diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_confbridge.c asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_confbridge.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_confbridge.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_confbridge.c	2022-05-12 11:50:59.000000000 +0000
@@ -131,6 +131,11 @@
 		</see-also>
 	</application>
 	<application name="ConfKick" language="en_US">
+		<since>
+			<version>16.19.0</version>
+			<version>18.5.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Kicks channel(s) from the requested ConfBridge.
 		</synopsis>
@@ -2720,17 +2725,24 @@
 		ast_autoservice_stop(chan);
 	}
 
-	/* Play the Join sound to both the conference and the user entering. */
 	if (!quiet) {
 		const char *join_sound = conf_get_sound(CONF_SOUND_JOIN, conference->b_profile.sounds);
 
-		if (strcmp(conference->b_profile.language, ast_channel_language(chan))) {
-			ast_stream_and_wait(chan, join_sound, "");
+		/* if hear_own_join_sound is enabled play the Join sound to everyone */
+		if (ast_test_flag(&user.u_profile, USER_OPT_HEAR_OWN_JOIN_SOUND) ) {
+			if (strcmp(conference->b_profile.language, ast_channel_language(chan))) {
+				ast_stream_and_wait(chan, join_sound, "");
+				ast_autoservice_start(chan);
+				play_sound_file(conference, join_sound);
+				ast_autoservice_stop(chan);
+			} else {
+				async_play_sound_file(conference, join_sound, chan);
+			}
+		/* if hear_own_join_sound is disabled only play the Join sound to just the conference */
+		} else {
 			ast_autoservice_start(chan);
 			play_sound_file(conference, join_sound);
 			ast_autoservice_stop(chan);
-		} else {
-			async_play_sound_file(conference, join_sound, chan);
 		}
 	}
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_dial.c asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_dial.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_dial.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_dial.c	2022-05-12 11:50:59.000000000 +0000
@@ -86,6 +86,7 @@
 					<para>If you need more than one enter them as
 					Technology2/Resource2&amp;Technology3/Resource3&amp;.....</para>
 				</argument>
+				<xi:include xpointer="xpointer(/docs/info[@name='Dial_Resource'])" />
 			</parameter>
 			<parameter name="timeout" required="false">
 				<para>Specifies the number of seconds we attempt to dial the specified devices.</para>
@@ -613,12 +614,31 @@
 				</variable>
 				<variable name="DIALSTATUS">
 					<para>This is the status of the call</para>
-					<value name="CHANUNAVAIL" />
-					<value name="CONGESTION" />
-					<value name="NOANSWER" />
-					<value name="BUSY" />
-					<value name="ANSWER" />
-					<value name="CANCEL" />
+					<value name="CHANUNAVAIL">
+						Either the dialed peer exists but is not currently reachable, e.g.
+						endpoint is not registered, or an attempt was made to call a
+						nonexistent location, e.g. nonexistent DNS hostname.
+					</value>
+					<value name="CONGESTION">
+						Channel or switching congestion occured when routing the call.
+						This can occur if there is a slow or no response from the remote end.
+					</value>
+					<value name="NOANSWER">
+						Called party did not answer.
+					</value>
+					<value name="BUSY">
+						The called party was busy or indicated a busy status.
+						Note that some SIP devices will respond with 486 Busy if their Do Not Disturb
+						modes are active. In this case, you can use DEVICE_STATUS to check if the
+						endpoint is actually in use, if needed.
+					</value>
+					<value name="ANSWER">
+						The call was answered.
+						Any other result implicitly indicates the call was not answered.
+					</value>
+					<value name="CANCEL">
+						Dial was cancelled before call was answered or reached some other terminating event.
+					</value>
 					<value name="DONTCALL">
 						For the Privacy and Screening Modes.
 						Will be set if the called party chooses to send the calling party to the 'Go Away' script.
@@ -627,7 +647,9 @@
 						For the Privacy and Screening Modes.
 						Will be set if the called party chooses to send the calling party to the 'torture' script.
 					</value>
-					<value name="INVALIDARGS" />
+					<value name="INVALIDARGS">
+						Dial failed due to invalid syntax.
+					</value>
 				</variable>
 			</variablelist>
 		</description>
@@ -2586,9 +2608,11 @@
 		struct ast_channel *tc; /* channel for this destination */
 		char *number;
 		char *tech;
+		int i;
 		size_t tech_len;
 		size_t number_len;
 		struct ast_stream_topology *topology;
+		struct ast_stream *stream;
 
 		cur = ast_strip(cur);
 		if (ast_strlen_zero(cur)) {
@@ -2654,6 +2678,21 @@
 
 		ast_channel_unlock(chan);
 
+		for (i = 0; i < ast_stream_topology_get_count(topology); ++i) {
+			stream = ast_stream_topology_get_stream(topology, i);
+			/* For both recvonly and sendonly the stream state reflects our state, that is we
+			 * are receiving only and we are sending only. Since we are requesting a
+			 * channel for the peer, we need to swap this to reflect what we will be doing.
+			 * That is, if we are receiving from Alice then we want to be sending to Bob,
+			 * so swap recvonly to sendonly and vice versa.
+			 */
+			if (ast_stream_get_state(stream) == AST_STREAM_STATE_RECVONLY) {
+				ast_stream_set_state(stream, AST_STREAM_STATE_SENDONLY);
+			} else if (ast_stream_get_state(stream) == AST_STREAM_STATE_SENDONLY) {
+				ast_stream_set_state(stream, AST_STREAM_STATE_RECVONLY);
+			}
+		}
+
 		tc = ast_request_with_stream_topology(tmp->tech, topology, NULL, chan, tmp->number, &cause);
 
 		ast_stream_topology_free(topology);
@@ -3602,4 +3641,4 @@
 	.load = load_module,
 	.unload = unload_module,
 	.requires = "ccss",
-);
\ No newline at end of file
+);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_dtmfstore.c asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_dtmfstore.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_dtmfstore.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_dtmfstore.c	2022-05-12 11:50:59.000000000 +0000
@@ -41,6 +41,11 @@
 
 /*** DOCUMENTATION
 	<application name="StoreDTMF" language="en_US">
+		<since>
+			<version>16.20.0</version>
+			<version>18.6.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Stores DTMF digits transmitted or received on a channel.
 		</synopsis>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_meetme.c asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_meetme.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_meetme.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_meetme.c	2022-05-12 11:50:59.000000000 +0000
@@ -4761,7 +4761,7 @@
 				}
 			}
 			if (!var) {
-				ast_debug(1, "%s isn't a valid conference\n", confno);
+				ast_log(LOG_WARNING, "%s isn't a valid conference\n", confno);
 			}
 			ast_config_destroy(cfg);
 		}
@@ -5239,7 +5239,9 @@
 
 	if (ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "MeetMeAdmin requires an argument!\n");
-		pbx_builtin_setvar_helper(chan, "MEETMEADMINSTATUS", "NOPARSE");
+		if (chan) {
+			pbx_builtin_setvar_helper(chan, "MEETMEADMINSTATUS", "NOPARSE");
+		}
 		return -1;
 	}
 
@@ -5248,7 +5250,9 @@
 
 	if (!args.command) {
 		ast_log(LOG_WARNING, "MeetmeAdmin requires a command!\n");
-		pbx_builtin_setvar_helper(chan, "MEETMEADMINSTATUS", "NOPARSE");
+		if (chan) {
+			pbx_builtin_setvar_helper(chan, "MEETMEADMINSTATUS", "NOPARSE");
+		}
 		return -1;
 	}
 
@@ -5261,7 +5265,9 @@
 	if (!cnf) {
 		ast_log(LOG_WARNING, "Conference number '%s' not found!\n", args.confno);
 		AST_LIST_UNLOCK(&confs);
-		pbx_builtin_setvar_helper(chan, "MEETMEADMINSTATUS", "NOTFOUND");
+		if (chan) {
+			pbx_builtin_setvar_helper(chan, "MEETMEADMINSTATUS", "NOTFOUND");
+		}
 		return 0;
 	}
 
@@ -5384,7 +5390,9 @@
 	AST_LIST_UNLOCK(&confs);
 
 	dispose_conf(cnf);
-	pbx_builtin_setvar_helper(chan, "MEETMEADMINSTATUS", res == -2 ? "NOTFOUND" : res ? "FAILED" : "OK");
+	if (chan) {
+		pbx_builtin_setvar_helper(chan, "MEETMEADMINSTATUS", res == -2 ? "NOTFOUND" : res ? "FAILED" : "OK");
+	}
 
 	return 0;
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_mf.c asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_mf.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_mf.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_mf.c	2022-05-12 11:50:59.000000000 +0000
@@ -42,6 +42,11 @@
 
 /*** DOCUMENTATION
 	<application name="ReceiveMF" language="en_US">
+		<since>
+			<version>16.21.0</version>
+			<version>18.7.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Detects MF digits on a channel and saves them to a variable.
 		</synopsis>
@@ -113,6 +118,11 @@
 		</see-also>
 	</application>
 	<application name="SendMF" language="en_US">
+		<since>
+			<version>16.21.0</version>
+			<version>18.7.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Sends arbitrary MF digits on the current or specified channel.
 		</synopsis>
@@ -151,6 +161,11 @@
 		</see-also>
 	</application>
 	<manager name="PlayMF" language="en_US">
+		<since>
+			<version>16.21.0</version>
+			<version>18.7.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Play MF digit on a specific channel.
 		</synopsis>
@@ -226,7 +241,7 @@
  * \param maxdigits If greater than 0, only read this many digits no matter what
  *
  * \retval 0 if successful
- * \retval -1 if unsuccessful.
+ * \retval -1 if unsuccessful (including hangup).
  */
 static int read_mf_digits(struct ast_channel *chan, char *buf, int buflen, int timeout, int features, int laxkp, int override, int no_kp, int no_st, int maxdigits) {
 	struct ast_dsp *dsp;
@@ -236,6 +251,7 @@
 	int digits_read = 0;
 	int is_start_digit = 0;
 	char *str = buf;
+	int res = 0;
 
 	if (!(dsp = ast_dsp_new())) {
 		ast_log(LOG_WARNING, "Unable to allocate DSP!\n");
@@ -318,11 +334,12 @@
 			}
 		} else {
 			pbx_builtin_setvar_helper(chan, "RECEIVEMFSTATUS", "HANGUP");
+			res = -1;
 		}
 	}
 	ast_dsp_free(dsp);
 	ast_debug(3, "channel '%s' - event loop stopped { timeout: %d, remaining_time: %d }\n", ast_channel_name(chan), timeout, remaining_time);
-	return 0;
+	return res;
 }
 
 static int read_mf_exec(struct ast_channel *chan, const char *data)
@@ -334,7 +351,7 @@
 	struct ast_flags flags = {0};
 	char *optargs[OPT_ARG_ARRAY_SIZE];
 	char *argcopy = NULL;
-	int features = 0, maxdigits = 0;
+	int res, features = 0, maxdigits = 0;
 
 	AST_DECLARE_APP_ARGS(arglist,
 		AST_APP_ARG(variable);
@@ -392,15 +409,15 @@
 		features |= DSP_DIGITMODE_RELAXDTMF;
 	}
 
-	read_mf_digits(chan, tmp, BUFFER_SIZE, to, features, (ast_test_flag(&flags, OPT_LAX_KP)),
+	res = read_mf_digits(chan, tmp, BUFFER_SIZE, to, features, (ast_test_flag(&flags, OPT_LAX_KP)),
 		(ast_test_flag(&flags, OPT_KP_OVERRIDE)), (ast_test_flag(&flags, OPT_NO_KP)), (ast_test_flag(&flags, OPT_NO_ST)), maxdigits);
 	pbx_builtin_setvar_helper(chan, arglist.variable, tmp);
 	if (!ast_strlen_zero(tmp)) {
 		ast_verb(3, "MF digits received: '%s'\n", tmp);
-	} else {
+	} else if (!res) { /* if channel hung up, don't print anything out */
 		ast_verb(3, "No MF digits received.\n");
 	}
-	return 0;
+	return res;
 }
 
 static int sendmf_exec(struct ast_channel *chan, const char *vdata)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_queue.c asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_queue.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_queue.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_queue.c	2022-05-12 11:50:59.000000000 +0000
@@ -185,10 +185,6 @@
 					<option name="H">
 						<para>Allow <emphasis>caller</emphasis> to hang up by pressing <literal>*</literal>.</para>
 					</option>
-					<option name="n">
-						<para>No retries on the timeout; will exit this application and
-						go to the next step.</para>
-					</option>
 					<option name="i">
 						<para>Ignore call forward requests from queue members and do nothing
 						when they are requested.</para>
@@ -197,6 +193,23 @@
 						<para>Asterisk will ignore any connected line update requests or any redirecting party
 						update requests it may receive on this dial attempt.</para>
 					</option>
+					<option name="k">
+						<para>Allow the <emphasis>called</emphasis> party to enable parking of the call by sending
+						the DTMF sequence defined for call parking in <filename>features.conf</filename>.</para>
+					</option>
+					<option name="K">
+						<para>Allow the <emphasis>calling</emphasis> party to enable parking of the call by sending
+						the DTMF sequence defined for call parking in <filename>features.conf</filename>.</para>
+					</option>
+					<option name="m">
+						<para>Custom music on hold class to use, which will override the music on hold class configured
+						in <filename>queues.conf</filename>, if specified.</para>
+						<para>Note that CHANNEL(musicclass), if set, will still override this option.</para>
+					</option>
+					<option name="n">
+						<para>No retries on the timeout; will exit this application and
+						go to the next step.</para>
+					</option>
 					<option name="r">
 						<para>Ring instead of playing MOH. Periodic Announcements are still made, if applicable.</para>
 					</option>
@@ -217,14 +230,6 @@
 						<para>Allow the <emphasis>calling</emphasis> user to write the conversation to
 						disk via Monitor.</para>
 					</option>
-					<option name="k">
-						<para>Allow the <emphasis>called</emphasis> party to enable parking of the call by sending
-						the DTMF sequence defined for call parking in <filename>features.conf</filename>.</para>
-					</option>
-					<option name="K">
-						<para>Allow the <emphasis>calling</emphasis> party to enable parking of the call by sending
-						the DTMF sequence defined for call parking in <filename>features.conf</filename>.</para>
-					</option>
 					<option name="x">
 						<para>Allow the <emphasis>called</emphasis> user to write the conversation
 						to disk via MixMonitor.</para>
@@ -1468,12 +1473,14 @@
 	OPT_CALLER_AUTOMON =         (1 << 18),
 	OPT_PREDIAL_CALLEE =         (1 << 19),
 	OPT_PREDIAL_CALLER =         (1 << 20),
+	OPT_MUSICONHOLD_CLASS =      (1 << 21),
 };
 
 enum {
 	OPT_ARG_CALLEE_GO_ON = 0,
 	OPT_ARG_PREDIAL_CALLEE,
 	OPT_ARG_PREDIAL_CALLER,
+	OPT_ARG_MUSICONHOLD_CLASS,
 	/* note: this entry _MUST_ be the last one in the enum */
 	OPT_ARG_ARRAY_SIZE
 };
@@ -1491,6 +1498,7 @@
 	AST_APP_OPTION('I', OPT_IGNORE_CONNECTEDLINE),
 	AST_APP_OPTION('k', OPT_CALLEE_PARK),
 	AST_APP_OPTION('K', OPT_CALLER_PARK),
+	AST_APP_OPTION_ARG('m', OPT_MUSICONHOLD_CLASS, OPT_ARG_MUSICONHOLD_CLASS),
 	AST_APP_OPTION('n', OPT_NO_RETRY),
 	AST_APP_OPTION('r', OPT_RINGING),
 	AST_APP_OPTION('R', OPT_RING_WHEN_RINGING),
@@ -8625,6 +8633,12 @@
 		ast_app_exec_sub(NULL, chan, opt_args[OPT_ARG_PREDIAL_CALLER], 0);
 	}
 
+	/* Music on hold class override */
+	if (ast_test_flag(&opts, OPT_MUSICONHOLD_CLASS)
+		&& !ast_strlen_zero(opt_args[OPT_ARG_MUSICONHOLD_CLASS])) {
+		ast_copy_string(qe.moh, opt_args[OPT_ARG_MUSICONHOLD_CLASS], sizeof(qe.moh));
+	}
+
 	copy_rules(&qe, args.rule);
 	qe.pr = AST_LIST_FIRST(&qe.qe_rules);
 check_turns:
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_sendtext.c asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_sendtext.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_sendtext.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_sendtext.c	2022-05-12 11:50:59.000000000 +0000
@@ -145,6 +145,11 @@
 		</see-also>
 	</application>
 	<application name="ReceiveText" language="en_US">
+		<since>
+			<version>16.24.0</version>
+			<version>18.10.0</version>
+			<version>19.2.0</version>
+		</since>
 		<synopsis>
 			Receive a Text Message on a channel.
 		</synopsis>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_sf.c asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_sf.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_sf.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_sf.c	2022-05-12 11:50:59.000000000 +0000
@@ -42,6 +42,11 @@
 
 /*** DOCUMENTATION
 	<application name="ReceiveSF" language="en_US">
+		<since>
+			<version>16.24.0</version>
+			<version>18.10.0</version>
+			<version>19.2.0</version>
+		</since>
 		<synopsis>
 			Detects SF digits on a channel and saves them to a variable.
 		</synopsis>
@@ -107,6 +112,11 @@
 		</see-also>
 	</application>
 	<application name="SendSF" language="en_US">
+		<since>
+			<version>16.24.0</version>
+			<version>18.10.0</version>
+			<version>19.2.0</version>
+		</since>
 		<synopsis>
 			Sends arbitrary SF digits on the current or specified channel.
 		</synopsis>
@@ -155,6 +165,21 @@
 static const char *readsf_name = "ReceiveSF";
 static const char sendsf_name[] = "SendSF";
 
+/*!
+ * \brief Detects SF digits on channel using DSP
+ *
+ * \param chan channel on which to read digits
+ * \param buf Buffer in which to store digits
+ * \param buflen Size of buffer
+ * \param timeout ms to wait for all digits before giving up
+ * \param maxdigits Maximum number of digits
+ * \param freq Frequency to use
+ * \param features DSP features
+ * \param extrapulses Whether to recognize extra pulses
+ *
+ * \retval 0 if successful
+ * \retval -1 if unsuccessful (including hangup).
+ */
 static int read_sf_digits(struct ast_channel *chan, char *buf, int buflen, int timeout, int maxdigits, int freq, int features, int extrapulses) {
 	/* Bell System Technical Journal 39 (Nov. 1960) */
 	#define SF_MIN_OFF 25
@@ -169,6 +194,7 @@
 	char *str = buf;
 	int hits = 0, digits_read = 0;
 	unsigned short int sf_on = 0;
+	int res = 0;
 
 	if (!(dsp = ast_dsp_new())) {
 		ast_log(LOG_WARNING, "Unable to allocate DSP!\n");
@@ -261,7 +287,7 @@
 								ast_debug(2, "Got more than 10 pulses, truncating to 10\n");
 								hits = 0; /* 10 dial pulses = digit 0 */
 								*str++ = hits + '0';
-								}
+							}
 						} else {
 							if (hits == 10) {
 								hits = 0; /* 10 dial pulses = digit 0 */
@@ -281,13 +307,14 @@
 			ast_frfree(frame);
 		} else {
 			pbx_builtin_setvar_helper(chan, "RECEIVESFSTATUS", "HANGUP");
+			res = -1;
 		}
 	}
 	if (dsp) {
 		ast_dsp_free(dsp);
 	}
 	ast_debug(3, "channel '%s' - event loop stopped { timeout: %d, remaining_time: %d }\n", ast_channel_name(chan), timeout, remaining_time);
-	return 0;
+	return res;
 }
 
 static int read_sf_exec(struct ast_channel *chan, const char *data)
@@ -297,7 +324,7 @@
 	double tosec;
 	struct ast_flags flags = {0};
 	char *argcopy = NULL;
-	int features = 0, digits = 0, to = 0, freq = 2600;
+	int res, features = 0, digits = 0, to = 0, freq = 2600;
 
 	AST_DECLARE_APP_ARGS(arglist,
 		AST_APP_ARG(variable);
@@ -360,14 +387,14 @@
 		features |= DSP_DIGITMODE_RELAXDTMF;
 	}
 
-	read_sf_digits(chan, tmp, BUFFER_SIZE, to, digits, freq, features, ast_test_flag(&flags, OPT_EXTRAPULSES));
+	res = read_sf_digits(chan, tmp, BUFFER_SIZE, to, digits, freq, features, ast_test_flag(&flags, OPT_EXTRAPULSES));
 	pbx_builtin_setvar_helper(chan, arglist.variable, tmp);
 	if (!ast_strlen_zero(tmp)) {
 		ast_verb(3, "SF digits received: '%s'\n", tmp);
-	} else {
+	} else if (!res) { /* if channel hung up, don't print anything out */
 		ast_verb(3, "No SF digits received.\n");
 	}
-	return 0;
+	return res;
 }
 
 static int sendsf_exec(struct ast_channel *chan, const char *vdata)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_waitforcond.c asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_waitforcond.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/app_waitforcond.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/app_waitforcond.c	2022-05-12 11:50:59.000000000 +0000
@@ -39,6 +39,11 @@
 
 /*** DOCUMENTATION
 	<application name="WaitForCondition" language="en_US">
+		<since>
+			<version>16.20.0</version>
+			<version>18.6.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Wait (sleep) until the given condition is true.
 		</synopsis>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/confbridge/conf_config_parser.c asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/confbridge/conf_config_parser.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/confbridge/conf_config_parser.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/confbridge/conf_config_parser.c	2022-05-12 11:50:59.000000000 +0000
@@ -97,6 +97,9 @@
 				<configOption name="quiet">
 					<synopsis>Silence enter/leave prompts and user intros for this user</synopsis>
 				</configOption>
+				<configOption name="hear_own_join_sound">
+					<synopsis>Determines if the user also hears the join sound when they enter a conference</synopsis>
+				</configOption>
 				<configOption name="announce_user_count">
 					<synopsis>Sets if the number of users should be announced to the user</synopsis>
 				</configOption>
@@ -1574,6 +1577,9 @@
 	ast_cli(a->fd,"Quiet:                   %s\n",
 		u_profile.flags & USER_OPT_QUIET ?
 		"enabled" : "disabled");
+	ast_cli(a->fd,"Hear Join:               %s\n",
+		u_profile.flags & USER_OPT_HEAR_OWN_JOIN_SOUND ?
+		"enabled" : "disabled");
 	ast_cli(a->fd,"Wait Marked:             %s\n",
 		u_profile.flags & USER_OPT_WAITMARKED ?
 		"enabled" : "disabled");
@@ -2396,6 +2402,7 @@
 	aco_option_register(&cfg_info, "startmuted", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_STARTMUTED);
 	aco_option_register(&cfg_info, "music_on_hold_when_empty", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_MUSICONHOLD);
 	aco_option_register(&cfg_info, "quiet", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_QUIET);
+	aco_option_register(&cfg_info, "hear_own_join_sound", ACO_EXACT, user_types, "yes", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_HEAR_OWN_JOIN_SOUND);
 	aco_option_register_custom(&cfg_info, "announce_user_count_all", ACO_EXACT, user_types, "no", announce_user_count_all_handler, 0);
 	aco_option_register(&cfg_info, "announce_user_count", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_ANNOUNCEUSERCOUNT);
 	/* Negative logic. Defaults to "yes" and evaluates with ast_false(). If !ast_false(), USER_OPT_NOONLYPERSON is cleared */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/confbridge/include/confbridge.h asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/confbridge/include/confbridge.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/apps/confbridge/include/confbridge.h	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/apps/confbridge/include/confbridge.h	2022-05-12 11:50:59.000000000 +0000
@@ -70,6 +70,7 @@
 	USER_OPT_ECHO_EVENTS = (1 << 18), /*!< Send events only to the admin(s) */
 	USER_OPT_TEXT_MESSAGING = (1 << 19), /*!< Send text messages to the user */
 	USER_OPT_ANSWER_CHANNEL = (1 << 20), /*!< Sets if the channel should be answered if currently unanswered */
+	USER_OPT_HEAR_OWN_JOIN_SOUND  = (1 << 21), /*!< Set if the caller should hear the join sound */
 };
 
 enum bridge_profile_flags {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/asterisk-18.11.2-summary.html asterisk-18.12.0~dfsg+~cs6.12.40431413/asterisk-18.11.2-summary.html
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/asterisk-18.11.2-summary.html	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/asterisk-18.11.2-summary.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><title>Release Summary - asterisk-18.11.2</title><h1 align="center"><a name="top">Release Summary</a></h1><h3 align="center">asterisk-18.11.2</h3><h3 align="center">Date: 2022-04-14</h3><h3 align="center">&lt;asteriskteam@digium.com&gt;</h3><hr><h2 align="center">Table of Contents</h2><ol>
-<li><a href="#summary">Summary</a></li>
-<li><a href="#contributors">Contributors</a></li>
-<li><a href="#closed_issues">Closed Issues</a></li>
-<li><a href="#commits">Other Changes</a></li>
-<li><a href="#diffstat">Diffstat</a></li>
-</ol><hr><a name="summary"><h2 align="center">Summary</h2></a><center><a href="#top">[Back to Top]</a></center><p>This release has been made to address one or more security vulnerabilities that have been identified. A security advisory document has been published for each vulnerability that includes additional information. Users of versions of Asterisk that are affected are strongly encouraged to review the advisories and determine what action they should take to protect their systems from these issues.</p><p>Security Advisories:</p><ul>
-<li><a href="http://downloads.asterisk.org/pub/security/AST-2022-001.html">AST-2022-001</a></li>
-<li><a href="http://downloads.asterisk.org/pub/security/AST-2022-002.html">AST-2022-002</a></li>
-<li><a href="http://downloads.asterisk.org/pub/security/AST-2022-003.html">AST-2022-003</a></li>
-</ul><p>The data in this summary reflects changes that have been made since the previous release, asterisk-18.11.1.</p><hr><a name="contributors"><h2 align="center">Contributors</h2></a><center><a href="#top">[Back to Top]</a></center><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were affected by commits that went into this release.</p><table width="100%" border="0">
-<tr><th width="33%">Coders</th><th width="33%">Testers</th><th width="33%">Reporters</th></tr>
-<tr valign="top"><td width="33%">3 Asterisk Development Team <asteriskteam@digium.com><br/>2 Ben Ford <bford@digium.com><br/>1 Joshua C. Colp <jcolp@sangoma.com><br/></td><td width="33%"><td width="33%">1 Benjamin Keith Ford <bford@digium.com><br/>1 Clint Ruoho <clint@ruoho.org><br/>1 Leandro Dardini <ldardini@gmail.com><br/></td></tr>
-</table><hr><a name="closed_issues"><h2 align="center">Closed Issues</h2></a><center><a href="#top">[Back to Top]</a></center><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p><h3>Security</h3><h4>Category: Functions/func_odbc</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29838">ASTERISK-29838</a>: ${SQL_ESC()} not correctly escaping a terminating \<br/>Reported by: Leandro Dardini<ul>
-<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=88522c22aa1985667c813c11df6f53d9f78b80a1">[88522c22aa]</a> Joshua C. Colp -- func_odbc: Add SQL_ESC_BACKSLASHES dialplan function.</li>
-</ul><br><h4>Category: Resources/res_stir_shaken</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29476">ASTERISK-29476</a>: res_stir_shaken: Blind SSRF vulnerabilities<br/>Reported by: Clint Ruoho<ul>
-<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=353142a2b4a8f30b860754115feae4618f48cfcb">[353142a2b4]</a> Ben Ford -- AST-2022-002 - res_stir_shaken/curl: Add ACL checks for Identity header.</li>
-</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29872">ASTERISK-29872</a>: res_stir_shaken: Resource exhaustion with large files<br/>Reported by: Benjamin Keith Ford<ul>
-<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=1fdb1a6edf997ed1337df20228748199f12b039b">[1fdb1a6edf]</a> Ben Ford -- AST-2022-001 - res_stir_shaken/curl: Limit file size and check start.</li>
-</ul><br><hr><a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a><center><a href="#top">[Back to Top]</a></center><p>This is a list of all changes that went into this release that did not reference a JIRA issue.</p><table width="100%" border="1">
-<tr><th>Revision</th><th>Author</th><th>Summary</th></tr>
-<tr><td><a href="https://code.asterisk.org/code/changelog/asterisk?cs=94eac3c13cdef5aa41848b6674f8bcd1f59d54b8">94eac3c13c</a></td><td>Asterisk Development Team</td><td>Doing a fresh summary</td></tr>
-<tr><td><a href="https://code.asterisk.org/code/changelog/asterisk?cs=3ca29c95549c761790610b94411e38f2193af4c6">3ca29c9554</a></td><td>Asterisk Development Team</td><td>Update for 18.11.2</td></tr>
-<tr><td><a href="https://code.asterisk.org/code/changelog/asterisk?cs=1422d098e70b09193f1d85c87aabdf86bf6ac059">1422d098e7</a></td><td>Asterisk Development Team</td><td>Update CHANGES and UPGRADE.txt for 18.11.2</td></tr>
-</table><hr><a name="diffstat"><h2 align="center">Diffstat Results</h2></a><center><a href="#top">[Back to Top]</a></center><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p><pre>asterisk-18.11.1-summary.html             |   16 -
-asterisk-18.11.1-summary.txt              |   91 -----------
-b/.version                                |    2
-b/CHANGES                                 |   12 +
-b/ChangeLog                               |   57 +++++++
-b/configs/samples/func_odbc.conf.sample   |    4
-b/configs/samples/pjsip.conf.sample       |    4
-b/configs/samples/stir_shaken.conf.sample |   18 ++
-b/funcs/func_odbc.c                       |   39 ++++
-b/include/asterisk/res_pjsip.h            |    2
-b/include/asterisk/res_stir_shaken.h      |   54 ++++++
-b/res/res_pjsip/pjsip_config.xml          |    7
-b/res/res_pjsip/pjsip_configuration.c     |    1
-b/res/res_pjsip_stir_shaken.c             |   14 +
-b/res/res_stir_shaken.c                   |   90 +++++++++--
-b/res/res_stir_shaken/curl.c              |  177 +++++++++++++++++-----
-b/res/res_stir_shaken/curl.h              |    5
-b/res/res_stir_shaken/profile.c           |  241 ++++++++++++++++++++++++++++++
-b/res/res_stir_shaken/profile.h           |   39 ++++
-b/res/res_stir_shaken/profile_private.h   |   40 ++++
-b/res/res_stir_shaken/stir_shaken.c       |   20 --
-21 files changed, 760 insertions(+), 173 deletions(-)</pre><br></html>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/asterisk-18.11.2-summary.txt asterisk-18.12.0~dfsg+~cs6.12.40431413/asterisk-18.11.2-summary.txt
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/asterisk-18.11.2-summary.txt	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/asterisk-18.11.2-summary.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-                                Release Summary
-
-                                asterisk-18.11.2
-
-                                Date: 2022-04-14
-
-                           <asteriskteam@digium.com>
-
-     ----------------------------------------------------------------------
-
-                               Table of Contents
-
-    1. Summary
-    2. Contributors
-    3. Closed Issues
-    4. Other Changes
-    5. Diffstat
-
-     ----------------------------------------------------------------------
-
-                                    Summary
-
-                                 [Back to Top]
-
-   This release has been made to address one or more security vulnerabilities
-   that have been identified. A security advisory document has been published
-   for each vulnerability that includes additional information. Users of
-   versions of Asterisk that are affected are strongly encouraged to review
-   the advisories and determine what action they should take to protect their
-   systems from these issues.
-
-   Security Advisories:
-
-     * AST-2022-001
-     * AST-2022-002
-     * AST-2022-003
-
-   The data in this summary reflects changes that have been made since the
-   previous release, asterisk-18.11.1.
-
-     ----------------------------------------------------------------------
-
-                                  Contributors
-
-                                 [Back to Top]
-
-   This table lists the people who have submitted code, those that have
-   tested patches, as well as those that reported issues on the issue tracker
-   that were resolved in this release. For coders, the number is how many of
-   their patches (of any size) were committed into this release. For testers,
-   the number is the number of times their name was listed as assisting with
-   testing a patch. Finally, for reporters, the number is the number of
-   issues that they reported that were affected by commits that went into
-   this release.
-
-   Coders                      Testers               Reporters                
-   3 Asterisk Development Team                       1 Benjamin Keith Ford    
-   2 Ben Ford                                        1 Clint Ruoho            
-   1 Joshua C. Colp                                  1 Leandro Dardini        
-
-     ----------------------------------------------------------------------
-
-                                 Closed Issues
-
-                                 [Back to Top]
-
-   This is a list of all issues from the issue tracker that were closed by
-   changes that went into this release.
-
-  Security
-
-    Category: Functions/func_odbc
-
-   ASTERISK-29838: ${SQL_ESC()} not correctly escaping a terminating \
-   Reported by: Leandro Dardini
-     * [88522c22aa] Joshua C. Colp -- func_odbc: Add SQL_ESC_BACKSLASHES
-       dialplan function.
-
-    Category: Resources/res_stir_shaken
-
-   ASTERISK-29476: res_stir_shaken: Blind SSRF vulnerabilities
-   Reported by: Clint Ruoho
-     * [353142a2b4] Ben Ford -- AST-2022-002 - res_stir_shaken/curl: Add ACL
-       checks for Identity header.
-   ASTERISK-29872: res_stir_shaken: Resource exhaustion with large files
-   Reported by: Benjamin Keith Ford
-     * [1fdb1a6edf] Ben Ford -- AST-2022-001 - res_stir_shaken/curl: Limit
-       file size and check start.
-
-     ----------------------------------------------------------------------
-
-                      Commits Not Associated with an Issue
-
-                                 [Back to Top]
-
-   This is a list of all changes that went into this release that did not
-   reference a JIRA issue.
-
-   +------------------------------------------------------------------------+
-   | Revision   | Author                    | Summary                       |
-   |------------+---------------------------+-------------------------------|
-   | 94eac3c13c | Asterisk Development Team | Doing a fresh summary         |
-   |------------+---------------------------+-------------------------------|
-   | 3ca29c9554 | Asterisk Development Team | Update for 18.11.2            |
-   |------------+---------------------------+-------------------------------|
-   | 1422d098e7 | Asterisk Development Team | Update CHANGES and            |
-   |            |                           | UPGRADE.txt for 18.11.2       |
-   +------------------------------------------------------------------------+
-
-     ----------------------------------------------------------------------
-
-                                Diffstat Results
-
-                                 [Back to Top]
-
-   This is a summary of the changes to the source code that went into this
-   release that was generated using the diffstat utility.
-
- asterisk-18.11.1-summary.html             |   16 -
- asterisk-18.11.1-summary.txt              |   91 -----------
- b/.version                                |    2
- b/CHANGES                                 |   12 +
- b/ChangeLog                               |   57 +++++++
- b/configs/samples/func_odbc.conf.sample   |    4
- b/configs/samples/pjsip.conf.sample       |    4
- b/configs/samples/stir_shaken.conf.sample |   18 ++
- b/funcs/func_odbc.c                       |   39 ++++
- b/include/asterisk/res_pjsip.h            |    2
- b/include/asterisk/res_stir_shaken.h      |   54 ++++++
- b/res/res_pjsip/pjsip_config.xml          |    7
- b/res/res_pjsip/pjsip_configuration.c     |    1
- b/res/res_pjsip_stir_shaken.c             |   14 +
- b/res/res_stir_shaken.c                   |   90 +++++++++--
- b/res/res_stir_shaken/curl.c              |  177 +++++++++++++++++-----
- b/res/res_stir_shaken/curl.h              |    5
- b/res/res_stir_shaken/profile.c           |  241 ++++++++++++++++++++++++++++++
- b/res/res_stir_shaken/profile.h           |   39 ++++
- b/res/res_stir_shaken/profile_private.h   |   40 ++++
- b/res/res_stir_shaken/stir_shaken.c       |   20 --
- 21 files changed, 760 insertions(+), 173 deletions(-)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/asterisk-18.12.0-summary.html asterisk-18.12.0~dfsg+~cs6.12.40431413/asterisk-18.12.0-summary.html
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/asterisk-18.12.0-summary.html	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/asterisk-18.12.0-summary.html	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><title>Release Summary - asterisk-18.12.0</title><h1 align="center"><a name="top">Release Summary</a></h1><h3 align="center">asterisk-18.12.0</h3><h3 align="center">Date: 2022-05-12</h3><h3 align="center">&lt;asteriskteam@digium.com&gt;</h3><hr><h2 align="center">Table of Contents</h2><ol>
+<li><a href="#summary">Summary</a></li>
+<li><a href="#contributors">Contributors</a></li>
+<li><a href="#closed_issues">Closed Issues</a></li>
+<li><a href="#commits">Other Changes</a></li>
+<li><a href="#diffstat">Diffstat</a></li>
+</ol><hr><a name="summary"><h2 align="center">Summary</h2></a><center><a href="#top">[Back to Top]</a></center><p>This release is a point release of an existing major version. The changes included were made to address problems that have been identified in this release series, or are minor, backwards compatible new features or improvements. Users should be able to safely upgrade to this version if this release series is already in use. Users considering upgrading from a previous version are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p><p>The data in this summary reflects changes that have been made since the previous release, asterisk-18.11.0.</p><hr><a name="contributors"><h2 align="center">Contributors</h2></a><center><a href="#top">[Back to Top]</a></center><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release. For coders, the number is how many of their patches (of any size) were committed into this release. For testers, the number is the number of times their name was listed as assisting with testing a patch. Finally, for reporters, the number is the number of issues that they reported that were affected by commits that went into this release.</p><table width="100%" border="0">
+<tr><th width="33%">Coders</th><th width="33%">Testers</th><th width="33%">Reporters</th></tr>
+<tr valign="top"><td width="33%">22 Naveen Albert <asterisk@phreaknet.org><br/>6 Joshua C. Colp <jcolp@sangoma.com><br/>5 Sean Bright <sean.bright@gmail.com><br/>4 Asterisk Development Team <asteriskteam@digium.com><br/>4 Ben Ford <bford@digium.com><br/>3 Mark Petersen <bugs.digium.com@zombie.dk><br/>2 Kevin Harwell <kharwell@sangoma.com><br/>2 Philip Prindeville <philipp@redfish-solutions.com><br/>2 George Joseph <gjoseph@digium.com><br/>2 Maximilian Fridrich <m.fridrich@commend.com><br/>1 Birger Harzenetter (license 5870)<br/>1 Alexei Gradinari <alex2grad@gmail.com><br/>1 Michael Cargile <mikec@vicidial.com><br/>1 Hugh McMaster <hugh.mcmaster@outlook.com><br/>1 Boris P. Korzun <drtr0jan@yandex.ru><br/>1 Yury Kirsanov <y.kirsanov@gmail.com><br/>1 Marcel Wagner <mwagner@sipgate.de><br/></td><td width="33%"><td width="33%">18 N A <mail@interlinked.x10host.com><br/>3 Mark Petersen <asterisk.org@zombie.dk><br/>2 Rusty Newton <rnewton@digium.com><br/>2 Michael Auracher <m.auracher@commend.com><br/>2 George Joseph <gjoseph@digium.com><br/>2 Michael Auracher<br/>1 Michael Cargile <mikec@vicidial.com><br/>1 Andre Heider <a.heider@gmail.com><br/>1 Alexei Gradinari <alex2grad@gmail.com><br/>1 Daniel Bonazzi <dbonazzi@arbeitsoftware.com><br/>1 Claude Diderich <claude.diderich@yahoo.com><br/>1 Scott Griepentrog <sgriepentrog@digium.com><br/>1 Arix <arix@xmail.re><br/>1 Stefan Ruijsenaars<br/>1 Benjamin Keith Ford <bford@digium.com><br/>1 LA <learbia@gmail.com><br/>1 Josh Hogan <josh@vxt.co.nz><br/>1 Ross Beer <ross.beer@voicehost.co.uk><br/>1 Boris P. Korzun <drtr0jan@yandex.ru><br/>1 Marcel Wagner <mwagner@sipgate.de><br/>1 INVADE International Ltd. <support@invade.net><br/>1 Leandro Dardini <ldardini@gmail.com><br/>1 Yury Kirsanov <y.kirsanov@gmail.com><br/>1 Clint Ruoho <clint@ruoho.org><br/>1 Jim Van Meggelen <jim.vanmeggelen@clearlycore.com><br/>1 Stefan Ruijsenaars <stefanr@wave.com><br/>1 Tzafrir Cohen <tzafrir.cohen@xorcom.com><br/>1 Hugh McMaster <hugh.mcmaster@outlook.com><br/>1 Jonathan Harris <lardconcepts@gmail.com><br/>1 David Herselman <bbs2web@hotmail.com><br/>1 Dmitriy Serov <serov.d.p@gmail.com><br/>1 Philip Prindeville <philipp@redfish-solutions.com><br/>1 Gregory Massel <greg@csurf.co.za><br/>1 Jasper Hafkenscheid <jasper.hafkenscheid@wearespindle.com><br/>1 Kevin Harwell <kharwell@digium.com><br/>1 Josh Alberts <jmana9@gmail.com><br/>1 Sebastian Gutierrez <scgm11@gmail.com><br/></td></tr>
+</table><hr><a name="closed_issues"><h2 align="center">Closed Issues</h2></a><center><a href="#top">[Back to Top]</a></center><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p><h3>Security</h3><h4>Category: Functions/func_odbc</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29838">ASTERISK-29838</a>: ${SQL_ESC()} not correctly escaping a terminating \<br/>Reported by: Leandro Dardini<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=39cd09c246ab66f6e6e56f7543230247071ea72b">[39cd09c246]</a> Joshua C. Colp -- func_odbc: Add SQL_ESC_BACKSLASHES dialplan function.</li>
+</ul><br><h4>Category: Resources/res_stir_shaken</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29476">ASTERISK-29476</a>: res_stir_shaken: Blind SSRF vulnerabilities<br/>Reported by: Clint Ruoho<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=11accf8064d8ea86ddba50b1065b1d7ade0cbd0c">[11accf8064]</a> Ben Ford -- AST-2022-002 - res_stir_shaken/curl: Add ACL checks for Identity header.</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29872">ASTERISK-29872</a>: res_stir_shaken: Resource exhaustion with large files<br/>Reported by: Benjamin Keith Ford<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=33091c2659a4cb28ea616c152018a574f951e881">[33091c2659]</a> Ben Ford -- AST-2022-001 - res_stir_shaken/curl: Limit file size and check start.</li>
+</ul><br><h3>New Feature</h3><h4>Category: Applications/app_confbridge</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29931">ASTERISK-29931</a>: Option to allow a user to not hear the join sound on enter but everyone else can<br/>Reported by: Michael Cargile<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=216a55408ea8c667956b030946d8bc863f1e2cda">[216a55408e]</a> Michael Cargile -- apps/confbridge: Added hear_own_join_sound option to control who hears sound_join</li>
+</ul><br><h4>Category: Applications/app_queue</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29876">ASTERISK-29876</a>: app_queue: Add music on hold option<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=b7edc08e33f7ffb832d32a54825f0b699098d0ef">[b7edc08e33]</a> Naveen Albert -- app_queue: Add music on hold option to Queue.</li>
+</ul><br><h4>Category: Channels/chan_pjsip</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29941">ASTERISK-29941</a>: chan_pjsip: Add ability to send flash events<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=8bc6d42a279045e92488f16372f2d4b417b6c7ef">[8bc6d42a27]</a> Naveen Albert -- chan_pjsip: Add ability to send flash events.</li>
+</ul><br><h4>Category: Functions/General</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29820">ASTERISK-29820</a>: cli: Add command to evaluate a function<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=3686a97d799f2aa60225ea04522c98c9e5114bba">[3686a97d79]</a> Naveen Albert -- cli: Add command to evaluate dialplan functions.</li>
+</ul><br><h4>Category: Functions/NewFeature</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29486">ASTERISK-29486</a>: Hint-like extension value lookup function without device state<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=79689d9df8c0426604dc4156521ed82aabd113cb">[79689d9df8]</a> Naveen Albert -- func_evalexten: Extension evaluation function.</li>
+</ul><br><h4>Category: Functions/func_db</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29968">ASTERISK-29968</a>: func_db: Add a function to return cardinality of keys at prefix<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=ce00f8758d61c2e05578311a5919f6c7edd7092b">[ce00f8758d]</a> Naveen Albert -- func_db: Add function to return cardinality at prefix</li>
+</ul><br><h3>Bug</h3><h4>Category: Applications/app_meetme</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-30002">ASTERISK-30002</a>: app_meetme: Don't erroneously set global variables when channel is NULL<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=ff70b2aac6379e89ec3d74deff7eb3c6651eff6d">[ff70b2aac6]</a> Naveen Albert -- app_meetme: Don't erroneously set global variables.</li>
+</ul><br><h4>Category: Bridges/bridge_simple</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29253">ASTERISK-29253</a>: Incorrect bridging on transfer<br/>Reported by: Yury Kirsanov<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=6ac08fdcf8d311d5cfedccf5b54b851a0bad47b0">[6ac08fdcf8]</a> Yury Kirsanov -- bridge_simple.c: Unhold channels on join simple bridge.</li>
+</ul><br><h4>Category: CDR/cdr_adaptive_odbc</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-30023">ASTERISK-30023</a>: cdr_adaptive_odbc: does not support DATETIME database columns<br/>Reported by: Gregory Massel<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=ec8ab44b7f207640ffa920b28efb2532c9f146ce">[ec8ab44b7f]</a> Joshua C. Colp -- cdr_adaptive_odbc: Add support for SQL_DATETIME field type.</li>
+</ul><br><h4>Category: Channels/chan_dahdi</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-28518">ASTERISK-28518</a>: chan_dahdi: Caller ID FSK Erroneously Sent when Picking Up Dahdi Call On Hold<br/>Reported by: Josh Alberts<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=a4f04666b5b54f3d633273fe46d1b78231877486">[a4f04666b5]</a> Naveen Albert -- chan_dahdi: Don't allow MWI FSK if channel not idle.</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29990">ASTERISK-29990</a>: chan_dahdi: adding ring cadences is not idempotent on dahdi restart<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=cb53ad567107169d9cf802f4e34a69a1fc674f3c">[cb53ad5671]</a> Naveen Albert -- chan_dahdi: Don't append cadences on dahdi restart.</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29994">ASTERISK-29994</a>: chan_dahdi: Round robin array size is too small for max number of groups<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=dd15cd049f2623e725eee601df0ae20071e54af3">[dd15cd049f]</a> Naveen Albert -- chan_dahdi: Fix insufficient array size for round robin.</li>
+</ul><br><h4>Category: Channels/chan_iax2</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-30007">ASTERISK-30007</a>: chan_iax2: Prevent crashes due to attempted encryption with missing secrets<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=9dc321cbcb21a243b9e6eed48c0d8ee8aa24c689">[9dc321cbcb]</a> Naveen Albert -- chan_iax2: Prevent crash if dialing RSA-only call without outkey.</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29895">ASTERISK-29895</a>: chan_iax2: Fix misaligned spacing in iax2 show netstats printout<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=d9e55250ddd47bad36252ccd27c007cc5ec929f6">[d9e55250dd]</a> Birger Harzenetter -- chan_iax2: Fix spacing in netstats command</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29048">ASTERISK-29048</a>: chan_iax2: "iax2 show registry" shows host for perceived<br/>Reported by: David Herselman<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=97c499ee343ee3680d5aeba49a29482f4c283415">[97c499ee34]</a> Naveen Albert -- chan_iax2: Fix perceived showing host address.</li>
+</ul><br><h4>Category: Channels/chan_pjsip</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29842">ASTERISK-29842</a>: Do not change 180 Ringing to 183 Progress even if early_media already enabled<br/>Reported by: Mark Petersen<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=16e59db5142034245d9ceb68fa8a1775f8353a7c">[16e59db514]</a> Mark Petersen -- chan_pjsip: add allow_sending_180_after_183 option</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-30006">ASTERISK-30006</a>: res_pjsip: UDP transport does not work when async_operations is greater than 1<br/>Reported by: Ross Beer<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=09e8667fa5b421f7c39e29921e3f3a62456f7f2b">[09e8667fa5]</a> Joshua C. Colp -- res_pjsip: Always set async_operations to 1.</li>
+</ul><br><h4>Category: Channels/chan_sip/General</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29843">ASTERISK-29843</a>: Session timers get removed on UPDATE<br/>Reported by: Mark Petersen<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=bb2102a9917b0c2ab86a8fccb73dce230f9a5cfc">[bb2102a991]</a> Mark Petersen -- chan_sip.c Session timers get removed on UPDATE</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29955">ASTERISK-29955</a>: chan_sip: SIP route header is missing on UPDATE<br/>Reported by: Mark Petersen<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=4f7e3d1609e391b5a3fac2ba509e58e4e68c28eb">[4f7e3d1609]</a> Mark Petersen -- chan_sip: SIP route header is missing on UPDATE</li>
+</ul><br><h4>Category: Channels/chan_sip/Transfers</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29955">ASTERISK-29955</a>: chan_sip: SIP route header is missing on UPDATE<br/>Reported by: Mark Petersen<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=4f7e3d1609e391b5a3fac2ba509e58e4e68c28eb">[4f7e3d1609]</a> Mark Petersen -- chan_sip: SIP route header is missing on UPDATE</li>
+</ul><br><h4>Category: Channels/chan_vpb</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-30021">ASTERISK-30021</a>: ast_variable_list_replace_variable uses variable with new keyword<br/>Reported by: Jasper Hafkenscheid<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=2587e58e05bf9f56aa20c86e5a31054330b10240">[2587e58e05]</a> Sean Bright -- config.h: Don't use C++ keywords as argument names.</li>
+</ul><br><h4>Category: Core/BuildSystem</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29986">ASTERISK-29986</a>: build: Asterisk 18.11.0 doesn't compile when wget isn't available<br/>Reported by: Stefan Ruijsenaars<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=dd704bbba516779bf671290789041b3de30b7fbe">[dd704bbba5]</a> George Joseph -- make_xml_documentation: Remove usage of get_sourceable_makeopts</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29988">ASTERISK-29988</a>: REGRESSION: The build process is requiring xmllint or xmlstarlet ro be installed when it shouldn't<br/>Reported by: George Joseph<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=2d3297d4f3e2cd944b8d7e2a69b0ba1da083f349">[2d3297d4f3]</a> George Joseph -- Makefile:  Disable XML doc validation</li>
+</ul><br><h4>Category: Core/FileFormatInterface</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29943">ASTERISK-29943</a>: file.c: seeking to negative file offset is not prevented<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=ea02bc368518e3d2b952c9f27db48f414d667bc9">[ea02bc3685]</a> Naveen Albert -- file.c: Prevent formats from seeking negative offsets.</li>
+</ul><br><h4>Category: Core/General</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29948">ASTERISK-29948</a>: iostream: Infinite TCP timeout writing data<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=ae1373d12d0f774fffa3c965c542c9f0b137fe95">[ae1373d12d]</a> Joshua C. Colp -- manager: Terminate session on write error.</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29674">ASTERISK-29674</a>: Adjust for 64bit time_t<br/>Reported by: Andre Heider<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=f50e793665ea66b5cea7c612cc95ca27bf45afb8">[f50e793665]</a> Philip Prindeville -- time: add support for time64 libcs</li>
+</ul><br><h4>Category: Core/Logging</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-22246">ASTERISK-22246</a>: Asterisk's "T" flag is ignored when used with "r" or "R" flags. (documentation bug)<br/>Reported by: Rusty Newton<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=09e989f972e2583df4e9bf585c246c37322d8d2f">[09e989f972]</a> Naveen Albert -- asterisk.c: Warn of incompatibilities with remote console.</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29928">ASTERISK-29928</a>: logging messages truncated when using MUSL runtime<br/>Reported by: Philip Prindeville<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=140c19c2067a5e2dcedfbb4dfa08c57758b822cb">[140c19c206]</a> Philip Prindeville -- logger: workaround woefully small BUFSIZ in MUSL</li>
+</ul><br><h4>Category: Core/Netsock</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29948">ASTERISK-29948</a>: iostream: Infinite TCP timeout writing data<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=ae1373d12d0f774fffa3c965c542c9f0b137fe95">[ae1373d12d]</a> Joshua C. Colp -- manager: Terminate session on write error.</li>
+</ul><br><h4>Category: Core/PBX</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-26719">ASTERISK-26719</a>: pbx: Only up to 127 includes in a dialplan context (AST_PBX_MAX_STACK - 1)<br/>Reported by: Tzafrir Cohen<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=bd69639a6b10e39848d6edd2a19c77f25800ef9b">[bd69639a6b]</a> Naveen Albert -- pbx.c: Warn if there are too many includes in a context.</li>
+</ul><br><h4>Category: Documentation</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29939">ASTERISK-29939</a>: agi: Fix xmldoc bug with set music<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=dc129b6951c6b207e7c1a686d72149b7a6460715">[dc129b6951]</a> Naveen Albert -- res_agi: Fix xmldocs bug with set music.</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-28891">ASTERISK-28891</a>: documentation: AGICommand_set+music documentation arguments displayed incorreclty<br/>Reported by: Jonathan Harris<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=dc129b6951c6b207e7c1a686d72149b7a6460715">[dc129b6951]</a> Naveen Albert -- res_agi: Fix xmldocs bug with set music.</li>
+</ul><br><h4>Category: General</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29728">ASTERISK-29728</a>: menuselect: Disabled by default modules that are enabled are always recompiled<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=b4c17c2044a8c78421c64b50da8ff1dbf368994b">[b4c17c2044]</a> Naveen Albert -- menuselect: Don't erroneously recompile modules.</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-22246">ASTERISK-22246</a>: Asterisk's "T" flag is ignored when used with "r" or "R" flags. (documentation bug)<br/>Reported by: Rusty Newton<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=09e989f972e2583df4e9bf585c246c37322d8d2f">[09e989f972]</a> Naveen Albert -- asterisk.c: Warn of incompatibilities with remote console.</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-26582">ASTERISK-26582</a>: Asterisk seems to ignore the "n" parameter for "disable console colorization"<br/>Reported by: Sebastian Gutierrez<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=09e989f972e2583df4e9bf585c246c37322d8d2f">[09e989f972]</a> Naveen Albert -- asterisk.c: Warn of incompatibilities with remote console.</li>
+</ul><br><h4>Category: PBX/General</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29950">ASTERISK-29950</a>: SayNumber can handle '01' to '07', but not '08' or '09'<br/>Reported by: Jim Van Meggelen<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=81a990b8d2431b9299ff77646847a92fbe651786">[81a990b8d2]</a> Sean Bright -- conversions.c: Specify that we only want to parse decimal numbers.</li>
+</ul><br><h4>Category: Resources/res_ari_recordings</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29960">ASTERISK-29960</a>: ari: Retrieving stored recording can returns wrong file<br/>Reported by: Arix<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=3a7d83087bcfc1f06b5ff66d3be24874c8217623">[3a7d83087b]</a> Sean Bright -- stasis_recording: Perform a complete match on requested filename.</li>
+</ul><br><h4>Category: Resources/res_pjsip_nat</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29411">ASTERISK-29411</a>: Crash in pjsip_msg_find_hdr_by_name<br/>Reported by: LA<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=ec5b449bcf97729f8664086049c1c4d92564be4e">[ec5b449bcf]</a> Kevin Harwell -- res_pjsip_header_funcs: wrong pool used tdata headers</li>
+</ul><br><h4>Category: Resources/res_pjsip_pubsub</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29961">ASTERISK-29961</a>: RLS: domain part of 'uri' list attribute mismatch with SUBSCRIBE request<br/>Reported by: Alexei Gradinari<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=96a3ff9eddd6a1964624c924fabb7f3d59a562dc">[96a3ff9edd]</a> Alexei Gradinari -- res_pjsip_pubsub: RLS 'uri' list attribute mismatch with SUBSCRIBE request</li>
+</ul><br><h4>Category: Resources/res_pjsip_sdp_rtp</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-26689">ASTERISK-26689</a>: res_pjsip_sdp_rtp: 183 Session in Progress. Disconnecting channel for lack of RTP activity<br/>Reported by: Dmitriy Serov<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=82dbfe7783d5199a940fb76b795f1ee1a3d4c9e5">[82dbfe7783]</a> Boris P. Korzun -- res_pjsip_sdp_rtp: Improve detecting of lack of RTP activity</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29929">ASTERISK-29929</a>: res_pjsip_sdp_rtp: Disconnecting channel for lack of RTP activity in one way sessions<br/>Reported by: Boris P. Korzun<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=82dbfe7783d5199a940fb76b795f1ee1a3d4c9e5">[82dbfe7783]</a> Boris P. Korzun -- res_pjsip_sdp_rtp: Improve detecting of lack of RTP activity</li>
+</ul><br><h4>Category: Resources/res_pjsip_session</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29655">ASTERISK-29655</a>: res_pjsip_session: No video to caller if no camera available<br/>Reported by: Michael Auracher<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=1e6991f95e6a70146a64407ab01bbbe45f93745f">[1e6991f95e]</a> Maximilian Fridrich -- core_unreal: Flip stream direction of second channel.</li>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=37829b4461dadf798611af25de0d58f55eedbfa4">[37829b4461]</a> Maximilian Fridrich -- app_dial: Flip stream direction of outgoing channel.</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29638">ASTERISK-29638</a>: res_pjsip_session: No video after early media<br/>Reported by: Michael Auracher<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=1e6991f95e6a70146a64407ab01bbbe45f93745f">[1e6991f95e]</a> Maximilian Fridrich -- core_unreal: Flip stream direction of second channel.</li>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=37829b4461dadf798611af25de0d58f55eedbfa4">[37829b4461]</a> Maximilian Fridrich -- app_dial: Flip stream direction of outgoing channel.</li>
+</ul><br><h4>Category: Resources/res_stir_shaken</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-30024">ASTERISK-30024</a>: Failed to sign STIR/SHAKEN payload with functionality not enabled<br/>Reported by: Claude Diderich<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=40f4268f2df3ac4d416e06bf825b2ea954a42075">[40f4268f2d]</a> Ben Ford -- res_pjsip_stir_shaken.c: Fix enabled when not configured.</li>
+</ul><br><h4>Category: pjproject/pjsip</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-30015">ASTERISK-30015</a>: pjsip / WebRTC: Chrome creating large number of SDP attributes<br/>Reported by: Josh Hogan<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=850021061178dbcf117f7bc1a0bf711838aa1efb">[8500210611]</a> Joshua C. Colp -- pjsip: Increase maximum number of format attributes.</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29535">ASTERISK-29535</a>: Segmentation fault in libasteriskpj.so.2<br/>Reported by: Daniel Bonazzi<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=ec5b449bcf97729f8664086049c1c4d92564be4e">[ec5b449bcf]</a> Kevin Harwell -- res_pjsip_header_funcs: wrong pool used tdata headers</li>
+</ul><br><h3>Improvement</h3><h4>Category: Applications/General</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29951">ASTERISK-29951</a>: app_mf, app_sf: Return -1 on hangup<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=9024bb989b2776014213c4e7577f9ba06e208403">[9024bb989b]</a> Naveen Albert -- app_mf, app_sf: Return -1 if channel hangs up.</li>
+</ul><br><h4>Category: Applications/app_dial</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-25716">ASTERISK-25716</a>: Documentation: Document explanations and examples for possible values of DIALSTATUS<br/>Reported by: Rusty Newton<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=a66b6647b296aac17713743541e54128bc761336">[a66b6647b2]</a> Naveen Albert -- app_dial: Document DIALSTATUS return values.</li>
+</ul><br><h4>Category: Applications/app_meetme</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29954">ASTERISK-29954</a>: app_meetme: Emit warning if conference not found<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=b2d5bd4cb8a76d01e0509f244fcb121783e43544">[b2d5bd4cb8]</a> Naveen Albert -- app_meetme: Emit warning if conference not found.</li>
+</ul><br><h4>Category: Codecs/codec_opus</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29980">ASTERISK-29980</a>: build: External binary modules don't use https<br/>Reported by: INVADE International Ltd.<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=2b636f376603bcd98fba44bb9f488337613ce40d">[2b636f3766]</a> Sean Bright -- download_externals: Use HTTPS for downloads</li>
+</ul><br><h4>Category: Core/BuildSystem</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29970">ASTERISK-29970</a>: Use pkg-config to find libxml2 headers and libraries<br/>Reported by: Hugh McMaster<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=b678624f0416388a41c9047f1bfcf9658403d3ac">[b678624f04]</a> Hugh McMaster -- configure.ac: Use pkg-config to detect libxml2</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29980">ASTERISK-29980</a>: build: External binary modules don't use https<br/>Reported by: INVADE International Ltd.<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=2b636f376603bcd98fba44bb9f488337613ce40d">[2b636f3766]</a> Sean Bright -- download_externals: Use HTTPS for downloads</li>
+</ul><br><h4>Category: Documentation</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-24827">ASTERISK-24827</a>: Missing documentation for chan_dahdi dial string ring cadences<br/>Reported by: Scott Griepentrog<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=085f33b7a363ffaaa749f5380580787895a846fd">[085f33b7a3]</a> Naveen Albert -- chan_dahdi: Document dial resource options.</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29940">ASTERISK-29940</a>: general: Add since tags to xmldocs<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=4aac359d79e1a59a83fd5b1b0e2ec06defa13218">[4aac359d79]</a> Naveen Albert -- documentation: Adds versioning information.</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29976">ASTERISK-29976</a>: Should Readme include information about install_prereq script?<br/>Reported by: Marcel Wagner<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=a893fdd90110562cbe31428909d0043a1699a802">[a893fdd901]</a> Marcel Wagner -- documentation: Add information on running install_prereq script in readme</li>
+</ul><a href="https://issues.asterisk.org/jira/browse/ASTERISK-25716">ASTERISK-25716</a>: Documentation: Document explanations and examples for possible values of DIALSTATUS<br/>Reported by: Rusty Newton<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=a66b6647b296aac17713743541e54128bc761336">[a66b6647b2]</a> Naveen Albert -- app_dial: Document DIALSTATUS return values.</li>
+</ul><br><h4>Category: PBX/General</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29967">ASTERISK-29967</a>: pbx_builtins: Add missing documentation<br/>Reported by: N A<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=b407511f024eb82ada81bc6083dd98e17e281167">[b407511f02]</a> Naveen Albert -- pbx_builtins: Add missing options documentation</li>
+</ul><br><h4>Category: Resources/NewFeature</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29726">ASTERISK-29726</a>: Add Asterisk External Application Protocol (AEAP) implementation<br/>Reported by: Kevin Harwell<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=2fb8667908a688a9b6568c7a51e5e20ad3b2d6d7">[2fb8667908]</a> Kevin Harwell -- res_aeap & res_speech_aeap: Add Asterisk External Application Protocol</li>
+</ul><br><h4>Category: Resources/res_pjsip</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29351">ASTERISK-29351</a>: Qualify pjproject 2.12 for Asterisk<br/>Reported by: George Joseph<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=e5e02f783d66c6ea10001934c9da20b11fa2effc">[e5e02f783d]</a> Joshua C. Colp -- pjproject: Update bundled to 2.12 release.</li>
+</ul><br><h4>Category: Resources/res_speech/NewFeature</h4><a href="https://issues.asterisk.org/jira/browse/ASTERISK-29726">ASTERISK-29726</a>: Add Asterisk External Application Protocol (AEAP) implementation<br/>Reported by: Kevin Harwell<ul>
+<li><a href="https://code.asterisk.org/code/changelog/asterisk?cs=2fb8667908a688a9b6568c7a51e5e20ad3b2d6d7">[2fb8667908]</a> Kevin Harwell -- res_aeap & res_speech_aeap: Add Asterisk External Application Protocol</li>
+</ul><br><hr><a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a><center><a href="#top">[Back to Top]</a></center><p>This is a list of all changes that went into this release that did not reference a JIRA issue.</p><table width="100%" border="1">
+<tr><th>Revision</th><th>Author</th><th>Summary</th></tr>
+<tr><td><a href="https://code.asterisk.org/code/changelog/asterisk?cs=4c4d11eb6c153301894bf469594bd7a7c444ee27">4c4d11eb6c</a></td><td>Asterisk Development Team</td><td>Update for 18.12.0-rc1</td></tr>
+<tr><td><a href="https://code.asterisk.org/code/changelog/asterisk?cs=efca7f4e8d932f9a1662d54cc53207edbe3106cc">efca7f4e8d</a></td><td>Asterisk Development Team</td><td>Update CHANGES and UPGRADE.txt for 18.12.0</td></tr>
+<tr><td><a href="https://code.asterisk.org/code/changelog/asterisk?cs=62f8e157fb3c693bb90e17a49afa6a7257e56485">62f8e157fb</a></td><td>Ben Ford</td><td>res_aeap: Add basic config skeleton and CLI commands.</td></tr>
+<tr><td><a href="https://code.asterisk.org/code/changelog/asterisk?cs=801317ae05ccbaea29183fa2c3bba5a5844ceda6">801317ae05</a></td><td>Asterisk Development Team</td><td>Update CHANGES and UPGRADE.txt for 18.11.2</td></tr>
+<tr><td><a href="https://code.asterisk.org/code/changelog/asterisk?cs=f325cb3d13b424d06b1b47d20cfc7cfbebca9a6a">f325cb3d13</a></td><td>Asterisk Development Team</td><td>Update CHANGES and UPGRADE.txt for 18.11.0</td></tr>
+<tr><td><a href="https://code.asterisk.org/code/changelog/asterisk?cs=777e9fde6748bc83b2a067a9dcf5cdb14a62f60e">777e9fde67</a></td><td>Sean Bright</td><td>openssl: Supress deprecation warnings from OpenSSL 3.0</td></tr>
+</table><hr><a name="diffstat"><h2 align="center">Diffstat Results</h2></a><center><a href="#top">[Back to Top]</a></center><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p><pre>asterisk-18.11.0-summary.html                                                                 |  147
+asterisk-18.11.0-summary.txt                                                                  |  381
+b/.version                                                                                    |    2
+b/CHANGES                                                                                     |   76
+b/ChangeLog                                                                                   |  910
+b/Makefile                                                                                    |    9
+b/README.md                                                                                   |    5
+b/UPGRADE.txt                                                                                 |   12
+b/apps/app_confbridge.c                                                                       |   22
+b/apps/app_dial.c                                                                             |   55
+b/apps/app_dtmfstore.c                                                                        |    5
+b/apps/app_meetme.c                                                                           |   18
+b/apps/app_mf.c                                                                               |   29
+b/apps/app_queue.c                                                                            |   38
+b/apps/app_sendtext.c                                                                         |    5
+b/apps/app_sf.c                                                                               |   39
+b/apps/app_waitforcond.c                                                                      |    5
+b/apps/confbridge/conf_config_parser.c                                                        |    7
+b/apps/confbridge/include/confbridge.h                                                        |    1
+b/asterisk-18.12.0-rc1-summary.html                                                           |  301
+b/asterisk-18.12.0-rc1-summary.txt                                                            |  715
+b/bridges/bridge_simple.c                                                                     |   21
+b/build_tools/download_externals                                                              |    2
+b/build_tools/make_xml_documentation                                                          |   42
+b/cdr/cdr_adaptive_odbc.c                                                                     |    1
+b/channels/chan_dahdi.c                                                                       |   59
+b/channels/chan_iax2.c                                                                        |   34
+b/channels/chan_pjsip.c                                                                       |   38
+b/channels/chan_sip.c                                                                         |   14
+b/channels/pjsip/dialplan_functions.c                                                         |   16
+b/codecs/codecs.xml                                                                           |   10
+b/configs/samples/aeap.conf.sample                                                            |   21
+b/configs/samples/chan_dahdi.conf.sample                                                      |    5
+b/configs/samples/confbridge.conf.sample                                                      |    6
+b/configs/samples/func_odbc.conf.sample                                                       |    4
+b/configs/samples/pjsip.conf.sample                                                           |   12
+b/configs/samples/queues.conf.sample                                                          |    3
+b/configs/samples/stir_shaken.conf.sample                                                     |   18
+b/configure                                                                                   |18310 +++++-----
+b/configure.ac                                                                                |    1
+b/contrib/ast-db-manage/config/versions/0bee61aa9425_allow_180_ringing_with_sdp.py            |   36
+b/contrib/realtime/mysql/mysql_config.sql                                                     |    6
+b/contrib/realtime/postgresql/postgresql_config.sql                                           |    6
+b/doc/asterisk.8                                                                              |    4
+b/funcs/func_channel.c                                                                        |    5
+b/funcs/func_db.c                                                                             |   72
+b/funcs/func_env.c                                                                            |   10
+b/funcs/func_evalexten.c                                                                      |  147
+b/funcs/func_frame_drop.c                                                                     |    5
+b/funcs/func_json.c                                                                           |    5
+b/funcs/func_math.c                                                                           |   15
+b/funcs/func_odbc.c                                                                           |   39
+b/funcs/func_sayfiles.c                                                                       |    5
+b/funcs/func_scramble.c                                                                       |    5
+b/funcs/func_strings.c                                                                        |    5
+b/funcs/func_talkdetect.c                                                                     |    3
+b/include/asterisk/config.h                                                                   |   13
+b/include/asterisk/pbx.h                                                                      |   19
+b/include/asterisk/res_aeap.h                                                                 |  370
+b/include/asterisk/res_aeap_message.h                                                         |  374
+b/include/asterisk/res_pjsip.h                                                                |    9
+b/include/asterisk/res_stir_shaken.h                                                          |   54
+b/include/asterisk/speech.h                                                                   |    6
+b/include/asterisk/time.h                                                                     |   20
+b/main/Makefile                                                                               |    1
+b/main/asterisk.c                                                                             |   53
+b/main/conversions.c                                                                          |    4
+b/main/core_unreal.c                                                                          |   31
+b/main/file.c                                                                                 |    6
+b/main/logger.c                                                                               |   15
+b/main/manager.c                                                                              |    8
+b/main/pbx.c                                                                                  |   79
+b/main/pbx_builtins.c                                                                         |    7
+b/main/pbx_variables.c                                                                        |   54
+b/main/time.c                                                                                 |   29
+b/menuselect/configure                                                                        | 3730 +-
+b/menuselect/configure.ac                                                                     |    2
+b/menuselect/menuselect.c                                                                     |   70
+b/res/Makefile                                                                                |    1
+b/res/res.xml                                                                                 |    2
+b/res/res_aeap.c                                                                              |  404
+b/res/res_aeap.exports.in                                                                     |    7
+b/res/res_aeap/aeap.c                                                                         |  501
+b/res/res_aeap/general.c                                                                      |   58
+b/res/res_aeap/general.h                                                                      |   41
+b/res/res_aeap/logger.h                                                                       |   60
+b/res/res_aeap/message.c                                                                      |  270
+b/res/res_aeap/message_json.c                                                                 |  191
+b/res/res_aeap/transaction.c                                                                  |  284
+b/res/res_aeap/transaction.h                                                                  |  123
+b/res/res_aeap/transport.c                                                                    |  156
+b/res/res_aeap/transport.h                                                                    |  209
+b/res/res_aeap/transport_websocket.c                                                          |  249
+b/res/res_aeap/transport_websocket.h                                                          |   34
+b/res/res_agi.c                                                                               |   10
+b/res/res_calendar_caldav.c                                                                   |    4
+b/res/res_calendar_icalendar.c                                                                |    4
+b/res/res_crypto.c                                                                            |    2
+b/res/res_http_media_cache.c                                                                  |    7
+b/res/res_odbc.c                                                                              |    4
+b/res/res_pjsip/config_global.c                                                               |   21
+b/res/res_pjsip/config_transport.c                                                            |    6
+b/res/res_pjsip/location.c                                                                    |    5
+b/res/res_pjsip/pjsip_config.xml                                                              |   20
+b/res/res_pjsip/pjsip_configuration.c                                                         |    1
+b/res/res_pjsip/pjsip_options.c                                                               |    4
+b/res/res_pjsip_header_funcs.c                                                                |    8
+b/res/res_pjsip_history.c                                                                     |   25
+b/res/res_pjsip_pubsub.c                                                                      |   19
+b/res/res_pjsip_registrar.c                                                                   |    5
+b/res/res_pjsip_sdp_rtp.c                                                                     |   48
+b/res/res_pjsip_stir_shaken.c                                                                 |   24
+b/res/res_rtp_asterisk.c                                                                      |    1
+b/res/res_speech.c                                                                            |   36
+b/res/res_speech_aeap.c                                                                       |  731
+b/res/res_stir_shaken.c                                                                       |   96
+b/res/res_stir_shaken/curl.c                                                                  |  177
+b/res/res_stir_shaken/curl.h                                                                  |    5
+b/res/res_stir_shaken/profile.c                                                               |  241
+b/res/res_stir_shaken/profile.h                                                               |   39
+b/res/res_stir_shaken/profile_private.h                                                       |   40
+b/res/res_stir_shaken/stir_shaken.c                                                           |   29
+b/res/res_stir_shaken/stir_shaken.h                                                           |    7
+b/res/res_tonedetect.c                                                                        |   15
+b/res/stasis_recording/stored.c                                                               |    6
+b/tests/test_aeap.c                                                                           |  252
+b/tests/test_aeap_speech.c                                                                    |  287
+b/tests/test_aeap_transaction.c                                                               |  179
+b/tests/test_aeap_transport.c                                                                 |  249
+b/tests/test_conversions.c                                                                    |   12
+b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch                         |   29
+b/third-party/pjproject/patches/0000-remove-third-party.patch                                 |   33
+b/third-party/pjproject/patches/0100-allow_multiple_auth_headers.patch                        |  413
+build_tools/get_sourceable_makeopts                                                           |   54
+third-party/pjproject/patches/0000-set_apps_initial_log_level.patch                           |   53
+third-party/pjproject/patches/0000-solaris.patch                                              |  135
+third-party/pjproject/patches/0011-sip_inv_patch.patch                                        |   39
+third-party/pjproject/patches/0020-pjlib_cancel_timer_0.patch                                 |   39
+third-party/pjproject/patches/0050-fix-race-parallel-build.patch                              |   72
+third-party/pjproject/patches/0060-clone-sdp-for-sip-timer-refresh-invite.patch               |   28
+third-party/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch           |   37
+third-party/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch                       |   33
+third-party/pjproject/patches/0090-Skip-unsupported-digest-algorithm-2408.patch               |  212
+third-party/pjproject/patches/0100-fix-double-stun-free.patch                                 |   82
+third-party/pjproject/patches/0110-tls-parent-listener-destroyed.patch                        |  166
+third-party/pjproject/patches/0111-ssl-premature-destroy.patch                                |  136
+third-party/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch |   32
+third-party/pjproject/patches/0130-sip_inv-Additional-multipart-support-2919-2920.patch       |  661
+third-party/pjproject/patches/0140-Fix-incorrect-unescaping-of-tokens-during-parsing-29.patch |  123
+third-party/pjproject/patches/0150-Create-generic-pjsip_hdr_find-functions.patch              |  176
+third-party/pjproject/patches/0160-Additional-multipart-improvements.patch                    |  644
+third-party/pjproject/patches/0170-stun-integer-underflow.patch                               |   26
+third-party/pjproject/patches/0171-dialog-set-free.patch                                      |  114
+third-party/pjproject/patches/0172-prevent-multipart-oob.patch                                |   22
+154 files changed, 21655 insertions(+), 13634 deletions(-)</pre><br></html>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/asterisk-18.12.0-summary.txt asterisk-18.12.0~dfsg+~cs6.12.40431413/asterisk-18.12.0-summary.txt
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/asterisk-18.12.0-summary.txt	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/asterisk-18.12.0-summary.txt	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,716 @@
+                                Release Summary
+
+                                asterisk-18.12.0
+
+                                Date: 2022-05-12
+
+                           <asteriskteam@digium.com>
+
+     ----------------------------------------------------------------------
+
+                               Table of Contents
+
+    1. Summary
+    2. Contributors
+    3. Closed Issues
+    4. Other Changes
+    5. Diffstat
+
+     ----------------------------------------------------------------------
+
+                                    Summary
+
+                                 [Back to Top]
+
+   This release is a point release of an existing major version. The changes
+   included were made to address problems that have been identified in this
+   release series, or are minor, backwards compatible new features or
+   improvements. Users should be able to safely upgrade to this version if
+   this release series is already in use. Users considering upgrading from a
+   previous version are strongly encouraged to review the UPGRADE.txt
+   document as well as the CHANGES document for information about upgrading
+   to this release series.
+
+   The data in this summary reflects changes that have been made since the
+   previous release, asterisk-18.11.0.
+
+     ----------------------------------------------------------------------
+
+                                  Contributors
+
+                                 [Back to Top]
+
+   This table lists the people who have submitted code, those that have
+   tested patches, as well as those that reported issues on the issue tracker
+   that were resolved in this release. For coders, the number is how many of
+   their patches (of any size) were committed into this release. For testers,
+   the number is the number of times their name was listed as assisting with
+   testing a patch. Finally, for reporters, the number is the number of
+   issues that they reported that were affected by commits that went into
+   this release.
+
+   Coders                              Testers    Reporters                   
+   22 Naveen Albert                               18 N A                      
+   6 Joshua C. Colp                               3 Mark Petersen             
+   5 Sean Bright                                  2 Rusty Newton              
+   4 Asterisk Development Team                    2 Michael Auracher          
+   4 Ben Ford                                     2 George Joseph             
+   3 Mark Petersen                                2 Michael Auracher          
+   2 Kevin Harwell                                1 Michael Cargile           
+   2 Philip Prindeville                           1 Andre Heider              
+   2 George Joseph                                1 Alexei Gradinari          
+   2 Maximilian Fridrich                          1 Daniel Bonazzi            
+   1 Birger Harzenetter (license 5870)            1 Claude Diderich           
+   1 Alexei Gradinari                             1 Scott Griepentrog         
+   1 Michael Cargile                              1 Arix                      
+   1 Hugh McMaster                                1 Stefan Ruijsenaars        
+   1 Boris P. Korzun                              1 Benjamin Keith Ford       
+   1 Yury Kirsanov                                1 LA                        
+   1 Marcel Wagner                                1 Josh Hogan                
+                                                  1 Ross Beer                 
+                                                  1 Boris P. Korzun           
+                                                  1 Marcel Wagner             
+                                                  1 INVADE International Ltd. 
+                                                  1 Leandro Dardini           
+                                                  1 Yury Kirsanov             
+                                                  1 Clint Ruoho               
+                                                  1 Jim Van Meggelen          
+                                                  1 Stefan Ruijsenaars        
+                                                  1 Tzafrir Cohen             
+                                                  1 Hugh McMaster             
+                                                  1 Jonathan Harris           
+                                                  1 David Herselman           
+                                                  1 Dmitriy Serov             
+                                                  1 Philip Prindeville        
+                                                  1 Gregory Massel            
+                                                  1 Jasper Hafkenscheid       
+                                                  1 Kevin Harwell             
+                                                  1 Josh Alberts              
+                                                  1 Sebastian Gutierrez       
+
+     ----------------------------------------------------------------------
+
+                                 Closed Issues
+
+                                 [Back to Top]
+
+   This is a list of all issues from the issue tracker that were closed by
+   changes that went into this release.
+
+  Security
+
+    Category: Functions/func_odbc
+
+   ASTERISK-29838: ${SQL_ESC()} not correctly escaping a terminating \
+   Reported by: Leandro Dardini
+     * [39cd09c246] Joshua C. Colp -- func_odbc: Add SQL_ESC_BACKSLASHES
+       dialplan function.
+
+    Category: Resources/res_stir_shaken
+
+   ASTERISK-29476: res_stir_shaken: Blind SSRF vulnerabilities
+   Reported by: Clint Ruoho
+     * [11accf8064] Ben Ford -- AST-2022-002 - res_stir_shaken/curl: Add ACL
+       checks for Identity header.
+   ASTERISK-29872: res_stir_shaken: Resource exhaustion with large files
+   Reported by: Benjamin Keith Ford
+     * [33091c2659] Ben Ford -- AST-2022-001 - res_stir_shaken/curl: Limit
+       file size and check start.
+
+  New Feature
+
+    Category: Applications/app_confbridge
+
+   ASTERISK-29931: Option to allow a user to not hear the join sound on enter
+   but everyone else can
+   Reported by: Michael Cargile
+     * [216a55408e] Michael Cargile -- apps/confbridge: Added
+       hear_own_join_sound option to control who hears sound_join
+
+    Category: Applications/app_queue
+
+   ASTERISK-29876: app_queue: Add music on hold option
+   Reported by: N A
+     * [b7edc08e33] Naveen Albert -- app_queue: Add music on hold option to
+       Queue.
+
+    Category: Channels/chan_pjsip
+
+   ASTERISK-29941: chan_pjsip: Add ability to send flash events
+   Reported by: N A
+     * [8bc6d42a27] Naveen Albert -- chan_pjsip: Add ability to send flash
+       events.
+
+    Category: Functions/General
+
+   ASTERISK-29820: cli: Add command to evaluate a function
+   Reported by: N A
+     * [3686a97d79] Naveen Albert -- cli: Add command to evaluate dialplan
+       functions.
+
+    Category: Functions/NewFeature
+
+   ASTERISK-29486: Hint-like extension value lookup function without device
+   state
+   Reported by: N A
+     * [79689d9df8] Naveen Albert -- func_evalexten: Extension evaluation
+       function.
+
+    Category: Functions/func_db
+
+   ASTERISK-29968: func_db: Add a function to return cardinality of keys at
+   prefix
+   Reported by: N A
+     * [ce00f8758d] Naveen Albert -- func_db: Add function to return
+       cardinality at prefix
+
+  Bug
+
+    Category: Applications/app_meetme
+
+   ASTERISK-30002: app_meetme: Don't erroneously set global variables when
+   channel is NULL
+   Reported by: N A
+     * [ff70b2aac6] Naveen Albert -- app_meetme: Don't erroneously set global
+       variables.
+
+    Category: Bridges/bridge_simple
+
+   ASTERISK-29253: Incorrect bridging on transfer
+   Reported by: Yury Kirsanov
+     * [6ac08fdcf8] Yury Kirsanov -- bridge_simple.c: Unhold channels on join
+       simple bridge.
+
+    Category: CDR/cdr_adaptive_odbc
+
+   ASTERISK-30023: cdr_adaptive_odbc: does not support DATETIME database
+   columns
+   Reported by: Gregory Massel
+     * [ec8ab44b7f] Joshua C. Colp -- cdr_adaptive_odbc: Add support for
+       SQL_DATETIME field type.
+
+    Category: Channels/chan_dahdi
+
+   ASTERISK-28518: chan_dahdi: Caller ID FSK Erroneously Sent when Picking Up
+   Dahdi Call On Hold
+   Reported by: Josh Alberts
+     * [a4f04666b5] Naveen Albert -- chan_dahdi: Don't allow MWI FSK if
+       channel not idle.
+   ASTERISK-29990: chan_dahdi: adding ring cadences is not idempotent on
+   dahdi restart
+   Reported by: N A
+     * [cb53ad5671] Naveen Albert -- chan_dahdi: Don't append cadences on
+       dahdi restart.
+   ASTERISK-29994: chan_dahdi: Round robin array size is too small for max
+   number of groups
+   Reported by: N A
+     * [dd15cd049f] Naveen Albert -- chan_dahdi: Fix insufficient array size
+       for round robin.
+
+    Category: Channels/chan_iax2
+
+   ASTERISK-30007: chan_iax2: Prevent crashes due to attempted encryption
+   with missing secrets
+   Reported by: N A
+     * [9dc321cbcb] Naveen Albert -- chan_iax2: Prevent crash if dialing
+       RSA-only call without outkey.
+   ASTERISK-29895: chan_iax2: Fix misaligned spacing in iax2 show netstats
+   printout
+   Reported by: N A
+     * [d9e55250dd] Birger Harzenetter -- chan_iax2: Fix spacing in netstats
+       command
+   ASTERISK-29048: chan_iax2: "iax2 show registry" shows host for perceived
+   Reported by: David Herselman
+     * [97c499ee34] Naveen Albert -- chan_iax2: Fix perceived showing host
+       address.
+
+    Category: Channels/chan_pjsip
+
+   ASTERISK-29842: Do not change 180 Ringing to 183 Progress even if
+   early_media already enabled
+   Reported by: Mark Petersen
+     * [16e59db514] Mark Petersen -- chan_pjsip: add
+       allow_sending_180_after_183 option
+   ASTERISK-30006: res_pjsip: UDP transport does not work when
+   async_operations is greater than 1
+   Reported by: Ross Beer
+     * [09e8667fa5] Joshua C. Colp -- res_pjsip: Always set async_operations
+       to 1.
+
+    Category: Channels/chan_sip/General
+
+   ASTERISK-29843: Session timers get removed on UPDATE
+   Reported by: Mark Petersen
+     * [bb2102a991] Mark Petersen -- chan_sip.c Session timers get removed on
+       UPDATE
+   ASTERISK-29955: chan_sip: SIP route header is missing on UPDATE
+   Reported by: Mark Petersen
+     * [4f7e3d1609] Mark Petersen -- chan_sip: SIP route header is missing on
+       UPDATE
+
+    Category: Channels/chan_sip/Transfers
+
+   ASTERISK-29955: chan_sip: SIP route header is missing on UPDATE
+   Reported by: Mark Petersen
+     * [4f7e3d1609] Mark Petersen -- chan_sip: SIP route header is missing on
+       UPDATE
+
+    Category: Channels/chan_vpb
+
+   ASTERISK-30021: ast_variable_list_replace_variable uses variable with new
+   keyword
+   Reported by: Jasper Hafkenscheid
+     * [2587e58e05] Sean Bright -- config.h: Don't use C++ keywords as
+       argument names.
+
+    Category: Core/BuildSystem
+
+   ASTERISK-29986: build: Asterisk 18.11.0 doesn't compile when wget isn't
+   available
+   Reported by: Stefan Ruijsenaars
+     * [dd704bbba5] George Joseph -- make_xml_documentation: Remove usage of
+       get_sourceable_makeopts
+   ASTERISK-29988: REGRESSION: The build process is requiring xmllint or
+   xmlstarlet ro be installed when it shouldn't
+   Reported by: George Joseph
+     * [2d3297d4f3] George Joseph -- Makefile: Disable XML doc validation
+
+    Category: Core/FileFormatInterface
+
+   ASTERISK-29943: file.c: seeking to negative file offset is not prevented
+   Reported by: N A
+     * [ea02bc3685] Naveen Albert -- file.c: Prevent formats from seeking
+       negative offsets.
+
+    Category: Core/General
+
+   ASTERISK-29948: iostream: Infinite TCP timeout writing data
+   Reported by: N A
+     * [ae1373d12d] Joshua C. Colp -- manager: Terminate session on write
+       error.
+   ASTERISK-29674: Adjust for 64bit time_t
+   Reported by: Andre Heider
+     * [f50e793665] Philip Prindeville -- time: add support for time64 libcs
+
+    Category: Core/Logging
+
+   ASTERISK-22246: Asterisk's "T" flag is ignored when used with "r" or "R"
+   flags. (documentation bug)
+   Reported by: Rusty Newton
+     * [09e989f972] Naveen Albert -- asterisk.c: Warn of incompatibilities
+       with remote console.
+   ASTERISK-29928: logging messages truncated when using MUSL runtime
+   Reported by: Philip Prindeville
+     * [140c19c206] Philip Prindeville -- logger: workaround woefully small
+       BUFSIZ in MUSL
+
+    Category: Core/Netsock
+
+   ASTERISK-29948: iostream: Infinite TCP timeout writing data
+   Reported by: N A
+     * [ae1373d12d] Joshua C. Colp -- manager: Terminate session on write
+       error.
+
+    Category: Core/PBX
+
+   ASTERISK-26719: pbx: Only up to 127 includes in a dialplan context
+   (AST_PBX_MAX_STACK - 1)
+   Reported by: Tzafrir Cohen
+     * [bd69639a6b] Naveen Albert -- pbx.c: Warn if there are too many
+       includes in a context.
+
+    Category: Documentation
+
+   ASTERISK-29939: agi: Fix xmldoc bug with set music
+   Reported by: N A
+     * [dc129b6951] Naveen Albert -- res_agi: Fix xmldocs bug with set music.
+   ASTERISK-28891: documentation: AGICommand_set+music documentation
+   arguments displayed incorreclty
+   Reported by: Jonathan Harris
+     * [dc129b6951] Naveen Albert -- res_agi: Fix xmldocs bug with set music.
+
+    Category: General
+
+   ASTERISK-29728: menuselect: Disabled by default modules that are enabled
+   are always recompiled
+   Reported by: N A
+     * [b4c17c2044] Naveen Albert -- menuselect: Don't erroneously recompile
+       modules.
+   ASTERISK-22246: Asterisk's "T" flag is ignored when used with "r" or "R"
+   flags. (documentation bug)
+   Reported by: Rusty Newton
+     * [09e989f972] Naveen Albert -- asterisk.c: Warn of incompatibilities
+       with remote console.
+   ASTERISK-26582: Asterisk seems to ignore the "n" parameter for "disable
+   console colorization"
+   Reported by: Sebastian Gutierrez
+     * [09e989f972] Naveen Albert -- asterisk.c: Warn of incompatibilities
+       with remote console.
+
+    Category: PBX/General
+
+   ASTERISK-29950: SayNumber can handle '01' to '07', but not '08' or '09'
+   Reported by: Jim Van Meggelen
+     * [81a990b8d2] Sean Bright -- conversions.c: Specify that we only want
+       to parse decimal numbers.
+
+    Category: Resources/res_ari_recordings
+
+   ASTERISK-29960: ari: Retrieving stored recording can returns wrong file
+   Reported by: Arix
+     * [3a7d83087b] Sean Bright -- stasis_recording: Perform a complete match
+       on requested filename.
+
+    Category: Resources/res_pjsip_nat
+
+   ASTERISK-29411: Crash in pjsip_msg_find_hdr_by_name
+   Reported by: LA
+     * [ec5b449bcf] Kevin Harwell -- res_pjsip_header_funcs: wrong pool used
+       tdata headers
+
+    Category: Resources/res_pjsip_pubsub
+
+   ASTERISK-29961: RLS: domain part of 'uri' list attribute mismatch with
+   SUBSCRIBE request
+   Reported by: Alexei Gradinari
+     * [96a3ff9edd] Alexei Gradinari -- res_pjsip_pubsub: RLS 'uri' list
+       attribute mismatch with SUBSCRIBE request
+
+    Category: Resources/res_pjsip_sdp_rtp
+
+   ASTERISK-26689: res_pjsip_sdp_rtp: 183 Session in Progress. Disconnecting
+   channel for lack of RTP activity
+   Reported by: Dmitriy Serov
+     * [82dbfe7783] Boris P. Korzun -- res_pjsip_sdp_rtp: Improve detecting
+       of lack of RTP activity
+   ASTERISK-29929: res_pjsip_sdp_rtp: Disconnecting channel for lack of RTP
+   activity in one way sessions
+   Reported by: Boris P. Korzun
+     * [82dbfe7783] Boris P. Korzun -- res_pjsip_sdp_rtp: Improve detecting
+       of lack of RTP activity
+
+    Category: Resources/res_pjsip_session
+
+   ASTERISK-29655: res_pjsip_session: No video to caller if no camera
+   available
+   Reported by: Michael Auracher
+     * [1e6991f95e] Maximilian Fridrich -- core_unreal: Flip stream direction
+       of second channel.
+     * [37829b4461] Maximilian Fridrich -- app_dial: Flip stream direction of
+       outgoing channel.
+   ASTERISK-29638: res_pjsip_session: No video after early media
+   Reported by: Michael Auracher
+     * [1e6991f95e] Maximilian Fridrich -- core_unreal: Flip stream direction
+       of second channel.
+     * [37829b4461] Maximilian Fridrich -- app_dial: Flip stream direction of
+       outgoing channel.
+
+    Category: Resources/res_stir_shaken
+
+   ASTERISK-30024: Failed to sign STIR/SHAKEN payload with functionality not
+   enabled
+   Reported by: Claude Diderich
+     * [40f4268f2d] Ben Ford -- res_pjsip_stir_shaken.c: Fix enabled when not
+       configured.
+
+    Category: pjproject/pjsip
+
+   ASTERISK-30015: pjsip / WebRTC: Chrome creating large number of SDP
+   attributes
+   Reported by: Josh Hogan
+     * [8500210611] Joshua C. Colp -- pjsip: Increase maximum number of
+       format attributes.
+   ASTERISK-29535: Segmentation fault in libasteriskpj.so.2
+   Reported by: Daniel Bonazzi
+     * [ec5b449bcf] Kevin Harwell -- res_pjsip_header_funcs: wrong pool used
+       tdata headers
+
+  Improvement
+
+    Category: Applications/General
+
+   ASTERISK-29951: app_mf, app_sf: Return -1 on hangup
+   Reported by: N A
+     * [9024bb989b] Naveen Albert -- app_mf, app_sf: Return -1 if channel
+       hangs up.
+
+    Category: Applications/app_dial
+
+   ASTERISK-25716: Documentation: Document explanations and examples for
+   possible values of DIALSTATUS
+   Reported by: Rusty Newton
+     * [a66b6647b2] Naveen Albert -- app_dial: Document DIALSTATUS return
+       values.
+
+    Category: Applications/app_meetme
+
+   ASTERISK-29954: app_meetme: Emit warning if conference not found
+   Reported by: N A
+     * [b2d5bd4cb8] Naveen Albert -- app_meetme: Emit warning if conference
+       not found.
+
+    Category: Codecs/codec_opus
+
+   ASTERISK-29980: build: External binary modules don't use https
+   Reported by: INVADE International Ltd.
+     * [2b636f3766] Sean Bright -- download_externals: Use HTTPS for
+       downloads
+
+    Category: Core/BuildSystem
+
+   ASTERISK-29970: Use pkg-config to find libxml2 headers and libraries
+   Reported by: Hugh McMaster
+     * [b678624f04] Hugh McMaster -- configure.ac: Use pkg-config to detect
+       libxml2
+   ASTERISK-29980: build: External binary modules don't use https
+   Reported by: INVADE International Ltd.
+     * [2b636f3766] Sean Bright -- download_externals: Use HTTPS for
+       downloads
+
+    Category: Documentation
+
+   ASTERISK-24827: Missing documentation for chan_dahdi dial string ring
+   cadences
+   Reported by: Scott Griepentrog
+     * [085f33b7a3] Naveen Albert -- chan_dahdi: Document dial resource
+       options.
+   ASTERISK-29940: general: Add since tags to xmldocs
+   Reported by: N A
+     * [4aac359d79] Naveen Albert -- documentation: Adds versioning
+       information.
+   ASTERISK-29976: Should Readme include information about install_prereq
+   script?
+   Reported by: Marcel Wagner
+     * [a893fdd901] Marcel Wagner -- documentation: Add information on
+       running install_prereq script in readme
+   ASTERISK-25716: Documentation: Document explanations and examples for
+   possible values of DIALSTATUS
+   Reported by: Rusty Newton
+     * [a66b6647b2] Naveen Albert -- app_dial: Document DIALSTATUS return
+       values.
+
+    Category: PBX/General
+
+   ASTERISK-29967: pbx_builtins: Add missing documentation
+   Reported by: N A
+     * [b407511f02] Naveen Albert -- pbx_builtins: Add missing options
+       documentation
+
+    Category: Resources/NewFeature
+
+   ASTERISK-29726: Add Asterisk External Application Protocol (AEAP)
+   implementation
+   Reported by: Kevin Harwell
+     * [2fb8667908] Kevin Harwell -- res_aeap & res_speech_aeap: Add Asterisk
+       External Application Protocol
+
+    Category: Resources/res_pjsip
+
+   ASTERISK-29351: Qualify pjproject 2.12 for Asterisk
+   Reported by: George Joseph
+     * [e5e02f783d] Joshua C. Colp -- pjproject: Update bundled to 2.12
+       release.
+
+    Category: Resources/res_speech/NewFeature
+
+   ASTERISK-29726: Add Asterisk External Application Protocol (AEAP)
+   implementation
+   Reported by: Kevin Harwell
+     * [2fb8667908] Kevin Harwell -- res_aeap & res_speech_aeap: Add Asterisk
+       External Application Protocol
+
+     ----------------------------------------------------------------------
+
+                      Commits Not Associated with an Issue
+
+                                 [Back to Top]
+
+   This is a list of all changes that went into this release that did not
+   reference a JIRA issue.
+
+   +------------------------------------------------------------------------+
+   | Revision   | Author               | Summary                            |
+   |------------+----------------------+------------------------------------|
+   | 4c4d11eb6c | Asterisk Development | Update for 18.12.0-rc1             |
+   |            | Team                 |                                    |
+   |------------+----------------------+------------------------------------|
+   | efca7f4e8d | Asterisk Development | Update CHANGES and UPGRADE.txt for |
+   |            | Team                 | 18.12.0                            |
+   |------------+----------------------+------------------------------------|
+   | 62f8e157fb | Ben Ford             | res_aeap: Add basic config         |
+   |            |                      | skeleton and CLI commands.         |
+   |------------+----------------------+------------------------------------|
+   | 801317ae05 | Asterisk Development | Update CHANGES and UPGRADE.txt for |
+   |            | Team                 | 18.11.2                            |
+   |------------+----------------------+------------------------------------|
+   | f325cb3d13 | Asterisk Development | Update CHANGES and UPGRADE.txt for |
+   |            | Team                 | 18.11.0                            |
+   |------------+----------------------+------------------------------------|
+   | 777e9fde67 | Sean Bright          | openssl: Supress deprecation       |
+   |            |                      | warnings from OpenSSL 3.0          |
+   +------------------------------------------------------------------------+
+
+     ----------------------------------------------------------------------
+
+                                Diffstat Results
+
+                                 [Back to Top]
+
+   This is a summary of the changes to the source code that went into this
+   release that was generated using the diffstat utility.
+
+ asterisk-18.11.0-summary.html                                                                 |  147
+ asterisk-18.11.0-summary.txt                                                                  |  381
+ b/.version                                                                                    |    2
+ b/CHANGES                                                                                     |   76
+ b/ChangeLog                                                                                   |  910
+ b/Makefile                                                                                    |    9
+ b/README.md                                                                                   |    5
+ b/UPGRADE.txt                                                                                 |   12
+ b/apps/app_confbridge.c                                                                       |   22
+ b/apps/app_dial.c                                                                             |   55
+ b/apps/app_dtmfstore.c                                                                        |    5
+ b/apps/app_meetme.c                                                                           |   18
+ b/apps/app_mf.c                                                                               |   29
+ b/apps/app_queue.c                                                                            |   38
+ b/apps/app_sendtext.c                                                                         |    5
+ b/apps/app_sf.c                                                                               |   39
+ b/apps/app_waitforcond.c                                                                      |    5
+ b/apps/confbridge/conf_config_parser.c                                                        |    7
+ b/apps/confbridge/include/confbridge.h                                                        |    1
+ b/asterisk-18.12.0-rc1-summary.html                                                           |  301
+ b/asterisk-18.12.0-rc1-summary.txt                                                            |  715
+ b/bridges/bridge_simple.c                                                                     |   21
+ b/build_tools/download_externals                                                              |    2
+ b/build_tools/make_xml_documentation                                                          |   42
+ b/cdr/cdr_adaptive_odbc.c                                                                     |    1
+ b/channels/chan_dahdi.c                                                                       |   59
+ b/channels/chan_iax2.c                                                                        |   34
+ b/channels/chan_pjsip.c                                                                       |   38
+ b/channels/chan_sip.c                                                                         |   14
+ b/channels/pjsip/dialplan_functions.c                                                         |   16
+ b/codecs/codecs.xml                                                                           |   10
+ b/configs/samples/aeap.conf.sample                                                            |   21
+ b/configs/samples/chan_dahdi.conf.sample                                                      |    5
+ b/configs/samples/confbridge.conf.sample                                                      |    6
+ b/configs/samples/func_odbc.conf.sample                                                       |    4
+ b/configs/samples/pjsip.conf.sample                                                           |   12
+ b/configs/samples/queues.conf.sample                                                          |    3
+ b/configs/samples/stir_shaken.conf.sample                                                     |   18
+ b/configure                                                                                   |18310 +++++-----
+ b/configure.ac                                                                                |    1
+ b/contrib/ast-db-manage/config/versions/0bee61aa9425_allow_180_ringing_with_sdp.py            |   36
+ b/contrib/realtime/mysql/mysql_config.sql                                                     |    6
+ b/contrib/realtime/postgresql/postgresql_config.sql                                           |    6
+ b/doc/asterisk.8                                                                              |    4
+ b/funcs/func_channel.c                                                                        |    5
+ b/funcs/func_db.c                                                                             |   72
+ b/funcs/func_env.c                                                                            |   10
+ b/funcs/func_evalexten.c                                                                      |  147
+ b/funcs/func_frame_drop.c                                                                     |    5
+ b/funcs/func_json.c                                                                           |    5
+ b/funcs/func_math.c                                                                           |   15
+ b/funcs/func_odbc.c                                                                           |   39
+ b/funcs/func_sayfiles.c                                                                       |    5
+ b/funcs/func_scramble.c                                                                       |    5
+ b/funcs/func_strings.c                                                                        |    5
+ b/funcs/func_talkdetect.c                                                                     |    3
+ b/include/asterisk/config.h                                                                   |   13
+ b/include/asterisk/pbx.h                                                                      |   19
+ b/include/asterisk/res_aeap.h                                                                 |  370
+ b/include/asterisk/res_aeap_message.h                                                         |  374
+ b/include/asterisk/res_pjsip.h                                                                |    9
+ b/include/asterisk/res_stir_shaken.h                                                          |   54
+ b/include/asterisk/speech.h                                                                   |    6
+ b/include/asterisk/time.h                                                                     |   20
+ b/main/Makefile                                                                               |    1
+ b/main/asterisk.c                                                                             |   53
+ b/main/conversions.c                                                                          |    4
+ b/main/core_unreal.c                                                                          |   31
+ b/main/file.c                                                                                 |    6
+ b/main/logger.c                                                                               |   15
+ b/main/manager.c                                                                              |    8
+ b/main/pbx.c                                                                                  |   79
+ b/main/pbx_builtins.c                                                                         |    7
+ b/main/pbx_variables.c                                                                        |   54
+ b/main/time.c                                                                                 |   29
+ b/menuselect/configure                                                                        | 3730 +-
+ b/menuselect/configure.ac                                                                     |    2
+ b/menuselect/menuselect.c                                                                     |   70
+ b/res/Makefile                                                                                |    1
+ b/res/res.xml                                                                                 |    2
+ b/res/res_aeap.c                                                                              |  404
+ b/res/res_aeap.exports.in                                                                     |    7
+ b/res/res_aeap/aeap.c                                                                         |  501
+ b/res/res_aeap/general.c                                                                      |   58
+ b/res/res_aeap/general.h                                                                      |   41
+ b/res/res_aeap/logger.h                                                                       |   60
+ b/res/res_aeap/message.c                                                                      |  270
+ b/res/res_aeap/message_json.c                                                                 |  191
+ b/res/res_aeap/transaction.c                                                                  |  284
+ b/res/res_aeap/transaction.h                                                                  |  123
+ b/res/res_aeap/transport.c                                                                    |  156
+ b/res/res_aeap/transport.h                                                                    |  209
+ b/res/res_aeap/transport_websocket.c                                                          |  249
+ b/res/res_aeap/transport_websocket.h                                                          |   34
+ b/res/res_agi.c                                                                               |   10
+ b/res/res_calendar_caldav.c                                                                   |    4
+ b/res/res_calendar_icalendar.c                                                                |    4
+ b/res/res_crypto.c                                                                            |    2
+ b/res/res_http_media_cache.c                                                                  |    7
+ b/res/res_odbc.c                                                                              |    4
+ b/res/res_pjsip/config_global.c                                                               |   21
+ b/res/res_pjsip/config_transport.c                                                            |    6
+ b/res/res_pjsip/location.c                                                                    |    5
+ b/res/res_pjsip/pjsip_config.xml                                                              |   20
+ b/res/res_pjsip/pjsip_configuration.c                                                         |    1
+ b/res/res_pjsip/pjsip_options.c                                                               |    4
+ b/res/res_pjsip_header_funcs.c                                                                |    8
+ b/res/res_pjsip_history.c                                                                     |   25
+ b/res/res_pjsip_pubsub.c                                                                      |   19
+ b/res/res_pjsip_registrar.c                                                                   |    5
+ b/res/res_pjsip_sdp_rtp.c                                                                     |   48
+ b/res/res_pjsip_stir_shaken.c                                                                 |   24
+ b/res/res_rtp_asterisk.c                                                                      |    1
+ b/res/res_speech.c                                                                            |   36
+ b/res/res_speech_aeap.c                                                                       |  731
+ b/res/res_stir_shaken.c                                                                       |   96
+ b/res/res_stir_shaken/curl.c                                                                  |  177
+ b/res/res_stir_shaken/curl.h                                                                  |    5
+ b/res/res_stir_shaken/profile.c                                                               |  241
+ b/res/res_stir_shaken/profile.h                                                               |   39
+ b/res/res_stir_shaken/profile_private.h                                                       |   40
+ b/res/res_stir_shaken/stir_shaken.c                                                           |   29
+ b/res/res_stir_shaken/stir_shaken.h                                                           |    7
+ b/res/res_tonedetect.c                                                                        |   15
+ b/res/stasis_recording/stored.c                                                               |    6
+ b/tests/test_aeap.c                                                                           |  252
+ b/tests/test_aeap_speech.c                                                                    |  287
+ b/tests/test_aeap_transaction.c                                                               |  179
+ b/tests/test_aeap_transport.c                                                                 |  249
+ b/tests/test_conversions.c                                                                    |   12
+ b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch                         |   29
+ b/third-party/pjproject/patches/0000-remove-third-party.patch                                 |   33
+ b/third-party/pjproject/patches/0100-allow_multiple_auth_headers.patch                        |  413
+ build_tools/get_sourceable_makeopts                                                           |   54
+ third-party/pjproject/patches/0000-set_apps_initial_log_level.patch                           |   53
+ third-party/pjproject/patches/0000-solaris.patch                                              |  135
+ third-party/pjproject/patches/0011-sip_inv_patch.patch                                        |   39
+ third-party/pjproject/patches/0020-pjlib_cancel_timer_0.patch                                 |   39
+ third-party/pjproject/patches/0050-fix-race-parallel-build.patch                              |   72
+ third-party/pjproject/patches/0060-clone-sdp-for-sip-timer-refresh-invite.patch               |   28
+ third-party/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch           |   37
+ third-party/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch                       |   33
+ third-party/pjproject/patches/0090-Skip-unsupported-digest-algorithm-2408.patch               |  212
+ third-party/pjproject/patches/0100-fix-double-stun-free.patch                                 |   82
+ third-party/pjproject/patches/0110-tls-parent-listener-destroyed.patch                        |  166
+ third-party/pjproject/patches/0111-ssl-premature-destroy.patch                                |  136
+ third-party/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch |   32
+ third-party/pjproject/patches/0130-sip_inv-Additional-multipart-support-2919-2920.patch       |  661
+ third-party/pjproject/patches/0140-Fix-incorrect-unescaping-of-tokens-during-parsing-29.patch |  123
+ third-party/pjproject/patches/0150-Create-generic-pjsip_hdr_find-functions.patch              |  176
+ third-party/pjproject/patches/0160-Additional-multipart-improvements.patch                    |  644
+ third-party/pjproject/patches/0170-stun-integer-underflow.patch                               |   26
+ third-party/pjproject/patches/0171-dialog-set-free.patch                                      |  114
+ third-party/pjproject/patches/0172-prevent-multipart-oob.patch                                |   22
+ 154 files changed, 21655 insertions(+), 13634 deletions(-)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/bridges/bridge_simple.c asterisk-18.12.0~dfsg+~cs6.12.40431413/bridges/bridge_simple.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/bridges/bridge_simple.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/bridges/bridge_simple.c	2022-05-12 11:50:59.000000000 +0000
@@ -128,6 +128,7 @@
 	struct ast_stream_topology *new_top;
 	struct ast_channel *c0 = AST_LIST_FIRST(&bridge->channels)->chan;
 	struct ast_channel *c1 = AST_LIST_LAST(&bridge->channels)->chan;
+	int unhold_c0, unhold_c1;
 
 	/*
 	 * If this is the first channel we can't make it compatible...
@@ -152,9 +153,29 @@
 		SWAP(c0, c1);
 	}
 	new_top = simple_bridge_request_stream_topology_update(existing_top, req_top);
+
+	/* The ast_channel_hold_state() and ast_channel_name() accessors need to be
+	 * called with the associated channel lock held.
+	 */
+	if ((unhold_c1 = ast_channel_hold_state(c1) == AST_CONTROL_HOLD)) {
+		ast_debug(1, "Channel %s simulating UNHOLD for bridge simple join.\n", ast_channel_name(c1));
+	}
+
+	if ((unhold_c0 = ast_channel_hold_state(c0) == AST_CONTROL_HOLD)) {
+		ast_debug(1, "Channel %s simulating UNHOLD for bridge simple join.\n", ast_channel_name(c0));
+	}
+
 	ast_channel_unlock(c0);
 	ast_channel_unlock(c1);
 
+	if (unhold_c1) {
+		ast_indicate(c1, AST_CONTROL_UNHOLD);
+	}
+
+	if (unhold_c0) {
+		ast_indicate(c0, AST_CONTROL_UNHOLD);
+	}
+
 	if (!new_top) {
 		/* Failure.  We'll just have to live with the current topology. */
 		return 0;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/build_tools/download_externals asterisk-18.12.0~dfsg+~cs6.12.40431413/build_tools/download_externals
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/build_tools/download_externals	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/build_tools/download_externals	2022-05-12 11:50:59.000000000 +0000
@@ -109,7 +109,7 @@
 		remote_url="${remote_url}/asterisk-${major_version}/x86-${host_bits}"
 	else
 		directory_name=$(${XMLSTARLET} sel -t -v "/menu/category/member[@name = '${member_name}']/member_data/downloader/@directory_name" ${ASTTOPDIR}/menuselect-tree || :)
-		remote_url="http://downloads.digium.com/pub/telephony/${directory_name:-${module_name}}/asterisk-${major_version}/x86-${host_bits}"
+		remote_url="https://downloads.digium.com/pub/telephony/${directory_name:-${module_name}}/asterisk-${major_version}/x86-${host_bits}"
 	fi
 fi
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/cdr/cdr_adaptive_odbc.c asterisk-18.12.0~dfsg+~cs6.12.40431413/cdr/cdr_adaptive_odbc.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/cdr/cdr_adaptive_odbc.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/cdr/cdr_adaptive_odbc.c	2022-05-12 11:50:59.000000000 +0000
@@ -564,6 +564,7 @@
 					break;
 				case SQL_TYPE_TIMESTAMP:
 				case SQL_TIMESTAMP:
+				case SQL_DATETIME:
 					if (ast_strlen_zero(colptr)) {
 						continue;
 					} else {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/ChangeLog asterisk-18.12.0~dfsg+~cs6.12.40431413/ChangeLog
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/ChangeLog	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/ChangeLog	2022-05-12 11:50:59.000000000 +0000
@@ -1,19 +1,510 @@
-2022-04-14 21:53 +0000  Asterisk Development Team <asteriskteam@digium.com>
+2022-05-12 11:50 +0000  Asterisk Development Team <asteriskteam@digium.com>
 
-	* asterisk 18.11.2 Released.
+	* asterisk 18.12.0 Released.
 
-2022-04-14 16:37 +0000 [94eac3c13c]  Asterisk Development Team <asteriskteam@digium.com>
+2022-05-05 14:28 +0000  Asterisk Development Team <asteriskteam@digium.com>
 
-	* Doing a fresh summary
+	* asterisk 18.12.0-rc1 Released.
 
-2022-04-14 16:00 +0000 [3ca29c9554]  Asterisk Development Team <asteriskteam@digium.com>
+2022-05-05 09:14 +0000 [efca7f4e8d]  Asterisk Development Team <asteriskteam@digium.com>
 
-	* Update for 18.11.2
+	* Update CHANGES and UPGRADE.txt for 18.12.0
+2022-04-29 03:47 +0000 [1e6991f95e]  Maximilian Fridrich <m.fridrich@commend.com>
 
-2022-04-14 15:47 +0000 [1422d098e7]  Asterisk Development Team <asteriskteam@digium.com>
+	* core_unreal: Flip stream direction of second channel.
+
+	  When a new unreal (local) channel is created, a second (;2) channel is
+	  created as a counterpart which clones the topology of the first
+	  channel. This creates issues when an outgoing stream is sendonly or
+	  recvonly as the stream state of the inbound channel will be the same
+	  as the stream state of the outbound channel.
+
+	  Now the stream state is flipped for the streams of the 2nd channel in
+	  ast_unreal_new_channels if the outgoing stream topology is recvonly or
+	  sendonly.
+
+	  ASTERISK-29655
+	  Reported by: Michael Auracher
+
+	  ASTERISK-29638
+	  Reported by: Michael Auracher
+
+	  Change-Id: I0cea29635bb20b7bf7fd0fb95498cd44dab98fbf
+
+2022-03-27 07:33 +0000 [085f33b7a3]  Naveen Albert <asterisk@phreaknet.org>
+
+	* chan_dahdi: Document dial resource options.
+
+	  Documents the Dial syntax for DAHDI, namely the channel group,
+	  distinctive ring, answer confirmation, and digital call options
+	  that are specified in the resource itself.
+
+	  ASTERISK-24827 #close
+
+	  Change-Id: Ib95e78497fb00dc5cbfde1c93a69f034bfd08c30
+
+2022-03-29 18:47 +0000 [a4f04666b5]  Naveen Albert <asterisk@phreaknet.org>
+
+	* chan_dahdi: Don't allow MWI FSK if channel not idle.
+
+	  For lines that have mailboxes configured on them, with
+	  FSK MWI, DAHDI will periodically try to dispatch FSK
+	  to update MWI. However, this is never supposed to be
+	  done when a channel is not idle.
+
+	  There is currently an edge case where MWI FSK can
+	  extraneously get spooled for the channel if a caller
+	  hook flashes and hangs up, which triggers a recall ring.
+	  After one ring, the on hook time threshold in this if
+	  condition has been satisfied and an MWI update is spooled.
+	  This means that when the phone is picked up again, the
+	  answerer gets an FSK spill before being reconnected to
+	  the party on hold.
+
+	  To prevent this, we now explicitly check to ensure that
+	  subchannel 0 has no owner. There is no owner when DAHDI
+	  channels are idle, but if the channel is "in use" in some
+	  way (such as in the aforementioned scenario), then there
+	  is an owner, and we shouldn't process MWI at this time.
+
+	  ASTERISK-28518 #close
+
+	  Change-Id: Ia3904434fd81688d71742f7e84358b7e1c38e92a
+
+2022-02-23 10:29 +0000 [216a55408e]  Michael Cargile <mikec@vicidial.com>
+
+	* apps/confbridge: Added hear_own_join_sound option to control who hears sound_join
+
+	  Added the hear_own_join_sound option to the confbridge user profile to
+	  control who hears the sound_join audio file. When set to 'yes' the user
+	  entering the conference and the participants already in the conference
+	  will hear the sound_join audio file. When set to 'no' the user entering
+	  the conference will not hear the sound_join audio file, but the
+	  participants already in the conference will hear the sound_join audio
+	  file.
+
+	  ASTERISK-29931
+	  Added by Michael Cargile
+
+	  Change-Id: I856bd66dc0dfa057323860a6418c1371d249abd2
+
+2022-03-27 06:23 +0000 [cb53ad5671]  Naveen Albert <asterisk@phreaknet.org>
+
+	* chan_dahdi: Don't append cadences on dahdi restart.
+
+	  Currently, if any custom ring cadences are specified, they are
+	  appended to the array of cadences from wherever we left off
+	  last time. This works properly the first time, but on subsequent
+	  dahdi restarts, it means that the existing cadences are left
+	  alone and (most likely) the same cadences are then re-added
+	  afterwards. In short order, the cadence array gets maxed out
+	  and the user begins seeing warnings that the array is full
+	  and no more cadences may be added.
+
+	  This buggy behavior persists until Asterisk is completely
+	  restarted; however, if and when dahdi restart is run again,
+	  then the same problem is reintroduced.
+
+	  This fixes this behavior so that cadence parsing is more
+	  idempotent, that is so running dahdi restart multiple times
+	  starts adding cadences from the beginning, rather than from
+	  wherever the last cadence was added.
+
+	  As before, it is still not possible to revert to the default
+	  cadences by simply removing all cadences in this manner, nor
+	  is it possible to delete existing cadences. However, this
+	  does make it possible to update existing cadences, which
+	  was not possible before, and also ensures that the cadences
+	  remain unchanged if the config remains unchanged.
+
+	  ASTERISK-29990 #close
+
+	  Change-Id: Ie32ea3e8a243b766756b1afce684d4a31ee7421d
+
+2022-04-02 16:22 +0000 [9dc321cbcb]  Naveen Albert <asterisk@phreaknet.org>
+
+	* chan_iax2: Prevent crash if dialing RSA-only call without outkey.
+
+	  Currently, if attempting to place a call to a peer that only allows
+	  RSA authentication, if we fail to provide an outkey when placing
+	  the call, Asterisk will crash.
+
+	  This exposes the broader issue that IAX2 is prone to causing a crash
+	  if encryption or decryption is attempted but we never initialized
+	  the encryption and decryption keys. In other words, if the logic
+	  to use encryption in chan_iax2 is not perfectly aligned with the
+	  decision to build keys in the first place, then a crash is not
+	  only possible but probable. This was demonstrated by ASTERISK_29264,
+	  for instance.
+
+	  This permanently prevents such events from causing a crash by explicitly
+	  checking that keys are initialized properly before setting the flags
+	  to use encryption for the call. Instead of crashing, the call will
+	  now abort.
+
+	  ASTERISK-30007 #close
+
+	  Change-Id: If925c3d86099ceac7f621804f2532baac5050c9a
+
+2022-02-05 09:03 +0000 [b4c17c2044]  Naveen Albert <asterisk@phreaknet.org>
+
+	* menuselect: Don't erroneously recompile modules.
+
+	  A bug in menuselect can cause modules that are disabled
+	  by default to be recompiled every time a recompilation
+	  occurs. This occurs for module categories that are NOT
+	  positive output, as for these categories, the modules
+	  contained in the makeopts file indicate modules which
+	  should NOT be selected. The existing procedure of iterating
+	  through these modules to mark modules as present is thus
+	  insufficient. This has led to modules with a default_enabled
+	  tag of "no" to get deleted and recompiled every time, even
+	  when they haven't changed.
+
+	  To fix this, we now modify the mark as present behavior
+	  for module categories that are not positive output. For
+	  these, we start by iterating through the module tree
+	  and marking all modules as present, then go back and
+	  mark anything contained in the makeopts file as not
+	  present. This ensures that makeopt selections are actually
+	  used properly, regardless of whether a module category
+	  uses positive output or not.
+
+	  ASTERISK-29728 #close
+
+	  Change-Id: Idf2974c4ed8d0ba3738a92f08a6082b234277b95
+
+2022-03-31 10:44 +0000 [ff70b2aac6]  Naveen Albert <asterisk@phreaknet.org>
+
+	* app_meetme: Don't erroneously set global variables.
+
+	  The admin_exec function in app_meetme is used by the SLA
+	  applications for internal bridging. However, in these cases,
+	  chan is NULL. Currently, this function will set some status
+	  variables that are intended for a channel, but since channel
+	  is NULL, this is erroneously creating meaningless global
+	  variables, which shouldn't be happening. This sets these
+	  variables only if chan is not NULL.
+
+	  ASTERISK-30002 #close
+
+	  Change-Id: I817df6c26f5bda131678e56791b0b61ba64fc6f7
+
+2022-03-14 20:41 +0000 [ce00f8758d]  Naveen Albert <asterisk@phreaknet.org>
+
+	* func_db: Add function to return cardinality at prefix
+
+	  Adds the DB_KEYCOUNT function, which can be used to retrieve
+	  the number of keys at a given prefix in AstDB.
+
+	  ASTERISK-29968 #close
+
+	  Change-Id: Ib2393b77b7e962dbaae6192f8576bc3f6ba92d09
+
+2022-03-29 19:22 +0000 [dd15cd049f]  Naveen Albert <asterisk@phreaknet.org>
+
+	* chan_dahdi: Fix insufficient array size for round robin.
+
+	  According to chan_dahdi.conf, up to 64 groups (numbered
+	  0 through 63) can be used when dialing DAHDI channels.
+
+	  However, currently dialing round robin with a group number
+	  greater than 31 fails because the array for the round robin
+	  structure is only size 32, instead of 64 as it should be.
+
+	  This fixes that so the round robin array size is consistent
+	  with the actual groups capacity.
+
+	  ASTERISK-29994
+
+	  Change-Id: I4caa08d7025f78ac75a0539f71aaf3eb3e85b3b7
+
+2022-03-05 05:43 +0000 [09e989f972]  Naveen Albert <asterisk@phreaknet.org>
+
+	* asterisk.c: Warn of incompatibilities with remote console.
+
+	  Some command line options to Asterisk only apply when Asterisk
+	  is started and cannot be used with remote console mode. If a
+	  user tries to use any of these, they are currently simply
+	  silently ignored.
+
+	  This prints out a warning if incompatible options are used,
+	  informing users that an option used cannot be used with remote
+	  console mode. Additionally, some clarifications are added to
+	  the help text and man page.
+
+	  ASTERISK-22246
+	  ASTERISK-26582
+
+	  Change-Id: I980a5380ef2c19e8ea348596396d5382893c4337
+
+2021-06-21 07:49 +0000 [79689d9df8]  Naveen Albert <asterisk@phreaknet.org>
+
+	* func_evalexten: Extension evaluation function.
+
+	  This adds the EVAL_EXTEN function, which may be used to retrieve
+	  the variable-substituted data at any extension.
+
+	  ASTERISK-29486
+
+	  Change-Id: Iad81019689674c9f4ac77d235f5d7234adbb1432
+
+2022-02-25 14:58 +0000 [4aac359d79]  Naveen Albert <asterisk@phreaknet.org>
+
+	* documentation: Adds versioning information.
+
+	  Adds version information for applications, functions,
+	  and manager events/actions.
+
+	  This is not completely exhaustive by any means but
+	  covers most new things added that have release
+	  versioning information in the issue tracker.
+
+	  ASTERISK-29940 #close
+
+	  Change-Id: I506401e93c799715dbbe97c0a8ba18af2bf5e131
+
+2022-02-26 03:07 +0000 [bb2102a991]  Mark Petersen <bugs.digium.com@zombie.dk>
+
+	* chan_sip.c Session timers get removed on UPDATE
+
+	  If Asterisk receives a SIP REFER with Session-Timers UAC
+	  maintain Session-Timers when sending UPDATE"
+
+	  ASTERISK-29843
+
+	  Change-Id: I8e9a21c13bf757fa34d778f49ba3cf859b29ae5c
+
+2022-02-28 19:29 +0000 [ea02bc3685]  Naveen Albert <asterisk@phreaknet.org>
+
+	* file.c: Prevent formats from seeking negative offsets.
+
+	  Currently, if a user uses an application like ControlPlayback
+	  to try to rewind a file past the beginning, this can throw
+	  warnings when the file format (e.g. PCM) tries to seek to
+	  a negative offset.
+
+	  Instead of letting file formats try (and fail) to seek a
+	  negative offset, we instead now catch this in the rewind
+	  function to ensure that we never seek an offset less than 0.
+	  This prevents legitimate user actions from triggering warnings
+	  from any particular file formats.
+
+	  ASTERISK-29943 #close
+
+	  Change-Id: Ia53f2623f57898f4b8e5c894b968b01e95426967
+
+2022-02-26 06:37 +0000 [8bc6d42a27]  Naveen Albert <asterisk@phreaknet.org>
+
+	* chan_pjsip: Add ability to send flash events.
+
+	  PJSIP currently is capable of receiving flash events
+	  and converting them to FLASH control frames, but it
+	  currently lacks support for doing the reverse: taking
+	  a FLASH control frame and converting it into a flash
+	  event in the SIP domain.
+
+	  This adds the ability for PJSIP to process flash control
+	  frames by converting them into the appropriate SIP INFO
+	  message, which can then be sent to the peer. This allows,
+	  for example, flash events to be sent between Asterisk
+	  systems using PJSIP.
+
+	  ASTERISK-29941 #close
+
+	  Change-Id: I1590221a4d238597f79672fa5825dd4a920c94dd
+
+2021-12-26 15:39 +0000 [3686a97d79]  Naveen Albert <asterisk@phreaknet.org>
+
+	* cli: Add command to evaluate dialplan functions.
+
+	  Adds the dialplan eval function commands to evaluate a dialplan
+	  function from the CLI. The return value and function result are
+	  printed out and can be used for testing or debugging.
+
+	  ASTERISK-29820 #close
+
+	  Change-Id: I833e97ea54c49336aca145330a2adeebfad05209
+
+2022-03-07 08:11 +0000 [4f7e3d1609]  Mark Petersen <bugs.digium.com@zombie.dk>
+
+	* chan_sip: SIP route header is missing on UPDATE
+
+	  if Asterisk need to send an UPDATE before answer
+	  on a channel that uses Record-Route:
+	  it will not include a Route header
+
+	  ASTERISK-29955
+
+	  Change-Id: Id1920ecbfea7739a038b14dc94487ecfe7b57eef
+
+2022-02-21 07:23 +0000 [16e59db514]  Mark Petersen <bugs.digium.com@zombie.dk>
+
+	* chan_pjsip: add allow_sending_180_after_183 option
+
+	  added new global config option "allow_sending_180_after_183"
+	  that if enabled will preserve 180 after a 183
+
+	  ASTERISK-29842
+
+	  Change-Id: I8a53f8c35595b6d16d8e86e241b5f110d92f3d18
+
+2022-04-25 18:39 +0000 [ae1373d12d]  Joshua C. Colp <jcolp@sangoma.com>
+
+	* manager: Terminate session on write error.
+
+	  On a write error to an AMI session a flag was set to
+	  indicate that the write error had occurred, with the
+	  expected result being that the session be terminated.
+	  This was not actually happening and instead writing
+	  would continue to be attempted.
+
+	  This change adds a check for the write error and causes
+	  the session to actually terminate.
+
+	  ASTERISK-29948
+
+	  Change-Id: Icaf5d413d4c0d5dc78292a17287fecc8720a31a5
+
+2021-06-18 12:54 +0000 [2fb8667908]  Kevin Harwell <kharwell@sangoma.com>
+
+	* res_aeap & res_speech_aeap: Add Asterisk External Application Protocol
+
+	  Add framework to connect to, and read and write protocol based
+	  messages from and to an external application using an Asterisk
+	  External Application Protocol (AEAP). This has been divided into
+	  several abstractions:
+
+	   1. transport - base communication layer (currently websocket only)
+	   2. message - AEAP description and data (currently JSON only)
+	   3. transaction - links/binds requests and responses
+	   4. aeap - transport, message, and transaction handler/manager
+
+	  This patch also adds an AEAP implementation for speech to text.
+	  Existing speech API callbacks for speech to text have been completed
+	  making it possible for Asterisk to connect to a configured external
+	  translator service and provide audio for STT. Results can also be
+	  received from the external translator, and made available as speech
+	  results in Asterisk.
+
+	  Unit tests have also been created that test the AEAP framework, and
+	  also the speech to text implementation.
+
+	  ASTERISK-29726 #close
+
+	  Change-Id: Iaa4b259f84aa63501e5fd2a6fb107f900b4d4ed2
+
+2022-04-21 09:10 +0000 [6ac08fdcf8]  Yury Kirsanov <y.kirsanov@gmail.com>
+
+	* bridge_simple.c: Unhold channels on join simple bridge.
+
+	  Patch provided inline by Yury Kirsanov on the linked issue and
+	  approved by Josh Colp.
+
+	  ASTERISK-29253 #close
+
+	  Change-Id: I5b9ccc67ebf06e875ed061d9e7fc21f47b0a4e1f
+
+2021-03-29 12:28 +0000 [62f8e157fb]  Ben Ford <bford@digium.com>
+
+	* res_aeap: Add basic config skeleton and CLI commands.
+
+	  Added support for a basic AEAP configuration read from aeap.conf.
+	  Also added 2 CLI commands for showing individual configurations as
+	  well as all of them: aeap show server <id> and aeap show servers.
+
+	  Only one configuration option is required at the moment, and that one is
+	  server_url. It must be a websocket URL. The other option, codecs, is
+	  optional and will be used over the codecs specified on the endpoint if
+	  provided.
+
+	  https://wiki.asterisk.org/wiki/pages/viewpage.action?pageId=45482453
+
+	  Change-Id: I567ac5148c92b98d29d2ad83421b416b75ffdaa3
+	  (cherry picked from commit 45a1977de49f56de5875a2cde951780de146762d)
+
+2022-04-06 05:23 +0000 [09e8667fa5]  Joshua C. Colp <jcolp@sangoma.com>
+
+	* res_pjsip: Always set async_operations to 1.
+
+	  The async_operations setting on a transport configures how
+	  many simultaneous incoming packets the transport can handle
+	  when multiple threads are polling and waiting on the transport.
+	  As we only use a single thread this was needlessly creating
+	  incoming packets when set to a non-default value, wasting memory.
+
+	  ASTERISK-30006
+
+	  Change-Id: I1915973ef352862dc2852a6ba4cfce2ed536e68f
+
+2022-04-21 10:26 +0000 [40f4268f2d]  Ben Ford <bford@digium.com>
+
+	* res_pjsip_stir_shaken.c: Fix enabled when not configured.
+
+	  There was an issue with the conditional where STIR/SHAKEN would be
+	  enabled even when not configured. It has been changed to ensure that if
+	  a profile does not exist and stir_shaken is not set in pjsip.conf, then
+	  the conditional will return from the function without performing
+	  STIR/SHAKEN operations.
+
+	  ASTERISK-30024
+
+	  Change-Id: I41286a3d35b033ccbfbe4129427a62cb793a86e6
+
+2022-04-13 08:12 +0000 [37829b4461]  Maximilian Fridrich <m.fridrich@commend.com>
+
+	* app_dial: Flip stream direction of outgoing channel.
+
+	  When executing dial, the topology of the incoming channel is cloned and
+	  used for the outgoing channel. This creates issues when an incoming
+	  stream is sendonly or recvonly as the stream state of the outgoing
+	  channel will be the same as the stream state of the incoming channel.
+
+	  Now the stream state is flipped for the outgoing stream in
+	  dial_exec_full if the incoming stream topology is recvonly or sendonly.
+
+	  ASTERISK-29655
+	  Reported by: Michael Auracher
+
+	  ASTERISK-29638
+	  Reported by: Michael Auracher
+
+	  Change-Id: I294dc834ac9a5f048b101b691669959e9df630e1
+
+2022-04-19 10:36 +0000 [2587e58e05]  Sean Bright <sean.bright@gmail.com>
+
+	* config.h: Don't use C++ keywords as argument names.
+
+	  ASTERISK-30021 #close
+
+	  Change-Id: I70eb59b782a4946b979942e21422746b7563029c
+
+2022-04-20 07:40 +0000 [ec8ab44b7f]  Joshua C. Colp <jcolp@sangoma.com>
+
+	* cdr_adaptive_odbc: Add support for SQL_DATETIME field type.
+
+	  ASTERISK-30023
+
+	  Change-Id: I0e1697f6af044e9eab7e07bbaeeffd1bb68ac34a
+
+2022-04-11 04:30 +0000 [8500210611]  Joshua C. Colp <jcolp@sangoma.com>
+
+	* pjsip: Increase maximum number of format attributes.
+
+	  Chrome has added more attributes, causing the limit to be
+	  exceeded. This raises it up some more.
+
+	  ASTERISK-30015
+
+	  Change-Id: I964957c005c4e6f7871b15ea1ccd9b4659c7ef32
+
+2022-04-14 15:47 +0000 [801317ae05]  Asterisk Development Team <asteriskteam@digium.com>
 
 	* Update CHANGES and UPGRADE.txt for 18.11.2
-2022-02-28 11:19 +0000 [353142a2b4]  Ben Ford <bford@digium.com>
+2022-03-17 10:23 +0000 [f325cb3d13]  Asterisk Development Team <asteriskteam@digium.com>
+
+	* Update CHANGES and UPGRADE.txt for 18.11.0
+2022-02-28 11:19 +0000 [11accf8064]  Ben Ford <bford@digium.com>
 
 	* AST-2022-002 - res_stir_shaken/curl: Add ACL checks for Identity header.
 
@@ -32,19 +523,7 @@
 
 	  Change-Id: I87fa61f78a9ea0cd42530691a30da3c781842406
 
-2022-01-07 08:50 +0000 [1fdb1a6edf]  Ben Ford <bford@digium.com>
-
-	* AST-2022-001 - res_stir_shaken/curl: Limit file size and check start.
-
-	  Put checks in place to limit how much we will actually download, as well
-	  as a check for the data we receive at the start to ensure it begins with
-	  what we would expect a certificate to begin with.
-
-	  ASTERISK-29872
-
-	  Change-Id: Ifd3c6b8bd52b8b6192a04166ccce4fc8a8000b46
-
-2022-02-10 06:02 +0000 [88522c22aa]  Joshua C. Colp <jcolp@sangoma.com>
+2022-02-10 06:02 +0000 [39cd09c246]  Joshua C. Colp <jcolp@sangoma.com>
 
 	* func_odbc: Add SQL_ESC_BACKSLASHES dialplan function.
 
@@ -63,11 +542,142 @@
 
 	  Change-Id: I152bf34899b96ddb09cca3e767254d8d78f0c83d
 
-2022-03-29 21:46 +0000  Asterisk Development Team <asteriskteam@digium.com>
+2022-01-07 08:50 +0000 [33091c2659]  Ben Ford <bford@digium.com>
+
+	* AST-2022-001 - res_stir_shaken/curl: Limit file size and check start.
+
+	  Put checks in place to limit how much we will actually download, as well
+	  as a check for the data we receive at the start to ensure it begins with
+	  what we would expect a certificate to begin with.
+
+	  ASTERISK-29872
+
+	  Change-Id: Ifd3c6b8bd52b8b6192a04166ccce4fc8a8000b46
+
+2022-03-04 19:41 +0000 [9024bb989b]  Naveen Albert <asterisk@phreaknet.org>
+
+	* app_mf, app_sf: Return -1 if channel hangs up.
+
+	  The ReceiveMF and ReceiveSF applications currently always
+	  return 0, even if a channel has hung up. The call will still
+	  end but generally applications are expected to return -1 if
+	  the channel has hung up.
+
+	  We now return -1 if a hangup occured to bring this behavior
+	  in line with this norm. This has no functional impact, but
+	  merely increases conformity with how these modules interact
+	  with the PBX core.
+
+	  ASTERISK-29951 #close
+
+	  Change-Id: I234d755050ab8ed58f197c6925b968ba26b14033
+
+2022-01-22 09:53 +0000 [b7edc08e33]  Naveen Albert <asterisk@phreaknet.org>
+
+	* app_queue: Add music on hold option to Queue.
+
+	  Adds the m option to the Queue application, which allows a
+	  music on hold class to be specified at runtime which will
+	  override the class configured in queues.conf.
+
+	  This option functions like the m option to Dial.
+
+	  ASTERISK-29876 #close
+
+	  Change-Id: Ie25a48569cf8755c305c9438b1ed292c3adcf8d7
+
+2022-03-05 09:40 +0000 [b2d5bd4cb8]  Naveen Albert <asterisk@phreaknet.org>
+
+	* app_meetme: Emit warning if conference not found.
+
+	  Currently, if a user tries to access a non-dynamic
+	  MeetMe conference and the conference is not found,
+	  the call simply silent hangs up. There is no indication
+	  to the user that anything went wrong at all.
+
+	  This changes the relevant debug message to a warning
+	  so that the user is notified of this invalidity.
+
+	  ASTERISK-29954 #close
+
+	  Change-Id: Iebcfae3755d00f2150d676ee211c57bc59530048
+
+2022-02-22 14:51 +0000 [82dbfe7783]  Boris P. Korzun <drtr0jan@yandex.ru>
+
+	* res_pjsip_sdp_rtp: Improve detecting of lack of RTP activity
+
+	  Change RTP timer behavior for detecting RTP only after two-way
+	  SDP channel establishment. Ignore detecting after receiving 183
+	  with SDP or while direct media is used.
+	  Make rtp_timeout and rtp_timeout_hold options consistent to rtptimeout
+	  and rtpholdtimeout options in chan_sip.
+
+	  ASTERISK-26689 #close
+	  ASTERISK-29929 #close
+
+	  Change-Id: I07326d5b9c40f25db717fd6075f6f3a8d77279eb
+
+2022-02-24 11:48 +0000 [e5e02f783d]  Joshua C. Colp <jcolp@sangoma.com>
+
+	* pjproject: Update bundled to 2.12 release.
+
+	  This change removes patches which have been merged into
+	  upstream and updates some existing ones. It also adds
+	  some additional config_site.h changes to restore previous
+	  behavior, as well as a patch to allow multiple Authorization
+	  headers. There seems to be some confusion or disagreement
+	  on language in RFC 8760 in regards to whether multiple
+	  Authorization headers are supported. The RFC implies it
+	  is allowed, as does some past sipcore discussion. There is
+	  also the catch all of "local policy" to allow it. In
+	  the case of Asterisk we allow it.
+
+	  ASTERISK-29351
+
+	  Change-Id: Id39ece02dedb7b9f739e0e37ea47d76854af7191
+
+2022-03-23 17:45 +0000 [ec5b449bcf]  Kevin Harwell <kharwell@sangoma.com>
+
+	* res_pjsip_header_funcs: wrong pool used tdata headers
+
+	  When adding headers to an outgoing request the headers were cloned using
+	  the dialog's pool when they should have been cloned using tdata's pool.
+	  Under certain circumstances it was possible for the dialog object, and
+	  its pool to be freed while tdata is still active and available. Thus the
+	  cloned header "disappeared", and when tdata tried to later access it a
+	  crash would occur.
+
+	  This patch makes it so all added headers are cloned appropriately using
+	  tdata's pool.
+
+	  ASTERISK-29411 #close
+	  ASTERISK-29535 #close
+
+	  Change-Id: I9852025b5ee93ce1c038209150ee9dba1e0767c5
+
+2022-03-05 10:26 +0000 [bd69639a6b]  Naveen Albert <asterisk@phreaknet.org>
+
+	* pbx.c: Warn if there are too many includes in a context.
+
+	  The PBX core uses the stack when it comes to includes, which
+	  means that a context can only contain strictly fewer than
+	  AST_PBX_MAX_STACK includes. If this is exceeded, then warnings
+	  will be emitted for each number of includes beyond this if
+	  searching for an extension in the including context, and if
+	  the extension's inclusion is beyond the stack size, it will
+	  simply not be found.
+
+	  To address this, we now check if there are too many includes
+	  in a context when the dialplan is reloaded so that if there
+	  is an issue, the user is aware of at "compile time" as opposed
+	  to "run time" only. Secondly, more details are printed out
+	  when this message is encountered so it's clear what has happened.
+
+	  ASTERISK-26719
 
-	* asterisk 18.11.1 Released.
+	  Change-Id: Ia3700452e75a7af3391b3e82ee69f06a669f8958
 
-2022-03-25 09:33 +0000 [663b565647]  George Joseph <gjoseph@digium.com>
+2022-03-25 09:33 +0000 [dd704bbba5]  George Joseph <gjoseph@digium.com>
 
 	* make_xml_documentation: Remove usage of get_sourceable_makeopts
 
@@ -81,7 +691,7 @@
 
 	  Change-Id: Idf2a90902228c2558daa5be7a4f8327556099cd2
 
-2022-03-25 14:00 +0000 [99fa792482]  George Joseph <gjoseph@digium.com>
+2022-03-25 14:00 +0000 [2d3297d4f3]  George Joseph <gjoseph@digium.com>
 
 	* Makefile:  Disable XML doc validation
 
@@ -96,9 +706,211 @@
 
 	  Change-Id: Idc6c44114e7dd3fadae183a4e22f4fdba0b8a645
 
-2022-03-24 13:12 +0000  Asterisk Development Team <asteriskteam@digium.com>
+2022-02-04 18:36 +0000 [d9e55250dd]  Birger Harzenetter (license 5870)
+
+	* chan_iax2: Fix spacing in netstats command
+
+	  The iax2 show netstats command previously didn't contain
+	  enough spacing in the header to properly align the table
+	  header with the table body. This caused column headers
+	  to not align with the values on longer channel names.
+
+	  Some spacing is added to account for the longest channel
+	  names that display (before truncation occurs) so that
+	  columns are always properly aligned.
+
+	  ASTERISK-29895 #close
+	  patches:
+	    61205_misaligned2.patch submitted by Birger Harzenetter (license 5870)
+
+	  Change-Id: I450ce6bb81157b9d6d149007e53b749f237b6d9f
+
+2022-03-23 16:04 +0000 [a893fdd901]  Marcel Wagner <mwagner@sipgate.de>
+
+	* documentation: Add information on running install_prereq script in readme
+
+	  Adding information in the readme about running the install_preqreq script to install components that the ./configure script might indicate as missing.
+
+	  ASTERISK-29976 #close
+
+	  Change-Id: Ic287b46300168729838bddd8f9265e98fc22bce6
+
+2022-03-25 08:19 +0000 [777e9fde67]  Sean Bright <sean.bright@gmail.com>
+
+	* openssl: Supress deprecation warnings from OpenSSL 3.0
+
+	  There is work going on to update our OpenSSL usage to avoid the
+	  deprecated functions but in the meantime make it possible to compile
+	  in devmode.
+
+	  Change-Id: Ib082eb8b3751f0185d8aa8fe127da664c93f0726
+
+2022-02-25 11:01 +0000 [dc129b6951]  Naveen Albert <asterisk@phreaknet.org>
+
+	* res_agi: Fix xmldocs bug with set music.
+
+	  The XML documentation for the SET MUSIC AGI
+	  command is invalid, as the parameter does not
+	  have a name and the on/off enum options for
+	  the on/off argument are listed separately, which
+	  is incorrect. The cumulative effect of these currently
+	  is that the Asterisk Wiki documentation for SET MUSIC
+	  is broken and external documentation generators crash
+	  on SET MUSIC due to the malformed documentation.
+
+	  These issues are corrected so that the documentation
+	  can be successfully parsed as with other similar AGI
+	  commands.
+
+	  ASTERISK-29939 #close
+	  ASTERISK-28891 #close
+
+	  Change-Id: I8c3d59897531bcbc401cbc7b00c9e2829dcb35f8
+	  (cherry picked from commit 37ece75677bff5655f0a3fb4dbda2b7c4847bc50)
+
+2022-03-13 12:46 +0000 [97c499ee34]  Naveen Albert <asterisk@phreaknet.org>
+
+	* chan_iax2: Fix perceived showing host address.
+
+	  ASTERISK_22025 introduced a regression that shows
+	  the host IP and port as the perceived IP and port
+	  again, as opposed to showing the actual perceived
+	  address. This fixes this by showing the correct
+	  information.
+
+	  ASTERISK-29048 #close
+
+	  Change-Id: I0ad3e25bc6b449e83ce72ea5d1a1cdba72aa304a
+
+2022-03-15 06:56 +0000 [b678624f04]  Hugh McMaster <hugh.mcmaster@outlook.com>
+
+	* configure.ac: Use pkg-config to detect libxml2
+
+	  Use pkg-config to detect libxml2, falling back to xml2-config if the
+	  former is not available.
+
+	  This patch ensures Asterisk continues to build on systems without
+	  xml2-config installed.
+
+	  The patch also updates the associated 'configure' files.
+
+	  ASTERISK-29970 #close
+
+	  Change-Id: I3c90dfe0b0590486cbb8e6d426a7c5c4199410c0
+
+2022-02-13 13:06 +0000 [f50e793665]  Philip Prindeville <philipp@redfish-solutions.com>
+
+	* time: add support for time64 libcs
+
+	  Treat time_t's as entirely unique and use the POSIX API's for
+	  converting to/from strings.
+
+	  Lastly, a 64-bit integer formats as 20 digits at most in base10.
+	  Don't need to have any 100 byte buffers to hold that.
+
+	  ASTERISK-29674 #close
+
+	  Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
+	  Change-Id: Id7b25bdca8f92e34229f6454f6c3e500f2cd6f56
+
+2022-03-15 12:24 +0000 [96a3ff9edd]  Alexei Gradinari <alex2grad@gmail.com>
+
+	* res_pjsip_pubsub: RLS 'uri' list attribute mismatch with SUBSCRIBE request
+
+	  When asterisk generates the RLMI part of NOTIFY request,
+	  the asterisk uses the local contact uri instead of the URI to which
+	  the SUBSCRIBE request is sent.
+	  Because of this mismatch some IP phones (for example Cisco 5XX) ignore
+	  this list.
+
+	  According
+	  https://datatracker.ietf.org/doc/html/rfc4662#section-5.2
+	    The first mandatory <list> attribute is "uri", which contains the uri
+	    that corresponds to the list. Typically, this is the URI to which
+	    the SUBSCRIBE request was sent.
+	  https://datatracker.ietf.org/doc/html/rfc4662#section-5.3
+	    The "uri" attribute identifies the resource to which the <resource>
+	    element corresponds. Typically, this will be a SIP URI that, if
+	    subscribed to, would return the state of the resource.
+
+	  This patch makes asterisk to generate URI using SUBSCRIBE request URI.
+
+	  ASTERISK-29961 #close
+
+	  Change-Id: I1fcfc08fd589677f40608c59a4e143c45ee05f6c
+
+2022-02-21 19:05 +0000 [140c19c206]  Philip Prindeville <philipp@redfish-solutions.com>
+
+	* logger: workaround woefully small BUFSIZ in MUSL
+
+	  MUSL defines BUFSIZ as 1024 which is not reasonable for log messages.
+
+	  More broadly, BUFSIZ is the amount of buffering stdio.h does, which
+	  is arbitrary and largely orthogonal to what logging should accept
+	  as the maximum message size.
+
+	  ASTERISK-29928
+
+	  Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
+	  Change-Id: Iaa49fbbab029c64ae3d95e4b18270e0442cce170
+
+2022-03-10 11:07 +0000 [3a7d83087b]  Sean Bright <sean.bright@gmail.com>
+
+	* stasis_recording: Perform a complete match on requested filename.
+
+	  Using the length of a file found on the filesystem rather than the
+	  file being requested could result in filenames whose names are
+	  substrings of another to be erroneously matched.
+
+	  We now ensure a complete comparison before returning a positive
+	  result.
+
+	  ASTERISK-29960 #close
+
+	  Change-Id: Id3ffc77681b9b75b8569062f3d952a128a21c71a
+
+2022-03-22 09:01 +0000 [2b636f3766]  Sean Bright <sean.bright@gmail.com>
+
+	* download_externals: Use HTTPS for downloads
+
+	  ASTERISK-29980 #close
+
+	  Change-Id: I7b347665822ea2774dd322276c09be67914d2065
+
+2022-03-04 14:26 +0000 [81a990b8d2]  Sean Bright <sean.bright@gmail.com>
+
+	* conversions.c: Specify that we only want to parse decimal numbers.
+
+	  Passing 0 as the last argument to strtoimax() or strtoumax() causes
+	  octal and hexadecimal to be accepted which was not originally
+	  intended. So we now force to only accept decimal.
+
+	  ASTERISK-29950 #close
+
+	  Change-Id: I93baf0f273441e8280354630a463df263a8c0edd
+
+2022-03-05 06:04 +0000 [a66b6647b2]  Naveen Albert <asterisk@phreaknet.org>
+
+	* app_dial: Document DIALSTATUS return values.
+
+	  Adds documentation for all of the possible return values
+	  for the DIALSTATUS variable in the Dial application.
+
+	  ASTERISK-25716
+
+	  Change-Id: Id22593f1f1f7ea86e5734cee49516ec50848e8c0
+
+2022-03-14 11:57 +0000 [b407511f02]  Naveen Albert <asterisk@phreaknet.org>
+
+	* pbx_builtins: Add missing options documentation
+
+	  BackGround and WaitExten both accept options that are not
+	  currently documented. This adds documentation for these
+	  options to the xml documentation for each application.
+
+	  ASTERISK-29967 #close
 
-	* asterisk 18.11.0 Released.
+	  Change-Id: If812a9f1ccbba3e4d427a0e7a6dea923c2f905f7
 
 2022-03-17 15:40 +0000  Asterisk Development Team <asteriskteam@digium.com>
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/CHANGES asterisk-18.12.0~dfsg+~cs6.12.40431413/CHANGES
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/CHANGES	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/CHANGES	2022-05-12 11:50:59.000000000 +0000
@@ -13,6 +13,70 @@
 ==============================================================================
 
 ------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 18.11.3 to Asterisk 18.12.0 ----------
+------------------------------------------------------------------------------
+
+app_confbridge
+------------------
+ * Added the hear_own_join_sound option to the confbridge user profile to
+   control who hears the sound_join audio file. When set to 'yes' the user
+   entering the conference and the participants already in the conference
+   will hear the sound_join audio file. When set to 'no' the user entering
+   the conference will not hear the sound_join audio file, but the
+   participants already in the conference will hear the sound_join audio file.
+
+app_queue
+------------------
+ * The m option now allows an override music on hold
+   class to be specified for the Queue application
+   within the dialplan.
+
+chan_dahdi
+------------------
+ * Previously, cadences were appended on dahdi restart,
+   rather than reloaded. This prevented cadences from
+   being updated and maxed out the available cadences
+   if reloaded multiple times. This behavior is fixed
+   so that reloading cadences is idempotent and cadences
+   can actually be reloaded.
+
+chan_pjsip
+------------------
+ * added global config option "allow_sending_180_after_183"
+
+   Allow Asterisk to send 180 Ringing to an endpoint
+   after 183 Session Progress has been send.
+   If disabled Asterisk will instead send only a
+   183 Session Progress to the endpoint.
+
+ * Hook flash events can now be sent on a PJSIP channel
+   if requested to do so.
+
+chan_sip
+------------------
+ * Session timers get removed on UPDATE
+   Fix if Asterisk receives a SIP REFER with Session-Timers UAC
+   that Asterisk maintains Session-Timers when sending UPDATE request
+
+cli
+------------------
+ * A new CLI command 'dialplan eval function' has been
+   added which allows users to test the behavior of
+   dialplan function calls directly from the CLI.
+
+func_db
+------------------
+ * The function DB_KEYCOUNT has been added, which
+   returns the cardinality of the keys at a specified
+   prefix in AstDB, i.e. the number of keys at a
+   given prefix.
+
+func_evalexten
+------------------
+ * This adds the EVAL_EXTEN function which may be
+   used to evaluate data at dialplan extensions.
+
+------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 18.11.1 to Asterisk 18.11.2 ----------
 ------------------------------------------------------------------------------
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/channels/chan_dahdi.c asterisk-18.12.0~dfsg+~cs6.12.40431413/channels/chan_dahdi.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/channels/chan_dahdi.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/channels/chan_dahdi.c	2022-05-12 11:50:59.000000000 +0000
@@ -234,6 +234,59 @@
 			</enum>
 		</enumlist>
 	</info>
+	<info name="Dial_Resource" language="en_US" tech="DAHDI">
+		<para>DAHDI allows several modifiers to be specified as part of the resource.</para>
+		<para>The general syntax is :</para>
+		<para><literal>Dial(DAHDI/pseudo[/extension])</literal></para>
+		<para><literal>Dial(DAHDI/&lt;channel#&gt;[c|r&lt;cadance#&gt;|d][/extension])</literal></para>
+		<para><literal>Dial(DAHDI/(g|G|r|R)&lt;group#(0-63)&gt;[c|r&lt;cadance#&gt;|d][/extension])</literal></para>
+		<para>The following modifiers may be used before the channel number:</para>
+		<enumlist>
+		<enum name="g">
+			<para>Search forward, dialing on first available channel in group (lowest to highest).</para>
+		</enum>
+		<enum name="G">
+			<para>Search backward, dialing on first available channel in group (highest to lowest).</para>
+		</enum>
+		<enum name="r">
+			<para>Round robin search forward, picking up from where last left off (lowest to highest).</para>
+		</enum>
+		<enum name="R">
+			<para>Round robin search backward, picking up from where last left off (highest to lowest).</para>
+		</enum>
+		</enumlist>
+		<para>The following modifiers may be used after the channel number:</para>
+		<enumlist>
+		<enum name="c">
+			<para>Wait for DTMF digit <literal>#</literal> before providing answer supervision.</para>
+			<para>This can be useful on outbound calls via FXO ports, as otherwise
+			they would indicate answer immediately.</para>
+		</enum>
+		<enum name="d">
+			<para>Force bearer capability for ISDN/SS7 call to digital.</para>
+		</enum>
+		<enum name="i">
+			<para>ISDN span channel restriction.</para>
+			<para>Used by CC to ensure that the CC recall goes out the same span.
+			Also to make ISDN channel names dialable when the sequence number
+			is stripped off.  (Used by DTMF attended transfer feature.)</para>
+		</enum>
+		<enum name="r">
+			<para>Specifies the distinctive ring cadence number to use immediately after
+			specifying this option. There are 4 default built-in cadences, and up to 24
+			total cadences may be configured.</para>
+		</enum>
+		</enumlist>
+		<example title="Dial 555-1212 on first available channel in group 1, searching from highest to lowest">
+		same => n,Dial(DAHDI/g1/5551212)
+		</example>
+		<example title="Ringing FXS channel 4 with ring cadence 2">
+		same => n,Dial(DAHDI/4r2)
+		</example>
+		<example title="Dial 555-1212 on channel 3 and require answer confirmation">
+		same => n,Dial(DAHDI/3c/5551212)
+		</example>
+	</info>
 	<manager name="DAHDITransfer" language="en_US">
 		<synopsis>
 			Transfer DAHDI Channel.
@@ -3410,7 +3463,7 @@
 };
 
 /*! Round robin search locations. */
-static struct dahdi_pvt *round_robin[32];
+static struct dahdi_pvt *round_robin[64]; /* groups can range from 0-63 */
 
 int _dahdi_get_index(struct ast_channel *ast, struct dahdi_pvt *p, int nullok, const char *fname, unsigned long line)
 {
@@ -11573,6 +11626,7 @@
 							&& !analog_p->fxsoffhookstate
 							&& !last->owner
 							&& !ast_strlen_zero(last->mailbox)
+							&& !analog_p->subs[SUB_REAL].owner /* could be a recall ring from a flash hook hold */
 							&& (thispass - analog_p->onhooktime > 3)) {
 							res = has_voicemail(last);
 							if (analog_p->msgstate != res) {
@@ -17873,6 +17927,9 @@
 	int y;
 	struct ast_variable *dahdichan = NULL;
 
+	/* Re-parse any cadences from beginning, rather than appending until we run out of room */
+	user_has_defined_cadences = 0;
+
 	for (; v; v = v->next) {
 		if (!ast_jb_read_conf(&global_jbconf, v->name, v->value))
 			continue;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/channels/chan_iax2.c asterisk-18.12.0~dfsg+~cs6.12.40431413/channels/chan_iax2.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/channels/chan_iax2.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/channels/chan_iax2.c	2022-05-12 11:50:59.000000000 +0000
@@ -6379,6 +6379,18 @@
 	}
 }
 
+static int invalid_key(ast_aes_decrypt_key *ecx)
+{
+	int i;
+	for (i = 0; i < 60; i++) {
+		if (ecx->rd_key[i]) {
+			return 0; /* stop if we encounter anything non-zero */
+		}
+	}
+	/* if ast_aes_encrypt or ast_aes_decrypt is called, then we'll crash when calling AES_encrypt or AES_decrypt */
+	return -1;
+}
+
 static void build_encryption_keys(const unsigned char *digest, struct chan_iax2_pvt *pvt)
 {
 	build_ecx_key(digest, pvt);
@@ -7375,7 +7387,7 @@
 	AST_LIST_TRAVERSE(&registrations, reg, entry) {
 		snprintf(host, sizeof(host), "%s", ast_sockaddr_stringify(&reg->addr));
 
-		snprintf(perceived, sizeof(perceived), "%s", ast_sockaddr_isnull(&reg->addr) ? "<Unregistered>" : ast_sockaddr_stringify(&reg->addr));
+		snprintf(perceived, sizeof(perceived), "%s", ast_sockaddr_isnull(&reg->us) ? "<Unregistered>" : ast_sockaddr_stringify(&reg->us));
 
 		ast_cli(a->fd, FORMAT, host,
 				(reg->dnsmgr) ? "Y" : "N",
@@ -7407,7 +7419,7 @@
 	AST_LIST_TRAVERSE(&registrations, reg, entry) {
 		snprintf(host, sizeof(host), "%s", ast_sockaddr_stringify(&reg->addr));
 
-		snprintf(perceived, sizeof(perceived), "%s", ast_sockaddr_isnull(&reg->addr) ? "<Unregistered>" : ast_sockaddr_stringify(&reg->addr));
+		snprintf(perceived, sizeof(perceived), "%s", ast_sockaddr_isnull(&reg->us) ? "<Unregistered>" : ast_sockaddr_stringify(&reg->us));
 
 		astman_append(s,
 			"Event: RegistryEntry\r\n"
@@ -7503,7 +7515,7 @@
 	int numchans = 0;
 	char first_message[10] = { 0, };
 	char last_message[10] = { 0, };
-#define ACN_FORMAT1 "%-20.25s %4u %4d %4d %5d %3d %5d %4d %6d %4d %4d %5d %3d %5d %4d %6d %s%s %4s%s\n"
+#define ACN_FORMAT1 "%-24.25s %4u %4d %4d %5d %3d %5d %4d %6d %4d %4d %5d %3d %5d %4d %6d %s%s %4s%s\n"
 #define ACN_FORMAT2 "%s %u %d %d %d %d %d %d %d %d %d %d %d %d %d %d %s%s %s%s\n"
 	for (x = 0; x < ARRAY_LEN(iaxs); x++) {
 		ast_mutex_lock(&iaxsl[x]);
@@ -7597,8 +7609,8 @@
 	}
 	if (a->argc != 3)
 		return CLI_SHOWUSAGE;
-	ast_cli(a->fd, "                           -------- LOCAL ---------------------  -------- REMOTE --------------------\n");
-	ast_cli(a->fd, "Channel               RTT  Jit  Del  Lost   %%  Drop  OOO  Kpkts  Jit  Del  Lost   %%  Drop  OOO  Kpkts FirstMsg    LastMsg\n");
+	ast_cli(a->fd, "                                -------- LOCAL ---------------------  -------- REMOTE --------------------\n");
+	ast_cli(a->fd, "Channel                    RTT  Jit  Del  Lost   %%  Drop  OOO  Kpkts  Jit  Del  Lost   %%  Drop  OOO  Kpkts FirstMsg    LastMsg\n");
 	numchans = ast_cli_netstats(NULL, a->fd, 1);
 	ast_cli(a->fd, "%d active IAX channel%s\n", numchans, (numchans != 1) ? "s" : "");
 	return CLI_SUCCESS;
@@ -8435,7 +8447,7 @@
 			iax_ie_append_str(ied, IAX_IE_PASSWORD, secret);
 			res = 0;
 		} else
-			ast_log(LOG_NOTICE, "No way to send secret to peer '%s' (their methods: %d)\n", ast_sockaddr_stringify_addr(addr), authmethods);
+			ast_log(LOG_WARNING, "No way to send secret to peer '%s' (their methods: %d)\n", ast_sockaddr_stringify_addr(addr), authmethods);
 	}
 	return res;
 }
@@ -8520,12 +8532,22 @@
 		}
 	}
 
+	if (!(ies->authmethods & (IAX_AUTH_MD5 | IAX_AUTH_PLAINTEXT)) && (ies->authmethods & IAX_AUTH_RSA) && ast_strlen_zero(okey)) {
+		/* If the only thing available is RSA, and we don't have an outkey, we can't do it... */
+		ast_log(LOG_WARNING, "Call terminated. RSA authentication requires an outkey\n");
+		return -1;
+	}
+
 	if (ies->encmethods) {
 		if (ast_strlen_zero(p->secret) &&
 			((ies->authmethods & IAX_AUTH_RSA) || (ies->authmethods & IAX_AUTH_MD5) || (ies->authmethods & IAX_AUTH_PLAINTEXT))) {
 			ast_log(LOG_WARNING, "Call terminated. Encryption requested by peer but no secret available locally\n");
 			return -1;
 		}
+		/* Don't even THINK about trying to encrypt or decrypt anything if we don't have valid keys, for some reason... */
+		/* If either of these happens, it's our fault, not the user's. But we should abort rather than crash. */
+		ast_assert_return(!invalid_key(&p->ecx), -1);
+		ast_assert_return(!invalid_key(&p->dcx), -1);
 		ast_set_flag64(p, IAX_ENCRYPTED | IAX_KEYPOPULATED);
 	} else if (ast_test_flag64(iaxs[callno], IAX_FORCE_ENCRYPT)) {
 		ast_log(LOG_NOTICE, "Call initiated without encryption while forceencryption=yes option is set\n");
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/channels/chan_pjsip.c asterisk-18.12.0~dfsg+~cs6.12.40431413/channels/chan_pjsip.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/channels/chan_pjsip.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/channels/chan_pjsip.c	2022-05-12 11:50:59.000000000 +0000
@@ -337,14 +337,6 @@
 		ast_sockaddr_setnull(&media->direct_media_addr);
 		changed = 1;
 		if (media->rtp) {
-			/* Direct media has ended - reset time of last received RTP packet
-			 * to avoid premature RTP timeout. Synchronisation between the
-			 * modification of direct_mdedia_addr+last_rx here and reading the
-			 * values in res_pjsip_sdp_rtp.c:rtp_check_timeout() is provided
-			 * by the channel's lock (which is held while this function is
-			 * executed).
-			 */
-			ast_rtp_instance_set_last_rx(media->rtp, time(NULL));
 			ast_rtp_instance_set_prop(media->rtp, AST_RTP_PROPERTY_RTCP, 1);
 			if (position != -1) {
 				ast_channel_set_fd(chan, position + AST_EXTENDED_FDS, ast_rtp_instance_fd(media->rtp, 1));
@@ -1609,6 +1601,10 @@
 	SCOPE_EXIT_RTN_VALUE(res, "RC: %d\n", res);
 }
 
+/* Forward declarations */
+static int transmit_info_dtmf(void *data);
+static struct info_dtmf_data *info_dtmf_data_alloc(struct ast_sip_session *session, char digit, unsigned int duration);
+
 /*! \brief Function called by core to ask the channel to indicate some sort of condition */
 static int chan_pjsip_indicate(struct ast_channel *ast, int condition, const void *data, size_t datalen)
 {
@@ -1629,6 +1625,10 @@
 		.data.ptr = (void *)data,
 	};
 	char condition_name[256];
+	unsigned int duration;
+	char digit;
+	struct info_dtmf_data *dtmf_data;
+
 	SCOPE_ENTER(3, "%s: Indicated %s\n", ast_channel_name(ast),
 		ast_frame_subclass2str(&f, condition_name, sizeof(condition_name), NULL, 0));
 
@@ -1638,8 +1638,12 @@
 			if (channel->session->endpoint->inband_progress ||
 				(channel->session->inv_session && channel->session->inv_session->neg &&
 				pjmedia_sdp_neg_get_state(channel->session->inv_session->neg) == PJMEDIA_SDP_NEG_STATE_DONE)) {
-				response_code = 183;
 				res = -1;
+				if (ast_sip_get_allow_sending_180_after_183()) {
+					response_code = 180;
+				} else {
+					response_code = 183;
+				}
 			} else {
 				response_code = 180;
 			}
@@ -1684,6 +1688,22 @@
 		}
 		ast_devstate_changed(AST_DEVICE_UNKNOWN, AST_DEVSTATE_CACHABLE, "PJSIP/%s", ast_sorcery_object_get_id(channel->session->endpoint));
 		break;
+	case AST_CONTROL_FLASH:
+		duration = 300;
+		digit = '!';
+		dtmf_data = info_dtmf_data_alloc(channel->session, digit, duration);
+
+		if (!dtmf_data) {
+			res = -1;
+			break;
+		}
+
+		if (ast_sip_push_task(channel->session->serializer, transmit_info_dtmf, dtmf_data)) {
+			ast_log(LOG_WARNING, "Error sending FLASH via INFO on channel %s\n", ast_channel_name(ast));
+			ao2_ref(dtmf_data, -1); /* dtmf_data can't be null here */
+			res = -1;
+		}
+		break;
 	case AST_CONTROL_VIDUPDATE:
 		for (i = 0; i < AST_VECTOR_SIZE(&channel->session->active_media_state->sessions); ++i) {
 			media = AST_VECTOR_GET(&channel->session->active_media_state->sessions, i);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/channels/chan_sip.c asterisk-18.12.0~dfsg+~cs6.12.40431413/channels/chan_sip.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/channels/chan_sip.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/channels/chan_sip.c	2022-05-12 11:50:59.000000000 +0000
@@ -12441,9 +12441,8 @@
 	 * Send UPDATE to the same destination as CANCEL, if call is not in final state.
 	 */
 	if (!sip_route_empty(&p->route) &&
-			!(sipmethod == SIP_CANCEL ||
-				(sipmethod == SIP_ACK && (p->invitestate == INV_COMPLETED || p->invitestate == INV_CANCELLED)) ||
-				(sipmethod == SIP_UPDATE && (p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA)))) {
+		!(sipmethod == SIP_CANCEL ||
+			(sipmethod == SIP_ACK && (p->invitestate == INV_COMPLETED || p->invitestate == INV_CANCELLED)))) {
 		if (p->socket.type != AST_TRANSPORT_UDP && p->socket.tcptls_session) {
 			/* For TCP/TLS sockets that are connected we won't need
 			 * to do any hostname/IP lookups */
@@ -12451,6 +12450,11 @@
 			/* For NATed traffic, we ignore the contact/route and
 			 * simply send to the received-from address. No need
 			 * for lookups. */
+		} else if (sipmethod == SIP_UPDATE && (p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA)) {
+			/* Calling set_destination for an UPDATE in early dialog
+			 * will result in mangling of the target for a subsequent
+			 * CANCEL according to ASTERISK-24628 so do not do it.
+			 */
 		} else {
 			set_destination(p, sip_route_first_uri(&p->route));
 		}
@@ -12501,11 +12505,9 @@
 	   An exception to this behavior is the ACK request. Since Asterisk never requires
 	   session-timers support from a remote end-point (UAS) in an INVITE, it must
 	   not send 'Require: timer' header in the ACK request.
-	   This should only be added in the INVITE transactions, not MESSAGE or REFER or other
-	   in-dialog messages.
 	*/
 	if (p->stimer && p->stimer->st_active == TRUE && p->stimer->st_active_peer_ua == TRUE
-	    && sipmethod == SIP_INVITE) {
+	    && (sipmethod == SIP_INVITE || sipmethod == SIP_UPDATE)) {
 		char se_hdr[256];
 		snprintf(se_hdr, sizeof(se_hdr), "%d;refresher=%s", p->stimer->st_interval,
 			p->stimer->st_ref == SESSION_TIMER_REFRESHER_US ? "uac" : "uas");
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/channels/pjsip/dialplan_functions.c asterisk-18.12.0~dfsg+~cs6.12.40431413/channels/pjsip/dialplan_functions.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/channels/pjsip/dialplan_functions.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/channels/pjsip/dialplan_functions.c	2022-05-12 11:50:59.000000000 +0000
@@ -69,6 +69,12 @@
 	</see-also>
 </function>
 <function name="PJSIP_DTMF_MODE" language="en_US">
+	<since>
+		<version>13.18.0</version>
+		<version>14.7.0</version>
+		<version>15.1.0</version>
+		<version>16.0.0</version>
+	</since>
 	<synopsis>
 		Get or change the DTMF mode for a SIP call.
 	</synopsis>
@@ -94,6 +100,11 @@
 	</description>
 </function>
 <function name="PJSIP_SEND_SESSION_REFRESH" language="en_US">
+	<since>
+		<version>13.12.0</version>
+		<version>14.1.0</version>
+		<version>15.0.0</version>
+	</since>
 	<synopsis>
 		W/O: Initiate a session refresh via an UPDATE or re-INVITE on an established media session
 	</synopsis>
@@ -135,6 +146,11 @@
 	</see-also>
 </function>
 <function name="PJSIP_PARSE_URI" language="en_US">
+	<since>
+		<version>13.24.0</version>
+		<version>16.1.0</version>
+		<version>17.0.0</version>
+	</since>
 	<synopsis>
 		Parse an uri and return a type part of the URI.
 	</synopsis>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/codecs/codecs.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/codecs/codecs.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/codecs/codecs.xml	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/codecs/codecs.xml	2022-05-12 11:50:59.000000000 +0000
@@ -1,4 +1,4 @@
-<member name="codec_opus" displayname="Download the Opus codec from Digium.  See http://downloads.digium.com/pub/telephony/codec_opus/README.">
+<member name="codec_opus" displayname="Download the Opus codec from Digium.  See https://downloads.digium.com/pub/telephony/codec_opus/README.">
 	<support_level>external</support_level>
 	<conflict>no_binary_modules</conflict>
 	<depend>xmlstarlet</depend>
@@ -6,28 +6,28 @@
 	<depend>res_format_attr_opus</depend>
 	<defaultenabled>no</defaultenabled>
 </member>
-<member name="codec_silk" displayname="Download the SILK codec from Digium.  See http://downloads.digium.com/pub/telephony/codec_silk/README.">
+<member name="codec_silk" displayname="Download the SILK codec from Digium.  See https://downloads.digium.com/pub/telephony/codec_silk/README.">
 	<support_level>external</support_level>
 	<conflict>no_binary_modules</conflict>
 	<depend>xmlstarlet</depend>
 	<depend>bash</depend>
 	<defaultenabled>no</defaultenabled>
 </member>
-<member name="codec_siren7" displayname="Download the Siren7 codec from Digium.  See http://downloads.digium.com/pub/telephony/codec_siren7/README.">
+<member name="codec_siren7" displayname="Download the Siren7 codec from Digium.  See https://downloads.digium.com/pub/telephony/codec_siren7/README.">
 	<support_level>external</support_level>
 	<conflict>no_binary_modules</conflict>
 	<depend>xmlstarlet</depend>
 	<depend>bash</depend>
 	<defaultenabled>no</defaultenabled>
 </member>
-<member name="codec_siren14" displayname="Download the Siren14 codec from Digium.  See http://downloads.digium.com/pub/telephony/codec_siren14/README.">
+<member name="codec_siren14" displayname="Download the Siren14 codec from Digium.  See https://downloads.digium.com/pub/telephony/codec_siren14/README.">
 	<support_level>external</support_level>
 	<conflict>no_binary_modules</conflict>
 	<depend>xmlstarlet</depend>
 	<depend>bash</depend>
 	<defaultenabled>no</defaultenabled>
 </member>
-<member name="codec_g729a" displayname="Download the g729a codec from Digium.  A license must be purchased for this codec.  See http://downloads.digium.com/pub/telephony/codec_g729/README.">
+<member name="codec_g729a" displayname="Download the g729a codec from Digium.  A license must be purchased for this codec.  See https://downloads.digium.com/pub/telephony/codec_g729/README.">
 	<support_level>external</support_level>
 	<conflict>no_binary_modules</conflict>
 	<depend>xmlstarlet</depend>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/configs/samples/aeap.conf.sample asterisk-18.12.0~dfsg+~cs6.12.40431413/configs/samples/aeap.conf.sample
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/configs/samples/aeap.conf.sample	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/configs/samples/aeap.conf.sample	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,21 @@
+;
+; This file is used by the res_aeap module to configure parameters
+; used for AEAP applications.
+;
+;[myclient]
+;
+; type must be "client".
+;type=client
+;
+; URL used to connect to a server. It must be a websocket URL (ws or wss).
+;url=ws://127.0.0.1:9099
+;
+; codecs is comma separated string of allowed/disallowed codec names.
+;codecs=!all,ulaw,alaw,opus
+;
+; protocol is the implementation specific sub-protocol
+;protocol=speech_to_text
+;
+; "@" parameters can be specified and are used to to set custom values to
+; be passed as "params" in the initial "setup" request.
+;@language=en-US
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/configs/samples/chan_dahdi.conf.sample asterisk-18.12.0~dfsg+~cs6.12.40431413/configs/samples/chan_dahdi.conf.sample
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/configs/samples/chan_dahdi.conf.sample	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/configs/samples/chan_dahdi.conf.sample	2022-05-12 11:50:59.000000000 +0000
@@ -1286,10 +1286,11 @@
 ; You can define your own custom ring cadences here.  You can define up to 8
 ; pairs.  If the silence is negative, it indicates where the caller ID spill is
 ; to be placed.  Also, if you define any custom cadences, the default cadences
-; will be turned off.
+; will be turned off (overwritten).
 ;
 ; This setting is global, rather than per-channel. It will not update on
-; a reload.
+; a reload, but new and modified cadences will update on dahdi restart.
+; A maximum of 24 cadences may be specified.
 ;
 ; Syntax is:  cadence=ring,silence[,ring,silence[...]]
 ;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/configs/samples/confbridge.conf.sample asterisk-18.12.0~dfsg+~cs6.12.40431413/configs/samples/confbridge.conf.sample
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/configs/samples/confbridge.conf.sample	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/configs/samples/confbridge.conf.sample	2022-05-12 11:50:59.000000000 +0000
@@ -41,6 +41,12 @@
                ; There are some prompts, such as the prompt to enter a PIN number,
                ; that must be played regardless of what this option is set to.
                ; Off by default
+;hear_own_join_sound=yes  ; Sets if a user joining the conference should hear the sound_join
+                          ; audio sound when they enter the conference. If set to 'no' the
+                          ; user will not hear the sound_join audio but the other participants
+                          ; in the conference will still hear the audio. If set to 'yes'
+                          ; everyone hears the sound_join audio when this user enters the conference.
+                          ; On by default
 ;announce_user_count=yes  ; Sets if the number of users should be announced to the
                           ; caller.  Off by default.
 ;announce_user_count_all=yes ; Sets if the number of users should be announced to
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/configs/samples/pjsip.conf.sample asterisk-18.12.0~dfsg+~cs6.12.40431413/configs/samples/pjsip.conf.sample
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/configs/samples/pjsip.conf.sample	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/configs/samples/pjsip.conf.sample	2022-05-12 11:50:59.000000000 +0000
@@ -1025,8 +1025,6 @@
 ;[transport]
 ;  SYNOPSIS: SIP Transport
 ;
-;async_operations=1     ; Number of simultaneous Asynchronous Operations
-                        ; (default: "1")
 ;bind=  ; IP Address and optional port to bind to for this transport (default:
         ; "")
 ; Note that for the Websocket transport the TLS configuration is configured
@@ -1313,6 +1311,12 @@
                     ; creating an implicit subscription (see RFC 4488).
                     ; (default: "yes")
 
+;allow_sending_180_after_183=yes	; Allow Asterisk to send 180 Ringing to an endpoint
+					; after 183 Session Progress has been send.
+					; If disabled Asterisk will instead send only a
+					; 183 Session Progress to the endpoint.
+					; (default: "no")
+
 ; MODULE PROVIDING BELOW SECTION(S): res_pjsip_acl
 ;==========================ACL SECTION OPTIONS=========================
 ;[acl]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/configs/samples/queues.conf.sample asterisk-18.12.0~dfsg+~cs6.12.40431413/configs/samples/queues.conf.sample
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/configs/samples/queues.conf.sample	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/configs/samples/queues.conf.sample	2022-05-12 11:50:59.000000000 +0000
@@ -64,8 +64,9 @@
 ;
 ; Musicclass sets which music applies for this particular call queue.
 ; The only class which can override this one is if the MOH class is set
+; using the m option when calling the Queue application or if set
 ; directly on the channel using Set(CHANNEL(musicclass)=whatever) in the
-; dialplan.
+; dialplan (the latter of which overrides everything).
 ;
 ;musicclass = default
 ;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/configure asterisk-18.12.0~dfsg+~cs6.12.40431413/configure
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/configure	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/configure	2022-05-12 11:50:59.000000000 +0000
@@ -1,11 +1,12 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for asterisk trunk.
+# Generated by GNU Autoconf 2.71 for asterisk trunk.
 #
 # Report bugs to <https://issues.asterisk.org>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -18,14 +19,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -35,46 +38,46 @@
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -83,13 +86,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -98,8 +94,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -111,30 +111,10 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -156,20 +136,22 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else
+else \$as_nop
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -189,42 +171,53 @@
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
 
-else
+else \$as_nop
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
+  if (eval "$as_required") 2>/dev/null
+then :
   as_have_required=yes
-else
+else $as_nop
   as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
 
-else
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
+	     as_shell=$as_dir$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
   break 2
 fi
 fi
@@ -232,14 +225,21 @@
        esac
   as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
 
 
-      if test "x$CONFIG_SHELL" != x; then :
+      if test "x$CONFIG_SHELL" != x
+then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -257,18 +257,19 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno
+then :
+  printf "%s\n" "$0: This script requires a shell more modern than all"
+  printf "%s\n" "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
 $0: https://issues.asterisk.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
@@ -296,6 +297,7 @@
 }
 as_unset=as_fn_unset
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -313,6 +315,14 @@
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -327,7 +337,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -336,7 +346,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -375,12 +385,13 @@
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -392,18 +403,27 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
@@ -415,9 +435,9 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -444,7 +464,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -488,7 +508,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -502,6 +522,10 @@
   exit
 }
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -515,6 +539,13 @@
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -590,41 +621,37 @@
 ac_unique_file="main/asterisk.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
 #endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
 #endif
 #ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_header_list=
+ac_header_c_list=
+ac_func_c_list=
 ac_subst_vars='LTLIBOBJS
 PBX_SYSLOG
 PBX_SYSLOG_FACILITY_LOG_UUCP
@@ -707,6 +734,8 @@
 PERMANENT_DLOPEN
 DISABLE_XMLDOC
 CONFIG_LIBXML2
+LIBXML2_LIBS
+LIBXML2_CFLAGS
 JANSSON_LIBS
 JANSSON_CFLAGS
 UUID_LIB
@@ -1271,14 +1300,17 @@
 AR
 ac_ct_STRIP
 STRIP
+GREP
 GNU_MAKE
 LN_S
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
 AWK
+EGREP
 SED
 CXXCPP
+CPP
 ac_ct_CXX
 CXXFLAGS
 CROSS_COMPILING
@@ -1312,9 +1344,6 @@
 astetcdir
 astcachedir
 astsbindir
-EGREP
-GREP
-CPP
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1474,10 +1503,10 @@
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
 CXX
 CXXFLAGS
 CCC
+CPP
 CXXCPP
 PKG_CONFIG
 PKG_CONFIG_PATH
@@ -1491,6 +1520,8 @@
 LIBEDIT_LIBS
 JANSSON_CFLAGS
 JANSSON_LIBS
+LIBXML2_CFLAGS
+LIBXML2_LIBS
 ILBC_CFLAGS
 ILBC_LIBS
 NETSNMP_CFLAGS
@@ -1575,8 +1606,6 @@
   *)    ac_optarg=yes ;;
   esac
 
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -1617,9 +1646,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1643,9 +1672,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1856,9 +1885,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1872,9 +1901,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1918,9 +1947,9 @@
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1936,7 +1965,7 @@
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -2000,7 +2029,7 @@
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -2247,9 +2276,9 @@
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
+  CPP         C preprocessor
   CXXCPP      C++ preprocessor
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
@@ -2274,6 +2303,10 @@
               C compiler flags for JANSSON, overriding pkg-config
   JANSSON_LIBS
               linker flags for JANSSON, overriding pkg-config
+  LIBXML2_CFLAGS
+              C compiler flags for LIBXML2, overriding pkg-config
+  LIBXML2_LIBS
+              linker flags for LIBXML2, overriding pkg-config
   ILBC_CFLAGS C compiler flags for ILBC, overriding pkg-config
   ILBC_LIBS   linker flags for ILBC, overriding pkg-config
   NETSNMP_CFLAGS
@@ -2321,9 +2354,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -2351,7 +2384,8 @@
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -2359,7 +2393,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -2369,9 +2403,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 asterisk configure trunk
-generated by GNU Autoconf 2.69
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
@@ -2390,14 +2424,14 @@
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2405,14 +2439,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2422,176 +2457,6 @@
 
 } # ac_fn_c_try_compile
 
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------------------ ##
-## Report this to https://issues.asterisk.org ##
-## ------------------------------------------ ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -2599,26 +2464,28 @@
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -2629,14 +2496,14 @@
 ac_fn_cxx_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2644,14 +2511,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2661,6 +2529,44 @@
 
 } # ac_fn_cxx_try_compile
 
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }
+then :
+  ac_retval=0
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
 # ac_fn_cxx_try_cpp LINENO
 # ------------------------
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -2673,7 +2579,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2681,14 +2587,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
@@ -2704,14 +2611,14 @@
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2719,17 +2626,18 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -2750,11 +2658,12 @@
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
@@ -2762,16 +2671,9 @@
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+   which can conflict with char $2 (); below.  */
 
+#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -2789,24 +2691,25 @@
 #endif
 
 int
-main ()
+main (void)
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
@@ -2818,17 +2721,18 @@
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof ($2))
 	 return 0;
@@ -2836,12 +2740,13 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof (($2)))
 	    return 0;
@@ -2849,55 +2754,101 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   eval "$3=yes"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
 
-# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
-# ----------------------------------------------------
-# Tries to find if the field MEMBER exists in type AGGR, after including
-# INCLUDES, setting cache variable VAR accordingly.
-ac_fn_c_check_member ()
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
+# executables *can* be run.
+ac_fn_c_try_run ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-$as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
-int
-main ()
-{
-static $2 ac_aggr;
-if (ac_aggr.$3)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$4=yes"
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$5
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+then :
+  ac_retval=0
+else $as_nop
+  printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+       printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+printf %s "checking for $2.$3... " >&6; }
+if eval test \${$4+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main (void)
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  eval "$4=yes"
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
 int
-main ()
+main (void)
 {
 static $2 ac_aggr;
 if (sizeof ac_aggr.$3)
@@ -2906,41 +2857,45 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$4=yes"
-else
+else $as_nop
   eval "$4=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$4
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
+# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR
+# ------------------------------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
+# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR.
+ac_fn_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+printf %s "checking whether $as_decl_name is declared... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  eval ac_save_FLAGS=\$$6
+  as_fn_append $6 " $5"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 #ifndef $as_decl_name
 #ifdef __cplusplus
@@ -2954,19 +2909,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+  eval $6=\$ac_save_FLAGS
+
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_c_check_decl
+} # ac_fn_check_decl
 
 # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
 # --------------------------------------------
@@ -2982,7 +2940,7 @@
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
 test_array [0] = 0;
@@ -2992,14 +2950,15 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_lo=0 ac_mid=0
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
@@ -3009,9 +2968,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_hi=$ac_mid; break
-else
+else $as_nop
   as_fn_arith $ac_mid + 1 && ac_lo=$as_val
 			if test $ac_lo -le $ac_mid; then
 			  ac_lo= ac_hi=
@@ -3019,14 +2979,14 @@
 			fi
 			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   done
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) < 0)];
 test_array [0] = 0;
@@ -3036,14 +2996,15 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_hi=-1 ac_mid=-1
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
 test_array [0] = 0;
@@ -3053,9 +3014,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_lo=$ac_mid; break
-else
+else $as_nop
   as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
 			if test $ac_mid -le $ac_hi; then
 			  ac_lo= ac_hi=
@@ -3063,14 +3025,14 @@
 			fi
 			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   done
-else
+else $as_nop
   ac_lo= ac_hi=
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
@@ -3078,7 +3040,7 @@
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
@@ -3088,12 +3050,13 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_hi=$ac_mid
-else
+else $as_nop
   as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done
 case $ac_lo in #((
 ?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
@@ -3103,12 +3066,12 @@
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
+static long int longval (void) { return $2; }
+static unsigned long int ulongval (void) { return $2; }
 #include <stdio.h>
 #include <stdlib.h>
 int
-main ()
+main (void)
 {
 
   FILE *f = fopen ("conftest.val", "w");
@@ -3136,9 +3099,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else
+else $as_nop
   ac_retval=1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -3157,14 +3121,14 @@
 ac_fn_cxx_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3172,17 +3136,18 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -3196,14 +3161,34 @@
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_link
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
+    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by asterisk $as_me trunk, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
-  $ $0 $@
+  $ $0$ac_configure_args_raw
 
 _ACEOF
 exec 5>>config.log
@@ -3236,8 +3221,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf "%s\n" "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -3272,7 +3261,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -3307,11 +3296,13 @@
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    $as_echo "## ---------------- ##
+    printf "%s\n" "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -3322,8 +3313,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -3347,7 +3338,7 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    printf "%s\n" "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -3355,14 +3346,14 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      printf "%s\n" "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      printf "%s\n" "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -3370,15 +3361,15 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      printf "%s\n" "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -3386,8 +3377,8 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      printf "%s\n" "$as_me: caught signal $ac_signal"
+    printf "%s\n" "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -3401,63 +3392,48 @@
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_files="$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+  case $ac_site_file in #(
+  */*) :
+     ;; #(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
@@ -3467,813 +3443,836 @@
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-as_fn_append ac_header_list " stdlib.h"
-as_fn_append ac_header_list " unistd.h"
-as_fn_append ac_header_list " sys/param.h"
-as_fn_append ac_header_list " utime.h"
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+   Do not test the value of __STDC__, because some compilers set it to 0
+   while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
 
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not \xHH hex character constants.
+   These do not provoke an error unfortunately, instead are silently treated
+   as an "x".  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
+   array size at least.  It is necessary to write \x00 == 0 to get something
+   that is true only with -std.  */
+int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) '\''x'\''
+int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
 
-# cross-compile macros
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+               int, int);'
 
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
+'
 
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+  #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
 
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
 
+typedef const char *ccp;
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+    continue;
+  return 0;
+}
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
 
+  const char *str = "";
+  int number = 0;
+  float fnumber = 0;
 
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case '\''s'\'': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case '\''d'\'': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case '\''f'\'': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
 
-# check existence of the package
+  return *str && number && fnumber;
+}
+'
 
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+  // Check bool.
+  _Bool success = false;
+  success |= (argc != 0);
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[0] = argv[0][0];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
+	 || dynamic_array[ni.number - 1] != 543);
+'
 
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+  int_alignment = _Alignof (int),
+  int_array_alignment = _Alignof (int[100]),
+  char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
 
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
 
-# preserve any CFLAGS or LDFLAGS that may be set
-# NOTE: This must be done before calling any macros that end up
-# calling AC_PROG_CC or the like, since they will set a default
-# set of CFLAGS ("-g -O2") if the user did not supply any, and
-# we don't want those default flags to be carried over into the
-# rest of the build system since we have other means of controlling
-# debugging symbol generation and optimization.
-CONFIG_CFLAGS="${CFLAGS}"
-CONFIG_LDFLAGS="${LDFLAGS}"
+// Check _Static_assert.
+struct test_static_assert
+{
+  int x;
+  _Static_assert (sizeof (int) <= sizeof (long int),
+                  "_Static_assert does not work in struct");
+  long int y;
+};
 
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal[] = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+  union {
+    struct { int i; int j; };
+    struct { int k; long int l; } w;
+  };
+  int m;
+} v1;
+'
 
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+  _Static_assert ((offsetof (struct anonymous, i)
+		   == offsetof (struct anonymous, w.k)),
+		  "Anonymous union alignment botch");
+  v1.i = 2;
+  v1.w.k = 5;
+  ok |= v1.i != 5;
+'
 
-# specify output header file
-ac_config_headers="$ac_config_headers include/asterisk/autoconfig.h"
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
 
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  ${ac_c_conftest_c11_main}
+  return ok;
+}
+"
 
-# Note: AC_PROG_CC *must* be specified before AC_USE_SYSTEM_EXTENSIONS or any
-# other macro that uses the C compiler, or the default order will be used.
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in gcc cc
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
 
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  return ok;
+}
+"
 
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
 
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in gcc cc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  return ok;
+}
+"
 
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
+# Test code for whether the C++ compiler supports C++98 (global declarations)
+ac_cxx_conftest_cxx98_globals='
+// Does the compiler advertise C++98 conformance?
+#if !defined __cplusplus || __cplusplus < 199711L
+# error "Compiler does not advertise C++98 conformance"
+#endif
+
+// These inclusions are to reject old compilers that
+// lack the unsuffixed header files.
+#include <cstdlib>
+#include <exception>
+
+// <cassert> and <cstring> are *not* freestanding headers in C++98.
+extern void assert (int);
+namespace std {
+  extern int strcmp (const char *, const char *);
+}
+
+// Namespaces, exceptions, and templates were all added after "C++ 2.0".
+using std::exception;
+using std::strcmp;
+
+namespace {
+
+void test_exception_syntax()
+{
+  try {
+    throw "test";
+  } catch (const char *s) {
+    // Extra parentheses suppress a warning when building autoconf itself,
+    // due to lint rules shared with more typical C programs.
+    assert (!(strcmp) (s, "test"));
+  }
+}
 
+template <typename T> struct test_template
+{
+  T const val;
+  explicit test_template(T t) : val(t) {}
+  template <typename U> T add(U u) { return static_cast<T>(u) + val; }
+};
 
-  test -n "$ac_ct_CC" && break
-done
+} // anonymous namespace
+'
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
+# Test code for whether the C++ compiler supports C++98 (body of main)
+ac_cxx_conftest_cxx98_main='
+  assert (argc);
+  assert (! argv[0]);
+{
+  test_exception_syntax ();
+  test_template<double> tt (2.0);
+  assert (tt.add (4) == 6.0);
+  assert (true && !false);
+}
+'
 
+# Test code for whether the C++ compiler supports C++11 (global declarations)
+ac_cxx_conftest_cxx11_globals='
+// Does the compiler advertise C++ 2011 conformance?
+#if !defined __cplusplus || __cplusplus < 201103L
+# error "Compiler does not advertise C++11 conformance"
+#endif
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+namespace cxx11test
+{
+  constexpr int get_val() { return 20; }
 
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
+  struct testinit
+  {
+    int i;
+    double d;
+  };
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  class delegate
+  {
+  public:
+    delegate(int n) : n(n) {}
+    delegate(): delegate(2354) {}
+
+    virtual int getval() { return this->n; };
+  protected:
+    int n;
+  };
 
-int
-main ()
+  class overridden : public delegate
+  {
+  public:
+    overridden(int n): delegate(n) {}
+    virtual int getval() override final { return this->n * 2; }
+  };
+
+  class nocopy
+  {
+  public:
+    nocopy(int i): i(i) {}
+    nocopy() = default;
+    nocopy(const nocopy&) = delete;
+    nocopy & operator=(const nocopy&) = delete;
+  private:
+    int i;
+  };
+
+  // for testing lambda expressions
+  template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
+  {
+    return f(v);
+  }
+
+  // for testing variadic templates and trailing return types
+  template <typename V> auto sum(V first) -> V
+  {
+    return first;
+  }
+  template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
+  {
+    return first + sum(rest...);
+  }
+}
+'
+
+# Test code for whether the C++ compiler supports C++11 (body of main)
+ac_cxx_conftest_cxx11_main='
 {
+  // Test auto and decltype
+  auto a1 = 6538;
+  auto a2 = 48573953.4;
+  auto a3 = "String literal";
 
-  ;
-  return 0;
+  int total = 0;
+  for (auto i = a3; *i; ++i) { total += *i; }
+
+  decltype(a2) a4 = 34895.034;
 }
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+{
+  // Test constexpr
+  short sa[cxx11test::get_val()] = { 0 };
+}
+{
+  // Test initializer lists
+  cxx11test::testinit il = { 4323, 435234.23544 };
+}
+{
+  // Test range-based for
+  int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
+                 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
+  for (auto &x : array) { x += 23; }
+}
+{
+  // Test lambda expressions
+  using cxx11test::eval;
+  assert (eval ([](int x) { return x*2; }, 21) == 42);
+  double d = 2.0;
+  assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0);
+  assert (d == 5.0);
+  assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0);
+  assert (d == 5.0);
+}
+{
+  // Test use of variadic templates
+  using cxx11test::sum;
+  auto a = sum(1);
+  auto b = sum(1, 2);
+  auto c = sum(1.0, 2.0, 3.0);
+}
+{
+  // Test constructor delegation
+  cxx11test::delegate d1;
+  cxx11test::delegate d2();
+  cxx11test::delegate d3(45);
+}
+{
+  // Test override and final
+  cxx11test::overridden o1(55464);
+}
+{
+  // Test nullptr
+  char *c = nullptr;
+}
+{
+  // Test template brackets
+  test_template<::test_template<int>> v(test_template<int>(12));
+}
+{
+  // Unicode literals
+  char const *utf8 = u8"UTF-8 string \u2500";
+  char16_t const *utf16 = u"UTF-8 string \u2500";
+  char32_t const *utf32 = U"UTF-32 string \u2500";
+}
+'
 
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+# Test code for whether the C compiler supports C++11 (complete).
+ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals}
+${ac_cxx_conftest_cxx11_globals}
 
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_cxx_conftest_cxx98_main}
+  ${ac_cxx_conftest_cxx11_main}
+  return ok;
+}
+"
 
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
+# Test code for whether the C compiler supports C++98 (complete).
+ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals}
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_cxx_conftest_cxx98_main}
+  return ok;
+}
+"
+
+as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H"
+as_fn_append ac_header_c_list " sys/param.h sys_param_h HAVE_SYS_PARAM_H"
+as_fn_append ac_func_c_list " getpagesize HAVE_GETPAGESIZE"
+as_fn_append ac_header_c_list " sys/select.h sys_select_h HAVE_SYS_SELECT_H"
+as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H"
+as_fn_append ac_header_c_list " utime.h utime_h HAVE_UTIME_H"
+as_fn_append ac_func_c_list " vprintf HAVE_VPRINTF"
+
+# Auxiliary files required by this configure script.
+ac_aux_files="install-sh config.guess config.sub"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
 do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
   esac
+  as_found=:
+
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  ac_aux_dir_found=yes
+  ac_install_sh=
+  for ac_aux in $ac_aux_files
+  do
+    # As a special case, if "install-sh" is required, that requirement
+    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+    # and $ac_install_sh is set appropriately for whichever one is found.
+    if test x"$ac_aux" = x"install-sh"
+    then
+      if test -f "${as_dir}install-sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        ac_install_sh="${as_dir}install-sh -c"
+      elif test -f "${as_dir}install.sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        ac_install_sh="${as_dir}install.sh -c"
+      elif test -f "${as_dir}shtool"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        ac_install_sh="${as_dir}shtool install -c"
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+        else
+          break
+        fi
+      fi
+    else
+      if test -f "${as_dir}${ac_aux}"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+        else
+          break
+        fi
+      fi
+    fi
+  done
+  if test "$ac_aux_dir_found" = yes; then
+    ac_aux_dir="$as_dir"
+    break
+  fi
+  ac_first_candidate=false
+
+  as_found=false
 done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
+IFS=$as_save_IFS
+if $as_found
+then :
 
-else
-  ac_file=''
+else $as_nop
+  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+  ac_configure="$SHELL ${ac_aux_dir}configure"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
 
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
   esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
 done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+if $ac_cache_corrupted; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+	    and start over" "$LINENO" 5
 fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
 
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
+# cross-compile macros
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+
+  # Make sure we can run config.sub.
+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
 else
-  ac_compiler_gnu=no
+  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
+# check existence of the package
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
 
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
+# preserve any CFLAGS or LDFLAGS that may be set
+# NOTE: This must be done before calling any macros that end up
+# calling AC_PROG_CC or the like, since they will set a default
+# set of CFLAGS ("-g -O2") if the user did not supply any, and
+# we don't want those default flags to be carried over into the
+# rest of the build system since we have other means of controlling
+# debugging symbol generation and optimization.
+CONFIG_CFLAGS="${CFLAGS}"
+CONFIG_LDFLAGS="${LDFLAGS}"
+
+
+
+# specify output header file
+ac_config_headers="$ac_config_headers include/asterisk/autoconfig.h"
+
+
+# Note: AC_PROG_CC *must* be specified before AC_USE_SYSTEM_EXTENSIONS or any
+# other macro that uses the C compiler, or the default order will be used.
 
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
 
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
 
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
-fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
@@ -4282,458 +4281,842 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in gcc cc
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-else
-  # Broken: fails on valid input.
-continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
-    done
-    ac_cv_prog_CPP=$CPP
 
+    test -n "$CC" && break
+  done
 fi
-  CPP=$ac_cv_prog_CPP
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in gcc cc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-else
-  # Broken: fails on valid input.
-continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  # Passes both tests.
-ac_preproc_ok=:
-break
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
 
+
+  test -n "$ac_ct_CC" && break
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+# Provide some information about the compiler.
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion -version; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
   fi
-else
-  ac_cv_path_GREP=$GREP
-fi
+  rm -f conftest.er1 conftest.err
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+int
+main (void)
+{
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
+else $as_nop
+  ac_file=''
 fi
+if test -z "$ac_file"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-   fi
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main (void)
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <string.h>
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
+int
+main (void)
+{
+#ifndef __GNUC__
+       choke me
+#endif
 
-else
-  ac_cv_header_stdc=no
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_compiler_gnu=yes
+else $as_nop
+  ac_compiler_gnu=no
 fi
-rm -f conftest*
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+y}
+ac_save_CFLAGS=$CFLAGS
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
 
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_g=yes
+else $as_nop
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
+int
+main (void)
+{
 
-fi
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else $as_nop
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 int
-main ()
+main (void)
 {
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
+
+  ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
 else
-  ac_cv_header_stdc=no
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c11=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
 fi
 
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c89_program
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
+fi
 fi
 
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-fi
 
+
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+    fi
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
+  fi
 done
 
 
 
-  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
-  MINIX=yes
-else
-  MINIX=
-fi
 
 
-  if test "$MINIX" = yes; then
 
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
 
 
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
 
+fi
 
-$as_echo "#define _MINIX 1" >>confdefs.h
 
-  fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #         define __EXTENSIONS__ 1
           $ac_includes_default
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_safe_to_define___extensions__=yes
-else
+else $as_nop
   ac_cv_safe_to_define___extensions__=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_should_define__xopen_source=no
+    if test $ac_cv_header_wchar_h = yes
+then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+          #include <wchar.h>
+          mbstate_t x;
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else $as_nop
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+            #define _XOPEN_SOURCE 500
+            #include <wchar.h>
+            mbstate_t x;
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_should_define__xopen_source=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-  test $ac_cv_safe_to_define___extensions__ = yes &&
-    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+
+  printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+
+  printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+
+  printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+  printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+  printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+  if test $ac_cv_header_minix_config_h = yes
+then :
+  MINIX=yes
+    printf "%s\n" "#define _MINIX 1" >>confdefs.h
 
-  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+    printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
 
-  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+    printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
-  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+else $as_nop
+  MINIX=
+fi
+  if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+  printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
 
-  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+fi
+  if test $ac_cv_should_define__xopen_source = yes
+then :
+  printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
 
+fi
 
 # System default paths
 astsbindir='${sbindir}'
@@ -4798,10 +5181,10 @@
         astvarrundir='/Library/Application Support/Asterisk/Run'
      fi
 
-$as_echo "#define AST_POLL_COMPAT 1" >>confdefs.h
+printf "%s\n" "#define AST_POLL_COMPAT 1" >>confdefs.h
 
 
-$as_echo "#define _DARWIN_UNLIMITED_SELECT 1" >>confdefs.h
+printf "%s\n" "#define _DARWIN_UNLIMITED_SELECT 1" >>confdefs.h
 
      ;;
      solaris*)
@@ -4898,8 +5281,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
-$as_echo_n "checking whether char is unsigned... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
+printf %s "checking whether char is unsigned... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -4910,32 +5293,34 @@
 
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 		CONFIG_SIGNED_CHAR=""
 
-else
+else $as_nop
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		CONFIG_SIGNED_CHAR="-fsigned-char"
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 #  check for uname
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}uname", so it can be a program name with args.
 set dummy ${ac_tool_prefix}uname; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_UNAME+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_UNAME+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $UNAME in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_UNAME="$UNAME" # Let the user override the test with a path.
@@ -4945,11 +5330,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_UNAME="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_UNAME="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4961,11 +5350,11 @@
 fi
 UNAME=$ac_cv_path_UNAME
 if test -n "$UNAME"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNAME" >&5
-$as_echo "$UNAME" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UNAME" >&5
+printf "%s\n" "$UNAME" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4974,11 +5363,12 @@
   ac_pt_UNAME=$UNAME
   # Extract the first word of "uname", so it can be a program name with args.
 set dummy uname; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_UNAME+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_UNAME+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_UNAME in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_UNAME="$ac_pt_UNAME" # Let the user override the test with a path.
@@ -4988,11 +5378,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_UNAME="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_UNAME="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5004,11 +5398,11 @@
 fi
 ac_pt_UNAME=$ac_cv_path_ac_pt_UNAME
 if test -n "$ac_pt_UNAME"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_UNAME" >&5
-$as_echo "$ac_pt_UNAME" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_UNAME" >&5
+printf "%s\n" "$ac_pt_UNAME" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_UNAME" = x; then
@@ -5016,8 +5410,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     UNAME=$ac_pt_UNAME
@@ -5041,11 +5435,12 @@
    if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -5053,11 +5448,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5068,11 +5467,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5081,11 +5480,12 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -5093,11 +5493,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5108,11 +5512,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -5120,8 +5524,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -5133,11 +5537,12 @@
    if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args.
 set dummy ${ac_tool_prefix}g++; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -5145,11 +5550,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="${ac_tool_prefix}g++"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5160,11 +5569,11 @@
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5173,11 +5582,12 @@
   ac_ct_CXX=$CXX
   # Extract the first word of "g++", so it can be a program name with args.
 set dummy g++; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
@@ -5185,11 +5595,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="g++"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5200,11 +5614,11 @@
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+printf "%s\n" "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_CXX" = x; then
@@ -5212,8 +5626,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -5225,11 +5639,12 @@
    if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ld; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_LD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$LD"; then
   ac_cv_prog_LD="$LD" # Let the user override the test.
 else
@@ -5237,11 +5652,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_LD="${ac_tool_prefix}ld"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5252,11 +5671,11 @@
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf "%s\n" "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5265,11 +5684,12 @@
   ac_ct_LD=$LD
   # Extract the first word of "ld", so it can be a program name with args.
 set dummy ld; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_LD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_LD"; then
   ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test.
 else
@@ -5277,11 +5697,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LD="ld"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5292,11 +5716,11 @@
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LD" >&5
-$as_echo "$ac_ct_LD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LD" >&5
+printf "%s\n" "$ac_ct_LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_LD" = x; then
@@ -5304,8 +5728,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LD=$ac_ct_LD
@@ -5317,11 +5741,12 @@
    if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
@@ -5329,11 +5754,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5344,11 +5773,11 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf "%s\n" "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5357,11 +5786,12 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
@@ -5369,11 +5799,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5384,11 +5818,11 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf "%s\n" "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -5396,8 +5830,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -5411,6 +5845,12 @@
 fi
 
 # Checks for programs.
+
+
+
+
+
+
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5421,15 +5861,16 @@
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -5437,11 +5878,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5452,11 +5897,11 @@
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5465,15 +5910,16 @@
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
@@ -5481,11 +5927,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5496,11 +5946,11 @@
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+printf "%s\n" "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5512,8 +5962,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -5523,7 +5973,7 @@
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -5533,7 +5983,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -5543,20 +5993,21 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
+printf %s "checking whether the compiler supports GNU C++... " >&6; }
+if test ${ac_cv_cxx_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -5566,29 +6017,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GXX=yes
 else
   GXX=
 fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_test_CXXFLAGS=${CXXFLAGS+y}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+printf %s "checking whether $CXX accepts -g... " >&6; }
+if test ${ac_cv_prog_cxx_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
@@ -5597,57 +6052,60 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_cv_prog_cxx_g=yes
-else
+else $as_nop
   CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
+if test $ac_test_CXXFLAGS; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
@@ -5662,6 +6120,100 @@
     CXXFLAGS=
   fi
 fi
+ac_prog_cxx_stdcxx=no
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
+printf %s "checking for $CXX option to enable C++11 features... " >&6; }
+if test ${ac_cv_prog_cxx_11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cxx_11=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_cxx_conftest_cxx11_program
+_ACEOF
+for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
+do
+  CXX="$ac_save_CXX $ac_arg"
+  if ac_fn_cxx_try_compile "$LINENO"
+then :
+  ac_cv_prog_cxx_cxx11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX
+fi
+
+if test "x$ac_cv_prog_cxx_cxx11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cxx_cxx11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
+     CXX="$CXX $ac_cv_prog_cxx_cxx11"
+fi
+  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
+  ac_prog_cxx_stdcxx=cxx11
+fi
+fi
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
+printf %s "checking for $CXX option to enable C++98 features... " >&6; }
+if test ${ac_cv_prog_cxx_98+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cxx_98=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_cxx_conftest_cxx98_program
+_ACEOF
+for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
+do
+  CXX="$ac_save_CXX $ac_arg"
+  if ac_fn_cxx_try_compile "$LINENO"
+then :
+  ac_cv_prog_cxx_cxx98=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX
+fi
+
+if test "x$ac_cv_prog_cxx_cxx98" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cxx_cxx98" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
+     CXX="$CXX $ac_cv_prog_cxx_cxx98"
+fi
+  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
+  ac_prog_cxx_stdcxx=cxx98
+fi
+fi
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5673,40 +6225,36 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+  if test ${ac_cv_prog_CPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CC needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -5718,10 +6266,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -5731,7 +6280,8 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -5743,29 +6293,24 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf "%s\n" "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -5777,10 +6322,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -5790,11 +6336,12 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -5810,36 +6357,32 @@
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+printf %s "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
+  if test ${ac_cv_prog_CXXCPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CXX needs to be expanded
+    for CXXCPP in "$CXX -E" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -5851,10 +6394,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -5864,7 +6408,8 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -5876,29 +6421,24 @@
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+printf "%s\n" "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -5910,10 +6450,11 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+if ac_fn_cxx_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -5923,11 +6464,12 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -5940,11 +6482,12 @@
 
 # This macro is just copied into our local acinclude.m4 from libtool.m4 so that
 # the developers regenerating the configure script don't have to install libtool.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
@@ -5958,10 +6501,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in sed gsed
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
@@ -5970,13 +6518,13 @@
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
+    printf "%s\n" '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6004,39 +6552,41 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf "%s\n" "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_prog_egrep+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_prog_egrep+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if echo a | (grep -E '(a|b)') >/dev/null 2>&1
     then ac_cv_prog_egrep='grep -E'
     else ac_cv_prog_egrep='egrep'
     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_egrep" >&5
-$as_echo "$ac_cv_prog_egrep" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_egrep" >&5
+printf "%s\n" "$ac_cv_prog_egrep" >&6; }
  EGREP=$ac_cv_prog_egrep
 
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
+if test ${with_gnu_ld+y}
+then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
+else $as_nop
   with_gnu_ld=no
 fi
 
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+printf %s "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -6065,15 +6615,16 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+printf %s "checking for non-GNU ld... " >&6; }
 fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${lt_cv_path_LD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
@@ -6102,18 +6653,19 @@
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf "%s\n" "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
+if test ${lt_cv_prog_gnu_ld+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
@@ -6124,8 +6676,8 @@
   ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 	# note, does not work on FreeBSD
@@ -6133,11 +6685,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AWK+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
@@ -6145,11 +6698,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6160,18 +6717,19 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf "%s\n" "$AWK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-# Find a good install program.  We prefer a C program (faster),
+
+  # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
 # SysV /etc/install, /usr/sbin/install
@@ -6185,20 +6743,25 @@
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${ac_cv_path_install+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    # Account for fact that we put trailing slashes in our PATH walk.
+case $as_dir in #((
+  ./ | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
@@ -6208,13 +6771,13 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
 	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
@@ -6222,12 +6785,12 @@
 	    echo one > conftest.one
 	    echo two > conftest.two
 	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	    if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
 	      test -s conftest.one && test -s conftest.two &&
 	      test -s conftest.dir/conftest.one &&
 	      test -s conftest.dir/conftest.two
 	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
 	      break 3
 	    fi
 	  fi
@@ -6243,7 +6806,7 @@
 rm -rf conftest.one conftest.two conftest.dir
 
 fi
-  if test "${ac_cv_path_install+set}" = set; then
+  if test ${ac_cv_path_install+y}; then
     INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  Don't cache a
@@ -6253,8 +6816,8 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf "%s\n" "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -6264,25 +6827,26 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf "%s\n" "no, using $LN_S" >&6; }
 fi
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
@@ -6290,11 +6854,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6305,11 +6873,11 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf "%s\n" "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6318,11 +6886,12 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
@@ -6330,11 +6899,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6345,11 +6918,11 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf "%s\n" "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -6357,8 +6930,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -6367,11 +6940,12 @@
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
-$as_echo_n "checking for GNU make... " >&6; }
-if ${ac_cv_GNU_MAKE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
+printf %s "checking for GNU make... " >&6; }
+if test ${ac_cv_GNU_MAKE+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_GNU_MAKE='Not Found' ;
    ac_cv_GNU_MAKE_VERSION_MAJOR=0 ;
    ac_cv_GNU_MAKE_VERSION_MINOR=0 ;
@@ -6386,8 +6960,8 @@
    done ;
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_GNU_MAKE" >&5
-$as_echo "$ac_cv_GNU_MAKE" >&6; } ;
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_GNU_MAKE" >&5
+printf "%s\n" "$ac_cv_GNU_MAKE" >&6; } ;
 if test  "x$ac_cv_GNU_MAKE" = "xNot Found"  ; then
    as_fn_error $? "*** Please install GNU make.  It is required to build Asterisk!" "$LINENO" 5
    exit 1
@@ -6395,11 +6969,81 @@
 GNU_MAKE=$ac_cv_GNU_MAKE
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+printf %s "checking for grep that handles long lines and -e... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in grep ggrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf "%s\n" "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
@@ -6410,10 +7054,15 @@
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
@@ -6422,13 +7071,13 @@
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -6457,8 +7106,8 @@
 
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
@@ -6468,11 +7117,12 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
@@ -6480,11 +7130,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6495,11 +7149,11 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf "%s\n" "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6512,11 +7166,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
@@ -6524,11 +7179,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6539,11 +7198,11 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf "%s\n" "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6555,8 +7214,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -6568,11 +7227,12 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
@@ -6580,11 +7240,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6595,11 +7259,11 @@
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf "%s\n" "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6612,11 +7276,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
@@ -6624,11 +7289,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6639,11 +7308,11 @@
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf "%s\n" "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6655,8 +7324,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -6672,11 +7341,12 @@
 
 # Extract the first word of "bison", so it can be a program name with args.
 set dummy bison; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BISON+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_BISON+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $BISON in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_BISON="$BISON" # Let the user override the test with a path.
@@ -6686,11 +7356,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_BISON="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6703,21 +7377,22 @@
 fi
 BISON=$ac_cv_path_BISON
 if test -n "$BISON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
-$as_echo "$BISON" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5
+printf "%s\n" "$BISON" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "cmp", so it can be a program name with args.
 set dummy cmp; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CMP in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CMP="$CMP" # Let the user override the test with a path.
@@ -6727,11 +7402,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CMP="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6744,21 +7423,22 @@
 fi
 CMP=$ac_cv_path_CMP
 if test -n "$CMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CMP" >&5
-$as_echo "$CMP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CMP" >&5
+printf "%s\n" "$CMP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "cat", so it can be a program name with args.
 set dummy cat; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CAT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CAT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CAT in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CAT="$CAT" # Let the user override the test with a path.
@@ -6768,11 +7448,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CAT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CAT="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6785,21 +7469,22 @@
 fi
 CAT=$ac_cv_path_CAT
 if test -n "$CAT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAT" >&5
-$as_echo "$CAT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CAT" >&5
+printf "%s\n" "$CAT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "cut", so it can be a program name with args.
 set dummy cut; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CUT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CUT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CUT in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CUT="$CUT" # Let the user override the test with a path.
@@ -6809,11 +7494,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CUT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CUT="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6826,21 +7515,22 @@
 fi
 CUT=$ac_cv_path_CUT
 if test -n "$CUT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUT" >&5
-$as_echo "$CUT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CUT" >&5
+printf "%s\n" "$CUT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_FLEX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_FLEX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $FLEX in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_FLEX="$FLEX" # Let the user override the test with a path.
@@ -6850,11 +7540,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_FLEX="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6867,21 +7561,22 @@
 fi
 FLEX=$ac_cv_path_FLEX
 if test -n "$FLEX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
-$as_echo "$FLEX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5
+printf "%s\n" "$FLEX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "grep", so it can be a program name with args.
 set dummy grep; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $GREP in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_GREP="$GREP" # Let the user override the test with a path.
@@ -6891,11 +7586,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GREP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_GREP="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6908,11 +7607,11 @@
 fi
 GREP=$ac_cv_path_GREP
 if test -n "$GREP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GREP" >&5
-$as_echo "$GREP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GREP" >&5
+printf "%s\n" "$GREP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6920,11 +7619,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PYTHON+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PYTHON+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $PYTHON in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
@@ -6934,11 +7634,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PYTHON="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6950,11 +7654,11 @@
 fi
 PYTHON=$ac_cv_path_PYTHON
 if test -n "$PYTHON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-$as_echo "$PYTHON" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+printf "%s\n" "$PYTHON" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6964,11 +7668,12 @@
 
 # Extract the first word of "find", so it can be a program name with args.
 set dummy find; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_FIND+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_FIND+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $FIND in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_FIND="$FIND" # Let the user override the test with a path.
@@ -6978,11 +7683,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_FIND="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6995,21 +7704,22 @@
 fi
 FIND=$ac_cv_path_FIND
 if test -n "$FIND"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIND" >&5
-$as_echo "$FIND" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FIND" >&5
+printf "%s\n" "$FIND" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "basename", so it can be a program name with args.
 set dummy basename; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BASENAME+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_BASENAME+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $BASENAME in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path.
@@ -7019,11 +7729,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BASENAME="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_BASENAME="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7036,21 +7750,22 @@
 fi
 BASENAME=$ac_cv_path_BASENAME
 if test -n "$BASENAME"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASENAME" >&5
-$as_echo "$BASENAME" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BASENAME" >&5
+printf "%s\n" "$BASENAME" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "dirname", so it can be a program name with args.
 set dummy dirname; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DIRNAME+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_DIRNAME+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $DIRNAME in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_DIRNAME="$DIRNAME" # Let the user override the test with a path.
@@ -7060,11 +7775,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DIRNAME="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_DIRNAME="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7077,21 +7796,22 @@
 fi
 DIRNAME=$ac_cv_path_DIRNAME
 if test -n "$DIRNAME"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIRNAME" >&5
-$as_echo "$DIRNAME" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DIRNAME" >&5
+printf "%s\n" "$DIRNAME" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "sh", so it can be a program name with args.
 set dummy sh; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SHELL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_SHELL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $SHELL in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_SHELL="$SHELL" # Let the user override the test with a path.
@@ -7101,11 +7821,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SHELL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_SHELL="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7118,21 +7842,22 @@
 fi
 SHELL=$ac_cv_path_SHELL
 if test -n "$SHELL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHELL" >&5
-$as_echo "$SHELL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SHELL" >&5
+printf "%s\n" "$SHELL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "ln", so it can be a program name with args.
 set dummy ln; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_LN+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $LN in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_LN="$LN" # Let the user override the test with a path.
@@ -7142,11 +7867,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_LN="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7159,21 +7888,22 @@
 fi
 LN=$ac_cv_path_LN
 if test -n "$LN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5
-$as_echo "$LN" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LN" >&5
+printf "%s\n" "$LN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "doxygen", so it can be a program name with args.
 set dummy doxygen; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DOXYGEN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_DOXYGEN+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $DOXYGEN in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_DOXYGEN="$DOXYGEN" # Let the user override the test with a path.
@@ -7183,11 +7913,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_DOXYGEN="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7200,21 +7934,22 @@
 fi
 DOXYGEN=$ac_cv_path_DOXYGEN
 if test -n "$DOXYGEN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
-$as_echo "$DOXYGEN" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5
+printf "%s\n" "$DOXYGEN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "dot", so it can be a program name with args.
 set dummy dot; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DOT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_DOT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $DOT in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_DOT="$DOT" # Let the user override the test with a path.
@@ -7224,11 +7959,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_DOT="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7241,21 +7980,22 @@
 fi
 DOT=$ac_cv_path_DOT
 if test -n "$DOT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5
-$as_echo "$DOT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5
+printf "%s\n" "$DOT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "wget", so it can be a program name with args.
 set dummy wget; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_WGET+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_WGET+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $WGET in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_WGET="$WGET" # Let the user override the test with a path.
@@ -7265,11 +8005,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_WGET="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_WGET="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7282,21 +8026,22 @@
 fi
 WGET=$ac_cv_path_WGET
 if test -n "$WGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
-$as_echo "$WGET" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
+printf "%s\n" "$WGET" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "curl", so it can be a program name with args.
 set dummy curl; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CURL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CURL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CURL in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CURL="$CURL" # Let the user override the test with a path.
@@ -7306,11 +8051,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CURL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CURL="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7323,21 +8072,22 @@
 fi
 CURL=$ac_cv_path_CURL
 if test -n "$CURL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL" >&5
-$as_echo "$CURL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CURL" >&5
+printf "%s\n" "$CURL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "xmllint", so it can be a program name with args.
 set dummy xmllint; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XMLLINT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_XMLLINT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $XMLLINT in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_XMLLINT="$XMLLINT" # Let the user override the test with a path.
@@ -7347,11 +8097,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XMLLINT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_XMLLINT="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7364,11 +8118,11 @@
 fi
 XMLLINT=$ac_cv_path_XMLLINT
 if test -n "$XMLLINT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
-$as_echo "$XMLLINT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
+printf "%s\n" "$XMLLINT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7376,11 +8130,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XMLSTARLET+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_XMLSTARLET+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $XMLSTARLET in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_XMLSTARLET="$XMLSTARLET" # Let the user override the test with a path.
@@ -7390,11 +8145,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XMLSTARLET="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_XMLSTARLET="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7406,11 +8165,11 @@
 fi
 XMLSTARLET=$ac_cv_path_XMLSTARLET
 if test -n "$XMLSTARLET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLSTARLET" >&5
-$as_echo "$XMLSTARLET" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XMLSTARLET" >&5
+printf "%s\n" "$XMLSTARLET" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7420,11 +8179,12 @@
 
 # Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BASH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_BASH+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $BASH in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_BASH="$BASH" # Let the user override the test with a path.
@@ -7434,11 +8194,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_BASH="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7451,21 +8215,22 @@
 fi
 BASH=$ac_cv_path_BASH
 if test -n "$BASH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5
-$as_echo "$BASH" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5
+printf "%s\n" "$BASH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "git", so it can be a program name with args.
 set dummy git; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_GIT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $GIT in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_GIT="$GIT" # Let the user override the test with a path.
@@ -7475,11 +8240,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GIT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_GIT="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7492,21 +8261,22 @@
 fi
 GIT=$ac_cv_path_GIT
 if test -n "$GIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5
-$as_echo "$GIT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5
+printf "%s\n" "$GIT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "alembic", so it can be a program name with args.
 set dummy alembic; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ALEMBIC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ALEMBIC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ALEMBIC in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ALEMBIC="$ALEMBIC" # Let the user override the test with a path.
@@ -7516,11 +8286,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ALEMBIC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ALEMBIC="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7533,21 +8307,22 @@
 fi
 ALEMBIC=$ac_cv_path_ALEMBIC
 if test -n "$ALEMBIC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALEMBIC" >&5
-$as_echo "$ALEMBIC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ALEMBIC" >&5
+printf "%s\n" "$ALEMBIC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "bzip2", so it can be a program name with args.
 set dummy bzip2; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_BZIP2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_BZIP2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $BZIP2 in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_BZIP2="$BZIP2" # Let the user override the test with a path.
@@ -7557,11 +8332,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_BZIP2="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7574,21 +8353,22 @@
 fi
 BZIP2=$ac_cv_path_BZIP2
 if test -n "$BZIP2"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2" >&5
-$as_echo "$BZIP2" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BZIP2" >&5
+printf "%s\n" "$BZIP2" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "tar", so it can be a program name with args.
 set dummy tar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TAR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_TAR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $TAR in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_TAR="$TAR" # Let the user override the test with a path.
@@ -7598,11 +8378,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_TAR="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7615,21 +8399,22 @@
 fi
 TAR=$ac_cv_path_TAR
 if test -n "$TAR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5
-$as_echo "$TAR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5
+printf "%s\n" "$TAR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "patch", so it can be a program name with args.
 set dummy patch; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PATCH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PATCH+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $PATCH in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PATCH="$PATCH" # Let the user override the test with a path.
@@ -7639,11 +8424,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PATCH="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7656,21 +8445,22 @@
 fi
 PATCH=$ac_cv_path_PATCH
 if test -n "$PATCH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5
-$as_echo "$PATCH" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5
+printf "%s\n" "$PATCH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "sed", so it can be a program name with args.
 set dummy sed; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $SED in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_SED="$SED" # Let the user override the test with a path.
@@ -7680,11 +8470,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_SED="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7697,21 +8491,22 @@
 fi
 SED=$ac_cv_path_SED
 if test -n "$SED"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
-$as_echo "$SED" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+printf "%s\n" "$SED" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "nm", so it can be a program name with args.
 set dummy nm; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_NM+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $NM in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_NM="$NM" # Let the user override the test with a path.
@@ -7721,11 +8516,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_NM="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7738,21 +8537,22 @@
 fi
 NM=$ac_cv_path_NM
 if test -n "$NM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
-$as_echo "$NM" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
+printf "%s\n" "$NM" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "realpath", so it can be a program name with args.
 set dummy realpath; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_REALPATH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_REALPATH+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $REALPATH in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_REALPATH="$REALPATH" # Let the user override the test with a path.
@@ -7762,11 +8562,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_REALPATH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_REALPATH="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7779,11 +8583,11 @@
 fi
 REALPATH=$ac_cv_path_REALPATH
 if test -n "$REALPATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $REALPATH" >&5
-$as_echo "$REALPATH" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $REALPATH" >&5
+printf "%s\n" "$REALPATH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7803,11 +8607,12 @@
 else
   # Extract the first word of "fetch", so it can be a program name with args.
 set dummy fetch; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_FETCH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_FETCH+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $FETCH in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_FETCH="$FETCH" # Let the user override the test with a path.
@@ -7817,11 +8622,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_FETCH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_FETCH="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7834,11 +8643,11 @@
 fi
 FETCH=$ac_cv_path_FETCH
 if test -n "$FETCH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FETCH" >&5
-$as_echo "$FETCH" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FETCH" >&5
+printf "%s\n" "$FETCH" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7854,11 +8663,12 @@
 
 # Extract the first word of "ldconfig", so it can be a program name with args.
 set dummy ldconfig; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LDCONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_LDCONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $LDCONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_LDCONFIG="$LDCONFIG" # Let the user override the test with a path.
@@ -7868,11 +8678,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LDCONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_LDCONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7885,21 +8699,22 @@
 fi
 LDCONFIG=$ac_cv_path_LDCONFIG
 if test -n "$LDCONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDCONFIG" >&5
-$as_echo "$LDCONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LDCONFIG" >&5
+printf "%s\n" "$LDCONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "sha1sum", so it can be a program name with args.
 set dummy sha1sum; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SHA1SUM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_SHA1SUM+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $SHA1SUM in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_SHA1SUM="$SHA1SUM" # Let the user override the test with a path.
@@ -7909,11 +8724,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SHA1SUM="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_SHA1SUM="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7926,21 +8745,22 @@
 fi
 SHA1SUM=$ac_cv_path_SHA1SUM
 if test -n "$SHA1SUM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHA1SUM" >&5
-$as_echo "$SHA1SUM" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SHA1SUM" >&5
+printf "%s\n" "$SHA1SUM" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "openssl", so it can be a program name with args.
 set dummy openssl; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_OPENSSL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_OPENSSL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $OPENSSL in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_OPENSSL="$OPENSSL" # Let the user override the test with a path.
@@ -7950,11 +8770,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_OPENSSL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_OPENSSL="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7967,11 +8791,11 @@
 fi
 OPENSSL=$ac_cv_path_OPENSSL
 if test -n "$OPENSSL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL" >&5
-$as_echo "$OPENSSL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OPENSSL" >&5
+printf "%s\n" "$OPENSSL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7987,11 +8811,12 @@
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
@@ -8001,11 +8826,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8017,11 +8846,11 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -8030,11 +8859,12 @@
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
@@ -8044,11 +8874,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8060,11 +8894,11 @@
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -8072,8 +8906,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -8085,23 +8919,24 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison that supports parse-param" >&5
-$as_echo_n "checking for bison that supports parse-param... " >&6; }
-if ${ac_cv_path_BISON2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bison that supports parse-param" >&5
+printf %s "checking for bison that supports parse-param... " >&6; }
+if test ${ac_cv_path_BISON2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
 	if test "x$BISON" != "x:" ; then
 		# Create a temporary directory $tmp in $TMPDIR (default /tmp).
@@ -8132,8 +8967,8 @@
 	fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_BISON2" >&5
-$as_echo "$ac_cv_path_BISON2" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_BISON2" >&5
+printf "%s\n" "$ac_cv_path_BISON2" >&6; }
 if test "x${ac_cv_path_BISON2}" = "x" ; then
 	BISON=:
 	PBX_BISON=0
@@ -8166,11 +9001,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}soxmix", so it can be a program name with args.
 set dummy ${ac_tool_prefix}soxmix; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_SOXMIX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_SOXMIX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$SOXMIX"; then
   ac_cv_prog_SOXMIX="$SOXMIX" # Let the user override the test.
 else
@@ -8178,11 +9014,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_SOXMIX="${ac_tool_prefix}soxmix"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8193,11 +9033,11 @@
 fi
 SOXMIX=$ac_cv_prog_SOXMIX
 if test -n "$SOXMIX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOXMIX" >&5
-$as_echo "$SOXMIX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SOXMIX" >&5
+printf "%s\n" "$SOXMIX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -8206,11 +9046,12 @@
   ac_ct_SOXMIX=$SOXMIX
   # Extract the first word of "soxmix", so it can be a program name with args.
 set dummy soxmix; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_SOXMIX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_SOXMIX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_SOXMIX"; then
   ac_cv_prog_ac_ct_SOXMIX="$ac_ct_SOXMIX" # Let the user override the test.
 else
@@ -8218,11 +9059,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_SOXMIX="soxmix"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8233,11 +9078,11 @@
 fi
 ac_ct_SOXMIX=$ac_cv_prog_ac_ct_SOXMIX
 if test -n "$ac_ct_SOXMIX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_SOXMIX" >&5
-$as_echo "$ac_ct_SOXMIX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_SOXMIX" >&5
+printf "%s\n" "$ac_ct_SOXMIX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_SOXMIX" = x; then
@@ -8245,8 +9090,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     SOXMIX=$ac_ct_SOXMIX
@@ -8257,7 +9102,7 @@
 
 if test "x${SOXMIX}" != "x:"; then
 
-$as_echo "#define HAVE_SOXMIX 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SOXMIX 1" >>confdefs.h
 
 fi
 
@@ -8265,11 +9110,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MD5+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_MD5+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$MD5"; then
   ac_cv_prog_MD5="$MD5" # Let the user override the test.
 else
@@ -8277,11 +9123,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_MD5="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8292,11 +9142,11 @@
 fi
 MD5=$ac_cv_prog_MD5
 if test -n "$MD5"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MD5" >&5
-$as_echo "$MD5" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MD5" >&5
+printf "%s\n" "$MD5" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -8308,11 +9158,12 @@
    MD5="${MD5} -a md5"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
@@ -8326,10 +9177,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in sed gsed
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
@@ -8338,13 +9194,13 @@
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
+    printf "%s\n" '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -8372,8 +9228,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf "%s\n" "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -8381,6 +9237,7 @@
 
 
 
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8400,38 +9257,37 @@
         ax_pthread_save_CC="$CC"
         ax_pthread_save_CFLAGS="$CFLAGS"
         ax_pthread_save_LIBS="$LIBS"
-        if test "x$PTHREAD_CC" != "x"; then :
+        if test "x$PTHREAD_CC" != "x"
+then :
   CC="$PTHREAD_CC"
 fi
         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
         LIBS="$PTHREAD_LIBS $LIBS"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5
-$as_echo_n "checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS... " >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5
+printf %s "checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS... " >&6; }
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pthread_join ();
 int
-main ()
+main (void)
 {
 return pthread_join ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ax_pthread_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
-$as_echo "$ax_pthread_ok" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+printf "%s\n" "$ax_pthread_ok" >&6; }
         if test "x$ax_pthread_ok" = "xno"; then
                 PTHREAD_LIBS=""
                 PTHREAD_CFLAGS=""
@@ -8507,11 +9363,12 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5
-$as_echo "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&2;}
+  $EGREP "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5
+printf "%s\n" "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&2;}
 fi
-rm -f conftest*
+rm -rf conftest*
 
         ;;
 
@@ -8531,7 +9388,8 @@
 
 # GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
 
-if test "x$GCC" = "xyes"; then :
+if test "x$GCC" = "xyes"
+then :
   ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"
 fi
 
@@ -8552,19 +9410,21 @@
         ax_pthread_check_macro="--"
         ;;
 esac
-if test "x$ax_pthread_check_macro" = "x--"; then :
+if test "x$ax_pthread_check_macro" = "x--"
+then :
   ax_pthread_check_cond=0
-else
+else $as_nop
   ax_pthread_check_cond="!defined($ax_pthread_check_macro)"
 fi
 
 # Are we compiling with Clang?
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC is Clang" >&5
-$as_echo_n "checking whether $CC is Clang... " >&6; }
-if ${ax_cv_PTHREAD_CLANG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC is Clang" >&5
+printf %s "checking whether $CC is Clang... " >&6; }
+if test ${ax_cv_PTHREAD_CLANG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ax_cv_PTHREAD_CLANG=no
      # Note that Autoconf sets GCC=yes for Clang as well as GCC
      if test "x$GCC" = "xyes"; then
@@ -8577,16 +9437,17 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1; then :
+  $EGREP "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1
+then :
   ax_cv_PTHREAD_CLANG=yes
 fi
-rm -f conftest*
+rm -rf conftest*
 
      fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5
-$as_echo "$ax_cv_PTHREAD_CLANG" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5
+printf "%s\n" "$ax_cv_PTHREAD_CLANG" >&6; }
 ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
 
 ax_pthread_clang_warning=no
@@ -8632,11 +9493,12 @@
         # that build with -Werror.  So if the active version of Clang has
         # this misfeature, we search for an option to squash it.
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5
-$as_echo_n "checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread... " >&6; }
-if ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5
+printf %s "checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread... " >&6; }
+if test ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
              # Create an alternate version of $ac_link that compiles and
              # links in two steps (.c -> .o, .o -> exe) instead of one
@@ -8648,7 +9510,8 @@
              ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
              ax_pthread_save_CFLAGS="$CFLAGS"
              for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-                if test "x$ax_pthread_try" = "xunknown"; then :
+                if test "x$ax_pthread_try" = "xunknown"
+then :
   break
 fi
                 CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
@@ -8657,32 +9520,35 @@
 /* end confdefs.h.  */
 int main(void){return 0;}
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_link="$ax_pthread_2step_ac_link"
                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void){return 0;}
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   break
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
              done
              ac_link="$ax_pthread_save_ac_link"
              CFLAGS="$ax_pthread_save_CFLAGS"
-             if test "x$ax_pthread_try" = "x"; then :
+             if test "x$ax_pthread_try" = "x"
+then :
   ax_pthread_try=no
 fi
              ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5
-$as_echo "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5
+printf "%s\n" "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; }
 
         case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
                 no | unknown) ;;
@@ -8696,31 +9562,32 @@
 
         case $ax_pthread_try_flag in
                 none)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
-$as_echo_n "checking whether pthreads work without any flags... " >&6; }
+                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
+printf %s "checking whether pthreads work without any flags... " >&6; }
                 ;;
 
                 -mt,pthread)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with -mt -lpthread" >&5
-$as_echo_n "checking whether pthreads work with -mt -lpthread... " >&6; }
+                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with -mt -lpthread" >&5
+printf %s "checking whether pthreads work with -mt -lpthread... " >&6; }
                 PTHREAD_CFLAGS="-mt"
                 PTHREAD_LIBS="-lpthread"
                 ;;
 
                 -*)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5
-$as_echo_n "checking whether pthreads work with $ax_pthread_try_flag... " >&6; }
+                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5
+printf %s "checking whether pthreads work with $ax_pthread_try_flag... " >&6; }
                 PTHREAD_CFLAGS="$ax_pthread_try_flag"
                 ;;
 
                 pthread-config)
                 # Extract the first word of "pthread-config", so it can be a program name with args.
 set dummy pthread-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ax_pthread_config+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ax_pthread_config+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ax_pthread_config"; then
   ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test.
 else
@@ -8728,11 +9595,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ax_pthread_config="yes"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8744,15 +9615,16 @@
 fi
 ax_pthread_config=$ac_cv_prog_ax_pthread_config
 if test -n "$ax_pthread_config"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5
-$as_echo "$ax_pthread_config" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5
+printf "%s\n" "$ax_pthread_config" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
-                if test "x$ax_pthread_config" = "xno"; then :
+                if test "x$ax_pthread_config" = "xno"
+then :
   continue
 fi
                 PTHREAD_CFLAGS="`pthread-config --cflags`"
@@ -8760,8 +9632,8 @@
                 ;;
 
                 *)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5
-$as_echo_n "checking for the pthreads library -l$ax_pthread_try_flag... " >&6; }
+                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5
+printf %s "checking for the pthreads library -l$ax_pthread_try_flag... " >&6; }
                 PTHREAD_LIBS="-l$ax_pthread_try_flag"
                 ;;
         esac
@@ -8790,7 +9662,7 @@
                         static void routine(void *a) { a = 0; }
                         static void *start_routine(void *a) { return a; }
 int
-main ()
+main (void)
 {
 pthread_t th; pthread_attr_t attr;
                         pthread_create(&th, 0, start_routine, 0);
@@ -8802,18 +9674,20 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ax_pthread_ok=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
         CFLAGS="$ax_pthread_save_CFLAGS"
         LIBS="$ax_pthread_save_LIBS"
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
-$as_echo "$ax_pthread_ok" >&6; }
-        if test "x$ax_pthread_ok" = "xyes"; then :
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+printf "%s\n" "$ax_pthread_ok" >&6; }
+        if test "x$ax_pthread_ok" = "xyes"
+then :
   break
 fi
 
@@ -8830,51 +9704,53 @@
         LIBS="$PTHREAD_LIBS $LIBS"
 
         # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
-$as_echo_n "checking for joinable pthread attribute... " >&6; }
-if ${ax_cv_PTHREAD_JOINABLE_ATTR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
+printf %s "checking for joinable pthread attribute... " >&6; }
+if test ${ax_cv_PTHREAD_JOINABLE_ATTR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ax_cv_PTHREAD_JOINABLE_ATTR=unknown
              for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
                  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 int attr = $ax_pthread_attr; return attr /* ; */
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
              done
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5
-$as_echo "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5
+printf "%s\n" "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; }
         if test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
                test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-               test "x$ax_pthread_joinable_attr_defined" != "xyes"; then :
+               test "x$ax_pthread_joinable_attr_defined" != "xyes"
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define PTHREAD_CREATE_JOINABLE $ax_cv_PTHREAD_JOINABLE_ATTR
-_ACEOF
+printf "%s\n" "#define PTHREAD_CREATE_JOINABLE $ax_cv_PTHREAD_JOINABLE_ATTR" >>confdefs.h
 
                ax_pthread_joinable_attr_defined=yes
 
 fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5
-$as_echo_n "checking whether more special flags are required for pthreads... " >&6; }
-if ${ax_cv_PTHREAD_SPECIAL_FLAGS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5
+printf %s "checking whether more special flags are required for pthreads... " >&6; }
+if test ${ax_cv_PTHREAD_SPECIAL_FLAGS+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ax_cv_PTHREAD_SPECIAL_FLAGS=no
              case $host_os in
              solaris*)
@@ -8883,45 +9759,49 @@
              esac
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5
-$as_echo "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5
+printf "%s\n" "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; }
         if test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-               test "x$ax_pthread_special_flags_added" != "xyes"; then :
+               test "x$ax_pthread_special_flags_added" != "xyes"
+then :
   PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
                ax_pthread_special_flags_added=yes
 fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5
-$as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; }
-if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5
+printf %s "checking for PTHREAD_PRIO_INHERIT... " >&6; }
+if test ${ax_cv_PTHREAD_PRIO_INHERIT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 int i = PTHREAD_PRIO_INHERIT;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ax_cv_PTHREAD_PRIO_INHERIT=yes
-else
+else $as_nop
   ax_cv_PTHREAD_PRIO_INHERIT=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5
-$as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5
+printf "%s\n" "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; }
         if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-               test "x$ax_pthread_prio_inherit_defined" != "xyes"; then :
+               test "x$ax_pthread_prio_inherit_defined" != "xyes"
+then :
 
-$as_echo "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h
 
                ax_pthread_prio_inherit_defined=yes
 
@@ -8939,7 +9819,8 @@
     #handle absolute path differently from PATH based program lookup
                      case "x$CC" in #(
   x/*) :
-    if as_fn_executable_p ${CC}_r; then :
+    if as_fn_executable_p ${CC}_r
+then :
   PTHREAD_CC="${CC}_r"
 fi ;; #(
   *) :
@@ -8947,11 +9828,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PTHREAD_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_PTHREAD_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$PTHREAD_CC"; then
   ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
 else
@@ -8959,11 +9841,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_PTHREAD_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8974,11 +9860,11 @@
 fi
 PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
 if test -n "$PTHREAD_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5
-$as_echo "$PTHREAD_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5
+printf "%s\n" "$PTHREAD_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -9004,7 +9890,7 @@
 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 if test "x$ax_pthread_ok" = "xyes"; then
 
-$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PTHREAD 1" >>confdefs.h
 
         :
 else
@@ -9028,7 +9914,8 @@
 
 PBX_NO_BINARY_MODULES=0
 # Check whether --enable-binary-modules was given.
-if test "${enable_binary_modules+set}" = set; then :
+if test ${enable_binary_modules+y}
+then :
   enableval=$enable_binary_modules; case "${enableval}" in
 	      y|ye|yes) PBX_NO_BINARY_MODULES=0 ;;
 	      n|no)  PBX_NO_BINARY_MODULES=1 ;;
@@ -9039,7 +9926,8 @@
 
 
 # Check whether --enable-dev-mode was given.
-if test "${enable_dev_mode+set}" = set; then :
+if test ${enable_dev_mode+y}
+then :
   enableval=$enable_dev_mode; case "${enableval}" in
 	      y|ye|yes) AST_DEVMODE=yes ;;
 	      n|no)  AST_DEVMODE=no ;;
@@ -9062,7 +9950,8 @@
 
 
 # Check whether --with-download-cache was given.
-if test "${with_download_cache+set}" = set; then :
+if test ${with_download_cache+y}
+then :
   withval=$with_download_cache;
 	case ${withval} in
 	n|no)
@@ -9077,7 +9966,7 @@
 		;;
 	esac
 
-else
+else $as_nop
   :
 fi
 
@@ -9086,7 +9975,8 @@
 
 
 # Check whether --with-sounds-cache was given.
-if test "${with_sounds_cache+set}" = set; then :
+if test ${with_sounds_cache+y}
+then :
   withval=$with_sounds_cache;
 	case ${withval} in
 	n|no)
@@ -9101,7 +9991,7 @@
 		;;
 	esac
 
-else
+else $as_nop
   :
 fi
 
@@ -9110,7 +10000,8 @@
 
 
 # Check whether --with-externals-cache was given.
-if test "${with_externals_cache+set}" = set; then :
+if test ${with_externals_cache+y}
+then :
   withval=$with_externals_cache;
 	case ${withval} in
 	n|no)
@@ -9125,7 +10016,7 @@
 		;;
 	esac
 
-else
+else $as_nop
   :
 fi
 
@@ -9134,7 +10025,8 @@
 
 AST_CODE_COVERAGE=no
 # Check whether --enable-coverage was given.
-if test "${enable_coverage+set}" = set; then :
+if test ${enable_coverage+y}
+then :
   enableval=$enable_coverage; case "${enableval}" in
 	      y|ye|yes) AST_CODE_COVERAGE=yes ;;
 	      n|no) AST_CODE_COVERAGE=no ;;
@@ -9145,14 +10037,14 @@
 
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAII support" >&5
-$as_echo_n "checking for RAII support... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for RAII support" >&5
+printf %s "checking for RAII support... " >&6; }
 	AST_C_COMPILER_FAMILY=""
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
 			int main() {
@@ -9167,16 +10059,17 @@
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-						{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc -fnested-functions" >&5
-$as_echo_n "checking for gcc -fnested-functions... " >&6; }
+						{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gcc -fnested-functions" >&5
+printf %s "checking for gcc -fnested-functions... " >&6; }
 			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main ()
+main (void)
 {
 auto void foo(void); void foo(void) {}
   ;
@@ -9184,38 +10077,39 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 					AST_NESTED_FUNCTIONS=""
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-else
+else $as_nop
 
 					AST_NESTED_FUNCTIONS="-fnested-functions"
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 			AST_C_COMPILER_FAMILY="gcc"
 
-else
+else $as_nop
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang -fblocks" >&5
-$as_echo_n "checking for clang -fblocks... " >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clang -fblocks" >&5
+printf %s "checking for clang -fblocks... " >&6; }
 			if test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c - 2>&1`" = ""; then
 				AST_CLANG_BLOCKS_LIBS=""
 				AST_CLANG_BLOCKS="-Wno-unknown-warning-option -fblocks"
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 			elif test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then
 				AST_CLANG_BLOCKS_LIBS="-lBlocksRuntime"
 				AST_CLANG_BLOCKS="-fblocks"
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 			else
 				as_fn_error $? "BlocksRuntime is required for clang, please install libblocksruntime" "$LINENO" 5
 			fi
@@ -9225,7 +10119,7 @@
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	if test -z "${AST_C_COMPILER_FAMILY}"; then
 		as_fn_error $? "Compiler ${CC} not supported. Mminimum required gcc-4.3 / llvm-gcc-4.3 / clang-3.3 + libblocksruntime-dev" "$LINENO" 5
@@ -9233,8 +10127,8 @@
 
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang strsep/strcmp optimization" >&5
-$as_echo_n "checking for clang strsep/strcmp optimization... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clang strsep/strcmp optimization" >&5
+printf %s "checking for clang strsep/strcmp optimization... " >&6; }
 	save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -O1 -Werror=array-bounds"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9262,32 +10156,34 @@
 
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-else
+else $as_nop
 
 
-$as_echo "#define _HAVE_STRING_ARCH_strcmp 1" >>confdefs.h
+printf "%s\n" "#define _HAVE_STRING_ARCH_strcmp 1" >>confdefs.h
 
 
-$as_echo "#define _HAVE_STRING_ARCH_strsep 1" >>confdefs.h
+printf "%s\n" "#define _HAVE_STRING_ARCH_strsep 1" >>confdefs.h
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: prevent use of __string2_1bptr_p / strsep / strcmp from bits/string2.h" >&5
-$as_echo "prevent use of __string2_1bptr_p / strsep / strcmp from bits/string2.h" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: prevent use of __string2_1bptr_p / strsep / strcmp from bits/string2.h" >&5
+printf "%s\n" "prevent use of __string2_1bptr_p / strsep / strcmp from bits/string2.h" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CFLAGS="$save_CFLAGS"
 
 
 JANSSON_BUNDLED=no
 
 # Check whether --with-jansson-bundled was given.
-if test "${with_jansson_bundled+set}" = set; then :
+if test ${with_jansson_bundled+y}
+then :
   withval=$with_jansson_bundled; case "${withval}" in
 		y|ye|yes) JANSSON_BUNDLED=yes ;;
 		*) JANSSON_BUNDLED=no ;;
@@ -9300,7 +10196,8 @@
 
 
 # Check whether --with-pjproject-bundled was given.
-if test "${with_pjproject_bundled+set}" = set; then :
+if test ${with_pjproject_bundled+y}
+then :
   withval=$with_pjproject_bundled; case "${withval}" in
 	      n|no) PJPROJECT_BUNDLED=no ;;
 	      *) PJPROJECT_BUNDLED=yes ;;
@@ -9323,7 +10220,8 @@
     PBX_CRYPTO=0
 
 # Check whether --with-crypto was given.
-if test "${with_crypto+set}" = set; then :
+if test ${with_crypto+y}
+then :
   withval=$with_crypto;
 	case ${withval} in
 	n|no)
@@ -9355,7 +10253,8 @@
     PBX_OPENSSL=0
 
 # Check whether --with-ssl was given.
-if test "${with_ssl+set}" = set; then :
+if test ${with_ssl+y}
+then :
   withval=$with_ssl;
 	case ${withval} in
 	n|no)
@@ -9398,25 +10297,25 @@
 # and there were no directories atdded to --with-ssl and --with-crypto, and
 # pkg-config is installed (which is should be by install_prereq).
 if test "x$PKG_CONFIG" != "x" -a $PBX_OPENSSL -ge 0 -a $PBX_CRYPTO -ge 0 -a "x$OPENSSL_DIR" = "x" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OPENSSL with pkg-config" >&5
-$as_echo "$as_me: checking OPENSSL with pkg-config" >&6;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system openssl > 1.1.0" >&5
-$as_echo "$as_me: checking whether system openssl > 1.1.0" >&6;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OPENSSL with pkg-config" >&5
+printf "%s\n" "$as_me: checking OPENSSL with pkg-config" >&6;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether system openssl > 1.1.0" >&5
+printf "%s\n" "$as_me: checking whether system openssl > 1.1.0" >&6;}
 
    if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
-$as_echo_n "checking for OPENSSL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.1.0" >&5
+printf %s "checking for openssl >= 1.1.0... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.1.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -9430,10 +10329,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.1.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -9447,8 +10346,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -9468,8 +10367,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_OPENSSL=0
 
@@ -9477,37 +10376,37 @@
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_OPENSSL=1
             OPENSSL_INCLUDE=$(echo ${OPENSSL_CFLAGS} | $SED -e "s|-std=c99||g")
             OPENSSL_LIB="$OPENSSL_LIBS"
 
-$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OPENSSL 1" >>confdefs.h
 
 
 fi
    fi
 
 	if test $PBX_OPENSSL -eq 0 ; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether alternate openssl11 is installed" >&5
-$as_echo "$as_me: checking whether alternate openssl11 is installed" >&6;}
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether alternate openssl11 is installed" >&5
+printf "%s\n" "$as_me: checking whether alternate openssl11 is installed" >&6;}
 
    if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
-$as_echo_n "checking for OPENSSL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl11" >&5
+printf %s "checking for openssl11... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl11\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -9521,10 +10420,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl11\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -9538,8 +10437,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -9559,8 +10458,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_OPENSSL=0
 
@@ -9568,14 +10467,14 @@
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_OPENSSL=1
             OPENSSL_INCLUDE=$(echo ${OPENSSL_CFLAGS} | $SED -e "s|-std=c99||g")
             OPENSSL_LIB="$OPENSSL_LIBS"
 
-$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OPENSSL 1" >>confdefs.h
 
 
 fi
@@ -9583,27 +10482,27 @@
 
 	fi
 	if test $PBX_OPENSSL -eq 1 ; then
-		$as_echo "#define HAVE_OPENSSL_BIO_METHOD 1" >>confdefs.h
+		printf "%s\n" "#define HAVE_OPENSSL_BIO_METHOD 1" >>confdefs.h
 
 		PBX_OPENSSL_BIO_METHOD=1
 	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking fallback system openssl" >&5
-$as_echo "$as_me: checking fallback system openssl" >&6;}
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking fallback system openssl" >&5
+printf "%s\n" "$as_me: checking fallback system openssl" >&6;}
 
    if test "x${PBX_OPENSSL}" != "x1" -a "${USE_OPENSSL}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
-$as_echo_n "checking for OPENSSL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
+printf %s "checking for openssl... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -9617,10 +10516,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -9634,8 +10533,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -9655,8 +10554,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_OPENSSL=0
 
@@ -9664,14 +10563,14 @@
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_OPENSSL=1
             OPENSSL_INCLUDE=$(echo ${OPENSSL_CFLAGS} | $SED -e "s|-std=c99||g")
             OPENSSL_LIB="$OPENSSL_LIBS"
 
-$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_OPENSSL 1" >>confdefs.h
 
 
 fi
@@ -9680,13 +10579,13 @@
 	fi
 
 	if test $PBX_OPENSSL -eq 1; then
-		$as_echo "#define HAVE_CRYPTO 1" >>confdefs.h
+		printf "%s\n" "#define HAVE_CRYPTO 1" >>confdefs.h
 
 		PBX_CRYPTO=1
 	fi
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: Checking OPENSSL without pkg-config" >&5
-$as_echo "$as_me: Checking OPENSSL without pkg-config" >&6;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Checking OPENSSL without pkg-config" >&5
+printf "%s\n" "$as_me: Checking OPENSSL without pkg-config" >&6;}
 
 if test "x${PBX_CRYPTO}" != "x1" -a "${USE_CRYPTO}" != "no"; then
    pbxlibdir=""
@@ -9701,11 +10600,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AES_encrypt in -lcrypto" >&5
-$as_echo_n "checking for AES_encrypt in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_AES_encrypt+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for AES_encrypt in -lcrypto" >&5
+printf %s "checking for AES_encrypt in -lcrypto... " >&6; }
+if test ${ac_cv_lib_crypto_AES_encrypt+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9714,32 +10614,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char AES_encrypt ();
 int
-main ()
+main (void)
 {
 return AES_encrypt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_crypto_AES_encrypt=yes
-else
+else $as_nop
   ac_cv_lib_crypto_AES_encrypt=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_AES_encrypt" >&5
-$as_echo "$ac_cv_lib_crypto_AES_encrypt" >&6; }
-if test "x$ac_cv_lib_crypto_AES_encrypt" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_AES_encrypt" >&5
+printf "%s\n" "$ac_cv_lib_crypto_AES_encrypt" >&6; }
+if test "x$ac_cv_lib_crypto_AES_encrypt" = xyes
+then :
   AST_CRYPTO_FOUND=yes
-else
+else $as_nop
   AST_CRYPTO_FOUND=no
 fi
 
@@ -9758,14 +10657,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${CRYPTO_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "openssl/aes.h" "ac_cv_header_openssl_aes_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_aes_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "openssl/aes.h" "ac_cv_header_openssl_aes_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_aes_h" = xyes
+then :
   CRYPTO_HEADER_FOUND=1
-else
+else $as_nop
   CRYPTO_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${CRYPTO_HEADER_FOUND}" = "x0" ; then
@@ -9799,11 +10698,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
-$as_echo_n "checking for SSL_connect in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_SSL_connect+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL_connect in -lssl" >&5
+printf %s "checking for SSL_connect in -lssl... " >&6; }
+if test ${ac_cv_lib_ssl_SSL_connect+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssl ${pbxlibdir} -lcrypto $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9812,32 +10712,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char SSL_connect ();
 int
-main ()
+main (void)
 {
 return SSL_connect ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ssl_SSL_connect=yes
-else
+else $as_nop
   ac_cv_lib_ssl_SSL_connect=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
-$as_echo "$ac_cv_lib_ssl_SSL_connect" >&6; }
-if test "x$ac_cv_lib_ssl_SSL_connect" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_connect" >&5
+printf "%s\n" "$ac_cv_lib_ssl_SSL_connect" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_connect" = xyes
+then :
   AST_OPENSSL_FOUND=yes
-else
+else $as_nop
   AST_OPENSSL_FOUND=no
 fi
 
@@ -9856,14 +10755,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OPENSSL_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_ssl_h" = xyes
+then :
   OPENSSL_HEADER_FOUND=1
-else
+else $as_nop
   OPENSSL_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${OPENSSL_HEADER_FOUND}" = "x0" ; then
@@ -9895,11 +10794,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIO_meth_new in -lssl" >&5
-$as_echo_n "checking for BIO_meth_new in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_BIO_meth_new+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BIO_meth_new in -lssl" >&5
+printf %s "checking for BIO_meth_new in -lssl... " >&6; }
+if test ${ac_cv_lib_ssl_BIO_meth_new+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssl ${pbxlibdir} -lcrypto $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9908,32 +10808,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char BIO_meth_new ();
 int
-main ()
+main (void)
 {
 return BIO_meth_new ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ssl_BIO_meth_new=yes
-else
+else $as_nop
   ac_cv_lib_ssl_BIO_meth_new=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_BIO_meth_new" >&5
-$as_echo "$ac_cv_lib_ssl_BIO_meth_new" >&6; }
-if test "x$ac_cv_lib_ssl_BIO_meth_new" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_BIO_meth_new" >&5
+printf "%s\n" "$ac_cv_lib_ssl_BIO_meth_new" >&6; }
+if test "x$ac_cv_lib_ssl_BIO_meth_new" = xyes
+then :
   AST_OPENSSL_BIO_METHOD_FOUND=yes
-else
+else $as_nop
   AST_OPENSSL_BIO_METHOD_FOUND=no
 fi
 
@@ -9952,14 +10851,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OPENSSL_BIO_METHOD_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_ssl_h" = xyes
+then :
   OPENSSL_BIO_METHOD_HEADER_FOUND=1
-else
+else $as_nop
   OPENSSL_BIO_METHOD_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${OPENSSL_BIO_METHOD_HEADER_FOUND}" = "x0" ; then
@@ -9980,8 +10879,8 @@
 	fi
 fi
 if test $PBX_OPENSSL -eq 0 ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL does not seem to be installed" >&5
-$as_echo "$as_me: WARNING: OpenSSL does not seem to be installed" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL does not seem to be installed" >&5
+printf "%s\n" "$as_me: WARNING: OpenSSL does not seem to be installed" >&2;}
 fi
 
 
@@ -9996,10 +10895,10 @@
 	ac_mandatory_list="$ac_mandatory_list JANSSON"
 	JANSSON_DIR="${ac_pwd}/third-party/jansson"
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for embedded jansson (may have to download)" >&5
-$as_echo_n "checking for embedded jansson (may have to download)... " >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: configuring" >&5
-$as_echo "configuring" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for embedded jansson (may have to download)" >&5
+printf %s "checking for embedded jansson (may have to download)... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: configuring" >&5
+printf "%s\n" "configuring" >&6; }
 
 	if test "x${DOWNLOAD_TO_STDOUT}" = "x" ; then
 		as_fn_error $? "A download utility (wget, curl, or fetch) is required to download bundled jansson" "$LINENO" 5
@@ -10048,15 +10947,15 @@
 		EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" \
 		configure
 	if test $? -ne 0 ; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: Unable to configure ${JANSSON_DIR}" >&5
-$as_echo "$as_me: Unable to configure ${JANSSON_DIR}" >&6;}
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf "%s\n" "failed" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to configure ${JANSSON_DIR}" >&5
+printf "%s\n" "$as_me: Unable to configure ${JANSSON_DIR}" >&6;}
 		as_fn_error $? "Re-run the ./configure command with 'NOISY_BUILD=yes' appended to see error details." "$LINENO" 5
 	fi
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bundled jansson" >&5
-$as_echo_n "checking for bundled jansson... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bundled jansson" >&5
+printf %s "checking for bundled jansson... " >&6; }
 
 	JANSSON_INCLUDE=-I${JANSSON_DIR}/dest/include
 	JANSSON_CFLAGS="$JANSSON_INCLUDE"
@@ -10072,7 +10971,7 @@
 /* end confdefs.h.  */
 #include <$JANSSON_DIR/source/src/jansson.h>
 int
-main ()
+main (void)
 {
 #if !JSON_INTEGER_IS_LONG_LONG
 		#error "not long long"
@@ -10082,16 +10981,17 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define AST_JSON_INT_T long long" >>confdefs.h
+printf "%s\n" "#define AST_JSON_INT_T long long" >>confdefs.h
 
-else
+else $as_nop
 
-$as_echo "#define AST_JSON_INT_T long" >>confdefs.h
+printf "%s\n" "#define AST_JSON_INT_T long" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
 
 
@@ -10099,10 +10999,10 @@
 
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_JANSSON_BUNDLED 1" >>confdefs.h
+printf "%s\n" "#define HAVE_JANSSON_BUNDLED 1" >>confdefs.h
 
 
 	fi
@@ -10119,10 +11019,10 @@
 		ac_mandatory_list="$ac_mandatory_list PJPROJECT"
 		PJPROJECT_DIR="${ac_top_build_prefix}third-party/pjproject"
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for embedded pjproject (may have to download)" >&5
-$as_echo_n "checking for embedded pjproject (may have to download)... " >&6; }
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: configuring" >&5
-$as_echo "configuring" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for embedded pjproject (may have to download)" >&5
+printf %s "checking for embedded pjproject (may have to download)... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: configuring" >&5
+printf "%s\n" "configuring" >&6; }
 
 		if test "x${DOWNLOAD_TO_STDOUT}" = "x" ; then
 			as_fn_error $? "A download utility (wget, curl, or fetch) is required to download bundled pjproject" "$LINENO" 5
@@ -10192,7 +11092,7 @@
 		# Determine if we're doing an out-of-tree build...
 
 		if test -L ${PJPROJECT_DIR}/source -o -d ${PJPROJECT_DIR}/source/.git ; then
-			$as_echo "#define HAVE_PJPROJECT_BUNDLED_OOT 1" >>confdefs.h
+			printf "%s\n" "#define HAVE_PJPROJECT_BUNDLED_OOT 1" >>confdefs.h
 
 			PJPROJECT_BUNDLED_OOT=yes
 		fi
@@ -10205,15 +11105,15 @@
 			PJPROJECT_BUNDLED_OOT="${PJPROJECT_BUNDLED_OOT}" \
 			configure
 		if test $? -ne 0 ; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: Unable to configure ${PJPROJECT_DIR}" >&5
-$as_echo "$as_me: Unable to configure ${PJPROJECT_DIR}" >&6;}
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+printf "%s\n" "failed" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Unable to configure ${PJPROJECT_DIR}" >&5
+printf "%s\n" "$as_me: Unable to configure ${PJPROJECT_DIR}" >&6;}
 			as_fn_error $? "Re-run the ./configure command with 'NOISY_BUILD=yes' appended to see error details." "$LINENO" 5
 		fi
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bundled pjproject" >&5
-$as_echo_n "checking for bundled pjproject... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bundled pjproject" >&5
+printf %s "checking for bundled pjproject... " >&6; }
 
 		PJPROJECT_INCLUDE=$(${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} \
 			PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" \
@@ -10224,59 +11124,59 @@
 		PBX_PJPROJECT=1
 
 
-$as_echo "#define HAVE_PJPROJECT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJPROJECT 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJPROJECT_BUNDLED 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJPROJECT_BUNDLED 1" >>confdefs.h
 
 
 
-$as_echo "#define HAVE_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJ_TRANSACTION_GRP_LOCK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJ_TRANSACTION_GRP_LOCK 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJSIP_REPLACE_MEDIA_STREAM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_REPLACE_MEDIA_STREAM 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJSIP_GET_DEST_INFO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_GET_DEST_INFO 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJ_SSL_CERT_LOAD_FROM_FILES2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJ_SSL_CERT_LOAD_FROM_FILES2 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJSIP_EXTERNAL_RESOLVER 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_EXTERNAL_RESOLVER 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJSIP_TLS_TRANSPORT_PROTO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_TLS_TRANSPORT_PROTO 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJSIP_EVSUB_GRP_LOCK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_EVSUB_GRP_LOCK 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJSIP_INV_SESSION_REF 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_INV_SESSION_REF 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJSIP_AUTH_CLT_DEINIT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_AUTH_CLT_DEINIT 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJSIP_TSX_LAYER_FIND_TSX2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_TSX_LAYER_FIND_TSX2 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJSIP_ENDPOINT_COMPACT_FORM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_ENDPOINT_COMPACT_FORM 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJSIP_OAUTH_AUTHENTICATION 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_OAUTH_AUTHENTICATION 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_PJPROJECT_ON_VALID_ICE_PAIR_CALLBACK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJPROJECT_ON_VALID_ICE_PAIR_CALLBACK 1" >>confdefs.h
 
 
 
@@ -10286,8 +11186,8 @@
 
 
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 	fi
 
@@ -10311,7 +11211,8 @@
     PBX_ALSA=0
 
 # Check whether --with-asound was given.
-if test "${with_asound+set}" = set; then :
+if test ${with_asound+y}
+then :
   withval=$with_asound;
 	case ${withval} in
 	n|no)
@@ -10343,7 +11244,8 @@
     PBX_BFD=0
 
 # Check whether --with-bfd was given.
-if test "${with_bfd+set}" = set; then :
+if test ${with_bfd+y}
+then :
   withval=$with_bfd;
 	case ${withval} in
 	n|no)
@@ -10378,7 +11280,8 @@
     PBX_BKTR=0
 
 # Check whether --with-execinfo was given.
-if test "${with_execinfo+set}" = set; then :
+if test ${with_execinfo+y}
+then :
   withval=$with_execinfo;
 	case ${withval} in
 	n|no)
@@ -10410,7 +11313,8 @@
     PBX_BLUETOOTH=0
 
 # Check whether --with-bluetooth was given.
-if test "${with_bluetooth+set}" = set; then :
+if test ${with_bluetooth+y}
+then :
   withval=$with_bluetooth;
 	case ${withval} in
 	n|no)
@@ -10442,7 +11346,8 @@
     PBX_CAP=0
 
 # Check whether --with-cap was given.
-if test "${with_cap+set}" = set; then :
+if test ${with_cap+y}
+then :
   withval=$with_cap;
 	case ${withval} in
 	n|no)
@@ -10474,7 +11379,8 @@
     PBX_CODEC2=0
 
 # Check whether --with-codec2 was given.
-if test "${with_codec2+set}" = set; then :
+if test ${with_codec2+y}
+then :
   withval=$with_codec2;
 	case ${withval} in
 	n|no)
@@ -10506,7 +11412,8 @@
     PBX_COROSYNC=0
 
 # Check whether --with-cpg was given.
-if test "${with_cpg+set}" = set; then :
+if test ${with_cpg+y}
+then :
   withval=$with_cpg;
 	case ${withval} in
 	n|no)
@@ -10550,7 +11457,8 @@
     PBX_CRYPT=0
 
 # Check whether --with-crypt was given.
-if test "${with_crypt+set}" = set; then :
+if test ${with_crypt+y}
+then :
   withval=$with_crypt;
 	case ${withval} in
 	n|no)
@@ -10582,7 +11490,8 @@
     PBX_DAHDI=0
 
 # Check whether --with-dahdi was given.
-if test "${with_dahdi+set}" = set; then :
+if test ${with_dahdi+y}
+then :
   withval=$with_dahdi;
 	case ${withval} in
 	n|no)
@@ -10614,7 +11523,8 @@
     PBX_FFMPEG=0
 
 # Check whether --with-avcodec was given.
-if test "${with_avcodec+set}" = set; then :
+if test ${with_avcodec+y}
+then :
   withval=$with_avcodec;
 	case ${withval} in
 	n|no)
@@ -10646,7 +11556,8 @@
     PBX_GSM=0
 
 # Check whether --with-gsm was given.
-if test "${with_gsm+set}" = set; then :
+if test ${with_gsm+y}
+then :
   withval=$with_gsm;
 	case ${withval} in
 	n|no)
@@ -10678,7 +11589,8 @@
     PBX_ILBC=0
 
 # Check whether --with-ilbc was given.
-if test "${with_ilbc+set}" = set; then :
+if test ${with_ilbc+y}
+then :
   withval=$with_ilbc;
 	case ${withval} in
 	n|no)
@@ -10710,7 +11622,8 @@
     PBX_GTK2=0
 
 # Check whether --with-gtk2 was given.
-if test "${with_gtk2+set}" = set; then :
+if test ${with_gtk2+y}
+then :
   withval=$with_gtk2;
 	case ${withval} in
 	n|no)
@@ -10742,7 +11655,8 @@
     PBX_GMIME=0
 
 # Check whether --with-gmime was given.
-if test "${with_gmime+set}" = set; then :
+if test ${with_gmime+y}
+then :
   withval=$with_gmime;
 	case ${withval} in
 	n|no)
@@ -10774,7 +11688,8 @@
     PBX_HOARD=0
 
 # Check whether --with-hoard was given.
-if test "${with_hoard+set}" = set; then :
+if test ${with_hoard+y}
+then :
   withval=$with_hoard;
 	case ${withval} in
 	n|no)
@@ -10806,7 +11721,8 @@
     PBX_ICAL=0
 
 # Check whether --with-ical was given.
-if test "${with_ical+set}" = set; then :
+if test ${with_ical+y}
+then :
   withval=$with_ical;
 	case ${withval} in
 	n|no)
@@ -10838,7 +11754,8 @@
     PBX_ICONV=0
 
 # Check whether --with-iconv was given.
-if test "${with_iconv+set}" = set; then :
+if test ${with_iconv+y}
+then :
   withval=$with_iconv;
 	case ${withval} in
 	n|no)
@@ -10870,7 +11787,8 @@
     PBX_IKSEMEL=0
 
 # Check whether --with-iksemel was given.
-if test "${with_iksemel+set}" = set; then :
+if test ${with_iksemel+y}
+then :
   withval=$with_iksemel;
 	case ${withval} in
 	n|no)
@@ -10902,7 +11820,8 @@
     PBX_IMAP_TK=0
 
 # Check whether --with-imap was given.
-if test "${with_imap+set}" = set; then :
+if test ${with_imap+y}
+then :
   withval=$with_imap;
 	case ${withval} in
 	n|no)
@@ -10934,7 +11853,8 @@
     PBX_INOTIFY=0
 
 # Check whether --with-inotify was given.
-if test "${with_inotify+set}" = set; then :
+if test ${with_inotify+y}
+then :
   withval=$with_inotify;
 	case ${withval} in
 	n|no)
@@ -10966,7 +11886,8 @@
     PBX_IODBC=0
 
 # Check whether --with-iodbc was given.
-if test "${with_iodbc+set}" = set; then :
+if test ${with_iodbc+y}
+then :
   withval=$with_iodbc;
 	case ${withval} in
 	n|no)
@@ -10998,7 +11919,8 @@
     PBX_ISDNNET=0
 
 # Check whether --with-isdnnet was given.
-if test "${with_isdnnet+set}" = set; then :
+if test ${with_isdnnet+y}
+then :
   withval=$with_isdnnet;
 	case ${withval} in
 	n|no)
@@ -11030,7 +11952,8 @@
     PBX_JACK=0
 
 # Check whether --with-jack was given.
-if test "${with_jack+set}" = set; then :
+if test ${with_jack+y}
+then :
   withval=$with_jack;
 	case ${withval} in
 	n|no)
@@ -11062,7 +11985,8 @@
     PBX_JANSSON=0
 
 # Check whether --with-jansson was given.
-if test "${with_jansson+set}" = set; then :
+if test ${with_jansson+y}
+then :
   withval=$with_jansson;
 	case ${withval} in
 	n|no)
@@ -11094,7 +12018,8 @@
     PBX_URIPARSER=0
 
 # Check whether --with-uriparser was given.
-if test "${with_uriparser+set}" = set; then :
+if test ${with_uriparser+y}
+then :
   withval=$with_uriparser;
 	case ${withval} in
 	n|no)
@@ -11126,7 +12051,8 @@
     PBX_KQUEUE=0
 
 # Check whether --with-kqueue was given.
-if test "${with_kqueue+set}" = set; then :
+if test ${with_kqueue+y}
+then :
   withval=$with_kqueue;
 	case ${withval} in
 	n|no)
@@ -11158,7 +12084,8 @@
     PBX_LDAP=0
 
 # Check whether --with-ldap was given.
-if test "${with_ldap+set}" = set; then :
+if test ${with_ldap+y}
+then :
   withval=$with_ldap;
 	case ${withval} in
 	n|no)
@@ -11212,9 +12139,10 @@
 
 
 # Check whether --with-libcurl was given.
-if test "${with_libcurl+set}" = set; then :
+if test ${with_libcurl+y}
+then :
   withval=$with_libcurl; _libcurl_with=$withval
-else
+else $as_nop
   _libcurl_with=yes
 fi
 
@@ -11225,11 +12153,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AWK+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
@@ -11237,11 +12166,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11252,11 +12185,11 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf "%s\n" "$AWK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -11273,11 +12206,12 @@
         _libcurl_ldflags="-L$withval/lib"
         # Extract the first word of "curl-config", so it can be a program name with args.
 set dummy curl-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path__libcurl_config+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path__libcurl_config+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $_libcurl_config in
   [\\/]* | ?:[\\/]*)
   ac_cv_path__libcurl_config="$_libcurl_config" # Let the user override the test with a path.
@@ -11287,11 +12221,15 @@
 for as_dir in "$withval/bin"
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path__libcurl_config="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path__libcurl_config="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11303,22 +12241,23 @@
 fi
 _libcurl_config=$ac_cv_path__libcurl_config
 if test -n "$_libcurl_config"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5
-$as_echo "$_libcurl_config" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5
+printf "%s\n" "$_libcurl_config" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
      else
         # Extract the first word of "curl-config", so it can be a program name with args.
 set dummy curl-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path__libcurl_config+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path__libcurl_config+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $_libcurl_config in
   [\\/]* | ?:[\\/]*)
   ac_cv_path__libcurl_config="$_libcurl_config" # Let the user override the test with a path.
@@ -11328,11 +12267,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path__libcurl_config="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path__libcurl_config="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11344,36 +12287,38 @@
 fi
 _libcurl_config=$ac_cv_path__libcurl_config
 if test -n "$_libcurl_config"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5
-$as_echo "$_libcurl_config" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $_libcurl_config" >&5
+printf "%s\n" "$_libcurl_config" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
      fi
 
      if test x$_libcurl_config != "x" ; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the version of libcurl" >&5
-$as_echo_n "checking for the version of libcurl... " >&6; }
-if ${libcurl_cv_lib_curl_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the version of libcurl" >&5
+printf %s "checking for the version of libcurl... " >&6; }
+if test ${libcurl_cv_lib_curl_version+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $2}'`
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_version" >&5
-$as_echo "$libcurl_cv_lib_curl_version" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_version" >&5
+printf "%s\n" "$libcurl_cv_lib_curl_version" >&6; }
 
         _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
         _libcurl_wanted=`echo 7.10.1 | $_libcurl_version_parse`
 
         if test $_libcurl_wanted -gt 0 ; then
-           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= version 7.10.1" >&5
-$as_echo_n "checking for libcurl >= version 7.10.1... " >&6; }
-if ${libcurl_cv_lib_version_ok+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+           { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl >= version 7.10.1" >&5
+printf %s "checking for libcurl >= version 7.10.1... " >&6; }
+if test ${libcurl_cv_lib_version_ok+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
               if test $_libcurl_version -ge $_libcurl_wanted ; then
                  libcurl_cv_lib_version_ok=yes
@@ -11382,8 +12327,8 @@
               fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_version_ok" >&5
-$as_echo "$libcurl_cv_lib_version_ok" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_version_ok" >&5
+printf "%s\n" "$libcurl_cv_lib_version_ok" >&6; }
         fi
 
         if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then
@@ -11423,11 +12368,12 @@
         # link line (or failing that, "-lcurl") is enough.
         CURL_LIB=${CURL_LIB-"$_libcurl_ldflags -lcurl"}
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libcurl is usable" >&5
-$as_echo_n "checking whether libcurl is usable... " >&6; }
-if ${libcurl_cv_lib_curl_usable+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether libcurl is usable" >&5
+printf %s "checking whether libcurl is usable... " >&6; }
+if test ${libcurl_cv_lib_curl_usable+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
            _libcurl_save_cppflags=$CPPFLAGS
            CPPFLAGS="$CURL_INCLUDE $CPPFLAGS"
@@ -11438,7 +12384,7 @@
 /* end confdefs.h.  */
 #include <curl/curl.h>
 int
-main ()
+main (void)
 {
 
 /* Try and use a few common options to force a failure if we are
@@ -11457,12 +12403,13 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   libcurl_cv_lib_curl_usable=yes
-else
+else $as_nop
   libcurl_cv_lib_curl_usable=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
            CPPFLAGS=$_libcurl_save_cppflags
@@ -11471,8 +12418,8 @@
            unset _libcurl_save_libs
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_usable" >&5
-$as_echo "$libcurl_cv_lib_curl_usable" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libcurl_cv_lib_curl_usable" >&5
+printf "%s\n" "$libcurl_cv_lib_curl_usable" >&6; }
 
         if test $libcurl_cv_lib_curl_usable = yes ; then
 
@@ -11485,11 +12432,12 @@
            LIBS="$LIBS $CURL_LIB"
 
            ac_fn_c_check_func "$LINENO" "curl_free" "ac_cv_func_curl_free"
-if test "x$ac_cv_func_curl_free" = xyes; then :
+if test "x$ac_cv_func_curl_free" = xyes
+then :
 
-else
+else $as_nop
 
-$as_echo "#define curl_free free" >>confdefs.h
+printf "%s\n" "#define curl_free free" >>confdefs.h
 
 fi
 
@@ -11500,7 +12448,7 @@
            unset _libcurl_save_libs
 
 
-$as_echo "#define HAVE_CURL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURL 1" >>confdefs.h
 
 
 
@@ -11508,10 +12456,10 @@
 
            for _libcurl_feature in $_libcurl_features ; do
               cat >>confdefs.h <<_ACEOF
-#define `$as_echo "libcurl_feature_$_libcurl_feature" | $as_tr_cpp` 1
+#define `printf "%s\n" "libcurl_feature_$_libcurl_feature" | $as_tr_cpp` 1
 _ACEOF
 
-              eval `$as_echo "libcurl_feature_$_libcurl_feature" | $as_tr_sh`=yes
+              eval `printf "%s\n" "libcurl_feature_$_libcurl_feature" | $as_tr_sh`=yes
            done
 
            if test "x$_libcurl_protocols" = "x" ; then
@@ -11539,10 +12487,10 @@
 
            for _libcurl_protocol in $_libcurl_protocols ; do
               cat >>confdefs.h <<_ACEOF
-#define `$as_echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_cpp` 1
+#define `printf "%s\n" "libcurl_protocol_$_libcurl_protocol" | $as_tr_cpp` 1
 _ACEOF
 
-              eval `$as_echo "libcurl_protocol_$_libcurl_protocol" | $as_tr_sh`=yes
+              eval `printf "%s\n" "libcurl_protocol_$_libcurl_protocol" | $as_tr_sh`=yes
            done
         else
            unset CURL_LIB
@@ -11577,7 +12525,8 @@
     PBX_LIBEDIT=0
 
 # Check whether --with-libedit was given.
-if test "${with_libedit+set}" = set; then :
+if test ${with_libedit+y}
+then :
   withval=$with_libedit;
 	case ${withval} in
 	n|no)
@@ -11621,7 +12570,8 @@
     PBX_LIBXML2=0
 
 # Check whether --with-libxml2 was given.
-if test "${with_libxml2+set}" = set; then :
+if test ${with_libxml2+y}
+then :
   withval=$with_libxml2;
 	case ${withval} in
 	n|no)
@@ -11653,7 +12603,8 @@
     PBX_LIBXSLT=0
 
 # Check whether --with-libxslt was given.
-if test "${with_libxslt+set}" = set; then :
+if test ${with_libxslt+y}
+then :
   withval=$with_libxslt;
 	case ${withval} in
 	n|no)
@@ -11697,7 +12648,8 @@
     PBX_LUA=0
 
 # Check whether --with-lua was given.
-if test "${with_lua+set}" = set; then :
+if test ${with_lua+y}
+then :
   withval=$with_lua;
 	case ${withval} in
 	n|no)
@@ -11730,7 +12682,8 @@
     PBX_MISDN=0
 
 # Check whether --with-misdn was given.
-if test "${with_misdn+set}" = set; then :
+if test ${with_misdn+y}
+then :
   withval=$with_misdn;
 	case ${withval} in
 	n|no)
@@ -11762,7 +12715,8 @@
     PBX_MYSQLCLIENT=0
 
 # Check whether --with-mysqlclient was given.
-if test "${with_mysqlclient+set}" = set; then :
+if test ${with_mysqlclient+y}
+then :
   withval=$with_mysqlclient;
 	case ${withval} in
 	n|no)
@@ -11794,7 +12748,8 @@
     PBX_NBS=0
 
 # Check whether --with-nbs was given.
-if test "${with_nbs+set}" = set; then :
+if test ${with_nbs+y}
+then :
   withval=$with_nbs;
 	case ${withval} in
 	n|no)
@@ -11826,7 +12781,8 @@
     PBX_NEON=0
 
 # Check whether --with-neon was given.
-if test "${with_neon+set}" = set; then :
+if test ${with_neon+y}
+then :
   withval=$with_neon;
 	case ${withval} in
 	n|no)
@@ -11858,7 +12814,8 @@
     PBX_NEON29=0
 
 # Check whether --with-neon29 was given.
-if test "${with_neon29+set}" = set; then :
+if test ${with_neon29+y}
+then :
   withval=$with_neon29;
 	case ${withval} in
 	n|no)
@@ -11890,7 +12847,8 @@
     PBX_NETSNMP=0
 
 # Check whether --with-netsnmp was given.
-if test "${with_netsnmp+set}" = set; then :
+if test ${with_netsnmp+y}
+then :
   withval=$with_netsnmp;
 	case ${withval} in
 	n|no)
@@ -11922,7 +12880,8 @@
     PBX_NEWT=0
 
 # Check whether --with-newt was given.
-if test "${with_newt+set}" = set; then :
+if test ${with_newt+y}
+then :
   withval=$with_newt;
 	case ${withval} in
 	n|no)
@@ -11954,7 +12913,8 @@
     PBX_OGG=0
 
 # Check whether --with-ogg was given.
-if test "${with_ogg+set}" = set; then :
+if test ${with_ogg+y}
+then :
   withval=$with_ogg;
 	case ${withval} in
 	n|no)
@@ -11986,7 +12946,8 @@
     PBX_OPENR2=0
 
 # Check whether --with-openr2 was given.
-if test "${with_openr2+set}" = set; then :
+if test ${with_openr2+y}
+then :
   withval=$with_openr2;
 	case ${withval} in
 	n|no)
@@ -12018,7 +12979,8 @@
     PBX_OPUS=0
 
 # Check whether --with-opus was given.
-if test "${with_opus+set}" = set; then :
+if test ${with_opus+y}
+then :
   withval=$with_opus;
 	case ${withval} in
 	n|no)
@@ -12050,7 +13012,8 @@
     PBX_OPUSFILE=0
 
 # Check whether --with-opusfile was given.
-if test "${with_opusfile+set}" = set; then :
+if test ${with_opusfile+y}
+then :
   withval=$with_opusfile;
 	case ${withval} in
 	n|no)
@@ -12082,7 +13045,8 @@
     PBX_OSPTK=0
 
 # Check whether --with-osptk was given.
-if test "${with_osptk+set}" = set; then :
+if test ${with_osptk+y}
+then :
   withval=$with_osptk;
 	case ${withval} in
 	n|no)
@@ -12114,7 +13078,8 @@
     PBX_OSS=0
 
 # Check whether --with-oss was given.
-if test "${with_oss+set}" = set; then :
+if test ${with_oss+y}
+then :
   withval=$with_oss;
 	case ${withval} in
 	n|no)
@@ -12146,7 +13111,8 @@
     PBX_PGSQL=0
 
 # Check whether --with-postgres was given.
-if test "${with_postgres+set}" = set; then :
+if test ${with_postgres+y}
+then :
   withval=$with_postgres;
 	case ${withval} in
 	n|no)
@@ -12178,7 +13144,8 @@
     PBX_BEANSTALK=0
 
 # Check whether --with-beanstalk was given.
-if test "${with_beanstalk+set}" = set; then :
+if test ${with_beanstalk+y}
+then :
   withval=$with_beanstalk;
 	case ${withval} in
 	n|no)
@@ -12212,7 +13179,8 @@
     PBX_PJPROJECT=0
 
 # Check whether --with-pjproject was given.
-if test "${with_pjproject+set}" = set; then :
+if test ${with_pjproject+y}
+then :
   withval=$with_pjproject;
 	case ${withval} in
 	n|no)
@@ -12426,7 +13394,8 @@
     PBX_POPT=0
 
 # Check whether --with-popt was given.
-if test "${with_popt+set}" = set; then :
+if test ${with_popt+y}
+then :
   withval=$with_popt;
 	case ${withval} in
 	n|no)
@@ -12458,7 +13427,8 @@
     PBX_PORTAUDIO=0
 
 # Check whether --with-portaudio was given.
-if test "${with_portaudio+set}" = set; then :
+if test ${with_portaudio+y}
+then :
   withval=$with_portaudio;
 	case ${withval} in
 	n|no)
@@ -12490,7 +13460,8 @@
     PBX_PRI=0
 
 # Check whether --with-pri was given.
-if test "${with_pri+set}" = set; then :
+if test ${with_pri+y}
+then :
   withval=$with_pri;
 	case ${withval} in
 	n|no)
@@ -12766,7 +13737,8 @@
     PBX_RADIUS=0
 
 # Check whether --with-radius was given.
-if test "${with_radius+set}" = set; then :
+if test ${with_radius+y}
+then :
   withval=$with_radius;
 	case ${withval} in
 	n|no)
@@ -12798,7 +13770,8 @@
     PBX_FFTW3=0
 
 # Check whether --with-fftw3 was given.
-if test "${with_fftw3+set}" = set; then :
+if test ${with_fftw3+y}
+then :
   withval=$with_fftw3;
 	case ${withval} in
 	n|no)
@@ -12830,7 +13803,8 @@
     PBX_RESAMPLE=0
 
 # Check whether --with-resample was given.
-if test "${with_resample+set}" = set; then :
+if test ${with_resample+y}
+then :
   withval=$with_resample;
 	case ${withval} in
 	n|no)
@@ -12862,7 +13836,8 @@
     PBX_SNDFILE=0
 
 # Check whether --with-sndfile was given.
-if test "${with_sndfile+set}" = set; then :
+if test ${with_sndfile+y}
+then :
   withval=$with_sndfile;
 	case ${withval} in
 	n|no)
@@ -12894,7 +13869,8 @@
     PBX_SDL=0
 
 # Check whether --with-sdl was given.
-if test "${with_sdl+set}" = set; then :
+if test ${with_sdl+y}
+then :
   withval=$with_sdl;
 	case ${withval} in
 	n|no)
@@ -12926,7 +13902,8 @@
     PBX_SDL_IMAGE=0
 
 # Check whether --with-SDL_image was given.
-if test "${with_SDL_image+set}" = set; then :
+if test ${with_SDL_image+y}
+then :
   withval=$with_SDL_image;
 	case ${withval} in
 	n|no)
@@ -12958,7 +13935,8 @@
     PBX_SPANDSP=0
 
 # Check whether --with-spandsp was given.
-if test "${with_spandsp+set}" = set; then :
+if test ${with_spandsp+y}
+then :
   withval=$with_spandsp;
 	case ${withval} in
 	n|no)
@@ -12990,7 +13968,8 @@
     PBX_SS7=0
 
 # Check whether --with-ss7 was given.
-if test "${with_ss7+set}" = set; then :
+if test ${with_ss7+y}
+then :
   withval=$with_ss7;
 	case ${withval} in
 	n|no)
@@ -13022,7 +14001,8 @@
     PBX_SPEEX=0
 
 # Check whether --with-speex was given.
-if test "${with_speex+set}" = set; then :
+if test ${with_speex+y}
+then :
   withval=$with_speex;
 	case ${withval} in
 	n|no)
@@ -13054,7 +14034,8 @@
     PBX_SPEEX_PREPROCESS=0
 
 # Check whether --with-speex was given.
-if test "${with_speex+set}" = set; then :
+if test ${with_speex+y}
+then :
   withval=$with_speex;
 	case ${withval} in
 	n|no)
@@ -13086,7 +14067,8 @@
     PBX_SPEEXDSP=0
 
 # Check whether --with-speexdsp was given.
-if test "${with_speexdsp+set}" = set; then :
+if test ${with_speexdsp+y}
+then :
   withval=$with_speexdsp;
 	case ${withval} in
 	n|no)
@@ -13129,7 +14111,8 @@
     PBX_SQLITE=0
 
 # Check whether --with-sqlite was given.
-if test "${with_sqlite+set}" = set; then :
+if test ${with_sqlite+y}
+then :
   withval=$with_sqlite;
 	case ${withval} in
 	n|no)
@@ -13161,7 +14144,8 @@
     PBX_SQLITE3=0
 
 # Check whether --with-sqlite3 was given.
-if test "${with_sqlite3+set}" = set; then :
+if test ${with_sqlite3+y}
+then :
   withval=$with_sqlite3;
 	case ${withval} in
 	n|no)
@@ -13193,7 +14177,8 @@
     PBX_SRTP=0
 
 # Check whether --with-srtp was given.
-if test "${with_srtp+set}" = set; then :
+if test ${with_srtp+y}
+then :
   withval=$with_srtp;
 	case ${withval} in
 	n|no)
@@ -13297,7 +14282,8 @@
     PBX_SUPPSERV=0
 
 # Check whether --with-suppserv was given.
-if test "${with_suppserv+set}" = set; then :
+if test ${with_suppserv+y}
+then :
   withval=$with_suppserv;
 	case ${withval} in
 	n|no)
@@ -13329,7 +14315,8 @@
     PBX_FREETDS=0
 
 # Check whether --with-tds was given.
-if test "${with_tds+set}" = set; then :
+if test ${with_tds+y}
+then :
   withval=$with_tds;
 	case ${withval} in
 	n|no)
@@ -13361,7 +14348,8 @@
     PBX_TIMERFD=0
 
 # Check whether --with-timerfd was given.
-if test "${with_timerfd+set}" = set; then :
+if test ${with_timerfd+y}
+then :
   withval=$with_timerfd;
 	case ${withval} in
 	n|no)
@@ -13393,7 +14381,8 @@
     PBX_TONEZONE=0
 
 # Check whether --with-tonezone was given.
-if test "${with_tonezone+set}" = set; then :
+if test ${with_tonezone+y}
+then :
   withval=$with_tonezone;
 	case ${withval} in
 	n|no)
@@ -13425,7 +14414,8 @@
     PBX_UNBOUND=0
 
 # Check whether --with-unbound was given.
-if test "${with_unbound+set}" = set; then :
+if test ${with_unbound+y}
+then :
   withval=$with_unbound;
 	case ${withval} in
 	n|no)
@@ -13457,7 +14447,8 @@
     PBX_UNIXODBC=0
 
 # Check whether --with-unixodbc was given.
-if test "${with_unixodbc+set}" = set; then :
+if test ${with_unixodbc+y}
+then :
   withval=$with_unixodbc;
 	case ${withval} in
 	n|no)
@@ -13489,7 +14480,8 @@
     PBX_VORBIS=0
 
 # Check whether --with-vorbis was given.
-if test "${with_vorbis+set}" = set; then :
+if test ${with_vorbis+y}
+then :
   withval=$with_vorbis;
 	case ${withval} in
 	n|no)
@@ -13521,7 +14513,8 @@
     PBX_VPB=0
 
 # Check whether --with-vpb was given.
-if test "${with_vpb+set}" = set; then :
+if test ${with_vpb+y}
+then :
   withval=$with_vpb;
 	case ${withval} in
 	n|no)
@@ -13553,7 +14546,8 @@
     PBX_X11=0
 
 # Check whether --with-x11 was given.
-if test "${with_x11+set}" = set; then :
+if test ${with_x11+y}
+then :
   withval=$with_x11;
 	case ${withval} in
 	n|no)
@@ -13585,7 +14579,8 @@
     PBX_ZLIB=0
 
 # Check whether --with-z was given.
-if test "${with_z+set}" = set; then :
+if test ${with_z+y}
+then :
   withval=$with_z;
 	case ${withval} in
 	n|no)
@@ -13616,28 +14611,28 @@
 # checking for package libraries
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = xyes
+then :
 
-else
+else $as_nop
 
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
+printf "%s\n" "#define size_t unsigned int" >>confdefs.h
 
 fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+printf %s "checking for working alloca.h... " >&6; }
+if test ${ac_cv_working_alloca_h+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
-main ()
+main (void)
 {
 char *p = (char *) alloca (2 * sizeof (int));
 			  if (p) return 0;
@@ -13645,52 +14640,52 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_working_alloca_h=yes
-else
+else $as_nop
   ac_cv_working_alloca_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+printf "%s\n" "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
-  $as_echo_n "(cached) " >&6
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+printf %s "checking for alloca... " >&6; }
+if test ${ac_cv_func_alloca_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test $ac_cv_working_alloca_h = yes; then
+  ac_cv_func_alloca_works=yes
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
+#include <stdlib.h>
+#include <stddef.h>
+#ifndef alloca
+# ifdef __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
 # else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
-#    endif
-#   endif
+#  ifdef  __cplusplus
+extern "C"
 #  endif
+void *alloca (size_t);
 # endif
 #endif
 
 int
-main ()
+main (void)
 {
 char *p = (char *) alloca (1);
 				    if (p) return 0;
@@ -13698,20 +14693,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_func_alloca_works=yes
-else
+else $as_nop
   ac_cv_func_alloca_works=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
+fi
 
 if test $ac_cv_func_alloca_works = yes; then
 
-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -13721,58 +14718,19 @@
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-$as_echo "#define C_ALLOCA 1" >>confdefs.h
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then :
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
-
-    break
-fi
+printf "%s\n" "#define C_ALLOCA 1" >>confdefs.h
 
-  done
-fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+printf %s "checking stack direction for C alloca... " >&6; }
+if test ${ac_cv_c_stack_direction+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_c_stack_direction=0
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
@@ -13793,9 +14751,10 @@
   return find_stack_direction (0, argc + !argv + 20) < 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_c_stack_direction=1
-else
+else $as_nop
   ac_cv_c_stack_direction=-1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -13803,30 +14762,29 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+printf "%s\n" "$ac_cv_c_stack_direction" >&6; }
+printf "%s\n" "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
 
 
 fi
 
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if eval \${$as_ac_Header+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+printf %s "checking for $ac_hdr that defines DIR... " >&6; }
+if eval test \${$as_ac_Header+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <$ac_hdr>
 
 int
-main ()
+main (void)
 {
 if ((DIR *) 0)
 return 0;
@@ -13834,19 +14792,21 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$as_ac_Header=yes"
-else
+else $as_nop
   eval "$as_ac_Header=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$as_ac_Header
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+#define `printf "%s\n" "HAVE_$ac_hdr" | $as_tr_cpp` 1
 _ACEOF
 
 ac_header_dirent=$ac_hdr; break
@@ -13855,11 +14815,12 @@
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+printf %s "checking for library containing opendir... " >&6; }
+if test ${ac_cv_search_opendir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13867,56 +14828,59 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char opendir ();
 int
-main ()
+main (void)
 {
 return opendir ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' dir; do
+for ac_lib in '' dir
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_opendir=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
+  if test ${ac_cv_search_opendir+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_opendir+:} false; then :
+if test ${ac_cv_search_opendir+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+printf "%s\n" "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if ${ac_cv_search_opendir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+printf %s "checking for library containing opendir... " >&6; }
+if test ${ac_cv_search_opendir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13924,46 +14888,48 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char opendir ();
 int
-main ()
+main (void)
 {
 return opendir ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' x; do
+for ac_lib in '' x
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_opendir=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_opendir+:} false; then :
+  if test ${ac_cv_search_opendir+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_opendir+:} false; then :
+if test ${ac_cv_search_opendir+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-$as_echo "$ac_cv_search_opendir" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+printf "%s\n" "$ac_cv_search_opendir" >&6; }
 ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
@@ -13974,11 +14940,12 @@
   as_fn_error $? "*** Could not find dirent header that defines 'DIR'." "$LINENO" 5
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
-$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if ${ac_cv_header_sys_wait_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+printf %s "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+if test ${ac_cv_header_sys_wait_h+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
@@ -13991,7 +14958,7 @@
 #endif
 
 int
-main ()
+main (void)
 {
   int s;
   wait (&s);
@@ -14000,18 +14967,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_header_sys_wait_h=yes
-else
+else $as_nop
   ac_cv_header_sys_wait_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
-$as_echo "$ac_cv_header_sys_wait_h" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
+printf "%s\n" "$ac_cv_header_sys_wait_h" >&6; }
 if test $ac_cv_header_sys_wait_h = yes; then
 
-$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
 
 fi
 
@@ -14019,10 +14987,7 @@
   as_fn_error $? "*** POSIX.1 compatible sys/wait.h is required." "$LINENO" 5
 fi
 
-for ac_header in sys/types.h netinet/in.h arpa/nameser.h netdb.h resolv.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_SYS_TYPES_H
+ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "#ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
 #endif
 #ifdef HAVE_NETINET_IN_H
@@ -14035,14 +15000,83 @@
 #  include <netdb.h>
 #endif
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+if test "x$ac_cv_header_sys_types_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "#ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#  include <netinet/in.h>   /* inet_ functions / structs */
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#  include <arpa/nameser.h> /* DNS HEADER struct */
+#endif
+#ifdef HAVE_NETDB_H
+#  include <netdb.h>
+#endif
+"
+if test "x$ac_cv_header_netinet_in_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_NETINET_IN_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "arpa/nameser.h" "ac_cv_header_arpa_nameser_h" "#ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#  include <netinet/in.h>   /* inet_ functions / structs */
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#  include <arpa/nameser.h> /* DNS HEADER struct */
+#endif
+#ifdef HAVE_NETDB_H
+#  include <netdb.h>
+#endif
+"
+if test "x$ac_cv_header_arpa_nameser_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ARPA_NAMESER_H 1" >>confdefs.h
 
-done
+fi
+ac_fn_c_check_header_compile "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "#ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#  include <netinet/in.h>   /* inet_ functions / structs */
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#  include <arpa/nameser.h> /* DNS HEADER struct */
+#endif
+#ifdef HAVE_NETDB_H
+#  include <netdb.h>
+#endif
+"
+if test "x$ac_cv_header_netdb_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_NETDB_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "#ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#  include <netinet/in.h>   /* inet_ functions / structs */
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+#  include <arpa/nameser.h> /* DNS HEADER struct */
+#endif
+#ifdef HAVE_NETDB_H
+#  include <netdb.h>
+#endif
+"
+if test "x$ac_cv_header_resolv_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_RESOLV_H 1" >>confdefs.h
+
+fi
 
 
 if test "$ac_cv_header_resolv_h" != "yes"; then
@@ -14051,23 +15085,17 @@
 
 # Check for headers that are unconditionally required on all platforms.  Do not use
 # this to check for headers that are only needed by modules.
-for ac_header in  \
-  arpa/nameser.h assert.h ctype.h dlfcn.h errno.h fcntl.h float.h grp.h \
-  inttypes.h limits.h locale.h math.h pwd.h netinet/in.h regex.h \
-  sched.h stdarg.h stdint.h stdio.h stdlib.h string.h syslog.h \
-  sys/file.h sys/ioctl.h sys/param.h sys/resource.h sys/socket.h sys/stat.h \
-  sys/time.h sys/types.h sys/un.h \
-  termios.h time.h unistd.h \
-
+       for ac_header in arpa/nameser.h assert.h ctype.h dlfcn.h errno.h fcntl.h float.h grp.h inttypes.h limits.h locale.h math.h pwd.h netinet/in.h regex.h sched.h stdarg.h stdint.h stdio.h stdlib.h string.h syslog.h sys/file.h sys/ioctl.h sys/param.h sys/resource.h sys/socket.h sys/stat.h sys/time.h sys/types.h sys/un.h termios.h time.h unistd.h
 do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
-else
+else $as_nop
 
   as_fn_error $? "*** A required header was not found." "$LINENO" 5
 
@@ -14075,19 +15103,54 @@
 
 done
 
+ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
+if test "x$ac_cv_header_arpa_inet_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ARPA_INET_H 1" >>confdefs.h
 
-for ac_header in arpa/inet.h libintl.h malloc.h netdb.h stddef.h strings.h sys/event.h utime.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_header_compile "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBINTL_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
+if test "x$ac_cv_header_malloc_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_MALLOC_H 1" >>confdefs.h
 
-done
+fi
+ac_fn_c_check_header_compile "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default"
+if test "x$ac_cv_header_netdb_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_NETDB_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default"
+if test "x$ac_cv_header_stddef_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STDDEF_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default"
+if test "x$ac_cv_header_strings_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRINGS_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_event_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_EVENT_H 1" >>confdefs.h
+
+fi
+ac_fn_c_check_header_compile "$LINENO" "utime.h" "ac_cv_header_utime_h" "$ac_includes_default"
+if test "x$ac_cv_header_utime_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UTIME_H 1" >>confdefs.h
+
+fi
 
 
 # Find required NetBSD Editline library (libedit).
@@ -14095,17 +15158,17 @@
    if test "x${PBX_LIBEDIT}" != "x1" -a "${USE_LIBEDIT}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEDIT" >&5
-$as_echo_n "checking for LIBEDIT... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5
+printf %s "checking for libedit... " >&6; }
 
 if test -n "$LIBEDIT_CFLAGS"; then
     pkg_cv_LIBEDIT_CFLAGS="$LIBEDIT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libedit") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBEDIT_CFLAGS=`$PKG_CONFIG --cflags "libedit" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -14119,10 +15182,10 @@
     pkg_cv_LIBEDIT_LIBS="$LIBEDIT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libedit") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBEDIT_LIBS=`$PKG_CONFIG --libs "libedit" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -14136,8 +15199,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -14157,8 +15220,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_LIBEDIT=0
 
@@ -14166,14 +15229,14 @@
 else
 	LIBEDIT_CFLAGS=$pkg_cv_LIBEDIT_CFLAGS
 	LIBEDIT_LIBS=$pkg_cv_LIBEDIT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_LIBEDIT=1
             LIBEDIT_INCLUDE=$(echo ${LIBEDIT_CFLAGS} | $SED -e "s|-std=c99||g")
             LIBEDIT_LIB="$LIBEDIT_LIBS"
 
-$as_echo "#define HAVE_LIBEDIT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBEDIT 1" >>confdefs.h
 
 
 fi
@@ -14194,11 +15257,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for history_init in -ledit" >&5
-$as_echo_n "checking for history_init in -ledit... " >&6; }
-if ${ac_cv_lib_edit_history_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for history_init in -ledit" >&5
+printf %s "checking for history_init in -ledit... " >&6; }
+if test ${ac_cv_lib_edit_history_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit ${pbxlibdir} -ltermcap $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14207,32 +15271,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char history_init ();
 int
-main ()
+main (void)
 {
 return history_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_edit_history_init=yes
-else
+else $as_nop
   ac_cv_lib_edit_history_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_history_init" >&5
-$as_echo "$ac_cv_lib_edit_history_init" >&6; }
-if test "x$ac_cv_lib_edit_history_init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_history_init" >&5
+printf "%s\n" "$ac_cv_lib_edit_history_init" >&6; }
+if test "x$ac_cv_lib_edit_history_init" = xyes
+then :
   AST_LIBEDIT_FOUND=yes
-else
+else $as_nop
   AST_LIBEDIT_FOUND=no
 fi
 
@@ -14251,14 +15314,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LIBEDIT_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "histedit.h" "ac_cv_header_histedit_h" "$ac_includes_default"
-if test "x$ac_cv_header_histedit_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "histedit.h" "ac_cv_header_histedit_h" "$ac_includes_default"
+if test "x$ac_cv_header_histedit_h" = xyes
+then :
   LIBEDIT_HEADER_FOUND=1
-else
+else $as_nop
   LIBEDIT_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${LIBEDIT_HEADER_FOUND}" = "x0" ; then
@@ -14282,8 +15345,8 @@
 fi
 
     if test "x${PBX_LIBEDIT_IS_UNICODE}" != "x1" -a "${USE_LIBEDIT_IS_UNICODE}" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Testing for libedit unicode support" >&5
-$as_echo_n "checking for Testing for libedit unicode support... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Testing for libedit unicode support" >&5
+printf %s "checking for Testing for libedit unicode support... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${LIBEDIT_IS_UNICODE_DIR}" != "x"; then
 	    LIBEDIT_IS_UNICODE_INCLUDE="-I${LIBEDIT_IS_UNICODE_DIR}/include"
@@ -14294,7 +15357,7 @@
 /* end confdefs.h.  */
  #include <histedit.h>
 int
-main ()
+main (void)
 {
  el_rfunc_t *callback;;
 
@@ -14302,21 +15365,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_LIBEDIT_IS_UNICODE=1
 
-$as_echo "#define HAVE_LIBEDIT_IS_UNICODE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBEDIT_IS_UNICODE 1" >>confdefs.h
 
 
 
-else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
@@ -14339,11 +15403,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_random in -luuid" >&5
-$as_echo_n "checking for uuid_generate_random in -luuid... " >&6; }
-if ${ac_cv_lib_uuid_uuid_generate_random+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_random in -luuid" >&5
+printf %s "checking for uuid_generate_random in -luuid... " >&6; }
+if test ${ac_cv_lib_uuid_uuid_generate_random+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-luuid ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14352,32 +15417,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char uuid_generate_random ();
 int
-main ()
+main (void)
 {
 return uuid_generate_random ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_uuid_uuid_generate_random=yes
-else
+else $as_nop
   ac_cv_lib_uuid_uuid_generate_random=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_random" >&5
-$as_echo "$ac_cv_lib_uuid_uuid_generate_random" >&6; }
-if test "x$ac_cv_lib_uuid_uuid_generate_random" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_random" >&5
+printf "%s\n" "$ac_cv_lib_uuid_uuid_generate_random" >&6; }
+if test "x$ac_cv_lib_uuid_uuid_generate_random" = xyes
+then :
   AST_LIBUUID_FOUND=yes
-else
+else $as_nop
   AST_LIBUUID_FOUND=no
 fi
 
@@ -14396,14 +15460,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LIBUUID_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
-if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
+if test "x$ac_cv_header_uuid_uuid_h" = xyes
+then :
   LIBUUID_HEADER_FOUND=1
-else
+else $as_nop
   LIBUUID_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${LIBUUID_HEADER_FOUND}" = "x0" ; then
@@ -14439,11 +15503,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_random in -le2fs-uuid" >&5
-$as_echo_n "checking for uuid_generate_random in -le2fs-uuid... " >&6; }
-if ${ac_cv_lib_e2fs_uuid_uuid_generate_random+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_random in -le2fs-uuid" >&5
+printf %s "checking for uuid_generate_random in -le2fs-uuid... " >&6; }
+if test ${ac_cv_lib_e2fs_uuid_uuid_generate_random+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-le2fs-uuid ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14452,32 +15517,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char uuid_generate_random ();
 int
-main ()
+main (void)
 {
 return uuid_generate_random ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_e2fs_uuid_uuid_generate_random=yes
-else
+else $as_nop
   ac_cv_lib_e2fs_uuid_uuid_generate_random=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_e2fs_uuid_uuid_generate_random" >&5
-$as_echo "$ac_cv_lib_e2fs_uuid_uuid_generate_random" >&6; }
-if test "x$ac_cv_lib_e2fs_uuid_uuid_generate_random" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_e2fs_uuid_uuid_generate_random" >&5
+printf "%s\n" "$ac_cv_lib_e2fs_uuid_uuid_generate_random" >&6; }
+if test "x$ac_cv_lib_e2fs_uuid_uuid_generate_random" = xyes
+then :
   AST_E2FSUUID_FOUND=yes
-else
+else $as_nop
   AST_E2FSUUID_FOUND=no
 fi
 
@@ -14496,14 +15560,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${E2FSUUID_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
-if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
+if test "x$ac_cv_header_uuid_uuid_h" = xyes
+then :
   E2FSUUID_HEADER_FOUND=1
-else
+else $as_nop
   E2FSUUID_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${E2FSUUID_HEADER_FOUND}" = "x0" ; then
@@ -14525,19 +15589,19 @@
     UUID_INCLUDE="$E2FSUUID_INCLUDE"
     UUID_LIB="$E2FSUUID_LIB"
   else
-    for ac_func in uuid_generate_random
+
+  for ac_func in uuid_generate_random
 do :
   ac_fn_c_check_func "$LINENO" "uuid_generate_random" "ac_cv_func_uuid_generate_random"
-if test "x$ac_cv_func_uuid_generate_random" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_UUID_GENERATE_RANDOM 1
-_ACEOF
+if test "x$ac_cv_func_uuid_generate_random" = xyes
+then :
+  printf "%s\n" "#define HAVE_UUID_GENERATE_RANDOM 1" >>confdefs.h
  SYSUUID=true
-else
+else $as_nop
   SYSUUID=""
 fi
-done
 
+done
     if test "x$SYSUUID" != "x" ; then
       UUID_INCLUDE=""
       UUID_LIB=""
@@ -14555,17 +15619,17 @@
    if test "x${PBX_JANSSON}" != "x1" -a "${USE_JANSSON}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5
-$as_echo_n "checking for JANSSON... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jansson >= 2.11" >&5
+printf %s "checking for jansson >= 2.11... " >&6; }
 
 if test -n "$JANSSON_CFLAGS"; then
     pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.11\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "jansson >= 2.11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson >= 2.11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -14579,10 +15643,10 @@
     pkg_cv_JANSSON_LIBS="$JANSSON_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.11\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "jansson >= 2.11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson >= 2.11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -14596,8 +15660,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -14617,8 +15681,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_JANSSON=0
 
@@ -14626,14 +15690,14 @@
 else
 	JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS
 	JANSSON_LIBS=$pkg_cv_JANSSON_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_JANSSON=1
             JANSSON_INCLUDE=$(echo ${JANSSON_CFLAGS} | $SED -e "s|-std=c99||g")
             JANSSON_LIB="$JANSSON_LIBS"
 
-$as_echo "#define HAVE_JANSSON 1" >>confdefs.h
+printf "%s\n" "#define HAVE_JANSSON 1" >>confdefs.h
 
 
 fi
@@ -14654,11 +15718,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for json_sprintf in -ljansson" >&5
-$as_echo_n "checking for json_sprintf in -ljansson... " >&6; }
-if ${ac_cv_lib_jansson_json_sprintf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for json_sprintf in -ljansson" >&5
+printf %s "checking for json_sprintf in -ljansson... " >&6; }
+if test ${ac_cv_lib_jansson_json_sprintf+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljansson ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14667,32 +15732,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char json_sprintf ();
 int
-main ()
+main (void)
 {
 return json_sprintf ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_jansson_json_sprintf=yes
-else
+else $as_nop
   ac_cv_lib_jansson_json_sprintf=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jansson_json_sprintf" >&5
-$as_echo "$ac_cv_lib_jansson_json_sprintf" >&6; }
-if test "x$ac_cv_lib_jansson_json_sprintf" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jansson_json_sprintf" >&5
+printf "%s\n" "$ac_cv_lib_jansson_json_sprintf" >&6; }
+if test "x$ac_cv_lib_jansson_json_sprintf" = xyes
+then :
   AST_JANSSON_FOUND=yes
-else
+else $as_nop
   AST_JANSSON_FOUND=no
 fi
 
@@ -14711,14 +15775,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${JANSSON_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "jansson.h" "ac_cv_header_jansson_h" "$ac_includes_default"
-if test "x$ac_cv_header_jansson_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "jansson.h" "ac_cv_header_jansson_h" "$ac_includes_default"
+if test "x$ac_cv_header_jansson_h" = xyes
+then :
   JANSSON_HEADER_FOUND=1
-else
+else $as_nop
   JANSSON_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${JANSSON_HEADER_FOUND}" = "x0" ; then
@@ -14738,12 +15802,12 @@
 
 
 	if test "${PBX_JANSSON}" != 1; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Asterisk requires libjansson >= 2.11 and no system copy was found." >&5
-$as_echo "$as_me: *** Asterisk requires libjansson >= 2.11 and no system copy was found." >&6;}
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Please install the 'libjansson' development package or" >&5
-$as_echo "$as_me: *** Please install the 'libjansson' development package or" >&6;}
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: *** use './configure --with-jansson-bundled'" >&5
-$as_echo "$as_me: *** use './configure --with-jansson-bundled'" >&6;}
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Asterisk requires libjansson >= 2.11 and no system copy was found." >&5
+printf "%s\n" "$as_me: *** Asterisk requires libjansson >= 2.11 and no system copy was found." >&6;}
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Please install the 'libjansson' development package or" >&5
+printf "%s\n" "$as_me: *** Please install the 'libjansson' development package or" >&6;}
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** use './configure --with-jansson-bundled'" >&5
+printf "%s\n" "$as_me: *** use './configure --with-jansson-bundled'" >&6;}
 		exit 1
 	fi
 
@@ -14754,7 +15818,7 @@
 /* end confdefs.h.  */
 #include <jansson.h>
 int
-main ()
+main (void)
 {
 #if !JSON_INTEGER_IS_LONG_LONG
 		#error "not long long"
@@ -14764,16 +15828,17 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-$as_echo "#define AST_JSON_INT_T long long" >>confdefs.h
+printf "%s\n" "#define AST_JSON_INT_T long long" >>confdefs.h
 
-else
+else $as_nop
 
-$as_echo "#define AST_JSON_INT_T long" >>confdefs.h
+printf "%s\n" "#define AST_JSON_INT_T long" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
 
 else
@@ -14795,11 +15860,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-if ${ac_cv_lib_rt_clock_gettime+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
+printf %s "checking for clock_gettime in -lrt... " >&6; }
+if test ${ac_cv_lib_rt_clock_gettime+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14808,32 +15874,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char clock_gettime ();
 int
-main ()
+main (void)
 {
 return clock_gettime ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_rt_clock_gettime=yes
-else
+else $as_nop
   ac_cv_lib_rt_clock_gettime=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
+printf "%s\n" "$ac_cv_lib_rt_clock_gettime" >&6; }
+if test "x$ac_cv_lib_rt_clock_gettime" = xyes
+then :
   AST_RT_FOUND=yes
-else
+else $as_nop
   AST_RT_FOUND=no
 fi
 
@@ -14869,16 +15934,105 @@
 
 
 
+   if test "x${PBX_LIBXML2}" != "x1" -a "${USE_LIBXML2}" != "no"; then
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0" >&5
+printf %s "checking for libxml-2.0... " >&6; }
+
+if test -n "$LIBXML2_CFLAGS"; then
+    pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBXML2_LIBS"; then
+    pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1`
+        else
+	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBXML2_PKG_ERRORS" >&5
+
+
+            PBX_LIBXML2=0
+
+
+elif test $pkg_failed = untried; then
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+            PBX_LIBXML2=0
+
+
+else
+	LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
+	LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+            PBX_LIBXML2=1
+            LIBXML2_INCLUDE=$(echo ${LIBXML2_CFLAGS} | $SED -e "s|-std=c99||g")
+            LIBXML2_LIB="$LIBXML2_LIBS"
+
+printf "%s\n" "#define HAVE_LIBXML2 1" >>confdefs.h
+
+
+fi
+   fi
+
+
 		if test "x${PBX_LIBXML2}" != "x1" -a "${USE_LIBXML2}" != "no"; then
 		PBX_LIBXML2=0
 		if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}xml2-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}xml2-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CONFIG_LIBXML2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CONFIG_LIBXML2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CONFIG_LIBXML2 in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CONFIG_LIBXML2="$CONFIG_LIBXML2" # Let the user override the test with a path.
@@ -14889,11 +16043,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CONFIG_LIBXML2="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CONFIG_LIBXML2="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -14905,11 +16063,11 @@
 fi
 CONFIG_LIBXML2=$ac_cv_path_CONFIG_LIBXML2
 if test -n "$CONFIG_LIBXML2"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_LIBXML2" >&5
-$as_echo "$CONFIG_LIBXML2" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CONFIG_LIBXML2" >&5
+printf "%s\n" "$CONFIG_LIBXML2" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -14918,11 +16076,12 @@
   ac_pt_CONFIG_LIBXML2=$CONFIG_LIBXML2
   # Extract the first word of "xml2-config", so it can be a program name with args.
 set dummy xml2-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_CONFIG_LIBXML2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_CONFIG_LIBXML2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_CONFIG_LIBXML2 in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_CONFIG_LIBXML2="$ac_pt_CONFIG_LIBXML2" # Let the user override the test with a path.
@@ -14933,11 +16092,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_CONFIG_LIBXML2="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_CONFIG_LIBXML2="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -14949,11 +16112,11 @@
 fi
 ac_pt_CONFIG_LIBXML2=$ac_cv_path_ac_pt_CONFIG_LIBXML2
 if test -n "$ac_pt_CONFIG_LIBXML2"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_LIBXML2" >&5
-$as_echo "$ac_pt_CONFIG_LIBXML2" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_LIBXML2" >&5
+printf "%s\n" "$ac_pt_CONFIG_LIBXML2" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_CONFIG_LIBXML2" = x; then
@@ -14961,8 +16124,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CONFIG_LIBXML2=$ac_pt_CONFIG_LIBXML2
@@ -14990,19 +16153,20 @@
   #include <libxml/tree.h>
         #include <libxml/parser.h>
 int
-main ()
+main (void)
 {
  LIBXML_TEST_VERSION;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
    PBX_LIBXML2=1
-$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBXML2 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 				CPPFLAGS="${saved_cppflags}"
 				LIBS="${saved_libs}"
@@ -15012,10 +16176,10 @@
 
 
 if test "${PBX_LIBXML2}" != 1; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: *** The Asterisk menuselect tool requires the 'libxml2' development package." >&5
-$as_echo "$as_me: *** The Asterisk menuselect tool requires the 'libxml2' development package." >&6;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Please install the 'libxml2' development package." >&5
-$as_echo "$as_me: *** Please install the 'libxml2' development package." >&6;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** The Asterisk menuselect tool requires the 'libxml2' development package." >&5
+printf "%s\n" "$as_me: *** The Asterisk menuselect tool requires the 'libxml2' development package." >&6;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Please install the 'libxml2' development package." >&5
+printf "%s\n" "$as_me: *** Please install the 'libxml2' development package." >&6;}
 	exit 1
 fi
 
@@ -15033,11 +16197,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uriParseUriA in -luriparser" >&5
-$as_echo_n "checking for uriParseUriA in -luriparser... " >&6; }
-if ${ac_cv_lib_uriparser_uriParseUriA+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uriParseUriA in -luriparser" >&5
+printf %s "checking for uriParseUriA in -luriparser... " >&6; }
+if test ${ac_cv_lib_uriparser_uriParseUriA+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-luriparser ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15046,32 +16211,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char uriParseUriA ();
 int
-main ()
+main (void)
 {
 return uriParseUriA ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_uriparser_uriParseUriA=yes
-else
+else $as_nop
   ac_cv_lib_uriparser_uriParseUriA=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uriparser_uriParseUriA" >&5
-$as_echo "$ac_cv_lib_uriparser_uriParseUriA" >&6; }
-if test "x$ac_cv_lib_uriparser_uriParseUriA" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uriparser_uriParseUriA" >&5
+printf "%s\n" "$ac_cv_lib_uriparser_uriParseUriA" >&6; }
+if test "x$ac_cv_lib_uriparser_uriParseUriA" = xyes
+then :
   AST_URIPARSER_FOUND=yes
-else
+else $as_nop
   AST_URIPARSER_FOUND=no
 fi
 
@@ -15090,14 +16254,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${URIPARSER_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "uriparser/Uri.h" "ac_cv_header_uriparser_Uri_h" "$ac_includes_default"
-if test "x$ac_cv_header_uriparser_Uri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "uriparser/Uri.h" "ac_cv_header_uriparser_Uri_h" "$ac_includes_default"
+if test "x$ac_cv_header_uriparser_Uri_h" = xyes
+then :
   URIPARSER_HEADER_FOUND=1
-else
+else $as_nop
   URIPARSER_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${URIPARSER_HEADER_FOUND}" = "x0" ; then
@@ -15118,13 +16282,14 @@
 
 # Another mandatory item (unless it's explicitly disabled)
 # Check whether --enable-xmldoc was given.
-if test "${enable_xmldoc+set}" = set; then :
+if test ${enable_xmldoc+y}
+then :
   enableval=$enable_xmldoc; case "${enableval}" in
 		y|ye|yes) DISABLE_XMLDOC=no ;;
 		n|no)  DISABLE_XMLDOC=yes ;;
 		*) as_fn_error $? "bad value ${enableval} for --disable-xmldoc" "$LINENO" 5  ;;
 	esac
-else
+else $as_nop
   DISABLE_XMLDOC=no
 fi
 
@@ -15132,7 +16297,7 @@
 
 if test "${DISABLE_XMLDOC}" != "yes"; then
 
-$as_echo "#define AST_XML_DOCS 1" >>confdefs.h
+printf "%s\n" "#define AST_XML_DOCS 1" >>confdefs.h
 
 fi
 
@@ -15150,11 +16315,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} ${LIBXML2_INCLUDE}"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xsltLoadStylesheetPI in -lxslt" >&5
-$as_echo_n "checking for xsltLoadStylesheetPI in -lxslt... " >&6; }
-if ${ac_cv_lib_xslt_xsltLoadStylesheetPI+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xsltLoadStylesheetPI in -lxslt" >&5
+printf %s "checking for xsltLoadStylesheetPI in -lxslt... " >&6; }
+if test ${ac_cv_lib_xslt_xsltLoadStylesheetPI+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxslt ${pbxlibdir} ${LIBXML2_LIB} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15163,32 +16329,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char xsltLoadStylesheetPI ();
 int
-main ()
+main (void)
 {
 return xsltLoadStylesheetPI ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_xslt_xsltLoadStylesheetPI=yes
-else
+else $as_nop
   ac_cv_lib_xslt_xsltLoadStylesheetPI=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xslt_xsltLoadStylesheetPI" >&5
-$as_echo "$ac_cv_lib_xslt_xsltLoadStylesheetPI" >&6; }
-if test "x$ac_cv_lib_xslt_xsltLoadStylesheetPI" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xslt_xsltLoadStylesheetPI" >&5
+printf "%s\n" "$ac_cv_lib_xslt_xsltLoadStylesheetPI" >&6; }
+if test "x$ac_cv_lib_xslt_xsltLoadStylesheetPI" = xyes
+then :
   AST_LIBXSLT_FOUND=yes
-else
+else $as_nop
   AST_LIBXSLT_FOUND=no
 fi
 
@@ -15207,14 +16372,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LIBXSLT_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libxslt/xsltInternals.h" "ac_cv_header_libxslt_xsltInternals_h" "$ac_includes_default"
-if test "x$ac_cv_header_libxslt_xsltInternals_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libxslt/xsltInternals.h" "ac_cv_header_libxslt_xsltInternals_h" "$ac_includes_default"
+if test "x$ac_cv_header_libxslt_xsltInternals_h" = xyes
+then :
   LIBXSLT_HEADER_FOUND=1
-else
+else $as_nop
   LIBXSLT_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${LIBXSLT_HEADER_FOUND}" = "x0" ; then
@@ -15246,11 +16411,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} ${LIBXML2_INCLUDE}"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xsltCleanupGlobals in -lxslt" >&5
-$as_echo_n "checking for xsltCleanupGlobals in -lxslt... " >&6; }
-if ${ac_cv_lib_xslt_xsltCleanupGlobals+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xsltCleanupGlobals in -lxslt" >&5
+printf %s "checking for xsltCleanupGlobals in -lxslt... " >&6; }
+if test ${ac_cv_lib_xslt_xsltCleanupGlobals+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lxslt ${pbxlibdir} ${LIBXML2_LIB} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15259,32 +16425,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char xsltCleanupGlobals ();
 int
-main ()
+main (void)
 {
 return xsltCleanupGlobals ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_xslt_xsltCleanupGlobals=yes
-else
+else $as_nop
   ac_cv_lib_xslt_xsltCleanupGlobals=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xslt_xsltCleanupGlobals" >&5
-$as_echo "$ac_cv_lib_xslt_xsltCleanupGlobals" >&6; }
-if test "x$ac_cv_lib_xslt_xsltCleanupGlobals" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xslt_xsltCleanupGlobals" >&5
+printf "%s\n" "$ac_cv_lib_xslt_xsltCleanupGlobals" >&6; }
+if test "x$ac_cv_lib_xslt_xsltCleanupGlobals" = xyes
+then :
   AST_LIBXSLT_CLEANUP_FOUND=yes
-else
+else $as_nop
   AST_LIBXSLT_CLEANUP_FOUND=no
 fi
 
@@ -15303,14 +16468,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LIBXSLT_CLEANUP_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libxslt/xsltInternals.h" "ac_cv_header_libxslt_xsltInternals_h" "$ac_includes_default"
-if test "x$ac_cv_header_libxslt_xsltInternals_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libxslt/xsltInternals.h" "ac_cv_header_libxslt_xsltInternals_h" "$ac_includes_default"
+if test "x$ac_cv_header_libxslt_xsltInternals_h" = xyes
+then :
   LIBXSLT_CLEANUP_HEADER_FOUND=1
-else
+else $as_nop
   LIBXSLT_CLEANUP_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${LIBXSLT_CLEANUP_HEADER_FOUND}" = "x0" ; then
@@ -15330,13 +16495,14 @@
 
 
 # Check whether --enable-permanent-dlopen was given.
-if test "${enable_permanent_dlopen+set}" = set; then :
+if test ${enable_permanent_dlopen+y}
+then :
   enableval=$enable_permanent_dlopen; case "${enableval}" in
 		y|ye|yes) PERMANENT_DLOPEN=yes ;;
 		n|no)  PERMANENT_DLOPEN=no ;;
 		*) as_fn_error $? "bad value ${enableval} for --enable-permanent-dlopen" "$LINENO" 5  ;;
 	esac
-else
+else $as_nop
   PERMANENT_DLOPEN=no
 fi
 
@@ -15344,61 +16510,58 @@
 
 if test "${PERMANENT_DLOPEN}" = "yes"; then
 
-$as_echo "#define HAVE_PERMANENT_DLOPEN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PERMANENT_DLOPEN 1" >>confdefs.h
 
 fi
 
 # some embedded systems omit internationalization (locale) support
-for ac_header in xlocale.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "xlocale.h" "ac_cv_header_xlocale_h" "$ac_includes_default"
-if test "x$ac_cv_header_xlocale_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_XLOCALE_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "xlocale.h" "ac_cv_header_xlocale_h" "$ac_includes_default"
+if test "x$ac_cv_header_xlocale_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_XLOCALE_H 1" >>confdefs.h
 
 fi
 
-done
-
 
-for ac_header in winsock.h winsock2.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "winsock.h" "ac_cv_header_winsock_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_WINSOCK_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock2_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h
 
-done
+fi
 
 
-ac_fn_c_check_header_mongrel "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_poll_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_poll_h" = xyes
+then :
 
-else
+else $as_nop
 
-$as_echo "#define AST_POLL_COMPAT 1" >>confdefs.h
+printf "%s\n" "#define AST_POLL_COMPAT 1" >>confdefs.h
 
 fi
 
 
-
 # Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
+if test ${enable_largefile+y}
+then :
   enableval=$enable_largefile;
 fi
 
 if test "$enable_largefile" != no; then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+printf %s "checking for special C compiler options needed for large files... " >&6; }
+if test ${ac_cv_sys_largefile_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_sys_largefile_CC=no
      if test "$GCC" != yes; then
        ac_save_CC=$CC
@@ -15412,44 +16575,47 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-	 if ac_fn_c_try_compile "$LINENO"; then :
+	 if ac_fn_c_try_compile "$LINENO"
+then :
   break
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
 	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"; then :
+	 if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_largefile_CC=' -n32'; break
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
 	 break
        done
        CC=$ac_save_CC
        rm -f conftest.$ac_ext
     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if test ${ac_cv_sys_file_offset_bits+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15458,22 +16624,23 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_file_offset_bits=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _FILE_OFFSET_BITS 64
@@ -15482,43 +16649,43 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_file_offset_bits=64; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   ac_cv_sys_file_offset_bits=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
   *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
+printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+printf %s "checking for _LARGE_FILES value needed for large files... " >&6; }
+if test ${ac_cv_sys_large_files+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -15527,22 +16694,23 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_large_files=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGE_FILES 1
@@ -15551,147 +16719,194 @@
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_large_files=1; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   ac_cv_sys_large_files=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+printf "%s\n" "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
   *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
+printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   fi
-
-
 fi
 
 
 # Checks for typedefs, structures, and compiler characteristics.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
-$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if ${ac_cv_header_stdbool_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+if test "x$ac_cv_type__Bool" = xyes
+then :
+
+printf "%s\n" "#define HAVE__BOOL 1" >>confdefs.h
+
+
+fi
+
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+printf %s "checking for stdbool.h that conforms to C99... " >&6; }
+if test ${ac_cv_header_stdbool_h+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <stdbool.h>
 
-             #include <stdbool.h>
-             #ifndef bool
-              "error: bool is not defined"
-             #endif
-             #ifndef false
-              "error: false is not defined"
-             #endif
-             #if false
-              "error: false is not 0"
+             #ifndef __bool_true_false_are_defined
+               #error "__bool_true_false_are_defined is not defined"
              #endif
-             #ifndef true
-              "error: true is not defined"
+             char a[__bool_true_false_are_defined == 1 ? 1 : -1];
+
+             /* Regardless of whether this is C++ or "_Bool" is a
+                valid type name, "true" and "false" should be usable
+                in #if expressions and integer constant expressions,
+                and "bool" should be a valid type name.  */
+
+             #if !true
+               #error "'true' is not true"
              #endif
              #if true != 1
-              "error: true is not 1"
+               #error "'true' is not equal to 1"
              #endif
-             #ifndef __bool_true_false_are_defined
-              "error: __bool_true_false_are_defined is not defined"
+             char b[true == 1 ? 1 : -1];
+             char c[true];
+
+             #if false
+               #error "'false' is not false"
+             #endif
+             #if false != 0
+               #error "'false' is not equal to 0"
              #endif
+             char d[false == 0 ? 1 : -1];
+
+             enum { e = false, f = true, g = false * true, h = true * 256 };
+
+             char i[(bool) 0.5 == true ? 1 : -1];
+             char j[(bool) 0.0 == false ? 1 : -1];
+             char k[sizeof (bool) > 0 ? 1 : -1];
 
-             struct s { _Bool s: 1; _Bool t; } s;
+             struct sb { bool s: 1; bool t; } s;
+             char l[sizeof s.t > 0 ? 1 : -1];
 
-             char a[true == 1 ? 1 : -1];
-             char b[false == 0 ? 1 : -1];
-             char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-             char d[(bool) 0.5 == true ? 1 : -1];
-             /* See body of main program for 'e'.  */
-             char f[(_Bool) 0.0 == false ? 1 : -1];
-             char g[true];
-             char h[sizeof (_Bool)];
-             char i[sizeof s.t];
-             enum { j = false, k = true, l = false * true, m = true * 256 };
              /* The following fails for
                 HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-             _Bool n[m];
-             char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-             char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+             bool m[h];
+             char n[sizeof m == h * sizeof m[0] ? 1 : -1];
+             char o[-1 - (bool) 0 < 0 ? 1 : -1];
              /* Catch a bug in an HP-UX C compiler.  See
-                http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-                http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+         https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+         https://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
               */
-             _Bool q = true;
-             _Bool *pq = &q;
+             bool p = true;
+             bool *pp = &p;
+
+             /* C 1999 specifies that bool, true, and false are to be
+                macros, but C++ 2011 and later overrule this.  */
+             #if __cplusplus < 201103
+              #ifndef bool
+               #error "bool is not defined"
+              #endif
+              #ifndef false
+               #error "false is not defined"
+              #endif
+              #ifndef true
+               #error "true is not defined"
+              #endif
+             #endif
+
+             /* If _Bool is available, repeat with it all the tests
+                above that used bool.  */
+             #ifdef HAVE__BOOL
+               struct sB { _Bool s: 1; _Bool t; } t;
+
+               char q[(_Bool) 0.5 == true ? 1 : -1];
+               char r[(_Bool) 0.0 == false ? 1 : -1];
+               char u[sizeof (_Bool) > 0 ? 1 : -1];
+               char v[sizeof t.t > 0 ? 1 : -1];
+
+               _Bool w[h];
+               char x[sizeof m == h * sizeof m[0] ? 1 : -1];
+               char y[-1 - (_Bool) 0 < 0 ? 1 : -1];
+               _Bool z = true;
+               _Bool *pz = &p;
+             #endif
 
 int
-main ()
+main (void)
 {
 
-             bool e = &s;
-             *pq |= q;
-             *pq |= ! q;
-             /* Refer to every declared value, to avoid compiler optimizations.  */
-             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-                     + !m + !n + !o + !p + !q + !pq);
+             bool ps = &s;
+             *pp |= p;
+             *pp |= ! p;
+
+             #ifdef HAVE__BOOL
+               _Bool pt = &t;
+               *pz |= z;
+               *pz |= ! z;
+             #endif
+
+             /* Refer to every declared value, so they cannot be
+                discarded as unused.  */
+             return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !j + !k
+                     + !l + !m + !n + !o + !p + !pp + !ps
+             #ifdef HAVE__BOOL
+                     + !q + !r + !u + !v + !w + !x + !y + !z + !pt
+             #endif
+                    );
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_header_stdbool_h=yes
-else
+else $as_nop
   ac_cv_header_stdbool_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-$as_echo "$ac_cv_header_stdbool_h" >&6; }
-   ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
-if test "x$ac_cv_type__Bool" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE__BOOL 1
-_ACEOF
-
-
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+printf "%s\n" "$ac_cv_header_stdbool_h" >&6; }
 
 if test $ac_cv_header_stdbool_h = yes; then
 
-$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_STDBOOL_H 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+printf %s "checking for an ANSI C-conforming const... " >&6; }
+if test ${ac_cv_c_const+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
 #ifndef __cplusplus
@@ -15704,7 +16919,7 @@
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
+  /* IBM XL C 1.02.0.0 rejects this.
      It does not let you subtract one const X* pointer from another in
      an arm of an if-expression whose if-part is not a constant
      expression */
@@ -15732,7 +16947,7 @@
     iptr p = 0;
     ++p;
   }
-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
+  { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
     struct s { int j; const int *ap[3]; } bx;
     struct s *b = &bx; b->j = 5;
@@ -15748,77 +16963,82 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_const=yes
-else
+else $as_nop
   ac_cv_c_const=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+printf "%s\n" "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
-$as_echo "#define const /**/" >>confdefs.h
+printf "%s\n" "#define const /**/" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if ${ac_cv_type_uid_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+printf %s "checking for uid_t in sys/types.h... " >&6; }
+if test ${ac_cv_type_uid_t+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then :
+  $EGREP "uid_t" >/dev/null 2>&1
+then :
   ac_cv_type_uid_t=yes
-else
+else $as_nop
   ac_cv_type_uid_t=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
-$as_echo "$ac_cv_type_uid_t" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+printf "%s\n" "$ac_cv_type_uid_t" >&6; }
 if test $ac_cv_type_uid_t = no; then
 
-$as_echo "#define uid_t int" >>confdefs.h
+printf "%s\n" "#define uid_t int" >>confdefs.h
 
 
-$as_echo "#define gid_t int" >>confdefs.h
+printf "%s\n" "#define gid_t int" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+printf %s "checking for inline... " >&6; }
+if test ${ac_cv_c_inline+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
+static $ac_kw foo_t static_foo (void) {return 0; }
+$ac_kw foo_t foo (void) {return 0; }
 #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_inline=$ac_kw
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+printf "%s\n" "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -15836,11 +17056,12 @@
 esac
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double with more range or precision than double" >&5
-$as_echo_n "checking for long double with more range or precision than double... " >&6; }
-if ${ac_cv_type_long_double_wider+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for long double with more range or precision than double" >&5
+printf %s "checking for long double with more range or precision than double... " >&6; }
+if test ${ac_cv_type_long_double_wider+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <float.h>
@@ -15857,7 +17078,7 @@
 	    }
 
 int
-main ()
+main (void)
 {
 static int test_array [1 - 2 * !((0 < ((DBL_MAX_EXP < LDBL_MAX_EXP)
 		   + (DBL_MANT_DIG < LDBL_MANT_DIG)
@@ -15872,71 +17093,94 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_type_long_double_wider=yes
-else
+else $as_nop
   ac_cv_type_long_double_wider=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_double_wider" >&5
-$as_echo "$ac_cv_type_long_double_wider" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_double_wider" >&5
+printf "%s\n" "$ac_cv_type_long_double_wider" >&6; }
   if test $ac_cv_type_long_double_wider = yes; then
 
-$as_echo "#define HAVE_LONG_DOUBLE_WIDER 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LONG_DOUBLE_WIDER 1" >>confdefs.h
 
   fi
 
 ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = xyes; then :
+if test "x$ac_cv_type_mode_t" = xyes
+then :
 
-else
+else $as_nop
 
-cat >>confdefs.h <<_ACEOF
-#define mode_t int
-_ACEOF
+printf "%s\n" "#define mode_t int" >>confdefs.h
 
 fi
 
 ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = xyes; then :
+if test "x$ac_cv_type_off_t" = xyes
+then :
 
-else
+else $as_nop
 
-cat >>confdefs.h <<_ACEOF
-#define off_t long int
-_ACEOF
+printf "%s\n" "#define off_t long int" >>confdefs.h
 
 fi
 
-ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
 
-else
+  ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default
+"
+if test "x$ac_cv_type_pid_t" = xyes
+then :
+
+else $as_nop
+                                          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+          #if defined _WIN64 && !defined __CYGWIN__
+          LLP64
+          #endif
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
 
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
 _ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_pid_type='int'
+else $as_nop
+  ac_pid_type='__int64'
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+
+printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h
+
 
 fi
 
+
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = xyes
+then :
 
-else
+else $as_nop
 
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
+printf "%s\n" "#define size_t unsigned int" >>confdefs.h
 
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_blksize" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLKSIZE 1" >>confdefs.h
 
 
 fi
@@ -15944,95 +17188,67 @@
 ac_fn_c_check_member "$LINENO" "struct ucred" "uid" "ac_cv_member_struct_ucred_uid" "#include <sys/types.h>
 #include <sys/socket.h>
 "
-if test "x$ac_cv_member_struct_ucred_uid" = xyes; then :
+if test "x$ac_cv_member_struct_ucred_uid" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_UCRED_UID 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_UCRED_UID 1" >>confdefs.h
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct ucred" "cr_uid" "ac_cv_member_struct_ucred_cr_uid" "#include <sys/types.h>
 #include <sys/socket.h>
 "
-if test "x$ac_cv_member_struct_ucred_cr_uid" = xyes; then :
+if test "x$ac_cv_member_struct_ucred_cr_uid" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_UCRED_CR_UID 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_UCRED_CR_UID 1" >>confdefs.h
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct sockpeercred" "uid" "ac_cv_member_struct_sockpeercred_uid" "#include <sys/types.h>
 #include <sys/socket.h>
 "
-if test "x$ac_cv_member_struct_sockpeercred_uid" = xyes; then :
+if test "x$ac_cv_member_struct_sockpeercred_uid" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_SOCKPEERCRED_UID 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_SOCKPEERCRED_UID 1" >>confdefs.h
 
 
 fi
 
 ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_ifru.ifru_hwaddr" "ac_cv_member_struct_ifreq_ifr_ifru_ifru_hwaddr" "#include <net/if.h>
 "
-if test "x$ac_cv_member_struct_ifreq_ifr_ifru_ifru_hwaddr" = xyes; then :
+if test "x$ac_cv_member_struct_ifreq_ifr_ifru_ifru_hwaddr" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR 1" >>confdefs.h
 
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
 
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_time=yes
-else
-  ac_cv_header_time=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
 
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+# Obsolete code to be removed.
+if test $ac_cv_header_sys_time_h = yes; then
+
+printf "%s\n" "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 
 fi
+# End of obsolete code.
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+printf %s "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if test ${ac_cv_struct_tm+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <time.h>
 
 int
-main ()
+main (void)
 {
 struct tm tm;
 				     int *p = &tm.tm_sec;
@@ -16041,31 +17257,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_struct_tm=time.h
-else
+else $as_nop
   ac_cv_struct_tm=sys/time.h
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+printf "%s\n" "$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
+printf "%s\n" "#define TM_IN_SYS_TIME 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
-$as_echo_n "checking for working volatile... " >&6; }
-if ${ac_cv_c_volatile+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
+printf %s "checking for working volatile... " >&6; }
+if test ${ac_cv_c_volatile+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
 volatile int x;
@@ -16075,27 +17293,27 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_volatile=yes
-else
+else $as_nop
   ac_cv_c_volatile=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5
-$as_echo "$ac_cv_c_volatile" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5
+printf "%s\n" "$ac_cv_c_volatile" >&6; }
 if test $ac_cv_c_volatile = no; then
 
-$as_echo "#define volatile /**/" >>confdefs.h
+printf "%s\n" "#define volatile /**/" >>confdefs.h
 
 fi
 
 ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
+if test "x$ac_cv_type_ptrdiff_t" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_PTRDIFF_T 1
-_ACEOF
+printf "%s\n" "#define HAVE_PTRDIFF_T 1" >>confdefs.h
 
 
 fi
@@ -16103,69 +17321,61 @@
 stat_nsec_found=no
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim" "ac_cv_member_struct_stat_st_mtim" "#include <sys/stat.h>
 "
-if test "x$ac_cv_member_struct_stat_st_mtim" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_mtim" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIM 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_MTIM 1" >>confdefs.h
 
 stat_nsec_found=yes
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimensec" "ac_cv_member_struct_stat_st_mtimensec" "#include <sys/stat.h>
 "
-if test "x$ac_cv_member_struct_stat_st_mtimensec" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_mtimensec" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1" >>confdefs.h
 
 stat_nsec_found=yes
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimespec" "ac_cv_member_struct_stat_st_mtimespec" "#include <sys/stat.h>
 "
-if test "x$ac_cv_member_struct_stat_st_mtimespec" = xyes; then :
+if test "x$ac_cv_member_struct_stat_st_mtimespec" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_STAT_ST_MTIMESPEC 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT_STAT_ST_MTIMESPEC 1" >>confdefs.h
 
 stat_nsec_found=yes
 fi
 
 
 if test "${stat_nsec_found}" != yes; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot determine nanosecond field of struct stat" >&5
-$as_echo "$as_me: WARNING: Cannot determine nanosecond field of struct stat" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Cannot determine nanosecond field of struct stat" >&5
+printf "%s\n" "$as_me: WARNING: Cannot determine nanosecond field of struct stat" >&2;}
 fi
 
 # Checks for library functions.
-for ac_header in unistd.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-if test "x$ac_cv_header_unistd_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_UNISTD_H 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working chown" >&5
-$as_echo_n "checking for working chown... " >&6; }
-if ${ac_cv_func_chown_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_chown_works=no
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working chown" >&5
+printf %s "checking for working chown... " >&6; }
+if test ${ac_cv_func_chown_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
+  case "$host_os" in # ((
+			  # Guess yes on glibc systems.
+		  *-gnu*) ac_cv_func_chown_works=yes ;;
+			  # If we don't know, assume the worst.
+		  *)      ac_cv_func_chown_works=no ;;
+		esac
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 #include <fcntl.h>
 
 int
-main ()
+main (void)
 {
   char *f = "conftest.chown";
   struct stat before, after;
@@ -16184,9 +17394,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_func_chown_works=yes
-else
+else $as_nop
   ac_cv_func_chown_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -16196,82 +17407,79 @@
 rm -f conftest.chown
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_chown_works" >&5
-$as_echo "$ac_cv_func_chown_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_chown_works" >&5
+printf "%s\n" "$ac_cv_func_chown_works" >&6; }
 if test $ac_cv_func_chown_works = yes; then
 
-$as_echo "#define HAVE_CHOWN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CHOWN 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5
-$as_echo_n "checking whether closedir returns void... " >&6; }
-if ${ac_cv_func_closedir_void+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_closedir_void=yes
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5
+printf %s "checking whether closedir returns void... " >&6; }
+if test ${ac_cv_func_closedir_void+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
 #include <$ac_header_dirent>
-#ifndef __cplusplus
-int closedir ();
-#endif
 
 int
-main ()
+main (void)
 {
-return closedir (opendir (".")) != 0;
+
+  return closedir(0);
+
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_func_closedir_void=no
-else
+else $as_nop
   ac_cv_func_closedir_void=yes
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_closedir_void" >&5
-$as_echo "$ac_cv_func_closedir_void" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_closedir_void" >&5
+printf "%s\n" "$ac_cv_func_closedir_void" >&6; }
 if test $ac_cv_func_closedir_void = yes; then
 
-$as_echo "#define CLOSEDIR_VOID 1" >>confdefs.h
+printf "%s\n" "#define CLOSEDIR_VOID 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
-$as_echo_n "checking for error_at_line... " >&6; }
-if ${ac_cv_lib_error_at_line+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
+printf %s "checking for error_at_line... " >&6; }
+if test ${ac_cv_lib_error_at_line+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <error.h>
 int
-main ()
+main (void)
 {
 error_at_line (0, 0, "", 0, "an error occurred");
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_error_at_line=yes
-else
+else $as_nop
   ac_cv_lib_error_at_line=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
-$as_echo "$ac_cv_lib_error_at_line" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
+printf "%s\n" "$ac_cv_lib_error_at_line" >&6; }
 if test $ac_cv_lib_error_at_line = no; then
   case " $LIBOBJS " in
   *" error.$ac_objext "* ) ;;
@@ -16281,44 +17489,42 @@
 
 fi
 
-for ac_header in vfork.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
-if test "x$ac_cv_header_vfork_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_VFORK_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
+if test "x$ac_cv_header_vfork_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_VFORK_H 1" >>confdefs.h
 
 fi
 
-done
+ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
+if test "x$ac_cv_func_fork" = xyes
+then :
+  printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h
 
-for ac_func in fork vfork
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_func "$LINENO" "vfork" "ac_cv_func_vfork"
+if test "x$ac_cv_func_vfork" = xyes
+then :
+  printf "%s\n" "#define HAVE_VFORK 1" >>confdefs.h
 
 fi
-done
 
 if test "x$ac_cv_func_fork" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
-$as_echo_n "checking for working fork... " >&6; }
-if ${ac_cv_func_fork_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
+printf %s "checking for working fork... " >&6; }
+if test ${ac_cv_func_fork_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_func_fork_works=cross
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main ()
+main (void)
 {
 
 	  /* By Ruediger Kuhlmann. */
@@ -16328,9 +17534,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_func_fork_works=yes
-else
+else $as_nop
   ac_cv_func_fork_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -16338,8 +17545,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
-$as_echo "$ac_cv_func_fork_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
+printf "%s\n" "$ac_cv_func_fork_works" >&6; }
 
 else
   ac_cv_func_fork_works=$ac_cv_func_fork
@@ -16354,27 +17561,37 @@
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
-$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
+printf "%s\n" "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
-$as_echo_n "checking for working vfork... " >&6; }
-if ${ac_cv_func_vfork_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
+printf %s "checking for working vfork... " >&6; }
+if test ${ac_cv_func_vfork_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_func_vfork_works=cross
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Thanks to Paul Eggert for this test.  */
 $ac_includes_default
+#include <signal.h>
 #include <sys/wait.h>
 #ifdef HAVE_VFORK_H
 # include <vfork.h>
 #endif
+
+static void
+do_nothing (int sig)
+{
+  (void) sig;
+}
+
 /* On some sparc systems, changes by the child to local and incoming
    argument registers are propagated back to the parent.  The compiler
    is told about this with #include <vfork.h>, but some compilers
@@ -16382,11 +17599,7 @@
    static variable whose address is put into a register that is
    clobbered by the vfork.  */
 static void
-#ifdef __cplusplus
 sparc_address_test (int arg)
-# else
-sparc_address_test (arg) int arg;
-#endif
 {
   static pid_t child;
   if (!child) {
@@ -16404,13 +17617,18 @@
 }
 
 int
-main ()
+main (void)
 {
   pid_t parent = getpid ();
   pid_t child;
 
   sparc_address_test (0);
 
+  /* On Solaris 2.4, changes by the child to the signal handler
+     also munge signal handlers in the parent.  To detect this,
+     start by putting the parent's handler in a known state.  */
+  signal (SIGTERM, SIG_DFL);
+
   child = vfork ();
 
   if (child == 0) {
@@ -16432,6 +17650,10 @@
 	|| p != p5 || p != p6 || p != p7)
       _exit(1);
 
+    /* Alter the child's signal handler.  */
+    if (signal (SIGTERM, do_nothing) != SIG_DFL)
+      _exit(1);
+
     /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
        from child file descriptors.  If the child closes a descriptor
        before it execs or exits, this munges the parent's descriptor
@@ -16447,6 +17669,9 @@
 	 /* Was there some problem with vforking?  */
 	 child < 0
 
+	 /* Did the child munge the parent's signal handler?  */
+	 || signal (SIGTERM, SIG_DFL) != SIG_DFL
+
 	 /* Did the child fail?  (This shouldn't happen.)  */
 	 || status
 
@@ -16459,9 +17684,10 @@
   }
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_func_vfork_works=yes
-else
+else $as_nop
   ac_cv_func_vfork_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -16469,45 +17695,46 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
-$as_echo "$ac_cv_func_vfork_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
+printf "%s\n" "$ac_cv_func_vfork_works" >&6; }
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=$ac_cv_func_vfork
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
-$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
+printf "%s\n" "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
 fi
 
 if test "x$ac_cv_func_vfork_works" = xyes; then
 
-$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_WORKING_VFORK 1" >>confdefs.h
 
 else
 
-$as_echo "#define vfork fork" >>confdefs.h
+printf "%s\n" "#define vfork fork" >>confdefs.h
 
 fi
 if test "x$ac_cv_func_fork_works" = xyes; then
 
-$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_WORKING_FORK 1" >>confdefs.h
 
   PBX_WORKING_FORK=1
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_source+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+printf %s "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+if test ${ac_cv_sys_largefile_source+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h> /* for off_t */
      #include <stdio.h>
 int
-main ()
+main (void)
 {
 int (*fp) (FILE *, off_t, int) = fseeko;
      return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
@@ -16515,10 +17742,11 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_sys_largefile_source=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -16526,7 +17754,7 @@
 #include <sys/types.h> /* for off_t */
      #include <stdio.h>
 int
-main ()
+main (void)
 {
 int (*fp) (FILE *, off_t, int) = fseeko;
      return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
@@ -16534,23 +17762,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_sys_largefile_source=1; break
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
   ac_cv_sys_largefile_source=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
-$as_echo "$ac_cv_sys_largefile_source" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
+printf "%s\n" "$ac_cv_sys_largefile_source" >&6; }
 case $ac_cv_sys_largefile_source in #(
   no | unknown) ;;
   *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
-_ACEOF
+printf "%s\n" "#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
@@ -16560,16 +17787,17 @@
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
 if test $ac_cv_sys_largefile_source != unknown; then
 
-$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h
 
 fi
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
-$as_echo_n "checking whether $CC needs -traditional... " >&6; }
-if ${ac_cv_prog_gcc_traditional+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
+printf %s "checking whether $CC needs -traditional... " >&6; }
+if test ${ac_cv_prog_gcc_traditional+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
     ac_pattern="Autoconf.*'x'"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -16577,12 +17805,13 @@
 Autoconf TIOCGETP
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
+  $EGREP "$ac_pattern" >/dev/null 2>&1
+then :
   ac_cv_prog_gcc_traditional=yes
-else
+else $as_nop
   ac_cv_prog_gcc_traditional=no
 fi
-rm -f conftest*
+rm -rf conftest*
 
 
   if test $ac_cv_prog_gcc_traditional = no; then
@@ -16592,15 +17821,16 @@
 Autoconf TCGETA
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
+  $EGREP "$ac_pattern" >/dev/null 2>&1
+then :
   ac_cv_prog_gcc_traditional=yes
 fi
-rm -f conftest*
+rm -rf conftest*
 
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
-$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
+printf "%s\n" "$ac_cv_prog_gcc_traditional" >&6; }
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
@@ -16610,19 +17840,21 @@
 # acts exactly like glibc's or not
 # AC_FUNC_MALLOC
 # AC_FUNC_REALLOC
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
-$as_echo_n "checking for working memcmp... " >&6; }
-if ${ac_cv_func_memcmp_working+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
+printf %s "checking for working memcmp... " >&6; }
+if test ${ac_cv_func_memcmp_working+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_func_memcmp_working=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main ()
+main (void)
 {
 
   /* Some versions of memcmp are not 8-bit clean.  */
@@ -16653,9 +17885,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_func_memcmp_working=yes
-else
+else $as_nop
   ac_cv_func_memcmp_working=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -16663,8 +17896,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
-$as_echo "$ac_cv_func_memcmp_working" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
+printf "%s\n" "$ac_cv_func_memcmp_working" >&6; }
 test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
   *" memcmp.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
@@ -16673,48 +17906,36 @@
 
 
 
-
-
-  for ac_header in $ac_header_list
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
+ac_func=
+for ac_item in $ac_func_c_list
+do
+  if test $ac_func; then
+    ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func
+    if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then
+      echo "#define $ac_item 1" >> confdefs.h
+    fi
+    ac_func=
+  else
+    ac_func=$ac_item
+  fi
 done
 
 
-
-
-
-
-
-
-for ac_func in getpagesize
-do :
-  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-if test "x$ac_cv_func_getpagesize" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETPAGESIZE 1
-_ACEOF
-
-fi
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
-$as_echo_n "checking for working mmap... " >&6; }
-if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_mmap_fixed_mapped=no
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+printf %s "checking for working mmap... " >&6; }
+if test ${ac_cv_func_mmap_fixed_mapped+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
+  case "$host_os" in # ((
+			  # Guess yes on platforms where we know the result.
+		  linux*) ac_cv_func_mmap_fixed_mapped=yes ;;
+			  # If we don't know, assume the worst.
+		  *)      ac_cv_func_mmap_fixed_mapped=no ;;
+		esac
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
@@ -16746,10 +17967,6 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
-char *malloc ();
-#endif
-
 /* This mess was copied from the GNU getpagesize.h.  */
 #ifndef HAVE_GETPAGESIZE
 # ifdef _SC_PAGESIZE
@@ -16783,7 +18000,7 @@
 #endif /* no HAVE_GETPAGESIZE */
 
 int
-main ()
+main (void)
 {
   char *data, *data2, *data3;
   const char *cdata2;
@@ -16851,12 +18068,15 @@
     if (*(data + i) != *(data3 + i))
       return 14;
   close (fd);
+  free (data);
+  free (data3);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_func_mmap_fixed_mapped=yes
-else
+else $as_nop
   ac_cv_func_mmap_fixed_mapped=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -16864,34 +18084,26 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
-$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
+printf "%s\n" "$ac_cv_func_mmap_fixed_mapped" >&6; }
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
-$as_echo "#define HAVE_MMAP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h
 
 fi
 rm -f conftest.mmap conftest.txt
 
-for ac_header in sys/select.h sys/socket.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
-fi
 
-done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5
-$as_echo_n "checking types of arguments for select... " >&6; }
-if ${ac_cv_func_select_args+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  for ac_arg234 in 'fd_set *' 'int *' 'void *'; do
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5
+printf %s "checking types of arguments for select... " >&6; }
+if test ${ac_cv_func_select_args+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_func_select_args='int,int *,struct timeval *'
+for ac_arg234 in 'fd_set *' 'int *' 'void *'; do
  for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do
   for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16905,7 +18117,7 @@
 #endif
 
 int
-main ()
+main (void)
 {
 extern int select ($ac_arg1,
 					    $ac_arg234, $ac_arg234, $ac_arg234,
@@ -16914,56 +18126,56 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   done
  done
 done
-# Provide a safe default value.
-: "${ac_cv_func_select_args=int,int *,struct timeval *}"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5
-$as_echo "$ac_cv_func_select_args" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5
+printf "%s\n" "$ac_cv_func_select_args" >&6; }
 ac_save_IFS=$IFS; IFS=','
 set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'`
 IFS=$ac_save_IFS
 shift
 
-cat >>confdefs.h <<_ACEOF
-#define SELECT_TYPE_ARG1 $1
-_ACEOF
+printf "%s\n" "#define SELECT_TYPE_ARG1 $1" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define SELECT_TYPE_ARG234 ($2)
-_ACEOF
+printf "%s\n" "#define SELECT_TYPE_ARG234 ($2)" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define SELECT_TYPE_ARG5 ($3)
-_ACEOF
+printf "%s\n" "#define SELECT_TYPE_ARG5 ($3)" >>confdefs.h
 
-rm -f conftest*
+rm -rf conftest*
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
-$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
-if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+printf %s "checking whether lstat correctly handles trailing slash... " >&6; }
+if test ${ac_cv_func_lstat_dereferences_slashed_symlink+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   rm -f conftest.sym conftest.file
 echo >conftest.file
 if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_lstat_dereferences_slashed_symlink=no
-else
+  if test "$cross_compiling" = yes
+then :
+  case "$host_os" in # ((
+			   # Guess yes on glibc systems.
+		   *-gnu*) ac_cv_func_lstat_dereferences_slashed_symlink=yes ;;
+			   # If we don't know, assume the worst.
+		   *)      ac_cv_func_lstat_dereferences_slashed_symlink=no ;;
+		 esac
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main ()
+main (void)
 {
 struct stat sbuf;
      /* Linux will dereference the symlink and fail, as required by POSIX.
@@ -16974,9 +18186,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_func_lstat_dereferences_slashed_symlink=yes
-else
+else $as_nop
   ac_cv_func_lstat_dereferences_slashed_symlink=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -16991,14 +18204,12 @@
 rm -f conftest.sym conftest.file
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
-$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+printf "%s\n" "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
 
 test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
 
-cat >>confdefs.h <<_ACEOF
-#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
-_ACEOF
+printf "%s\n" "#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h
 
 
 if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
@@ -17010,19 +18221,21 @@
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
-$as_echo_n "checking whether stat accepts an empty string... " >&6; }
-if ${ac_cv_func_stat_empty_string_bug+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
+printf %s "checking whether stat accepts an empty string... " >&6; }
+if test ${ac_cv_func_stat_empty_string_bug+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_func_stat_empty_string_bug=yes
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main ()
+main (void)
 {
 struct stat sbuf;
   return stat ("", &sbuf) == 0;
@@ -17030,9 +18243,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_func_stat_empty_string_bug=no
-else
+else $as_nop
   ac_cv_func_stat_empty_string_bug=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -17040,8 +18254,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5
-$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5
+printf "%s\n" "$ac_cv_func_stat_empty_string_bug" >&6; }
 if test $ac_cv_func_stat_empty_string_bug = yes; then
   case " $LIBOBJS " in
   *" stat.$ac_objext "* ) ;;
@@ -17050,25 +18264,30 @@
 esac
 
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STAT_EMPTY_STRING_BUG 1
-_ACEOF
+printf "%s\n" "#define HAVE_STAT_EMPTY_STRING_BUG 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5
-$as_echo_n "checking for working strcoll... " >&6; }
-if ${ac_cv_func_strcoll_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_strcoll_works=no
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5
+printf %s "checking for working strcoll... " >&6; }
+if test ${ac_cv_func_strcoll_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
+  case "$host_os" in # ((
+			  # Guess yes on glibc systems.
+		  *-gnu*) ac_cv_func_strcoll_works=yes ;;
+			  # If we don't know, assume the worst.
+		  *)      ac_cv_func_strcoll_works=no ;;
+		esac
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main ()
+main (void)
 {
 return (strcoll ("abc", "def") >= 0 ||
 	 strcoll ("ABC", "DEF") >= 0 ||
@@ -17077,9 +18296,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_func_strcoll_works=yes
-else
+else $as_nop
   ac_cv_func_strcoll_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -17087,29 +18307,30 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5
-$as_echo "$ac_cv_func_strcoll_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5
+printf "%s\n" "$ac_cv_func_strcoll_works" >&6; }
 if test $ac_cv_func_strcoll_works = yes; then
 
-$as_echo "#define HAVE_STRCOLL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_STRCOLL 1" >>confdefs.h
 
 fi
 
-for ac_func in strftime
+
+  for ac_func in strftime
 do :
   ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
-if test "x$ac_cv_func_strftime" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRFTIME 1
-_ACEOF
+if test "x$ac_cv_func_strftime" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRFTIME 1" >>confdefs.h
 
-else
+else $as_nop
   # strftime is in -lintl on SCO UNIX.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
-$as_echo_n "checking for strftime in -lintl... " >&6; }
-if ${ac_cv_lib_intl_strftime+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
+printf %s "checking for strftime in -lintl... " >&6; }
+if test ${ac_cv_lib_intl_strftime+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17118,55 +18339,56 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char strftime ();
 int
-main ()
+main (void)
 {
 return strftime ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_intl_strftime=yes
-else
+else $as_nop
   ac_cv_lib_intl_strftime=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
-$as_echo "$ac_cv_lib_intl_strftime" >&6; }
-if test "x$ac_cv_lib_intl_strftime" = xyes; then :
-  $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
+printf "%s\n" "$ac_cv_lib_intl_strftime" >&6; }
+if test "x$ac_cv_lib_intl_strftime" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRFTIME 1" >>confdefs.h
 
 LIBS="-lintl $LIBS"
 fi
 
 fi
-done
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
-$as_echo_n "checking for working strnlen... " >&6; }
-if ${ac_cv_func_strnlen_working+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+done
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strnlen" >&5
+printf %s "checking for working strnlen... " >&6; }
+if test ${ac_cv_func_strnlen_working+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   # Guess no on AIX systems, yes otherwise.
 		case "$host_os" in
 		  aix*) ac_cv_func_strnlen_working=no;;
 		  *)    ac_cv_func_strnlen_working=yes;;
 		esac
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main ()
+main (void)
 {
 
 #define S "foobar"
@@ -17188,9 +18410,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_func_strnlen_working=yes
-else
+else $as_nop
   ac_cv_func_strnlen_working=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -17198,8 +18421,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strnlen_working" >&5
-$as_echo "$ac_cv_func_strnlen_working" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strnlen_working" >&5
+printf "%s\n" "$ac_cv_func_strnlen_working" >&6; }
 test $ac_cv_func_strnlen_working = no && case " $LIBOBJS " in
   *" strnlen.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS strnlen.$ac_objext"
@@ -17207,14 +18430,16 @@
 esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
-$as_echo_n "checking for working strtod... " >&6; }
-if ${ac_cv_func_strtod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
+printf %s "checking for working strtod... " >&6; }
+if test ${ac_cv_func_strtod+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_func_strtod=no
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17223,7 +18448,7 @@
 double strtod ();
 #endif
 int
-main()
+main (void)
 {
   {
     /* Some versions of Linux strtod mis-parse strings with leading '+'.  */
@@ -17248,9 +18473,10 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_func_strtod=yes
-else
+else $as_nop
   ac_cv_func_strtod=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -17258,8 +18484,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
-$as_echo "$ac_cv_func_strtod" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
+printf "%s\n" "$ac_cv_func_strtod" >&6; }
 if test $ac_cv_func_strtod = no; then
   case " $LIBOBJS " in
   *" strtod.$ac_objext "* ) ;;
@@ -17268,16 +18494,18 @@
 esac
 
 ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
-if test "x$ac_cv_func_pow" = xyes; then :
+if test "x$ac_cv_func_pow" = xyes
+then :
 
 fi
 
 if test $ac_cv_func_pow = no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
-$as_echo_n "checking for pow in -lm... " >&6; }
-if ${ac_cv_lib_m_pow+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
+printf %s "checking for pow in -lm... " >&6; }
+if test ${ac_cv_lib_m_pow+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17286,34 +18514,33 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pow ();
 int
-main ()
+main (void)
 {
 return pow ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_m_pow=yes
-else
+else $as_nop
   ac_cv_lib_m_pow=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
-$as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
+printf "%s\n" "$ac_cv_lib_m_pow" >&6; }
+if test "x$ac_cv_lib_m_pow" = xyes
+then :
   POW_LIB=-lm
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
-$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
+printf "%s\n" "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
 fi
 
 fi
@@ -17322,17 +18549,18 @@
 
 
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether utime accepts a null argument" >&5
-$as_echo_n "checking whether utime accepts a null argument... " >&6; }
-if ${ac_cv_func_utime_null+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether utime accepts a null argument" >&5
+printf %s "checking whether utime accepts a null argument... " >&6; }
+if test ${ac_cv_func_utime_null+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   rm -f conftest.data; >conftest.data
 # Sequent interprets utime(file, 0) to mean use start of epoch.  Wrong.
-if test "$cross_compiling" = yes; then :
+if test "$cross_compiling" = yes
+then :
   ac_cv_func_utime_null='guessing yes'
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
@@ -17340,7 +18568,7 @@
 	       # include <utime.h>
 	       #endif
 int
-main ()
+main (void)
 {
 struct stat s, t;
   return ! (stat ("conftest.data", &s) == 0
@@ -17352,9 +18580,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_func_utime_null=yes
-else
+else $as_nop
   ac_cv_func_utime_null=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -17362,236 +18591,823 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_utime_null" >&5
-$as_echo "$ac_cv_func_utime_null" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_utime_null" >&5
+printf "%s\n" "$ac_cv_func_utime_null" >&6; }
 if test "x$ac_cv_func_utime_null" != xno; then
   ac_cv_func_utime_null=yes
 
-$as_echo "#define HAVE_UTIME_NULL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_UTIME_NULL 1" >>confdefs.h
 
 fi
 rm -f conftest.data
 
-for ac_func in vprintf
-do :
-  ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
-if test "x$ac_cv_func_vprintf" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_VPRINTF 1
+
+
+if test "x$ac_cv_func_vprintf" = xno
+then :
+  ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+if test "x$ac_cv_func__doprnt" = xyes
+then :
+
+printf "%s\n" "#define HAVE_DOPRNT 1" >>confdefs.h
+
+fi
+
+fi
+ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf"
+if test "x$ac_cv_func_asprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_ASPRINTF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "atexit" "ac_cv_func_atexit"
+if test "x$ac_cv_func_atexit" = xyes
+then :
+  printf "%s\n" "#define HAVE_ATEXIT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "closefrom" "ac_cv_func_closefrom"
+if test "x$ac_cv_func_closefrom" = xyes
+then :
+  printf "%s\n" "#define HAVE_CLOSEFROM 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "dup2" "ac_cv_func_dup2"
+if test "x$ac_cv_func_dup2" = xyes
+then :
+  printf "%s\n" "#define HAVE_DUP2 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "eaccess" "ac_cv_func_eaccess"
+if test "x$ac_cv_func_eaccess" = xyes
+then :
+  printf "%s\n" "#define HAVE_EACCESS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "endpwent" "ac_cv_func_endpwent"
+if test "x$ac_cv_func_endpwent" = xyes
+then :
+  printf "%s\n" "#define HAVE_ENDPWENT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "euidaccess" "ac_cv_func_euidaccess"
+if test "x$ac_cv_func_euidaccess" = xyes
+then :
+  printf "%s\n" "#define HAVE_EUIDACCESS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ffsll" "ac_cv_func_ffsll"
+if test "x$ac_cv_func_ffsll" = xyes
+then :
+  printf "%s\n" "#define HAVE_FFSLL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate"
+if test "x$ac_cv_func_ftruncate" = xyes
+then :
+  printf "%s\n" "#define HAVE_FTRUNCATE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
+if test "x$ac_cv_func_getcwd" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETCWD 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname"
+if test "x$ac_cv_func_gethostname" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
+if test "x$ac_cv_func_getloadavg" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETLOADAVG 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
+if test "x$ac_cv_func_gettimeofday" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "glob" "ac_cv_func_glob"
+if test "x$ac_cv_func_glob" = xyes
+then :
+  printf "%s\n" "#define HAVE_GLOB 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ioperm" "ac_cv_func_ioperm"
+if test "x$ac_cv_func_ioperm" = xyes
+then :
+  printf "%s\n" "#define HAVE_IOPERM 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
+if test "x$ac_cv_func_inet_ntoa" = xyes
+then :
+  printf "%s\n" "#define HAVE_INET_NTOA 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "isascii" "ac_cv_func_isascii"
+if test "x$ac_cv_func_isascii" = xyes
+then :
+  printf "%s\n" "#define HAVE_ISASCII 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "memchr" "ac_cv_func_memchr"
+if test "x$ac_cv_func_memchr" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMCHR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
+if test "x$ac_cv_func_memmove" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMMOVE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset"
+if test "x$ac_cv_func_memset" = xyes
+then :
+  printf "%s\n" "#define HAVE_MEMSET 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mkdir" "ac_cv_func_mkdir"
+if test "x$ac_cv_func_mkdir" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKDIR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp"
+if test "x$ac_cv_func_mkdtemp" = xyes
+then :
+  printf "%s\n" "#define HAVE_MKDTEMP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "munmap" "ac_cv_func_munmap"
+if test "x$ac_cv_func_munmap" = xyes
+then :
+  printf "%s\n" "#define HAVE_MUNMAP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "newlocale" "ac_cv_func_newlocale"
+if test "x$ac_cv_func_newlocale" = xyes
+then :
+  printf "%s\n" "#define HAVE_NEWLOCALE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pipe2" "ac_cv_func_pipe2"
+if test "x$ac_cv_func_pipe2" = xyes
+then :
+  printf "%s\n" "#define HAVE_PIPE2 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ppoll" "ac_cv_func_ppoll"
+if test "x$ac_cv_func_ppoll" = xyes
+then :
+  printf "%s\n" "#define HAVE_PPOLL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv"
+if test "x$ac_cv_func_putenv" = xyes
+then :
+  printf "%s\n" "#define HAVE_PUTENV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "re_comp" "ac_cv_func_re_comp"
+if test "x$ac_cv_func_re_comp" = xyes
+then :
+  printf "%s\n" "#define HAVE_RE_COMP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "regcomp" "ac_cv_func_regcomp"
+if test "x$ac_cv_func_regcomp" = xyes
+then :
+  printf "%s\n" "#define HAVE_REGCOMP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select"
+if test "x$ac_cv_func_select" = xyes
+then :
+  printf "%s\n" "#define HAVE_SELECT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv"
+if test "x$ac_cv_func_setenv" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETENV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
+if test "x$ac_cv_func_socket" = xyes
+then :
+  printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
+if test "x$ac_cv_func_strcasecmp" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr"
+if test "x$ac_cv_func_strcasestr" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRCASESTR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strchr" "ac_cv_func_strchr"
+if test "x$ac_cv_func_strchr" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRCHR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strcspn" "ac_cv_func_strcspn"
+if test "x$ac_cv_func_strcspn" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRCSPN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
+if test "x$ac_cv_func_strdup" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRDUP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
+if test "x$ac_cv_func_strerror" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRERROR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat"
+if test "x$ac_cv_func_strlcat" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRLCAT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
+if test "x$ac_cv_func_strlcpy" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp"
+if test "x$ac_cv_func_strncasecmp" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRNCASECMP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup"
+if test "x$ac_cv_func_strndup" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRNDUP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
+if test "x$ac_cv_func_strnlen" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strrchr" "ac_cv_func_strrchr"
+if test "x$ac_cv_func_strrchr" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRRCHR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep"
+if test "x$ac_cv_func_strsep" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRSEP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strspn" "ac_cv_func_strspn"
+if test "x$ac_cv_func_strspn" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRSPN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr"
+if test "x$ac_cv_func_strstr" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRSTR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strtod" "ac_cv_func_strtod"
+if test "x$ac_cv_func_strtod" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRTOD 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
+if test "x$ac_cv_func_strtol" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRTOL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strtold" "ac_cv_func_strtold"
+if test "x$ac_cv_func_strtold" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRTOLD 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "strtoq" "ac_cv_func_strtoq"
+if test "x$ac_cv_func_strtoq" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRTOQ 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv"
+if test "x$ac_cv_func_unsetenv" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "uselocale" "ac_cv_func_uselocale"
+if test "x$ac_cv_func_uselocale" = xyes
+then :
+  printf "%s\n" "#define HAVE_USELOCALE 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "utime" "ac_cv_func_utime"
+if test "x$ac_cv_func_utime" = xyes
+then :
+  printf "%s\n" "#define HAVE_UTIME 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
+if test "x$ac_cv_func_vasprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getpeereid" "ac_cv_func_getpeereid"
+if test "x$ac_cv_func_getpeereid" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETPEEREID 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sysctl" "ac_cv_func_sysctl"
+if test "x$ac_cv_func_sysctl" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYSCTL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "swapctl" "ac_cv_func_swapctl"
+if test "x$ac_cv_func_swapctl" = xyes
+then :
+  printf "%s\n" "#define HAVE_SWAPCTL 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "malloc_trim" "ac_cv_func_malloc_trim"
+if test "x$ac_cv_func_malloc_trim" = xyes
+then :
+  printf "%s\n" "#define HAVE_MALLOC_TRIM 1" >>confdefs.h
+
+fi
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for htonll" >&5
+printf %s "checking for htonll... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <arpa/inet.h>
+int
+main (void)
+{
+return htonll(0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+printf "%s\n" "#define HAVE_HTONLL 1" >>confdefs.h
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ntohll" >&5
+printf %s "checking for ntohll... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <arpa/inet.h>
+int
+main (void)
+{
+return ntohll(0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+printf "%s\n" "#define HAVE_NTOHLL 1" >>confdefs.h
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+
+# NOTE: we use AC_CHECK_LIB to get -lm into the arguments for later checks,
+# so that AC_CHECK_FUNCS can detect functions in that library.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
+printf %s "checking for sqrt in -lm... " >&6; }
+if test ${ac_cv_lib_m_sqrt+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char sqrt ();
+int
+main (void)
+{
+return sqrt ();
+  ;
+  return 0;
+}
 _ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_m_sqrt=yes
+else $as_nop
+  ac_cv_lib_m_sqrt=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
+printf "%s\n" "$ac_cv_lib_m_sqrt" >&6; }
+if test "x$ac_cv_lib_m_sqrt" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBM 1" >>confdefs.h
+
+  LIBS="-lm $LIBS"
+
+fi
+
+# BSD might not have exp2, and/or log2
+ac_fn_c_check_func "$LINENO" "exp2" "ac_cv_func_exp2"
+if test "x$ac_cv_func_exp2" = xyes
+then :
+  printf "%s\n" "#define HAVE_EXP2 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "log2" "ac_cv_func_log2"
+if test "x$ac_cv_func_log2" = xyes
+then :
+  printf "%s\n" "#define HAVE_LOG2 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "exp10" "ac_cv_func_exp10"
+if test "x$ac_cv_func_exp10" = xyes
+then :
+  printf "%s\n" "#define HAVE_EXP10 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "log10" "ac_cv_func_log10"
+if test "x$ac_cv_func_log10" = xyes
+then :
+  printf "%s\n" "#define HAVE_LOG10 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin"
+if test "x$ac_cv_func_sin" = xyes
+then :
+  printf "%s\n" "#define HAVE_SIN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "cos" "ac_cv_func_cos"
+if test "x$ac_cv_func_cos" = xyes
+then :
+  printf "%s\n" "#define HAVE_COS 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "tan" "ac_cv_func_tan"
+if test "x$ac_cv_func_tan" = xyes
+then :
+  printf "%s\n" "#define HAVE_TAN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "asin" "ac_cv_func_asin"
+if test "x$ac_cv_func_asin" = xyes
+then :
+  printf "%s\n" "#define HAVE_ASIN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "acos" "ac_cv_func_acos"
+if test "x$ac_cv_func_acos" = xyes
+then :
+  printf "%s\n" "#define HAVE_ACOS 1" >>confdefs.h
 
-ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
-if test "x$ac_cv_func__doprnt" = xyes; then :
+fi
+ac_fn_c_check_func "$LINENO" "atan" "ac_cv_func_atan"
+if test "x$ac_cv_func_atan" = xyes
+then :
+  printf "%s\n" "#define HAVE_ATAN 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "atan2" "ac_cv_func_atan2"
+if test "x$ac_cv_func_atan2" = xyes
+then :
+  printf "%s\n" "#define HAVE_ATAN2 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
+if test "x$ac_cv_func_pow" = xyes
+then :
+  printf "%s\n" "#define HAVE_POW 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "rint" "ac_cv_func_rint"
+if test "x$ac_cv_func_rint" = xyes
+then :
+  printf "%s\n" "#define HAVE_RINT 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "exp" "ac_cv_func_exp"
+if test "x$ac_cv_func_exp" = xyes
+then :
+  printf "%s\n" "#define HAVE_EXP 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "log" "ac_cv_func_log"
+if test "x$ac_cv_func_log" = xyes
+then :
+  printf "%s\n" "#define HAVE_LOG 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "remainder" "ac_cv_func_remainder"
+if test "x$ac_cv_func_remainder" = xyes
+then :
+  printf "%s\n" "#define HAVE_REMAINDER 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "fmod" "ac_cv_func_fmod"
+if test "x$ac_cv_func_fmod" = xyes
+then :
+  printf "%s\n" "#define HAVE_FMOD 1" >>confdefs.h
 
-$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
+fi
+ac_fn_c_check_func "$LINENO" "round" "ac_cv_func_round"
+if test "x$ac_cv_func_round" = xyes
+then :
+  printf "%s\n" "#define HAVE_ROUND 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "roundf" "ac_cv_func_roundf"
+if test "x$ac_cv_func_roundf" = xyes
+then :
+  printf "%s\n" "#define HAVE_ROUNDF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "trunc" "ac_cv_func_trunc"
+if test "x$ac_cv_func_trunc" = xyes
+then :
+  printf "%s\n" "#define HAVE_TRUNC 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "floor" "ac_cv_func_floor"
+if test "x$ac_cv_func_floor" = xyes
+then :
+  printf "%s\n" "#define HAVE_FLOOR 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "ceil" "ac_cv_func_ceil"
+if test "x$ac_cv_func_ceil" = xyes
+then :
+  printf "%s\n" "#define HAVE_CEIL 1" >>confdefs.h
+
+fi
+
+
+# Certain architectures don't really have long double, even though
+# AC_CHECK_FUNCS would otherwise find the following functions.
+if test "x${ac_cv_type_long_double_wider}" = "xyes" ; then
+	ac_fn_c_check_func "$LINENO" "exp2l" "ac_cv_func_exp2l"
+if test "x$ac_cv_func_exp2l" = xyes
+then :
+  printf "%s\n" "#define HAVE_EXP2L 1" >>confdefs.h
 
 fi
+ac_fn_c_check_func "$LINENO" "log2l" "ac_cv_func_log2l"
+if test "x$ac_cv_func_log2l" = xyes
+then :
+  printf "%s\n" "#define HAVE_LOG2L 1" >>confdefs.h
 
 fi
-done
-
-
-for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap newlocale pipe2 ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv uselocale utime vasprintf getpeereid sysctl swapctl malloc_trim
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "exp10l" "ac_cv_func_exp10l"
+if test "x$ac_cv_func_exp10l" = xyes
+then :
+  printf "%s\n" "#define HAVE_EXP10L 1" >>confdefs.h
 
 fi
-done
+ac_fn_c_check_func "$LINENO" "log10l" "ac_cv_func_log10l"
+if test "x$ac_cv_func_log10l" = xyes
+then :
+  printf "%s\n" "#define HAVE_LOG10L 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "sinl" "ac_cv_func_sinl"
+if test "x$ac_cv_func_sinl" = xyes
+then :
+  printf "%s\n" "#define HAVE_SINL 1" >>confdefs.h
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for htonll" >&5
-$as_echo_n "checking for htonll... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <arpa/inet.h>
-int
-main ()
-{
-return htonll(0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+fi
+ac_fn_c_check_func "$LINENO" "cosl" "ac_cv_func_cosl"
+if test "x$ac_cv_func_cosl" = xyes
+then :
+  printf "%s\n" "#define HAVE_COSL 1" >>confdefs.h
 
-$as_echo "#define HAVE_HTONLL 1" >>confdefs.h
+fi
+ac_fn_c_check_func "$LINENO" "tanl" "ac_cv_func_tanl"
+if test "x$ac_cv_func_tanl" = xyes
+then :
+  printf "%s\n" "#define HAVE_TANL 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+fi
+ac_fn_c_check_func "$LINENO" "asinl" "ac_cv_func_asinl"
+if test "x$ac_cv_func_asinl" = xyes
+then :
+  printf "%s\n" "#define HAVE_ASINL 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+ac_fn_c_check_func "$LINENO" "acosl" "ac_cv_func_acosl"
+if test "x$ac_cv_func_acosl" = xyes
+then :
+  printf "%s\n" "#define HAVE_ACOSL 1" >>confdefs.h
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ntohll" >&5
-$as_echo_n "checking for ntohll... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <arpa/inet.h>
-int
-main ()
-{
-return ntohll(0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+fi
+ac_fn_c_check_func "$LINENO" "atanl" "ac_cv_func_atanl"
+if test "x$ac_cv_func_atanl" = xyes
+then :
+  printf "%s\n" "#define HAVE_ATANL 1" >>confdefs.h
 
-$as_echo "#define HAVE_NTOHLL 1" >>confdefs.h
+fi
+ac_fn_c_check_func "$LINENO" "atan2l" "ac_cv_func_atan2l"
+if test "x$ac_cv_func_atan2l" = xyes
+then :
+  printf "%s\n" "#define HAVE_ATAN2L 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+fi
+ac_fn_c_check_func "$LINENO" "powl" "ac_cv_func_powl"
+if test "x$ac_cv_func_powl" = xyes
+then :
+  printf "%s\n" "#define HAVE_POWL 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+ac_fn_c_check_func "$LINENO" "sqrtl" "ac_cv_func_sqrtl"
+if test "x$ac_cv_func_sqrtl" = xyes
+then :
+  printf "%s\n" "#define HAVE_SQRTL 1" >>confdefs.h
 
-# NOTE: we use AC_CHECK_LIB to get -lm into the arguments for later checks,
-# so that AC_CHECK_FUNCS can detect functions in that library.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
-$as_echo_n "checking for sqrt in -lm... " >&6; }
-if ${ac_cv_lib_m_sqrt+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+fi
+ac_fn_c_check_func "$LINENO" "rintl" "ac_cv_func_rintl"
+if test "x$ac_cv_func_rintl" = xyes
+then :
+  printf "%s\n" "#define HAVE_RINTL 1" >>confdefs.h
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sqrt ();
-int
-main ()
-{
-return sqrt ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_sqrt=yes
-else
-  ac_cv_lib_m_sqrt=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ac_fn_c_check_func "$LINENO" "expl" "ac_cv_func_expl"
+if test "x$ac_cv_func_expl" = xyes
+then :
+  printf "%s\n" "#define HAVE_EXPL 1" >>confdefs.h
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
-$as_echo "$ac_cv_lib_m_sqrt" >&6; }
-if test "x$ac_cv_lib_m_sqrt" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "logl" "ac_cv_func_logl"
+if test "x$ac_cv_func_logl" = xyes
+then :
+  printf "%s\n" "#define HAVE_LOGL 1" >>confdefs.h
 
-  LIBS="-lm $LIBS"
+fi
+ac_fn_c_check_func "$LINENO" "remainderl" "ac_cv_func_remainderl"
+if test "x$ac_cv_func_remainderl" = xyes
+then :
+  printf "%s\n" "#define HAVE_REMAINDERL 1" >>confdefs.h
 
 fi
+ac_fn_c_check_func "$LINENO" "fmodl" "ac_cv_func_fmodl"
+if test "x$ac_cv_func_fmodl" = xyes
+then :
+  printf "%s\n" "#define HAVE_FMODL 1" >>confdefs.h
 
-# BSD might not have exp2, and/or log2
-for ac_func in exp2 log2 exp10 log10 sin cos tan asin acos atan atan2 pow rint exp log remainder fmod round roundf trunc floor ceil
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_func "$LINENO" "roundl" "ac_cv_func_roundl"
+if test "x$ac_cv_func_roundl" = xyes
+then :
+  printf "%s\n" "#define HAVE_ROUNDL 1" >>confdefs.h
 
 fi
-done
+ac_fn_c_check_func "$LINENO" "truncl" "ac_cv_func_truncl"
+if test "x$ac_cv_func_truncl" = xyes
+then :
+  printf "%s\n" "#define HAVE_TRUNCL 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "floorl" "ac_cv_func_floorl"
+if test "x$ac_cv_func_floorl" = xyes
+then :
+  printf "%s\n" "#define HAVE_FLOORL 1" >>confdefs.h
 
-# Certain architectures don't really have long double, even though
-# AC_CHECK_FUNCS would otherwise find the following functions.
-if test "x${ac_cv_type_long_double_wider}" = "xyes" ; then
-	for ac_func in exp2l log2l exp10l log10l sinl cosl tanl asinl acosl atanl atan2l powl sqrtl rintl expl logl remainderl fmodl roundl truncl floorl ceill
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_func "$LINENO" "ceill" "ac_cv_func_ceill"
+if test "x$ac_cv_func_ceill" = xyes
+then :
+  printf "%s\n" "#define HAVE_CEILL 1" >>confdefs.h
 
 fi
-done
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LLONG_MAX in limits.h" >&5
-$as_echo_n "checking for LLONG_MAX in limits.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LLONG_MAX in limits.h" >&5
+printf %s "checking for LLONG_MAX in limits.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 int
-main ()
+main (void)
 {
 long long foo = LLONG_MAX
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_LLONG_MAX 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LLONG_MAX 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for timersub in time.h" >&5
-$as_echo_n "checking for timersub in time.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timersub in time.h" >&5
+printf %s "checking for timersub in time.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/time.h>
 int
-main ()
+main (void)
 {
 struct timeval *a; timersub(a, a, a);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_TIMERSUB 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TIMERSUB 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a version of GNU ld that supports the --dynamic-list flag" >&5
-$as_echo_n "checking for a version of GNU ld that supports the --dynamic-list flag... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a version of GNU ld that supports the --dynamic-list flag" >&5
+printf %s "checking for a version of GNU ld that supports the --dynamic-list flag... " >&6; }
 old_LDFLAGS=${LDFLAGS}
 cat >conftest.dynamics <<_ACEOF
 {
@@ -17604,40 +19420,42 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   PBX_DYNAMIC_LIST=1
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 LDFLAGS=${old_LDFLAGS}
 rm -f conftest.dynamics
 
-ac_fn_c_check_header_mongrel "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_poll_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_poll_h" = xyes
+then :
   HAS_POLL=1
 
-$as_echo "#define HAVE_SYS_POLL_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYS_POLL_H 1" >>confdefs.h
 
 fi
 
 
-
 # Check whether --enable-internal-poll was given.
-if test "${enable_internal_poll+set}" = set; then :
+if test ${enable_internal_poll+y}
+then :
   enableval=$enable_internal_poll; case "${enableval}" in
 		y|ye|yes) HAS_POLL="";;
 		n|no) HAS_POLL="${HAS_POLL}" ;;
@@ -17648,86 +19466,164 @@
 
 
 # Check whether --enable-asteriskssl was given.
-if test "${enable_asteriskssl+set}" = set; then :
+if test ${enable_asteriskssl+y}
+then :
   enableval=$enable_asteriskssl; case "${enableval}" in
 		y|ye|yes) AST_ASTERISKSSL=yes ;;
 		n|no)  AST_ASTERISKSSL=no ;;
 		*) as_fn_error $? "bad value ${enableval} for --disable-asteriskssl" "$LINENO" 5  ;;
 	esac
-else
+else $as_nop
   AST_ASTERISKSSL=yes
 fi
 
 
 
-for ac_func in inet_aton
-do :
-  ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
-if test "x$ac_cv_func_inet_aton" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_INET_ATON 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
+if test "x$ac_cv_func_inet_aton" = xyes
+then :
+  printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h
 
 fi
-done
 
 
 # check if we have IP_PKTINFO constant defined
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IP_PKTINFO" >&5
-$as_echo_n "checking for IP_PKTINFO... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IP_PKTINFO" >&5
+printf %s "checking for IP_PKTINFO... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netinet/in.h>
 int
-main ()
+main (void)
 {
 int pi = IP_PKTINFO;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_PKTINFO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PKTINFO 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 # NetBSD libc ships with an internal-only incompatible symbol gethostbyname_r
-ac_fn_c_check_decl "$LINENO" "gethostbyname_r" "ac_cv_have_decl_gethostbyname_r" "#include <stdlib.h>
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
+printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
+if test ${ac_cv_c_undeclared_builtin_options+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_save_CFLAGS=$CFLAGS
+   ac_cv_c_undeclared_builtin_options='cannot detect'
+   for ac_arg in '' -fno-builtin; do
+     CFLAGS="$ac_save_CFLAGS $ac_arg"
+     # This test program should *not* compile successfully.
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+(void) strchr;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else $as_nop
+  # This test program should compile successfully.
+        # No library function is consistently available on
+        # freestanding implementations, so test against a dummy
+        # declaration.  Include always-available headers on the
+        # off chance that they somehow elicit warnings.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <float.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stddef.h>
+extern void ac_decl (int, char *);
+
+int
+main (void)
+{
+(void) ac_decl (0, (char *) 0);
+  (void) ac_decl;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  if test x"$ac_arg" = x
+then :
+  ac_cv_c_undeclared_builtin_options='none needed'
+else $as_nop
+  ac_cv_c_undeclared_builtin_options=$ac_arg
+fi
+          break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+    done
+    CFLAGS=$ac_save_CFLAGS
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
+printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
+  case $ac_cv_c_undeclared_builtin_options in #(
+  'cannot detect') :
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot make $CC report undeclared builtins
+See \`config.log' for more details" "$LINENO" 5; } ;; #(
+  'none needed') :
+    ac_c_undeclared_builtin_options='' ;; #(
+  *) :
+    ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
+esac
+
+ac_fn_check_decl "$LINENO" "gethostbyname_r" "ac_cv_have_decl_gethostbyname_r" "#include <stdlib.h>
          #include <netdb.h>
 
-"
-if test "x$ac_cv_have_decl_gethostbyname_r" = xyes; then :
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_gethostbyname_r" = xyes
+then :
   ac_have_decl=1
-else
+else $as_nop
   ac_have_decl=0
 fi
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GETHOSTBYNAME_R $ac_have_decl
-_ACEOF
-if test $ac_have_decl = 1; then :
+printf "%s\n" "#define HAVE_DECL_GETHOSTBYNAME_R $ac_have_decl" >>confdefs.h
+if test $ac_have_decl = 1
+then :
   have_gethostbyname_r_public_declaration=yes
-else
+else $as_nop
   have_gethostbyname_r_public_declaration=no
 fi
 
 
 if test "x$have_gethostbyname_r_public_declaration" = "xyes"; then
         # some systems already have gethostbyname_r so we don't need to build ours in main/utils.c
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname_r" >&5
-$as_echo_n "checking for library containing gethostbyname_r... " >&6; }
-if ${ac_cv_search_gethostbyname_r+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname_r" >&5
+printf %s "checking for library containing gethostbyname_r... " >&6; }
+if test ${ac_cv_search_gethostbyname_r+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -17735,284 +19631,292 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gethostbyname_r ();
 int
-main ()
+main (void)
 {
 return gethostbyname_r ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' socket nsl; do
+for ac_lib in '' socket nsl
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_gethostbyname_r=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_gethostbyname_r+:} false; then :
+  if test ${ac_cv_search_gethostbyname_r+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_gethostbyname_r+:} false; then :
+if test ${ac_cv_search_gethostbyname_r+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_gethostbyname_r=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname_r" >&5
-$as_echo "$ac_cv_search_gethostbyname_r" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname_r" >&5
+printf "%s\n" "$ac_cv_search_gethostbyname_r" >&6; }
 ac_res=$ac_cv_search_gethostbyname_r
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname_r with 6 arguments" >&5
-$as_echo_n "checking for gethostbyname_r with 6 arguments... " >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname_r with 6 arguments" >&5
+printf %s "checking for gethostbyname_r with 6 arguments... " >&6; }
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
                                  #include <netdb.h>
 int
-main ()
+main (void)
 {
 struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (struct hostent **)NULL, (int *)NULL);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_GETHOSTBYNAME_R_6 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETHOSTBYNAME_R_6 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname_r with 5 arguments" >&5
-$as_echo_n "checking for gethostbyname_r with 5 arguments... " >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname_r with 5 arguments" >&5
+printf %s "checking for gethostbyname_r with 5 arguments... " >&6; }
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 	                         #include <netdb.h>
 int
-main ()
+main (void)
 {
 struct hostent *he = gethostbyname_r((const char *)NULL, (struct hostent *)NULL, (char *)NULL, (int)0, (int *)NULL);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_GETHOSTBYNAME_R_5 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETHOSTBYNAME_R_5 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default"
-if test "x$ac_cv_header_byteswap_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default"
+if test "x$ac_cv_header_byteswap_h" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_BYTESWAP_H 1
-_ACEOF
+printf "%s\n" "#define HAVE_BYTESWAP_H 1" >>confdefs.h
 
 fi
 
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __swap16 variant of <sys/endian.h> byteswapping macros" >&5
-$as_echo_n "checking for __swap16 variant of <sys/endian.h> byteswapping macros... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __swap16 variant of <sys/endian.h> byteswapping macros" >&5
+printf %s "checking for __swap16 variant of <sys/endian.h> byteswapping macros... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/endian.h>
 int
-main ()
+main (void)
 {
 int a = 1; int b = __swap16(a);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_SYS_ENDIAN_SWAP16 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYS_ENDIAN_SWAP16 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap16 variant of <sys/endian.h> byteswapping macros" >&5
-$as_echo_n "checking for bswap16 variant of <sys/endian.h> byteswapping macros... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bswap16 variant of <sys/endian.h> byteswapping macros" >&5
+printf %s "checking for bswap16 variant of <sys/endian.h> byteswapping macros... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/endian.h>
 int
-main ()
+main (void)
 {
 int a = 1; int b = bswap16(a);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_SYS_ENDIAN_BSWAP16 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYS_ENDIAN_BSWAP16 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for locale_t in locale.h" >&5
-$as_echo_n "checking for locale_t in locale.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for locale_t in locale.h" >&5
+printf %s "checking for locale_t in locale.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <locale.h>
 int
-main ()
+main (void)
 {
 locale_t lt = NULL
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_LOCALE_T_IN_LOCALE_H 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for locale_t in xlocale.h" >&5
-$as_echo_n "checking for locale_t in xlocale.h... " >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+printf "%s\n" "#define HAVE_LOCALE_T_IN_LOCALE_H 1" >>confdefs.h
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for locale_t in xlocale.h" >&5
+printf %s "checking for locale_t in xlocale.h... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <xlocale.h>
 int
-main ()
+main (void)
 {
 locale_t lt = NULL
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_LOCALE_T_IN_XLOCALE_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LOCALE_T_IN_XLOCALE_H 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_EVTONLY in fcntl.h" >&5
-$as_echo_n "checking for O_EVTONLY in fcntl.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for O_EVTONLY in fcntl.h" >&5
+printf %s "checking for O_EVTONLY in fcntl.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fcntl.h>
 int
-main ()
+main (void)
 {
 int a = O_EVTONLY;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_O_EVTONLY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_O_EVTONLY 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_SYMLINK in fcntl.h" >&5
-$as_echo_n "checking for O_SYMLINK in fcntl.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for O_SYMLINK in fcntl.h" >&5
+printf %s "checking for O_SYMLINK in fcntl.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fcntl.h>
 int
-main ()
+main (void)
 {
 int a = O_SYMLINK;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_O_SYMLINK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_O_SYMLINK 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
     if test "x${PBX_PTHREAD_RWLOCK_INITIALIZER}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RWLOCK_INITIALIZER in pthread.h" >&5
-$as_echo_n "checking for PTHREAD_RWLOCK_INITIALIZER in pthread.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RWLOCK_INITIALIZER in pthread.h" >&5
+printf %s "checking for PTHREAD_RWLOCK_INITIALIZER in pthread.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${PTHREAD_RWLOCK_INITIALIZER_DIR}" != "x"; then
 	    PTHREAD_RWLOCK_INITIALIZER_INCLUDE="-I${PTHREAD_RWLOCK_INITIALIZER_DIR}/include"
@@ -18023,7 +19927,7 @@
 /* end confdefs.h.  */
  #include <pthread.h>
 int
-main ()
+main (void)
 {
 #if defined(PTHREAD_RWLOCK_INITIALIZER)
 				int foo = 0;
@@ -18036,132 +19940,137 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_PTHREAD_RWLOCK_INITIALIZER=1
 
-$as_echo "#define HAVE_PTHREAD_RWLOCK_INITIALIZER 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PTHREAD_RWLOCK_INITIALIZER 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h" >&5
-$as_echo_n "checking for PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h" >&5
+printf %s "checking for PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 int a = PTHREAD_RWLOCK_PREFER_WRITER_NP;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_MUTEX_RECURSIVE_NP in pthread.h" >&5
-$as_echo_n "checking for PTHREAD_MUTEX_RECURSIVE_NP in pthread.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_MUTEX_RECURSIVE_NP in pthread.h" >&5
+printf %s "checking for PTHREAD_MUTEX_RECURSIVE_NP in pthread.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 int a = PTHREAD_MUTEX_RECURSIVE_NP;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE_NP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PTHREAD_MUTEX_RECURSIVE_NP 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_MUTEX_ADAPTIVE_NP in pthread.h" >&5
-$as_echo_n "checking for PTHREAD_MUTEX_ADAPTIVE_NP in pthread.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_MUTEX_ADAPTIVE_NP in pthread.h" >&5
+printf %s "checking for PTHREAD_MUTEX_ADAPTIVE_NP in pthread.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 int a = PTHREAD_MUTEX_ADAPTIVE_NP;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_PTHREAD_MUTEX_ADAPTIVE_NP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PTHREAD_MUTEX_ADAPTIVE_NP 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_spinlock_t in pthread.h" >&5
-$as_echo_n "checking for pthread_spinlock_t in pthread.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_spinlock_t in pthread.h" >&5
+printf %s "checking for pthread_spinlock_t in pthread.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 pthread_spinlock_t spin;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_PTHREAD_SPINLOCK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PTHREAD_SPINLOCK 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 save_LIBS="$LIBS"
@@ -18169,14 +20078,14 @@
 LIBS="$PTHREAD_LIBS $LIBS"
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_rwlock_timedwrlock() in pthread.h" >&5
-$as_echo_n "checking for pthread_rwlock_timedwrlock() in pthread.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_rwlock_timedwrlock() in pthread.h" >&5
+printf %s "checking for pthread_rwlock_timedwrlock() in pthread.h... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
      #include <time.h>
 int
-main ()
+main (void)
 {
 pthread_rwlock_t foo; struct timespec bar; pthread_rwlock_timedwrlock(&foo, &bar)
   ;
@@ -18184,56 +20093,59 @@
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     ac_cv_pthread_rwlock_timedwrlock="yes"
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     ac_cv_pthread_rwlock_timedwrlock="no"
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 # Some platforms define sem_init(), but only support sem_open(). joyous.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working unnamed semaphores" >&5
-$as_echo_n "checking for working unnamed semaphores... " >&6; }
-if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compile" >&5
-$as_echo "cross-compile" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result yes guessed because of cross compilation" >&5
-$as_echo "$as_me: WARNING: result yes guessed because of cross compilation" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working unnamed semaphores" >&5
+printf %s "checking for working unnamed semaphores... " >&6; }
+if test "$cross_compiling" = yes
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cross-compile" >&5
+printf "%s\n" "cross-compile" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: result yes guessed because of cross compilation" >&5
+printf "%s\n" "$as_me: WARNING: result yes guessed because of cross compilation" >&6;}
 
-$as_echo "#define HAS_WORKING_SEMAPHORE 1" >>confdefs.h
+printf "%s\n" "#define HAS_WORKING_SEMAPHORE 1" >>confdefs.h
 
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <semaphore.h>
 int
-main ()
+main (void)
 {
 sem_t sem; return sem_init(&sem, 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAS_WORKING_SEMAPHORE 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ac_fn_c_try_run "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+printf "%s\n" "#define HAS_WORKING_SEMAPHORE 1" >>confdefs.h
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -18244,12 +20156,12 @@
 CFLAGS="$save_CFLAGS"
 if test "${ac_cv_pthread_rwlock_timedwrlock}" = "yes"; then
 
-$as_echo "#define HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_ONCE_INIT needs braces" >&5
-$as_echo_n "checking if PTHREAD_ONCE_INIT needs braces... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if PTHREAD_ONCE_INIT needs braces" >&5
+printf %s "checking if PTHREAD_ONCE_INIT needs braces... " >&6; }
 saved_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} -Werror -Wmissing-braces"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18257,7 +20169,7 @@
 #include <pthread.h>
      void empty(){}
 int
-main ()
+main (void)
 {
 pthread_once_t once = PTHREAD_ONCE_INIT; pthread_once(&once, empty);
   ;
@@ -18265,32 +20177,33 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
     ac_cv_pthread_once_needsbraces="no"
 
-else
+else $as_nop
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
     ac_cv_pthread_once_needsbraces="yes"
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 CFLAGS="${saved_CFLAGS}"
 if test "${ac_cv_pthread_once_needsbraces}" = "yes"; then
 
-$as_echo "#define PTHREAD_ONCE_INIT_NEEDS_BRACES 1" >>confdefs.h
+printf "%s\n" "#define PTHREAD_ONCE_INIT_NEEDS_BRACES 1" >>confdefs.h
 
 fi
 
 
     if test "x${PBX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP in pthread.h" >&5
-$as_echo_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP in pthread.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP in pthread.h" >&5
+printf %s "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP in pthread.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP_DIR}" != "x"; then
 	    PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP_INCLUDE="-I${PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP_DIR}/include"
@@ -18301,7 +20214,7 @@
 /* end confdefs.h.  */
  #include <pthread.h>
 int
-main ()
+main (void)
 {
 #if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
 				int foo = 0;
@@ -18314,21 +20227,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP=1
 
-$as_echo "#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
@@ -18336,13 +20250,13 @@
 
 # Can we compare a mutex to its initial value?
 # Generally yes on OpenBSD/FreeBSD and no on Mac OS X.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can compare a mutex to its initial value" >&5
-$as_echo_n "checking whether we can compare a mutex to its initial value... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can compare a mutex to its initial value" >&5
+printf %s "checking whether we can compare a mutex to its initial value... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 pthread_mutex_t lock;
 	if ((lock) != ((pthread_mutex_t) PTHREAD_MUTEX_INITIALIZER)) {
@@ -18353,18 +20267,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define CAN_COMPARE_MUTEX_TO_INIT_VALUE 1" >>confdefs.h
+printf "%s\n" "#define CAN_COMPARE_MUTEX_TO_INIT_VALUE 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 #if test "${cross_compiling}" = "no";
@@ -18383,73 +20298,70 @@
 #fi
 
 # for FreeBSD thr_self
-for ac_header in sys/thr.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/thr.h" "ac_cv_header_sys_thr_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_thr_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_THR_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "sys/thr.h" "ac_cv_header_sys_thr_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_thr_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SYS_THR_H 1" >>confdefs.h
 
 fi
 
-done
-
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler sync operations" >&5
-$as_echo_n "checking for compiler sync operations... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler sync operations" >&5
+printf %s "checking for compiler sync operations... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 int foo1; int foo2 = __sync_fetch_and_add(&foo1, 1);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 ax_cv_have_gcc_atomics=1
 
-$as_echo "#define HAVE_GCC_ATOMICS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GCC_ATOMICS 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler atomic operations" >&5
-$as_echo_n "checking for compiler atomic operations... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler atomic operations" >&5
+printf %s "checking for compiler atomic operations... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 int foo1; int foo2 = __atomic_fetch_add(&foo1, 1, __ATOMIC_RELAXED);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 ax_cv_have_c_atomics=1
 
-$as_echo "#define HAVE_C_ATOMICS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_C_ATOMICS 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 if test -z $ax_cv_have_c_atomics$ax_cv_have_gcc_atomics; then
@@ -18457,47 +20369,50 @@
 fi
 
 # glibc, AFAIK, is the only C library that makes printing a NULL to a string safe.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system printf is NULL-safe." >&5
-$as_echo_n "checking if your system printf is NULL-safe.... " >&6; }
-if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if your system printf is NULL-safe." >&5
+printf %s "checking if your system printf is NULL-safe.... " >&6; }
+if test "$cross_compiling" = yes
+then :
   # It's unlikely an embedded system will have this.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
-$as_echo "unknown" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+printf "%s\n" "unknown" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 printf("%s", NULL)
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-$as_echo "#define HAVE_NULLSAFE_PRINTF 1" >>confdefs.h
+printf "%s\n" "#define HAVE_NULLSAFE_PRINTF 1" >>confdefs.h
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if socket() accepts SOCK_NONBLOCK" >&5
-$as_echo_n "checking if socket() accepts SOCK_NONBLOCK... " >&6; }
-if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compile" >&5
-$as_echo "cross-compile" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if socket() accepts SOCK_NONBLOCK" >&5
+printf %s "checking if socket() accepts SOCK_NONBLOCK... " >&6; }
+if test "$cross_compiling" = yes
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cross-compile" >&5
+printf "%s\n" "cross-compile" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -18509,7 +20424,7 @@
 	#endif
 
 int
-main ()
+main (void)
 {
 
 	   if (socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0) < 0) {
@@ -18521,28 +20436,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_SOCK_NONBLOCK 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ac_fn_c_try_run "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+printf "%s\n" "#define HAVE_SOCK_NONBLOCK 1" >>confdefs.h
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can increase the maximum select-able file descriptor" >&5
-$as_echo_n "checking if we can increase the maximum select-able file descriptor... " >&6; }
-if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compile" >&5
-$as_echo "cross-compile" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can increase the maximum select-able file descriptor" >&5
+printf %s "checking if we can increase the maximum select-able file descriptor... " >&6; }
+if test "$cross_compiling" = yes
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cross-compile" >&5
+printf "%s\n" "cross-compile" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -18559,7 +20476,7 @@
 #include <unistd.h>
 
 int
-main ()
+main (void)
 {
 
 	struct rlimit rlim = { FD_SETSIZE * 2, FD_SETSIZE * 2 };
@@ -18577,15 +20494,16 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_VARIABLE_FDSET 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ac_fn_c_try_run "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+printf "%s\n" "#define HAVE_VARIABLE_FDSET 1" >>confdefs.h
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -18593,12 +20511,13 @@
 
 
 if test "${ac_cv_have_variable_fdset}x" = "0x"; then
-	if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+	if test "$cross_compiling" = yes
+then :
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
 See \`config.log' for more details" "$LINENO" 5; }
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -18607,16 +20526,17 @@
 #include <stdlib.h>
 
 int
-main ()
+main (void)
 {
 if (getuid() != 0) { exit(1); }
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 
-$as_echo "#define CONFIGURE_RAN_AS_ROOT 1" >>confdefs.h
+printf "%s\n" "#define CONFIGURE_RAN_AS_ROOT 1" >>confdefs.h
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -18625,33 +20545,35 @@
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have usable eventfd support" >&5
-$as_echo_n "checking if we have usable eventfd support... " >&6; }
-if test "$cross_compiling" = yes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compile" >&5
-$as_echo "cross-compile" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we have usable eventfd support" >&5
+printf %s "checking if we have usable eventfd support... " >&6; }
+if test "$cross_compiling" = yes
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cross-compile" >&5
+printf "%s\n" "cross-compile" >&6; }
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/eventfd.h>
 int
-main ()
+main (void)
 {
 return eventfd(0, EFD_NONBLOCK | EFD_SEMAPHORE) == -1;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_EVENTFD 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ac_fn_c_try_run "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+printf "%s\n" "#define HAVE_EVENTFD 1" >>confdefs.h
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -18659,8 +20581,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute pure' support" >&5
-$as_echo_n "checking for compiler 'attribute pure' support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute pure' support" >&5
+printf %s "checking for compiler 'attribute pure' support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
 
@@ -18670,37 +20592,36 @@
 /* end confdefs.h.  */
  void __attribute__((pure)) *test(void *muffin, ...) {return (void *) 0;}
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 	ax_cv_have_func_attribute_pure=1
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_pure 1
-_ACEOF
+printf "%s\n" "#define HAVE_ATTRIBUTE_pure 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 CFLAGS="$saved_CFLAGS"
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute malloc' support" >&5
-$as_echo_n "checking for compiler 'attribute malloc' support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute malloc' support" >&5
+printf %s "checking for compiler 'attribute malloc' support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
 
@@ -18710,37 +20631,36 @@
 /* end confdefs.h.  */
  void __attribute__((malloc)) *test(void *muffin, ...) {return (void *) 0;}
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 	ax_cv_have_func_attribute_malloc=1
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_malloc 1
-_ACEOF
+printf "%s\n" "#define HAVE_ATTRIBUTE_malloc 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 CFLAGS="$saved_CFLAGS"
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute const' support" >&5
-$as_echo_n "checking for compiler 'attribute const' support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute const' support" >&5
+printf %s "checking for compiler 'attribute const' support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
 
@@ -18750,37 +20670,36 @@
 /* end confdefs.h.  */
  void __attribute__((const)) *test(void *muffin, ...) {return (void *) 0;}
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 	ax_cv_have_func_attribute_const=1
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_const 1
-_ACEOF
+printf "%s\n" "#define HAVE_ATTRIBUTE_const 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 CFLAGS="$saved_CFLAGS"
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute unused' support" >&5
-$as_echo_n "checking for compiler 'attribute unused' support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute unused' support" >&5
+printf %s "checking for compiler 'attribute unused' support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
 
@@ -18790,37 +20709,36 @@
 /* end confdefs.h.  */
  void __attribute__((unused)) *test(void *muffin, ...) {return (void *) 0;}
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 	ax_cv_have_func_attribute_unused=1
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_unused 1
-_ACEOF
+printf "%s\n" "#define HAVE_ATTRIBUTE_unused 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 CFLAGS="$saved_CFLAGS"
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute always_inline' support" >&5
-$as_echo_n "checking for compiler 'attribute always_inline' support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute always_inline' support" >&5
+printf %s "checking for compiler 'attribute always_inline' support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
 
@@ -18830,37 +20748,36 @@
 /* end confdefs.h.  */
  void __attribute__((always_inline)) *test(void *muffin, ...) {return (void *) 0;}
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 	ax_cv_have_func_attribute_always_inline=1
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_always_inline 1
-_ACEOF
+printf "%s\n" "#define HAVE_ATTRIBUTE_always_inline 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 CFLAGS="$saved_CFLAGS"
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute deprecated' support" >&5
-$as_echo_n "checking for compiler 'attribute deprecated' support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute deprecated' support" >&5
+printf %s "checking for compiler 'attribute deprecated' support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
 
@@ -18870,37 +20787,36 @@
 /* end confdefs.h.  */
  void __attribute__((deprecated)) *test(void *muffin, ...) {return (void *) 0;}
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 	ax_cv_have_func_attribute_deprecated=1
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_deprecated 1
-_ACEOF
+printf "%s\n" "#define HAVE_ATTRIBUTE_deprecated 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 CFLAGS="$saved_CFLAGS"
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute sentinel' support" >&5
-$as_echo_n "checking for compiler 'attribute sentinel' support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute sentinel' support" >&5
+printf %s "checking for compiler 'attribute sentinel' support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
 
@@ -18910,37 +20826,36 @@
 /* end confdefs.h.  */
  void __attribute__((sentinel)) *test(void *muffin, ...) {return (void *) 0;}
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 	ax_cv_have_func_attribute_sentinel=1
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_sentinel 1
-_ACEOF
+printf "%s\n" "#define HAVE_ATTRIBUTE_sentinel 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 CFLAGS="$saved_CFLAGS"
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute warn_unused_result' support" >&5
-$as_echo_n "checking for compiler 'attribute warn_unused_result' support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute warn_unused_result' support" >&5
+printf %s "checking for compiler 'attribute warn_unused_result' support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
 
@@ -18950,37 +20865,36 @@
 /* end confdefs.h.  */
  void __attribute__((warn_unused_result)) *test(void *muffin, ...) {return (void *) 0;}
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 	ax_cv_have_func_attribute_warn_unused_result=1
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_warn_unused_result 1
-_ACEOF
+printf "%s\n" "#define HAVE_ATTRIBUTE_warn_unused_result 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 CFLAGS="$saved_CFLAGS"
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute may_alias' support" >&5
-$as_echo_n "checking for compiler 'attribute may_alias' support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute may_alias' support" >&5
+printf %s "checking for compiler 'attribute may_alias' support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
 
@@ -18990,37 +20904,36 @@
 /* end confdefs.h.  */
  void __attribute__((may_alias)) *test(void *muffin, ...) {return (void *) 0;}
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 	ax_cv_have_func_attribute_may_alias=1
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_may_alias 1
-_ACEOF
+printf "%s\n" "#define HAVE_ATTRIBUTE_may_alias 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 CFLAGS="$saved_CFLAGS"
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute constructor' support" >&5
-$as_echo_n "checking for compiler 'attribute constructor' support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute constructor' support" >&5
+printf %s "checking for compiler 'attribute constructor' support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
 
@@ -19030,29 +20943,28 @@
 /* end confdefs.h.  */
  void __attribute__((constructor)) *test(void *muffin, ...) {return (void *) 0;}
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 	ax_cv_have_func_attribute_constructor=1
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_constructor 1
-_ACEOF
+printf "%s\n" "#define HAVE_ATTRIBUTE_constructor 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 CFLAGS="$saved_CFLAGS"
@@ -19063,8 +20975,8 @@
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute destructor' support" >&5
-$as_echo_n "checking for compiler 'attribute destructor' support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute destructor' support" >&5
+printf %s "checking for compiler 'attribute destructor' support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
 
@@ -19074,29 +20986,28 @@
 /* end confdefs.h.  */
  void __attribute__((destructor)) *test(void *muffin, ...) {return (void *) 0;}
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 	ax_cv_have_func_attribute_destructor=1
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_destructor 1
-_ACEOF
+printf "%s\n" "#define HAVE_ATTRIBUTE_destructor 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 CFLAGS="$saved_CFLAGS"
@@ -19106,8 +21017,8 @@
 	as_fn_error $? "*** Function destructor attribute is not supported by your compiler." "$LINENO" 5
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute noreturn' support" >&5
-$as_echo_n "checking for compiler 'attribute noreturn' support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compiler 'attribute noreturn' support" >&5
+printf %s "checking for compiler 'attribute noreturn' support... " >&6; }
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
 
@@ -19117,37 +21028,36 @@
 /* end confdefs.h.  */
  void __attribute__((noreturn)) *test(void *muffin, ...) ;
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 	ax_cv_have_func_attribute_noreturn=1
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ATTRIBUTE_noreturn 1
-_ACEOF
+printf "%s\n" "#define HAVE_ATTRIBUTE_noreturn 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 CFLAGS="$saved_CFLAGS"
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fsanitize=address support" >&5
-$as_echo_n "checking for -fsanitize=address support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -fsanitize=address support" >&5
+printf %s "checking for -fsanitize=address support... " >&6; }
 saved_sanitize_CFLAGS="${CFLAGS}"
 saved_sanitize_LDFLAGS="${LDFLAGS}"
 CFLAGS="-fsanitize=address -fno-omit-frame-pointer"
@@ -19156,30 +21066,31 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 int x = 1;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	AST_ADDRESS_SANITIZER=1
-else
+else $as_nop
   AST_ADDRESS_SANITIZER=0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 CFLAGS="${saved_sanitize_CFLAGS}"
 LDFLAGS="${saved_sanitize_LDFLAGS}"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fsanitize=thread support" >&5
-$as_echo_n "checking for -fsanitize=thread support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -fsanitize=thread support" >&5
+printf %s "checking for -fsanitize=thread support... " >&6; }
 saved_sanitize_CFLAGS="${CFLAGS}"
 saved_sanitize_LDFLAGS="${LDFLAGS}"
 CFLAGS="-fno-omit-frame-pointer -pie -fPIE -fsanitize=thread"
@@ -19188,30 +21099,31 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 int x = 1;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	AST_THREAD_SANITIZER=1
-else
+else $as_nop
   AST_THREAD_SANITIZER=0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 CFLAGS="${saved_sanitize_CFLAGS}"
 LDFLAGS="${saved_sanitize_LDFLAGS}"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fsanitize=leak support" >&5
-$as_echo_n "checking for -fsanitize=leak support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -fsanitize=leak support" >&5
+printf %s "checking for -fsanitize=leak support... " >&6; }
 saved_sanitize_CFLAGS="${CFLAGS}"
 saved_sanitize_LDFLAGS="${LDFLAGS}"
 CFLAGS="-fno-omit-frame-pointer -fsanitize=leak"
@@ -19220,30 +21132,31 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 int x = 1;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	AST_LEAK_SANITIZER=1
-else
+else $as_nop
   AST_LEAK_SANITIZER=0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 CFLAGS="${saved_sanitize_CFLAGS}"
 LDFLAGS="${saved_sanitize_LDFLAGS}"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fsanitize=undefined support" >&5
-$as_echo_n "checking for -fsanitize=undefined support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -fsanitize=undefined support" >&5
+printf %s "checking for -fsanitize=undefined support... " >&6; }
 saved_sanitize_CFLAGS="${CFLAGS}"
 saved_sanitize_LDFLAGS="${LDFLAGS}"
 CFLAGS="-fno-omit-frame-pointer -fsanitize=undefined"
@@ -19252,194 +21165,198 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 int x = 1;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	AST_UNDEFINED_SANITIZER=1
-else
+else $as_nop
   AST_UNDEFINED_SANITIZER=0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 CFLAGS="${saved_sanitize_CFLAGS}"
 LDFLAGS="${saved_sanitize_LDFLAGS}"
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wdeclaration-after-statement support" >&5
-$as_echo_n "checking for -Wdeclaration-after-statement support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Wdeclaration-after-statement support" >&5
+printf %s "checking for -Wdeclaration-after-statement support... " >&6; }
 if $(${CC} -Wdeclaration-after-statement -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	AST_DECLARATION_AFTER_STATEMENT=-Wdeclaration-after-statement
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	AST_DECLARATION_AFTER_STATEMENT=
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wtrampolines support" >&5
-$as_echo_n "checking for -Wtrampolines support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Wtrampolines support" >&5
+printf %s "checking for -Wtrampolines support... " >&6; }
 if $(${CC} -Wtrampolines -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	AST_TRAMPOLINES=-Wtrampolines
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	AST_TRAMPOLINES=
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FORTIFY_SOURCE support" >&5
-$as_echo_n "checking for _FORTIFY_SOURCE support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FORTIFY_SOURCE support" >&5
+printf %s "checking for _FORTIFY_SOURCE support... " >&6; }
 if $(${CC} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	AST_FORTIFY_SOURCE="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	AST_FORTIFY_SOURCE=
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fno-strict-overflow" >&5
-$as_echo_n "checking for -fno-strict-overflow... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -fno-strict-overflow" >&5
+printf %s "checking for -fno-strict-overflow... " >&6; }
 if $(${CC} -O2 -fno-strict-overflow -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	AST_NO_STRICT_OVERFLOW=-fno-strict-overflow
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	AST_NO_STRICT_OVERFLOW=
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-format-truncation" >&5
-$as_echo_n "checking for -Wno-format-truncation... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Wno-format-truncation" >&5
+printf %s "checking for -Wno-format-truncation... " >&6; }
 if $(${CC} -Wno-format-truncation -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	AST_NO_FORMAT_TRUNCATION=-Wno-format-truncation
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	AST_NO_FORMAT_TRUNCATION=
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-stringop-truncation" >&5
-$as_echo_n "checking for -Wno-stringop-truncation... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Wno-stringop-truncation" >&5
+printf %s "checking for -Wno-stringop-truncation... " >&6; }
 if $(${CC} -Wno-stringop-truncation -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	AST_NO_STRINGOP_TRUNCATION=-Wno-stringop-truncation
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	AST_NO_STRINGOP_TRUNCATION=
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wshadow" >&5
-$as_echo_n "checking for -Wshadow... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -Wshadow" >&5
+printf %s "checking for -Wshadow... " >&6; }
 if $(${CC} -Wshadow -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	AST_SHADOW_WARNINGS=-Wshadow
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	AST_SHADOW_WARNINGS=
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -march=native support" >&5
-$as_echo_n "checking for -march=native support... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -march=native support" >&5
+printf %s "checking for -march=native support... " >&6; }
 if $(${CC} -march=native -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	AST_NATIVE_ARCH=1
 else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	AST_NATIVE_ARCH=0
 fi
 
 
 
 # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
+if test ${enable_rpath+y}
+then :
   enableval=$enable_rpath; case "${enableval}" in
 		y|ye|yes) check_rpath=yes ;;
 		n|no) check_rpath=no ;;
                 *) as_fn_error $? "bad value ${enableval} for --disable-rpath" "$LINENO" 5 ;;
 	esac
-else
+else $as_nop
   check_rpath=yes
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use rpath" >&5
-$as_echo_n "checking whether to use rpath... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use rpath" >&5
+printf %s "checking whether to use rpath... " >&6; }
 AST_RPATH=
 if test "${OSARCH}" = "NetBSD"; then
 	AST_RPATH="-Wl,-rpath,/usr/pkg/lib"
 fi
 if test "${check_rpath}" != yes; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped" >&5
-$as_echo "skipped" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped" >&5
+printf "%s\n" "skipped" >&6; }
 elif test "${prefix}" = /usr || test "${prefix}" = NONE; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not needed" >&5
-$as_echo "not needed" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not needed" >&5
+printf "%s\n" "not needed" >&6; }
 else
 	AST_RPATH="-Wl,-rpath,${libdir}"
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysinfo" >&5
-$as_echo_n "checking for sysinfo... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysinfo" >&5
+printf %s "checking for sysinfo... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/sysinfo.h>
 int
-main ()
+main (void)
 {
 struct sysinfo sys_info; int uptime = sys_info.uptime
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_SYSINFO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSINFO 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_ninit" >&5
-$as_echo_n "checking for library containing res_9_ninit... " >&6; }
-if ${ac_cv_search_res_9_ninit+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_ninit" >&5
+printf %s "checking for library containing res_9_ninit... " >&6; }
+if test ${ac_cv_search_res_9_ninit+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19447,52 +21364,54 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char res_9_ninit ();
 int
-main ()
+main (void)
 {
 return res_9_ninit ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' resolv; do
+for ac_lib in '' resolv
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_res_9_ninit=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_res_9_ninit+:} false; then :
+  if test ${ac_cv_search_res_9_ninit+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_res_9_ninit+:} false; then :
+if test ${ac_cv_search_res_9_ninit+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_res_9_ninit=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_ninit" >&5
-$as_echo "$ac_cv_search_res_9_ninit" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_ninit" >&5
+printf "%s\n" "$ac_cv_search_res_9_ninit" >&6; }
 ac_res=$ac_cv_search_res_9_ninit
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ninit" >&5
-$as_echo_n "checking for res_ninit... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_ninit" >&5
+printf %s "checking for res_ninit... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -19507,24 +21426,26 @@
 			#endif
 			#include <resolv.h>
 int
-main ()
+main (void)
 {
 int foo = res_ninit(NULL);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_RES_NINIT 1" >>confdefs.h
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_ndestroy" >&5
-$as_echo_n "checking for library containing res_9_ndestroy... " >&6; }
-if ${ac_cv_search_res_9_ndestroy+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+printf "%s\n" "#define HAVE_RES_NINIT 1" >>confdefs.h
+
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_ndestroy" >&5
+printf %s "checking for library containing res_9_ndestroy... " >&6; }
+if test ${ac_cv_search_res_9_ndestroy+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19532,52 +21453,54 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char res_9_ndestroy ();
 int
-main ()
+main (void)
 {
 return res_9_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' resolv; do
+for ac_lib in '' resolv
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_res_9_ndestroy=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_res_9_ndestroy+:} false; then :
+  if test ${ac_cv_search_res_9_ndestroy+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_res_9_ndestroy+:} false; then :
+if test ${ac_cv_search_res_9_ndestroy+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_res_9_ndestroy=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_ndestroy" >&5
-$as_echo "$ac_cv_search_res_9_ndestroy" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_ndestroy" >&5
+printf "%s\n" "$ac_cv_search_res_9_ndestroy" >&6; }
 ac_res=$ac_cv_search_res_9_ndestroy
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy" >&5
-$as_echo_n "checking for res_ndestroy... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy" >&5
+printf %s "checking for res_ndestroy... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -19592,31 +21515,33 @@
 				#endif
 				#include <resolv.h>
 int
-main ()
+main (void)
 {
 res_ndestroy(NULL);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_close" >&5
-$as_echo_n "checking for library containing res_9_close... " >&6; }
-if ${ac_cv_search_res_9_close+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_close" >&5
+printf %s "checking for library containing res_9_close... " >&6; }
+if test ${ac_cv_search_res_9_close+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19624,52 +21549,54 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char res_9_close ();
 int
-main ()
+main (void)
 {
 return res_9_close ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' resolv; do
+for ac_lib in '' resolv
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_res_9_close=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_res_9_close+:} false; then :
+  if test ${ac_cv_search_res_9_close+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_res_9_close+:} false; then :
+if test ${ac_cv_search_res_9_close+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_res_9_close=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_close" >&5
-$as_echo "$ac_cv_search_res_9_close" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_close" >&5
+printf "%s\n" "$ac_cv_search_res_9_close" >&6; }
 ac_res=$ac_cv_search_res_9_close
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_close" >&5
-$as_echo_n "checking for res_close... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_close" >&5
+printf %s "checking for res_close... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -19684,47 +21611,47 @@
 				#endif
 				#include <resolv.h>
 int
-main ()
+main (void)
 {
 res_close();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_RES_CLOSE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RES_CLOSE 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	ac_fn_c_check_member "$LINENO" "struct __res_state" "_u._ext.nsaddrs" "ac_cv_member_struct___res_state__u__ext_nsaddrs" "#include <resolv.h>
 "
-if test "x$ac_cv_member_struct___res_state__u__ext_nsaddrs" = xyes; then :
+if test "x$ac_cv_member_struct___res_state__u__ext_nsaddrs" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT___RES_STATE__U__EXT_NSADDRS 1
-_ACEOF
+printf "%s\n" "#define HAVE_STRUCT___RES_STATE__U__EXT_NSADDRS 1" >>confdefs.h
 
 
 fi
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIND_8_COMPAT required" >&5
-$as_echo_n "checking for BIND_8_COMPAT required... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BIND_8_COMPAT required" >&5
+printf %s "checking for BIND_8_COMPAT required... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -19732,28 +21659,29 @@
 #include <arpa/nameser.h>
 
 int
-main ()
+main (void)
 {
 int x = NXDOMAIN
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 BIND8_CFLAGS=-DBIND_8_COMPAT
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 
     if test "x${PBX_GLOB_NOMAGIC}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLOB_NOMAGIC in glob.h" >&5
-$as_echo_n "checking for GLOB_NOMAGIC in glob.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLOB_NOMAGIC in glob.h" >&5
+printf %s "checking for GLOB_NOMAGIC in glob.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${GLOB_NOMAGIC_DIR}" != "x"; then
 	    GLOB_NOMAGIC_INCLUDE="-I${GLOB_NOMAGIC_DIR}/include"
@@ -19764,7 +21692,7 @@
 /* end confdefs.h.  */
  #include <glob.h>
 int
-main ()
+main (void)
 {
 #if defined(GLOB_NOMAGIC)
 				int foo = 0;
@@ -19777,21 +21705,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_GLOB_NOMAGIC=1
 
-$as_echo "#define HAVE_GLOB_NOMAGIC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GLOB_NOMAGIC 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
@@ -19799,8 +21728,8 @@
 
 
     if test "x${PBX_GLOB_BRACE}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLOB_BRACE in glob.h" >&5
-$as_echo_n "checking for GLOB_BRACE in glob.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLOB_BRACE in glob.h" >&5
+printf %s "checking for GLOB_BRACE in glob.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${GLOB_BRACE_DIR}" != "x"; then
 	    GLOB_BRACE_INCLUDE="-I${GLOB_BRACE_DIR}/include"
@@ -19811,7 +21740,7 @@
 /* end confdefs.h.  */
  #include <glob.h>
 int
-main ()
+main (void)
 {
 #if defined(GLOB_BRACE)
 				int foo = 0;
@@ -19824,21 +21753,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_GLOB_BRACE=1
 
-$as_echo "#define HAVE_GLOB_BRACE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GLOB_BRACE 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
@@ -19846,8 +21776,8 @@
 
 
     if test "x${PBX_RTLD_NOLOAD}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTLD_NOLOAD in dlfcn.h" >&5
-$as_echo_n "checking for RTLD_NOLOAD in dlfcn.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for RTLD_NOLOAD in dlfcn.h" >&5
+printf %s "checking for RTLD_NOLOAD in dlfcn.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${RTLD_NOLOAD_DIR}" != "x"; then
 	    RTLD_NOLOAD_INCLUDE="-I${RTLD_NOLOAD_DIR}/include"
@@ -19858,7 +21788,7 @@
 /* end confdefs.h.  */
  #include <dlfcn.h>
 int
-main ()
+main (void)
 {
 #if defined(RTLD_NOLOAD)
 				int foo = 0;
@@ -19871,21 +21801,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_RTLD_NOLOAD=1
 
-$as_echo "#define HAVE_RTLD_NOLOAD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_RTLD_NOLOAD 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
@@ -19893,8 +21824,8 @@
 
 
     if test "x${PBX_IP_MTU_DISCOVER}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IP_MTU_DISCOVER in netinet/in.h" >&5
-$as_echo_n "checking for IP_MTU_DISCOVER in netinet/in.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IP_MTU_DISCOVER in netinet/in.h" >&5
+printf %s "checking for IP_MTU_DISCOVER in netinet/in.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${IP_MTU_DISCOVER_DIR}" != "x"; then
 	    IP_MTU_DISCOVER_INCLUDE="-I${IP_MTU_DISCOVER_DIR}/include"
@@ -19905,7 +21836,7 @@
 /* end confdefs.h.  */
  #include <netinet/in.h>
 int
-main ()
+main (void)
 {
 #if defined(IP_MTU_DISCOVER)
 				int foo = 0;
@@ -19918,21 +21849,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_IP_MTU_DISCOVER=1
 
-$as_echo "#define HAVE_IP_MTU_DISCOVER 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IP_MTU_DISCOVER 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
@@ -19942,17 +21874,19 @@
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+printf %s "checking size of int... " >&6; }
+if test ${ac_cv_sizeof_int+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (int)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -19961,31 +21895,31 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+printf "%s\n" "$ac_cv_sizeof_int" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
+printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h
 
 
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+printf %s "checking size of long... " >&6; }
+if test ${ac_cv_sizeof_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -19994,31 +21928,31 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
 
 
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if ${ac_cv_sizeof_long_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+printf %s "checking size of long long... " >&6; }
+if test ${ac_cv_sizeof_long_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -20027,31 +21961,31 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h
 
 
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char *" >&5
-$as_echo_n "checking size of char *... " >&6; }
-if ${ac_cv_sizeof_char_p+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char *))" "ac_cv_sizeof_char_p"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of char *" >&5
+printf %s "checking size of char *... " >&6; }
+if test ${ac_cv_sizeof_char_p+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char *))" "ac_cv_sizeof_char_p"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_char_p" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (char *)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -20060,31 +21994,31 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char_p" >&5
-$as_echo "$ac_cv_sizeof_char_p" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char_p" >&5
+printf "%s\n" "$ac_cv_sizeof_char_p" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
-_ACEOF
+printf "%s\n" "#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p" >>confdefs.h
 
 
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+printf %s "checking size of long... " >&6; }
+if test ${ac_cv_sizeof_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -20093,31 +22027,31 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
 
 
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if ${ac_cv_sizeof_long_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+printf %s "checking size of long long... " >&6; }
+if test ${ac_cv_sizeof_long_long+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_long_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long long)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -20126,18 +22060,17 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+printf "%s\n" "$ac_cv_sizeof_long_long" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
+printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h
 
 
 if ac_fn_c_compute_int "$LINENO" "sizeof(foo.fds_bits[0])" "ac_cv_sizeof_fd_set_fds_bits"        "$ac_includes_default
-fd_set foo;"; then :
+fd_set foo;"
+then :
 
 fi
 
@@ -20147,17 +22080,19 @@
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of fd_set.fds_bits" >&5
-$as_echo_n "checking size of fd_set.fds_bits... " >&6; }
-if ${ac_cv_sizeof_fd_set_fds_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (fd_set.fds_bits))" "ac_cv_sizeof_fd_set_fds_bits"        "$ac_includes_default"; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of fd_set.fds_bits" >&5
+printf %s "checking size of fd_set.fds_bits... " >&6; }
+if test ${ac_cv_sizeof_fd_set_fds_bits+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (fd_set.fds_bits))" "ac_cv_sizeof_fd_set_fds_bits"        "$ac_includes_default"
+then :
 
-else
+else $as_nop
   if test "$ac_cv_type_fd_set_fds_bits" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (fd_set.fds_bits)
 See \`config.log' for more details" "$LINENO" 5; }
    else
@@ -20166,14 +22101,12 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_fd_set_fds_bits" >&5
-$as_echo "$ac_cv_sizeof_fd_set_fds_bits" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_fd_set_fds_bits" >&5
+printf "%s\n" "$ac_cv_sizeof_fd_set_fds_bits" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_FD_SET_FDS_BITS $ac_cv_sizeof_fd_set_fds_bits
-_ACEOF
+printf "%s\n" "#define SIZEOF_FD_SET_FDS_BITS $ac_cv_sizeof_fd_set_fds_bits" >>confdefs.h
 
 
 
@@ -20182,20 +22115,20 @@
 # correctly if the size is wrong.
 if test $ac_cv_sizeof_int = $ac_cv_sizeof_fd_set_fds_bits; then
 
-$as_echo "#define TYPEOF_FD_SET_FDS_BITS int" >>confdefs.h
+printf "%s\n" "#define TYPEOF_FD_SET_FDS_BITS int" >>confdefs.h
 
 elif test $ac_cv_sizeof_long = $ac_cv_sizeof_fd_set_fds_bits; then
 
-$as_echo "#define TYPEOF_FD_SET_FDS_BITS long" >>confdefs.h
+printf "%s\n" "#define TYPEOF_FD_SET_FDS_BITS long" >>confdefs.h
 
 elif test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then
 
-$as_echo "#define TYPEOF_FD_SET_FDS_BITS long long" >>confdefs.h
+printf "%s\n" "#define TYPEOF_FD_SET_FDS_BITS long long" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dladdr in dlfcn.h" >&5
-$as_echo_n "checking for dladdr in dlfcn.h... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dladdr in dlfcn.h" >&5
+printf %s "checking for dladdr in dlfcn.h... " >&6; }
 PBX_DLADDR=0
 old_LIBS=${LIBS}
 LIBS="${LIBS} -ldl"
@@ -20204,7 +22137,7 @@
 #define _GNU_SOURCE 1
 #include <dlfcn.h>
 int
-main ()
+main (void)
 {
 dladdr((void *)0, (void *)0)
 
@@ -20212,34 +22145,35 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	PBX_DLADDR=1
 
 
-$as_echo "#define HAVE_DLADDR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DLADDR 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=${old_LIBS}
 
 # re-check without -ldl
 # Non-Linux platforms like FreeBSD and NetBSD do not need a library libdl.so.
 if test "${PBX_DLADDR}" = "0"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dladdr in dlfcn.h without -ldl" >&5
-$as_echo_n "checking for dladdr in dlfcn.h without -ldl... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dladdr in dlfcn.h without -ldl" >&5
+printf %s "checking for dladdr in dlfcn.h without -ldl... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _GNU_SOURCE 1
 #include <dlfcn.h>
 int
-main ()
+main (void)
 {
 dladdr((void *)0, (void *)0)
 
@@ -20247,20 +22181,21 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_DLADDR=1
 
 
-$as_echo "#define HAVE_DLADDR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DLADDR 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -20281,11 +22216,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5
-$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
-if ${ac_cv_lib_asound_snd_pcm_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5
+printf %s "checking for snd_pcm_open in -lasound... " >&6; }
+if test ${ac_cv_lib_asound_snd_pcm_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lasound ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20294,32 +22230,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char snd_pcm_open ();
 int
-main ()
+main (void)
 {
 return snd_pcm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_asound_snd_pcm_open=yes
-else
+else $as_nop
   ac_cv_lib_asound_snd_pcm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5
-$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5
+printf "%s\n" "$ac_cv_lib_asound_snd_pcm_open" >&6; }
+if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes
+then :
   AST_ALSA_FOUND=yes
-else
+else $as_nop
   AST_ALSA_FOUND=no
 fi
 
@@ -20338,14 +22273,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ALSA_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_alsa_asoundlib_h" = xyes
+then :
   ALSA_HEADER_FOUND=1
-else
+else $as_nop
   ALSA_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${ALSA_HEADER_FOUND}" = "x0" ; then
@@ -20378,11 +22313,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
-$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
-if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
+printf %s "checking for bfd_openr in -lbfd... " >&6; }
+if test ${ac_cv_lib_bfd_bfd_openr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbfd ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20391,32 +22327,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char bfd_openr ();
 int
-main ()
+main (void)
 {
 return bfd_openr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bfd_bfd_openr=yes
-else
+else $as_nop
   ac_cv_lib_bfd_bfd_openr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
-$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
-if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
+printf "%s\n" "$ac_cv_lib_bfd_bfd_openr" >&6; }
+if test "x$ac_cv_lib_bfd_bfd_openr" = xyes
+then :
   AST_BFD_FOUND=yes
-else
+else $as_nop
   AST_BFD_FOUND=no
 fi
 
@@ -20435,14 +22370,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${BFD_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
-if test "x$ac_cv_header_bfd_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
+if test "x$ac_cv_header_bfd_h" = xyes
+then :
   BFD_HEADER_FOUND=1
-else
+else $as_nop
   BFD_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${BFD_HEADER_FOUND}" = "x0" ; then
@@ -20475,11 +22410,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
-$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
-if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
+printf %s "checking for bfd_openr in -lbfd... " >&6; }
+if test ${ac_cv_lib_bfd_bfd_openr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbfd ${pbxlibdir} -ldl -liberty $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20488,32 +22424,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char bfd_openr ();
 int
-main ()
+main (void)
 {
 return bfd_openr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bfd_bfd_openr=yes
-else
+else $as_nop
   ac_cv_lib_bfd_bfd_openr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
-$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
-if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
+printf "%s\n" "$ac_cv_lib_bfd_bfd_openr" >&6; }
+if test "x$ac_cv_lib_bfd_bfd_openr" = xyes
+then :
   AST_BFD_FOUND=yes
-else
+else $as_nop
   AST_BFD_FOUND=no
 fi
 
@@ -20532,14 +22467,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${BFD_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
-if test "x$ac_cv_header_bfd_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
+if test "x$ac_cv_header_bfd_h" = xyes
+then :
   BFD_HEADER_FOUND=1
-else
+else $as_nop
   BFD_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${BFD_HEADER_FOUND}" = "x0" ; then
@@ -20572,11 +22507,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
-$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
-if ${ac_cv_lib_bfd_bfd_openr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
+printf %s "checking for bfd_openr in -lbfd... " >&6; }
+if test ${ac_cv_lib_bfd_bfd_openr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbfd ${pbxlibdir} -ldl -liberty -lz $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20585,32 +22521,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char bfd_openr ();
 int
-main ()
+main (void)
 {
 return bfd_openr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bfd_bfd_openr=yes
-else
+else $as_nop
   ac_cv_lib_bfd_bfd_openr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
-$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
-if test "x$ac_cv_lib_bfd_bfd_openr" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
+printf "%s\n" "$ac_cv_lib_bfd_bfd_openr" >&6; }
+if test "x$ac_cv_lib_bfd_bfd_openr" = xyes
+then :
   AST_BFD_FOUND=yes
-else
+else $as_nop
   AST_BFD_FOUND=no
 fi
 
@@ -20629,14 +22564,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${BFD_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
-if test "x$ac_cv_header_bfd_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"
+if test "x$ac_cv_header_bfd_h" = xyes
+then :
   BFD_HEADER_FOUND=1
-else
+else $as_nop
   BFD_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${BFD_HEADER_FOUND}" = "x0" ; then
@@ -20671,11 +22606,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_from_text in -lcap" >&5
-$as_echo_n "checking for cap_from_text in -lcap... " >&6; }
-if ${ac_cv_lib_cap_cap_from_text+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cap_from_text in -lcap" >&5
+printf %s "checking for cap_from_text in -lcap... " >&6; }
+if test ${ac_cv_lib_cap_cap_from_text+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcap ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20684,32 +22620,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char cap_from_text ();
 int
-main ()
+main (void)
 {
 return cap_from_text ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_cap_cap_from_text=yes
-else
+else $as_nop
   ac_cv_lib_cap_cap_from_text=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_from_text" >&5
-$as_echo "$ac_cv_lib_cap_cap_from_text" >&6; }
-if test "x$ac_cv_lib_cap_cap_from_text" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_from_text" >&5
+printf "%s\n" "$ac_cv_lib_cap_cap_from_text" >&6; }
+if test "x$ac_cv_lib_cap_cap_from_text" = xyes
+then :
   AST_CAP_FOUND=yes
-else
+else $as_nop
   AST_CAP_FOUND=no
 fi
 
@@ -20728,14 +22663,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${CAP_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_capability_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_capability_h" = xyes
+then :
   CAP_HEADER_FOUND=1
-else
+else $as_nop
   CAP_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${CAP_HEADER_FOUND}" = "x0" ; then
@@ -20758,8 +22693,8 @@
 
 
     if test "x${PBX_DAHDI}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DAHDI_RESET_COUNTERS in dahdi/user.h" >&5
-$as_echo_n "checking for DAHDI_RESET_COUNTERS in dahdi/user.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DAHDI_RESET_COUNTERS in dahdi/user.h" >&5
+printf %s "checking for DAHDI_RESET_COUNTERS in dahdi/user.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${DAHDI_DIR}" != "x"; then
 	    DAHDI_INCLUDE="-I${DAHDI_DIR}/include"
@@ -20770,7 +22705,7 @@
 /* end confdefs.h.  */
  #include <dahdi/user.h>
 int
-main ()
+main (void)
 {
 #if defined(DAHDI_RESET_COUNTERS)
 				int foo = 0;
@@ -20783,31 +22718,32 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_DAHDI=1
 
-$as_echo "#define HAVE_DAHDI 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DAHDI 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_DAHDI_VERSION 230" >>confdefs.h
+printf "%s\n" "#define HAVE_DAHDI_VERSION 230" >>confdefs.h
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_DAHDI}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DAHDI_DEFAULT_MTU_MRU in dahdi/user.h" >&5
-$as_echo_n "checking for DAHDI_DEFAULT_MTU_MRU in dahdi/user.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DAHDI_DEFAULT_MTU_MRU in dahdi/user.h" >&5
+printf %s "checking for DAHDI_DEFAULT_MTU_MRU in dahdi/user.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${DAHDI_DIR}" != "x"; then
 	    DAHDI_INCLUDE="-I${DAHDI_DIR}/include"
@@ -20818,7 +22754,7 @@
 /* end confdefs.h.  */
  #include <dahdi/user.h>
 int
-main ()
+main (void)
 {
 #if defined(DAHDI_DEFAULT_MTU_MRU)
 				int foo = 0;
@@ -20831,31 +22767,32 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_DAHDI=1
 
-$as_echo "#define HAVE_DAHDI 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DAHDI 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_DAHDI_VERSION 220" >>confdefs.h
+printf "%s\n" "#define HAVE_DAHDI_VERSION 220" >>confdefs.h
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_DAHDI}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DAHDI_CODE in dahdi/user.h" >&5
-$as_echo_n "checking for DAHDI_CODE in dahdi/user.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DAHDI_CODE in dahdi/user.h" >&5
+printf %s "checking for DAHDI_CODE in dahdi/user.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${DAHDI_DIR}" != "x"; then
 	    DAHDI_INCLUDE="-I${DAHDI_DIR}/include"
@@ -20866,7 +22803,7 @@
 /* end confdefs.h.  */
  #include <dahdi/user.h>
 int
-main ()
+main (void)
 {
 #if defined(DAHDI_CODE)
 				int foo = 0;
@@ -20879,23 +22816,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_DAHDI=1
 
-$as_echo "#define HAVE_DAHDI 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DAHDI 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_DAHDI_VERSION 200" >>confdefs.h
+printf "%s\n" "#define HAVE_DAHDI_VERSION 200" >>confdefs.h
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
@@ -20903,8 +22841,8 @@
 
 
     if test "x${PBX_DAHDI_HALF_FULL}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DAHDI_POLICY_HALF_FULL in dahdi/user.h" >&5
-$as_echo_n "checking for DAHDI_POLICY_HALF_FULL in dahdi/user.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DAHDI_POLICY_HALF_FULL in dahdi/user.h" >&5
+printf %s "checking for DAHDI_POLICY_HALF_FULL in dahdi/user.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${DAHDI_HALF_FULL_DIR}" != "x"; then
 	    DAHDI_HALF_FULL_INCLUDE="-I${DAHDI_HALF_FULL_DIR}/include"
@@ -20915,7 +22853,7 @@
 /* end confdefs.h.  */
  #include <dahdi/user.h>
 int
-main ()
+main (void)
 {
 #if defined(DAHDI_POLICY_HALF_FULL)
 				int foo = 0;
@@ -20928,21 +22866,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_DAHDI_HALF_FULL=1
 
-$as_echo "#define HAVE_DAHDI_HALF_FULL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DAHDI_HALF_FULL 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
@@ -20950,8 +22889,8 @@
 
 
     if test "x${PBX_DAHDI_LINEREVERSE_VMWI}" != "x1" -a "${USE_DAHDI_LINEREVERSE_VMWI}" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for enhanced dahdi vmwi support" >&5
-$as_echo_n "checking for enhanced dahdi vmwi support... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enhanced dahdi vmwi support" >&5
+printf %s "checking for enhanced dahdi vmwi support... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${DAHDI_LINEREVERSE_VMWI_DIR}" != "x"; then
 	    DAHDI_LINEREVERSE_VMWI_INCLUDE="-I${DAHDI_LINEREVERSE_VMWI_DIR}/include"
@@ -20962,7 +22901,7 @@
 /* end confdefs.h.  */
  #include <dahdi/user.h>
 int
-main ()
+main (void)
 {
  struct dahdi_vmwi_info booger;
 
@@ -20970,29 +22909,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_DAHDI_LINEREVERSE_VMWI=1
 
-$as_echo "#define HAVE_DAHDI_LINEREVERSE_VMWI 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DAHDI_LINEREVERSE_VMWI 1" >>confdefs.h
 
 
 
-else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_DAHDI_ECHOCANCEL_FAX_MODE}" != "x1" -a "${USE_DAHDI_ECHOCANCEL_FAX_MODE}" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"int foo = DAHDI_ECHOCANCEL_FAX_MODE\" compiles using dahdi/user.h" >&5
-$as_echo_n "checking if \"int foo = DAHDI_ECHOCANCEL_FAX_MODE\" compiles using dahdi/user.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if \"int foo = DAHDI_ECHOCANCEL_FAX_MODE\" compiles using dahdi/user.h" >&5
+printf %s "checking if \"int foo = DAHDI_ECHOCANCEL_FAX_MODE\" compiles using dahdi/user.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${DAHDI_ECHOCANCEL_FAX_MODE_DIR}" != "x"; then
 	    DAHDI_ECHOCANCEL_FAX_MODE_INCLUDE="-I${DAHDI_ECHOCANCEL_FAX_MODE_DIR}/include"
@@ -21003,7 +22943,7 @@
 /* end confdefs.h.  */
  #include <dahdi/user.h>
 int
-main ()
+main (void)
 {
  int foo = DAHDI_ECHOCANCEL_FAX_MODE;
 
@@ -21011,29 +22951,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_DAHDI_ECHOCANCEL_FAX_MODE=1
 
-$as_echo "#define HAVE_DAHDI_ECHOCANCEL_FAX_MODE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DAHDI_ECHOCANCEL_FAX_MODE 1" >>confdefs.h
 
 
 
-else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_GETIFADDRS}" != "x1" -a "${USE_GETIFADDRS}" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs() support" >&5
-$as_echo_n "checking for getifaddrs() support... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getifaddrs() support" >&5
+printf %s "checking for getifaddrs() support... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${GETIFADDRS_DIR}" != "x"; then
 	    GETIFADDRS_INCLUDE="-I${GETIFADDRS_DIR}/include"
@@ -21044,7 +22985,7 @@
 /* end confdefs.h.  */
  #include <ifaddrs.h>
 int
-main ()
+main (void)
 {
  struct ifaddrs *p; getifaddrs(&p);
 
@@ -21052,28 +22993,29 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_GETIFADDRS=1
 
-$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETIFADDRS 1" >>confdefs.h
 
 
 
-else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
     if test "x${PBX_TIMERFD}" != "x1" -a "${USE_TIMERFD}" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for timerfd support" >&5
-$as_echo_n "checking for timerfd support... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timerfd support" >&5
+printf %s "checking for timerfd support... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${TIMERFD_DIR}" != "x"; then
 	    TIMERFD_INCLUDE="-I${TIMERFD_DIR}/include"
@@ -21084,7 +23026,7 @@
 /* end confdefs.h.  */
  #include <sys/timerfd.h>
 int
-main ()
+main (void)
 {
  timerfd_create(0,0); timerfd_settime(0,0,NULL,NULL);;
 
@@ -21092,21 +23034,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_TIMERFD=1
 
-$as_echo "#define HAVE_TIMERFD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_TIMERFD 1" >>confdefs.h
 
 
 
-else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
@@ -21129,11 +23072,12 @@
             gsmlibdir="-L${GSM_DIR}"
          fi
       fi
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gsm_create in -lgsm" >&5
-$as_echo_n "checking for gsm_create in -lgsm... " >&6; }
-if ${ac_cv_lib_gsm_gsm_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gsm_create in -lgsm" >&5
+printf %s "checking for gsm_create in -lgsm... " >&6; }
+if test ${ac_cv_lib_gsm_gsm_create+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgsm ${gsmlibdir} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21142,86 +23086,83 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gsm_create ();
 int
-main ()
+main (void)
 {
 return gsm_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_gsm_gsm_create=yes
-else
+else $as_nop
   ac_cv_lib_gsm_gsm_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gsm_gsm_create" >&5
-$as_echo "$ac_cv_lib_gsm_gsm_create" >&6; }
-if test "x$ac_cv_lib_gsm_gsm_create" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gsm_gsm_create" >&5
+printf "%s\n" "$ac_cv_lib_gsm_gsm_create" >&6; }
+if test "x$ac_cv_lib_gsm_gsm_create" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_GSM 1
-_ACEOF
+printf "%s\n" "#define HAVE_GSM 1" >>confdefs.h
 
 fi
 
       if test "${ac_cv_lib_gsm_gsm_create}" = "yes"; then
          if test "x${GSM_DIR}" != "x" ; then
-            as_ac_Header=`$as_echo "ac_cv_header_${GSM_DIR}/include/gsm.h" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "${GSM_DIR}/include/gsm.h" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+            as_ac_Header=`printf "%s\n" "ac_cv_header_${GSM_DIR}/include/gsm.h" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "${GSM_DIR}/include/gsm.h" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
   GSM_HEADER_FOUND=1
-else
+else $as_nop
   GSM_HEADER_FOUND=0
 fi
 
-
-            as_ac_Header=`$as_echo "ac_cv_header_${GSM_DIR}/include/gsm/gsm.h" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "${GSM_DIR}/include/gsm/gsm.h" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+            as_ac_Header=`printf "%s\n" "ac_cv_header_${GSM_DIR}/include/gsm/gsm.h" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "${GSM_DIR}/include/gsm/gsm.h" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
   GSM_GSM_HEADER_FOUND=1
-else
+else $as_nop
   GSM_GSM_HEADER_FOUND=0
 fi
 
-
          else
-            ac_fn_c_check_header_mongrel "$LINENO" "gsm.h" "ac_cv_header_gsm_h" "$ac_includes_default"
-if test "x$ac_cv_header_gsm_h" = xyes; then :
+            ac_fn_c_check_header_compile "$LINENO" "gsm.h" "ac_cv_header_gsm_h" "$ac_includes_default"
+if test "x$ac_cv_header_gsm_h" = xyes
+then :
   GSM_HEADER_FOUND=1
-else
+else $as_nop
   GSM_HEADER_FOUND=0
 fi
 
-
-            ac_fn_c_check_header_mongrel "$LINENO" "gsm/gsm.h" "ac_cv_header_gsm_gsm_h" "$ac_includes_default"
-if test "x$ac_cv_header_gsm_gsm_h" = xyes; then :
+            ac_fn_c_check_header_compile "$LINENO" "gsm/gsm.h" "ac_cv_header_gsm_gsm_h" "$ac_includes_default"
+if test "x$ac_cv_header_gsm_gsm_h" = xyes
+then :
   GSM_GSM_HEADER_FOUND=1
-else
+else $as_nop
   GSM_GSM_HEADER_FOUND=0
 fi
 
-
          fi
          if test "${GSM_HEADER_FOUND}" = "0" ; then
             if test "{GSM_GSM_HEADER_FOUND}" = "0" ; then
                if test "x${GSM_MANDATORY}" = "xyes" ; then
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5
-$as_echo "$as_me: ***" >&6;}
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: *** It appears that you do not have the gsm development package installed." >&5
-$as_echo "$as_me: *** It appears that you do not have the gsm development package installed." >&6;}
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: *** Please install it to include ${GSM_DESCRIP} support, or re-run configure" >&5
-$as_echo "$as_me: *** Please install it to include ${GSM_DESCRIP} support, or re-run configure" >&6;}
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: *** without explicitly specifying --with-${GSM_OPTION}" >&5
-$as_echo "$as_me: *** without explicitly specifying --with-${GSM_OPTION}" >&6;}
+                  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ***" >&5
+printf "%s\n" "$as_me: ***" >&6;}
+                  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** It appears that you do not have the gsm development package installed." >&5
+printf "%s\n" "$as_me: *** It appears that you do not have the gsm development package installed." >&6;}
+                  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Please install it to include ${GSM_DESCRIP} support, or re-run configure" >&5
+printf "%s\n" "$as_me: *** Please install it to include ${GSM_DESCRIP} support, or re-run configure" >&6;}
+                  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** without explicitly specifying --with-${GSM_OPTION}" >&5
+printf "%s\n" "$as_me: *** without explicitly specifying --with-${GSM_OPTION}" >&6;}
                   exit 1
                fi
             fi
@@ -21229,16 +23170,12 @@
          GSM_OK=0
          if test "${GSM_HEADER_FOUND}" = "1" ; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_GSM_HEADER 1
-_ACEOF
+printf "%s\n" "#define HAVE_GSM_HEADER 1" >>confdefs.h
 
             GSM_OK=1
          elif test "${GSM_GSM_HEADER_FOUND}" = "1" ; then
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_GSM_GSM_HEADER 1
-_ACEOF
+printf "%s\n" "#define HAVE_GSM_GSM_HEADER 1" >>confdefs.h
 
             GSM_OK=1
          fi
@@ -21256,9 +23193,7 @@
    if test "${GSM_INTERNAL}" = "yes"; then
       PBX_GSM=1
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_GSM_HEADER 1
-_ACEOF
+printf "%s\n" "#define HAVE_GSM_HEADER 1" >>confdefs.h
 
    fi
 fi
@@ -21277,17 +23212,17 @@
    if test "x${PBX_ILBC}" != "x1" -a "${USE_ILBC}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ILBC" >&5
-$as_echo_n "checking for ILBC... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libilbc" >&5
+printf %s "checking for libilbc... " >&6; }
 
 if test -n "$ILBC_CFLAGS"; then
     pkg_cv_ILBC_CFLAGS="$ILBC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libilbc\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libilbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libilbc") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ILBC_CFLAGS=`$PKG_CONFIG --cflags "libilbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -21301,10 +23236,10 @@
     pkg_cv_ILBC_LIBS="$ILBC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libilbc\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libilbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libilbc") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ILBC_LIBS=`$PKG_CONFIG --libs "libilbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -21318,8 +23253,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -21339,8 +23274,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_ILBC=0
 
@@ -21348,14 +23283,14 @@
 else
 	ILBC_CFLAGS=$pkg_cv_ILBC_CFLAGS
 	ILBC_LIBS=$pkg_cv_ILBC_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_ILBC=1
             ILBC_INCLUDE=$(echo ${ILBC_CFLAGS} | $SED -e "s|-std=c99||g")
             ILBC_LIB="$ILBC_LIBS"
 
-$as_echo "#define HAVE_ILBC 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ILBC 1" >>confdefs.h
 
 
 fi
@@ -21384,11 +23319,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
-$as_echo_n "checking for iconv_open in -liconv... " >&6; }
-if ${ac_cv_lib_iconv_iconv_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
+printf %s "checking for iconv_open in -liconv... " >&6; }
+if test ${ac_cv_lib_iconv_iconv_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21397,32 +23333,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char iconv_open ();
 int
-main ()
+main (void)
 {
 return iconv_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_iconv_iconv_open=yes
-else
+else $as_nop
   ac_cv_lib_iconv_iconv_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv_open" >&5
-$as_echo "$ac_cv_lib_iconv_iconv_open" >&6; }
-if test "x$ac_cv_lib_iconv_iconv_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv_open" >&5
+printf "%s\n" "$ac_cv_lib_iconv_iconv_open" >&6; }
+if test "x$ac_cv_lib_iconv_iconv_open" = xyes
+then :
   AST_ICONV_FOUND=yes
-else
+else $as_nop
   AST_ICONV_FOUND=no
 fi
 
@@ -21441,14 +23376,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
-if test "x$ac_cv_header_iconv_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
+if test "x$ac_cv_header_iconv_h" = xyes
+then :
   ICONV_HEADER_FOUND=1
-else
+else $as_nop
   ICONV_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${ICONV_HEADER_FOUND}" = "x0" ; then
@@ -21481,11 +23416,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
-$as_echo_n "checking for libiconv_open in -liconv... " >&6; }
-if ${ac_cv_lib_iconv_libiconv_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiconv_open in -liconv" >&5
+printf %s "checking for libiconv_open in -liconv... " >&6; }
+if test ${ac_cv_lib_iconv_libiconv_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liconv ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21494,32 +23430,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char libiconv_open ();
 int
-main ()
+main (void)
 {
 return libiconv_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_iconv_libiconv_open=yes
-else
+else $as_nop
   ac_cv_lib_iconv_libiconv_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5
-$as_echo "$ac_cv_lib_iconv_libiconv_open" >&6; }
-if test "x$ac_cv_lib_iconv_libiconv_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv_open" >&5
+printf "%s\n" "$ac_cv_lib_iconv_libiconv_open" >&6; }
+if test "x$ac_cv_lib_iconv_libiconv_open" = xyes
+then :
   AST_ICONV_FOUND=yes
-else
+else $as_nop
   AST_ICONV_FOUND=no
 fi
 
@@ -21538,14 +23473,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
-if test "x$ac_cv_header_iconv_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
+if test "x$ac_cv_header_iconv_h" = xyes
+then :
   ICONV_HEADER_FOUND=1
-else
+else $as_nop
   ICONV_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${ICONV_HEADER_FOUND}" = "x0" ; then
@@ -21578,11 +23513,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_close in -lc" >&5
-$as_echo_n "checking for iconv_close in -lc... " >&6; }
-if ${ac_cv_lib_c_iconv_close+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv_close in -lc" >&5
+printf %s "checking for iconv_close in -lc... " >&6; }
+if test ${ac_cv_lib_c_iconv_close+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21591,32 +23527,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char iconv_close ();
 int
-main ()
+main (void)
 {
 return iconv_close ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_c_iconv_close=yes
-else
+else $as_nop
   ac_cv_lib_c_iconv_close=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_iconv_close" >&5
-$as_echo "$ac_cv_lib_c_iconv_close" >&6; }
-if test "x$ac_cv_lib_c_iconv_close" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_iconv_close" >&5
+printf "%s\n" "$ac_cv_lib_c_iconv_close" >&6; }
+if test "x$ac_cv_lib_c_iconv_close" = xyes
+then :
   AST_ICONV_FOUND=yes
-else
+else $as_nop
   AST_ICONV_FOUND=no
 fi
 
@@ -21635,14 +23570,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ICONV_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
-if test "x$ac_cv_header_iconv_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
+if test "x$ac_cv_header_iconv_h" = xyes
+then :
   ICONV_HEADER_FOUND=1
-else
+else $as_nop
   ICONV_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${ICONV_HEADER_FOUND}" = "x0" ; then
@@ -21676,11 +23611,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icaltimezone_get_utc_timezone in -lical" >&5
-$as_echo_n "checking for icaltimezone_get_utc_timezone in -lical... " >&6; }
-if ${ac_cv_lib_ical_icaltimezone_get_utc_timezone+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icaltimezone_get_utc_timezone in -lical" >&5
+printf %s "checking for icaltimezone_get_utc_timezone in -lical... " >&6; }
+if test ${ac_cv_lib_ical_icaltimezone_get_utc_timezone+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lical ${pbxlibdir} ${PTHREAD_LIBS} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21689,32 +23625,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char icaltimezone_get_utc_timezone ();
 int
-main ()
+main (void)
 {
 return icaltimezone_get_utc_timezone ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ical_icaltimezone_get_utc_timezone=yes
-else
+else $as_nop
   ac_cv_lib_ical_icaltimezone_get_utc_timezone=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ical_icaltimezone_get_utc_timezone" >&5
-$as_echo "$ac_cv_lib_ical_icaltimezone_get_utc_timezone" >&6; }
-if test "x$ac_cv_lib_ical_icaltimezone_get_utc_timezone" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ical_icaltimezone_get_utc_timezone" >&5
+printf "%s\n" "$ac_cv_lib_ical_icaltimezone_get_utc_timezone" >&6; }
+if test "x$ac_cv_lib_ical_icaltimezone_get_utc_timezone" = xyes
+then :
   AST_ICAL_FOUND=yes
-else
+else $as_nop
   AST_ICAL_FOUND=no
 fi
 
@@ -21733,14 +23668,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ICAL_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libical/ical.h" "ac_cv_header_libical_ical_h" "$ac_includes_default"
-if test "x$ac_cv_header_libical_ical_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libical/ical.h" "ac_cv_header_libical_ical_h" "$ac_includes_default"
+if test "x$ac_cv_header_libical_ical_h" = xyes
+then :
   ICAL_HEADER_FOUND=1
-else
+else $as_nop
   ICAL_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${ICAL_HEADER_FOUND}" = "x0" ; then
@@ -21773,11 +23708,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iks_start_sasl in -liksemel" >&5
-$as_echo_n "checking for iks_start_sasl in -liksemel... " >&6; }
-if ${ac_cv_lib_iksemel_iks_start_sasl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iks_start_sasl in -liksemel" >&5
+printf %s "checking for iks_start_sasl in -liksemel... " >&6; }
+if test ${ac_cv_lib_iksemel_iks_start_sasl+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liksemel ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21786,32 +23722,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char iks_start_sasl ();
 int
-main ()
+main (void)
 {
 return iks_start_sasl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_iksemel_iks_start_sasl=yes
-else
+else $as_nop
   ac_cv_lib_iksemel_iks_start_sasl=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iksemel_iks_start_sasl" >&5
-$as_echo "$ac_cv_lib_iksemel_iks_start_sasl" >&6; }
-if test "x$ac_cv_lib_iksemel_iks_start_sasl" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iksemel_iks_start_sasl" >&5
+printf "%s\n" "$ac_cv_lib_iksemel_iks_start_sasl" >&6; }
+if test "x$ac_cv_lib_iksemel_iks_start_sasl" = xyes
+then :
   AST_IKSEMEL_FOUND=yes
-else
+else $as_nop
   AST_IKSEMEL_FOUND=no
 fi
 
@@ -21830,14 +23765,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${IKSEMEL_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "iksemel.h" "ac_cv_header_iksemel_h" "$ac_includes_default"
-if test "x$ac_cv_header_iksemel_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "iksemel.h" "ac_cv_header_iksemel_h" "$ac_includes_default"
+if test "x$ac_cv_header_iksemel_h" = xyes
+then :
   IKSEMEL_HEADER_FOUND=1
-else
+else $as_nop
   IKSEMEL_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${IKSEMEL_HEADER_FOUND}" = "x0" ; then
@@ -21865,8 +23800,8 @@
 		switch_to_system_on_failure="yes"
 	fi
 	if test "${IMAP_TK_DIR}" != "system"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UW IMAP Toolkit c-client library" >&5
-$as_echo_n "checking for UW IMAP Toolkit c-client library... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for UW IMAP Toolkit c-client library" >&5
+printf %s "checking for UW IMAP Toolkit c-client library... " >&6; }
 		if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
       		imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
 		fi
@@ -21923,7 +23858,7 @@
 				{
 				}
 int
-main ()
+main (void)
 {
 
 				MAILSTREAM *foo = mail_open(NULL, "", 0);
@@ -21933,13 +23868,14 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_imap_tk="yes"
-else
+else $as_nop
   ac_cv_imap_tk="no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 		if test "${ac_cv_imap_tk}" = "yes"; then
 			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21991,7 +23927,7 @@
 					{
 					}
 int
-main ()
+main (void)
 {
 
 					long check = mail_expunge_full(NULL, "", 0);
@@ -22001,25 +23937,26 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_imap_tk2006="yes"
-else
+else $as_nop
   ac_cv_imap_tk2006="no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 		fi
 		CPPFLAGS="${saved_cppflags}"
 		LIBS="${saved_libs}"
 		if test "${ac_cv_imap_tk}" = "no"; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 			if test "${switch_to_system_on_failure}" = "yes"; then
 				IMAP_TK_DIR="system"
 			else #This means they specified a directory. Search for a package installation there too
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for system c-client library..." >&5
-$as_echo_n "checking for system c-client library...... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for system c-client library..." >&5
+printf %s "checking for system c-client library...... " >&6; }
 				CPPFLAGS="${saved_cppflags}"
 				LIBS="${saved_libs}"
 				imap_include="-I${IMAP_TK_DIR}/include"
@@ -22076,7 +24013,7 @@
 						{
 						}
 int
-main ()
+main (void)
 {
 
 						MAILSTREAM *foo = mail_open(NULL, "", 0);
@@ -22086,13 +24023,14 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_imap_tk="yes"
-else
+else $as_nop
   ac_cv_imap_tk="no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 				if test "${ac_cv_imap_tk}" = "yes"; then
 					cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22144,7 +24082,7 @@
 							{
 							}
 int
-main ()
+main (void)
 {
 
 							long check = mail_expunge_full(NULL, "", 0);
@@ -22154,13 +24092,14 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_imap_tk2006="yes"
-else
+else $as_nop
   ac_cv_imap_tk2006="no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 				fi
 			fi
@@ -22168,8 +24107,8 @@
 	fi
 	if test "${IMAP_TK_DIR}" = "system"; then
 		#We will enter here if user specified "system" or if any of above checks failed
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for system c-client library..." >&5
-$as_echo_n "checking for system c-client library...... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for system c-client library..." >&5
+printf %s "checking for system c-client library...... " >&6; }
 		CPPFLAGS="${saved_cppflags}"
 		LIBS="${saved_libs}"
 		imap_ldflags=""
@@ -22227,7 +24166,7 @@
 				{
 				}
 int
-main ()
+main (void)
 {
 
 				MAILSTREAM *foo = mail_open(NULL, "", 0);
@@ -22237,13 +24176,14 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_imap_tk="yes"
-else
+else $as_nop
   ac_cv_imap_tk="no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 		if test "${ac_cv_imap_tk}" = "yes"; then
 			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22296,7 +24236,7 @@
 					{
 					}
 int
-main ()
+main (void)
 {
 
 					long check = mail_expunge_full(NULL, "", 0);
@@ -22306,13 +24246,14 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_imap_tk2006="yes"
-else
+else $as_nop
   ac_cv_imap_tk2006="no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 		else #looking in imap directory didn't work, try c-client
 			imap_ldflags=""
@@ -22372,7 +24313,7 @@
 					{
 					}
 int
-main ()
+main (void)
 {
 
 					MAILSTREAM *foo = mail_open(NULL, "", 0);
@@ -22382,13 +24323,14 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_imap_tk="yes"
-else
+else $as_nop
   ac_cv_imap_tk="no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 			if test "${ac_cv_imap_tk}" = "no"; then
 				imap_libs="-lcrypto -lssl -lc-client4"
@@ -22443,7 +24385,7 @@
 						{
 						}
 int
-main ()
+main (void)
 {
 
 						MAILSTREAM *foo = mail_open(NULL, "", 0);
@@ -22453,13 +24395,14 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_imap_tk="yes"
-else
+else $as_nop
   ac_cv_imap_tk="no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 			fi
 			if test "${ac_cv_imap_tk}" = "yes"; then
@@ -22513,7 +24456,7 @@
 						{
 						}
 int
-main ()
+main (void)
 {
 
 						long check = mail_expunge_full(NULL, "", 0);
@@ -22523,34 +24466,35 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_imap_tk2006="yes"
-else
+else $as_nop
   ac_cv_imap_tk2006="no"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 			fi
 		fi
 	fi
 	if test "${ac_cv_imap_tk}" = "yes"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}`
 		IMAP_TK_INCLUDE="${imap_include}"
 		PBX_IMAP_TK=1
 
-$as_echo "#define HAVE_IMAP_TK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP_TK 1" >>confdefs.h
 
 		if test "${ac_cv_imap_tk2006}" = "yes"; then
 
-$as_echo "#define HAVE_IMAP_TK2006 1" >>confdefs.h
+printf "%s\n" "#define HAVE_IMAP_TK2006 1" >>confdefs.h
 
 		fi
 	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 	fi
 	CPPFLAGS="${saved_cppflags}"
 	LIBS="${saved_libs}"
@@ -22570,11 +24514,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -liodbc" >&5
-$as_echo_n "checking for SQLConnect in -liodbc... " >&6; }
-if ${ac_cv_lib_iodbc_SQLConnect+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -liodbc" >&5
+printf %s "checking for SQLConnect in -liodbc... " >&6; }
+if test ${ac_cv_lib_iodbc_SQLConnect+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-liodbc ${pbxlibdir} ${PTHREAD_LIBS} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22583,32 +24528,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char SQLConnect ();
 int
-main ()
+main (void)
 {
 return SQLConnect ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_iodbc_SQLConnect=yes
-else
+else $as_nop
   ac_cv_lib_iodbc_SQLConnect=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iodbc_SQLConnect" >&5
-$as_echo "$ac_cv_lib_iodbc_SQLConnect" >&6; }
-if test "x$ac_cv_lib_iodbc_SQLConnect" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iodbc_SQLConnect" >&5
+printf "%s\n" "$ac_cv_lib_iodbc_SQLConnect" >&6; }
+if test "x$ac_cv_lib_iodbc_SQLConnect" = xyes
+then :
   AST_IODBC_FOUND=yes
-else
+else $as_nop
   AST_IODBC_FOUND=no
 fi
 
@@ -22627,14 +24571,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${IODBC_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "sql.h" "ac_cv_header_sql_h" "$ac_includes_default"
-if test "x$ac_cv_header_sql_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "sql.h" "ac_cv_header_sql_h" "$ac_includes_default"
+if test "x$ac_cv_header_sql_h" = xyes
+then :
   IODBC_HEADER_FOUND=1
-else
+else $as_nop
   IODBC_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${IODBC_HEADER_FOUND}" = "x0" ; then
@@ -22667,11 +24611,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify_init in -lc" >&5
-$as_echo_n "checking for inotify_init in -lc... " >&6; }
-if ${ac_cv_lib_c_inotify_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inotify_init in -lc" >&5
+printf %s "checking for inotify_init in -lc... " >&6; }
+if test ${ac_cv_lib_c_inotify_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22680,32 +24625,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char inotify_init ();
 int
-main ()
+main (void)
 {
 return inotify_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_c_inotify_init=yes
-else
+else $as_nop
   ac_cv_lib_c_inotify_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inotify_init" >&5
-$as_echo "$ac_cv_lib_c_inotify_init" >&6; }
-if test "x$ac_cv_lib_c_inotify_init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inotify_init" >&5
+printf "%s\n" "$ac_cv_lib_c_inotify_init" >&6; }
+if test "x$ac_cv_lib_c_inotify_init" = xyes
+then :
   AST_INOTIFY_FOUND=yes
-else
+else $as_nop
   AST_INOTIFY_FOUND=no
 fi
 
@@ -22724,14 +24668,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${INOTIFY_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_inotify_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_inotify_h" = xyes
+then :
   INOTIFY_HEADER_FOUND=1
-else
+else $as_nop
   INOTIFY_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${INOTIFY_HEADER_FOUND}" = "x0" ; then
@@ -22764,11 +24708,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jack_activate in -ljack" >&5
-$as_echo_n "checking for jack_activate in -ljack... " >&6; }
-if ${ac_cv_lib_jack_jack_activate+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jack_activate in -ljack" >&5
+printf %s "checking for jack_activate in -ljack... " >&6; }
+if test ${ac_cv_lib_jack_jack_activate+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljack ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22777,32 +24722,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char jack_activate ();
 int
-main ()
+main (void)
 {
 return jack_activate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_jack_jack_activate=yes
-else
+else $as_nop
   ac_cv_lib_jack_jack_activate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jack_jack_activate" >&5
-$as_echo "$ac_cv_lib_jack_jack_activate" >&6; }
-if test "x$ac_cv_lib_jack_jack_activate" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jack_jack_activate" >&5
+printf "%s\n" "$ac_cv_lib_jack_jack_activate" >&6; }
+if test "x$ac_cv_lib_jack_jack_activate" = xyes
+then :
   AST_JACK_FOUND=yes
-else
+else $as_nop
   AST_JACK_FOUND=no
 fi
 
@@ -22821,14 +24765,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${JACK_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "jack/jack.h" "ac_cv_header_jack_jack_h" "$ac_includes_default"
-if test "x$ac_cv_header_jack_jack_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "jack/jack.h" "ac_cv_header_jack_jack_h" "$ac_includes_default"
+if test "x$ac_cv_header_jack_jack_h" = xyes
+then :
   JACK_HEADER_FOUND=1
-else
+else $as_nop
   JACK_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${JACK_HEADER_FOUND}" = "x0" ; then
@@ -22862,11 +24806,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kqueue in -lc" >&5
-$as_echo_n "checking for kqueue in -lc... " >&6; }
-if ${ac_cv_lib_c_kqueue+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kqueue in -lc" >&5
+printf %s "checking for kqueue in -lc... " >&6; }
+if test ${ac_cv_lib_c_kqueue+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22875,32 +24820,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char kqueue ();
 int
-main ()
+main (void)
 {
 return kqueue ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_c_kqueue=yes
-else
+else $as_nop
   ac_cv_lib_c_kqueue=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_kqueue" >&5
-$as_echo "$ac_cv_lib_c_kqueue" >&6; }
-if test "x$ac_cv_lib_c_kqueue" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_kqueue" >&5
+printf "%s\n" "$ac_cv_lib_c_kqueue" >&6; }
+if test "x$ac_cv_lib_c_kqueue" = xyes
+then :
   AST_KQUEUE_FOUND=yes
-else
+else $as_nop
   AST_KQUEUE_FOUND=no
 fi
 
@@ -22919,14 +24863,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${KQUEUE_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_event_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_event_h" = xyes
+then :
   KQUEUE_HEADER_FOUND=1
-else
+else $as_nop
   KQUEUE_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${KQUEUE_HEADER_FOUND}" = "x0" ; then
@@ -22946,16 +24890,12 @@
 
 
 # 64-bit version of kevent (from kqueue) on OS X
-for ac_func in kevent64
-do :
-  ac_fn_c_check_func "$LINENO" "kevent64" "ac_cv_func_kevent64"
-if test "x$ac_cv_func_kevent64" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_KEVENT64 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "kevent64" "ac_cv_func_kevent64"
+if test "x$ac_cv_func_kevent64" = xyes
+then :
+  printf "%s\n" "#define HAVE_KEVENT64 1" >>confdefs.h
 
 fi
-done
 
 
 
@@ -22972,11 +24912,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5
-$as_echo_n "checking for ldap_initialize in -lldap... " >&6; }
-if ${ac_cv_lib_ldap_ldap_initialize+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize in -lldap" >&5
+printf %s "checking for ldap_initialize in -lldap... " >&6; }
+if test ${ac_cv_lib_ldap_ldap_initialize+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lldap ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22985,32 +24926,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char ldap_initialize ();
 int
-main ()
+main (void)
 {
 return ldap_initialize ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ldap_ldap_initialize=yes
-else
+else $as_nop
   ac_cv_lib_ldap_ldap_initialize=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5
-$as_echo "$ac_cv_lib_ldap_ldap_initialize" >&6; }
-if test "x$ac_cv_lib_ldap_ldap_initialize" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_initialize" >&5
+printf "%s\n" "$ac_cv_lib_ldap_ldap_initialize" >&6; }
+if test "x$ac_cv_lib_ldap_ldap_initialize" = xyes
+then :
   AST_LDAP_FOUND=yes
-else
+else $as_nop
   AST_LDAP_FOUND=no
 fi
 
@@ -23029,14 +24969,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LDAP_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
-if test "x$ac_cv_header_ldap_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default"
+if test "x$ac_cv_header_ldap_h" = xyes
+then :
   LDAP_HEADER_FOUND=1
-else
+else $as_nop
   LDAP_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${LDAP_HEADER_FOUND}" = "x0" ; then
@@ -23069,11 +25009,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mISDN_open in -lmISDN" >&5
-$as_echo_n "checking for mISDN_open in -lmISDN... " >&6; }
-if ${ac_cv_lib_mISDN_mISDN_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mISDN_open in -lmISDN" >&5
+printf %s "checking for mISDN_open in -lmISDN... " >&6; }
+if test ${ac_cv_lib_mISDN_mISDN_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmISDN ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23082,32 +25023,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char mISDN_open ();
 int
-main ()
+main (void)
 {
 return mISDN_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_mISDN_mISDN_open=yes
-else
+else $as_nop
   ac_cv_lib_mISDN_mISDN_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mISDN_mISDN_open" >&5
-$as_echo "$ac_cv_lib_mISDN_mISDN_open" >&6; }
-if test "x$ac_cv_lib_mISDN_mISDN_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mISDN_mISDN_open" >&5
+printf "%s\n" "$ac_cv_lib_mISDN_mISDN_open" >&6; }
+if test "x$ac_cv_lib_mISDN_mISDN_open" = xyes
+then :
   AST_MISDN_FOUND=yes
-else
+else $as_nop
   AST_MISDN_FOUND=no
 fi
 
@@ -23126,14 +25066,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${MISDN_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "mISDNuser/mISDNlib.h" "ac_cv_header_mISDNuser_mISDNlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_mISDNuser_mISDNlib_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "mISDNuser/mISDNlib.h" "ac_cv_header_mISDNuser_mISDNlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_mISDNuser_mISDNlib_h" = xyes
+then :
   MISDN_HEADER_FOUND=1
-else
+else $as_nop
   MISDN_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${MISDN_HEADER_FOUND}" = "x0" ; then
@@ -23167,11 +25107,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for init_manager in -lisdnnet" >&5
-$as_echo_n "checking for init_manager in -lisdnnet... " >&6; }
-if ${ac_cv_lib_isdnnet_init_manager+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for init_manager in -lisdnnet" >&5
+printf %s "checking for init_manager in -lisdnnet... " >&6; }
+if test ${ac_cv_lib_isdnnet_init_manager+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lisdnnet ${pbxlibdir} -lmISDN -lpthread $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23180,32 +25121,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char init_manager ();
 int
-main ()
+main (void)
 {
 return init_manager ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_isdnnet_init_manager=yes
-else
+else $as_nop
   ac_cv_lib_isdnnet_init_manager=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_isdnnet_init_manager" >&5
-$as_echo "$ac_cv_lib_isdnnet_init_manager" >&6; }
-if test "x$ac_cv_lib_isdnnet_init_manager" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_isdnnet_init_manager" >&5
+printf "%s\n" "$ac_cv_lib_isdnnet_init_manager" >&6; }
+if test "x$ac_cv_lib_isdnnet_init_manager" = xyes
+then :
   AST_ISDNNET_FOUND=yes
-else
+else $as_nop
   AST_ISDNNET_FOUND=no
 fi
 
@@ -23224,14 +25164,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ISDNNET_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "mISDNuser/isdn_net.h" "ac_cv_header_mISDNuser_isdn_net_h" "$ac_includes_default"
-if test "x$ac_cv_header_mISDNuser_isdn_net_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "mISDNuser/isdn_net.h" "ac_cv_header_mISDNuser_isdn_net_h" "$ac_includes_default"
+if test "x$ac_cv_header_mISDNuser_isdn_net_h" = xyes
+then :
   ISDNNET_HEADER_FOUND=1
-else
+else $as_nop
   ISDNNET_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${ISDNNET_HEADER_FOUND}" = "x0" ; then
@@ -23263,11 +25203,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for encodeFac in -lsuppserv" >&5
-$as_echo_n "checking for encodeFac in -lsuppserv... " >&6; }
-if ${ac_cv_lib_suppserv_encodeFac+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for encodeFac in -lsuppserv" >&5
+printf %s "checking for encodeFac in -lsuppserv... " >&6; }
+if test ${ac_cv_lib_suppserv_encodeFac+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsuppserv ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23276,32 +25217,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char encodeFac ();
 int
-main ()
+main (void)
 {
 return encodeFac ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_suppserv_encodeFac=yes
-else
+else $as_nop
   ac_cv_lib_suppserv_encodeFac=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_suppserv_encodeFac" >&5
-$as_echo "$ac_cv_lib_suppserv_encodeFac" >&6; }
-if test "x$ac_cv_lib_suppserv_encodeFac" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_suppserv_encodeFac" >&5
+printf "%s\n" "$ac_cv_lib_suppserv_encodeFac" >&6; }
+if test "x$ac_cv_lib_suppserv_encodeFac" = xyes
+then :
   AST_SUPPSERV_FOUND=yes
-else
+else $as_nop
   AST_SUPPSERV_FOUND=no
 fi
 
@@ -23320,14 +25260,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SUPPSERV_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "mISDNuser/suppserv.h" "ac_cv_header_mISDNuser_suppserv_h" "$ac_includes_default"
-if test "x$ac_cv_header_mISDNuser_suppserv_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "mISDNuser/suppserv.h" "ac_cv_header_mISDNuser_suppserv_h" "$ac_includes_default"
+if test "x$ac_cv_header_mISDNuser_suppserv_h" = xyes
+then :
   SUPPSERV_HEADER_FOUND=1
-else
+else $as_nop
   SUPPSERV_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SUPPSERV_HEADER_FOUND}" = "x0" ; then
@@ -23347,8 +25287,8 @@
 
 
     if test "x${PBX_MISDN_FAC_RESULT}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fac_RESULT in mISDNuser/suppserv.h" >&5
-$as_echo_n "checking for Fac_RESULT in mISDNuser/suppserv.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fac_RESULT in mISDNuser/suppserv.h" >&5
+printf %s "checking for Fac_RESULT in mISDNuser/suppserv.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${MISDN_FAC_RESULT_DIR}" != "x"; then
 	    MISDN_FAC_RESULT_INCLUDE="-I${MISDN_FAC_RESULT_DIR}/include"
@@ -23359,7 +25299,7 @@
 /* end confdefs.h.  */
  #include <mISDNuser/suppserv.h>
 int
-main ()
+main (void)
 {
 #if defined(Fac_RESULT)
 				int foo = 0;
@@ -23372,29 +25312,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_MISDN_FAC_RESULT=1
 
-$as_echo "#define HAVE_MISDN_FAC_RESULT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MISDN_FAC_RESULT 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_MISDN_FAC_ERROR}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fac_ERROR in mISDNuser/suppserv.h" >&5
-$as_echo_n "checking for Fac_ERROR in mISDNuser/suppserv.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fac_ERROR in mISDNuser/suppserv.h" >&5
+printf %s "checking for Fac_ERROR in mISDNuser/suppserv.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${MISDN_FAC_ERROR_DIR}" != "x"; then
 	    MISDN_FAC_ERROR_INCLUDE="-I${MISDN_FAC_ERROR_DIR}/include"
@@ -23405,7 +25346,7 @@
 /* end confdefs.h.  */
  #include <mISDNuser/suppserv.h>
 int
-main ()
+main (void)
 {
 #if defined(Fac_ERROR)
 				int foo = 0;
@@ -23418,40 +25359,40 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_MISDN_FAC_ERROR=1
 
-$as_echo "#define HAVE_MISDN_FAC_ERROR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MISDN_FAC_ERROR 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
-   ac_fn_c_check_header_mongrel "$LINENO" "linux/mISDNdsp.h" "ac_cv_header_linux_mISDNdsp_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_mISDNdsp_h" = xyes; then :
+   ac_fn_c_check_header_compile "$LINENO" "linux/mISDNdsp.h" "ac_cv_header_linux_mISDNdsp_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_mISDNdsp_h" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define MISDN_1_2 1
-_ACEOF
+printf "%s\n" "#define MISDN_1_2 1" >>confdefs.h
 
 fi
 
-
    ac_fn_c_check_member "$LINENO" "Q931_info_t" "redirect_dn" "ac_cv_member_Q931_info_t_redirect_dn" "#include <mISDNuser/mISDNlib.h>
 "
-if test "x$ac_cv_member_Q931_info_t_redirect_dn" = xyes; then :
+if test "x$ac_cv_member_Q931_info_t_redirect_dn" = xyes
+then :
 
-else
+else $as_nop
   PBX_MISDN=0
 fi
 
@@ -23464,11 +25405,12 @@
 		if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mysql_config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mysql_config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CONFIG_MYSQLCLIENT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CONFIG_MYSQLCLIENT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CONFIG_MYSQLCLIENT in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CONFIG_MYSQLCLIENT="$CONFIG_MYSQLCLIENT" # Let the user override the test with a path.
@@ -23479,11 +25421,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CONFIG_MYSQLCLIENT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CONFIG_MYSQLCLIENT="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23495,11 +25441,11 @@
 fi
 CONFIG_MYSQLCLIENT=$ac_cv_path_CONFIG_MYSQLCLIENT
 if test -n "$CONFIG_MYSQLCLIENT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_MYSQLCLIENT" >&5
-$as_echo "$CONFIG_MYSQLCLIENT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CONFIG_MYSQLCLIENT" >&5
+printf "%s\n" "$CONFIG_MYSQLCLIENT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -23508,11 +25454,12 @@
   ac_pt_CONFIG_MYSQLCLIENT=$CONFIG_MYSQLCLIENT
   # Extract the first word of "mysql_config", so it can be a program name with args.
 set dummy mysql_config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_CONFIG_MYSQLCLIENT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_CONFIG_MYSQLCLIENT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_CONFIG_MYSQLCLIENT in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_CONFIG_MYSQLCLIENT="$ac_pt_CONFIG_MYSQLCLIENT" # Let the user override the test with a path.
@@ -23523,11 +25470,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_CONFIG_MYSQLCLIENT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_CONFIG_MYSQLCLIENT="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23539,11 +25490,11 @@
 fi
 ac_pt_CONFIG_MYSQLCLIENT=$ac_cv_path_ac_pt_CONFIG_MYSQLCLIENT
 if test -n "$ac_pt_CONFIG_MYSQLCLIENT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_MYSQLCLIENT" >&5
-$as_echo "$ac_pt_CONFIG_MYSQLCLIENT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_MYSQLCLIENT" >&5
+printf "%s\n" "$ac_pt_CONFIG_MYSQLCLIENT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_CONFIG_MYSQLCLIENT" = x; then
@@ -23551,8 +25502,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CONFIG_MYSQLCLIENT=$ac_pt_CONFIG_MYSQLCLIENT
@@ -23571,7 +25522,7 @@
 
 				PBX_MYSQLCLIENT=1
 
-$as_echo "#define HAVE_MYSQLCLIENT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MYSQLCLIENT 1" >>confdefs.h
 
 
 		fi
@@ -23579,57 +25530,59 @@
 
 
 if test "${PBX_MYSQLCLIENT}" = 1; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL client bool support" >&5
-$as_echo_n "checking for MySQL client bool support... " >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL client bool support" >&5
+printf %s "checking for MySQL client bool support... " >&6; }
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <mysql/mysql.h>
 int
-main ()
+main (void)
 {
 bool test = 1;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_MYSQLCLIENT_BOOL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MYSQLCLIENT_BOOL 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL client my_bool support" >&5
-$as_echo_n "checking for MySQL client my_bool support... " >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL client my_bool support" >&5
+printf %s "checking for MySQL client my_bool support... " >&6; }
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <mysql/mysql.h>
 int
-main ()
+main (void)
 {
 my_bool test = 1;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_MYSQLCLIENT_MY_BOOL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MYSQLCLIENT_MY_BOOL 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
@@ -23647,11 +25600,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nbs_connect in -lnbs" >&5
-$as_echo_n "checking for nbs_connect in -lnbs... " >&6; }
-if ${ac_cv_lib_nbs_nbs_connect+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nbs_connect in -lnbs" >&5
+printf %s "checking for nbs_connect in -lnbs... " >&6; }
+if test ${ac_cv_lib_nbs_nbs_connect+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnbs ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23660,32 +25614,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char nbs_connect ();
 int
-main ()
+main (void)
 {
 return nbs_connect ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_nbs_nbs_connect=yes
-else
+else $as_nop
   ac_cv_lib_nbs_nbs_connect=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nbs_nbs_connect" >&5
-$as_echo "$ac_cv_lib_nbs_nbs_connect" >&6; }
-if test "x$ac_cv_lib_nbs_nbs_connect" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nbs_nbs_connect" >&5
+printf "%s\n" "$ac_cv_lib_nbs_nbs_connect" >&6; }
+if test "x$ac_cv_lib_nbs_nbs_connect" = xyes
+then :
   AST_NBS_FOUND=yes
-else
+else $as_nop
   AST_NBS_FOUND=no
 fi
 
@@ -23704,14 +25657,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${NBS_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "nbs.h" "ac_cv_header_nbs_h" "$ac_includes_default"
-if test "x$ac_cv_header_nbs_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "nbs.h" "ac_cv_header_nbs_h" "$ac_includes_default"
+if test "x$ac_cv_header_nbs_h" = xyes
+then :
   NBS_HEADER_FOUND=1
-else
+else $as_nop
   NBS_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${NBS_HEADER_FOUND}" = "x0" ; then
@@ -23736,11 +25689,12 @@
 		if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}neon-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}neon-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CONFIG_NEON+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CONFIG_NEON+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CONFIG_NEON in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CONFIG_NEON="$CONFIG_NEON" # Let the user override the test with a path.
@@ -23751,11 +25705,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CONFIG_NEON="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CONFIG_NEON="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23767,11 +25725,11 @@
 fi
 CONFIG_NEON=$ac_cv_path_CONFIG_NEON
 if test -n "$CONFIG_NEON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_NEON" >&5
-$as_echo "$CONFIG_NEON" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CONFIG_NEON" >&5
+printf "%s\n" "$CONFIG_NEON" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -23780,11 +25738,12 @@
   ac_pt_CONFIG_NEON=$CONFIG_NEON
   # Extract the first word of "neon-config", so it can be a program name with args.
 set dummy neon-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_CONFIG_NEON+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_CONFIG_NEON+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_CONFIG_NEON in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_CONFIG_NEON="$ac_pt_CONFIG_NEON" # Let the user override the test with a path.
@@ -23795,11 +25754,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_CONFIG_NEON="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_CONFIG_NEON="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23811,11 +25774,11 @@
 fi
 ac_pt_CONFIG_NEON=$ac_cv_path_ac_pt_CONFIG_NEON
 if test -n "$ac_pt_CONFIG_NEON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_NEON" >&5
-$as_echo "$ac_pt_CONFIG_NEON" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_NEON" >&5
+printf "%s\n" "$ac_pt_CONFIG_NEON" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_CONFIG_NEON" = x; then
@@ -23823,8 +25786,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CONFIG_NEON=$ac_pt_CONFIG_NEON
@@ -23843,7 +25806,7 @@
 
 				PBX_NEON=1
 
-$as_echo "#define HAVE_NEON 1" >>confdefs.h
+printf "%s\n" "#define HAVE_NEON 1" >>confdefs.h
 
 
 		fi
@@ -23856,11 +25819,12 @@
 		if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}neon-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}neon-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CONFIG_NEON29+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CONFIG_NEON29+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CONFIG_NEON29 in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CONFIG_NEON29="$CONFIG_NEON29" # Let the user override the test with a path.
@@ -23871,11 +25835,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CONFIG_NEON29="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CONFIG_NEON29="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23887,11 +25855,11 @@
 fi
 CONFIG_NEON29=$ac_cv_path_CONFIG_NEON29
 if test -n "$CONFIG_NEON29"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_NEON29" >&5
-$as_echo "$CONFIG_NEON29" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CONFIG_NEON29" >&5
+printf "%s\n" "$CONFIG_NEON29" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -23900,11 +25868,12 @@
   ac_pt_CONFIG_NEON29=$CONFIG_NEON29
   # Extract the first word of "neon-config", so it can be a program name with args.
 set dummy neon-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_CONFIG_NEON29+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_CONFIG_NEON29+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_CONFIG_NEON29 in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_CONFIG_NEON29="$ac_pt_CONFIG_NEON29" # Let the user override the test with a path.
@@ -23915,11 +25884,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_CONFIG_NEON29="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_CONFIG_NEON29="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23931,11 +25904,11 @@
 fi
 ac_pt_CONFIG_NEON29=$ac_cv_path_ac_pt_CONFIG_NEON29
 if test -n "$ac_pt_CONFIG_NEON29"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_NEON29" >&5
-$as_echo "$ac_pt_CONFIG_NEON29" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_NEON29" >&5
+printf "%s\n" "$ac_pt_CONFIG_NEON29" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_CONFIG_NEON29" = x; then
@@ -23943,8 +25916,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CONFIG_NEON29=$ac_pt_CONFIG_NEON29
@@ -23971,7 +25944,7 @@
 /* end confdefs.h.  */
   #include <ne_auth.h>
 int
-main ()
+main (void)
 {
  #ifndef NE_AUTH_NTLM
 #error Need libneon >= 0.29.0
@@ -23980,12 +25953,13 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
    PBX_NEON29=1
-$as_echo "#define HAVE_NEON29 1" >>confdefs.h
+printf "%s\n" "#define HAVE_NEON29 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 				CPPFLAGS="${saved_cppflags}"
 				LIBS="${saved_libs}"
@@ -23998,17 +25972,17 @@
    if test "x${PBX_NETSNMP}" != "x1" -a "${USE_NETSNMP}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETSNMP" >&5
-$as_echo_n "checking for NETSNMP... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for netsnmp-agent" >&5
+printf %s "checking for netsnmp-agent... " >&6; }
 
 if test -n "$NETSNMP_CFLAGS"; then
     pkg_cv_NETSNMP_CFLAGS="$NETSNMP_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"netsnmp-agent\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"netsnmp-agent\""; } >&5
   ($PKG_CONFIG --exists --print-errors "netsnmp-agent") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_NETSNMP_CFLAGS=`$PKG_CONFIG --cflags "netsnmp-agent" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -24022,10 +25996,10 @@
     pkg_cv_NETSNMP_LIBS="$NETSNMP_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"netsnmp-agent\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"netsnmp-agent\""; } >&5
   ($PKG_CONFIG --exists --print-errors "netsnmp-agent") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_NETSNMP_LIBS=`$PKG_CONFIG --libs "netsnmp-agent" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -24039,8 +26013,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -24060,8 +26034,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_NETSNMP=0
 
@@ -24069,14 +26043,14 @@
 else
 	NETSNMP_CFLAGS=$pkg_cv_NETSNMP_CFLAGS
 	NETSNMP_LIBS=$pkg_cv_NETSNMP_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_NETSNMP=1
             NETSNMP_INCLUDE=$(echo ${NETSNMP_CFLAGS} | $SED -e "s|-std=c99||g")
             NETSNMP_LIB="$NETSNMP_LIBS"
 
-$as_echo "#define HAVE_NETSNMP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_NETSNMP 1" >>confdefs.h
 
 
 fi
@@ -24088,11 +26062,12 @@
 		if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}net-snmp-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}net-snmp-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CONFIG_NETSNMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CONFIG_NETSNMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CONFIG_NETSNMP in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CONFIG_NETSNMP="$CONFIG_NETSNMP" # Let the user override the test with a path.
@@ -24103,11 +26078,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CONFIG_NETSNMP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CONFIG_NETSNMP="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -24119,11 +26098,11 @@
 fi
 CONFIG_NETSNMP=$ac_cv_path_CONFIG_NETSNMP
 if test -n "$CONFIG_NETSNMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_NETSNMP" >&5
-$as_echo "$CONFIG_NETSNMP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CONFIG_NETSNMP" >&5
+printf "%s\n" "$CONFIG_NETSNMP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -24132,11 +26111,12 @@
   ac_pt_CONFIG_NETSNMP=$CONFIG_NETSNMP
   # Extract the first word of "net-snmp-config", so it can be a program name with args.
 set dummy net-snmp-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_CONFIG_NETSNMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_CONFIG_NETSNMP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_CONFIG_NETSNMP in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_CONFIG_NETSNMP="$ac_pt_CONFIG_NETSNMP" # Let the user override the test with a path.
@@ -24147,11 +26127,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_CONFIG_NETSNMP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_CONFIG_NETSNMP="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -24163,11 +26147,11 @@
 fi
 ac_pt_CONFIG_NETSNMP=$ac_cv_path_ac_pt_CONFIG_NETSNMP
 if test -n "$ac_pt_CONFIG_NETSNMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_NETSNMP" >&5
-$as_echo "$ac_pt_CONFIG_NETSNMP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_NETSNMP" >&5
+printf "%s\n" "$ac_pt_CONFIG_NETSNMP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_CONFIG_NETSNMP" = x; then
@@ -24175,8 +26159,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CONFIG_NETSNMP=$ac_pt_CONFIG_NETSNMP
@@ -24205,19 +26189,20 @@
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 int
-main ()
+main (void)
 {
  int callback = snmp_register_callback(0, 0, NULL, NULL);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
    PBX_NETSNMP=1
-$as_echo "#define HAVE_NETSNMP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_NETSNMP 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 				CPPFLAGS="${saved_cppflags}"
 				LIBS="${saved_libs}"
@@ -24240,11 +26225,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for newtBell in -lnewt" >&5
-$as_echo_n "checking for newtBell in -lnewt... " >&6; }
-if ${ac_cv_lib_newt_newtBell+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for newtBell in -lnewt" >&5
+printf %s "checking for newtBell in -lnewt... " >&6; }
+if test ${ac_cv_lib_newt_newtBell+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnewt ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24253,32 +26239,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char newtBell ();
 int
-main ()
+main (void)
 {
 return newtBell ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_newt_newtBell=yes
-else
+else $as_nop
   ac_cv_lib_newt_newtBell=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_newt_newtBell" >&5
-$as_echo "$ac_cv_lib_newt_newtBell" >&6; }
-if test "x$ac_cv_lib_newt_newtBell" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_newt_newtBell" >&5
+printf "%s\n" "$ac_cv_lib_newt_newtBell" >&6; }
+if test "x$ac_cv_lib_newt_newtBell" = xyes
+then :
   AST_NEWT_FOUND=yes
-else
+else $as_nop
   AST_NEWT_FOUND=no
 fi
 
@@ -24297,14 +26282,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${NEWT_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "newt.h" "ac_cv_header_newt_h" "$ac_includes_default"
-if test "x$ac_cv_header_newt_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "newt.h" "ac_cv_header_newt_h" "$ac_includes_default"
+if test "x$ac_cv_header_newt_h" = xyes
+then :
   NEWT_HEADER_FOUND=1
-else
+else $as_nop
   NEWT_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${NEWT_HEADER_FOUND}" = "x0" ; then
@@ -24338,11 +26323,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ub_ctx_delete in -lunbound" >&5
-$as_echo_n "checking for ub_ctx_delete in -lunbound... " >&6; }
-if ${ac_cv_lib_unbound_ub_ctx_delete+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ub_ctx_delete in -lunbound" >&5
+printf %s "checking for ub_ctx_delete in -lunbound... " >&6; }
+if test ${ac_cv_lib_unbound_ub_ctx_delete+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lunbound ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24351,32 +26337,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char ub_ctx_delete ();
 int
-main ()
+main (void)
 {
 return ub_ctx_delete ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_unbound_ub_ctx_delete=yes
-else
+else $as_nop
   ac_cv_lib_unbound_ub_ctx_delete=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unbound_ub_ctx_delete" >&5
-$as_echo "$ac_cv_lib_unbound_ub_ctx_delete" >&6; }
-if test "x$ac_cv_lib_unbound_ub_ctx_delete" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unbound_ub_ctx_delete" >&5
+printf "%s\n" "$ac_cv_lib_unbound_ub_ctx_delete" >&6; }
+if test "x$ac_cv_lib_unbound_ub_ctx_delete" = xyes
+then :
   AST_UNBOUND_FOUND=yes
-else
+else $as_nop
   AST_UNBOUND_FOUND=no
 fi
 
@@ -24395,21 +26380,21 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${UNBOUND_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "unbound.h" "ac_cv_header_unbound_h" "$ac_includes_default"
-if test "x$ac_cv_header_unbound_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "unbound.h" "ac_cv_header_unbound_h" "$ac_includes_default"
+if test "x$ac_cv_header_unbound_h" = xyes
+then :
   UNBOUND_HEADER_FOUND=1
-else
+else $as_nop
   UNBOUND_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
    fi
    # Validate the package with the supplied code.
    if test "x${UNBOUND_HEADER_FOUND}" = "x1" ; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unbound version >= 1.5" >&5
-$as_echo_n "checking for unbound version >= 1.5... " >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unbound version >= 1.5" >&5
+printf %s "checking for unbound version >= 1.5... " >&6; }
       ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
       CPPFLAGS="${CPPFLAGS} ${UNBOUND_INCLUDE}"
       ast_ext_lib_check_saved_LIBS="${LIBS}"
@@ -24419,7 +26404,7 @@
 
       #include <unbound.h>
 int
-main ()
+main (void)
 {
 
             #if (UNBOUND_VERSION_MAJOR < 1 || (UNBOUND_VERSION_MAJOR == 1 && UNBOUND_VERSION_MINOR < 5 ))
@@ -24432,32 +26417,33 @@
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
             if test "x${cross_compiling}" = "xyes" ; then
                UNBOUND_VALIDATED="1"
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (guessed for cross-compile)" >&5
-$as_echo "yes (guessed for cross-compile)" >&6; }
+               { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (guessed for cross-compile)" >&5
+printf "%s\n" "yes (guessed for cross-compile)" >&6; }
             else
                ./conftest$EXEEXT
                if test $? -eq 0 ; then
                   UNBOUND_VALIDATED="1"
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+                  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
                else
-                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+                  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
                fi
             fi
 
-else
+else $as_nop
 
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
       LIBS="${ast_ext_lib_check_saved_LIBS}"
@@ -24492,11 +26478,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -lodbc" >&5
-$as_echo_n "checking for SQLConnect in -lodbc... " >&6; }
-if ${ac_cv_lib_odbc_SQLConnect+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -lodbc" >&5
+printf %s "checking for SQLConnect in -lodbc... " >&6; }
+if test ${ac_cv_lib_odbc_SQLConnect+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lodbc ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24505,32 +26492,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char SQLConnect ();
 int
-main ()
+main (void)
 {
 return SQLConnect ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_odbc_SQLConnect=yes
-else
+else $as_nop
   ac_cv_lib_odbc_SQLConnect=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc_SQLConnect" >&5
-$as_echo "$ac_cv_lib_odbc_SQLConnect" >&6; }
-if test "x$ac_cv_lib_odbc_SQLConnect" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc_SQLConnect" >&5
+printf "%s\n" "$ac_cv_lib_odbc_SQLConnect" >&6; }
+if test "x$ac_cv_lib_odbc_SQLConnect" = xyes
+then :
   AST_UNIXODBC_FOUND=yes
-else
+else $as_nop
   AST_UNIXODBC_FOUND=no
 fi
 
@@ -24549,14 +26535,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${UNIXODBC_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "sql.h" "ac_cv_header_sql_h" "$ac_includes_default"
-if test "x$ac_cv_header_sql_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "sql.h" "ac_cv_header_sql_h" "$ac_includes_default"
+if test "x$ac_cv_header_sql_h" = xyes
+then :
   UNIXODBC_HEADER_FOUND=1
-else
+else $as_nop
   UNIXODBC_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${UNIXODBC_HEADER_FOUND}" = "x0" ; then
@@ -24589,11 +26575,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ogg_stream_init in -logg" >&5
-$as_echo_n "checking for ogg_stream_init in -logg... " >&6; }
-if ${ac_cv_lib_ogg_ogg_stream_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg_stream_init in -logg" >&5
+printf %s "checking for ogg_stream_init in -logg... " >&6; }
+if test ${ac_cv_lib_ogg_ogg_stream_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-logg ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24601,33 +26588,32 @@
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
+   builtin and then its argument prototype would still apply.  */
 char ogg_stream_init ();
 int
-main ()
+main (void)
 {
 return ogg_stream_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ogg_ogg_stream_init=yes
-else
+else $as_nop
   ac_cv_lib_ogg_ogg_stream_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_ogg_stream_init" >&5
-$as_echo "$ac_cv_lib_ogg_ogg_stream_init" >&6; }
-if test "x$ac_cv_lib_ogg_ogg_stream_init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ogg_ogg_stream_init" >&5
+printf "%s\n" "$ac_cv_lib_ogg_ogg_stream_init" >&6; }
+if test "x$ac_cv_lib_ogg_ogg_stream_init" = xyes
+then :
   AST_OGG_FOUND=yes
-else
+else $as_nop
   AST_OGG_FOUND=no
 fi
 
@@ -24646,14 +26632,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OGG_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "ogg/ogg.h" "ac_cv_header_ogg_ogg_h" "$ac_includes_default"
-if test "x$ac_cv_header_ogg_ogg_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "ogg/ogg.h" "ac_cv_header_ogg_ogg_h" "$ac_includes_default"
+if test "x$ac_cv_header_ogg_ogg_h" = xyes
+then :
   OGG_HEADER_FOUND=1
-else
+else $as_nop
   OGG_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${OGG_HEADER_FOUND}" = "x0" ; then
@@ -24687,11 +26673,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lexecinfo" >&5
-$as_echo_n "checking for backtrace in -lexecinfo... " >&6; }
-if ${ac_cv_lib_execinfo_backtrace+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lexecinfo" >&5
+printf %s "checking for backtrace in -lexecinfo... " >&6; }
+if test ${ac_cv_lib_execinfo_backtrace+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lexecinfo ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24700,32 +26687,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char backtrace ();
 int
-main ()
+main (void)
 {
 return backtrace ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_execinfo_backtrace=yes
-else
+else $as_nop
   ac_cv_lib_execinfo_backtrace=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_execinfo_backtrace" >&5
-$as_echo "$ac_cv_lib_execinfo_backtrace" >&6; }
-if test "x$ac_cv_lib_execinfo_backtrace" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_execinfo_backtrace" >&5
+printf "%s\n" "$ac_cv_lib_execinfo_backtrace" >&6; }
+if test "x$ac_cv_lib_execinfo_backtrace" = xyes
+then :
   AST_BKTR_FOUND=yes
-else
+else $as_nop
   AST_BKTR_FOUND=no
 fi
 
@@ -24744,14 +26730,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
-if test "x$ac_cv_header_execinfo_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
+if test "x$ac_cv_header_execinfo_h" = xyes
+then :
   BKTR_HEADER_FOUND=1
-else
+else $as_nop
   BKTR_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${BKTR_HEADER_FOUND}" = "x0" ; then
@@ -24784,11 +26770,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lc" >&5
-$as_echo_n "checking for backtrace in -lc... " >&6; }
-if ${ac_cv_lib_c_backtrace+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lc" >&5
+printf %s "checking for backtrace in -lc... " >&6; }
+if test ${ac_cv_lib_c_backtrace+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24797,32 +26784,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char backtrace ();
 int
-main ()
+main (void)
 {
 return backtrace ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_c_backtrace=yes
-else
+else $as_nop
   ac_cv_lib_c_backtrace=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_backtrace" >&5
-$as_echo "$ac_cv_lib_c_backtrace" >&6; }
-if test "x$ac_cv_lib_c_backtrace" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_backtrace" >&5
+printf "%s\n" "$ac_cv_lib_c_backtrace" >&6; }
+if test "x$ac_cv_lib_c_backtrace" = xyes
+then :
   AST_BKTR_FOUND=yes
-else
+else $as_nop
   AST_BKTR_FOUND=no
 fi
 
@@ -24841,14 +26827,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${BKTR_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
-if test "x$ac_cv_header_execinfo_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
+if test "x$ac_cv_header_execinfo_h" = xyes
+then :
   BKTR_HEADER_FOUND=1
-else
+else $as_nop
   BKTR_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${BKTR_HEADER_FOUND}" = "x0" ; then
@@ -24881,11 +26867,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ba2str in -lbluetooth" >&5
-$as_echo_n "checking for ba2str in -lbluetooth... " >&6; }
-if ${ac_cv_lib_bluetooth_ba2str+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ba2str in -lbluetooth" >&5
+printf %s "checking for ba2str in -lbluetooth... " >&6; }
+if test ${ac_cv_lib_bluetooth_ba2str+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbluetooth ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24894,32 +26881,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char ba2str ();
 int
-main ()
+main (void)
 {
 return ba2str ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_bluetooth_ba2str=yes
-else
+else $as_nop
   ac_cv_lib_bluetooth_ba2str=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bluetooth_ba2str" >&5
-$as_echo "$ac_cv_lib_bluetooth_ba2str" >&6; }
-if test "x$ac_cv_lib_bluetooth_ba2str" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bluetooth_ba2str" >&5
+printf "%s\n" "$ac_cv_lib_bluetooth_ba2str" >&6; }
+if test "x$ac_cv_lib_bluetooth_ba2str" = xyes
+then :
   AST_BLUETOOTH_FOUND=yes
-else
+else $as_nop
   AST_BLUETOOTH_FOUND=no
 fi
 
@@ -24938,14 +26924,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${BLUETOOTH_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "bluetooth/bluetooth.h" "ac_cv_header_bluetooth_bluetooth_h" "$ac_includes_default"
-if test "x$ac_cv_header_bluetooth_bluetooth_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "bluetooth/bluetooth.h" "ac_cv_header_bluetooth_bluetooth_h" "$ac_includes_default"
+if test "x$ac_cv_header_bluetooth_bluetooth_h" = xyes
+then :
   BLUETOOTH_HEADER_FOUND=1
-else
+else $as_nop
   BLUETOOTH_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${BLUETOOTH_HEADER_FOUND}" = "x0" ; then
@@ -24978,11 +26964,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bs_version in -lbeanstalk" >&5
-$as_echo_n "checking for bs_version in -lbeanstalk... " >&6; }
-if ${ac_cv_lib_beanstalk_bs_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bs_version in -lbeanstalk" >&5
+printf %s "checking for bs_version in -lbeanstalk... " >&6; }
+if test ${ac_cv_lib_beanstalk_bs_version+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbeanstalk ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24991,32 +26978,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char bs_version ();
 int
-main ()
+main (void)
 {
 return bs_version ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_beanstalk_bs_version=yes
-else
+else $as_nop
   ac_cv_lib_beanstalk_bs_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_beanstalk_bs_version" >&5
-$as_echo "$ac_cv_lib_beanstalk_bs_version" >&6; }
-if test "x$ac_cv_lib_beanstalk_bs_version" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_beanstalk_bs_version" >&5
+printf "%s\n" "$ac_cv_lib_beanstalk_bs_version" >&6; }
+if test "x$ac_cv_lib_beanstalk_bs_version" = xyes
+then :
   AST_BEANSTALK_FOUND=yes
-else
+else $as_nop
   AST_BEANSTALK_FOUND=no
 fi
 
@@ -25035,14 +27021,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${BEANSTALK_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "beanstalk.h" "ac_cv_header_beanstalk_h" "$ac_includes_default"
-if test "x$ac_cv_header_beanstalk_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "beanstalk.h" "ac_cv_header_beanstalk_h" "$ac_includes_default"
+if test "x$ac_cv_header_beanstalk_h" = xyes
+then :
   BEANSTALK_HEADER_FOUND=1
-else
+else $as_nop
   BEANSTALK_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${BEANSTALK_HEADER_FOUND}" = "x0" ; then
@@ -25090,14 +27076,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "linux/soundcard.h" "ac_cv_header_linux_soundcard_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_soundcard_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "linux/soundcard.h" "ac_cv_header_linux_soundcard_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_soundcard_h" = xyes
+then :
   OSS_HEADER_FOUND=1
-else
+else $as_nop
   OSS_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${OSS_HEADER_FOUND}" = "x0" ; then
@@ -25146,14 +27132,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_soundcard_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_soundcard_h" = xyes
+then :
   OSS_HEADER_FOUND=1
-else
+else $as_nop
   OSS_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${OSS_HEADER_FOUND}" = "x0" ; then
@@ -25188,11 +27174,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for oss_ioctl_mixer in -lossaudio" >&5
-$as_echo_n "checking for oss_ioctl_mixer in -lossaudio... " >&6; }
-if ${ac_cv_lib_ossaudio_oss_ioctl_mixer+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for oss_ioctl_mixer in -lossaudio" >&5
+printf %s "checking for oss_ioctl_mixer in -lossaudio... " >&6; }
+if test ${ac_cv_lib_ossaudio_oss_ioctl_mixer+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lossaudio ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25201,32 +27188,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char oss_ioctl_mixer ();
 int
-main ()
+main (void)
 {
 return oss_ioctl_mixer ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ossaudio_oss_ioctl_mixer=yes
-else
+else $as_nop
   ac_cv_lib_ossaudio_oss_ioctl_mixer=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio_oss_ioctl_mixer" >&5
-$as_echo "$ac_cv_lib_ossaudio_oss_ioctl_mixer" >&6; }
-if test "x$ac_cv_lib_ossaudio_oss_ioctl_mixer" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio_oss_ioctl_mixer" >&5
+printf "%s\n" "$ac_cv_lib_ossaudio_oss_ioctl_mixer" >&6; }
+if test "x$ac_cv_lib_ossaudio_oss_ioctl_mixer" = xyes
+then :
   AST_OSS_FOUND=yes
-else
+else $as_nop
   AST_OSS_FOUND=no
 fi
 
@@ -25245,14 +27231,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OSS_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "soundcard.h" "ac_cv_header_soundcard_h" "$ac_includes_default"
-if test "x$ac_cv_header_soundcard_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "soundcard.h" "ac_cv_header_soundcard_h" "$ac_includes_default"
+if test "x$ac_cv_header_soundcard_h" = xyes
+then :
   OSS_HEADER_FOUND=1
-else
+else $as_nop
   OSS_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${OSS_HEADER_FOUND}" = "x0" ; then
@@ -25277,11 +27263,12 @@
       if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pg_config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pg_config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $PG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PG_CONFIG="$PG_CONFIG" # Let the user override the test with a path.
@@ -25291,11 +27278,15 @@
 for as_dir in ${PGSQL_DIR}/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -25307,11 +27298,11 @@
 fi
 PG_CONFIG=$ac_cv_path_PG_CONFIG
 if test -n "$PG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
-$as_echo "$PG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+printf "%s\n" "$PG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -25320,11 +27311,12 @@
   ac_pt_PG_CONFIG=$PG_CONFIG
   # Extract the first word of "pg_config", so it can be a program name with args.
 set dummy pg_config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_PG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_PG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_PG_CONFIG="$ac_pt_PG_CONFIG" # Let the user override the test with a path.
@@ -25334,11 +27326,15 @@
 for as_dir in ${PGSQL_DIR}/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -25350,11 +27346,11 @@
 fi
 ac_pt_PG_CONFIG=$ac_cv_path_ac_pt_PG_CONFIG
 if test -n "$ac_pt_PG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PG_CONFIG" >&5
-$as_echo "$ac_pt_PG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PG_CONFIG" >&5
+printf "%s\n" "$ac_pt_PG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_PG_CONFIG" = x; then
@@ -25362,8 +27358,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PG_CONFIG=$ac_pt_PG_CONFIG
@@ -25373,27 +27369,28 @@
 fi
 
       if test "${PG_CONFIG}" = ":"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5
-$as_echo "$as_me: ***" >&6;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: *** pg_config was not found in the path you specified:" >&5
-$as_echo "$as_me: *** pg_config was not found in the path you specified:" >&6;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: *** ${PGSQL_DIR}/bin" >&5
-$as_echo "$as_me: *** ${PGSQL_DIR}/bin" >&6;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: *** Either correct the installation, or run configure" >&5
-$as_echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: *** including --without-postgres" >&5
-$as_echo "$as_me: *** including --without-postgres" >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ***" >&5
+printf "%s\n" "$as_me: ***" >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** pg_config was not found in the path you specified:" >&5
+printf "%s\n" "$as_me: *** pg_config was not found in the path you specified:" >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** ${PGSQL_DIR}/bin" >&5
+printf "%s\n" "$as_me: *** ${PGSQL_DIR}/bin" >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Either correct the installation, or run configure" >&5
+printf "%s\n" "$as_me: *** Either correct the installation, or run configure" >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** including --without-postgres" >&5
+printf "%s\n" "$as_me: *** including --without-postgres" >&6;}
          exit 1
       fi
    else
       if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pg_config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pg_config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $PG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PG_CONFIG="$PG_CONFIG" # Let the user override the test with a path.
@@ -25403,11 +27400,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -25419,11 +27420,11 @@
 fi
 PG_CONFIG=$ac_cv_path_PG_CONFIG
 if test -n "$PG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
-$as_echo "$PG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+printf "%s\n" "$PG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -25432,11 +27433,12 @@
   ac_pt_PG_CONFIG=$PG_CONFIG
   # Extract the first word of "pg_config", so it can be a program name with args.
 set dummy pg_config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_PG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_PG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_PG_CONFIG="$ac_pt_PG_CONFIG" # Let the user override the test with a path.
@@ -25446,11 +27448,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -25462,11 +27468,11 @@
 fi
 ac_pt_PG_CONFIG=$ac_cv_path_ac_pt_PG_CONFIG
 if test -n "$ac_pt_PG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PG_CONFIG" >&5
-$as_echo "$ac_pt_PG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PG_CONFIG" >&5
+printf "%s\n" "$ac_pt_PG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_PG_CONFIG" = x; then
@@ -25474,8 +27480,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PG_CONFIG=$ac_pt_PG_CONFIG
@@ -25491,22 +27497,23 @@
    PGSQL_includedir=`${PG_CONFIG} --includedir`
    if test "x$?" != "x0" ; then
       if test -n "${PGSQL_MANDATORY}" ; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5
-$as_echo "$as_me: ***" >&6;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: *** The PostgreSQL installation on this system appears to be broken." >&5
-$as_echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: *** Either correct the installation, or run configure" >&5
-$as_echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: *** including --without-postgres" >&5
-$as_echo "$as_me: *** including --without-postgres" >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ***" >&5
+printf "%s\n" "$as_me: ***" >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** The PostgreSQL installation on this system appears to be broken." >&5
+printf "%s\n" "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Either correct the installation, or run configure" >&5
+printf "%s\n" "$as_me: *** Either correct the installation, or run configure" >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** including --without-postgres" >&5
+printf "%s\n" "$as_me: *** including --without-postgres" >&6;}
          exit 1
 	  fi
    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeStringConn in -lpq" >&5
-$as_echo_n "checking for PQescapeStringConn in -lpq... " >&6; }
-if ${ac_cv_lib_pq_PQescapeStringConn+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQescapeStringConn in -lpq" >&5
+printf %s "checking for PQescapeStringConn in -lpq... " >&6; }
+if test ${ac_cv_lib_pq_PQescapeStringConn+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq -L${PGSQL_libdir} -lz $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25515,40 +27522,37 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char PQescapeStringConn ();
 int
-main ()
+main (void)
 {
 return PQescapeStringConn ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pq_PQescapeStringConn=yes
-else
+else $as_nop
   ac_cv_lib_pq_PQescapeStringConn=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeStringConn" >&5
-$as_echo "$ac_cv_lib_pq_PQescapeStringConn" >&6; }
-if test "x$ac_cv_lib_pq_PQescapeStringConn" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeStringConn" >&5
+printf "%s\n" "$ac_cv_lib_pq_PQescapeStringConn" >&6; }
+if test "x$ac_cv_lib_pq_PQescapeStringConn" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_PGSQL 1
-_ACEOF
+printf "%s\n" "#define HAVE_PGSQL 1" >>confdefs.h
 
 fi
 
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_encoding_to_char within Postgres headers" >&5
-$as_echo_n "checking for pg_encoding_to_char within Postgres headers... " >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pg_encoding_to_char within Postgres headers" >&5
+printf %s "checking for pg_encoding_to_char within Postgres headers... " >&6; }
       old_CFLAGS=${CFLAGS}
       CFLAGS="${CFLAGS} -I${PGSQL_includedir} -Werror"
       old_LDFLAGS=${LDFLAGS}
@@ -25557,26 +27561,25 @@
 /* end confdefs.h.  */
 #include <libpq-fe.h>
 int
-main ()
+main (void)
 {
 const char *foo = pg_encoding_to_char(1)
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_PGSQL_pg_encoding_to_char 1
-_ACEOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+printf "%s\n" "#define HAVE_PGSQL_pg_encoding_to_char 1" >>confdefs.h
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       CFLAGS=${old_CFLAGS}
       LDFLAGS=${old_LDFLAGS}
@@ -25587,14 +27590,14 @@
          PBX_PGSQL=1
       elif test -n "${PGSQL_MANDATORY}";
       then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5
-$as_echo "$as_me: ***" >&6;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: *** The PostgreSQL installation on this system appears to be broken." >&5
-$as_echo "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: *** Either correct the installation, or run configure" >&5
-$as_echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: *** including --without-postgres" >&5
-$as_echo "$as_me: *** including --without-postgres" >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ***" >&5
+printf "%s\n" "$as_me: ***" >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** The PostgreSQL installation on this system appears to be broken." >&5
+printf "%s\n" "$as_me: *** The PostgreSQL installation on this system appears to be broken." >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Either correct the installation, or run configure" >&5
+printf "%s\n" "$as_me: *** Either correct the installation, or run configure" >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** including --without-postgres" >&5
+printf "%s\n" "$as_me: *** including --without-postgres" >&6;}
          exit 1
       fi
    fi
@@ -25606,17 +27609,17 @@
    if test "x${PBX_PJPROJECT}" != "x1" -a "${USE_PJPROJECT}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PJPROJECT" >&5
-$as_echo_n "checking for PJPROJECT... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpjproject" >&5
+printf %s "checking for libpjproject... " >&6; }
 
 if test -n "$PJPROJECT_CFLAGS"; then
     pkg_cv_PJPROJECT_CFLAGS="$PJPROJECT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpjproject\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpjproject\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpjproject") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PJPROJECT_CFLAGS=`$PKG_CONFIG --cflags "libpjproject" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -25630,10 +27633,10 @@
     pkg_cv_PJPROJECT_LIBS="$PJPROJECT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpjproject\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpjproject\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpjproject") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PJPROJECT_LIBS=`$PKG_CONFIG --libs "libpjproject" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -25647,8 +27650,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -25668,8 +27671,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_PJPROJECT=0
 
@@ -25677,14 +27680,14 @@
 else
 	PJPROJECT_CFLAGS=$pkg_cv_PJPROJECT_CFLAGS
 	PJPROJECT_LIBS=$pkg_cv_PJPROJECT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_PJPROJECT=1
             PJPROJECT_INCLUDE=$(echo ${PJPROJECT_CFLAGS} | $SED -e "s|-std=c99||g")
             PJPROJECT_LIB="$PJPROJECT_LIBS"
 
-$as_echo "#define HAVE_PJPROJECT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJPROJECT 1" >>confdefs.h
 
 
 fi
@@ -25705,11 +27708,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_dlg_create_uas_and_inc_lock in -lpjsip" >&5
-$as_echo_n "checking for pjsip_dlg_create_uas_and_inc_lock in -lpjsip... " >&6; }
-if ${ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pjsip_dlg_create_uas_and_inc_lock in -lpjsip" >&5
+printf %s "checking for pjsip_dlg_create_uas_and_inc_lock in -lpjsip... " >&6; }
+if test ${ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25718,32 +27722,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pjsip_dlg_create_uas_and_inc_lock ();
 int
-main ()
+main (void)
 {
 return pjsip_dlg_create_uas_and_inc_lock ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock=yes
-else
+else $as_nop
   ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock" >&5
-$as_echo "$ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock" >&6; }
-if test "x$ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock" >&5
+printf "%s\n" "$ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_dlg_create_uas_and_inc_lock" = xyes
+then :
   AST_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_FOUND=yes
-else
+else $as_nop
   AST_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_FOUND=no
 fi
 
@@ -25762,14 +27765,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
-if test "x$ac_cv_header_pjsip_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
+if test "x$ac_cv_header_pjsip_h" = xyes
+then :
   PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_HEADER_FOUND=1
-else
+else $as_nop
   PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PJSIP_DLG_CREATE_UAS_AND_INC_LOCK_HEADER_FOUND}" = "x0" ; then
@@ -25801,11 +27804,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_tsx_create_uac2 in -lpjsip" >&5
-$as_echo_n "checking for pjsip_tsx_create_uac2 in -lpjsip... " >&6; }
-if ${ac_cv_lib_pjsip_pjsip_tsx_create_uac2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pjsip_tsx_create_uac2 in -lpjsip" >&5
+printf %s "checking for pjsip_tsx_create_uac2 in -lpjsip... " >&6; }
+if test ${ac_cv_lib_pjsip_pjsip_tsx_create_uac2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25814,32 +27818,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pjsip_tsx_create_uac2 ();
 int
-main ()
+main (void)
 {
 return pjsip_tsx_create_uac2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pjsip_pjsip_tsx_create_uac2=yes
-else
+else $as_nop
   ac_cv_lib_pjsip_pjsip_tsx_create_uac2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_tsx_create_uac2" >&5
-$as_echo "$ac_cv_lib_pjsip_pjsip_tsx_create_uac2" >&6; }
-if test "x$ac_cv_lib_pjsip_pjsip_tsx_create_uac2" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_tsx_create_uac2" >&5
+printf "%s\n" "$ac_cv_lib_pjsip_pjsip_tsx_create_uac2" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_tsx_create_uac2" = xyes
+then :
   AST_PJ_TRANSACTION_GRP_LOCK_FOUND=yes
-else
+else $as_nop
   AST_PJ_TRANSACTION_GRP_LOCK_FOUND=no
 fi
 
@@ -25858,14 +27861,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PJ_TRANSACTION_GRP_LOCK_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
-if test "x$ac_cv_header_pjsip_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
+if test "x$ac_cv_header_pjsip_h" = xyes
+then :
   PJ_TRANSACTION_GRP_LOCK_HEADER_FOUND=1
-else
+else $as_nop
   PJ_TRANSACTION_GRP_LOCK_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PJ_TRANSACTION_GRP_LOCK_HEADER_FOUND}" = "x0" ; then
@@ -25890,8 +27893,8 @@
          LIBS="${LIBS} ${PJPROJECT_LIB}"
 
     if test "x${PBX_PJSIP_REPLACE_MEDIA_STREAM}" != "x1" -a "${USE_PJSIP_REPLACE_MEDIA_STREAM}" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h" >&5
-$as_echo_n "checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h" >&5
+printf %s "checking if \"pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE\" compiles using pjmedia.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${PJSIP_REPLACE_MEDIA_STREAM_DIR}" != "x"; then
 	    PJSIP_REPLACE_MEDIA_STREAM_INCLUDE="-I${PJSIP_REPLACE_MEDIA_STREAM_DIR}/include"
@@ -25902,7 +27905,7 @@
 /* end confdefs.h.  */
  #include <pjmedia.h>
 int
-main ()
+main (void)
 {
  pjmedia_mod_offer_flag flag = PJMEDIA_SDP_NEG_ALLOW_MEDIA_CHANGE;
 
@@ -25910,21 +27913,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_PJSIP_REPLACE_MEDIA_STREAM=1
 
-$as_echo "#define HAVE_PJSIP_REPLACE_MEDIA_STREAM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_REPLACE_MEDIA_STREAM 1" >>confdefs.h
 
 
 
-else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
@@ -25945,11 +27949,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_get_dest_info in -lpjsip" >&5
-$as_echo_n "checking for pjsip_get_dest_info in -lpjsip... " >&6; }
-if ${ac_cv_lib_pjsip_pjsip_get_dest_info+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pjsip_get_dest_info in -lpjsip" >&5
+printf %s "checking for pjsip_get_dest_info in -lpjsip... " >&6; }
+if test ${ac_cv_lib_pjsip_pjsip_get_dest_info+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25958,32 +27963,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pjsip_get_dest_info ();
 int
-main ()
+main (void)
 {
 return pjsip_get_dest_info ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pjsip_pjsip_get_dest_info=yes
-else
+else $as_nop
   ac_cv_lib_pjsip_pjsip_get_dest_info=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_get_dest_info" >&5
-$as_echo "$ac_cv_lib_pjsip_pjsip_get_dest_info" >&6; }
-if test "x$ac_cv_lib_pjsip_pjsip_get_dest_info" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_get_dest_info" >&5
+printf "%s\n" "$ac_cv_lib_pjsip_pjsip_get_dest_info" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_get_dest_info" = xyes
+then :
   AST_PJSIP_GET_DEST_INFO_FOUND=yes
-else
+else $as_nop
   AST_PJSIP_GET_DEST_INFO_FOUND=no
 fi
 
@@ -26002,14 +28006,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PJSIP_GET_DEST_INFO_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
-if test "x$ac_cv_header_pjsip_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
+if test "x$ac_cv_header_pjsip_h" = xyes
+then :
   PJSIP_GET_DEST_INFO_HEADER_FOUND=1
-else
+else $as_nop
   PJSIP_GET_DEST_INFO_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PJSIP_GET_DEST_INFO_HEADER_FOUND}" = "x0" ; then
@@ -26041,11 +28045,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_ssl_cert_load_from_files2 in -lpj" >&5
-$as_echo_n "checking for pj_ssl_cert_load_from_files2 in -lpj... " >&6; }
-if ${ac_cv_lib_pj_pj_ssl_cert_load_from_files2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pj_ssl_cert_load_from_files2 in -lpj" >&5
+printf %s "checking for pj_ssl_cert_load_from_files2 in -lpj... " >&6; }
+if test ${ac_cv_lib_pj_pj_ssl_cert_load_from_files2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpj ${pbxlibdir} $PJPROJECT_LIB $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26054,32 +28059,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pj_ssl_cert_load_from_files2 ();
 int
-main ()
+main (void)
 {
 return pj_ssl_cert_load_from_files2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pj_pj_ssl_cert_load_from_files2=yes
-else
+else $as_nop
   ac_cv_lib_pj_pj_ssl_cert_load_from_files2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pj_pj_ssl_cert_load_from_files2" >&5
-$as_echo "$ac_cv_lib_pj_pj_ssl_cert_load_from_files2" >&6; }
-if test "x$ac_cv_lib_pj_pj_ssl_cert_load_from_files2" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pj_pj_ssl_cert_load_from_files2" >&5
+printf "%s\n" "$ac_cv_lib_pj_pj_ssl_cert_load_from_files2" >&6; }
+if test "x$ac_cv_lib_pj_pj_ssl_cert_load_from_files2" = xyes
+then :
   AST_PJ_SSL_CERT_LOAD_FROM_FILES2_FOUND=yes
-else
+else $as_nop
   AST_PJ_SSL_CERT_LOAD_FROM_FILES2_FOUND=no
 fi
 
@@ -26098,14 +28102,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PJ_SSL_CERT_LOAD_FROM_FILES2_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "pjlib.h" "ac_cv_header_pjlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_pjlib_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "pjlib.h" "ac_cv_header_pjlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_pjlib_h" = xyes
+then :
   PJ_SSL_CERT_LOAD_FROM_FILES2_HEADER_FOUND=1
-else
+else $as_nop
   PJ_SSL_CERT_LOAD_FROM_FILES2_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PJ_SSL_CERT_LOAD_FROM_FILES2_HEADER_FOUND}" = "x0" ; then
@@ -26137,11 +28141,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_endpt_set_ext_resolver in -lpjsip" >&5
-$as_echo_n "checking for pjsip_endpt_set_ext_resolver in -lpjsip... " >&6; }
-if ${ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pjsip_endpt_set_ext_resolver in -lpjsip" >&5
+printf %s "checking for pjsip_endpt_set_ext_resolver in -lpjsip... " >&6; }
+if test ${ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26150,32 +28155,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pjsip_endpt_set_ext_resolver ();
 int
-main ()
+main (void)
 {
 return pjsip_endpt_set_ext_resolver ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver=yes
-else
+else $as_nop
   ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver" >&5
-$as_echo "$ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver" >&6; }
-if test "x$ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver" >&5
+printf "%s\n" "$ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_endpt_set_ext_resolver" = xyes
+then :
   AST_PJSIP_EXTERNAL_RESOLVER_FOUND=yes
-else
+else $as_nop
   AST_PJSIP_EXTERNAL_RESOLVER_FOUND=no
 fi
 
@@ -26194,14 +28198,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PJSIP_EXTERNAL_RESOLVER_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
-if test "x$ac_cv_header_pjsip_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
+if test "x$ac_cv_header_pjsip_h" = xyes
+then :
   PJSIP_EXTERNAL_RESOLVER_HEADER_FOUND=1
-else
+else $as_nop
   PJSIP_EXTERNAL_RESOLVER_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PJSIP_EXTERNAL_RESOLVER_HEADER_FOUND}" = "x0" ; then
@@ -26226,8 +28230,8 @@
          LIBS="${LIBS} ${PJPROJECT_LIB}"
 
     if test "x${PBX_PJSIP_TLS_TRANSPORT_PROTO}" != "x1" -a "${USE_PJSIP_TLS_TRANSPORT_PROTO}" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct pjsip_tls_setting setting; int proto; proto = setting.proto;\" compiles using pjsip.h" >&5
-$as_echo_n "checking if \"struct pjsip_tls_setting setting; int proto; proto = setting.proto;\" compiles using pjsip.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if \"struct pjsip_tls_setting setting; int proto; proto = setting.proto;\" compiles using pjsip.h" >&5
+printf %s "checking if \"struct pjsip_tls_setting setting; int proto; proto = setting.proto;\" compiles using pjsip.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${PJSIP_TLS_TRANSPORT_PROTO_DIR}" != "x"; then
 	    PJSIP_TLS_TRANSPORT_PROTO_INCLUDE="-I${PJSIP_TLS_TRANSPORT_PROTO_DIR}/include"
@@ -26238,7 +28242,7 @@
 /* end confdefs.h.  */
  #include <pjsip.h>
 int
-main ()
+main (void)
 {
  struct pjsip_tls_setting setting; int proto; proto = setting.proto;;
 
@@ -26246,28 +28250,29 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_PJSIP_TLS_TRANSPORT_PROTO=1
 
-$as_echo "#define HAVE_PJSIP_TLS_TRANSPORT_PROTO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_TLS_TRANSPORT_PROTO 1" >>confdefs.h
 
 
 
-else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
     if test "x${PBX_PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS}" != "x1" -a "${USE_PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS}" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"pjsip_cfg()->endpt.accept_multiple_sdp_answers = 0;\" compiles using pjsip.h" >&5
-$as_echo_n "checking if \"pjsip_cfg()->endpt.accept_multiple_sdp_answers = 0;\" compiles using pjsip.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if \"pjsip_cfg()->endpt.accept_multiple_sdp_answers = 0;\" compiles using pjsip.h" >&5
+printf %s "checking if \"pjsip_cfg()->endpt.accept_multiple_sdp_answers = 0;\" compiles using pjsip.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS_DIR}" != "x"; then
 	    PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS_INCLUDE="-I${PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS_DIR}/include"
@@ -26278,7 +28283,7 @@
 /* end confdefs.h.  */
  #include <pjsip.h>
 int
-main ()
+main (void)
 {
  pjsip_cfg()->endpt.accept_multiple_sdp_answers = 0;;
 
@@ -26286,28 +28291,29 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS=1
 
-$as_echo "#define HAVE_PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_INV_ACCEPT_MULTIPLE_SDP_ANSWERS 1" >>confdefs.h
 
 
 
-else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
     if test "x${PBX_PJSIP_ENDPOINT_COMPACT_FORM}" != "x1" -a "${USE_PJSIP_ENDPOINT_COMPACT_FORM}" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"pjsip_cfg()->endpt.use_compact_form = PJ_TRUE;\" compiles using pjsip.h" >&5
-$as_echo_n "checking if \"pjsip_cfg()->endpt.use_compact_form = PJ_TRUE;\" compiles using pjsip.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if \"pjsip_cfg()->endpt.use_compact_form = PJ_TRUE;\" compiles using pjsip.h" >&5
+printf %s "checking if \"pjsip_cfg()->endpt.use_compact_form = PJ_TRUE;\" compiles using pjsip.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${PJSIP_ENDPOINT_COMPACT_FORM_DIR}" != "x"; then
 	    PJSIP_ENDPOINT_COMPACT_FORM_INCLUDE="-I${PJSIP_ENDPOINT_COMPACT_FORM_DIR}/include"
@@ -26318,7 +28324,7 @@
 /* end confdefs.h.  */
  #include <pjsip.h>
 int
-main ()
+main (void)
 {
  pjsip_cfg()->endpt.use_compact_form = PJ_TRUE;;
 
@@ -26326,28 +28332,29 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_PJSIP_ENDPOINT_COMPACT_FORM=1
 
-$as_echo "#define HAVE_PJSIP_ENDPOINT_COMPACT_FORM 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_ENDPOINT_COMPACT_FORM 1" >>confdefs.h
 
 
 
-else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
     if test "x${PBX_PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE}" != "x1" -a "${USE_PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE}" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct pjsip_tpselector sel; sel.disable_connection_reuse = PJ_TRUE;\" compiles using pjsip.h" >&5
-$as_echo_n "checking if \"struct pjsip_tpselector sel; sel.disable_connection_reuse = PJ_TRUE;\" compiles using pjsip.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if \"struct pjsip_tpselector sel; sel.disable_connection_reuse = PJ_TRUE;\" compiles using pjsip.h" >&5
+printf %s "checking if \"struct pjsip_tpselector sel; sel.disable_connection_reuse = PJ_TRUE;\" compiles using pjsip.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE_DIR}" != "x"; then
 	    PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE_INCLUDE="-I${PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE_DIR}/include"
@@ -26358,7 +28365,7 @@
 /* end confdefs.h.  */
  #include <pjsip.h>
 int
-main ()
+main (void)
 {
  struct pjsip_tpselector sel; sel.disable_connection_reuse = PJ_TRUE;;
 
@@ -26366,28 +28373,29 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE=1
 
-$as_echo "#define HAVE_PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_TRANSPORT_DISABLE_CONNECTION_REUSE 1" >>confdefs.h
 
 
 
-else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
     if test "x${PBX_PJSIP_OAUTH_AUTHENTICATION}" != "x1" -a "${USE_PJSIP_OAUTH_AUTHENTICATION}" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if \"struct pjsip_oauth_credential credential;\" compiles using pjsip.h" >&5
-$as_echo_n "checking if \"struct pjsip_oauth_credential credential;\" compiles using pjsip.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if \"struct pjsip_oauth_credential credential;\" compiles using pjsip.h" >&5
+printf %s "checking if \"struct pjsip_oauth_credential credential;\" compiles using pjsip.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${PJSIP_OAUTH_AUTHENTICATION_DIR}" != "x"; then
 	    PJSIP_OAUTH_AUTHENTICATION_INCLUDE="-I${PJSIP_OAUTH_AUTHENTICATION_DIR}/include"
@@ -26398,7 +28406,7 @@
 /* end confdefs.h.  */
  #include <pjsip.h>
 int
-main ()
+main (void)
 {
  struct pjsip_oauth_credential credential;;
 
@@ -26406,26 +28414,27 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_PJSIP_OAUTH_AUTHENTICATION=1
 
-$as_echo "#define HAVE_PJSIP_OAUTH_AUTHENTICATION 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJSIP_OAUTH_AUTHENTICATION 1" >>confdefs.h
 
 
 
-else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjproject on_valid_pair callback" >&5
-$as_echo_n "checking for pjproject on_valid_pair callback... " >&6; }
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pjproject on_valid_pair callback" >&5
+printf %s "checking for pjproject on_valid_pair callback... " >&6; }
          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pjsip.h>
@@ -26436,7 +28445,7 @@
                void on_rx_data(pj_ice_sess *ice, unsigned comp_id, unsigned transport_id, void *pkt, pj_size_t size, const pj_sockaddr_t *src_addr, unsigned src_addr_len) {}
                pj_status_t on_tx_pkt(pj_ice_sess *ice, unsigned comp_id, unsigned transport_id, const void *pkt, pj_size_t size, const pj_sockaddr_t *dst_addr, unsigned dst_addr_len) {}
 int
-main ()
+main (void)
 {
 pj_ice_sess_cb ice_sess_cb = {
                   .on_valid_pair = on_valid_pair,
@@ -26448,18 +28457,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_PJPROJECT_ON_VALID_ICE_PAIR_CALLBACK 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PJPROJECT_ON_VALID_ICE_PAIR_CALLBACK 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
          LIBS="${saved_libs}"
          CPPFLAGS="${saved_cppflags}"
@@ -26478,11 +28488,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_evsub_add_ref in -lpjsip" >&5
-$as_echo_n "checking for pjsip_evsub_add_ref in -lpjsip... " >&6; }
-if ${ac_cv_lib_pjsip_pjsip_evsub_add_ref+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pjsip_evsub_add_ref in -lpjsip" >&5
+printf %s "checking for pjsip_evsub_add_ref in -lpjsip... " >&6; }
+if test ${ac_cv_lib_pjsip_pjsip_evsub_add_ref+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26491,32 +28502,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pjsip_evsub_add_ref ();
 int
-main ()
+main (void)
 {
 return pjsip_evsub_add_ref ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pjsip_pjsip_evsub_add_ref=yes
-else
+else $as_nop
   ac_cv_lib_pjsip_pjsip_evsub_add_ref=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_evsub_add_ref" >&5
-$as_echo "$ac_cv_lib_pjsip_pjsip_evsub_add_ref" >&6; }
-if test "x$ac_cv_lib_pjsip_pjsip_evsub_add_ref" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_evsub_add_ref" >&5
+printf "%s\n" "$ac_cv_lib_pjsip_pjsip_evsub_add_ref" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_evsub_add_ref" = xyes
+then :
   AST_PJSIP_EVSUB_GRP_LOCK_FOUND=yes
-else
+else $as_nop
   AST_PJSIP_EVSUB_GRP_LOCK_FOUND=no
 fi
 
@@ -26535,14 +28545,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PJSIP_EVSUB_GRP_LOCK_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
-if test "x$ac_cv_header_pjsip_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
+if test "x$ac_cv_header_pjsip_h" = xyes
+then :
   PJSIP_EVSUB_GRP_LOCK_HEADER_FOUND=1
-else
+else $as_nop
   PJSIP_EVSUB_GRP_LOCK_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PJSIP_EVSUB_GRP_LOCK_HEADER_FOUND}" = "x0" ; then
@@ -26574,11 +28584,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_inv_add_ref in -lpjsip" >&5
-$as_echo_n "checking for pjsip_inv_add_ref in -lpjsip... " >&6; }
-if ${ac_cv_lib_pjsip_pjsip_inv_add_ref+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pjsip_inv_add_ref in -lpjsip" >&5
+printf %s "checking for pjsip_inv_add_ref in -lpjsip... " >&6; }
+if test ${ac_cv_lib_pjsip_pjsip_inv_add_ref+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26587,32 +28598,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pjsip_inv_add_ref ();
 int
-main ()
+main (void)
 {
 return pjsip_inv_add_ref ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pjsip_pjsip_inv_add_ref=yes
-else
+else $as_nop
   ac_cv_lib_pjsip_pjsip_inv_add_ref=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_inv_add_ref" >&5
-$as_echo "$ac_cv_lib_pjsip_pjsip_inv_add_ref" >&6; }
-if test "x$ac_cv_lib_pjsip_pjsip_inv_add_ref" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_inv_add_ref" >&5
+printf "%s\n" "$ac_cv_lib_pjsip_pjsip_inv_add_ref" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_inv_add_ref" = xyes
+then :
   AST_PJSIP_INV_SESSION_REF_FOUND=yes
-else
+else $as_nop
   AST_PJSIP_INV_SESSION_REF_FOUND=no
 fi
 
@@ -26631,14 +28641,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PJSIP_INV_SESSION_REF_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
-if test "x$ac_cv_header_pjsip_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
+if test "x$ac_cv_header_pjsip_h" = xyes
+then :
   PJSIP_INV_SESSION_REF_HEADER_FOUND=1
-else
+else $as_nop
   PJSIP_INV_SESSION_REF_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PJSIP_INV_SESSION_REF_HEADER_FOUND}" = "x0" ; then
@@ -26670,11 +28680,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_auth_clt_deinit in -lpjsip" >&5
-$as_echo_n "checking for pjsip_auth_clt_deinit in -lpjsip... " >&6; }
-if ${ac_cv_lib_pjsip_pjsip_auth_clt_deinit+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pjsip_auth_clt_deinit in -lpjsip" >&5
+printf %s "checking for pjsip_auth_clt_deinit in -lpjsip... " >&6; }
+if test ${ac_cv_lib_pjsip_pjsip_auth_clt_deinit+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26683,32 +28694,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pjsip_auth_clt_deinit ();
 int
-main ()
+main (void)
 {
 return pjsip_auth_clt_deinit ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pjsip_pjsip_auth_clt_deinit=yes
-else
+else $as_nop
   ac_cv_lib_pjsip_pjsip_auth_clt_deinit=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_auth_clt_deinit" >&5
-$as_echo "$ac_cv_lib_pjsip_pjsip_auth_clt_deinit" >&6; }
-if test "x$ac_cv_lib_pjsip_pjsip_auth_clt_deinit" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_auth_clt_deinit" >&5
+printf "%s\n" "$ac_cv_lib_pjsip_pjsip_auth_clt_deinit" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_auth_clt_deinit" = xyes
+then :
   AST_PJSIP_AUTH_CLT_DEINIT_FOUND=yes
-else
+else $as_nop
   AST_PJSIP_AUTH_CLT_DEINIT_FOUND=no
 fi
 
@@ -26727,14 +28737,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PJSIP_AUTH_CLT_DEINIT_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
-if test "x$ac_cv_header_pjsip_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
+if test "x$ac_cv_header_pjsip_h" = xyes
+then :
   PJSIP_AUTH_CLT_DEINIT_HEADER_FOUND=1
-else
+else $as_nop
   PJSIP_AUTH_CLT_DEINIT_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PJSIP_AUTH_CLT_DEINIT_HEADER_FOUND}" = "x0" ; then
@@ -26766,11 +28776,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pjsip_tsx_layer_find_tsx2 in -lpjsip" >&5
-$as_echo_n "checking for pjsip_tsx_layer_find_tsx2 in -lpjsip... " >&6; }
-if ${ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pjsip_tsx_layer_find_tsx2 in -lpjsip" >&5
+printf %s "checking for pjsip_tsx_layer_find_tsx2 in -lpjsip... " >&6; }
+if test ${ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26779,32 +28790,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pjsip_tsx_layer_find_tsx2 ();
 int
-main ()
+main (void)
 {
 return pjsip_tsx_layer_find_tsx2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2=yes
-else
+else $as_nop
   ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2" >&5
-$as_echo "$ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2" >&6; }
-if test "x$ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2" >&5
+printf "%s\n" "$ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2" >&6; }
+if test "x$ac_cv_lib_pjsip_pjsip_tsx_layer_find_tsx2" = xyes
+then :
   AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND=yes
-else
+else $as_nop
   AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND=no
 fi
 
@@ -26823,14 +28833,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
-if test "x$ac_cv_header_pjsip_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
+if test "x$ac_cv_header_pjsip_h" = xyes
+then :
   PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND=1
-else
+else $as_nop
   PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND}" = "x0" ; then
@@ -26859,17 +28869,17 @@
    if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHONDEV" >&5
-$as_echo_n "checking for PYTHONDEV... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python-2.7" >&5
+printf %s "checking for python-2.7... " >&6; }
 
 if test -n "$PYTHONDEV_CFLAGS"; then
     pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-2.7\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-2.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "python-2.7") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PYTHONDEV_CFLAGS=`$PKG_CONFIG --cflags "python-2.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -26883,10 +28893,10 @@
     pkg_cv_PYTHONDEV_LIBS="$PYTHONDEV_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-2.7\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-2.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "python-2.7") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PYTHONDEV_LIBS=`$PKG_CONFIG --libs "python-2.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -26900,8 +28910,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -26921,8 +28931,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_PYTHONDEV=0
 
@@ -26930,14 +28940,14 @@
 else
 	PYTHONDEV_CFLAGS=$pkg_cv_PYTHONDEV_CFLAGS
 	PYTHONDEV_LIBS=$pkg_cv_PYTHONDEV_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_PYTHONDEV=1
             PYTHONDEV_INCLUDE=$(echo ${PYTHONDEV_CFLAGS} | $SED -e "s|-std=c99||g")
             PYTHONDEV_LIB="$PYTHONDEV_LIBS"
 
-$as_echo "#define HAVE_PYTHONDEV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PYTHONDEV 1" >>confdefs.h
 
 
 fi
@@ -26947,17 +28957,17 @@
    if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHONDEV" >&5
-$as_echo_n "checking for PYTHONDEV... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python2" >&5
+printf %s "checking for python2... " >&6; }
 
 if test -n "$PYTHONDEV_CFLAGS"; then
     pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "python2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PYTHONDEV_CFLAGS=`$PKG_CONFIG --cflags "python2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -26971,10 +28981,10 @@
     pkg_cv_PYTHONDEV_LIBS="$PYTHONDEV_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "python2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PYTHONDEV_LIBS=`$PKG_CONFIG --libs "python2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -26988,8 +28998,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -27009,8 +29019,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_PYTHONDEV=0
 
@@ -27018,14 +29028,14 @@
 else
 	PYTHONDEV_CFLAGS=$pkg_cv_PYTHONDEV_CFLAGS
 	PYTHONDEV_LIBS=$pkg_cv_PYTHONDEV_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_PYTHONDEV=1
             PYTHONDEV_INCLUDE=$(echo ${PYTHONDEV_CFLAGS} | $SED -e "s|-std=c99||g")
             PYTHONDEV_LIB="$PYTHONDEV_LIBS"
 
-$as_echo "#define HAVE_PYTHONDEV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PYTHONDEV 1" >>confdefs.h
 
 
 fi
@@ -27035,17 +29045,17 @@
    if test "x${PBX_PYTHONDEV}" != "x1" -a "${USE_PYTHONDEV}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHONDEV" >&5
-$as_echo_n "checking for PYTHONDEV... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python" >&5
+printf %s "checking for python... " >&6; }
 
 if test -n "$PYTHONDEV_CFLAGS"; then
     pkg_cv_PYTHONDEV_CFLAGS="$PYTHONDEV_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python\""; } >&5
   ($PKG_CONFIG --exists --print-errors "python") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PYTHONDEV_CFLAGS=`$PKG_CONFIG --cflags "python" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -27059,10 +29069,10 @@
     pkg_cv_PYTHONDEV_LIBS="$PYTHONDEV_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python\""; } >&5
   ($PKG_CONFIG --exists --print-errors "python") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PYTHONDEV_LIBS=`$PKG_CONFIG --libs "python" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -27076,8 +29086,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -27097,8 +29107,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_PYTHONDEV=0
 
@@ -27106,14 +29116,14 @@
 else
 	PYTHONDEV_CFLAGS=$pkg_cv_PYTHONDEV_CFLAGS
 	PYTHONDEV_LIBS=$pkg_cv_PYTHONDEV_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_PYTHONDEV=1
             PYTHONDEV_INCLUDE=$(echo ${PYTHONDEV_CFLAGS} | $SED -e "s|-std=c99||g")
             PYTHONDEV_LIB="$PYTHONDEV_LIBS"
 
-$as_echo "#define HAVE_PYTHONDEV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PYTHONDEV 1" >>confdefs.h
 
 
 fi
@@ -27144,11 +29154,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poptStrerror in -lpopt" >&5
-$as_echo_n "checking for poptStrerror in -lpopt... " >&6; }
-if ${ac_cv_lib_popt_poptStrerror+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for poptStrerror in -lpopt" >&5
+printf %s "checking for poptStrerror in -lpopt... " >&6; }
+if test ${ac_cv_lib_popt_poptStrerror+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpopt ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27157,32 +29168,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char poptStrerror ();
 int
-main ()
+main (void)
 {
 return poptStrerror ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_popt_poptStrerror=yes
-else
+else $as_nop
   ac_cv_lib_popt_poptStrerror=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_popt_poptStrerror" >&5
-$as_echo "$ac_cv_lib_popt_poptStrerror" >&6; }
-if test "x$ac_cv_lib_popt_poptStrerror" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_popt_poptStrerror" >&5
+printf "%s\n" "$ac_cv_lib_popt_poptStrerror" >&6; }
+if test "x$ac_cv_lib_popt_poptStrerror" = xyes
+then :
   AST_POPT_FOUND=yes
-else
+else $as_nop
   AST_POPT_FOUND=no
 fi
 
@@ -27201,14 +29211,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${POPT_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "popt.h" "ac_cv_header_popt_h" "$ac_includes_default"
-if test "x$ac_cv_header_popt_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "popt.h" "ac_cv_header_popt_h" "$ac_includes_default"
+if test "x$ac_cv_header_popt_h" = xyes
+then :
   POPT_HEADER_FOUND=1
-else
+else $as_nop
   POPT_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${POPT_HEADER_FOUND}" = "x0" ; then
@@ -27231,17 +29241,17 @@
    if test "x${PBX_PORTAUDIO}" != "x1" -a "${USE_PORTAUDIO}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5
-$as_echo_n "checking for PORTAUDIO... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for portaudio-2.0" >&5
+printf %s "checking for portaudio-2.0... " >&6; }
 
 if test -n "$PORTAUDIO_CFLAGS"; then
     pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "portaudio-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PORTAUDIO_CFLAGS=`$PKG_CONFIG --cflags "portaudio-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -27255,10 +29265,10 @@
     pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "portaudio-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs "portaudio-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -27272,8 +29282,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -27293,8 +29303,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_PORTAUDIO=0
 
@@ -27302,14 +29312,14 @@
 else
 	PORTAUDIO_CFLAGS=$pkg_cv_PORTAUDIO_CFLAGS
 	PORTAUDIO_LIBS=$pkg_cv_PORTAUDIO_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_PORTAUDIO=1
             PORTAUDIO_INCLUDE=$(echo ${PORTAUDIO_CFLAGS} | $SED -e "s|-std=c99||g")
             PORTAUDIO_LIB="$PORTAUDIO_LIBS"
 
-$as_echo "#define HAVE_PORTAUDIO 1" >>confdefs.h
+printf "%s\n" "#define HAVE_PORTAUDIO 1" >>confdefs.h
 
 
 fi
@@ -27329,11 +29339,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Pa_GetDeviceCount in -lportaudio" >&5
-$as_echo_n "checking for Pa_GetDeviceCount in -lportaudio... " >&6; }
-if ${ac_cv_lib_portaudio_Pa_GetDeviceCount+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Pa_GetDeviceCount in -lportaudio" >&5
+printf %s "checking for Pa_GetDeviceCount in -lportaudio... " >&6; }
+if test ${ac_cv_lib_portaudio_Pa_GetDeviceCount+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lportaudio ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27342,32 +29353,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char Pa_GetDeviceCount ();
 int
-main ()
+main (void)
 {
 return Pa_GetDeviceCount ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_portaudio_Pa_GetDeviceCount=yes
-else
+else $as_nop
   ac_cv_lib_portaudio_Pa_GetDeviceCount=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_portaudio_Pa_GetDeviceCount" >&5
-$as_echo "$ac_cv_lib_portaudio_Pa_GetDeviceCount" >&6; }
-if test "x$ac_cv_lib_portaudio_Pa_GetDeviceCount" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_portaudio_Pa_GetDeviceCount" >&5
+printf "%s\n" "$ac_cv_lib_portaudio_Pa_GetDeviceCount" >&6; }
+if test "x$ac_cv_lib_portaudio_Pa_GetDeviceCount" = xyes
+then :
   AST_PORTAUDIO_FOUND=yes
-else
+else $as_nop
   AST_PORTAUDIO_FOUND=no
 fi
 
@@ -27386,14 +29396,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PORTAUDIO_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "portaudio.h" "ac_cv_header_portaudio_h" "$ac_includes_default"
-if test "x$ac_cv_header_portaudio_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "portaudio.h" "ac_cv_header_portaudio_h" "$ac_includes_default"
+if test "x$ac_cv_header_portaudio_h" = xyes
+then :
   PORTAUDIO_HEADER_FOUND=1
-else
+else $as_nop
   PORTAUDIO_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PORTAUDIO_HEADER_FOUND}" = "x0" ; then
@@ -27426,11 +29436,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_connected_line_update in -lpri" >&5
-$as_echo_n "checking for pri_connected_line_update in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_connected_line_update+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_connected_line_update in -lpri" >&5
+printf %s "checking for pri_connected_line_update in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_connected_line_update+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27439,32 +29450,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_connected_line_update ();
 int
-main ()
+main (void)
 {
 return pri_connected_line_update ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_connected_line_update=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_connected_line_update=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_connected_line_update" >&5
-$as_echo "$ac_cv_lib_pri_pri_connected_line_update" >&6; }
-if test "x$ac_cv_lib_pri_pri_connected_line_update" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_connected_line_update" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_connected_line_update" >&6; }
+if test "x$ac_cv_lib_pri_pri_connected_line_update" = xyes
+then :
   AST_PRI_FOUND=yes
-else
+else $as_nop
   AST_PRI_FOUND=no
 fi
 
@@ -27483,14 +29493,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_HEADER_FOUND=1
-else
+else $as_nop
   PRI_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_HEADER_FOUND}" = "x0" ; then
@@ -27523,11 +29533,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_setup_ack in -lpri" >&5
-$as_echo_n "checking for pri_setup_ack in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_setup_ack+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_setup_ack in -lpri" >&5
+printf %s "checking for pri_setup_ack in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_setup_ack+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27536,32 +29547,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_setup_ack ();
 int
-main ()
+main (void)
 {
 return pri_setup_ack ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_setup_ack=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_setup_ack=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_setup_ack" >&5
-$as_echo "$ac_cv_lib_pri_pri_setup_ack" >&6; }
-if test "x$ac_cv_lib_pri_pri_setup_ack" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_setup_ack" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_setup_ack" >&6; }
+if test "x$ac_cv_lib_pri_pri_setup_ack" = xyes
+then :
   AST_PRI_SETUP_ACK_INBAND_FOUND=yes
-else
+else $as_nop
   AST_PRI_SETUP_ACK_INBAND_FOUND=no
 fi
 
@@ -27580,14 +29590,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_SETUP_ACK_INBAND_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_SETUP_ACK_INBAND_HEADER_FOUND=1
-else
+else $as_nop
   PRI_SETUP_ACK_INBAND_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_SETUP_ACK_INBAND_HEADER_FOUND}" = "x0" ; then
@@ -27619,11 +29629,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_persistent_layer2_option in -lpri" >&5
-$as_echo_n "checking for pri_persistent_layer2_option in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_persistent_layer2_option+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_persistent_layer2_option in -lpri" >&5
+printf %s "checking for pri_persistent_layer2_option in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_persistent_layer2_option+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27632,32 +29643,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_persistent_layer2_option ();
 int
-main ()
+main (void)
 {
 return pri_persistent_layer2_option ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_persistent_layer2_option=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_persistent_layer2_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_persistent_layer2_option" >&5
-$as_echo "$ac_cv_lib_pri_pri_persistent_layer2_option" >&6; }
-if test "x$ac_cv_lib_pri_pri_persistent_layer2_option" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_persistent_layer2_option" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_persistent_layer2_option" >&6; }
+if test "x$ac_cv_lib_pri_pri_persistent_layer2_option" = xyes
+then :
   AST_PRI_L2_PERSISTENCE_FOUND=yes
-else
+else $as_nop
   AST_PRI_L2_PERSISTENCE_FOUND=no
 fi
 
@@ -27676,14 +29686,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_L2_PERSISTENCE_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_L2_PERSISTENCE_HEADER_FOUND=1
-else
+else $as_nop
   PRI_L2_PERSISTENCE_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_L2_PERSISTENCE_HEADER_FOUND}" = "x0" ; then
@@ -27715,11 +29725,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_date_time_send_option in -lpri" >&5
-$as_echo_n "checking for pri_date_time_send_option in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_date_time_send_option+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_date_time_send_option in -lpri" >&5
+printf %s "checking for pri_date_time_send_option in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_date_time_send_option+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27728,32 +29739,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_date_time_send_option ();
 int
-main ()
+main (void)
 {
 return pri_date_time_send_option ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_date_time_send_option=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_date_time_send_option=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_date_time_send_option" >&5
-$as_echo "$ac_cv_lib_pri_pri_date_time_send_option" >&6; }
-if test "x$ac_cv_lib_pri_pri_date_time_send_option" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_date_time_send_option" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_date_time_send_option" >&6; }
+if test "x$ac_cv_lib_pri_pri_date_time_send_option" = xyes
+then :
   AST_PRI_DATETIME_SEND_FOUND=yes
-else
+else $as_nop
   AST_PRI_DATETIME_SEND_FOUND=no
 fi
 
@@ -27772,14 +29782,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_DATETIME_SEND_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_DATETIME_SEND_HEADER_FOUND=1
-else
+else $as_nop
   PRI_DATETIME_SEND_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_DATETIME_SEND_HEADER_FOUND}" = "x0" ; then
@@ -27811,11 +29821,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_mwi_indicate_v2 in -lpri" >&5
-$as_echo_n "checking for pri_mwi_indicate_v2 in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_mwi_indicate_v2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_mwi_indicate_v2 in -lpri" >&5
+printf %s "checking for pri_mwi_indicate_v2 in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_mwi_indicate_v2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27824,32 +29835,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_mwi_indicate_v2 ();
 int
-main ()
+main (void)
 {
 return pri_mwi_indicate_v2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_mwi_indicate_v2=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_mwi_indicate_v2=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mwi_indicate_v2" >&5
-$as_echo "$ac_cv_lib_pri_pri_mwi_indicate_v2" >&6; }
-if test "x$ac_cv_lib_pri_pri_mwi_indicate_v2" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mwi_indicate_v2" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_mwi_indicate_v2" >&6; }
+if test "x$ac_cv_lib_pri_pri_mwi_indicate_v2" = xyes
+then :
   AST_PRI_MWI_V2_FOUND=yes
-else
+else $as_nop
   AST_PRI_MWI_V2_FOUND=no
 fi
 
@@ -27868,14 +29878,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_MWI_V2_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_MWI_V2_HEADER_FOUND=1
-else
+else $as_nop
   PRI_MWI_V2_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_MWI_V2_HEADER_FOUND}" = "x0" ; then
@@ -27907,11 +29917,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_display_text in -lpri" >&5
-$as_echo_n "checking for pri_display_text in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_display_text+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_display_text in -lpri" >&5
+printf %s "checking for pri_display_text in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_display_text+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27920,32 +29931,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_display_text ();
 int
-main ()
+main (void)
 {
 return pri_display_text ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_display_text=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_display_text=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_display_text" >&5
-$as_echo "$ac_cv_lib_pri_pri_display_text" >&6; }
-if test "x$ac_cv_lib_pri_pri_display_text" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_display_text" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_display_text" >&6; }
+if test "x$ac_cv_lib_pri_pri_display_text" = xyes
+then :
   AST_PRI_DISPLAY_TEXT_FOUND=yes
-else
+else $as_nop
   AST_PRI_DISPLAY_TEXT_FOUND=no
 fi
 
@@ -27964,14 +29974,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_DISPLAY_TEXT_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_DISPLAY_TEXT_HEADER_FOUND=1
-else
+else $as_nop
   PRI_DISPLAY_TEXT_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_DISPLAY_TEXT_HEADER_FOUND}" = "x0" ; then
@@ -28003,11 +30013,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_mwi_indicate in -lpri" >&5
-$as_echo_n "checking for pri_mwi_indicate in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_mwi_indicate+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_mwi_indicate in -lpri" >&5
+printf %s "checking for pri_mwi_indicate in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_mwi_indicate+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28016,32 +30027,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_mwi_indicate ();
 int
-main ()
+main (void)
 {
 return pri_mwi_indicate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_mwi_indicate=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_mwi_indicate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mwi_indicate" >&5
-$as_echo "$ac_cv_lib_pri_pri_mwi_indicate" >&6; }
-if test "x$ac_cv_lib_pri_pri_mwi_indicate" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mwi_indicate" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_mwi_indicate" >&6; }
+if test "x$ac_cv_lib_pri_pri_mwi_indicate" = xyes
+then :
   AST_PRI_MWI_FOUND=yes
-else
+else $as_nop
   AST_PRI_MWI_FOUND=no
 fi
 
@@ -28060,14 +30070,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_MWI_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_MWI_HEADER_FOUND=1
-else
+else $as_nop
   PRI_MWI_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_MWI_HEADER_FOUND}" = "x0" ; then
@@ -28099,11 +30109,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_mcid_enable in -lpri" >&5
-$as_echo_n "checking for pri_mcid_enable in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_mcid_enable+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_mcid_enable in -lpri" >&5
+printf %s "checking for pri_mcid_enable in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_mcid_enable+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28112,32 +30123,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_mcid_enable ();
 int
-main ()
+main (void)
 {
 return pri_mcid_enable ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_mcid_enable=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_mcid_enable=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mcid_enable" >&5
-$as_echo "$ac_cv_lib_pri_pri_mcid_enable" >&6; }
-if test "x$ac_cv_lib_pri_pri_mcid_enable" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_mcid_enable" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_mcid_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_mcid_enable" = xyes
+then :
   AST_PRI_MCID_FOUND=yes
-else
+else $as_nop
   AST_PRI_MCID_FOUND=no
 fi
 
@@ -28156,14 +30166,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_MCID_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_MCID_HEADER_FOUND=1
-else
+else $as_nop
   PRI_MCID_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_MCID_HEADER_FOUND}" = "x0" ; then
@@ -28195,11 +30205,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_connect_ack_enable in -lpri" >&5
-$as_echo_n "checking for pri_connect_ack_enable in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_connect_ack_enable+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_connect_ack_enable in -lpri" >&5
+printf %s "checking for pri_connect_ack_enable in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_connect_ack_enable+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28208,32 +30219,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_connect_ack_enable ();
 int
-main ()
+main (void)
 {
 return pri_connect_ack_enable ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_connect_ack_enable=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_connect_ack_enable=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_connect_ack_enable" >&5
-$as_echo "$ac_cv_lib_pri_pri_connect_ack_enable" >&6; }
-if test "x$ac_cv_lib_pri_pri_connect_ack_enable" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_connect_ack_enable" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_connect_ack_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_connect_ack_enable" = xyes
+then :
   AST_PRI_CALL_WAITING_FOUND=yes
-else
+else $as_nop
   AST_PRI_CALL_WAITING_FOUND=no
 fi
 
@@ -28252,14 +30262,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_CALL_WAITING_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_CALL_WAITING_HEADER_FOUND=1
-else
+else $as_nop
   PRI_CALL_WAITING_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_CALL_WAITING_HEADER_FOUND}" = "x0" ; then
@@ -28291,11 +30301,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_aoc_events_enable in -lpri" >&5
-$as_echo_n "checking for pri_aoc_events_enable in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_aoc_events_enable+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_aoc_events_enable in -lpri" >&5
+printf %s "checking for pri_aoc_events_enable in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_aoc_events_enable+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28304,32 +30315,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_aoc_events_enable ();
 int
-main ()
+main (void)
 {
 return pri_aoc_events_enable ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_aoc_events_enable=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_aoc_events_enable=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_aoc_events_enable" >&5
-$as_echo "$ac_cv_lib_pri_pri_aoc_events_enable" >&6; }
-if test "x$ac_cv_lib_pri_pri_aoc_events_enable" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_aoc_events_enable" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_aoc_events_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_aoc_events_enable" = xyes
+then :
   AST_PRI_AOC_EVENTS_FOUND=yes
-else
+else $as_nop
   AST_PRI_AOC_EVENTS_FOUND=no
 fi
 
@@ -28348,14 +30358,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_AOC_EVENTS_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_AOC_EVENTS_HEADER_FOUND=1
-else
+else $as_nop
   PRI_AOC_EVENTS_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_AOC_EVENTS_HEADER_FOUND}" = "x0" ; then
@@ -28387,11 +30397,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_transfer_enable in -lpri" >&5
-$as_echo_n "checking for pri_transfer_enable in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_transfer_enable+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_transfer_enable in -lpri" >&5
+printf %s "checking for pri_transfer_enable in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_transfer_enable+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28400,32 +30411,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_transfer_enable ();
 int
-main ()
+main (void)
 {
 return pri_transfer_enable ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_transfer_enable=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_transfer_enable=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_transfer_enable" >&5
-$as_echo "$ac_cv_lib_pri_pri_transfer_enable" >&6; }
-if test "x$ac_cv_lib_pri_pri_transfer_enable" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_transfer_enable" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_transfer_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_transfer_enable" = xyes
+then :
   AST_PRI_TRANSFER_FOUND=yes
-else
+else $as_nop
   AST_PRI_TRANSFER_FOUND=no
 fi
 
@@ -28444,14 +30454,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_TRANSFER_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_TRANSFER_HEADER_FOUND=1
-else
+else $as_nop
   PRI_TRANSFER_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_TRANSFER_HEADER_FOUND}" = "x0" ; then
@@ -28483,45 +30493,45 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_cc_enable in -lpri" >&5
-$as_echo_n "checking for pri_cc_enable in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_cc_enable+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_cc_enable in -lpri" >&5
+printf %s "checking for pri_cc_enable in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_cc_enable+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 char pri_cc_enable ();
 int
-main ()
+main (void)
 {
 return pri_cc_enable ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_cc_enable=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_cc_enable=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_cc_enable" >&5
-$as_echo "$ac_cv_lib_pri_pri_cc_enable" >&6; }
-if test "x$ac_cv_lib_pri_pri_cc_enable" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_cc_enable" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_cc_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_cc_enable" = xyes
+then :
   AST_PRI_CCSS_FOUND=yes
-else
+else $as_nop
   AST_PRI_CCSS_FOUND=no
 fi
 
@@ -28540,14 +30550,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_CCSS_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_CCSS_HEADER_FOUND=1
-else
+else $as_nop
   PRI_CCSS_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_CCSS_HEADER_FOUND}" = "x0" ; then
@@ -28579,11 +30589,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_hangup_fix_enable in -lpri" >&5
-$as_echo_n "checking for pri_hangup_fix_enable in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_hangup_fix_enable+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_hangup_fix_enable in -lpri" >&5
+printf %s "checking for pri_hangup_fix_enable in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_hangup_fix_enable+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28592,32 +30603,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_hangup_fix_enable ();
 int
-main ()
+main (void)
 {
 return pri_hangup_fix_enable ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_hangup_fix_enable=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_hangup_fix_enable=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_hangup_fix_enable" >&5
-$as_echo "$ac_cv_lib_pri_pri_hangup_fix_enable" >&6; }
-if test "x$ac_cv_lib_pri_pri_hangup_fix_enable" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_hangup_fix_enable" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_hangup_fix_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_hangup_fix_enable" = xyes
+then :
   AST_PRI_HANGUP_FIX_FOUND=yes
-else
+else $as_nop
   AST_PRI_HANGUP_FIX_FOUND=no
 fi
 
@@ -28636,14 +30646,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_HANGUP_FIX_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_HANGUP_FIX_HEADER_FOUND=1
-else
+else $as_nop
   PRI_HANGUP_FIX_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_HANGUP_FIX_HEADER_FOUND}" = "x0" ; then
@@ -28675,11 +30685,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_sr_set_called_subaddress in -lpri" >&5
-$as_echo_n "checking for pri_sr_set_called_subaddress in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_sr_set_called_subaddress+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_sr_set_called_subaddress in -lpri" >&5
+printf %s "checking for pri_sr_set_called_subaddress in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_sr_set_called_subaddress+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28688,32 +30699,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_sr_set_called_subaddress ();
 int
-main ()
+main (void)
 {
 return pri_sr_set_called_subaddress ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_sr_set_called_subaddress=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_sr_set_called_subaddress=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_called_subaddress" >&5
-$as_echo "$ac_cv_lib_pri_pri_sr_set_called_subaddress" >&6; }
-if test "x$ac_cv_lib_pri_pri_sr_set_called_subaddress" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_called_subaddress" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_sr_set_called_subaddress" >&6; }
+if test "x$ac_cv_lib_pri_pri_sr_set_called_subaddress" = xyes
+then :
   AST_PRI_SUBADDR_FOUND=yes
-else
+else $as_nop
   AST_PRI_SUBADDR_FOUND=no
 fi
 
@@ -28732,14 +30742,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_SUBADDR_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_SUBADDR_HEADER_FOUND=1
-else
+else $as_nop
   PRI_SUBADDR_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_SUBADDR_HEADER_FOUND}" = "x0" ; then
@@ -28771,11 +30781,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_hold_enable in -lpri" >&5
-$as_echo_n "checking for pri_hold_enable in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_hold_enable+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_hold_enable in -lpri" >&5
+printf %s "checking for pri_hold_enable in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_hold_enable+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28784,32 +30795,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_hold_enable ();
 int
-main ()
+main (void)
 {
 return pri_hold_enable ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_hold_enable=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_hold_enable=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_hold_enable" >&5
-$as_echo "$ac_cv_lib_pri_pri_hold_enable" >&6; }
-if test "x$ac_cv_lib_pri_pri_hold_enable" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_hold_enable" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_hold_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_hold_enable" = xyes
+then :
   AST_PRI_CALL_HOLD_FOUND=yes
-else
+else $as_nop
   AST_PRI_CALL_HOLD_FOUND=no
 fi
 
@@ -28828,14 +30838,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_CALL_HOLD_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_CALL_HOLD_HEADER_FOUND=1
-else
+else $as_nop
   PRI_CALL_HOLD_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_CALL_HOLD_HEADER_FOUND}" = "x0" ; then
@@ -28867,11 +30877,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_reroute_enable in -lpri" >&5
-$as_echo_n "checking for pri_reroute_enable in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_reroute_enable+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_reroute_enable in -lpri" >&5
+printf %s "checking for pri_reroute_enable in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_reroute_enable+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28880,32 +30891,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_reroute_enable ();
 int
-main ()
+main (void)
 {
 return pri_reroute_enable ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_reroute_enable=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_reroute_enable=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_reroute_enable" >&5
-$as_echo "$ac_cv_lib_pri_pri_reroute_enable" >&6; }
-if test "x$ac_cv_lib_pri_pri_reroute_enable" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_reroute_enable" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_reroute_enable" >&6; }
+if test "x$ac_cv_lib_pri_pri_reroute_enable" = xyes
+then :
   AST_PRI_CALL_REROUTING_FOUND=yes
-else
+else $as_nop
   AST_PRI_CALL_REROUTING_FOUND=no
 fi
 
@@ -28924,14 +30934,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_CALL_REROUTING_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_CALL_REROUTING_HEADER_FOUND=1
-else
+else $as_nop
   PRI_CALL_REROUTING_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_CALL_REROUTING_HEADER_FOUND}" = "x0" ; then
@@ -28963,11 +30973,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_sr_set_keypad_digits in -lpri" >&5
-$as_echo_n "checking for pri_sr_set_keypad_digits in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_sr_set_keypad_digits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_sr_set_keypad_digits in -lpri" >&5
+printf %s "checking for pri_sr_set_keypad_digits in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_sr_set_keypad_digits+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28976,32 +30987,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_sr_set_keypad_digits ();
 int
-main ()
+main (void)
 {
 return pri_sr_set_keypad_digits ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_sr_set_keypad_digits=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_sr_set_keypad_digits=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_keypad_digits" >&5
-$as_echo "$ac_cv_lib_pri_pri_sr_set_keypad_digits" >&6; }
-if test "x$ac_cv_lib_pri_pri_sr_set_keypad_digits" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_keypad_digits" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_sr_set_keypad_digits" >&6; }
+if test "x$ac_cv_lib_pri_pri_sr_set_keypad_digits" = xyes
+then :
   AST_PRI_SETUP_KEYPAD_FOUND=yes
-else
+else $as_nop
   AST_PRI_SETUP_KEYPAD_FOUND=no
 fi
 
@@ -29020,14 +31030,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_SETUP_KEYPAD_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_SETUP_KEYPAD_HEADER_FOUND=1
-else
+else $as_nop
   PRI_SETUP_KEYPAD_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_SETUP_KEYPAD_HEADER_FOUND}" = "x0" ; then
@@ -29063,11 +31073,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_progress_with_cause in -lpri" >&5
-$as_echo_n "checking for pri_progress_with_cause in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_progress_with_cause+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_progress_with_cause in -lpri" >&5
+printf %s "checking for pri_progress_with_cause in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_progress_with_cause+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29076,32 +31087,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_progress_with_cause ();
 int
-main ()
+main (void)
 {
 return pri_progress_with_cause ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_progress_with_cause=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_progress_with_cause=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_progress_with_cause" >&5
-$as_echo "$ac_cv_lib_pri_pri_progress_with_cause" >&6; }
-if test "x$ac_cv_lib_pri_pri_progress_with_cause" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_progress_with_cause" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_progress_with_cause" >&6; }
+if test "x$ac_cv_lib_pri_pri_progress_with_cause" = xyes
+then :
   AST_PRI_PROG_W_CAUSE_FOUND=yes
-else
+else $as_nop
   AST_PRI_PROG_W_CAUSE_FOUND=no
 fi
 
@@ -29120,14 +31130,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_PROG_W_CAUSE_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_PROG_W_CAUSE_HEADER_FOUND=1
-else
+else $as_nop
   PRI_PROG_W_CAUSE_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_PROG_W_CAUSE_HEADER_FOUND}" = "x0" ; then
@@ -29159,11 +31169,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_set_inbanddisconnect in -lpri" >&5
-$as_echo_n "checking for pri_set_inbanddisconnect in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_set_inbanddisconnect+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_set_inbanddisconnect in -lpri" >&5
+printf %s "checking for pri_set_inbanddisconnect in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_set_inbanddisconnect+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29172,32 +31183,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_set_inbanddisconnect ();
 int
-main ()
+main (void)
 {
 return pri_set_inbanddisconnect ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_set_inbanddisconnect=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_set_inbanddisconnect=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_set_inbanddisconnect" >&5
-$as_echo "$ac_cv_lib_pri_pri_set_inbanddisconnect" >&6; }
-if test "x$ac_cv_lib_pri_pri_set_inbanddisconnect" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_set_inbanddisconnect" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_set_inbanddisconnect" >&6; }
+if test "x$ac_cv_lib_pri_pri_set_inbanddisconnect" = xyes
+then :
   AST_PRI_INBANDDISCONNECT_FOUND=yes
-else
+else $as_nop
   AST_PRI_INBANDDISCONNECT_FOUND=no
 fi
 
@@ -29216,14 +31226,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_INBANDDISCONNECT_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_INBANDDISCONNECT_HEADER_FOUND=1
-else
+else $as_nop
   PRI_INBANDDISCONNECT_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_INBANDDISCONNECT_HEADER_FOUND}" = "x0" ; then
@@ -29255,11 +31265,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_maintenance_service in -lpri" >&5
-$as_echo_n "checking for pri_maintenance_service in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_maintenance_service+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_maintenance_service in -lpri" >&5
+printf %s "checking for pri_maintenance_service in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_maintenance_service+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29268,32 +31279,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_maintenance_service ();
 int
-main ()
+main (void)
 {
 return pri_maintenance_service ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_maintenance_service=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_maintenance_service=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_maintenance_service" >&5
-$as_echo "$ac_cv_lib_pri_pri_maintenance_service" >&6; }
-if test "x$ac_cv_lib_pri_pri_maintenance_service" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_maintenance_service" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_maintenance_service" >&6; }
+if test "x$ac_cv_lib_pri_pri_maintenance_service" = xyes
+then :
   AST_PRI_SERVICE_MESSAGES_FOUND=yes
-else
+else $as_nop
   AST_PRI_SERVICE_MESSAGES_FOUND=no
 fi
 
@@ -29312,14 +31322,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_SERVICE_MESSAGES_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_SERVICE_MESSAGES_HEADER_FOUND=1
-else
+else $as_nop
   PRI_SERVICE_MESSAGES_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_SERVICE_MESSAGES_HEADER_FOUND}" = "x0" ; then
@@ -29351,11 +31361,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pri_sr_set_reversecharge in -lpri" >&5
-$as_echo_n "checking for pri_sr_set_reversecharge in -lpri... " >&6; }
-if ${ac_cv_lib_pri_pri_sr_set_reversecharge+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pri_sr_set_reversecharge in -lpri" >&5
+printf %s "checking for pri_sr_set_reversecharge in -lpri... " >&6; }
+if test ${ac_cv_lib_pri_pri_sr_set_reversecharge+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpri ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29364,32 +31375,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pri_sr_set_reversecharge ();
 int
-main ()
+main (void)
 {
 return pri_sr_set_reversecharge ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pri_pri_sr_set_reversecharge=yes
-else
+else $as_nop
   ac_cv_lib_pri_pri_sr_set_reversecharge=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_reversecharge" >&5
-$as_echo "$ac_cv_lib_pri_pri_sr_set_reversecharge" >&6; }
-if test "x$ac_cv_lib_pri_pri_sr_set_reversecharge" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pri_pri_sr_set_reversecharge" >&5
+printf "%s\n" "$ac_cv_lib_pri_pri_sr_set_reversecharge" >&6; }
+if test "x$ac_cv_lib_pri_pri_sr_set_reversecharge" = xyes
+then :
   AST_PRI_REVERSE_CHARGE_FOUND=yes
-else
+else $as_nop
   AST_PRI_REVERSE_CHARGE_FOUND=no
 fi
 
@@ -29408,14 +31418,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${PRI_REVERSE_CHARGE_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
-if test "x$ac_cv_header_libpri_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libpri.h" "ac_cv_header_libpri_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpri_h" = xyes
+then :
   PRI_REVERSE_CHARGE_HEADER_FOUND=1
-else
+else $as_nop
   PRI_REVERSE_CHARGE_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${PRI_REVERSE_CHARGE_HEADER_FOUND}" = "x0" ; then
@@ -29450,11 +31460,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resample_open in -lresample" >&5
-$as_echo_n "checking for resample_open in -lresample... " >&6; }
-if ${ac_cv_lib_resample_resample_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for resample_open in -lresample" >&5
+printf %s "checking for resample_open in -lresample... " >&6; }
+if test ${ac_cv_lib_resample_resample_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresample ${pbxlibdir} -lm $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29463,32 +31474,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char resample_open ();
 int
-main ()
+main (void)
 {
 return resample_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_resample_resample_open=yes
-else
+else $as_nop
   ac_cv_lib_resample_resample_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resample_resample_open" >&5
-$as_echo "$ac_cv_lib_resample_resample_open" >&6; }
-if test "x$ac_cv_lib_resample_resample_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resample_resample_open" >&5
+printf "%s\n" "$ac_cv_lib_resample_resample_open" >&6; }
+if test "x$ac_cv_lib_resample_resample_open" = xyes
+then :
   AST_RESAMPLE_FOUND=yes
-else
+else $as_nop
   AST_RESAMPLE_FOUND=no
 fi
 
@@ -29507,14 +31517,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${RESAMPLE_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libresample.h" "ac_cv_header_libresample_h" "$ac_includes_default"
-if test "x$ac_cv_header_libresample_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libresample.h" "ac_cv_header_libresample_h" "$ac_includes_default"
+if test "x$ac_cv_header_libresample_h" = xyes
+then :
   RESAMPLE_HEADER_FOUND=1
-else
+else $as_nop
   RESAMPLE_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${RESAMPLE_HEADER_FOUND}" = "x0" ; then
@@ -29546,11 +31556,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_malloc in -lfftw3" >&5
-$as_echo_n "checking for fftw_malloc in -lfftw3... " >&6; }
-if ${ac_cv_lib_fftw3_fftw_malloc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fftw_malloc in -lfftw3" >&5
+printf %s "checking for fftw_malloc in -lfftw3... " >&6; }
+if test ${ac_cv_lib_fftw3_fftw_malloc+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfftw3 ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29559,32 +31570,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char fftw_malloc ();
 int
-main ()
+main (void)
 {
 return fftw_malloc ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_fftw3_fftw_malloc=yes
-else
+else $as_nop
   ac_cv_lib_fftw3_fftw_malloc=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_malloc" >&5
-$as_echo "$ac_cv_lib_fftw3_fftw_malloc" >&6; }
-if test "x$ac_cv_lib_fftw3_fftw_malloc" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_malloc" >&5
+printf "%s\n" "$ac_cv_lib_fftw3_fftw_malloc" >&6; }
+if test "x$ac_cv_lib_fftw3_fftw_malloc" = xyes
+then :
   AST_FFTW3_FOUND=yes
-else
+else $as_nop
   AST_FFTW3_FOUND=no
 fi
 
@@ -29603,14 +31613,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${FFTW3_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default"
-if test "x$ac_cv_header_fftw3_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default"
+if test "x$ac_cv_header_fftw3_h" = xyes
+then :
   FFTW3_HEADER_FOUND=1
-else
+else $as_nop
   FFTW3_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${FFTW3_HEADER_FOUND}" = "x0" ; then
@@ -29642,11 +31652,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sf_open in -lsndfile" >&5
-$as_echo_n "checking for sf_open in -lsndfile... " >&6; }
-if ${ac_cv_lib_sndfile_sf_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sf_open in -lsndfile" >&5
+printf %s "checking for sf_open in -lsndfile... " >&6; }
+if test ${ac_cv_lib_sndfile_sf_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsndfile ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29655,32 +31666,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sf_open ();
 int
-main ()
+main (void)
 {
 return sf_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_sndfile_sf_open=yes
-else
+else $as_nop
   ac_cv_lib_sndfile_sf_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sndfile_sf_open" >&5
-$as_echo "$ac_cv_lib_sndfile_sf_open" >&6; }
-if test "x$ac_cv_lib_sndfile_sf_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sndfile_sf_open" >&5
+printf "%s\n" "$ac_cv_lib_sndfile_sf_open" >&6; }
+if test "x$ac_cv_lib_sndfile_sf_open" = xyes
+then :
   AST_SNDFILE_FOUND=yes
-else
+else $as_nop
   AST_SNDFILE_FOUND=no
 fi
 
@@ -29699,14 +31709,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SNDFILE_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "sndfile.h" "ac_cv_header_sndfile_h" "$ac_includes_default"
-if test "x$ac_cv_header_sndfile_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "sndfile.h" "ac_cv_header_sndfile_h" "$ac_includes_default"
+if test "x$ac_cv_header_sndfile_h" = xyes
+then :
   SNDFILE_HEADER_FOUND=1
-else
+else $as_nop
   SNDFILE_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SNDFILE_HEADER_FOUND}" = "x0" ; then
@@ -29727,8 +31737,8 @@
 
 
     if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for minimum version of SpanDSP" >&5
-$as_echo_n "checking for minimum version of SpanDSP... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for minimum version of SpanDSP" >&5
+printf %s "checking for minimum version of SpanDSP... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${SPANDSP_DIR}" != "x"; then
 	    SPANDSP_INCLUDE="-I${SPANDSP_DIR}/include"
@@ -29739,7 +31749,7 @@
 /* end confdefs.h.  */
  #include <spandsp/version.h>
 int
-main ()
+main (void)
 {
 
 		#if SPANDSP_RELEASE_DATE < 20080516
@@ -29751,21 +31761,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_SPANDSP=1
 
-$as_echo "#define HAVE_SPANDSP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SPANDSP 1" >>confdefs.h
 
 
 
-else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
@@ -29788,11 +31799,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for span_set_message_handler in -lspandsp" >&5
-$as_echo_n "checking for span_set_message_handler in -lspandsp... " >&6; }
-if ${ac_cv_lib_spandsp_span_set_message_handler+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for span_set_message_handler in -lspandsp" >&5
+printf %s "checking for span_set_message_handler in -lspandsp... " >&6; }
+if test ${ac_cv_lib_spandsp_span_set_message_handler+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lspandsp ${pbxlibdir} -ltiff $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29801,32 +31813,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char span_set_message_handler ();
 int
-main ()
+main (void)
 {
 return span_set_message_handler ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_spandsp_span_set_message_handler=yes
-else
+else $as_nop
   ac_cv_lib_spandsp_span_set_message_handler=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spandsp_span_set_message_handler" >&5
-$as_echo "$ac_cv_lib_spandsp_span_set_message_handler" >&6; }
-if test "x$ac_cv_lib_spandsp_span_set_message_handler" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spandsp_span_set_message_handler" >&5
+printf "%s\n" "$ac_cv_lib_spandsp_span_set_message_handler" >&6; }
+if test "x$ac_cv_lib_spandsp_span_set_message_handler" = xyes
+then :
   AST_SPANDSP_FOUND=yes
-else
+else $as_nop
   AST_SPANDSP_FOUND=no
 fi
 
@@ -29845,14 +31856,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "spandsp.h" "ac_cv_header_spandsp_h" "$ac_includes_default"
-if test "x$ac_cv_header_spandsp_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "spandsp.h" "ac_cv_header_spandsp_h" "$ac_includes_default"
+if test "x$ac_cv_header_spandsp_h" = xyes
+then :
   SPANDSP_HEADER_FOUND=1
-else
+else $as_nop
   SPANDSP_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then
@@ -29889,11 +31900,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for t38_terminal_init in -lspandsp" >&5
-$as_echo_n "checking for t38_terminal_init in -lspandsp... " >&6; }
-if ${ac_cv_lib_spandsp_t38_terminal_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for t38_terminal_init in -lspandsp" >&5
+printf %s "checking for t38_terminal_init in -lspandsp... " >&6; }
+if test ${ac_cv_lib_spandsp_t38_terminal_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lspandsp ${pbxlibdir} -ltiff $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29902,32 +31914,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char t38_terminal_init ();
 int
-main ()
+main (void)
 {
 return t38_terminal_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_spandsp_t38_terminal_init=yes
-else
+else $as_nop
   ac_cv_lib_spandsp_t38_terminal_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spandsp_t38_terminal_init" >&5
-$as_echo "$ac_cv_lib_spandsp_t38_terminal_init" >&6; }
-if test "x$ac_cv_lib_spandsp_t38_terminal_init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_spandsp_t38_terminal_init" >&5
+printf "%s\n" "$ac_cv_lib_spandsp_t38_terminal_init" >&6; }
+if test "x$ac_cv_lib_spandsp_t38_terminal_init" = xyes
+then :
   AST_SPANDSP_FOUND=yes
-else
+else $as_nop
   AST_SPANDSP_FOUND=no
 fi
 
@@ -29946,14 +31957,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SPANDSP_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "spandsp.h" "ac_cv_header_spandsp_h" "$ac_includes_default"
-if test "x$ac_cv_header_spandsp_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "spandsp.h" "ac_cv_header_spandsp_h" "$ac_includes_default"
+if test "x$ac_cv_header_spandsp_h" = xyes
+then :
   SPANDSP_HEADER_FOUND=1
-else
+else $as_nop
   SPANDSP_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SPANDSP_HEADER_FOUND}" = "x0" ; then
@@ -29988,11 +31999,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ss7_set_isup_timer in -lss7" >&5
-$as_echo_n "checking for ss7_set_isup_timer in -lss7... " >&6; }
-if ${ac_cv_lib_ss7_ss7_set_isup_timer+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ss7_set_isup_timer in -lss7" >&5
+printf %s "checking for ss7_set_isup_timer in -lss7... " >&6; }
+if test ${ac_cv_lib_ss7_ss7_set_isup_timer+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lss7 ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30001,32 +32013,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char ss7_set_isup_timer ();
 int
-main ()
+main (void)
 {
 return ss7_set_isup_timer ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ss7_ss7_set_isup_timer=yes
-else
+else $as_nop
   ac_cv_lib_ss7_ss7_set_isup_timer=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ss7_ss7_set_isup_timer" >&5
-$as_echo "$ac_cv_lib_ss7_ss7_set_isup_timer" >&6; }
-if test "x$ac_cv_lib_ss7_ss7_set_isup_timer" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ss7_ss7_set_isup_timer" >&5
+printf "%s\n" "$ac_cv_lib_ss7_ss7_set_isup_timer" >&6; }
+if test "x$ac_cv_lib_ss7_ss7_set_isup_timer" = xyes
+then :
   AST_SS7_FOUND=yes
-else
+else $as_nop
   AST_SS7_FOUND=no
 fi
 
@@ -30045,14 +32056,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SS7_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "libss7.h" "ac_cv_header_libss7_h" "$ac_includes_default"
-if test "x$ac_cv_header_libss7_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "libss7.h" "ac_cv_header_libss7_h" "$ac_includes_default"
+if test "x$ac_cv_header_libss7_h" = xyes
+then :
   SS7_HEADER_FOUND=1
-else
+else $as_nop
   SS7_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SS7_HEADER_FOUND}" = "x0" ; then
@@ -30085,11 +32096,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openr2_chan_new in -lopenr2" >&5
-$as_echo_n "checking for openr2_chan_new in -lopenr2... " >&6; }
-if ${ac_cv_lib_openr2_openr2_chan_new+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openr2_chan_new in -lopenr2" >&5
+printf %s "checking for openr2_chan_new in -lopenr2... " >&6; }
+if test ${ac_cv_lib_openr2_openr2_chan_new+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lopenr2 ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30098,32 +32110,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char openr2_chan_new ();
 int
-main ()
+main (void)
 {
 return openr2_chan_new ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_openr2_openr2_chan_new=yes
-else
+else $as_nop
   ac_cv_lib_openr2_openr2_chan_new=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openr2_openr2_chan_new" >&5
-$as_echo "$ac_cv_lib_openr2_openr2_chan_new" >&6; }
-if test "x$ac_cv_lib_openr2_openr2_chan_new" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openr2_openr2_chan_new" >&5
+printf "%s\n" "$ac_cv_lib_openr2_openr2_chan_new" >&6; }
+if test "x$ac_cv_lib_openr2_openr2_chan_new" = xyes
+then :
   AST_OPENR2_FOUND=yes
-else
+else $as_nop
   AST_OPENR2_FOUND=no
 fi
 
@@ -30142,14 +32153,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OPENR2_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "openr2.h" "ac_cv_header_openr2_h" "$ac_includes_default"
-if test "x$ac_cv_header_openr2_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "openr2.h" "ac_cv_header_openr2_h" "$ac_includes_default"
+if test "x$ac_cv_header_openr2_h" = xyes
+then :
   OPENR2_HEADER_FOUND=1
-else
+else $as_nop
   OPENR2_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${OPENR2_HEADER_FOUND}" = "x0" ; then
@@ -30182,11 +32193,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opus_encoder_create in -lopus" >&5
-$as_echo_n "checking for opus_encoder_create in -lopus... " >&6; }
-if ${ac_cv_lib_opus_opus_encoder_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for opus_encoder_create in -lopus" >&5
+printf %s "checking for opus_encoder_create in -lopus... " >&6; }
+if test ${ac_cv_lib_opus_opus_encoder_create+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lopus ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30195,32 +32207,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char opus_encoder_create ();
 int
-main ()
+main (void)
 {
 return opus_encoder_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_opus_opus_encoder_create=yes
-else
+else $as_nop
   ac_cv_lib_opus_opus_encoder_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opus_opus_encoder_create" >&5
-$as_echo "$ac_cv_lib_opus_opus_encoder_create" >&6; }
-if test "x$ac_cv_lib_opus_opus_encoder_create" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opus_opus_encoder_create" >&5
+printf "%s\n" "$ac_cv_lib_opus_opus_encoder_create" >&6; }
+if test "x$ac_cv_lib_opus_opus_encoder_create" = xyes
+then :
   AST_OPUS_FOUND=yes
-else
+else $as_nop
   AST_OPUS_FOUND=no
 fi
 
@@ -30239,14 +32250,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OPUS_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "opus/opus.h" "ac_cv_header_opus_opus_h" "$ac_includes_default"
-if test "x$ac_cv_header_opus_opus_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "opus/opus.h" "ac_cv_header_opus_opus_h" "$ac_includes_default"
+if test "x$ac_cv_header_opus_opus_h" = xyes
+then :
   OPUS_HEADER_FOUND=1
-else
+else $as_nop
   OPUS_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${OPUS_HEADER_FOUND}" = "x0" ; then
@@ -30284,11 +32295,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} $__opus_include"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for op_open_callbacks in -lopusfile" >&5
-$as_echo_n "checking for op_open_callbacks in -lopusfile... " >&6; }
-if ${ac_cv_lib_opusfile_op_open_callbacks+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for op_open_callbacks in -lopusfile" >&5
+printf %s "checking for op_open_callbacks in -lopusfile... " >&6; }
+if test ${ac_cv_lib_opusfile_op_open_callbacks+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lopusfile ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30297,32 +32309,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char op_open_callbacks ();
 int
-main ()
+main (void)
 {
 return op_open_callbacks ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_opusfile_op_open_callbacks=yes
-else
+else $as_nop
   ac_cv_lib_opusfile_op_open_callbacks=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opusfile_op_open_callbacks" >&5
-$as_echo "$ac_cv_lib_opusfile_op_open_callbacks" >&6; }
-if test "x$ac_cv_lib_opusfile_op_open_callbacks" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opusfile_op_open_callbacks" >&5
+printf "%s\n" "$ac_cv_lib_opusfile_op_open_callbacks" >&6; }
+if test "x$ac_cv_lib_opusfile_op_open_callbacks" = xyes
+then :
   AST_OPUSFILE_FOUND=yes
-else
+else $as_nop
   AST_OPUSFILE_FOUND=no
 fi
 
@@ -30341,14 +32352,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${OPUSFILE_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "opus/opusfile.h" "ac_cv_header_opus_opusfile_h" "$ac_includes_default"
-if test "x$ac_cv_header_opus_opusfile_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "opus/opusfile.h" "ac_cv_header_opus_opusfile_h" "$ac_includes_default"
+if test "x$ac_cv_header_opus_opusfile_h" = xyes
+then :
   OPUSFILE_HEADER_FOUND=1
-else
+else $as_nop
   OPUSFILE_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${OPUSFILE_HEADER_FOUND}" = "x0" ; then
@@ -30382,12 +32393,13 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5
-$as_echo_n "checking for luaL_newstate in -llua${ver}... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua${ver}""_luaL_newstate" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5
+printf %s "checking for luaL_newstate in -llua${ver}... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-llua${ver} ${pbxlibdir} -lm $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30396,33 +32408,32 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char luaL_newstate ();
 int
-main ()
+main (void)
 {
 return luaL_newstate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
   AST_LUA_FOUND=yes
-else
+else $as_nop
   AST_LUA_FOUND=no
 fi
 
@@ -30441,15 +32452,15 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
-         as_ac_Header=`$as_echo "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+         as_ac_Header=`printf "%s\n" "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
   LUA_HEADER_FOUND=1
-else
+else $as_nop
   LUA_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${LUA_HEADER_FOUND}" = "x0" ; then
@@ -30493,11 +32504,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua" >&5
-$as_echo_n "checking for luaL_newstate in -llua... " >&6; }
-if ${ac_cv_lib_lua_luaL_newstate+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua" >&5
+printf %s "checking for luaL_newstate in -llua... " >&6; }
+if test ${ac_cv_lib_lua_luaL_newstate+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-llua ${pbxlibdir} -lm $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30506,32 +32518,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char luaL_newstate ();
 int
-main ()
+main (void)
 {
 return luaL_newstate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_lua_luaL_newstate=yes
-else
+else $as_nop
   ac_cv_lib_lua_luaL_newstate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_newstate" >&5
-$as_echo "$ac_cv_lib_lua_luaL_newstate" >&6; }
-if test "x$ac_cv_lib_lua_luaL_newstate" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_newstate" >&5
+printf "%s\n" "$ac_cv_lib_lua_luaL_newstate" >&6; }
+if test "x$ac_cv_lib_lua_luaL_newstate" = xyes
+then :
   AST_LUA_FOUND=yes
-else
+else $as_nop
   AST_LUA_FOUND=no
 fi
 
@@ -30550,14 +32561,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "lua.h" "ac_cv_header_lua_h" "$ac_includes_default"
-if test "x$ac_cv_header_lua_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "lua.h" "ac_cv_header_lua_h" "$ac_includes_default"
+if test "x$ac_cv_header_lua_h" = xyes
+then :
   LUA_HEADER_FOUND=1
-else
+else $as_nop
   LUA_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${LUA_HEADER_FOUND}" = "x0" ; then
@@ -30593,11 +32604,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lfreeradius-client" >&5
-$as_echo_n "checking for rc_read_config in -lfreeradius-client... " >&6; }
-if ${ac_cv_lib_freeradius_client_rc_read_config+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lfreeradius-client" >&5
+printf %s "checking for rc_read_config in -lfreeradius-client... " >&6; }
+if test ${ac_cv_lib_freeradius_client_rc_read_config+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfreeradius-client ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30606,32 +32618,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rc_read_config ();
 int
-main ()
+main (void)
 {
 return rc_read_config ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_freeradius_client_rc_read_config=yes
-else
+else $as_nop
   ac_cv_lib_freeradius_client_rc_read_config=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freeradius_client_rc_read_config" >&5
-$as_echo "$ac_cv_lib_freeradius_client_rc_read_config" >&6; }
-if test "x$ac_cv_lib_freeradius_client_rc_read_config" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freeradius_client_rc_read_config" >&5
+printf "%s\n" "$ac_cv_lib_freeradius_client_rc_read_config" >&6; }
+if test "x$ac_cv_lib_freeradius_client_rc_read_config" = xyes
+then :
   AST_RADIUS_FOUND=yes
-else
+else $as_nop
   AST_RADIUS_FOUND=no
 fi
 
@@ -30650,14 +32661,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "freeradius-client.h" "ac_cv_header_freeradius_client_h" "$ac_includes_default"
-if test "x$ac_cv_header_freeradius_client_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "freeradius-client.h" "ac_cv_header_freeradius_client_h" "$ac_includes_default"
+if test "x$ac_cv_header_freeradius_client_h" = xyes
+then :
   RADIUS_HEADER_FOUND=1
-else
+else $as_nop
   RADIUS_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then
@@ -30677,7 +32688,7 @@
 
 if test "x${PBX_RADIUS}" = "x1"; then
 
-$as_echo "#define RADIUS_HEADER_STR <freeradius-client.h>" >>confdefs.h
+printf "%s\n" "#define RADIUS_HEADER_STR <freeradius-client.h>" >>confdefs.h
 
 else
 
@@ -30694,11 +32705,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradiusclient-ng" >&5
-$as_echo_n "checking for rc_read_config in -lradiusclient-ng... " >&6; }
-if ${ac_cv_lib_radiusclient_ng_rc_read_config+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradiusclient-ng" >&5
+printf %s "checking for rc_read_config in -lradiusclient-ng... " >&6; }
+if test ${ac_cv_lib_radiusclient_ng_rc_read_config+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lradiusclient-ng ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30707,32 +32719,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rc_read_config ();
 int
-main ()
+main (void)
 {
 return rc_read_config ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_radiusclient_ng_rc_read_config=yes
-else
+else $as_nop
   ac_cv_lib_radiusclient_ng_rc_read_config=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radiusclient_ng_rc_read_config" >&5
-$as_echo "$ac_cv_lib_radiusclient_ng_rc_read_config" >&6; }
-if test "x$ac_cv_lib_radiusclient_ng_rc_read_config" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radiusclient_ng_rc_read_config" >&5
+printf "%s\n" "$ac_cv_lib_radiusclient_ng_rc_read_config" >&6; }
+if test "x$ac_cv_lib_radiusclient_ng_rc_read_config" = xyes
+then :
   AST_RADIUS_FOUND=yes
-else
+else $as_nop
   AST_RADIUS_FOUND=no
 fi
 
@@ -30751,14 +32762,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "radiusclient-ng.h" "ac_cv_header_radiusclient_ng_h" "$ac_includes_default"
-if test "x$ac_cv_header_radiusclient_ng_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "radiusclient-ng.h" "ac_cv_header_radiusclient_ng_h" "$ac_includes_default"
+if test "x$ac_cv_header_radiusclient_ng_h" = xyes
+then :
   RADIUS_HEADER_FOUND=1
-else
+else $as_nop
   RADIUS_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then
@@ -30778,7 +32789,7 @@
 
 	if test "x${PBX_RADIUS}" = "x1"; then
 
-$as_echo "#define RADIUS_HEADER_STR <radiusclient-ng.h>" >>confdefs.h
+printf "%s\n" "#define RADIUS_HEADER_STR <radiusclient-ng.h>" >>confdefs.h
 
 	else
 
@@ -30795,11 +32806,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradcli" >&5
-$as_echo_n "checking for rc_read_config in -lradcli... " >&6; }
-if ${ac_cv_lib_radcli_rc_read_config+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradcli" >&5
+printf %s "checking for rc_read_config in -lradcli... " >&6; }
+if test ${ac_cv_lib_radcli_rc_read_config+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lradcli ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30808,32 +32820,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char rc_read_config ();
 int
-main ()
+main (void)
 {
 return rc_read_config ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_radcli_rc_read_config=yes
-else
+else $as_nop
   ac_cv_lib_radcli_rc_read_config=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radcli_rc_read_config" >&5
-$as_echo "$ac_cv_lib_radcli_rc_read_config" >&6; }
-if test "x$ac_cv_lib_radcli_rc_read_config" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radcli_rc_read_config" >&5
+printf "%s\n" "$ac_cv_lib_radcli_rc_read_config" >&6; }
+if test "x$ac_cv_lib_radcli_rc_read_config" = xyes
+then :
   AST_RADIUS_FOUND=yes
-else
+else $as_nop
   AST_RADIUS_FOUND=no
 fi
 
@@ -30852,14 +32863,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "radcli/radcli.h" "ac_cv_header_radcli_radcli_h" "$ac_includes_default"
-if test "x$ac_cv_header_radcli_radcli_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "radcli/radcli.h" "ac_cv_header_radcli_radcli_h" "$ac_includes_default"
+if test "x$ac_cv_header_radcli_radcli_h" = xyes
+then :
   RADIUS_HEADER_FOUND=1
-else
+else $as_nop
   RADIUS_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then
@@ -30879,7 +32890,7 @@
 
 		if test "x${PBX_RADIUS}" = "x1"; then
 
-$as_echo "#define RADIUS_HEADER_STR <radcli/radcli.h>" >>confdefs.h
+printf "%s\n" "#define RADIUS_HEADER_STR <radcli/radcli.h>" >>confdefs.h
 
 		fi
 	fi
@@ -30899,11 +32910,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for codec2_create in -lcodec2" >&5
-$as_echo_n "checking for codec2_create in -lcodec2... " >&6; }
-if ${ac_cv_lib_codec2_codec2_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for codec2_create in -lcodec2" >&5
+printf %s "checking for codec2_create in -lcodec2... " >&6; }
+if test ${ac_cv_lib_codec2_codec2_create+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcodec2 ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30912,32 +32924,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char codec2_create ();
 int
-main ()
+main (void)
 {
 return codec2_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_codec2_codec2_create=yes
-else
+else $as_nop
   ac_cv_lib_codec2_codec2_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_codec2_codec2_create" >&5
-$as_echo "$ac_cv_lib_codec2_codec2_create" >&6; }
-if test "x$ac_cv_lib_codec2_codec2_create" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_codec2_codec2_create" >&5
+printf "%s\n" "$ac_cv_lib_codec2_codec2_create" >&6; }
+if test "x$ac_cv_lib_codec2_codec2_create" = xyes
+then :
   AST_CODEC2_FOUND=yes
-else
+else $as_nop
   AST_CODEC2_FOUND=no
 fi
 
@@ -30956,14 +32967,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${CODEC2_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "codec2/codec2.h" "ac_cv_header_codec2_codec2_h" "$ac_includes_default"
-if test "x$ac_cv_header_codec2_codec2_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "codec2/codec2.h" "ac_cv_header_codec2_codec2_h" "$ac_includes_default"
+if test "x$ac_cv_header_codec2_codec2_h" = xyes
+then :
   CODEC2_HEADER_FOUND=1
-else
+else $as_nop
   CODEC2_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${CODEC2_HEADER_FOUND}" = "x0" ; then
@@ -30996,11 +33007,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cpg_join in -lcpg" >&5
-$as_echo_n "checking for cpg_join in -lcpg... " >&6; }
-if ${ac_cv_lib_cpg_cpg_join+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cpg_join in -lcpg" >&5
+printf %s "checking for cpg_join in -lcpg... " >&6; }
+if test ${ac_cv_lib_cpg_cpg_join+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcpg ${pbxlibdir} -lcpg -lcfg $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31009,32 +33021,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char cpg_join ();
 int
-main ()
+main (void)
 {
 return cpg_join ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_cpg_cpg_join=yes
-else
+else $as_nop
   ac_cv_lib_cpg_cpg_join=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cpg_cpg_join" >&5
-$as_echo "$ac_cv_lib_cpg_cpg_join" >&6; }
-if test "x$ac_cv_lib_cpg_cpg_join" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cpg_cpg_join" >&5
+printf "%s\n" "$ac_cv_lib_cpg_cpg_join" >&6; }
+if test "x$ac_cv_lib_cpg_cpg_join" = xyes
+then :
   AST_COROSYNC_FOUND=yes
-else
+else $as_nop
   AST_COROSYNC_FOUND=no
 fi
 
@@ -31053,14 +33064,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${COROSYNC_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "corosync/cpg.h" "ac_cv_header_corosync_cpg_h" "$ac_includes_default"
-if test "x$ac_cv_header_corosync_cpg_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "corosync/cpg.h" "ac_cv_header_corosync_cpg_h" "$ac_includes_default"
+if test "x$ac_cv_header_corosync_cpg_h" = xyes
+then :
   COROSYNC_HEADER_FOUND=1
-else
+else $as_nop
   COROSYNC_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${COROSYNC_HEADER_FOUND}" = "x0" ; then
@@ -31092,11 +33103,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for corosync_cfg_state_track in -lcfg" >&5
-$as_echo_n "checking for corosync_cfg_state_track in -lcfg... " >&6; }
-if ${ac_cv_lib_cfg_corosync_cfg_state_track+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for corosync_cfg_state_track in -lcfg" >&5
+printf %s "checking for corosync_cfg_state_track in -lcfg... " >&6; }
+if test ${ac_cv_lib_cfg_corosync_cfg_state_track+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcfg ${pbxlibdir} -lcfg $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31105,32 +33117,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char corosync_cfg_state_track ();
 int
-main ()
+main (void)
 {
 return corosync_cfg_state_track ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_cfg_corosync_cfg_state_track=yes
-else
+else $as_nop
   ac_cv_lib_cfg_corosync_cfg_state_track=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cfg_corosync_cfg_state_track" >&5
-$as_echo "$ac_cv_lib_cfg_corosync_cfg_state_track" >&6; }
-if test "x$ac_cv_lib_cfg_corosync_cfg_state_track" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cfg_corosync_cfg_state_track" >&5
+printf "%s\n" "$ac_cv_lib_cfg_corosync_cfg_state_track" >&6; }
+if test "x$ac_cv_lib_cfg_corosync_cfg_state_track" = xyes
+then :
   AST_COROSYNC_CFG_STATE_TRACK_FOUND=yes
-else
+else $as_nop
   AST_COROSYNC_CFG_STATE_TRACK_FOUND=no
 fi
 
@@ -31149,14 +33160,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${COROSYNC_CFG_STATE_TRACK_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "corosync/cfg.h" "ac_cv_header_corosync_cfg_h" "$ac_includes_default"
-if test "x$ac_cv_header_corosync_cfg_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "corosync/cfg.h" "ac_cv_header_corosync_cfg_h" "$ac_includes_default"
+if test "x$ac_cv_header_corosync_cfg_h" = xyes
+then :
   COROSYNC_CFG_STATE_TRACK_HEADER_FOUND=1
-else
+else $as_nop
   COROSYNC_CFG_STATE_TRACK_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${COROSYNC_CFG_STATE_TRACK_HEADER_FOUND}" = "x0" ; then
@@ -31189,11 +33200,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speex_encode in -lspeex" >&5
-$as_echo_n "checking for speex_encode in -lspeex... " >&6; }
-if ${ac_cv_lib_speex_speex_encode+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for speex_encode in -lspeex" >&5
+printf %s "checking for speex_encode in -lspeex... " >&6; }
+if test ${ac_cv_lib_speex_speex_encode+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lspeex ${pbxlibdir} -lm $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31202,32 +33214,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char speex_encode ();
 int
-main ()
+main (void)
 {
 return speex_encode ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_speex_speex_encode=yes
-else
+else $as_nop
   ac_cv_lib_speex_speex_encode=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speex_speex_encode" >&5
-$as_echo "$ac_cv_lib_speex_speex_encode" >&6; }
-if test "x$ac_cv_lib_speex_speex_encode" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speex_speex_encode" >&5
+printf "%s\n" "$ac_cv_lib_speex_speex_encode" >&6; }
+if test "x$ac_cv_lib_speex_speex_encode" = xyes
+then :
   AST_SPEEX_FOUND=yes
-else
+else $as_nop
   AST_SPEEX_FOUND=no
 fi
 
@@ -31246,14 +33257,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SPEEX_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default"
-if test "x$ac_cv_header_speex_speex_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default"
+if test "x$ac_cv_header_speex_speex_h" = xyes
+then :
   SPEEX_HEADER_FOUND=1
-else
+else $as_nop
   SPEEX_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SPEEX_HEADER_FOUND}" = "x0" ; then
@@ -31287,11 +33298,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speex_preprocess_ctl in -lspeex" >&5
-$as_echo_n "checking for speex_preprocess_ctl in -lspeex... " >&6; }
-if ${ac_cv_lib_speex_speex_preprocess_ctl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for speex_preprocess_ctl in -lspeex" >&5
+printf %s "checking for speex_preprocess_ctl in -lspeex... " >&6; }
+if test ${ac_cv_lib_speex_speex_preprocess_ctl+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lspeex ${pbxlibdir} -lm $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31300,32 +33312,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char speex_preprocess_ctl ();
 int
-main ()
+main (void)
 {
 return speex_preprocess_ctl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_speex_speex_preprocess_ctl=yes
-else
+else $as_nop
   ac_cv_lib_speex_speex_preprocess_ctl=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speex_speex_preprocess_ctl" >&5
-$as_echo "$ac_cv_lib_speex_speex_preprocess_ctl" >&6; }
-if test "x$ac_cv_lib_speex_speex_preprocess_ctl" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speex_speex_preprocess_ctl" >&5
+printf "%s\n" "$ac_cv_lib_speex_speex_preprocess_ctl" >&6; }
+if test "x$ac_cv_lib_speex_speex_preprocess_ctl" = xyes
+then :
   AST_SPEEX_PREPROCESS_FOUND=yes
-else
+else $as_nop
   AST_SPEEX_PREPROCESS_FOUND=no
 fi
 
@@ -31344,14 +33355,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SPEEX_PREPROCESS_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default"
-if test "x$ac_cv_header_speex_speex_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default"
+if test "x$ac_cv_header_speex_speex_h" = xyes
+then :
   SPEEX_PREPROCESS_HEADER_FOUND=1
-else
+else $as_nop
   SPEEX_PREPROCESS_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SPEEX_PREPROCESS_HEADER_FOUND}" = "x0" ; then
@@ -31387,11 +33398,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speex_preprocess_ctl in -lspeexdsp" >&5
-$as_echo_n "checking for speex_preprocess_ctl in -lspeexdsp... " >&6; }
-if ${ac_cv_lib_speexdsp_speex_preprocess_ctl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for speex_preprocess_ctl in -lspeexdsp" >&5
+printf %s "checking for speex_preprocess_ctl in -lspeexdsp... " >&6; }
+if test ${ac_cv_lib_speexdsp_speex_preprocess_ctl+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lspeexdsp ${pbxlibdir} -lm $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31400,32 +33412,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char speex_preprocess_ctl ();
 int
-main ()
+main (void)
 {
 return speex_preprocess_ctl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_speexdsp_speex_preprocess_ctl=yes
-else
+else $as_nop
   ac_cv_lib_speexdsp_speex_preprocess_ctl=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speexdsp_speex_preprocess_ctl" >&5
-$as_echo "$ac_cv_lib_speexdsp_speex_preprocess_ctl" >&6; }
-if test "x$ac_cv_lib_speexdsp_speex_preprocess_ctl" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_speexdsp_speex_preprocess_ctl" >&5
+printf "%s\n" "$ac_cv_lib_speexdsp_speex_preprocess_ctl" >&6; }
+if test "x$ac_cv_lib_speexdsp_speex_preprocess_ctl" = xyes
+then :
   AST_SPEEXDSP_FOUND=yes
-else
+else $as_nop
   AST_SPEEXDSP_FOUND=no
 fi
 
@@ -31444,14 +33455,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SPEEXDSP_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default"
-if test "x$ac_cv_header_speex_speex_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "speex/speex.h" "ac_cv_header_speex_speex_h" "$ac_includes_default"
+if test "x$ac_cv_header_speex_speex_h" = xyes
+then :
   SPEEXDSP_HEADER_FOUND=1
-else
+else $as_nop
   SPEEXDSP_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SPEEXDSP_HEADER_FOUND}" = "x0" ; then
@@ -31489,11 +33500,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite_exec in -lsqlite" >&5
-$as_echo_n "checking for sqlite_exec in -lsqlite... " >&6; }
-if ${ac_cv_lib_sqlite_sqlite_exec+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite_exec in -lsqlite" >&5
+printf %s "checking for sqlite_exec in -lsqlite... " >&6; }
+if test ${ac_cv_lib_sqlite_sqlite_exec+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31502,32 +33514,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sqlite_exec ();
 int
-main ()
+main (void)
 {
 return sqlite_exec ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_sqlite_sqlite_exec=yes
-else
+else $as_nop
   ac_cv_lib_sqlite_sqlite_exec=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_exec" >&5
-$as_echo "$ac_cv_lib_sqlite_sqlite_exec" >&6; }
-if test "x$ac_cv_lib_sqlite_sqlite_exec" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite_sqlite_exec" >&5
+printf "%s\n" "$ac_cv_lib_sqlite_sqlite_exec" >&6; }
+if test "x$ac_cv_lib_sqlite_sqlite_exec" = xyes
+then :
   AST_SQLITE_FOUND=yes
-else
+else $as_nop
   AST_SQLITE_FOUND=no
 fi
 
@@ -31546,14 +33557,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SQLITE_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "sqlite.h" "ac_cv_header_sqlite_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlite_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "sqlite.h" "ac_cv_header_sqlite_h" "$ac_includes_default"
+if test "x$ac_cv_header_sqlite_h" = xyes
+then :
   SQLITE_HEADER_FOUND=1
-else
+else $as_nop
   SQLITE_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SQLITE_HEADER_FOUND}" = "x0" ; then
@@ -31586,11 +33597,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5
-$as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
-if ${ac_cv_lib_sqlite3_sqlite3_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5
+printf %s "checking for sqlite3_open in -lsqlite3... " >&6; }
+if test ${ac_cv_lib_sqlite3_sqlite3_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3 ${pbxlibdir} ${PTHREAD_LIBS} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31599,32 +33611,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sqlite3_open ();
 int
-main ()
+main (void)
 {
 return sqlite3_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_sqlite3_sqlite3_open=yes
-else
+else $as_nop
   ac_cv_lib_sqlite3_sqlite3_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
-$as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
+printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes
+then :
   AST_SQLITE3_FOUND=yes
-else
+else $as_nop
   AST_SQLITE3_FOUND=no
 fi
 
@@ -31643,14 +33654,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SQLITE3_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlite3_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
+if test "x$ac_cv_header_sqlite3_h" = xyes
+then :
   SQLITE3_HEADER_FOUND=1
-else
+else $as_nop
   SQLITE3_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SQLITE3_HEADER_FOUND}" = "x0" ; then
@@ -31692,11 +33703,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-$as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt_crypt+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+printf %s "checking for crypt in -lcrypt... " >&6; }
+if test ${ac_cv_lib_crypt_crypt+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31705,32 +33717,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char crypt ();
 int
-main ()
+main (void)
 {
 return crypt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_crypt_crypt=yes
-else
+else $as_nop
   ac_cv_lib_crypt_crypt=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+printf "%s\n" "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = xyes
+then :
   AST_LIBCRYPT_FOUND=yes
-else
+else $as_nop
   AST_LIBCRYPT_FOUND=no
 fi
 
@@ -31749,14 +33760,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${LIBCRYPT_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
-if test "x$ac_cv_header_crypt_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
+if test "x$ac_cv_header_crypt_h" = xyes
+then :
   LIBCRYPT_HEADER_FOUND=1
-else
+else $as_nop
   LIBCRYPT_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${LIBCRYPT_HEADER_FOUND}" = "x0" ; then
@@ -31775,9 +33786,10 @@
 
 
 ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
-if test "x$ac_cv_func_crypt" = xyes; then :
+if test "x$ac_cv_func_crypt" = xyes
+then :
   SYSCRYPT=true
-else
+else $as_nop
   SYSCRYPT=""
 fi
 
@@ -31786,13 +33798,13 @@
     CRYPT_LIB="$LIBCRYPT_LIB"
     CRYPT_INCLUDE="$LIBCRYPT_INCLUDE"
 
-$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CRYPT 1" >>confdefs.h
 
 elif test "x$SYSCRYPT" != "x" ; then
     CRYPT_LIB=""
     CRYPT_INCLUDE=""
 
-$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CRYPT 1" >>confdefs.h
 
 fi
 
@@ -31800,11 +33812,12 @@
 
 
 # Find crypt_r support
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt_r in -lcrypt" >&5
-$as_echo_n "checking for crypt_r in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt_crypt_r+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt_r in -lcrypt" >&5
+printf %s "checking for crypt_r in -lcrypt... " >&6; }
+if test ${ac_cv_lib_crypt_crypt_r+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31813,32 +33826,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char crypt_r ();
 int
-main ()
+main (void)
 {
 return crypt_r ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_crypt_crypt_r=yes
-else
+else $as_nop
   ac_cv_lib_crypt_crypt_r=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt_r" >&5
-$as_echo "$ac_cv_lib_crypt_crypt_r" >&6; }
-if test "x$ac_cv_lib_crypt_crypt_r" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt_r" >&5
+printf "%s\n" "$ac_cv_lib_crypt_crypt_r" >&6; }
+if test "x$ac_cv_lib_crypt_crypt_r" = xyes
+then :
 
-$as_echo "#define HAVE_CRYPT_R 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CRYPT_R 1" >>confdefs.h
 
 fi
 
@@ -31860,25 +33872,26 @@
 		# check for the header
 		osptk_saved_cppflags="${CPPFLAGS}"
 		CPPFLAGS="${CPPFLAGS} ${osptk_cflags}"
-		ac_fn_c_check_header_mongrel "$LINENO" "osp/osp.h" "ac_cv_header_osp_osp_h" "$ac_includes_default"
-if test "x$ac_cv_header_osp_osp_h" = xyes; then :
+		ac_fn_c_check_header_compile "$LINENO" "osp/osp.h" "ac_cv_header_osp_osp_h" "$ac_includes_default"
+if test "x$ac_cv_header_osp_osp_h" = xyes
+then :
   osptk_header_found=yes
-else
+else $as_nop
   osptk_header_found=no
 fi
 
-
 		CPPFLAGS="${osptk_saved_cppflags}"
 
 		# check for the library
 		if test "${osptk_header_found}" = "yes"; then
 			osptk_extralibs="-lssl -lcrypto"
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSPPInit in -losptk" >&5
-$as_echo_n "checking for OSPPInit in -losptk... " >&6; }
-if ${ac_cv_lib_osptk_OSPPInit+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OSPPInit in -losptk" >&5
+printf %s "checking for OSPPInit in -losptk... " >&6; }
+if test ${ac_cv_lib_osptk_OSPPInit+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-losptk ${osptk_ldflags} ${osptk_extralibs} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31887,49 +33900,49 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char OSPPInit ();
 int
-main ()
+main (void)
 {
 return OSPPInit ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_osptk_OSPPInit=yes
-else
+else $as_nop
   ac_cv_lib_osptk_OSPPInit=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_osptk_OSPPInit" >&5
-$as_echo "$ac_cv_lib_osptk_OSPPInit" >&6; }
-if test "x$ac_cv_lib_osptk_OSPPInit" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_osptk_OSPPInit" >&5
+printf "%s\n" "$ac_cv_lib_osptk_OSPPInit" >&6; }
+if test "x$ac_cv_lib_osptk_OSPPInit" = xyes
+then :
   osptk_library_found=yes
-else
+else $as_nop
   osptk_library_found=no
 fi
 
 
 			# check OSP Toolkit version
 			if test "${osptk_library_found}" = "yes"; then
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if OSP Toolkit version is compatible with app_osplookup" >&5
-$as_echo_n "checking if OSP Toolkit version is compatible with app_osplookup... " >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if OSP Toolkit version is compatible with app_osplookup" >&5
+printf %s "checking if OSP Toolkit version is compatible with app_osplookup... " >&6; }
 
 				osptk_saved_cppflags="${CPPFLAGS}"
 				CPPFLAGS="${CPPFLAGS} ${osptk_cflags}"
-				if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+				if test "$cross_compiling" = yes
+then :
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
 See \`config.log' for more details" "$LINENO" 5; }
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -31941,9 +33954,10 @@
 						}
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   osptk_compatible=yes
-else
+else $as_nop
   osptk_compatible=no
 
 fi
@@ -31954,19 +33968,17 @@
 				CPPFLAGS="${osptk_saved_cppflags}"
 
 				if test "${osptk_compatible}" = "yes"; then
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 					PBX_OSPTK=1
 					OSPTK_INCLUDE="${osptk_cflags}"
 					OSPTK_LIB="${osptk_ldflags} -losptk ${osptk_extralibs}"
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_OSPTK 1
-_ACEOF
+printf "%s\n" "#define HAVE_OSPTK 1" >>confdefs.h
 
 				else
-					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+					{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 				fi
 			fi
 		fi
@@ -31988,11 +34000,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_init in -lsrtp2" >&5
-$as_echo_n "checking for srtp_init in -lsrtp2... " >&6; }
-if ${ac_cv_lib_srtp2_srtp_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srtp_init in -lsrtp2" >&5
+printf %s "checking for srtp_init in -lsrtp2... " >&6; }
+if test ${ac_cv_lib_srtp2_srtp_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsrtp2 ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32001,32 +34014,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char srtp_init ();
 int
-main ()
+main (void)
 {
 return srtp_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_srtp2_srtp_init=yes
-else
+else $as_nop
   ac_cv_lib_srtp2_srtp_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_init" >&5
-$as_echo "$ac_cv_lib_srtp2_srtp_init" >&6; }
-if test "x$ac_cv_lib_srtp2_srtp_init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_init" >&5
+printf "%s\n" "$ac_cv_lib_srtp2_srtp_init" >&6; }
+if test "x$ac_cv_lib_srtp2_srtp_init" = xyes
+then :
   AST_SRTP_FOUND=yes
-else
+else $as_nop
   AST_SRTP_FOUND=no
 fi
 
@@ -32045,14 +34057,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SRTP_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "srtp2/srtp.h" "ac_cv_header_srtp2_srtp_h" "$ac_includes_default"
-if test "x$ac_cv_header_srtp2_srtp_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "srtp2/srtp.h" "ac_cv_header_srtp2_srtp_h" "$ac_includes_default"
+if test "x$ac_cv_header_srtp2_srtp_h" = xyes
+then :
   SRTP_HEADER_FOUND=1
-else
+else $as_nop
   SRTP_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SRTP_HEADER_FOUND}" = "x0" ; then
@@ -32082,14 +34094,14 @@
    LIBS="${LIBS} ${SRTP_LIB} "
    LDFLAGS="${LDFLAGS} -shared -fPIC"
    CFLAGS="${CFLAGS} ${SRTP_INCLUDE} "
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the ability of -lsrtp2 to be linked in a shared object" >&5
-$as_echo_n "checking for the ability of -lsrtp2 to be linked in a shared object... " >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the ability of -lsrtp2 to be linked in a shared object" >&5
+printf %s "checking for the ability of -lsrtp2 to be linked in a shared object... " >&6; }
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
        #include <srtp2/srtp.h>
 int
-main ()
+main (void)
 {
 srtp_init();
 
@@ -32098,47 +34110,48 @@
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 
-else
+else $as_nop
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
-$as_echo "$as_me: WARNING: ***" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** libsrtp2 could not be linked as a shared object." >&5
-$as_echo "$as_me: WARNING: *** libsrtp2 could not be linked as a shared object." >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Try compiling libsrtp2 manually. Configure libsrtp2" >&5
-$as_echo "$as_me: WARNING: *** Try compiling libsrtp2 manually. Configure libsrtp2" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** with ./configure --prefix=/usr replacing /usr with" >&5
-$as_echo "$as_me: WARNING: *** with ./configure --prefix=/usr replacing /usr with" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** the prefix of your choice, and then make with" >&5
-$as_echo "$as_me: WARNING: *** the prefix of your choice, and then make with" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** 'make libsrtp2.so'" >&5
-$as_echo "$as_me: WARNING: *** 'make libsrtp2.so'" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
-$as_echo "$as_me: WARNING: ***" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** After re-installing libsrtp2, re-run the Asterisk" >&5
-$as_echo "$as_me: WARNING: *** After re-installing libsrtp2, re-run the Asterisk" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** configure script." >&5
-$as_echo "$as_me: WARNING: *** configure script." >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
-$as_echo "$as_me: WARNING: ***" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** If you do not need SRTP support re-run configure" >&5
-$as_echo "$as_me: WARNING: *** If you do not need SRTP support re-run configure" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** with the --without-srtp option." >&5
-$as_echo "$as_me: WARNING: *** with the --without-srtp option." >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
+printf "%s\n" "$as_me: WARNING: ***" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** libsrtp2 could not be linked as a shared object." >&5
+printf "%s\n" "$as_me: WARNING: *** libsrtp2 could not be linked as a shared object." >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Try compiling libsrtp2 manually. Configure libsrtp2" >&5
+printf "%s\n" "$as_me: WARNING: *** Try compiling libsrtp2 manually. Configure libsrtp2" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** with ./configure --prefix=/usr replacing /usr with" >&5
+printf "%s\n" "$as_me: WARNING: *** with ./configure --prefix=/usr replacing /usr with" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** the prefix of your choice, and then make with" >&5
+printf "%s\n" "$as_me: WARNING: *** the prefix of your choice, and then make with" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** 'make libsrtp2.so'" >&5
+printf "%s\n" "$as_me: WARNING: *** 'make libsrtp2.so'" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
+printf "%s\n" "$as_me: WARNING: ***" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** After re-installing libsrtp2, re-run the Asterisk" >&5
+printf "%s\n" "$as_me: WARNING: *** After re-installing libsrtp2, re-run the Asterisk" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** configure script." >&5
+printf "%s\n" "$as_me: WARNING: *** configure script." >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
+printf "%s\n" "$as_me: WARNING: ***" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** If you do not need SRTP support re-run configure" >&5
+printf "%s\n" "$as_me: WARNING: *** If you do not need SRTP support re-run configure" >&2;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** with the --without-srtp option." >&5
+printf "%s\n" "$as_me: WARNING: *** with the --without-srtp option." >&2;}
     exit 1
 
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
    CFLAGS="${ast_ext_lib_check_shared_saved_cflags}"
    LDFLAGS="${ast_ext_lib_check_shared_saved_ldflags}"
@@ -32162,11 +34175,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp2" >&5
-$as_echo_n "checking for srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp2... " >&6; }
-if ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp2" >&5
+printf %s "checking for srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp2... " >&6; }
+if test ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsrtp2 ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32175,32 +34189,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 ();
 int
-main ()
+main (void)
 {
 return srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=yes
-else
+else $as_nop
   ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&5
-$as_echo "$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&6; }
-if test "x$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&5
+printf "%s\n" "$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&6; }
+if test "x$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" = xyes
+then :
   AST_SRTP_256_FOUND=yes
-else
+else $as_nop
   AST_SRTP_256_FOUND=no
 fi
 
@@ -32248,11 +34261,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp2" >&5
-$as_echo_n "checking for srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp2... " >&6; }
-if ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp2" >&5
+printf %s "checking for srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp2... " >&6; }
+if test ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsrtp2 ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32261,32 +34275,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 ();
 int
-main ()
+main (void)
 {
 return srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=yes
-else
+else $as_nop
   ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&5
-$as_echo "$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&6; }
-if test "x$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&5
+printf "%s\n" "$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&6; }
+if test "x$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" = xyes
+then :
   AST_SRTP_192_FOUND=yes
-else
+else $as_nop
   AST_SRTP_192_FOUND=no
 fi
 
@@ -32334,11 +34347,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_crypto_policy_set_aes_gcm_128_8_auth in -lsrtp2" >&5
-$as_echo_n "checking for srtp_crypto_policy_set_aes_gcm_128_8_auth in -lsrtp2... " >&6; }
-if ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srtp_crypto_policy_set_aes_gcm_128_8_auth in -lsrtp2" >&5
+printf %s "checking for srtp_crypto_policy_set_aes_gcm_128_8_auth in -lsrtp2... " >&6; }
+if test ${ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsrtp2 ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32347,32 +34361,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char srtp_crypto_policy_set_aes_gcm_128_8_auth ();
 int
-main ()
+main (void)
 {
 return srtp_crypto_policy_set_aes_gcm_128_8_auth ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth=yes
-else
+else $as_nop
   ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&5
-$as_echo "$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&6; }
-if test "x$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&5
+printf "%s\n" "$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&6; }
+if test "x$ac_cv_lib_srtp2_srtp_crypto_policy_set_aes_gcm_128_8_auth" = xyes
+then :
   AST_SRTP_GCM_FOUND=yes
-else
+else $as_nop
   AST_SRTP_GCM_FOUND=no
 fi
 
@@ -32420,11 +34433,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_shutdown in -lsrtp2" >&5
-$as_echo_n "checking for srtp_shutdown in -lsrtp2... " >&6; }
-if ${ac_cv_lib_srtp2_srtp_shutdown+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srtp_shutdown in -lsrtp2" >&5
+printf %s "checking for srtp_shutdown in -lsrtp2... " >&6; }
+if test ${ac_cv_lib_srtp2_srtp_shutdown+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsrtp2 ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32433,32 +34447,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char srtp_shutdown ();
 int
-main ()
+main (void)
 {
 return srtp_shutdown ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_srtp2_srtp_shutdown=yes
-else
+else $as_nop
   ac_cv_lib_srtp2_srtp_shutdown=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_shutdown" >&5
-$as_echo "$ac_cv_lib_srtp2_srtp_shutdown" >&6; }
-if test "x$ac_cv_lib_srtp2_srtp_shutdown" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_shutdown" >&5
+printf "%s\n" "$ac_cv_lib_srtp2_srtp_shutdown" >&6; }
+if test "x$ac_cv_lib_srtp2_srtp_shutdown" = xyes
+then :
   AST_SRTP_SHUTDOWN_FOUND=yes
-else
+else $as_nop
   AST_SRTP_SHUTDOWN_FOUND=no
 fi
 
@@ -32477,14 +34490,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SRTP_SHUTDOWN_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "srtp2/srtp.h" "ac_cv_header_srtp2_srtp_h" "$ac_includes_default"
-if test "x$ac_cv_header_srtp2_srtp_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "srtp2/srtp.h" "ac_cv_header_srtp2_srtp_h" "$ac_includes_default"
+if test "x$ac_cv_header_srtp2_srtp_h" = xyes
+then :
   SRTP_SHUTDOWN_HEADER_FOUND=1
-else
+else $as_nop
   SRTP_SHUTDOWN_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SRTP_SHUTDOWN_HEADER_FOUND}" = "x0" ; then
@@ -32516,11 +34529,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_get_version_string in -lsrtp2" >&5
-$as_echo_n "checking for srtp_get_version_string in -lsrtp2... " >&6; }
-if ${ac_cv_lib_srtp2_srtp_get_version_string+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srtp_get_version_string in -lsrtp2" >&5
+printf %s "checking for srtp_get_version_string in -lsrtp2... " >&6; }
+if test ${ac_cv_lib_srtp2_srtp_get_version_string+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsrtp2 ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32529,32 +34543,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char srtp_get_version_string ();
 int
-main ()
+main (void)
 {
 return srtp_get_version_string ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_srtp2_srtp_get_version_string=yes
-else
+else $as_nop
   ac_cv_lib_srtp2_srtp_get_version_string=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_get_version_string" >&5
-$as_echo "$ac_cv_lib_srtp2_srtp_get_version_string" >&6; }
-if test "x$ac_cv_lib_srtp2_srtp_get_version_string" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp2_srtp_get_version_string" >&5
+printf "%s\n" "$ac_cv_lib_srtp2_srtp_get_version_string" >&6; }
+if test "x$ac_cv_lib_srtp2_srtp_get_version_string" = xyes
+then :
   AST_SRTP_GET_VERSION_FOUND=yes
-else
+else $as_nop
   AST_SRTP_GET_VERSION_FOUND=no
 fi
 
@@ -32573,14 +34586,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SRTP_GET_VERSION_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "srtp2/srtp.h" "ac_cv_header_srtp2_srtp_h" "$ac_includes_default"
-if test "x$ac_cv_header_srtp2_srtp_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "srtp2/srtp.h" "ac_cv_header_srtp2_srtp_h" "$ac_includes_default"
+if test "x$ac_cv_header_srtp2_srtp_h" = xyes
+then :
   SRTP_GET_VERSION_HEADER_FOUND=1
-else
+else $as_nop
   SRTP_GET_VERSION_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SRTP_GET_VERSION_HEADER_FOUND}" = "x0" ; then
@@ -32602,12 +34615,12 @@
     # libsrtp2 removed support for PRNG, so we require OpenSSL
     if test "x$PBX_OPENSSL" != x1;
     then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
-$as_echo "$as_me: WARNING: ***" >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** OpenSSL required when using libsrtp2, checking for libsrtp instead." >&5
-$as_echo "$as_me: WARNING: *** OpenSSL required when using libsrtp2, checking for libsrtp instead." >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
-$as_echo "$as_me: WARNING: ***" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
+printf "%s\n" "$as_me: WARNING: ***" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** OpenSSL required when using libsrtp2, checking for libsrtp instead." >&5
+printf "%s\n" "$as_me: WARNING: *** OpenSSL required when using libsrtp2, checking for libsrtp instead." >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
+printf "%s\n" "$as_me: WARNING: ***" >&2;}
 	PBX_SRTP=0
     fi
 fi
@@ -32628,11 +34641,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_init in -lsrtp" >&5
-$as_echo_n "checking for srtp_init in -lsrtp... " >&6; }
-if ${ac_cv_lib_srtp_srtp_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srtp_init in -lsrtp" >&5
+printf %s "checking for srtp_init in -lsrtp... " >&6; }
+if test ${ac_cv_lib_srtp_srtp_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsrtp ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32641,32 +34655,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char srtp_init ();
 int
-main ()
+main (void)
 {
 return srtp_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_srtp_srtp_init=yes
-else
+else $as_nop
   ac_cv_lib_srtp_srtp_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_init" >&5
-$as_echo "$ac_cv_lib_srtp_srtp_init" >&6; }
-if test "x$ac_cv_lib_srtp_srtp_init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_init" >&5
+printf "%s\n" "$ac_cv_lib_srtp_srtp_init" >&6; }
+if test "x$ac_cv_lib_srtp_srtp_init" = xyes
+then :
   AST_SRTP_FOUND=yes
-else
+else $as_nop
   AST_SRTP_FOUND=no
 fi
 
@@ -32685,14 +34698,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SRTP_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "srtp/srtp.h" "ac_cv_header_srtp_srtp_h" "$ac_includes_default"
-if test "x$ac_cv_header_srtp_srtp_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "srtp/srtp.h" "ac_cv_header_srtp_srtp_h" "$ac_includes_default"
+if test "x$ac_cv_header_srtp_srtp_h" = xyes
+then :
   SRTP_HEADER_FOUND=1
-else
+else $as_nop
   SRTP_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SRTP_HEADER_FOUND}" = "x0" ; then
@@ -32722,14 +34735,14 @@
    LIBS="${LIBS} ${SRTP_LIB} "
    LDFLAGS="${LDFLAGS} -shared -fPIC"
    CFLAGS="${CFLAGS} ${SRTP_INCLUDE} "
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the ability of -lsrtp to be linked in a shared object" >&5
-$as_echo_n "checking for the ability of -lsrtp to be linked in a shared object... " >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the ability of -lsrtp to be linked in a shared object" >&5
+printf %s "checking for the ability of -lsrtp to be linked in a shared object... " >&6; }
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
        #include <srtp/srtp.h>
 int
-main ()
+main (void)
 {
 srtp_init();
 
@@ -32738,43 +34751,44 @@
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 
-else
+else $as_nop
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
-$as_echo "$as_me: WARNING: ***" >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** libsrtp could not be linked as a shared object." >&5
-$as_echo "$as_me: WARNING: *** libsrtp could not be linked as a shared object." >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Try compiling libsrtp manually. Configure libsrtp" >&5
-$as_echo "$as_me: WARNING: *** Try compiling libsrtp manually. Configure libsrtp" >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** with ./configure CFLAGS=-fPIC --prefix=/usr" >&5
-$as_echo "$as_me: WARNING: *** with ./configure CFLAGS=-fPIC --prefix=/usr" >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** replacing /usr with the prefix of your choice." >&5
-$as_echo "$as_me: WARNING: *** replacing /usr with the prefix of your choice." >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** After re-installing libsrtp, re-run the Asterisk" >&5
-$as_echo "$as_me: WARNING: *** After re-installing libsrtp, re-run the Asterisk" >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** configure script." >&5
-$as_echo "$as_me: WARNING: *** configure script." >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
-$as_echo "$as_me: WARNING: ***" >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** If you do not need SRTP support re-run configure" >&5
-$as_echo "$as_me: WARNING: *** If you do not need SRTP support re-run configure" >&2;}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** with the --without-srtp option." >&5
-$as_echo "$as_me: WARNING: *** with the --without-srtp option." >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
+printf "%s\n" "$as_me: WARNING: ***" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** libsrtp could not be linked as a shared object." >&5
+printf "%s\n" "$as_me: WARNING: *** libsrtp could not be linked as a shared object." >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** Try compiling libsrtp manually. Configure libsrtp" >&5
+printf "%s\n" "$as_me: WARNING: *** Try compiling libsrtp manually. Configure libsrtp" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** with ./configure CFLAGS=-fPIC --prefix=/usr" >&5
+printf "%s\n" "$as_me: WARNING: *** with ./configure CFLAGS=-fPIC --prefix=/usr" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** replacing /usr with the prefix of your choice." >&5
+printf "%s\n" "$as_me: WARNING: *** replacing /usr with the prefix of your choice." >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** After re-installing libsrtp, re-run the Asterisk" >&5
+printf "%s\n" "$as_me: WARNING: *** After re-installing libsrtp, re-run the Asterisk" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** configure script." >&5
+printf "%s\n" "$as_me: WARNING: *** configure script." >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ***" >&5
+printf "%s\n" "$as_me: WARNING: ***" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** If you do not need SRTP support re-run configure" >&5
+printf "%s\n" "$as_me: WARNING: *** If you do not need SRTP support re-run configure" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: *** with the --without-srtp option." >&5
+printf "%s\n" "$as_me: WARNING: *** with the --without-srtp option." >&2;}
         exit 1
 
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
    CFLAGS="${ast_ext_lib_check_shared_saved_cflags}"
    LDFLAGS="${ast_ext_lib_check_shared_saved_ldflags}"
@@ -32798,11 +34812,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp" >&5
-$as_echo_n "checking for crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp... " >&6; }
-if ${ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp" >&5
+printf %s "checking for crypto_policy_set_aes_cm_256_hmac_sha1_80 in -lsrtp... " >&6; }
+if test ${ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsrtp ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32811,32 +34826,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char crypto_policy_set_aes_cm_256_hmac_sha1_80 ();
 int
-main ()
+main (void)
 {
 return crypto_policy_set_aes_cm_256_hmac_sha1_80 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=yes
-else
+else $as_nop
   ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&5
-$as_echo "$ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&6; }
-if test "x$ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&5
+printf "%s\n" "$ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" >&6; }
+if test "x$ac_cv_lib_srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80" = xyes
+then :
   AST_SRTP_256_FOUND=yes
-else
+else $as_nop
   AST_SRTP_256_FOUND=no
 fi
 
@@ -32884,11 +34898,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp" >&5
-$as_echo_n "checking for crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp... " >&6; }
-if ${ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp" >&5
+printf %s "checking for crypto_policy_set_aes_cm_192_hmac_sha1_80 in -lsrtp... " >&6; }
+if test ${ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsrtp ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32897,32 +34912,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char crypto_policy_set_aes_cm_192_hmac_sha1_80 ();
 int
-main ()
+main (void)
 {
 return crypto_policy_set_aes_cm_192_hmac_sha1_80 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=yes
-else
+else $as_nop
   ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&5
-$as_echo "$ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&6; }
-if test "x$ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&5
+printf "%s\n" "$ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" >&6; }
+if test "x$ac_cv_lib_srtp_crypto_policy_set_aes_cm_192_hmac_sha1_80" = xyes
+then :
   AST_SRTP_192_FOUND=yes
-else
+else $as_nop
   AST_SRTP_192_FOUND=no
 fi
 
@@ -32970,11 +34984,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypto_policy_set_aes_gcm_128_8_auth in -lsrtp" >&5
-$as_echo_n "checking for crypto_policy_set_aes_gcm_128_8_auth in -lsrtp... " >&6; }
-if ${ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypto_policy_set_aes_gcm_128_8_auth in -lsrtp" >&5
+printf %s "checking for crypto_policy_set_aes_gcm_128_8_auth in -lsrtp... " >&6; }
+if test ${ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsrtp ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32983,32 +34998,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char crypto_policy_set_aes_gcm_128_8_auth ();
 int
-main ()
+main (void)
 {
 return crypto_policy_set_aes_gcm_128_8_auth ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth=yes
-else
+else $as_nop
   ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&5
-$as_echo "$ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&6; }
-if test "x$ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&5
+printf "%s\n" "$ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth" >&6; }
+if test "x$ac_cv_lib_srtp_crypto_policy_set_aes_gcm_128_8_auth" = xyes
+then :
   AST_SRTP_GCM_FOUND=yes
-else
+else $as_nop
   AST_SRTP_GCM_FOUND=no
 fi
 
@@ -33056,11 +35070,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_shutdown in -lsrtp" >&5
-$as_echo_n "checking for srtp_shutdown in -lsrtp... " >&6; }
-if ${ac_cv_lib_srtp_srtp_shutdown+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srtp_shutdown in -lsrtp" >&5
+printf %s "checking for srtp_shutdown in -lsrtp... " >&6; }
+if test ${ac_cv_lib_srtp_srtp_shutdown+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsrtp ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33069,32 +35084,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char srtp_shutdown ();
 int
-main ()
+main (void)
 {
 return srtp_shutdown ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_srtp_srtp_shutdown=yes
-else
+else $as_nop
   ac_cv_lib_srtp_srtp_shutdown=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_shutdown" >&5
-$as_echo "$ac_cv_lib_srtp_srtp_shutdown" >&6; }
-if test "x$ac_cv_lib_srtp_srtp_shutdown" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_shutdown" >&5
+printf "%s\n" "$ac_cv_lib_srtp_srtp_shutdown" >&6; }
+if test "x$ac_cv_lib_srtp_srtp_shutdown" = xyes
+then :
   AST_SRTP_SHUTDOWN_FOUND=yes
-else
+else $as_nop
   AST_SRTP_SHUTDOWN_FOUND=no
 fi
 
@@ -33113,14 +35127,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SRTP_SHUTDOWN_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "srtp/srtp.h" "ac_cv_header_srtp_srtp_h" "$ac_includes_default"
-if test "x$ac_cv_header_srtp_srtp_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "srtp/srtp.h" "ac_cv_header_srtp_srtp_h" "$ac_includes_default"
+if test "x$ac_cv_header_srtp_srtp_h" = xyes
+then :
   SRTP_SHUTDOWN_HEADER_FOUND=1
-else
+else $as_nop
   SRTP_SHUTDOWN_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SRTP_SHUTDOWN_HEADER_FOUND}" = "x0" ; then
@@ -33152,11 +35166,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_get_version_string in -lsrtp" >&5
-$as_echo_n "checking for srtp_get_version_string in -lsrtp... " >&6; }
-if ${ac_cv_lib_srtp_srtp_get_version_string+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srtp_get_version_string in -lsrtp" >&5
+printf %s "checking for srtp_get_version_string in -lsrtp... " >&6; }
+if test ${ac_cv_lib_srtp_srtp_get_version_string+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsrtp ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33165,32 +35180,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char srtp_get_version_string ();
 int
-main ()
+main (void)
 {
 return srtp_get_version_string ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_srtp_srtp_get_version_string=yes
-else
+else $as_nop
   ac_cv_lib_srtp_srtp_get_version_string=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_get_version_string" >&5
-$as_echo "$ac_cv_lib_srtp_srtp_get_version_string" >&6; }
-if test "x$ac_cv_lib_srtp_srtp_get_version_string" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_srtp_srtp_get_version_string" >&5
+printf "%s\n" "$ac_cv_lib_srtp_srtp_get_version_string" >&6; }
+if test "x$ac_cv_lib_srtp_srtp_get_version_string" = xyes
+then :
   AST_SRTP_GET_VERSION_FOUND=yes
-else
+else $as_nop
   AST_SRTP_GET_VERSION_FOUND=no
 fi
 
@@ -33209,14 +35223,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SRTP_GET_VERSION_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "srtp/srtp.h" "ac_cv_header_srtp_srtp_h" "$ac_includes_default"
-if test "x$ac_cv_header_srtp_srtp_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "srtp/srtp.h" "ac_cv_header_srtp_srtp_h" "$ac_includes_default"
+if test "x$ac_cv_header_srtp_srtp_h" = xyes
+then :
   SRTP_GET_VERSION_HEADER_FOUND=1
-else
+else $as_nop
   SRTP_GET_VERSION_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SRTP_GET_VERSION_HEADER_FOUND}" = "x0" ; then
@@ -33242,17 +35256,17 @@
    if test "x${PBX_GMIME}" != "x1" -a "${USE_GMIME}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMIME" >&5
-$as_echo_n "checking for GMIME... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gmime-$ver" >&5
+printf %s "checking for gmime-$ver... " >&6; }
 
 if test -n "$GMIME_CFLAGS"; then
     pkg_cv_GMIME_CFLAGS="$GMIME_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmime-\$ver\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmime-\$ver\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gmime-$ver") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GMIME_CFLAGS=`$PKG_CONFIG --cflags "gmime-$ver" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -33266,10 +35280,10 @@
     pkg_cv_GMIME_LIBS="$GMIME_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmime-\$ver\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmime-\$ver\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gmime-$ver") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GMIME_LIBS=`$PKG_CONFIG --libs "gmime-$ver" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -33283,8 +35297,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -33304,8 +35318,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_GMIME=0
 
@@ -33313,14 +35327,14 @@
 else
 	GMIME_CFLAGS=$pkg_cv_GMIME_CFLAGS
 	GMIME_LIBS=$pkg_cv_GMIME_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_GMIME=1
             GMIME_INCLUDE=$(echo ${GMIME_CFLAGS} | $SED -e "s|-std=c99||g")
             GMIME_LIB="$GMIME_LIBS"
 
-$as_echo "#define HAVE_GMIME 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GMIME 1" >>confdefs.h
 
 
 fi
@@ -33345,11 +35359,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -lhoard" >&5
-$as_echo_n "checking for malloc in -lhoard... " >&6; }
-if ${ac_cv_lib_hoard_malloc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for malloc in -lhoard" >&5
+printf %s "checking for malloc in -lhoard... " >&6; }
+if test ${ac_cv_lib_hoard_malloc+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lhoard ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33358,32 +35373,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char malloc ();
 int
-main ()
+main (void)
 {
 return malloc ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_hoard_malloc=yes
-else
+else $as_nop
   ac_cv_lib_hoard_malloc=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hoard_malloc" >&5
-$as_echo "$ac_cv_lib_hoard_malloc" >&6; }
-if test "x$ac_cv_lib_hoard_malloc" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hoard_malloc" >&5
+printf "%s\n" "$ac_cv_lib_hoard_malloc" >&6; }
+if test "x$ac_cv_lib_hoard_malloc" = xyes
+then :
   AST_HOARD_FOUND=yes
-else
+else $as_nop
   AST_HOARD_FOUND=no
 fi
 
@@ -33432,11 +35446,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbinit in -lsybdb" >&5
-$as_echo_n "checking for dbinit in -lsybdb... " >&6; }
-if ${ac_cv_lib_sybdb_dbinit+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbinit in -lsybdb" >&5
+printf %s "checking for dbinit in -lsybdb... " >&6; }
+if test ${ac_cv_lib_sybdb_dbinit+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsybdb ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33445,32 +35460,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char dbinit ();
 int
-main ()
+main (void)
 {
 return dbinit ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_sybdb_dbinit=yes
-else
+else $as_nop
   ac_cv_lib_sybdb_dbinit=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybdb_dbinit" >&5
-$as_echo "$ac_cv_lib_sybdb_dbinit" >&6; }
-if test "x$ac_cv_lib_sybdb_dbinit" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybdb_dbinit" >&5
+printf "%s\n" "$ac_cv_lib_sybdb_dbinit" >&6; }
+if test "x$ac_cv_lib_sybdb_dbinit" = xyes
+then :
   AST_FREETDS_FOUND=yes
-else
+else $as_nop
   AST_FREETDS_FOUND=no
 fi
 
@@ -33489,14 +35503,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${FREETDS_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "sybdb.h" "ac_cv_header_sybdb_h" "$ac_includes_default"
-if test "x$ac_cv_header_sybdb_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "sybdb.h" "ac_cv_header_sybdb_h" "$ac_includes_default"
+if test "x$ac_cv_header_sybdb_h" = xyes
+then :
   FREETDS_HEADER_FOUND=1
-else
+else $as_nop
   FREETDS_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${FREETDS_HEADER_FOUND}" = "x0" ; then
@@ -33515,11 +35529,12 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tone_zone_find_by_num in -ltonezone" >&5
-$as_echo_n "checking for tone_zone_find_by_num in -ltonezone... " >&6; }
-if ${ac_cv_lib_tonezone_tone_zone_find_by_num+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tone_zone_find_by_num in -ltonezone" >&5
+printf %s "checking for tone_zone_find_by_num in -ltonezone... " >&6; }
+if test ${ac_cv_lib_tonezone_tone_zone_find_by_num+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltonezone  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33528,32 +35543,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char tone_zone_find_by_num ();
 int
-main ()
+main (void)
 {
 return tone_zone_find_by_num ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_tonezone_tone_zone_find_by_num=yes
-else
+else $as_nop
   ac_cv_lib_tonezone_tone_zone_find_by_num=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tonezone_tone_zone_find_by_num" >&5
-$as_echo "$ac_cv_lib_tonezone_tone_zone_find_by_num" >&6; }
-if test "x$ac_cv_lib_tonezone_tone_zone_find_by_num" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tonezone_tone_zone_find_by_num" >&5
+printf "%s\n" "$ac_cv_lib_tonezone_tone_zone_find_by_num" >&6; }
+if test "x$ac_cv_lib_tonezone_tone_zone_find_by_num" = xyes
+then :
   tonezone_does_not_need_lm=yes
-else
+else $as_nop
   tonezone_does_not_need_lm=no
 fi
 
@@ -33576,11 +35590,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tone_zone_find in -ltonezone" >&5
-$as_echo_n "checking for tone_zone_find in -ltonezone... " >&6; }
-if ${ac_cv_lib_tonezone_tone_zone_find+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tone_zone_find in -ltonezone" >&5
+printf %s "checking for tone_zone_find in -ltonezone... " >&6; }
+if test ${ac_cv_lib_tonezone_tone_zone_find+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltonezone ${pbxlibdir} ${tonezone_extra} ${DAHDI_INCLUDE} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33589,32 +35604,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char tone_zone_find ();
 int
-main ()
+main (void)
 {
 return tone_zone_find ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_tonezone_tone_zone_find=yes
-else
+else $as_nop
   ac_cv_lib_tonezone_tone_zone_find=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tonezone_tone_zone_find" >&5
-$as_echo "$ac_cv_lib_tonezone_tone_zone_find" >&6; }
-if test "x$ac_cv_lib_tonezone_tone_zone_find" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tonezone_tone_zone_find" >&5
+printf "%s\n" "$ac_cv_lib_tonezone_tone_zone_find" >&6; }
+if test "x$ac_cv_lib_tonezone_tone_zone_find" = xyes
+then :
   AST_TONEZONE_FOUND=yes
-else
+else $as_nop
   AST_TONEZONE_FOUND=no
 fi
 
@@ -33633,14 +35647,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${TONEZONE_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "dahdi/tonezone.h" "ac_cv_header_dahdi_tonezone_h" "$ac_includes_default"
-if test "x$ac_cv_header_dahdi_tonezone_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "dahdi/tonezone.h" "ac_cv_header_dahdi_tonezone_h" "$ac_includes_default"
+if test "x$ac_cv_header_dahdi_tonezone_h" = xyes
+then :
   TONEZONE_HEADER_FOUND=1
-else
+else $as_nop
   TONEZONE_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${TONEZONE_HEADER_FOUND}" = "x0" ; then
@@ -33673,11 +35687,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vorbis_info_init in -lvorbis" >&5
-$as_echo_n "checking for vorbis_info_init in -lvorbis... " >&6; }
-if ${ac_cv_lib_vorbis_vorbis_info_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vorbis_info_init in -lvorbis" >&5
+printf %s "checking for vorbis_info_init in -lvorbis... " >&6; }
+if test ${ac_cv_lib_vorbis_vorbis_info_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lvorbis ${pbxlibdir} -lm -lvorbisenc -lvorbisfile $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33686,32 +35701,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char vorbis_info_init ();
 int
-main ()
+main (void)
 {
 return vorbis_info_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_vorbis_vorbis_info_init=yes
-else
+else $as_nop
   ac_cv_lib_vorbis_vorbis_info_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbis_vorbis_info_init" >&5
-$as_echo "$ac_cv_lib_vorbis_vorbis_info_init" >&6; }
-if test "x$ac_cv_lib_vorbis_vorbis_info_init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vorbis_vorbis_info_init" >&5
+printf "%s\n" "$ac_cv_lib_vorbis_vorbis_info_init" >&6; }
+if test "x$ac_cv_lib_vorbis_vorbis_info_init" = xyes
+then :
   AST_VORBIS_FOUND=yes
-else
+else $as_nop
   AST_VORBIS_FOUND=no
 fi
 
@@ -33730,14 +35744,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${VORBIS_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "vorbis/codec.h" "ac_cv_header_vorbis_codec_h" "$ac_includes_default"
-if test "x$ac_cv_header_vorbis_codec_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "vorbis/codec.h" "ac_cv_header_vorbis_codec_h" "$ac_includes_default"
+if test "x$ac_cv_header_vorbis_codec_h" = xyes
+then :
   VORBIS_HEADER_FOUND=1
-else
+else $as_nop
   VORBIS_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${VORBIS_HEADER_FOUND}" = "x0" ; then
@@ -33757,8 +35771,8 @@
 
 
     if test "x${PBX_VORBIS_OPEN_CALLBACKS}" != "x1" -a "${USE_VORBIS_OPEN_CALLBACKS}" != "no"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OV_CALLBACKS_NOCLOSE declared in vorbis/vorbisfile.h" >&5
-$as_echo_n "checking for OV_CALLBACKS_NOCLOSE declared in vorbis/vorbisfile.h... " >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OV_CALLBACKS_NOCLOSE declared in vorbis/vorbisfile.h" >&5
+printf %s "checking for OV_CALLBACKS_NOCLOSE declared in vorbis/vorbisfile.h... " >&6; }
         saved_cppflags="${CPPFLAGS}"
         if test "x${VORBIS_OPEN_CALLBACKS_DIR}" != "x"; then
             VORBIS_OPEN_CALLBACKS_INCLUDE="-I${VORBIS_OPEN_CALLBACKS_DIR}/include"
@@ -33769,7 +35783,7 @@
 /* end confdefs.h.  */
  #include <vorbis/vorbisfile.h>
 int
-main ()
+main (void)
 {
 #if !defined(OV_CALLBACKS_NOCLOSE)
                                     (void) OV_CALLBACKS_NOCLOSE;
@@ -33779,21 +35793,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
                 PBX_VORBIS_OPEN_CALLBACKS=1
 
-$as_echo "#define HAVE_VORBIS_OPEN_CALLBACKS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_VORBIS_OPEN_CALLBACKS 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
         CPPFLAGS="${saved_cppflags}"
     fi
@@ -33807,8 +35822,8 @@
 
 
 if test "${USE_VPB}" != "no"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vpb_open in -lvpb" >&5
-$as_echo_n "checking for vpb_open in -lvpb... " >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vpb_open in -lvpb" >&5
+printf %s "checking for vpb_open in -lvpb... " >&6; }
    saved_libs="${LIBS}"
    saved_cppflags="${CPPFLAGS}"
    if test "x${VPB_DIR}" != "x"; then
@@ -33828,7 +35843,7 @@
 
 	#include <vpbapi.h>
 int
-main ()
+main (void)
 {
 int q = vpb_open(0,0);
   ;
@@ -33836,19 +35851,20 @@
 }
 
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_cxx_try_link "$LINENO"
+then :
+  	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		ac_cv_lib_vpb_vpb_open="yes"
 
-else
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 		ac_cv_lib_vpb_vpb_open="no"
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
    LIBS="${saved_libs}"
    CPPFLAGS="${saved_cppflags}"
@@ -33860,7 +35876,7 @@
 	fi
 	PBX_VPB=1
 
-$as_echo "#define HAVE_VPB 1" >>confdefs.h
+printf "%s\n" "#define HAVE_VPB 1" >>confdefs.h
 
    fi
 fi
@@ -33886,11 +35902,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
-$as_echo_n "checking for compress in -lz... " >&6; }
-if ${ac_cv_lib_z_compress+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
+printf %s "checking for compress in -lz... " >&6; }
+if test ${ac_cv_lib_z_compress+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33899,32 +35916,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char compress ();
 int
-main ()
+main (void)
 {
 return compress ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_z_compress=yes
-else
+else $as_nop
   ac_cv_lib_z_compress=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
-$as_echo "$ac_cv_lib_z_compress" >&6; }
-if test "x$ac_cv_lib_z_compress" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
+printf "%s\n" "$ac_cv_lib_z_compress" >&6; }
+if test "x$ac_cv_lib_z_compress" = xyes
+then :
   AST_ZLIB_FOUND=yes
-else
+else $as_nop
   AST_ZLIB_FOUND=no
 fi
 
@@ -33943,14 +35959,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ZLIB_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = xyes
+then :
   ZLIB_HEADER_FOUND=1
-else
+else $as_nop
   ZLIB_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${ZLIB_HEADER_FOUND}" = "x0" ; then
@@ -33971,46 +35987,45 @@
 
 if test "x${PBX_UNIXODBC}" = "x1" -o "x${PBX_IODBC}" = "x1"; then
 	# Does ODBC support wide characters?
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ODBC has support for Unicode types" >&5
-$as_echo_n "checking whether ODBC has support for Unicode types... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ODBC has support for Unicode types" >&5
+printf %s "checking whether ODBC has support for Unicode types... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sql.h>
 #include <sqlext.h>
 int
-main ()
+main (void)
 {
 int foo = SQL_WCHAR
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_ODBC_WCHAR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ODBC_WCHAR 1" >>confdefs.h
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 
-ac_fn_c_check_header_mongrel "$LINENO" "linux/compiler.h" "ac_cv_header_linux_compiler_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_compiler_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "linux/compiler.h" "ac_cv_header_linux_compiler_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_compiler_h" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LINUX_COMPILER_H 1
-_ACEOF
+printf "%s\n" "#define HAVE_LINUX_COMPILER_H 1" >>confdefs.h
 
 fi
 
 
-
 ac_fn_c_check_header_compile "$LINENO" "linux/ixjuser.h" "ac_cv_header_linux_ixjuser_h" "
 				   #include <linux/version.h>
 				   #ifdef HAVE_LINUX_COMPILER_H
@@ -34018,20 +36033,20 @@
 				   #endif
 
 "
-if test "x$ac_cv_header_linux_ixjuser_h" = xyes; then :
+if test "x$ac_cv_header_linux_ixjuser_h" = xyes
+then :
   PBX_IXJUSER=1
-else
+else $as_nop
   PBX_IXJUSER=0
 fi
 
 
 
-
 # Used in res/res_pktccops
 
     if test "x${PBX_MSG_NOSIGNAL}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MSG_NOSIGNAL in sys/socket.h" >&5
-$as_echo_n "checking for MSG_NOSIGNAL in sys/socket.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MSG_NOSIGNAL in sys/socket.h" >&5
+printf %s "checking for MSG_NOSIGNAL in sys/socket.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${MSG_NOSIGNAL_DIR}" != "x"; then
 	    MSG_NOSIGNAL_INCLUDE="-I${MSG_NOSIGNAL_DIR}/include"
@@ -34042,7 +36057,7 @@
 /* end confdefs.h.  */
  #include <sys/socket.h>
 int
-main ()
+main (void)
 {
 #if defined(MSG_NOSIGNAL)
 				int foo = 0;
@@ -34055,29 +36070,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_MSG_NOSIGNAL=1
 
-$as_echo "#define HAVE_MSG_NOSIGNAL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_MSG_NOSIGNAL 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_SO_NOSIGPIPE}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SO_NOSIGPIPE in sys/socket.h" >&5
-$as_echo_n "checking for SO_NOSIGPIPE in sys/socket.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SO_NOSIGPIPE in sys/socket.h" >&5
+printf %s "checking for SO_NOSIGPIPE in sys/socket.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${SO_NOSIGPIPE_DIR}" != "x"; then
 	    SO_NOSIGPIPE_INCLUDE="-I${SO_NOSIGPIPE_DIR}/include"
@@ -34088,7 +36104,7 @@
 /* end confdefs.h.  */
  #include <sys/socket.h>
 int
-main ()
+main (void)
 {
 #if defined(SO_NOSIGPIPE)
 				int foo = 0;
@@ -34101,21 +36117,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_SO_NOSIGPIPE=1
 
-$as_echo "#define HAVE_SO_NOSIGPIPE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SO_NOSIGPIPE 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
@@ -34127,11 +36144,12 @@
 		if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}sdl-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}sdl-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CONFIG_SDL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CONFIG_SDL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CONFIG_SDL in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CONFIG_SDL="$CONFIG_SDL" # Let the user override the test with a path.
@@ -34142,11 +36160,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CONFIG_SDL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CONFIG_SDL="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -34158,11 +36180,11 @@
 fi
 CONFIG_SDL=$ac_cv_path_CONFIG_SDL
 if test -n "$CONFIG_SDL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_SDL" >&5
-$as_echo "$CONFIG_SDL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CONFIG_SDL" >&5
+printf "%s\n" "$CONFIG_SDL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -34171,11 +36193,12 @@
   ac_pt_CONFIG_SDL=$CONFIG_SDL
   # Extract the first word of "sdl-config", so it can be a program name with args.
 set dummy sdl-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_CONFIG_SDL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_CONFIG_SDL+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_CONFIG_SDL in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_CONFIG_SDL="$ac_pt_CONFIG_SDL" # Let the user override the test with a path.
@@ -34186,11 +36209,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_CONFIG_SDL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_CONFIG_SDL="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -34202,11 +36229,11 @@
 fi
 ac_pt_CONFIG_SDL=$ac_cv_path_ac_pt_CONFIG_SDL
 if test -n "$ac_pt_CONFIG_SDL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_SDL" >&5
-$as_echo "$ac_pt_CONFIG_SDL" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_SDL" >&5
+printf "%s\n" "$ac_pt_CONFIG_SDL" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_CONFIG_SDL" = x; then
@@ -34214,8 +36241,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CONFIG_SDL=$ac_pt_CONFIG_SDL
@@ -34234,7 +36261,7 @@
 
 				PBX_SDL=1
 
-$as_echo "#define HAVE_SDL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SDL 1" >>confdefs.h
 
 
 		fi
@@ -34254,11 +36281,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} ${SDL_INCLUDE}"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMG_Load in -lSDL_image" >&5
-$as_echo_n "checking for IMG_Load in -lSDL_image... " >&6; }
-if ${ac_cv_lib_SDL_image_IMG_Load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IMG_Load in -lSDL_image" >&5
+printf %s "checking for IMG_Load in -lSDL_image... " >&6; }
+if test ${ac_cv_lib_SDL_image_IMG_Load+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lSDL_image ${pbxlibdir} ${SDL_LIB} $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -34267,32 +36295,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char IMG_Load ();
 int
-main ()
+main (void)
 {
 return IMG_Load ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_SDL_image_IMG_Load=yes
-else
+else $as_nop
   ac_cv_lib_SDL_image_IMG_Load=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
-$as_echo "$ac_cv_lib_SDL_image_IMG_Load" >&6; }
-if test "x$ac_cv_lib_SDL_image_IMG_Load" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
+printf "%s\n" "$ac_cv_lib_SDL_image_IMG_Load" >&6; }
+if test "x$ac_cv_lib_SDL_image_IMG_Load" = xyes
+then :
   AST_SDL_IMAGE_FOUND=yes
-else
+else $as_nop
   AST_SDL_IMAGE_FOUND=no
 fi
 
@@ -34311,14 +36338,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${SDL_IMAGE_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "SDL_image.h" "ac_cv_header_SDL_image_h" "$ac_includes_default"
-if test "x$ac_cv_header_SDL_image_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "SDL_image.h" "ac_cv_header_SDL_image_h" "$ac_includes_default"
+if test "x$ac_cv_header_SDL_image_h" = xyes
+then :
   SDL_IMAGE_HEADER_FOUND=1
-else
+else $as_nop
   SDL_IMAGE_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${SDL_IMAGE_HEADER_FOUND}" = "x0" ; then
@@ -34350,11 +36377,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sws_getContext in -lavcodec" >&5
-$as_echo_n "checking for sws_getContext in -lavcodec... " >&6; }
-if ${ac_cv_lib_avcodec_sws_getContext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sws_getContext in -lavcodec" >&5
+printf %s "checking for sws_getContext in -lavcodec... " >&6; }
+if test ${ac_cv_lib_avcodec_sws_getContext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lavcodec ${pbxlibdir} ${PTHREAD_LIBS} -lz -lm $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -34363,32 +36391,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sws_getContext ();
 int
-main ()
+main (void)
 {
 return sws_getContext ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_avcodec_sws_getContext=yes
-else
+else $as_nop
   ac_cv_lib_avcodec_sws_getContext=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_sws_getContext" >&5
-$as_echo "$ac_cv_lib_avcodec_sws_getContext" >&6; }
-if test "x$ac_cv_lib_avcodec_sws_getContext" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_sws_getContext" >&5
+printf "%s\n" "$ac_cv_lib_avcodec_sws_getContext" >&6; }
+if test "x$ac_cv_lib_avcodec_sws_getContext" = xyes
+then :
   AST_FFMPEG_FOUND=yes
-else
+else $as_nop
   AST_FFMPEG_FOUND=no
 fi
 
@@ -34407,14 +36434,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${FFMPEG_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "ffmpeg/avcodec.h" "ac_cv_header_ffmpeg_avcodec_h" "$ac_includes_default"
-if test "x$ac_cv_header_ffmpeg_avcodec_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "ffmpeg/avcodec.h" "ac_cv_header_ffmpeg_avcodec_h" "$ac_includes_default"
+if test "x$ac_cv_header_ffmpeg_avcodec_h" = xyes
+then :
   FFMPEG_HEADER_FOUND=1
-else
+else $as_nop
   FFMPEG_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${FFMPEG_HEADER_FOUND}" = "x0" ; then
@@ -34434,17 +36461,15 @@
 
 
 # possible places for video4linux version 1
-ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_videodev_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_videodev_h" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_VIDEODEV_H 1
-_ACEOF
+printf "%s\n" "#define HAVE_VIDEODEV_H 1" >>confdefs.h
 
 fi
 
 
-
 # possible places for X11
 
 if test "x${PBX_X11}" != "x1" -a "${USE_X11}" != "no"; then
@@ -34460,11 +36485,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
-$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; }
-if ${ac_cv_lib_X11_XOpenDisplay+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
+printf %s "checking for XOpenDisplay in -lX11... " >&6; }
+if test ${ac_cv_lib_X11_XOpenDisplay+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -34473,32 +36499,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char XOpenDisplay ();
 int
-main ()
+main (void)
 {
 return XOpenDisplay ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_X11_XOpenDisplay=yes
-else
+else $as_nop
   ac_cv_lib_X11_XOpenDisplay=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
-if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+printf "%s\n" "$ac_cv_lib_X11_XOpenDisplay" >&6; }
+if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes
+then :
   AST_X11_FOUND=yes
-else
+else $as_nop
   AST_X11_FOUND=no
 fi
 
@@ -34517,14 +36542,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xlib_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_X11_Xlib_h" = xyes
+then :
   X11_HEADER_FOUND=1
-else
+else $as_nop
   X11_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${X11_HEADER_FOUND}" = "x0" ; then
@@ -34560,11 +36585,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} -I/usr/X11R6/include"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
-$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; }
-if ${ac_cv_lib_X11_XOpenDisplay+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5
+printf %s "checking for XOpenDisplay in -lX11... " >&6; }
+if test ${ac_cv_lib_X11_XOpenDisplay+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -34573,32 +36599,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char XOpenDisplay ();
 int
-main ()
+main (void)
 {
 return XOpenDisplay ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_X11_XOpenDisplay=yes
-else
+else $as_nop
   ac_cv_lib_X11_XOpenDisplay=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
-if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+printf "%s\n" "$ac_cv_lib_X11_XOpenDisplay" >&6; }
+if test "x$ac_cv_lib_X11_XOpenDisplay" = xyes
+then :
   AST_X11_FOUND=yes
-else
+else $as_nop
   AST_X11_FOUND=no
 fi
 
@@ -34617,14 +36642,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${X11_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xlib_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_X11_Xlib_h" = xyes
+then :
   X11_HEADER_FOUND=1
-else
+else $as_nop
   X11_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${X11_HEADER_FOUND}" = "x0" ; then
@@ -34650,11 +36675,12 @@
 PBX_LAUNCHD=0
 if test "${cross_compiling}" = "no";
 then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /sbin/launchd" >&5
-$as_echo_n "checking for /sbin/launchd... " >&6; }
-if ${ac_cv_file__sbin_launchd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /sbin/launchd" >&5
+printf %s "checking for /sbin/launchd... " >&6; }
+if test ${ac_cv_file__sbin_launchd+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/sbin/launchd"; then
@@ -34663,12 +36689,13 @@
   ac_cv_file__sbin_launchd=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__sbin_launchd" >&5
-$as_echo "$ac_cv_file__sbin_launchd" >&6; }
-if test "x$ac_cv_file__sbin_launchd" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__sbin_launchd" >&5
+printf "%s\n" "$ac_cv_file__sbin_launchd" >&6; }
+if test "x$ac_cv_file__sbin_launchd" = xyes
+then :
   PBX_LAUNCHD=1
 
-$as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
 
 fi
 
@@ -34679,17 +36706,17 @@
    if test "x${PBX_GTK2}" != "x1" -a "${USE_GTK2}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5
-$as_echo_n "checking for GTK2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5
+printf %s "checking for gtk+-2.0... " >&6; }
 
 if test -n "$GTK2_CFLAGS"; then
     pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -34703,10 +36730,10 @@
     pkg_cv_GTK2_LIBS="$GTK2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -34720,8 +36747,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -34741,8 +36768,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_GTK2=0
 
@@ -34750,14 +36777,14 @@
 else
 	GTK2_CFLAGS=$pkg_cv_GTK2_CFLAGS
 	GTK2_LIBS=$pkg_cv_GTK2_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_GTK2=1
             GTK2_INCLUDE=$(echo ${GTK2_CFLAGS} | $SED -e "s|-std=c99||g")
             GTK2_LIB="$GTK2_LIBS"
 
-$as_echo "#define HAVE_GTK2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GTK2 1" >>confdefs.h
 
 
 fi
@@ -34790,17 +36817,17 @@
    if test "x${PBX_SYSTEMD}" != "x1" -a "${USE_SYSTEMD}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
-$as_echo_n "checking for SYSTEMD... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd" >&5
+printf %s "checking for libsystemd... " >&6; }
 
 if test -n "$SYSTEMD_CFLAGS"; then
     pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -34814,10 +36841,10 @@
     pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -34831,8 +36858,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -34852,8 +36879,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_SYSTEMD=0
 
@@ -34861,14 +36888,14 @@
 else
 	SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
 	SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_SYSTEMD=1
             SYSTEMD_INCLUDE=$(echo ${SYSTEMD_CFLAGS} | $SED -e "s|-std=c99||g")
             SYSTEMD_LIB="$SYSTEMD_LIBS"
 
-$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSTEMD 1" >>confdefs.h
 
 
 fi
@@ -34881,8 +36908,8 @@
    # syslog facilities
 
     if test "x${PBX_SYSLOG_FACILITY_LOG_AUTH}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOG_AUTH in syslog.h" >&5
-$as_echo_n "checking for LOG_AUTH in syslog.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOG_AUTH in syslog.h" >&5
+printf %s "checking for LOG_AUTH in syslog.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${SYSLOG_FACILITY_LOG_AUTH_DIR}" != "x"; then
 	    SYSLOG_FACILITY_LOG_AUTH_INCLUDE="-I${SYSLOG_FACILITY_LOG_AUTH_DIR}/include"
@@ -34893,7 +36920,7 @@
 /* end confdefs.h.  */
  #include <syslog.h>
 int
-main ()
+main (void)
 {
 #if defined(LOG_AUTH)
 				int foo = 0;
@@ -34906,29 +36933,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_SYSLOG_FACILITY_LOG_AUTH=1
 
-$as_echo "#define HAVE_SYSLOG_FACILITY_LOG_AUTH 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_AUTH 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_SYSLOG_FACILITY_LOG_AUTHPRIV}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOG_AUTHPRIV in syslog.h" >&5
-$as_echo_n "checking for LOG_AUTHPRIV in syslog.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOG_AUTHPRIV in syslog.h" >&5
+printf %s "checking for LOG_AUTHPRIV in syslog.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${SYSLOG_FACILITY_LOG_AUTHPRIV_DIR}" != "x"; then
 	    SYSLOG_FACILITY_LOG_AUTHPRIV_INCLUDE="-I${SYSLOG_FACILITY_LOG_AUTHPRIV_DIR}/include"
@@ -34939,7 +36967,7 @@
 /* end confdefs.h.  */
  #include <syslog.h>
 int
-main ()
+main (void)
 {
 #if defined(LOG_AUTHPRIV)
 				int foo = 0;
@@ -34952,29 +36980,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_SYSLOG_FACILITY_LOG_AUTHPRIV=1
 
-$as_echo "#define HAVE_SYSLOG_FACILITY_LOG_AUTHPRIV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_AUTHPRIV 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_SYSLOG_FACILITY_LOG_CRON}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOG_CRON in syslog.h" >&5
-$as_echo_n "checking for LOG_CRON in syslog.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOG_CRON in syslog.h" >&5
+printf %s "checking for LOG_CRON in syslog.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${SYSLOG_FACILITY_LOG_CRON_DIR}" != "x"; then
 	    SYSLOG_FACILITY_LOG_CRON_INCLUDE="-I${SYSLOG_FACILITY_LOG_CRON_DIR}/include"
@@ -34985,7 +37014,7 @@
 /* end confdefs.h.  */
  #include <syslog.h>
 int
-main ()
+main (void)
 {
 #if defined(LOG_CRON)
 				int foo = 0;
@@ -34998,29 +37027,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_SYSLOG_FACILITY_LOG_CRON=1
 
-$as_echo "#define HAVE_SYSLOG_FACILITY_LOG_CRON 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_CRON 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_SYSLOG_FACILITY_LOG_DAEMON}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOG_DAEMON in syslog.h" >&5
-$as_echo_n "checking for LOG_DAEMON in syslog.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOG_DAEMON in syslog.h" >&5
+printf %s "checking for LOG_DAEMON in syslog.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${SYSLOG_FACILITY_LOG_DAEMON_DIR}" != "x"; then
 	    SYSLOG_FACILITY_LOG_DAEMON_INCLUDE="-I${SYSLOG_FACILITY_LOG_DAEMON_DIR}/include"
@@ -35031,7 +37061,7 @@
 /* end confdefs.h.  */
  #include <syslog.h>
 int
-main ()
+main (void)
 {
 #if defined(LOG_DAEMON)
 				int foo = 0;
@@ -35044,29 +37074,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_SYSLOG_FACILITY_LOG_DAEMON=1
 
-$as_echo "#define HAVE_SYSLOG_FACILITY_LOG_DAEMON 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_DAEMON 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_SYSLOG_FACILITY_LOG_FTP}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOG_FTP in syslog.h" >&5
-$as_echo_n "checking for LOG_FTP in syslog.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOG_FTP in syslog.h" >&5
+printf %s "checking for LOG_FTP in syslog.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${SYSLOG_FACILITY_LOG_FTP_DIR}" != "x"; then
 	    SYSLOG_FACILITY_LOG_FTP_INCLUDE="-I${SYSLOG_FACILITY_LOG_FTP_DIR}/include"
@@ -35077,7 +37108,7 @@
 /* end confdefs.h.  */
  #include <syslog.h>
 int
-main ()
+main (void)
 {
 #if defined(LOG_FTP)
 				int foo = 0;
@@ -35090,29 +37121,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_SYSLOG_FACILITY_LOG_FTP=1
 
-$as_echo "#define HAVE_SYSLOG_FACILITY_LOG_FTP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_FTP 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_SYSLOG_FACILITY_LOG_KERN}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOG_KERN in syslog.h" >&5
-$as_echo_n "checking for LOG_KERN in syslog.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOG_KERN in syslog.h" >&5
+printf %s "checking for LOG_KERN in syslog.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${SYSLOG_FACILITY_LOG_KERN_DIR}" != "x"; then
 	    SYSLOG_FACILITY_LOG_KERN_INCLUDE="-I${SYSLOG_FACILITY_LOG_KERN_DIR}/include"
@@ -35123,7 +37155,7 @@
 /* end confdefs.h.  */
  #include <syslog.h>
 int
-main ()
+main (void)
 {
 #if defined(LOG_KERN)
 				int foo = 0;
@@ -35136,29 +37168,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_SYSLOG_FACILITY_LOG_KERN=1
 
-$as_echo "#define HAVE_SYSLOG_FACILITY_LOG_KERN 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_KERN 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_SYSLOG_FACILITY_LOG_LPR}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOG_LPR in syslog.h" >&5
-$as_echo_n "checking for LOG_LPR in syslog.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOG_LPR in syslog.h" >&5
+printf %s "checking for LOG_LPR in syslog.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${SYSLOG_FACILITY_LOG_LPR_DIR}" != "x"; then
 	    SYSLOG_FACILITY_LOG_LPR_INCLUDE="-I${SYSLOG_FACILITY_LOG_LPR_DIR}/include"
@@ -35169,7 +37202,7 @@
 /* end confdefs.h.  */
  #include <syslog.h>
 int
-main ()
+main (void)
 {
 #if defined(LOG_LPR)
 				int foo = 0;
@@ -35182,29 +37215,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_SYSLOG_FACILITY_LOG_LPR=1
 
-$as_echo "#define HAVE_SYSLOG_FACILITY_LOG_LPR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_LPR 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_SYSLOG_FACILITY_LOG_MAIL}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOG_MAIL in syslog.h" >&5
-$as_echo_n "checking for LOG_MAIL in syslog.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOG_MAIL in syslog.h" >&5
+printf %s "checking for LOG_MAIL in syslog.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${SYSLOG_FACILITY_LOG_MAIL_DIR}" != "x"; then
 	    SYSLOG_FACILITY_LOG_MAIL_INCLUDE="-I${SYSLOG_FACILITY_LOG_MAIL_DIR}/include"
@@ -35215,7 +37249,7 @@
 /* end confdefs.h.  */
  #include <syslog.h>
 int
-main ()
+main (void)
 {
 #if defined(LOG_MAIL)
 				int foo = 0;
@@ -35228,29 +37262,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_SYSLOG_FACILITY_LOG_MAIL=1
 
-$as_echo "#define HAVE_SYSLOG_FACILITY_LOG_MAIL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_MAIL 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_SYSLOG_FACILITY_LOG_NEWS}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOG_NEWS in syslog.h" >&5
-$as_echo_n "checking for LOG_NEWS in syslog.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOG_NEWS in syslog.h" >&5
+printf %s "checking for LOG_NEWS in syslog.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${SYSLOG_FACILITY_LOG_NEWS_DIR}" != "x"; then
 	    SYSLOG_FACILITY_LOG_NEWS_INCLUDE="-I${SYSLOG_FACILITY_LOG_NEWS_DIR}/include"
@@ -35261,7 +37296,7 @@
 /* end confdefs.h.  */
  #include <syslog.h>
 int
-main ()
+main (void)
 {
 #if defined(LOG_NEWS)
 				int foo = 0;
@@ -35274,29 +37309,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_SYSLOG_FACILITY_LOG_NEWS=1
 
-$as_echo "#define HAVE_SYSLOG_FACILITY_LOG_NEWS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_NEWS 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_SYSLOG_FACILITY_LOG_SYSLOG}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOG_SYSLOG in syslog.h" >&5
-$as_echo_n "checking for LOG_SYSLOG in syslog.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOG_SYSLOG in syslog.h" >&5
+printf %s "checking for LOG_SYSLOG in syslog.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${SYSLOG_FACILITY_LOG_SYSLOG_DIR}" != "x"; then
 	    SYSLOG_FACILITY_LOG_SYSLOG_INCLUDE="-I${SYSLOG_FACILITY_LOG_SYSLOG_DIR}/include"
@@ -35307,7 +37343,7 @@
 /* end confdefs.h.  */
  #include <syslog.h>
 int
-main ()
+main (void)
 {
 #if defined(LOG_SYSLOG)
 				int foo = 0;
@@ -35320,29 +37356,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_SYSLOG_FACILITY_LOG_SYSLOG=1
 
-$as_echo "#define HAVE_SYSLOG_FACILITY_LOG_SYSLOG 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_SYSLOG 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
 
 
     if test "x${PBX_SYSLOG_FACILITY_LOG_UUCP}" != "x1"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LOG_UUCP in syslog.h" >&5
-$as_echo_n "checking for LOG_UUCP in syslog.h... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LOG_UUCP in syslog.h" >&5
+printf %s "checking for LOG_UUCP in syslog.h... " >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${SYSLOG_FACILITY_LOG_UUCP_DIR}" != "x"; then
 	    SYSLOG_FACILITY_LOG_UUCP_INCLUDE="-I${SYSLOG_FACILITY_LOG_UUCP_DIR}/include"
@@ -35353,7 +37390,7 @@
 /* end confdefs.h.  */
  #include <syslog.h>
 int
-main ()
+main (void)
 {
 #if defined(LOG_UUCP)
 				int foo = 0;
@@ -35366,21 +37403,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 		PBX_SYSLOG_FACILITY_LOG_UUCP=1
 
-$as_echo "#define HAVE_SYSLOG_FACILITY_LOG_UUCP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_SYSLOG_FACILITY_LOG_UUCP 1" >>confdefs.h
 
 
 
-else
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else $as_nop
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	CPPFLAGS="${saved_cppflags}"
     fi
 
@@ -35399,11 +37437,12 @@
 # conf_bridge (binaural rendering): check if HRIRs are available
 # this check does not work when cross-compiling
 if test "${cross_compiling}" = "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bridges/bridge_softmix/include/hrirs.h" >&5
-$as_echo_n "checking for bridges/bridge_softmix/include/hrirs.h... " >&6; }
-if ${ac_cv_file_bridges_bridge_softmix_include_hrirs_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bridges/bridge_softmix/include/hrirs.h" >&5
+printf %s "checking for bridges/bridge_softmix/include/hrirs.h... " >&6; }
+if test ${ac_cv_file_bridges_bridge_softmix_include_hrirs_h+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   test "$cross_compiling" = yes &&
   as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "bridges/bridge_softmix/include/hrirs.h"; then
@@ -35412,13 +37451,12 @@
   ac_cv_file_bridges_bridge_softmix_include_hrirs_h=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file_bridges_bridge_softmix_include_hrirs_h" >&5
-$as_echo "$ac_cv_file_bridges_bridge_softmix_include_hrirs_h" >&6; }
-if test "x$ac_cv_file_bridges_bridge_softmix_include_hrirs_h" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file_bridges_bridge_softmix_include_hrirs_h" >&5
+printf "%s\n" "$ac_cv_file_bridges_bridge_softmix_include_hrirs_h" >&6; }
+if test "x$ac_cv_file_bridges_bridge_softmix_include_hrirs_h" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_BRIDGES_BRIDGE_SOFTMIX_INCLUDE_HRIRS_H 1
-_ACEOF
+printf "%s\n" "#define HAVE_BRIDGES_BRIDGE_SOFTMIX_INCLUDE_HRIRS_H 1" >>confdefs.h
 
 fi
 
@@ -35427,30 +37465,30 @@
 ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts"
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mandatory modules: ${ac_mandatory_list}" >&5
-$as_echo_n "checking for mandatory modules: ${ac_mandatory_list}... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mandatory modules: ${ac_mandatory_list}" >&5
+printf %s "checking for mandatory modules: ${ac_mandatory_list}... " >&6; }
 	err=0;
 	for i in ${ac_mandatory_list}; do
 		eval "a=\${PBX_$i}"
 		if test "x${a}" = "x1" ; then continue; fi
-		if test ${err} = "0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: fail" >&5
-$as_echo "fail" >&6; } ; fi
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
+		if test ${err} = "0" ; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: fail" >&5
+printf "%s\n" "fail" >&6; } ; fi
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
+printf "%s\n" "" >&6; }
 		eval "a=\${${i}_OPTION}"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: ***" >&5
-$as_echo "$as_me: ***" >&6;}
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: *** The $i installation appears to be missing or broken." >&5
-$as_echo "$as_me: *** The $i installation appears to be missing or broken." >&6;}
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Either correct the installation, or run configure" >&5
-$as_echo "$as_me: *** Either correct the installation, or run configure" >&6;}
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: *** including --without-${a}." >&5
-$as_echo "$as_me: *** including --without-${a}." >&6;}
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ***" >&5
+printf "%s\n" "$as_me: ***" >&6;}
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** The $i installation appears to be missing or broken." >&5
+printf "%s\n" "$as_me: *** The $i installation appears to be missing or broken." >&6;}
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** Either correct the installation, or run configure" >&5
+printf "%s\n" "$as_me: *** Either correct the installation, or run configure" >&6;}
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: *** including --without-${a}." >&5
+printf "%s\n" "$as_me: *** including --without-${a}." >&6;}
 		err=1
 	done
 	if test $err = 1 ; then exit 1; fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+printf "%s\n" "ok" >&6; }
 
 
 if test -f build_tools/menuselect-deps; then
@@ -35490,8 +37528,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -35521,15 +37559,15 @@
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
      t end
      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -35543,8 +37581,8 @@
       fi
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -35561,7 +37599,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -35577,8 +37615,8 @@
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -35601,14 +37639,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -35618,46 +37658,46 @@
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -35666,13 +37706,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -35681,8 +37714,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -35694,30 +37731,10 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -35730,13 +37747,14 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -35763,18 +37781,20 @@
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
+
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -35786,12 +37806,13 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -35822,7 +37843,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -35844,6 +37865,10 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -35857,6 +37882,12 @@
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -35898,7 +37929,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -35907,7 +37938,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -35970,7 +38001,7 @@
 # values after options handling.
 ac_log="
 This file was extended by asterisk $as_me trunk, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -36028,14 +38059,16 @@
 Report bugs to <https://issues.asterisk.org>."
 
 _ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 asterisk config.status trunk
-configured by $0, generated by GNU Autoconf 2.69,
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -36074,15 +38107,15 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    printf "%s\n" "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
+    printf "%s\n" "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -36090,7 +38123,7 @@
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -36099,7 +38132,7 @@
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    printf "%s\n" "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -36127,7 +38160,7 @@
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -36141,7 +38174,7 @@
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  printf "%s\n" "$ac_log"
 } >&5
 
 _ACEOF
@@ -36168,8 +38201,8 @@
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -36505,7 +38538,7 @@
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -36513,17 +38546,17 @@
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
+       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -36540,7 +38573,7 @@
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -36564,9 +38597,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -36623,8 +38656,8 @@
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -36667,9 +38700,9 @@
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -36685,20 +38718,20 @@
   #
   if test x"$ac_file" != x-; then
     {
-      $as_echo "/* $configure_input  */" \
+      printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    $as_echo "/* $configure_input  */" \
+    printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -36739,8 +38772,8 @@
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
@@ -36789,17 +38822,18 @@
 	echo
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Package configured for: " >&5
-$as_echo "$as_me: Package configured for: " >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: OS type  : $host_os" >&5
-$as_echo "$as_me: OS type  : $host_os" >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Host CPU : $host_cpu" >&5
-$as_echo "$as_me: Host CPU : $host_cpu" >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
-$as_echo "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
-$as_echo "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Package configured for: " >&5
+printf "%s\n" "$as_me: Package configured for: " >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: OS type  : $host_os" >&5
+printf "%s\n" "$as_me: OS type  : $host_os" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Host CPU : $host_cpu" >&5
+printf "%s\n" "$as_me: Host CPU : $host_cpu" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&5
+printf "%s\n" "$as_me: build-cpu:vendor:os: $build_cpu : $build_vendor : $build_os :" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&5
+printf "%s\n" "$as_me: host-cpu:vendor:os: $host_cpu : $host_vendor : $host_os :" >&6;}
 if test "${cross_compiling}" = "yes"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: Cross Compilation = YES" >&5
-$as_echo "$as_me: Cross Compilation = YES" >&6;}
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Cross Compilation = YES" >&5
+printf "%s\n" "$as_me: Cross Compilation = YES" >&6;}
 fi
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/configure.ac asterisk-18.12.0~dfsg+~cs6.12.40431413/configure.ac
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/configure.ac	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/configure.ac	2022-05-12 11:50:59.000000000 +0000
@@ -744,6 +744,7 @@
 # See if clock_gettime is in librt
 AST_EXT_LIB_CHECK([RT], [rt], [clock_gettime], [])
 
+AST_PKG_CONFIG_CHECK([LIBXML2], [libxml-2.0])
 AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , ,
         [#include <libxml/tree.h>
         #include <libxml/parser.h>],
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/contrib/ast-db-manage/config/versions/0bee61aa9425_allow_180_ringing_with_sdp.py asterisk-18.12.0~dfsg+~cs6.12.40431413/contrib/ast-db-manage/config/versions/0bee61aa9425_allow_180_ringing_with_sdp.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/contrib/ast-db-manage/config/versions/0bee61aa9425_allow_180_ringing_with_sdp.py	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/contrib/ast-db-manage/config/versions/0bee61aa9425_allow_180_ringing_with_sdp.py	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,36 @@
+"""allow_sending_180_after_183
+
+Revision ID: 0bee61aa9425
+Revises: 8f72185e437f
+Create Date: 2022-04-07 13:51:33.400664
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import ENUM
+
+# revision identifiers, used by Alembic.
+revision = '0bee61aa9425'
+down_revision = '8f72185e437f'
+AST_BOOL_NAME = 'ast_bool_values'
+# We'll just ignore the n/y and f/t abbreviations as Asterisk does not write
+# those aliases.
+AST_BOOL_VALUES = [ '0', '1',
+                    'off', 'on',
+                    'false', 'true',
+                    'no', 'yes' ]
+
+def upgrade():
+    ############################# Enums ##############################
+
+    # ast_bool_values has already been created, so use postgres enum object
+    # type to get around "already created" issue - works okay with mysql
+    ast_bool_values = ENUM(*AST_BOOL_VALUES, name=AST_BOOL_NAME, create_type=False)
+
+    op.add_column('ps_globals', sa.Column('allow_sending_180_after_183', ast_bool_values))
+
+
+def downgrade():
+    if op.get_context().bind.dialect.name == 'mssql':
+        op.drop_constraint('ck_ps_globals_allow_sending_180_after_183_ast_bool_values', 'ps_globals')
+    op.drop_column('ps_globals', 'allow_sending_180_after_183')
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/contrib/realtime/mysql/mysql_config.sql asterisk-18.12.0~dfsg+~cs6.12.40431413/contrib/realtime/mysql/mysql_config.sql
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/contrib/realtime/mysql/mysql_config.sql	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/contrib/realtime/mysql/mysql_config.sql	2022-05-12 11:50:59.000000000 +0000
@@ -1334,3 +1334,9 @@
 
 UPDATE alembic_version SET version_num='8f72185e437f' WHERE alembic_version.version_num = 'a06d8f8462d9';
 
+-- Running upgrade 8f72185e437f -> 0bee61aa9425
+
+ALTER TABLE ps_globals ADD COLUMN allow_sending_180_after_183 ENUM('0','1','off','on','false','true','no','yes');
+
+UPDATE alembic_version SET version_num='0bee61aa9425' WHERE alembic_version.version_num = '8f72185e437f';
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/contrib/realtime/postgresql/postgresql_config.sql asterisk-18.12.0~dfsg+~cs6.12.40431413/contrib/realtime/postgresql/postgresql_config.sql
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/contrib/realtime/postgresql/postgresql_config.sql	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/contrib/realtime/postgresql/postgresql_config.sql	2022-05-12 11:50:59.000000000 +0000
@@ -1444,5 +1444,11 @@
 
 UPDATE alembic_version SET version_num='8f72185e437f' WHERE alembic_version.version_num = 'a06d8f8462d9';
 
+-- Running upgrade 8f72185e437f -> 0bee61aa9425
+
+ALTER TABLE ps_globals ADD COLUMN allow_sending_180_after_183 ast_bool_values;
+
+UPDATE alembic_version SET version_num='0bee61aa9425' WHERE alembic_version.version_num = '8f72185e437f';
+
 COMMIT;
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/changelog asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/changelog
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/changelog	2022-04-17 13:59:40.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/changelog	2022-05-12 20:37:38.000000000 +0000
@@ -1,3 +1,18 @@
+asterisk (1:18.12.0~dfsg+~cs6.12.40431413-1) unstable; urgency=medium
+
+  [ upstream ]
+  * new release
+
+  [ Jonas Smedegaard ]
+  * update watch file:
+    + fixate component pjproject at upstream release 2.12
+      (not asterisk fork of 2.10)
+  * update copyright info: update coverage
+  * update and unfuzz patches
+  * declare compliance with Debian Policy 4.6.1
+
+ -- Jonas Smedegaard <dr@jones.dk>  Thu, 12 May 2022 22:37:38 +0200
+
 asterisk (1:18.11.2~dfsg+~cs6.10.40431413-1) unstable; urgency=medium
 
   [ upstream ]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/control asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/control
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/control	2022-04-06 13:18:45.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/control	2022-05-12 20:37:12.000000000 +0000
@@ -73,7 +73,7 @@
  unixodbc-dev,
  uuid-dev,
  zlib1g-dev,
-Standards-Version: 4.1.1
+Standards-Version: 4.6.1
 Homepage: https://www.asterisk.org/
 Vcs-Git: https://salsa.debian.org/pkg-voip-team/asterisk.git
 Vcs-Browser: https://salsa.debian.org/pkg-voip-team/asterisk
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/copyright asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/copyright
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/copyright	2022-04-17 13:57:32.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/copyright	2022-05-12 20:20:26.000000000 +0000
@@ -144,7 +144,7 @@
   2007-2009  Konftel AB
   2010-2012  Regis Montoya (r3gis) <http://www.r3gis.fr/>
   2014-2017  Savoir-faire Linux
-  2008-2019  Teluu Inc. <http://www.teluu.com/>
+  2008-2021  Teluu Inc. <http://www.teluu.com/>
   2012-2015  Zaark Technology AB
 License-Grant:
  This program is free software;
@@ -159,6 +159,77 @@
  for our redistribution.
 
 Files:
+ Xpjproject/third_party/webrtc_aec3/*
+Copyright:
+  1996-2001             Takuya OOURA
+  2004-2006, 2011-2021  The WebRTC project authors
+License-Grant:
+ Use of this source code is governed by a BSD-style license
+ that can be found in the <LICENSE> file
+ in the root of the source tree.
+License: BSD-3-clause~Google
+
+Files:
+ Xpjproject/third_party/webrtc_aec3/src/absl/*
+Copyright:
+  2017-2019  The Abseil Authors
+License-Grant:
+ Licensed under the Apache License,
+ Version 2.0 (the "License");
+ you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License
+ at <https://www.apache.org/licenses/LICENSE-2.0>
+License: Apache-2.0
+
+Files:
+ Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/*
+Copyright:
+  2013  Julien Pommier <pommier@modartt.com>
+  2004  the University Corporation for Atmospheric Research ("UCAR")
+License: BSD-3-clause~NCAR
+
+Files:
+ Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/*
+Copyright:
+  2012-2017  Jean-Marc Valin
+  2008-2011  Octasic Inc.
+License: BSD-2-clause
+License: BSD-2-clause
+ Redistribution and use in source and binary forms,
+ with or without modification,
+ are permitted
+ provided that the following conditions are met:
+   - Redistributions of source code must retain
+     the above copyright notice, this list of conditions
+     and the following disclaimer.
+   - Redistributions in binary form must reproduce
+     the above copyright notice, this list of conditions
+     and the following disclaimer
+     in the documentation and/or other materials
+     provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED
+ BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.
+ IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files:
  Xamr/*
 Copyright: none (Public Domain)
 License: public-domain
@@ -246,7 +317,7 @@
  */configure
  Xpjproject/aconfigure
 Copyright:
-  1992-1996, 1998-2012  Free Software Foundation, Inc.
+  1992-1996, 1998-2017, 2020-2021  Free Software Foundation, Inc.
 License: FSFUL
 
 Files:
@@ -1054,6 +1125,42 @@
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: BSD-3-clause~Google
+ Redistribution and use in source and binary forms,
+ with or without modification, are permitted
+ provided that the following conditions are met:
+  1) Redistributions of source code must retain
+     the above copyright notice, this list of conditions
+     and the following disclaimer.
+  2) Redistributions in binary form must reproduce
+     the above copyright notice, this list of conditions
+     and the following disclaimer
+     in the documentation and/or other materials
+     provided with the distribution.
+  3) Neither the name of Google nor the names of its contributors
+     may be used to endorse or promote products
+     derived from this software
+     without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED
+ BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 License: BSD-3-Clause~IETF
  Redistribution and use in source and binary forms,
  with or without modification,
@@ -1093,6 +1200,39 @@
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: BSD-3-clause~NCAR
+ Redistribution and use of the Software in source and binary forms,
+ with or without modification, is permitted provided that the
+ following conditions are met:
+   - Neither the names
+     of NCAR's Computational and Information Systems Laboratory,
+     the University Corporation for Atmospheric Research,
+     nor the names of its sponsors or contributors
+     may be used to endorse or promote
+     products derived from this Software
+     without specific prior written permission.
+   - Redistributions of source code must retain
+     the above copyright notices, this list of conditions,
+     and the disclaimer below.
+   - Redistributions in binary form must reproduce
+     the above copyright notice, this list of conditions,
+     and the disclaimer below
+     in the documentation and/or other materials
+     provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED "AS IS",
+ WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ INCLUDING, BUT NOT LIMITED TO
+ THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE
+ FOR ANY CLAIM, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+ OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
+
 License: BSD-3-Clause~Xiph
  Redistribution and use in source and binary forms,
  with or without modification, are permitted
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/copyright_hints asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/copyright_hints
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/copyright_hints	2022-04-17 13:56:51.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/copyright_hints	2022-05-12 17:19:36.000000000 +0000
@@ -34,6 +34,7 @@
  Xpjproject/INSTALL.txt
  Xpjproject/Makefile
  Xpjproject/README-RTEMS
+ Xpjproject/SECURITY.md
  Xpjproject/aconfigure.ac
  Xpjproject/bb10-config.mak
  Xpjproject/build.mak.in
@@ -103,6 +104,8 @@
  Xpjproject/build/vs/pjproject-vs14-api-def.props
  Xpjproject/build/vs/pjproject-vs14-arm-common-defaults.props
  Xpjproject/build/vs/pjproject-vs14-arm-release-defaults.props
+ Xpjproject/build/vs/pjproject-vs14-arm64-common-defaults.props
+ Xpjproject/build/vs/pjproject-vs14-arm64-release-defaults.props
  Xpjproject/build/vs/pjproject-vs14-build-targets.targets
  Xpjproject/build/vs/pjproject-vs14-common-config.props
  Xpjproject/build/vs/pjproject-vs14-common-defaults.props
@@ -205,6 +208,7 @@
  Xpjproject/pjlib/docs/doxygen.css
  Xpjproject/pjlib/docs/header.html
  Xpjproject/pjlib/include/pj/config_site_sample.h
+ Xpjproject/pjlib/include/pj/config_site_test.h
  Xpjproject/pjlib/src/pjlib-test/main_symbian.cpp
  Xpjproject/pjlib/src/pjlib-test/pjlib_test_reg.rss
  Xpjproject/pjmedia/build/Jbtest.dat
@@ -336,6 +340,16 @@
  Xpjproject/pjsip-apps/src/pjsua/bb10/translations/Makefile
  Xpjproject/pjsip-apps/src/pjsua/bb10/translations/PjsuaBB.pro
  Xpjproject/pjsip-apps/src/pjsua/bb10/translations/PjsuaBB.ts
+ Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.pbxproj
+ Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+ Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+ Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/AccentColor.colorset/Contents.json
+ Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/AppIcon.appiconset/Contents.json
+ Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/Contents.json
+ Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Info.plist
+ Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Preview Content/Preview Assets.xcassets/Contents.json
+ Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ipjsua-swift-Bridging-Header.h
+ Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/pjsip.m
  Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj
  Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/xcshareddata/xcschemes/ipjsua.xcscheme
  Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua.xcworkspace/contents.xcworkspacedata
@@ -408,6 +422,17 @@
  Xpjproject/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipTasks/project.json
  Xpjproject/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipTasks/project.lock.json
  Xpjproject/pjsip-apps/src/pjsua/wm/pjsua.bmp
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.pbxproj
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/xcshareddata/xcschemes/ios-swift-pjsua2.xcscheme
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/AccentColor.colorset/Contents.json
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/AppIcon.appiconset/Contents.json
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/Contents.json
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Info.plist
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/View/Base.lproj/LaunchScreen.storyboard
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/View/Base.lproj/Main.storyboard
  Xpjproject/pjsip-apps/src/pjsystest/pjsystest_wince.rc
  Xpjproject/pjsip-apps/src/pjsystest/pjsystest_wince.rc2
  Xpjproject/pjsip-apps/src/pjsystest/resource.h
@@ -427,6 +452,21 @@
  Xpjproject/pjsip-apps/src/swig/Makefile
  Xpjproject/pjsip-apps/src/swig/csharp/Makefile
  Xpjproject/pjsip-apps/src/swig/java/Makefile
+ Xpjproject/pjsip-apps/src/swig/java/android/android.iml
+ Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/build.gradle
+ Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/proguard-rules.pro
+ Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/AndroidManifest.xml
+ Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/java/org/pjsip/pjsua2/app_kotlin/MainActivity.kt
+ Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml
+ Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/drawable/ic_launcher_background.xml
+ Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/layout/activity_main.xml
+ Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+ Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+ Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values-night/themes.xml
+ Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/colors.xml
+ Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/strings.xml
+ Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/themes.xml
+ Xpjproject/pjsip-apps/src/swig/java/android/app/app.iml
  Xpjproject/pjsip-apps/src/swig/java/android/app/build.gradle
  Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/AndroidManifest.xml
  Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/res/drawable/bkg.xml
@@ -448,6 +488,9 @@
  Xpjproject/pjsip-apps/src/swig/java/android/gradle/wrapper/gradle-wrapper.properties
  Xpjproject/pjsip-apps/src/swig/java/android/gradlew
  Xpjproject/pjsip-apps/src/swig/java/android/gradlew.bat
+ Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/build.gradle
+ Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/proguard-rules.pro
+ Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/src/main/AndroidManifest.xml
  Xpjproject/pjsip-apps/src/swig/java/android/settings.gradle
  Xpjproject/pjsip-apps/src/swig/java/test.java
  Xpjproject/pjsip-apps/src/swig/pjsua2.i
@@ -552,6 +595,7 @@
  Xpjproject/tests/pjsua/scripts-call/150_srtp_3_1.py
  Xpjproject/tests/pjsua/scripts-call/150_srtp_3_2.py
  Xpjproject/tests/pjsua/scripts-call/150_srtp_3_3.py
+ Xpjproject/tests/pjsua/scripts-call/160_srtp_dtls.py
  Xpjproject/tests/pjsua/scripts-call/200_tcp.py
  Xpjproject/tests/pjsua/scripts-call/300_ice_0_1.py
  Xpjproject/tests/pjsua/scripts-call/300_ice_1_0.py
@@ -560,6 +604,14 @@
  Xpjproject/tests/pjsua/scripts-call/301_ice_public_b.py
  Xpjproject/tests/pjsua/scripts-call/305_ice_comp_1_2.py
  Xpjproject/tests/pjsua/scripts-call/305_ice_comp_2_1.py
+ Xpjproject/tests/pjsua/scripts-call/320_ice_dtls_srtp.py
+ Xpjproject/tests/pjsua/scripts-call/330_ice_no_ice_vs_trickle_full.py
+ Xpjproject/tests/pjsua/scripts-call/330_ice_reg_vs_trickle_full.py
+ Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full.py
+ Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full_vs_no_ice.py
+ Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full_vs_reg.py
+ Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_half.py
+ Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_half_vs_reg.py
  Xpjproject/tests/pjsua/scripts-call/350_prack_a.py
  Xpjproject/tests/pjsua/scripts-call/350_prack_b.py
  Xpjproject/tests/pjsua/scripts-call/400_tel_uri.py
@@ -739,6 +791,8 @@
  Xpjproject/tests/pjsua/scripts-sipp/uas-answer-183-without-to-tag.py
  Xpjproject/tests/pjsua/scripts-sipp/uas-answer-200-reinvite-without-sdp.py
  Xpjproject/tests/pjsua/scripts-sipp/uas-answer-200-update-without-sdp.py
+ Xpjproject/tests/pjsua/scripts-sipp/uas-auth-two-algo.py
+ Xpjproject/tests/pjsua/scripts-sipp/uas-auth-two-algo.xml
  Xpjproject/tests/pjsua/scripts-sipp/uas-auth.py
  Xpjproject/tests/pjsua/scripts-sipp/uas-cancel-no-final.py
  Xpjproject/tests/pjsua/scripts-sipp/uas-cancel-no-final.xml
@@ -747,6 +801,7 @@
  Xpjproject/tests/pjsua/scripts-sipp/uas-mwi.py
  Xpjproject/tests/pjsua/scripts-sipp/uas-register-ip-change-port-only.xml
  Xpjproject/tests/pjsua/scripts-sipp/uas-register-ip-change.xml
+ Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-after-failed-nego.py
  Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-glare.py
  Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-with-less-media.py
  Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-late-notify.py
@@ -755,6 +810,7 @@
  Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-refresh-481.py
  Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-terminated-retry.py
  Xpjproject/tests/pjsua/tools/Makefile
+ Xpjproject/tests/pjsua/tools/cmp_wav.vcxproj
  Xpjproject/tests/pjsua/wavs/input.11.wav
  Xpjproject/tests/pjsua/wavs/input.16.wav
  Xpjproject/tests/pjsua/wavs/input.2.16.wav
@@ -767,6 +823,7 @@
  Xpjproject/tests/pjsua/wavs/tock8.wav
  Xpjproject/third_party/README.txt
  Xpjproject/third_party/build/Makefile
+ Xpjproject/third_party/build/baseclasses/Makefile
  Xpjproject/third_party/build/baseclasses/libbaseclasses.vcproj
  Xpjproject/third_party/build/baseclasses/libbaseclasses.vcxproj
  Xpjproject/third_party/build/baseclasses/libbaseclasses.vcxproj.filters
@@ -802,7 +859,6 @@
  Xpjproject/third_party/build/resample/libresample.vcxproj
  Xpjproject/third_party/build/resample/libresample.vcxproj.filters
  Xpjproject/third_party/build/resample/libresample_dll.vcproj
- Xpjproject/third_party/build/samplerate/README.txt
  Xpjproject/third_party/build/samplerate/Static.msvc
  Xpjproject/third_party/build/samplerate/libsamplerate_static.dsp
  Xpjproject/third_party/build/speex/Makefile
@@ -822,11 +878,31 @@
  Xpjproject/third_party/build/webrtc/libwebrtc.vcxproj
  Xpjproject/third_party/build/webrtc/libwebrtc.vcxproj.filters
  Xpjproject/third_party/build/webrtc/notes.txt
+ Xpjproject/third_party/build/webrtc_aec3/Makefile
+ Xpjproject/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj
+ Xpjproject/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj.filters
  Xpjproject/third_party/build/yuv/Makefile
  Xpjproject/third_party/build/yuv/Notes.txt
  Xpjproject/third_party/build/yuv/libyuv.vcproj
  Xpjproject/third_party/build/yuv/libyuv.vcxproj
  Xpjproject/third_party/build/yuv/libyuv.vcxproj.filters
+ Xpjproject/third_party/webrtc_aec3/OWNERS
+ Xpjproject/third_party/webrtc_aec3/PATENTS
+ Xpjproject/third_party/webrtc_aec3/PJSIP_NOTES
+ Xpjproject/third_party/webrtc_aec3/README.md
+ Xpjproject/third_party/webrtc_aec3/src/absl/AUTHORS
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/OWNERS
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/README.chromium
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/LICENSE
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/README.chromium
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/DEPS
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/DEPS
+ Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/OWNERS
+ Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_vad_weights.cc
+ Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_vad_weights.h
  Xpjproject/user.mak.sample
  Xpjproject/version.mak
  Zaptel-to-DAHDI.txt
@@ -838,8 +914,8 @@
  agi/fastagi-test
  agi/numeralize
  apps/app_voicemail.exports.in
- asterisk-18.11.2-summary.html
- asterisk-18.11.2-summary.txt
+ asterisk-18.12.0-summary.html
+ asterisk-18.12.0-summary.txt
  autoconf/ast_c_compile_check.m4
  autoconf/ast_c_declare_check.m4
  autoconf/ast_c_define_check.m4
@@ -943,6 +1019,7 @@
  configs/basic-pbx/voicemail.conf
  configs/samples/acl.conf.sample
  configs/samples/adsi.conf.sample
+ configs/samples/aeap.conf.sample
  configs/samples/agents.conf.sample
  configs/samples/alarmreceiver.conf.sample
  configs/samples/alsa.conf.sample
@@ -1067,6 +1144,7 @@
  contrib/ast-db-manage/config/versions/041c0d3d1857_add_dtls_auto_gen_cert.py
  contrib/ast-db-manage/config/versions/0838f8db6a61_pjsip_add_send_contact_status_on_update_.py
  contrib/ast-db-manage/config/versions/0be05c3a8225_add_early_media_options.py
+ contrib/ast-db-manage/config/versions/0bee61aa9425_allow_180_ringing_with_sdp.py
  contrib/ast-db-manage/config/versions/136885b81223_add_regcontext_to_pj.py
  contrib/ast-db-manage/config/versions/154177371065_add_default_from_user.py
  contrib/ast-db-manage/config/versions/15b1430ad6f1_add_moh_passthrough_option_to_pjsip.py
@@ -1463,6 +1541,7 @@
  phoneprov/polycom_line.xml
  phoneprov/snom-mac.xml
  res/res.xml
+ res/res_aeap.exports.in
  res/res_ael_share.exports.in
  res/res_agi.exports.in
  res/res_ari.exports.in
@@ -1548,30 +1627,11 @@
  third-party/pjproject/dependency_utils
  third-party/pjproject/patches/0000-configure-ssl-library-path.patch
  third-party/pjproject/patches/0000-remove-third-party.patch
- third-party/pjproject/patches/0000-set_apps_initial_log_level.patch
- third-party/pjproject/patches/0000-solaris.patch
- third-party/pjproject/patches/0011-sip_inv_patch.patch
- third-party/pjproject/patches/0020-pjlib_cancel_timer_0.patch
- third-party/pjproject/patches/0050-fix-race-parallel-build.patch
- third-party/pjproject/patches/0060-clone-sdp-for-sip-timer-refresh-invite.patch
- third-party/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch
- third-party/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch
- third-party/pjproject/patches/0090-Skip-unsupported-digest-algorithm-2408.patch
- third-party/pjproject/patches/0100-fix-double-stun-free.patch
- third-party/pjproject/patches/0110-tls-parent-listener-destroyed.patch
- third-party/pjproject/patches/0111-ssl-premature-destroy.patch
- third-party/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch
- third-party/pjproject/patches/0130-sip_inv-Additional-multipart-support-2919-2920.patch
- third-party/pjproject/patches/0140-Fix-incorrect-unescaping-of-tokens-during-parsing-29.patch
- third-party/pjproject/patches/0150-Create-generic-pjsip_hdr_find-functions.patch
- third-party/pjproject/patches/0160-Additional-multipart-improvements.patch
- third-party/pjproject/patches/0170-stun-integer-underflow.patch
- third-party/pjproject/patches/0171-dialog-set-free.patch
- third-party/pjproject/patches/0172-prevent-multipart-oob.patch
+ third-party/pjproject/patches/0100-allow_multiple_auth_headers.patch
  third-party/pjproject/patches/README
  third-party/pjproject/patches/config_site.h
  third-party/pjproject/patches/user.mak
- third-party/pjproject/pjproject-2.10.tar.bz2.md5
+ third-party/pjproject/pjproject-2.12.tar.bz2.md5
  third-party/versions.mak
  utils/ael_main.c
  utils/clicompat.c
@@ -3041,6 +3101,452 @@
 License: GPL-2+
  FIXME
 
+Files: Xpjproject/third_party/webrtc_aec3/src/api/audio/BUILD.gn
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame.cc
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame.h
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame_processor.h
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_mixer.h
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/channel_layout.cc
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/channel_layout.h
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config.cc
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config.h
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config_json.cc
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config_json.h
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_factory.cc
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_factory.h
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_control.h
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_detector_creator.cc
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_detector_creator.h
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/test/BUILD.gn
+ Xpjproject/third_party/webrtc_aec3/src/api/rtp_headers.cc
+ Xpjproject/third_party/webrtc_aec3/src/api/rtp_headers.h
+ Xpjproject/third_party/webrtc_aec3/src/api/rtp_packet_info.cc
+ Xpjproject/third_party/webrtc_aec3/src/api/rtp_packet_info.h
+ Xpjproject/third_party/webrtc_aec3/src/api/units/time_delta.cc
+ Xpjproject/third_party/webrtc_aec3/src/api/units/time_delta.h
+ Xpjproject/third_party/webrtc_aec3/src/api/units/timestamp.cc
+ Xpjproject/third_party/webrtc_aec3/src/api/units/timestamp.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/audio_util.cc
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/channel_buffer.cc
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/channel_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/include/audio_util.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/include/push_resampler.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/include/resampler.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_resampler.cc
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_sinc_resampler.cc
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_sinc_resampler.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler.cc
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_avx2.cc
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_neon.cc
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_sse.cc
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/dot_product_with_scale.cc
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/dot_product_with_scale.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/signal_processing_library.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl_armv7.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl_mips.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/splitting_filter2.c
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/BUILD.gn
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_mips.cc
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_common.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_neon_sse2.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_256/fft4g.h
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/BUILD.gn
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/BUILD.gn
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_avx2.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl_avx2.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_common.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_common.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_buffer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/delay_estimate.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/dominant_nearend_detector.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/dominant_nearend_detector.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/downsampled_render_buffer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/downsampled_render_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_audibility.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_audibility.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_buffer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data_avx2.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fullband_erle_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fullband_erle_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_avx2.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_block_processor.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_block_processor.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_echo_remover.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_echo_remover.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_buffer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_controller.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_controller.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/nearend_detector.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_decay_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_decay_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_frequency_response.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_frequency_response.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/spectrum_buffer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/spectrum_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/stationarity_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/stationarity_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_erle_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_erle_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_nearend_detector.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_nearend_detector.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output_analyzer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output_analyzer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/transparent_mode.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/transparent_mode.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math_avx2.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/BUILD.gn
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_agc.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_agc.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_common.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/compute_interpolated_gain_curve.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/compute_interpolated_gain_curve.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/cpu_features.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/cpu_features.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/down_sampler.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/down_sampler.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_spectrum_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_spectrum_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/BUILD.gn
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/common.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/ring_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/ring_buffer_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vad_tool.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vad_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vector_math_avx2.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/sequence_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/sequence_buffer_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/test_utils.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/test_utils.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/vector_math.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/vector_math_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vector_float_frame.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vector_float_frame.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/audio_buffer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/audio_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/gain_controller2.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/gain_controller2.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/high_pass_filter.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/high_pass_filter.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_frame_view.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing_statistics.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing_statistics.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/config.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/config.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/logging/apm_data_dumper.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/logging/apm_data_dumper.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/BUILD.gn
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/fast_math.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/fast_math.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/histograms.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/histograms.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_common.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_config.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_fft.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_fft.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/quantile_noise_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/quantile_noise_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/speech_probability_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/speech_probability_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/suppression_params.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/suppression_params.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/wiener_filter.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/wiener_filter.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/residual_echo_detector.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/residual_echo_detector.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/splitting_filter.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/splitting_filter.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/three_band_filter_bank.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/three_band_filter_bank.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/BUILD.gn
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_internal.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_wrapper.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_wrapper.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper.cc
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper.h
+ Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/arraysize.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/compile_assert_c.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/experiments/field_trial_parser.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/experiments/field_trial_parser.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/gtest_prod_util.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/memory/aligned_malloc.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/memory/aligned_malloc.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/race_checker.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/race_checker.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/random.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/random.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/swap_queue.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/yield.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/arch.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/file_wrapper.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/file_wrapper.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/inline.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/rtc_export.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/thread_annotations.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/units/unit_base.h
+ Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/cpu_features_wrapper.h
+ Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/field_trial.h
+ Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/metrics.h
+ Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features2.cc
+ Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features_android.cc
+ Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features_linux.cc
+ Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/field_trial.cc
+ Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/metrics.cc
+Copyright: 2011, The WebRTC project authors.
+  2012, The WebRTC project authors.
+  2013, The WebRTC project authors.
+  2014, The WebRTC project authors.
+  2015, The WebRTC project authors.
+  2016, The WebRTC project authors.
+  2017, The WebRTC project authors.
+  2018, The WebRTC project authors.
+  2019, The WebRTC project authors.
+  2020, The WebRTC project authors.
+  2021, The WebRTC project authors.
+License: UNKNOWN
+ FIXME
+
 Files: Xpjproject/pjlib-util/include/pjlib-util/cli.h
  Xpjproject/pjlib-util/include/pjlib-util/cli_console.h
  Xpjproject/pjlib-util/include/pjlib-util/cli_imp.h
@@ -3058,6 +3564,8 @@
  Xpjproject/pjlib-util/src/pjlib-util/xml_wrap.cpp
  Xpjproject/pjlib/include/pj/ssl_sock.h
  Xpjproject/pjlib/src/pj/guid_android.c
+ Xpjproject/pjlib/src/pj/guid_bsd.c
+ Xpjproject/pjlib/src/pj/guid_darwin.c
  Xpjproject/pjlib/src/pj/ioqueue_uwp.cpp
  Xpjproject/pjlib/src/pj/ip_helper_winphone8.c
  Xpjproject/pjlib/src/pj/os_core_darwin.m
@@ -3070,6 +3578,7 @@
  Xpjproject/pjlib/src/pj/sock_qos_wm.c
  Xpjproject/pjlib/src/pj/sock_uwp.cpp
  Xpjproject/pjlib/src/pj/sock_uwp.h
+ Xpjproject/pjlib/src/pj/ssl_sock_apple.m
  Xpjproject/pjlib/src/pj/ssl_sock_common.c
  Xpjproject/pjlib/src/pj/ssl_sock_darwin.c
  Xpjproject/pjlib/src/pj/ssl_sock_dump.c
@@ -3081,6 +3590,8 @@
  Xpjproject/pjlib/src/pjlib-test/pool_wrap.cpp
  Xpjproject/pjlib/src/pjlib-test/test_wrap.cpp
  Xpjproject/pjmedia/include/pjmedia-audiodev/errno.h
+ Xpjproject/pjmedia/include/pjmedia-codec/and_aud_mediacodec.h
+ Xpjproject/pjmedia/include/pjmedia-codec/and_vid_mediacodec.h
  Xpjproject/pjmedia/include/pjmedia-codec/audio_codecs.h
  Xpjproject/pjmedia/include/pjmedia-codec/bcg729.h
  Xpjproject/pjmedia/include/pjmedia-codec/h263_packetizer.h
@@ -3089,6 +3600,7 @@
  Xpjproject/pjmedia/include/pjmedia-codec/silk.h
  Xpjproject/pjmedia/include/pjmedia-codec/vid_toolbox.h
  Xpjproject/pjmedia/include/pjmedia-codec/vpx.h
+ Xpjproject/pjmedia/include/pjmedia-codec/vpx_packetizer.h
  Xpjproject/pjmedia/include/pjmedia-videodev/avi_dev.h
  Xpjproject/pjmedia/include/pjmedia-videodev/config.h
  Xpjproject/pjmedia/include/pjmedia-videodev/errno.h
@@ -3108,13 +3620,17 @@
  Xpjproject/pjmedia/include/pjmedia/vid_tee.h
  Xpjproject/pjmedia/include/pjmedia/videodev.h
  Xpjproject/pjmedia/include/pjmedia_videodev.h
+ Xpjproject/pjmedia/src/pjmedia-audiodev/android/PjAudioDevInfo.java
  Xpjproject/pjmedia/src/pjmedia-audiodev/bb10_dev.c
  Xpjproject/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m
  Xpjproject/pjmedia/src/pjmedia-audiodev/errno.c
  Xpjproject/pjmedia/src/pjmedia-audiodev/legacy_dev.c
  Xpjproject/pjmedia/src/pjmedia-audiodev/null_dev.c
+ Xpjproject/pjmedia/src/pjmedia-audiodev/oboe_dev.cpp
  Xpjproject/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp
  Xpjproject/pjmedia/src/pjmedia-audiodev/wasapi_dev.cpp
+ Xpjproject/pjmedia/src/pjmedia-codec/and_aud_mediacodec.cpp
+ Xpjproject/pjmedia/src/pjmedia-codec/and_vid_mediacodec.cpp
  Xpjproject/pjmedia/src/pjmedia-codec/audio_codecs.c
  Xpjproject/pjmedia/src/pjmedia-codec/bcg729.c
  Xpjproject/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
@@ -3124,8 +3640,11 @@
  Xpjproject/pjmedia/src/pjmedia-codec/silk.c
  Xpjproject/pjmedia/src/pjmedia-codec/vid_toolbox.m
  Xpjproject/pjmedia/src/pjmedia-codec/vpx.c
+ Xpjproject/pjmedia/src/pjmedia-codec/vpx_packetizer.c
  Xpjproject/pjmedia/src/pjmedia-videodev/android/PjCamera.java
+ Xpjproject/pjmedia/src/pjmedia-videodev/android/PjCamera2.java
  Xpjproject/pjmedia/src/pjmedia-videodev/android/PjCameraInfo.java
+ Xpjproject/pjmedia/src/pjmedia-videodev/android/PjCameraInfo2.java
  Xpjproject/pjmedia/src/pjmedia-videodev/android_dev.c
  Xpjproject/pjmedia/src/pjmedia-videodev/android_opengl.c
  Xpjproject/pjmedia/src/pjmedia-videodev/avi_dev.c
@@ -3149,6 +3668,7 @@
  Xpjproject/pjmedia/src/pjmedia/converter_libswscale.c
  Xpjproject/pjmedia/src/pjmedia/converter_libyuv.c
  Xpjproject/pjmedia/src/pjmedia/echo_webrtc.c
+ Xpjproject/pjmedia/src/pjmedia/echo_webrtc_aec3.cpp
  Xpjproject/pjmedia/src/pjmedia/event.c
  Xpjproject/pjmedia/src/pjmedia/ffmpeg_util.c
  Xpjproject/pjmedia/src/pjmedia/ffmpeg_util.h
@@ -3186,6 +3706,8 @@
  Xpjproject/pjsip-apps/src/pjsua/android/jni/pjsua_app_callback.cpp
  Xpjproject/pjsip-apps/src/pjsua/android/jni/pjsua_app_callback.h
  Xpjproject/pjsip-apps/src/pjsua/gui.h
+ Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ContentView.swift
+ Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ipjsua_swiftApp.swift
  Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.h
  Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m
  Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaViewController.h
@@ -3202,6 +3724,18 @@
  Xpjproject/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipBackEnd/MyApp.h
  Xpjproject/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipTasks/Helpers/EndpointHelper.cs
  Xpjproject/pjsip-apps/src/pjsua/wm/main_wm.c
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/AppDelegate.swift
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/ActiveViewController.swift
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/IncomingViewController.swift
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/OutgoingViewController.swift
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/ViewController.swift
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Model/Model.swift
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/CustomPJSUA2.cpp
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/CustomPJSUA2.hpp
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/wrapper.h
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/wrapper.mm
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/SceneDelegate.swift
+ Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/ios-swift-pjsua2-Bridging-Header.h
  Xpjproject/pjsip-apps/src/pjsystest/gui.h
  Xpjproject/pjsip-apps/src/pjsystest/main_console.c
  Xpjproject/pjsip-apps/src/pjsystest/main_wm.c
@@ -3292,6 +3826,7 @@
   2010-2011, Teluu Inc. (http://www.teluu.com)
   2011, Teluu Inc. (http://www.teluu.com)
   2011-2015, Teluu Inc. (http://www.teluu.com)
+  2011-2021, Teluu Inc. (http://www.teluu.com)
   2012, Teluu Inc. (http://www.teluu.com)
   2012-2013, Teluu Inc. (http://www.teluu.com)
   2013, Teluu Inc. (http://www.teluu.com)
@@ -3304,6 +3839,9 @@
   2017, Teluu Inc. (http://www.teluu.com)
   2018, Teluu Inc. (http://www.teluu.com)
   2019, Teluu Inc. (http://www.teluu.com)
+  2019-2020, Teluu Inc. (http://www.teluu.com)
+  2020, Teluu Inc. (http://www.teluu.com)
+  2021, Teluu Inc. (http://www.teluu.com)
   2032, Teluu Inc. (http://www.teluu.com)
 License: GPL-2+
  FIXME
@@ -3415,6 +3953,7 @@
  Xpjproject/tests/pjsua/scripts-sipp/uas-mwi-0.xml
  Xpjproject/tests/pjsua/scripts-sipp/uas-mwi.xml
  Xpjproject/tests/pjsua/scripts-sipp/uas-prack_fork.xml
+ Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-after-failed-nego.xml
  Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-and-ack-same-branch-without-sdp.xml
  Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-and-ack-without-sdp.xml
  Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-glare.xml
@@ -3428,12 +3967,70 @@
  Xpjproject/tests/pjsua/scripts-sipp/uas-template.xml
  Xpjproject/tests/pjsua/scripts-sipp/uas-timer-reinvite.xml
  Xpjproject/tests/pjsua/scripts-sipp/uas-timer-update.xml
+ Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/README.txt
  apps/app_fax.c
  contrib/scripts/astcli
 Copyright: NONE
 License: GPL
  FIXME
 
+Files: include/asterisk/logger_category.h
+ include/asterisk/mwi.h
+ include/asterisk/res_aeap.h
+ include/asterisk/res_aeap_message.h
+ include/asterisk/res_pjsip_session_caps.h
+ include/asterisk/res_stir_shaken.h
+ include/asterisk/serializer.h
+ include/asterisk/stasis_state.h
+ main/logger_category.c
+ main/mwi.c
+ main/serializer.c
+ main/stasis_state.c
+ main/time.c
+ res/res_aeap.c
+ res/res_aeap/aeap.c
+ res/res_aeap/general.c
+ res/res_aeap/general.h
+ res/res_aeap/logger.h
+ res/res_aeap/message.c
+ res/res_aeap/message_json.c
+ res/res_aeap/transaction.c
+ res/res_aeap/transaction.h
+ res/res_aeap/transport.c
+ res/res_aeap/transport.h
+ res/res_aeap/transport_websocket.c
+ res/res_aeap/transport_websocket.h
+ res/res_pjsip_session/pjsip_session_caps.c
+ res/res_pjsip_stir_shaken.c
+ res/res_speech_aeap.c
+ res/res_stir_shaken.c
+ res/res_stir_shaken/certificate.c
+ res/res_stir_shaken/certificate.h
+ res/res_stir_shaken/curl.c
+ res/res_stir_shaken/curl.h
+ res/res_stir_shaken/general.c
+ res/res_stir_shaken/general.h
+ res/res_stir_shaken/profile.c
+ res/res_stir_shaken/profile.h
+ res/res_stir_shaken/profile_private.h
+ res/res_stir_shaken/stir_shaken.c
+ res/res_stir_shaken/stir_shaken.h
+ res/res_stir_shaken/store.c
+ res/res_stir_shaken/store.h
+ tests/test_aeap.c
+ tests/test_aeap_speech.c
+ tests/test_aeap_transaction.c
+ tests/test_aeap_transport.c
+ tests/test_mwi.c
+ tests/test_res_pjsip_session_caps.c
+ tests/test_stasis_state.c
+Copyright: 2019, Sangoma Technologies Corporation
+  2020, Sangoma Technologies Corporation
+  2021, Sangoma Technologies Corporation
+  2022, Sangoma Technologies Corporation
+License: GPL-2
+ FIXME
+
 Files: include/solaris-compat/sys/queue.h
  utils/db1-ast/btree/bt_close.c
  utils/db1-ast/btree/bt_conv.c
@@ -3485,6 +4082,60 @@
 License: BSD-4-Clause-UC
  FIXME
 
+Files: Xpjproject/third_party/webrtc_aec3/src/api/array_view.h
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/test/audio_frame_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/test/echo_canceller3_config_json_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/api/audio/test/echo_canceller3_config_unittest.cc
+ Xpjproject/third_party/webrtc_aec3/src/api/function_view.h
+ Xpjproject/third_party/webrtc_aec3/src/api/scoped_refptr.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/atomic_ops.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/checks.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/checks.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/constructor_magic.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/logging.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/logging.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_compare.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_conversions.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_conversions_impl.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_minmax.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_count.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_counted_object.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_counter.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_encode.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_encode.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_to_number.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_to_number.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_utils.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_utils.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/strings/string_builder.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/strings/string_builder.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_abseil.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_benchmark.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_critical_section.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_pthread.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_race_check.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/yield.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/system_time.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/system_time.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/time_utils.cc
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/time_utils.h
+ Xpjproject/third_party/webrtc_aec3/src/rtc_base/type_traits.h
+Copyright: 2004, The WebRTC Project Authors.
+  2005, The WebRTC Project Authors.
+  2006, The WebRTC Project Authors.
+  2011, The WebRTC Project Authors.
+  2014, The WebRTC Project Authors.
+  2015, The WebRTC Project Authors.
+  2016, The WebRTC Project Authors.
+  2017, The WebRTC Project Authors.
+  2018, The WebRTC Project Authors.
+  2020, The WebRTC Project Authors.
+  2021, The WebRTC Project Authors.
+License: UNKNOWN
+ FIXME
+
 Files: Makefile
  Makefile.moddir_rules
  Makefile.rules
@@ -3535,41 +4186,37 @@
 License: GPL
  FIXME
 
-Files: include/asterisk/logger_category.h
- include/asterisk/mwi.h
- include/asterisk/res_pjsip_session_caps.h
- include/asterisk/res_stir_shaken.h
- include/asterisk/serializer.h
- include/asterisk/stasis_state.h
- main/logger_category.c
- main/mwi.c
- main/serializer.c
- main/stasis_state.c
- main/time.c
- res/res_pjsip_session/pjsip_session_caps.c
- res/res_pjsip_stir_shaken.c
- res/res_stir_shaken.c
- res/res_stir_shaken/certificate.c
- res/res_stir_shaken/certificate.h
- res/res_stir_shaken/curl.c
- res/res_stir_shaken/curl.h
- res/res_stir_shaken/general.c
- res/res_stir_shaken/general.h
- res/res_stir_shaken/profile.c
- res/res_stir_shaken/profile.h
- res/res_stir_shaken/profile_private.h
- res/res_stir_shaken/stir_shaken.c
- res/res_stir_shaken/stir_shaken.h
- res/res_stir_shaken/store.c
- res/res_stir_shaken/store.h
- tests/test_mwi.c
- tests/test_res_pjsip_session_caps.c
- tests/test_stasis_state.c
-Copyright: 2019, Sangoma Technologies Corporation
-  2020, Sangoma Technologies Corporation
-  2021, Sangoma Technologies Corporation
-  2022, Sangoma Technologies Corporation
-License: GPL-2
+Files: Xpjproject/third_party/webrtc_aec3/src/absl/base/attributes.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/config.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/const_init.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/atomic_hook.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/identity.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/inline_variable.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/invoke.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/raw_logging.cc
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/raw_logging.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/throw_delegate.cc
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/throw_delegate.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/log_severity.cc
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/log_severity.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/macros.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/optimization.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/options.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/policy_checks.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/base/port.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/memory/memory.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/meta/type_traits.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/strings/string_view.cc
+ Xpjproject/third_party/webrtc_aec3/src/absl/strings/string_view.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/types/bad_optional_access.cc
+ Xpjproject/third_party/webrtc_aec3/src/absl/types/bad_optional_access.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/types/internal/optional.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/types/optional.h
+ Xpjproject/third_party/webrtc_aec3/src/absl/utility/utility.h
+Copyright: 2017, The Abseil Authors.
+  2018, The Abseil Authors.
+  2019, The Abseil Authors.
+License: Apache-2.0
  FIXME
 
 Files: Xpjproject/pjmedia/README.txt
@@ -3737,6 +4384,20 @@
 License: GPL-2+
  FIXME
 
+Files: apps/app_dtmfstore.c
+ apps/app_mf.c
+ apps/app_reload.c
+ apps/app_sf.c
+ apps/app_waitforcond.c
+ funcs/func_evalexten.c
+ funcs/func_frame_drop.c
+ funcs/func_json.c
+ funcs/func_scramble.c
+ res/res_tonedetect.c
+Copyright: 2021, Naveen Albert
+License: GPL-2
+ FIXME
+
 Files: include/asterisk/res_prometheus.h
  res/prometheus/bridges.c
  res/prometheus/channels.c
@@ -3766,19 +4427,6 @@
 License: GPL-2
  FIXME
 
-Files: apps/app_dtmfstore.c
- apps/app_mf.c
- apps/app_reload.c
- apps/app_sf.c
- apps/app_waitforcond.c
- funcs/func_frame_drop.c
- funcs/func_json.c
- funcs/func_scramble.c
- res/res_tonedetect.c
-Copyright: 2021, Naveen Albert
-License: GPL-2
- FIXME
-
 Files: include/asterisk/astobj2.h
  main/astobj2.c
  main/astobj2_container.c
@@ -3990,8 +4638,8 @@
 Files: Xpjproject/aconfigure
  configure
  menuselect/configure
-Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
-  2012, Free Software Foundation, Inc.
+Copyright: 1992-1996, 1998-2017, 2020-2021, Free Software Foundation,
+  2021, Free Software Foundation, Inc.
 License: FSFUL
  FIXME
 
@@ -4287,6 +4935,13 @@
 License: UNKNOWN
  FIXME
 
+Files: Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.c
+ Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.h
+Copyright: 2004, the University Corporation for Atmospheric
+  2013, Julien Pommier ( pommier@modartt.com )
+License: UNKNOWN
+ FIXME
+
 Files: Xmp3/decode_i386.c
  Xmp3/decode_ntom.c
 Copyright: 1995-1997, Michael Hipp
@@ -4312,6 +4967,12 @@
 License: UNKNOWN
  FIXME
 
+Files: Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/LICENSE
+ Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_256/fft4g.cc
+Copyright: Takuya OOURA, 1996-2001
+License: UNKNOWN
+ FIXME
+
 Files: install-sh
  menuselect/install-sh
 Copyright: 1994, X Consortium
@@ -4329,11 +4990,49 @@
 License: (GPL-3+ and/or public-domain) with Bison-2.2 exception
  FIXME
 
+Files: Xpjproject/third_party/webrtc_aec3/src/absl/README.md
+Copyright: NONE
+License: Apache
+ FIXME
+
+Files: Xpjproject/third_party/webrtc_aec3/src/absl/LICENSE
+Copyright: NONE
+License: Apache-2.0
+ FIXME
+
 Files: Xpjproject/pjsip-apps/src/pjsua/bb10/bar-descriptor.xml
 Copyright: 2011-2013, Research In Motion Limited.
 License: Apache-2.0
  FIXME
 
+Files: Xpjproject/third_party/build/samplerate/README.txt
+Copyright: NONE
+License: BSD-2-clause
+ FIXME
+
+Files: Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_activations.h
+Copyright: 2008-2011, Octasic Inc.
+License: BSD-2-clause
+ FIXME
+
+Files: Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/README.chromium
+Copyright: NONE
+License: BSD-3-clause
+ FIXME
+
+Files: Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/COPYING
+Copyright: 2003-2004, Mark Borgerding
+  2005-2017, Xiph.Org Foundation
+  2007-2017, Jean-Marc Valin
+  2017, Mozilla
+License: BSD-3-clause
+ FIXME
+
+Files: Xpjproject/third_party/webrtc_aec3/LICENSE
+Copyright: 2011, The WebRTC project authors.
+License: BSD-3-clause
+ FIXME
+
 Files: main/dns.c
 Copyright: 1983, 1989, 1993, The Regents of the University of California.
   1993, Digital Equipment Corporation.
@@ -4976,6 +5675,12 @@
 License: UNKNOWN
  FIXME
 
+Files: Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft.cc
+Copyright: Do a mix of floats and 64 bit integer to maximize register
+  Takuya OOURA, 1996-2001
+License: UNKNOWN
+ FIXME
+
 Files: addons/ooh323c/src/Makefile.in
 Copyright: 1994-2002, Free Software Foundation, Inc.
 License: UNKNOWN
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/patches/020210816~20b2741.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/patches/020210816~20b2741.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/patches/020210816~20b2741.patch	2022-04-06 13:18:41.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/patches/020210816~20b2741.patch	2022-05-12 20:34:27.000000000 +0000
@@ -3151,207 +3151,6 @@
 -;channel=1
 -;channel=2
 -;channel=3
---- a/configure
-+++ b/configure
-@@ -722,10 +722,6 @@
- X11_DIR
- X11_INCLUDE
- X11_LIB
--PBX_VPB
--VPB_DIR
--VPB_INCLUDE
--VPB_LIB
- PBX_VORBIS
- VORBIS_DIR
- VORBIS_INCLUDE
-@@ -1456,7 +1452,6 @@
- with_unbound
- with_unixodbc
- with_vorbis
--with_vpb
- with_x11
- with_z
- enable_xmldoc
-@@ -2235,7 +2230,6 @@
-   --with-unbound=PATH     use unbound files in PATH
-   --with-unixodbc=PATH    use unixODBC files in PATH
-   --with-vorbis=PATH      use Vorbis files in PATH
--  --with-vpb=PATH         use Voicetronix API files in PATH
-   --with-x11=PATH         use X11 files in PATH
-   --with-z=PATH           use zlib compression files in PATH
- 
-@@ -3150,52 +3144,6 @@
-   as_fn_set_status $ac_retval
- 
- } # ac_fn_c_compute_int
--
--# ac_fn_cxx_try_link LINENO
--# -------------------------
--# Try to link conftest.$ac_ext, and return whether this succeeded.
--ac_fn_cxx_try_link ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  rm -f conftest.$ac_objext conftest$ac_exeext
--  if { { ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_link") 2>conftest.err
--  ac_status=$?
--  if test -s conftest.err; then
--    grep -v '^ *+' conftest.err >conftest.er1
--    cat conftest.er1 >&5
--    mv -f conftest.er1 conftest.err
--  fi
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 test -x conftest$ac_exeext
--       }; then :
--  ac_retval=0
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_retval=1
--fi
--  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
--  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
--  # interfere with the next link command; also delete a directory that is
--  # left behind by Apple's compiler.  We do this before executing the actions.
--  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
--  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
--  as_fn_set_status $ac_retval
--
--} # ac_fn_cxx_try_link
- cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
-@@ -13516,38 +13464,6 @@
- 
- 
- 
--    VPB_DESCRIP="Voicetronix API"
--    VPB_OPTION="vpb"
--    PBX_VPB=0
--
--# Check whether --with-vpb was given.
--if test "${with_vpb+set}" = set; then :
--  withval=$with_vpb;
--	case ${withval} in
--	n|no)
--	USE_VPB=no
--	# -1 is a magic value used by menuselect to know that the package
--	# was disabled, other than 'not found'
--	PBX_VPB=-1
--	;;
--	y|ye|yes)
--	ac_mandatory_list="${ac_mandatory_list} VPB"
--	;;
--	*)
--	VPB_DIR="${withval}"
--	ac_mandatory_list="${ac_mandatory_list} VPB"
--	;;
--	esac
--
--fi
--
--
--
--
--
--
--
--
-     X11_DESCRIP="X11"
-     X11_OPTION="x11"
-     PBX_X11=0
-@@ -33799,79 +33715,6 @@
-     fi
- 
- 
--ac_ext=cpp
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--if test "${USE_VPB}" != "no"; then
--   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vpb_open in -lvpb" >&5
--$as_echo_n "checking for vpb_open in -lvpb... " >&6; }
--   saved_libs="${LIBS}"
--   saved_cppflags="${CPPFLAGS}"
--   if test "x${VPB_DIR}" != "x"; then
--      if test -d ${VPB_DIR}/lib; then
--         vpblibdir=${VPB_DIR}/lib
--      else
--         vpblibdir=${VPB_DIR}
--      fi
--      LIBS="${LIBS} -L${vpblibdir}"
--      CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include"
--   fi
--   LIBS="${PTHREAD_LIBS} ${LIBS} -lvpb"
--   CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}"
--
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--	#include <vpbapi.h>
--int
--main ()
--{
--int q = vpb_open(0,0);
--  ;
--  return 0;
--}
--
--_ACEOF
--if ac_fn_cxx_try_link "$LINENO"; then :
--  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--		ac_cv_lib_vpb_vpb_open="yes"
--
--else
--  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--		ac_cv_lib_vpb_vpb_open="no"
--
--
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--   LIBS="${saved_libs}"
--   CPPFLAGS="${saved_cppflags}"
--   if test "${ac_cv_lib_vpb_vpb_open}" = "yes"; then
--	VPB_LIB="-lvpb"
--	if test "${VPB_DIR}" != ""; then
--	   VPB_LIB="-L${vpblibdir}  ${VPB_LIB}"
--	   VPB_INCLUDE="-I${VPB_DIR}/include"
--	fi
--	PBX_VPB=1
--
--$as_echo "#define HAVE_VPB 1" >>confdefs.h
--
--   fi
--fi
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
- 
- if test "x${PBX_ZLIB}" != "x1" -a "${USE_ZLIB}" != "no"; then
-    pbxlibdir=""
 --- a/configure.ac
 +++ b/configure.ac
 @@ -650,7 +650,6 @@
@@ -3362,7 +3161,7 @@
  AST_EXT_LIB_SETUP([X11], [X11], [x11])
  AST_EXT_LIB_SETUP([ZLIB], [zlib compression], [z])
  
-@@ -2788,51 +2787,6 @@
+@@ -2789,51 +2788,6 @@
  AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc -lvorbisfile])
  AST_C_DECLARE_CHECK([VORBIS_OPEN_CALLBACKS], [OV_CALLBACKS_NOCLOSE], [vorbis/vorbisfile.h])
  
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/patches/1007_ffmpeg_detect.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/patches/1007_ffmpeg_detect.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/patches/1007_ffmpeg_detect.patch	2022-04-06 13:21:30.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/patches/1007_ffmpeg_detect.patch	2022-05-12 20:34:36.000000000 +0000
@@ -23,7 +23,7 @@
  AST_EXT_LIB_SETUP([GSM], [External GSM], [gsm], [, use 'internal' GSM otherwise])
  AST_EXT_LIB_SETUP([ILBC], [System iLBC], [ilbc], [, use 'internal' iLBC otherwise])
  AST_EXT_LIB_SETUP([GTK2], [gtk2], [gtk2])
-@@ -2820,7 +2820,18 @@
+@@ -2821,7 +2821,18 @@
  
  AST_EXT_TOOL_CHECK([SDL], [sdl-config])
  AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/patches/2011_amr_build_tools.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/patches/2011_amr_build_tools.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/patches/2011_amr_build_tools.patch	2022-04-06 13:21:30.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/patches/2011_amr_build_tools.patch	2022-05-12 20:34:43.000000000 +0000
@@ -29,7 +29,7 @@
  AST_EXT_LIB_SETUP([BFD], [Debug symbol decoding], [bfd])
  
  # BKTR is used for backtrace support on platforms that do not
-@@ -1607,6 +1610,10 @@
+@@ -1608,6 +1611,10 @@
  
  AST_EXT_LIB_CHECK([ALSA], [asound], [snd_pcm_open], [alsa/asoundlib.h])
  
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/patches/2014_pjproject_unbreak.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/patches/2014_pjproject_unbreak.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/patches/2014_pjproject_unbreak.patch	2022-04-06 12:26:39.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/patches/2014_pjproject_unbreak.patch	2022-05-12 20:36:07.000000000 +0000
@@ -11,6 +11,6 @@
  				 legacy_dev.o null_dev.o pa_dev.o wmme_dev.o \
 -				 alsa_dev.o bb10_dev.o bdimad_dev.o \
 +				 alsa_dev.o bb10_dev.o \
- 				 android_jni_dev.o opensl_dev.o
+ 				 android_jni_dev.o opensl_dev.o oboe_dev.o
  export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
  export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/patches/2015_opus.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/patches/2015_opus.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/patches/2015_opus.patch	2022-04-06 13:21:30.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/patches/2015_opus.patch	2022-05-12 20:36:10.000000000 +0000
@@ -28,7 +28,7 @@
  AST_EXT_LIB_SETUP([OPUSFILE], [Opusfile], [opusfile])
  AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk])
  AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss])
-@@ -2616,6 +2617,7 @@
+@@ -2617,6 +2618,7 @@
  if test -z "$__opus_include" -o x"$__opus_include" = x" " ; then
  	__opus_include=-I/usr/include/opus
  fi
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/watch asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/watch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/debian/watch	2022-04-06 12:17:04.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/debian/watch	2022-05-12 17:14:24.000000000 +0000
@@ -35,5 +35,5 @@
 component=Xpjproject,\
 filenamemangle=s/.*?(@ANY_VERSION@@ARCHIVE_EXT@)/@PACKAGE@-Xpjproject-$1/,\
 dversionmangle=auto \
-https://github.com/asterisk/pjproject/tags \
-.*?(2\.10)@ARCHIVE_EXT@ checksum
+https://github.com/pjsip/pjproject/tags \
+.*?(2\.12)@ARCHIVE_EXT@ checksum
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/doc/asterisk.8 asterisk-18.12.0~dfsg+~cs6.12.40431413/doc/asterisk.8
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/doc/asterisk.8	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/doc/asterisk.8	2022-05-12 11:50:59.000000000 +0000
@@ -158,6 +158,7 @@
 .TP
 \-n
 Disable ANSI colors even on terminals capable of displaying them.
+This option can be used only at startup (e.g. not with remote console).
 .TP
 \-p
 If supported by the operating system (and executing as root),
@@ -195,7 +196,8 @@
 .TP
 \-T
 Add timestamp to all non-command related output going to the console
-when running with verbose and/or logging to the console.
+when running with verbose and/or logging to the console. Can only be
+used at startup (e.g. not with remote console mode).
 .TP
 \-U \fIuser\fR
 Run as user \fIuser\fR instead of the
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_channel.c asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_channel.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_channel.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_channel.c	2022-05-12 11:50:59.000000000 +0000
@@ -64,6 +64,11 @@
 		</description>
 	</function>
 	<function name="CHANNEL_EXISTS" language="en_US">
+		<since>
+			<version>16.22.0</version>
+			<version>18.8.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Checks if the specified channel exists.
 		</synopsis>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_db.c asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_db.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_db.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_db.c	2022-05-12 11:50:59.000000000 +0000
@@ -95,6 +95,25 @@
 			at the prefix specified within the Asterisk database.  If no argument is
 			provided, then a list of key families will be returned.</para>
 		</description>
+		<see-also>
+			<ref type="function">DB_KEYCOUNT</ref>
+		</see-also>
+	</function>
+	<function name="DB_KEYCOUNT" language="en_US">
+		<synopsis>
+			Obtain the number of keys at a prefix within the Asterisk database.
+		</synopsis>
+		<syntax>
+			<parameter name="prefix" />
+		</syntax>
+		<description>
+			<para>This function will return the number of keys that exist
+			at the prefix specified within the Asterisk database.  If no argument is
+			provided, then the number of all key families will be returned.</para>
+		</description>
+		<see-also>
+			<ref type="function">DB_KEYS</ref>
+		</see-also>
 	</function>
 	<function name="DB_DELETE" language="en_US">
 		<synopsis>
@@ -286,6 +305,57 @@
 	.read2 = function_db_keys,
 };
 
+static int function_db_keycount(struct ast_channel *chan, const char *cmd, char *parse, char *buf, size_t len)
+{
+	size_t parselen = strlen(parse);
+	struct ast_db_entry *dbe, *orig_dbe;
+	const char *last = "";
+	int keycount = 0;
+
+	/* Remove leading and trailing slashes */
+	while (parse[0] == '/') {
+		parse++;
+		parselen--;
+	}
+	while (parse[parselen - 1] == '/') {
+		parse[--parselen] = '\0';
+	}
+
+	/* Nothing within the database at that prefix? */
+	if (!(orig_dbe = dbe = ast_db_gettree(parse, NULL))) {
+		snprintf(buf, len, "%d", keycount);
+		return 0;
+	}
+
+	for (; dbe; dbe = dbe->next) {
+		/* Find the current component */
+		char *curkey = &dbe->key[parselen + 1], *slash;
+		if (*curkey == '/') {
+			curkey++;
+		}
+		/* Remove everything after the current component */
+		if ((slash = strchr(curkey, '/'))) {
+			*slash = '\0';
+		}
+
+		/* Skip duplicates */
+		if (!strcasecmp(last, curkey)) {
+			continue;
+		}
+		last = curkey;
+
+		keycount++;
+	}
+	ast_db_freetree(orig_dbe);
+	snprintf(buf, len, "%d", keycount);
+	return 0;
+}
+
+static struct ast_custom_function db_keycount_function = {
+	.name = "DB_KEYCOUNT",
+	.read = function_db_keycount,
+};
+
 static int function_db_delete(struct ast_channel *chan, const char *cmd,
 			      char *parse, char *buf, size_t len)
 {
@@ -347,6 +417,7 @@
 	res |= ast_custom_function_unregister(&db_exists_function);
 	res |= ast_custom_function_unregister(&db_delete_function);
 	res |= ast_custom_function_unregister(&db_keys_function);
+	res |= ast_custom_function_unregister(&db_keycount_function);
 
 	return res;
 }
@@ -359,6 +430,7 @@
 	res |= ast_custom_function_register(&db_exists_function);
 	res |= ast_custom_function_register_escalating(&db_delete_function, AST_CFE_READ);
 	res |= ast_custom_function_register(&db_keys_function);
+	res |= ast_custom_function_register(&db_keycount_function);
 
 	return res;
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_env.c asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_env.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_env.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_env.c	2022-05-12 11:50:59.000000000 +0000
@@ -291,6 +291,11 @@
 		</see-also>
 	</function>
 	<function name="BASENAME" language="en_US">
+		<since>
+			<version>16.21.0</version>
+			<version>18.7.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Return the name of a file.
 		</synopsis>
@@ -309,6 +314,11 @@
 		</see-also>
 	</function>
 	<function name="DIRNAME" language="en_US">
+		<since>
+			<version>16.21.0</version>
+			<version>18.7.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Return the directory of a file.
 		</synopsis>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_evalexten.c asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_evalexten.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_evalexten.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_evalexten.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,147 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Naveen Albert
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ *
+ * \brief Dialplan extension evaluation function
+ *
+ * \author Naveen Albert <asterisk@phreaknet.org>
+ *
+ * \ingroup functions
+ */
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#include "asterisk/module.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/utils.h"
+#include "asterisk/app.h"
+
+/*** DOCUMENTATION
+	<function name="EVAL_EXTEN" language="en_US">
+		<synopsis>
+			Evaluates the contents of a dialplan extension and returns it as a string.
+		</synopsis>
+		<syntax>
+			<parameter name="context" />
+			<parameter name="extensions" />
+			<parameter name="priority" required="true" />
+		</syntax>
+		<description>
+			<para>The EVAL_EXTEN function looks up a dialplan entry by context,extension,priority,
+			evaluates the contents of a Return statement to resolve any variable or function
+			references, and returns the result as a string.</para>
+			<para>You can use this function to create simple user-defined lookup tables or
+			user-defined functions.</para>
+			<example title="Custom dialplan functions">
+			[call-types]
+			exten => _1NNN,1,Return(internal)
+			exten => _NXXNXXXXXX,1,Return(external)
+
+			[udf]
+			exten => calleridlen,1,Return(${LEN(${CALLERID(num)})})
+
+			[default]
+			exten => _X!,1,Verbose(Call type ${EVAL_EXTEN(call-types,${EXTEN},1)} - ${EVAL_EXTEN(udf,calleridlen,1)})
+			</example>
+			<para>Any variables in the evaluated data will be resolved in the context of
+			that extension. For example, <literal>${EXTEN}</literal> would refer to the
+			EVAL_EXTEN extension, not the extension in the context invoking the function.
+			This behavior is similar to other applications, e.g. <literal>Gosub</literal>.</para>
+			<example title="Choosing which prompt to use">
+			same => n,Read(input,${EVAL_EXTEN(prompts,${CALLERID(num)},1)})
+
+			[prompts]
+			exten => _X!,1,Return(default)
+			exten => _20X,1,Return(welcome)
+			exten => _2XX,1,Return(${DB(promptsettings/${EXTEN})})
+			exten => _3XX,1,Return(${ODBC_MYFUNC(${EXTEN})})
+			</example>
+			<para>Extensions on which EVAL_EXTEN is invoked are not different from other
+			extensions. However, the application at that extension is not executed.
+			Only the application data is parsed and evaluated.</para>
+			<para>A limitation of this function is that the application at the specified
+			extension isn't actually executed, and thus unlike a Gosub, you can't pass
+			arguments in the EVAL_EXTEN function.</para>
+		</description>
+		<see-also>
+			<ref type="function">EVAL</ref>
+		</see-also>
+	</function>
+ ***/
+
+static int eval_exten_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
+{
+	char *exten, *pri, *context, *parse;
+	int ipri;
+	char tmpbuf[len];
+
+	if (ast_strlen_zero(data)) {
+		ast_log(LOG_WARNING, "The EVAL_EXTEN function requires an extension\n");
+		return -1;
+	}
+
+	parse = ast_strdupa(data);
+	/* Split context,exten,pri */
+	context = strsep(&parse, ",");
+	exten = strsep(&parse, ",");
+	pri = strsep(&parse, ",");
+
+	if (pbx_parse_location(chan, &context, &exten, &pri, &ipri, NULL, NULL)) {
+		return -1;
+	}
+
+	if (ast_strlen_zero(exten) || ast_strlen_zero(context)) { /* only lock if we really need to */
+		ast_channel_lock(chan);
+		if (ast_strlen_zero(exten)) {
+			exten = ast_strdupa(ast_channel_exten(chan));
+		}
+		if (ast_strlen_zero(context)) {
+			context = ast_strdupa(ast_channel_context(chan));
+		}
+		ast_channel_unlock(chan);
+	}
+
+	if (ast_get_extension_data(tmpbuf, len, chan, context, exten, ipri)) {
+		return -1; /* EVAL_EXTEN failed */
+	}
+
+	pbx_substitute_variables_helper_full_location(chan, (chan) ? ast_channel_varshead(chan) : NULL, tmpbuf, buf, len, NULL, context, exten, ipri);
+
+	return 0;
+}
+
+static struct ast_custom_function eval_exten_function = {
+	.name = "EVAL_EXTEN",
+	.read = eval_exten_read,
+};
+
+static int unload_module(void)
+{
+	return ast_custom_function_unregister(&eval_exten_function);
+}
+
+static int load_module(void)
+{
+	return ast_custom_function_register(&eval_exten_function);
+}
+
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Extension evaluation function");
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_frame_drop.c asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_frame_drop.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_frame_drop.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_frame_drop.c	2022-05-12 11:50:59.000000000 +0000
@@ -38,6 +38,11 @@
 
 /*** DOCUMENTATION
 	<function name="FRAME_DROP" language="en_US">
+		<since>
+			<version>16.21.0</version>
+			<version>18.7.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Drops specific frame types in the TX or RX direction on a channel.
 		</synopsis>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_json.c asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_json.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_json.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_json.c	2022-05-12 11:50:59.000000000 +0000
@@ -39,6 +39,11 @@
 
 /*** DOCUMENTATION
 	<function name="JSON_DECODE" language="en_US">
+		<since>
+			<version>16.24.0</version>
+			<version>18.10.0</version>
+			<version>19.2.0</version>
+		</since>
 		<synopsis>
 			Returns the string value of a JSON object key from a string containing a
 			JSON array.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_math.c asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_math.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_math.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_math.c	2022-05-12 11:50:59.000000000 +0000
@@ -109,6 +109,11 @@
 		</description>
 	</function>
 	<function name="MIN" language="en_US">
+		<since>
+			<version>16.19.0</version>
+			<version>18.5.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Returns the minimum of two numbers.
 		</synopsis>
@@ -123,6 +128,11 @@
 		</description>
 	</function>
 	<function name="MAX" language="en_US">
+		<since>
+			<version>16.19.0</version>
+			<version>18.5.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Returns the maximum of two numbers.
 		</synopsis>
@@ -137,6 +147,11 @@
 		</description>
 	</function>
 	<function name="ABS" language="en_US">
+		<since>
+			<version>16.19.0</version>
+			<version>18.5.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Returns absolute value of a number.
 		</synopsis>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_sayfiles.c asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_sayfiles.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_sayfiles.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_sayfiles.c	2022-05-12 11:50:59.000000000 +0000
@@ -42,6 +42,11 @@
 
 /*** DOCUMENTATION
 	<function name="SAYFILES" language="en_US">
+		<since>
+			<version>16.21.0</version>
+			<version>18.7.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Returns the ampersand-delimited file names that would be played by the Say applications (e.g. SayAlpha, SayDigits).
 		</synopsis>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_scramble.c asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_scramble.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_scramble.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_scramble.c	2022-05-12 11:50:59.000000000 +0000
@@ -32,6 +32,11 @@
 
 /*** DOCUMENTATION
 	<function name="SCRAMBLE" language="en_US">
+		<since>
+			<version>16.21.0</version>
+			<version>18.7.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Scrambles audio on a channel.
 		</synopsis>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_strings.c asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_strings.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_strings.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_strings.c	2022-05-12 11:50:59.000000000 +0000
@@ -155,6 +155,11 @@
 		</description>
 	</function>
 	<function name="STRBETWEEN" language="en_US">
+		<since>
+			<version>16.21.0</version>
+			<version>18.7.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Inserts a substring between each character in a string.
 		</synopsis>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_talkdetect.c asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_talkdetect.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/funcs/func_talkdetect.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/funcs/func_talkdetect.c	2022-05-12 11:50:59.000000000 +0000
@@ -42,6 +42,9 @@
 
 /*** DOCUMENTATION
 	<function name="TALK_DETECT" language="en_US">
+		<since>
+			<version>12.4.0</version>
+		</since>
 		<synopsis>
 			Raises notifications when Asterisk detects silence or talking on a channel.
 		</synopsis>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/config.h asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/config.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/config.h	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/config.h	2022-05-12 11:50:59.000000000 +0000
@@ -970,10 +970,10 @@
 /*!
  * \brief Replace a variable in the given list with a new variable
  *
- * \param head A pointer to the current variable list head.  Since the variable to be
- *             replaced, this pointer may be updated with the new head.
- * \param old  A pointer to the existing variable to be replaced.
- * \param new  A pointer to the new variable that will replace the old one.
+ * \param head   A pointer to the current variable list head.  Since the variable to be
+ *               replaced, this pointer may be updated with the new head.
+ * \param oldvar A pointer to the existing variable to be replaced.
+ * \param newvar A pointer to the new variable that will replace the old one.
  *
  * \retval 0 if a variable was replaced in the list
  * \retval -1 if no replacement occured
@@ -981,8 +981,9 @@
  * \note The search for the old variable is done simply on the pointer.
  * \note If a variable is replaced, its memory is freed.
  */
-int ast_variable_list_replace_variable(struct ast_variable **head, struct ast_variable *old,
-	struct ast_variable *new);
+int ast_variable_list_replace_variable(struct ast_variable **head,
+	struct ast_variable *oldvar,
+	struct ast_variable *newvar);
 
 /*!
  * \brief Join an ast_variable list with specified separators and quoted values
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/pbx.h asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/pbx.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/pbx.h	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/pbx.h	2022-05-12 11:50:59.000000000 +0000
@@ -1501,6 +1501,25 @@
  */
 int ast_async_goto_if_exists(struct ast_channel *chan, const char *context, const char *exten, int priority);
 
+/*!
+ * \brief Parses a dialplan location into context, extension, priority
+ *
+ * \param chan Channel to execute on
+ * \param context Pointer to initial value for context.
+ * \param exten Pointer to initial value for exten.
+ * \param pri Pointer to initial value for pri
+ * \param ipri Pointer to integer value of priority
+ * \param mode Pointer to mode (or NULL if mode is not used)
+ * \param rest Pointer to buffer to capture rest of parsing (or NULL if not used)
+ *
+ * strsep should be used to initially populate context, exten, and pri prior
+ * to calling this function. All arguments are modified in place.
+ *
+ * \retval 0 success
+ * \retval non-zero failure
+ */
+int pbx_parse_location(struct ast_channel *chan, char **context, char **exten, char **pri, int *ipri, int *mode, char *rest);
+
 struct ast_custom_function* ast_custom_function_find(const char *name);
 
 /*!
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/res_aeap.h asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/res_aeap.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/res_aeap.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/res_aeap.h	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,370 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ * \brief Asterisk External Application Protocol API
+ */
+
+#ifndef AST_RES_AEAP_H
+#define AST_RES_AEAP_H
+
+#include <stdint.h>
+
+struct ao2_container;
+struct ast_sorcery;
+struct ast_variable;
+
+struct ast_aeap_client_config;
+struct ast_aeap_message;
+
+#define AEAP_CONFIG_CLIENT "client"
+
+/*!
+ * \brief Retrieve the AEAP sorcery object
+ *
+ * \returns the AEAP sorcery object
+ */
+struct ast_sorcery *ast_aeap_sorcery(void);
+
+/*!
+ * \brief Retrieve a listing of all client configuration objects by protocol.
+ *
+ * \note Caller is responsible for the returned container's reference.
+ *
+ * \param protocol An optional protocol to filter on (if NULL returns all client configs)
+ *
+ * \returns A container of client configuration objects
+ */
+struct ao2_container *ast_aeap_client_configs_get(const char *protocol);
+
+/*!
+ * \brief Retrieve codec capabilities from the configuration
+ *
+ * \param config A configuration object
+ *
+ * \returns The configuration's codec capabilities
+ */
+const struct ast_format_cap *ast_aeap_client_config_codecs(const struct ast_aeap_client_config *cfg);
+
+/*!
+ * \brief Check a given protocol against that in an Asterisk external application configuration
+ *
+ * \param config A configuration object
+ * \param protocol The protocol to check
+ *
+ * \returns True if the configuration's protocol matches, false otherwise
+ */
+int ast_aeap_client_config_has_protocol(const struct ast_aeap_client_config *cfg,
+	const char *protocol);
+
+/*!
+ * \brief Retrieve a list of custom configuration fields
+ *
+ * \param id configuration id/sorcery lookup key
+ *
+ * \returns variables, or NULL on error
+ */
+struct ast_variable *ast_aeap_custom_fields_get(const char *id);
+
+/*!
+ * \brief An Asterisk external application object
+ *
+ * Connects to an external application, sending and receiving data, and
+ * dispatches received data to registered handlers.
+ */
+struct ast_aeap;
+
+/*!
+ * \brief Event raised when a message is received
+ *
+ * \param aeap An Asterisk external application object
+ * \param message The received message
+ * \param obj Associated user object
+ *
+ * \returns 0 on if message handled, otherwise non-zero
+ */
+typedef int (*ast_aeap_on_message)(struct ast_aeap *aeap, struct ast_aeap_message *message, void *obj);
+
+/*!
+ * \brief An Asterisk external application message handler
+ *
+ * Used to register message handlers with an AEAP object.
+ */
+struct ast_aeap_message_handler {
+	/*! The handler name */
+	const char *name;
+	/*! Callback triggered when on a name match */
+	ast_aeap_on_message on_message;
+};
+
+/*!
+ * \brief Event raised when a sent message does not receive a reply within
+ *        a specified time interval
+ *
+ * \param aeap An Asterisk external application object
+ * \param message The message sent that received no response
+ * \param obj Associated user object
+ */
+typedef void (*ast_aeap_on_timeout)(struct ast_aeap *aeap, struct ast_aeap_message *message, void *obj);
+
+/*!
+ * \brief Callback to cleanup a user object
+ *
+ * \param obj The user object
+ */
+typedef void (*ast_aeap_user_obj_cleanup)(void *obj);
+
+/*!
+ * \brief Supported Asterisk external application data types
+ */
+enum AST_AEAP_DATA_TYPE {
+	AST_AEAP_DATA_TYPE_NONE,
+	AST_AEAP_DATA_TYPE_BINARY,
+	AST_AEAP_DATA_TYPE_STRING,
+};
+
+/*!
+ * \brief Callbacks and other parameters used by an Asterisk external application object
+ */
+struct ast_aeap_params {
+	/*!
+	 * If true pass along error messages to the implementation.
+	 * Otherwise log it only, and consider it handled.
+	 */
+	unsigned int emit_error;
+
+	/*! The message type used for communication */
+	const struct ast_aeap_message_type *msg_type;
+
+	/*! Response handlers array */
+	const struct ast_aeap_message_handler *response_handlers;
+	/*! The number of response handlers */
+	uintmax_t response_handlers_size;
+
+	/*! Request handlers array */
+	const struct ast_aeap_message_handler *request_handlers;
+	/*! The number of request handlers */
+	uintmax_t request_handlers_size;
+
+	/*!
+	 * \brief Raised when binary data is received
+	 *
+	 * \param aeap An Asterisk external application object
+	 * \param buf The buffer containing binary data
+	 * \param size The size of the buffer
+	 */
+	void (*on_binary)(struct ast_aeap *aeap, const void *buf, intmax_t size);
+
+	/*!
+	 * \brief Raised when string data is received
+	 *
+	 * \param aeap An Asterisk external application object
+	 * \param buf The buffer containing string data
+	 * \param size The size/length of the string
+	 */
+	void (*on_string)(struct ast_aeap *aeap, const char *buf, intmax_t size);
+
+	/*!
+	 * \brief Raised when an error occurs during reading
+	 *
+	 * \note This is an AEAP transport level read error event
+	 *
+	 * \note When this event is triggered the client has also
+	 *       been disconnected.
+	 *
+	 * \param aeap An Asterisk external application object
+	 */
+	void (*on_error)(struct ast_aeap *aeap);
+};
+
+/*!
+ * \brief Create an Asterisk external application object
+ *
+ * \param type The type of underlying transport
+ * \param params Callbacks and other parameters to use
+ *
+ * \returns A new ao2 reference counted aeap object, or NULL on error
+ */
+struct ast_aeap *ast_aeap_create(const char *type, const struct ast_aeap_params *params);
+
+/*!
+ * \brief Create an Asterisk external application object by sorcery id
+ *
+ * \param id The sorcery id to lookup
+ * \param params Callbacks and other parameters to use
+ *
+ * \returns A new ao2 reference counted aeap object, or NULL on error
+ */
+struct ast_aeap *ast_aeap_create_by_id(const char *id, const struct ast_aeap_params *params);
+
+/*!
+ * \brief Connect to an external application
+ *
+ * \param aeap An Asterisk external application object
+ * \param url The url to connect to
+ * \param protocol A protocol to use
+ * \param timeout How long (in milliseconds) to attempt to connect (-1 equals infinite)
+ *
+ * \returns 0 if able to connect, -1 on error
+ */
+int ast_aeap_connect(struct ast_aeap *aeap, const char *url, const char *protocol, int timeout);
+
+/*!
+ * \brief Create and connect to an Asterisk external application by sorcery id
+ *
+ * \param id The sorcery id to lookup
+ * \param params Callbacks and other parameters to use
+ * \param timeout How long (in milliseconds) to attempt to connect (-1 equals infinite)
+ *
+ * \returns A new ao2 reference counted aeap object, or NULL on error
+ */
+struct ast_aeap *ast_aeap_create_and_connect_by_id(const char *id,
+	const struct ast_aeap_params *params, int timeout);
+
+/*!
+ * \brief Create and connect to an Asterisk external application
+ *
+ * \param type The type of client connection to make
+ * \param params Callbacks and other parameters to use
+ * \param url The url to connect to
+ * \param protocol A protocol to use
+ * \param timeout How long (in milliseconds) to attempt to connect (-1 equals infinite)
+ *
+ * \returns A new ao2 reference counted aeap object, or NULL on error
+ */
+struct ast_aeap *ast_aeap_create_and_connect(const char *type,
+	const struct ast_aeap_params *params, const char *url, const char *protocol, int timeout);
+
+/*!
+ * \brief Disconnect an Asterisk external application object
+ *
+ * \note Depending on the underlying transport this call may block
+ *
+ * \param aeap An Asterisk external application object
+ *
+ * \returns 0 on success, -1 on error
+ */
+int ast_aeap_disconnect(struct ast_aeap *aeap);
+
+/*!
+ * \brief Register a user data object
+ *
+ * \note The "cleanup" is called on un-register, if one is specified
+ *
+ * \param aeap An Asterisk external application object
+ * \param id The look up id for the object
+ * \param obj The user object to register
+ * \param cleanup Optional user object clean up callback
+ *
+ * \returns 0 on success, -1 on error
+ */
+int ast_aeap_user_data_register(struct ast_aeap *aeap, const char *id, void *obj,
+	ast_aeap_user_obj_cleanup cleanup);
+
+/*!
+ * \brief Un-register a user data object
+ *
+ * \note If specified on register, the "cleanup" callback is called during unregister.
+ *
+ * \param aeap An Asterisk external application object
+ * \param id The look up id for the object
+ */
+void ast_aeap_user_data_unregister(struct ast_aeap *aeap, const char *id);
+
+/*!
+ * \brief Retrieve a registered user data object by its id
+ *
+ * \note Depending on how it was registered the returned user data object's lifetime
+ *       may be managed by the given "aeap" object. If it was registered with a cleanup
+ *       handler that [potentially] frees it the caller of this function must ensure
+ *       it's done using the returned object before it's unregistered.
+ *
+ * \param data A user data object
+ *
+ * \returns A user data object
+ */
+void *ast_aeap_user_data_object_by_id(struct ast_aeap *aeap, const char *id);
+
+/*!
+ * \brief Send a binary data to an external application
+ *
+ * \param aeap An Asterisk external application object
+ * \param buf Binary data to send
+ * \param size The size of the binary data
+ *
+ * \returns 0 on success, -1 on error
+ */
+int ast_aeap_send_binary(struct ast_aeap *aeap, const void *buf, uintmax_t size);
+
+/*!
+ * \brief Send a message to an external application
+ *
+ * \note "Steals" the given message reference, thus callers are not required to un-ref
+ *       the message object after calling this function.
+ *
+ * \param aeap An Asterisk external application object
+ * \param msg The message to send
+ *
+ * \returns 0 on success, -1 on error
+ */
+int ast_aeap_send_msg(struct ast_aeap *aeap, struct ast_aeap_message *msg);
+
+/*!
+ * \brief Parameters to be used when sending a transaction based message
+ */
+struct ast_aeap_tsx_params {
+	/*! The message to send */
+	struct ast_aeap_message *msg;
+	/*! The amount of time (in milliseconds) to wait for a received message */
+	int timeout;
+	/*! Optional callback raised when no message is received in an allotted time */
+	ast_aeap_on_timeout on_timeout;
+	/*! Whether or not to block the current thread, and wait for a received message */
+	int wait;
+	/*!
+	 * Optional user object to pass to handlers. User is responsible for object's lifetime
+	 * unless an obj_cleanup callback is specified that handles its cleanup (e.g. freeing
+	 * of memory).
+	 */
+	void *obj;
+	/*!
+	 * Optional user object cleanup callback. If specified, called upon "this" param's
+	 * destruction (including on error).
+	 */
+	ast_aeap_user_obj_cleanup obj_cleanup;
+};
+
+/*!
+ * \brief Send a transaction based message to an external application using the given parameters
+ *
+ * \note "Steals" the given message reference, thus callers are not required to un-ref
+ *       the message object after calling this function.
+ *
+ * \note Also handles cleaning up the user object if the obj_cleanup callback
+ *       is specified in "params".
+ *
+ * \param aeap An Asterisk external application object
+ * \param msg The message to send
+ * \param params (optional) Additional parameters to consider when sending. Heap allocation
+ *     not required.
+ *
+ * \returns 0 on success, -1 on error
+ */
+int ast_aeap_send_msg_tsx(struct ast_aeap *aeap, struct ast_aeap_tsx_params *params);
+
+#endif /* AST_RES_AEAP_H */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/res_aeap_message.h asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/res_aeap_message.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/res_aeap_message.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/res_aeap_message.h	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,374 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ * \brief Asterisk External Application Protocol Message API
+ */
+
+#ifndef AST_AEAP_MESSAGE_H
+#define AST_AEAP_MESSAGE_H
+
+#include <stdint.h>
+
+#include "asterisk/res_aeap.h"
+
+struct ast_aeap_message;
+
+/*!
+ * \brief Message type virtual method table
+ */
+struct ast_aeap_message_type {
+	/*! The size of the message implementation type. Used for allocations. */
+	size_t type_size;
+	/*! The name of this type */
+	const char *type_name;
+	/*! The type to serialize to, and de-serialize from */
+	enum AST_AEAP_DATA_TYPE serial_type;
+
+	/*!
+	 * \brief Construct/Initialize a message object
+	 *
+	 * \param self The message object to initialize
+	 * \param params Other optional parameter(s) to possibly use
+	 *
+	 * \returns 0 on success, -1 on error
+	 */
+	int (*construct1)(struct ast_aeap_message *self, const void *params);
+
+	/*!
+	 * \brief Construct/Initialize a message object
+	 *
+	 * \param self The message object to initialize
+	 * \param msg_type The type of message (e.g. request or response)
+	 * \param name The name of the message
+	 * \param id The message id
+	 * \param params Other optional parameter(s) to possibly use
+	 *
+	 * \returns 0 on success, -1 on error
+	 */
+	int (*construct2)(struct ast_aeap_message *self, const char *msg_type, const char *name,
+		const char *id, const void *params);
+
+	/*!
+	 * \brief Destruct/Cleanup object resources
+	 *
+	 * \param self The message object being destructed
+	 */
+	void (*destruct)(struct ast_aeap_message *self);
+
+	/*!
+	 * \brief Deserialize the given buffer into a message object
+	 *
+	 * \param self The message object to deserialize into
+	 * \param buf The buffer to deserialize
+	 * \param size The size/length of the buffer
+	 *
+	 * \returns 0 on success, -1 on error
+	 */
+	int (*deserialize)(struct ast_aeap_message *self, const void *buf, intmax_t size);
+
+	/*!
+	 * \brief Serialize the message object into byte/char buffer
+	 *
+	 * \param self The message object to serialize
+	 * \param buf [out] The buffer to hold the "packed" data
+	 * \param size [out] The size of the data written to the buffer
+	 *
+	 * \returns 0 on success, -1 on error
+	 */
+	int (*serialize)(const struct ast_aeap_message *self, void **buf, intmax_t *size);
+
+	/*!
+	 * \brief Retrieve a message id
+	 *
+	 * \param self The message object
+	 *
+	 * \returns The message id
+	 */
+	const char *(*id)(const struct ast_aeap_message *self);
+
+	/*!
+	 * \brief Set a message id.
+	 *
+	 * \param self The message object
+	 * \param id The id to set
+	 *
+	 * \returns 0 on success, -1 on error
+	 */
+	int (*id_set)(struct ast_aeap_message *self, const char *id);
+
+	/*!
+	 * \brief Retrieve a message name
+	 *
+	 * \param self The message object
+	 *
+	 * \returns The message name
+	 */
+	const char *(*name)(const struct ast_aeap_message *self);
+
+	/*!
+	 * \brief Retrieve the core message data/body
+	 *
+	 * \param self This message object
+	 */
+	void *(*data)(struct ast_aeap_message *self);
+
+	/*!
+	 * \brief Retrieve whether or not this is a request message
+	 *
+	 * \param self The message object
+	 *
+	 * \returns True if message is a request, false otherwise
+	 */
+	int (*is_request)(const struct ast_aeap_message *self);
+
+	/*!
+	 * \brief Retrieve whether or not this is a response message
+	 *
+	 * \param self The message object
+	 *
+	 * \returns True if message is a response, false otherwise
+	 */
+	int (*is_response)(const struct ast_aeap_message *self);
+
+	/*!
+	 * \brief Retrieve the error message if it has one
+	 *
+	 * \param self The message object
+	 *
+	 * \returns The error message if available, or NULL
+	 */
+	const char *(*error_msg)(const struct ast_aeap_message *self);
+
+	/*!
+	 * \brief Set an error message
+	 *
+	 * \param self The message object
+	 * \param error_msg The error message string to set
+	 *
+	 * \returns 0 on success, -1 on error
+	 */
+	int (*error_msg_set)(struct ast_aeap_message *self, const char *error_msg);
+};
+
+/*!
+ * \brief Asterisk external application base message
+ */
+struct ast_aeap_message {
+	/*! The type virtual table */
+	const struct ast_aeap_message_type *type;
+};
+
+/*!
+ * \brief Retrieve the serial type a message type
+ *
+ * \param type A message type
+ *
+ * \returns The type's serial type
+ */
+enum AST_AEAP_DATA_TYPE ast_aeap_message_serial_type(const struct ast_aeap_message_type *type);
+
+/*!
+ * \brief Create an Asterisk external application message object
+ *
+ * \param type The type of message object to create
+ * \param params Any parameter(s) to pass to the type's constructor
+ *
+ * \returns An ao2 reference counted AEAP message object, or NULL on error
+ */
+struct ast_aeap_message *ast_aeap_message_create1(const struct ast_aeap_message_type *type,
+	const void *params);
+
+/*!
+ * \brief Create an Asterisk external application message object
+ *
+ * \param type The type of message object to create
+ * \param msg_type The type of message (e.g. request or response)
+ * \param name The name of the message
+ * \param id The message id
+ * \param params Other optional parameter(s) to possibly use
+ *
+ * \returns An ao2 reference counted AEAP message object, or NULL on error
+ */
+struct ast_aeap_message *ast_aeap_message_create2(const struct ast_aeap_message_type *type,
+	const char *msg_type, const char *name, const char *id, const void *params);
+
+/*!
+ * \brief Create an Asterisk external application request object
+ *
+ * \param type The type of message object to create
+ * \param name The name of the message
+ * \param id Optional id (if NULL an id is generated)
+ * \param params Other optional parameter(s) to possibly use
+ *
+ * \returns An ao2 reference counted AEAP request object, or NULL on error
+ */
+struct ast_aeap_message *ast_aeap_message_create_request(const struct ast_aeap_message_type *type,
+	const char *name, const char *id, const void *params);
+
+/*!
+ * \brief Create an Asterisk external application response object
+ *
+ * \param type The type of message object to create
+ * \param name The name of the message
+ * \param id Optional id
+ * \param params Other optional parameter(s) to possibly use
+ *
+ * \returns An ao2 reference counted AEAP response object, or NULL on error
+ */
+struct ast_aeap_message *ast_aeap_message_create_response(const struct ast_aeap_message_type *type,
+	const char *name, const char *id, const void *params);
+
+/*!
+ * \brief Create an Asterisk external application error response object
+ *
+ * \param type The type of message object to create
+ * \param name The name of the message
+ * \param id Optional id
+ * \param error_msg Error message to set
+ * \param params Other optional parameter(s) to possibly use
+ *
+ * \returns An ao2 reference counted AEAP response object, or NULL on error
+ */
+struct ast_aeap_message *ast_aeap_message_create_error(const struct ast_aeap_message_type *type,
+	const char *name, const char *id, const char *error_msg);
+
+/*!
+ * \brief Deserialize the given buffer into an Asterisk external application message object
+ *
+ * \param type The message type to create, and deserialize to
+ * \param buf The buffer to deserialize
+ * \param size The size/length of the buffer
+ *
+ * \returns An ao2 reference counted AEAP message object, or NULL on error
+ */
+struct ast_aeap_message *ast_aeap_message_deserialize(const struct ast_aeap_message_type *type,
+	const void *buf, intmax_t size);
+
+/*!
+ * \brief Serialize the given message object into a byte/char buffer
+ *
+ * \param message The message object to serialize
+ * \param buf [out] The buffer to hold the "packed" data
+ * \param size [out] The size of the data written to the buffer
+ *
+ * \returns 0 on success, -1 on error
+ */
+int ast_aeap_message_serialize(const struct ast_aeap_message *message,
+	void **buf, intmax_t *size);
+
+/*!
+ * \brief Retrieve a message id
+ *
+ * \param message A message object
+ *
+ * \returns The message id, or an empty string
+ */
+const char *ast_aeap_message_id(const struct ast_aeap_message *message);
+
+/*!
+ * \brief Set a message id.
+ *
+ * \param message A message object
+ * \param id The id to set
+ *
+ * \returns 0 on success, -1 on error
+ */
+int ast_aeap_message_id_set(struct ast_aeap_message *message, const char *id);
+
+/*!
+ * \brief Generate an id, and set it for the message
+ *
+ * \param message A message object
+ *
+ * \returns the generated id on success, or NULL on error
+ */
+const char *ast_aeap_message_id_generate(struct ast_aeap_message *message);
+
+/*!
+ * \brief Retrieve a message name
+ *
+ * \param message A message object
+ *
+ * \returns The message name, or an empty string
+ */
+const char *ast_aeap_message_name(const struct ast_aeap_message *message);
+
+/*!
+ * \brief Check whether or not a message's name matches the given one
+ *
+ * \note Case insensitive
+ *
+ * \param message A message object
+ * \param message name The name to check against
+ *
+ * \returns True if matched, false otherwise
+ */
+int ast_aeap_message_is_named(const struct ast_aeap_message *message, const char *name);
+
+/*!
+ * \brief Retrieve the core message data/body
+ *
+ * \param message A message object
+ */
+void *ast_aeap_message_data(struct ast_aeap_message *message);
+
+/*!
+ * \brief Retrieve whether or not this is a request message
+ *
+ * \param message A message object
+ *
+ * \returns True if the message is a request, false otherwise
+ */
+int ast_aeap_message_is_request(const struct ast_aeap_message *message);
+
+/*!
+ * \brief Retrieve whether or not this is a response message
+ *
+ * \param message A message object
+ *
+ * \returns True if the message is a response, false otherwise
+ */
+int ast_aeap_message_is_response(const struct ast_aeap_message *message);
+
+/*!
+ * \brief Retrieve the error message if it has one
+ *
+ * \param message A message object
+ *
+ * \returns The error message if available, or NULL
+ */
+const char *ast_aeap_message_error_msg(const struct ast_aeap_message *message);
+
+/*!
+ * \brief Set an error message.
+ *
+ * \param message A message object
+ * \param error_msg The error string to set
+ *
+ * \returns 0 on success, -1 on error
+ */
+int ast_aeap_message_error_msg_set(struct ast_aeap_message *message,
+	const char *error_msg);
+
+/*!
+ * \brief Asterisk external application JSON message type
+ */
+extern const struct ast_aeap_message_type *ast_aeap_message_type_json;
+
+#endif /* AST_AEAP_MESSAGE_H */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/res_pjsip.h asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/res_pjsip.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/res_pjsip.h	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/res_pjsip.h	2022-05-12 11:50:59.000000000 +0000
@@ -3066,6 +3066,13 @@
 unsigned int ast_sip_get_mwi_disable_initial_unsolicited(void);
 
 /*!
+ * \brief Retrieve the global setting 'allow_sending_180_after_183'.
+ *
+ * \retval non zero if disable.
+ */
+unsigned int ast_sip_get_allow_sending_180_after_183(void);
+
+/*!
  * \brief Retrieve the global setting 'use_callerid_contact'.
  * \since 13.24.0
  *
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/speech.h asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/speech.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/speech.h	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/speech.h	2022-05-12 11:50:59.000000000 +0000
@@ -158,6 +158,12 @@
 /*! \brief Unregister a speech recognition engine */
 struct ast_speech_engine *ast_speech_unregister2(const char *engine_name);
 
+/*! \brief Retrieve a speech recognition engine */
+struct ast_speech_engine *ast_speech_find_engine(const char *engine_name);
+/*! \brief Unregister all speech recognition engines told to by callback */
+void ast_speech_unregister_engines(
+	int (*should_unregister)(const struct ast_speech_engine *engine, void *data), void *data,
+	void (*on_unregistered)(void *obj));
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/time.h asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/time.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/include/asterisk/time.h	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/include/asterisk/time.h	2022-05-12 11:50:59.000000000 +0000
@@ -35,6 +35,13 @@
 
 #include "asterisk/inline_api.h"
 
+/* A time_t can be represented as an unsigned long long (or uint64_t).
+ * Formatted in base 10, UINT64_MAX is 20 digits long, plus one for NUL.
+ * This should be the size of the receiving char buffer for calls to
+ * ast_time_t_to_string().
+ */
+#define AST_TIME_T_LEN		21
+
 /* We have to let the compiler learn what types to use for the elements of a
    struct timeval since on linux, it's time_t and suseconds_t, but on *BSD,
    they are just a long.
@@ -316,4 +323,17 @@
  */
 struct timeval ast_time_create_by_unit_str(unsigned long val, const char *unit);
 
+/*!
+ * \brief Converts to a string representation of a time_t as decimal
+ * seconds since the epoch. Returns -1 on failure, zero otherwise.
+ *
+ * The buffer should be at least 22 bytes long.
+ */
+int ast_time_t_to_string(time_t time, char *buf, size_t length);
+
+/*!
+ * \brief Returns a time_t from a string containing seconds since the epoch.
+ */
+time_t ast_string_to_time_t(const char *str);
+
 #endif /* _ASTERISK_TIME_H */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/main/asterisk.c asterisk-18.12.0~dfsg+~cs6.12.40431413/main/asterisk.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/main/asterisk.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/main/asterisk.c	2022-05-12 11:50:59.000000000 +0000
@@ -3351,7 +3351,7 @@
 	printf("   -L <load>       Limit the maximum load average before rejecting new calls\n");
 	printf("   -M <value>      Limit the maximum number of calls to the specified value\n");
 	printf("   -m              Mute debugging and console output on the console\n");
-	printf("   -n              Disable console colorization\n");
+	printf("   -n              Disable console colorization. Can be used only at startup.\n");
 	printf("   -p              Run as pseudo-realtime thread\n");
 	printf("   -q              Quiet mode (suppress output)\n");
 	printf("   -r              Connect to Asterisk on this machine\n");
@@ -3360,7 +3360,7 @@
 	printf("   -t              Record soundfiles in /var/tmp and move them where they\n");
 	printf("                   belong after they are done\n");
 	printf("   -T              Display the time in [Mmm dd hh:mm:ss] format for each line\n");
-	printf("                   of output to the CLI\n");
+	printf("                   of output to the CLI. Cannot be used with remote console mode.\n\n");
 	printf("   -v              Increase verbosity (multiple v's = more verbose)\n");
 	printf("   -x <cmd>        Execute command <cmd> (implies -r)\n");
 	printf("   -X              Enable use of #exec in asterisk.conf\n");
@@ -3716,6 +3716,55 @@
 		}
 	}
 
+	if (ast_opt_remote) {
+		int didwarn = 0;
+		optind = 1;
+
+		/* Not all options can be used with remote console. Warn if they're used. */
+		while ((c = getopt(argc, argv, getopt_settings)) != -1) {
+			switch (c) {
+			/* okay to run with remote console */
+			case 'B': /* force black background */
+			case 'd': /* debug */
+			case 'h': /* help */
+			case 'I': /* obsolete timing option: warning already thrown if used */
+			case 'L': /* max load */
+			case 'M': /* max calls */
+			case 'R': /* reconnect */
+			case 'r': /* remote */
+			case 's': /* set socket path */
+			case 'V': /* version */
+			case 'v': /* verbose */
+			case 'W': /* white background */
+			case 'x': /* remote execute */
+			case '?': /* ? */
+				break;
+			/* can only be run when Asterisk is starting */
+			case 'X': /* enables #exec for asterisk.conf only. */
+			case 'C': /* set config path */
+			case 'c': /* foreground console */
+			case 'e': /* minimum memory free */
+			case 'F': /* always fork */
+			case 'f': /* no fork */
+			case 'G': /* run group */
+			case 'g': /* dump core */
+			case 'i': /* init keys */
+			case 'm': /* mute */
+			case 'n': /* no color */
+			case 'p': /* high priority */
+			case 'q': /* quiet */
+			case 'T': /* timestamp */
+			case 't': /* cache record files */
+			case 'U': /* run user */
+				fprintf(stderr, "'%c' option is not compatible with remote console mode and has no effect.\n", c);
+				didwarn = 1;
+			}
+		}
+		if (didwarn) {
+			fprintf(stderr, "\n"); /* if any warnings print out, make them stand out */
+		}
+	}
+
 	/* For remote connections, change the name of the remote connection.
 	 * We do this for the benefit of init scripts (which need to know if/when
 	 * the main asterisk process has died yet). */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/main/conversions.c asterisk-18.12.0~dfsg+~cs6.12.40431413/main/conversions.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/main/conversions.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/main/conversions.c	2022-05-12 11:50:59.000000000 +0000
@@ -99,7 +99,7 @@
 	}
 
 	errno = 0;
-	val = strtoimax(str, &end, 0);
+	val = strtoimax(str, &end, 10);
 
 	/*
 	 * If str equals end then no digits were found. If end is not pointing to
@@ -126,7 +126,7 @@
 	}
 
 	errno = 0;
-	val = strtoumax(str, &end, 0);
+	val = strtoumax(str, &end, 10);
 
 	/*
 	 * If str equals end then no digits were found. If end is not pointing to
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/main/core_unreal.c asterisk-18.12.0~dfsg+~cs6.12.40431413/main/core_unreal.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/main/core_unreal.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/main/core_unreal.c	2022-05-12 11:50:59.000000000 +0000
@@ -1168,7 +1168,9 @@
 	struct ast_assigned_ids id1 = {NULL, NULL};
 	struct ast_assigned_ids id2 = {NULL, NULL};
 	int generated_seqno = ast_atomic_fetchadd_int((int *) &name_sequence, +1);
-	struct ast_stream_topology *topology;
+	int i;
+	struct ast_stream_topology *chan_topology;
+	struct ast_stream *stream;
 
 	/* set unique ids for the two channels */
 	if (assignedids && !ast_strlen_zero(assignedids->uniqueid)) {
@@ -1186,14 +1188,27 @@
 		id2.uniqueid = uniqueid2;
 	}
 
-	/* We need to create a topology to place on the first channel, as we can't
+	/* We need to create a topology to place on the second channel, as we can't
 	 * share a single one between both.
 	 */
-	topology = ast_stream_topology_clone(p->reqtopology);
-	if (!topology) {
+	chan_topology = ast_stream_topology_clone(p->reqtopology);
+	if (!chan_topology) {
 		return NULL;
 	}
 
+	for (i = 0; i < ast_stream_topology_get_count(chan_topology); ++i) {
+		stream = ast_stream_topology_get_stream(chan_topology, i);
+		/* We need to make sure that the ;2 channel has the opposite stream topology
+		 * of the first channel if the stream is one-way. I.e. if the first channel
+		 * is recvonly, the second channel has to be sendonly and vice versa.
+		 */
+		if (ast_stream_get_state(stream) == AST_STREAM_STATE_RECVONLY) {
+			ast_stream_set_state(stream, AST_STREAM_STATE_SENDONLY);
+		} else if (ast_stream_get_state(stream) == AST_STREAM_STATE_SENDONLY) {
+			ast_stream_set_state(stream, AST_STREAM_STATE_RECVONLY);
+		}
+	}
+
 	/*
 	 * Allocate two new Asterisk channels
 	 *
@@ -1206,7 +1221,7 @@
 		"%s/%s-%08x;1", tech->type, p->name, (unsigned)generated_seqno);
 	if (!owner) {
 		ast_log(LOG_WARNING, "Unable to allocate owner channel structure\n");
-		ast_stream_topology_free(topology);
+		ast_stream_topology_free(chan_topology);
 		return NULL;
 	}
 
@@ -1221,7 +1236,8 @@
 	ast_channel_nativeformats_set(owner, p->reqcap);
 
 	if (ast_channel_is_multistream(owner)) {
-		ast_channel_set_stream_topology(owner, topology);
+		ast_channel_set_stream_topology(owner, p->reqtopology);
+		p->reqtopology = NULL;
 	}
 
 	/* Determine our read/write format and set it on each channel */
@@ -1279,8 +1295,7 @@
 	ast_channel_nativeformats_set(chan, p->reqcap);
 
 	if (ast_channel_is_multistream(chan)) {
-		ast_channel_set_stream_topology(chan, p->reqtopology);
-		p->reqtopology = NULL;
+		ast_channel_set_stream_topology(chan, chan_topology);
 	}
 
 	/* Format was already determined when setting up owner */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/main/file.c asterisk-18.12.0~dfsg+~cs6.12.40431413/main/file.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/main/file.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/main/file.c	2022-05-12 11:50:59.000000000 +0000
@@ -1097,6 +1097,12 @@
 
 int ast_stream_rewind(struct ast_filestream *fs, off_t ms)
 {
+	off_t offset = ast_tellstream(fs);
+	if (ms * DEFAULT_SAMPLES_PER_MS > offset) {
+		/* Don't even bother asking the file format to seek to a negative offset... */
+		ast_debug(1, "Restarting, rather than seeking to negative offset %ld\n", (long) (offset - (ms * DEFAULT_SAMPLES_PER_MS)));
+		return ast_seekstream(fs, 0, SEEK_SET);
+	}
 	return ast_seekstream(fs, -ms * DEFAULT_SAMPLES_PER_MS, SEEK_CUR);
 }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/main/logger.c asterisk-18.12.0~dfsg+~cs6.12.40431413/main/logger.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/main/logger.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/main/logger.c	2022-05-12 11:50:59.000000000 +0000
@@ -97,6 +97,11 @@
 static int logger_messages_discarded;
 static unsigned int high_water_alert;
 
+/* On some platforms, like those with MUSL as the runtime, BUFSIZ is
+ * unreasonably small (1024). Use a larger value in those environments.
+ */
+#define LOGMSG_SIZE		MAX(BUFSIZ, 8192)
+
 static enum rotatestrategy {
 	NONE = 0,                /* Do not rotate log files at all, instead rely on external mechanisms */
 	SEQUENTIAL = 1 << 0,     /* Original method - create a new file, in order */
@@ -1665,7 +1670,7 @@
 static void logger_print_normal(struct logmsg *logmsg)
 {
 	struct logchannel *chan = NULL;
-	char buf[BUFSIZ];
+	char buf[LOGMSG_SIZE];
 	int level = 0;
 
 	AST_RWLIST_RDLOCK(&logchannels);
@@ -1698,13 +1703,13 @@
 
 					/* Don't use LOG_MAKEPRI because it's broken in glibc<2.17 */
 					syslog_level = chan->facility | syslog_level; /* LOG_MAKEPRI(chan->facility, syslog_level); */
-					if (!chan->formatter.format_log(chan, logmsg, buf, BUFSIZ)) {
+					if (!chan->formatter.format_log(chan, logmsg, buf, sizeof(buf))) {
 						syslog(syslog_level, "%s", buf);
 					}
 				}
 				break;
 			case LOGTYPE_CONSOLE:
-				if (!chan->formatter.format_log(chan, logmsg, buf, BUFSIZ)) {
+				if (!chan->formatter.format_log(chan, logmsg, buf, sizeof(buf))) {
 					ast_console_puts_mutable_full(buf, logmsg->level, logmsg->sublevel);
 				}
 				break;
@@ -1716,7 +1721,7 @@
 						continue;
 					}
 
-					if (chan->formatter.format_log(chan, logmsg, buf, BUFSIZ)) {
+					if (chan->formatter.format_log(chan, logmsg, buf, sizeof(buf))) {
 						continue;
 					}
 
@@ -1780,7 +1785,7 @@
 	}
 
 	/* Build string */
-	res = ast_str_set_va(&buf, BUFSIZ, fmt, ap);
+	res = ast_str_set_va(&buf, LOGMSG_SIZE, fmt, ap);
 
 	/* If the build failed, then abort and free this structure */
 	if (res == AST_DYNSTR_BUILD_FAILED) {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/main/Makefile asterisk-18.12.0~dfsg+~cs6.12.40431413/main/Makefile
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/main/Makefile	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/main/Makefile	2022-05-12 11:50:59.000000000 +0000
@@ -169,6 +169,7 @@
 tcptls.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE) -Wno-deprecated-declarations
 uuid.o: _ASTCFLAGS+=$(UUID_INCLUDE)
 stasis.o: _ASTCFLAGS+=$(call get_menuselect_cflags,AO2_DEBUG)
+time.o: _ASTCFLAGS+=-D_XOPEN_SOURCE=700
 
 
 OBJS:=$(sort $(OBJS))
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/main/manager.c asterisk-18.12.0~dfsg+~cs6.12.40431413/main/manager.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/main/manager.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/main/manager.c	2022-05-12 11:50:59.000000000 +0000
@@ -633,6 +633,12 @@
 		</see-also>
 	</manager>
 	<manager name="CancelAtxfer" language="en_US">
+		<since>
+			<version>13.18.0</version>
+			<version>14.7.0</version>
+			<version>15.1.0</version>
+			<version>16.0.0</version>
+		</since>
 		<synopsis>
 			Cancel an attended transfer.
 		</synopsis>
@@ -6242,7 +6248,7 @@
 			    (s->session->readperm & eqe->category) == eqe->category &&
 			    (s->session->send_events & eqe->category) == eqe->category) {
 					if (match_filter(s, eqe->eventdata)) {
-						if (send_string(s, eqe->eventdata) < 0)
+						if (send_string(s, eqe->eventdata) < 0 || s->write_error)
 							ret = -1;	/* don't send more */
 					}
 			}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/main/pbx_builtins.c asterisk-18.12.0~dfsg+~cs6.12.40431413/main/pbx_builtins.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/main/pbx_builtins.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/main/pbx_builtins.c	2022-05-12 11:50:59.000000000 +0000
@@ -83,6 +83,9 @@
 						<para>Only break if a digit hit matches a one digit
 						extension in the destination context.</para>
 					</option>
+					<option name="p">
+						<para>Do not allow playback to be interrupted with digits.</para>
+					</option>
 				</optionlist>
 			</parameter>
 			<parameter name="langoverride">
@@ -698,6 +701,10 @@
 							be used instead if set</emphasis></para>
 						</argument>
 					</option>
+					<option name="d">
+						<para>Play <literal>dial</literal> indications tone on channel while waiting
+						for digits.</para>
+					</option>
 				</optionlist>
 			</parameter>
 		</syntax>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/main/pbx.c asterisk-18.12.0~dfsg+~cs6.12.40431413/main/pbx.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/main/pbx.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/main/pbx.c	2022-05-12 11:50:59.000000000 +0000
@@ -2506,7 +2506,7 @@
 		q->data = NULL;
 		q->foundcontext = NULL;
 	} else if (q->stacklen >= AST_PBX_MAX_STACK) {
-		ast_log(LOG_WARNING, "Maximum PBX stack exceeded\n");
+		ast_log(LOG_WARNING, "Maximum PBX stack (%d) exceeded. Too many includes?\n", AST_PBX_MAX_STACK);
 		return NULL;
 	}
 
@@ -8771,8 +8771,14 @@
 {
 	int idx;
 	int res = 0;
+	int includecount = ast_context_includes_count(con);
 
-	for (idx = 0; idx < ast_context_includes_count(con); idx++) {
+	if (includecount >= AST_PBX_MAX_STACK) {
+		ast_log(LOG_WARNING, "Context %s contains too many includes (%d). Maximum is %d.\n",
+			ast_get_context_name(con), includecount, AST_PBX_MAX_STACK);
+	}
+
+	for (idx = 0; idx < includecount; idx++) {
 		const struct ast_include *inc = ast_context_includes_get(con, idx);
 
 		if (ast_context_find(include_rname(inc))) {
@@ -8820,6 +8826,47 @@
 	return __ast_goto_if_exists(chan, context, exten, priority, 1);
 }
 
+int pbx_parse_location(struct ast_channel *chan, char **contextp, char **extenp, char **prip, int *ipri, int *mode, char *rest)
+{
+	char *context, *exten, *pri;
+	/* do the strsep before here, so we don't have to alloc and free */
+	if (!*extenp) {
+		/* Only a priority in this one */
+		*prip = *contextp;
+		*extenp = NULL;
+		*contextp = NULL;
+	} else if (!*prip) {
+		/* Only an extension and priority in this one */
+		*prip = *extenp;
+		*extenp = *contextp;
+		*contextp = NULL;
+	}
+	context = *contextp;
+	exten = *extenp;
+	pri = *prip;
+	if (mode) {
+		if (*pri == '+') {
+			*mode = 1;
+			pri++;
+		} else if (*pri == '-') {
+			*mode = -1;
+			pri++;
+		}
+	}
+	if ((rest && sscanf(pri, "%30d%1s", ipri, rest) != 1) || sscanf(pri, "%30d", ipri) != 1) {
+		*ipri = ast_findlabel_extension(chan, context ? context : ast_channel_context(chan),
+			exten ? exten : ast_channel_exten(chan), pri,
+			S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL));
+		if (*ipri < 1) {
+			ast_log(LOG_WARNING, "Priority '%s' must be a number > 0, or valid label\n", pri);
+			return -1;
+		} else if (mode) {
+			*mode = 0;
+		}
+	}
+	return 0;
+}
+
 static int pbx_parseable_goto(struct ast_channel *chan, const char *goto_string, int async)
 {
 	char *exten, *pri, *context;
@@ -8836,31 +8883,9 @@
 	context = strsep(&stringp, ",");	/* guaranteed non-null */
 	exten = strsep(&stringp, ",");
 	pri = strsep(&stringp, ",");
-	if (!exten) {	/* Only a priority in this one */
-		pri = context;
-		exten = NULL;
-		context = NULL;
-	} else if (!pri) {	/* Only an extension and priority in this one */
-		pri = exten;
-		exten = context;
-		context = NULL;
-	}
-	if (*pri == '+') {
-		mode = 1;
-		pri++;
-	} else if (*pri == '-') {
-		mode = -1;
-		pri++;
-	}
-	if (sscanf(pri, "%30d%1s", &ipri, rest) != 1) {
-		ipri = ast_findlabel_extension(chan, context ? context : ast_channel_context(chan),
-			exten ? exten : ast_channel_exten(chan), pri,
-			S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL));
-		if (ipri < 1) {
-			ast_log(LOG_WARNING, "Priority '%s' must be a number > 0, or valid label\n", pri);
-			return -1;
-		} else
-			mode = 0;
+
+	if (pbx_parse_location(chan, &context, &exten, &pri, &ipri, &mode, rest)) {
+		return -1;
 	}
 	/* At this point we have a priority and maybe an extension and a context */
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/main/pbx_variables.c asterisk-18.12.0~dfsg+~cs6.12.40431413/main/pbx_variables.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/main/pbx_variables.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/main/pbx_variables.c	2022-05-12 11:50:59.000000000 +0000
@@ -736,7 +736,7 @@
 
 			/* Substitute if necessary */
 			if (needsub) {
-				pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1, NULL);
+				pbx_substitute_variables_helper_full_location(c, headp, var, ltmp, VAR_BUF_SIZE - 1, NULL, context, exten, pri);
 				vars = ltmp;
 			} else {
 				vars = var;
@@ -770,10 +770,13 @@
 				/* For dialplan location, if we were told what to substitute explicitly, use that instead */
 				if (exten && !strcmp(vars, "EXTEN")) {
 					ast_copy_string(workspace, exten, VAR_BUF_SIZE);
+					cp4 = workspace;
 				} else if (context && !strcmp(vars, "CONTEXT")) {
 					ast_copy_string(workspace, context, VAR_BUF_SIZE);
+					cp4 = workspace;
 				} else if (pri && !strcmp(vars, "PRIORITY")) {
 					snprintf(workspace, VAR_BUF_SIZE, "%d", pri);
+					cp4 = workspace;
 				} else {
 					pbx_retrieve_variable(c, vars, &cp4, workspace, VAR_BUF_SIZE, headp);
 				}
@@ -829,7 +832,7 @@
 
 			/* Substitute if necessary */
 			if (needsub) {
-				pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1, NULL);
+				pbx_substitute_variables_helper_full_location(c, headp, var, ltmp, VAR_BUF_SIZE - 1, NULL, context, exten, pri);
 				vars = ltmp;
 			} else {
 				vars = var;
@@ -924,6 +927,52 @@
 	return CLI_SUCCESS;
 }
 
+/*! \brief CLI support for executing function */
+static char *handle_eval_function(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+	struct ast_channel *c = NULL;
+	char *fn, *substituted;
+	int ret;
+	char workspace[1024];
+
+	switch (cmd) {
+	case CLI_INIT:
+		e->command = "dialplan eval function";
+		e->usage =
+			"Usage: dialplan eval function <name(args)>\n"
+			"       Evaluate a dialplan function call\n"
+			"       A dummy channel is used to evaluate\n"
+			"       the function call, so only global\n"
+			"       variables should be used.\n";
+		return NULL;
+	case CLI_GENERATE:
+		return NULL;
+	}
+
+	if (a->argc != e->args + 1) {
+		return CLI_SHOWUSAGE;
+	}
+
+	c = ast_dummy_channel_alloc();
+	if (!c) {
+		ast_cli(a->fd, "Unable to allocate bogus channel for function evaluation.\n");
+		return CLI_FAILURE;
+	}
+
+	fn = (char *) a->argv[3];
+	pbx_substitute_variables_helper(c, fn, workspace, sizeof(workspace));
+	substituted = ast_strdupa(workspace);
+	workspace[0] = '\0';
+	ret = ast_func_read(c, substituted, workspace, sizeof(workspace));
+
+	c = ast_channel_unref(c);
+
+	ast_cli(a->fd, "Return Value: %s (%d)\n", ret ? "Failure" : "Success", ret);
+	ast_cli(a->fd, "Result: %s\n", workspace);
+
+	return CLI_SUCCESS;
+}
+
 static char *handle_set_global(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
 	switch (cmd) {
@@ -1218,6 +1267,7 @@
 static struct ast_cli_entry vars_cli[] = {
 	AST_CLI_DEFINE(handle_show_globals, "Show global dialplan variables"),
 	AST_CLI_DEFINE(handle_show_chanvar, "Show channel variables"),
+	AST_CLI_DEFINE(handle_eval_function, "Evaluate dialplan function"),
 	AST_CLI_DEFINE(handle_set_global, "Set global dialplan variable"),
 	AST_CLI_DEFINE(handle_set_chanvar, "Set a channel variable"),
 };
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/main/time.c asterisk-18.12.0~dfsg+~cs6.12.40431413/main/time.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/main/time.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/main/time.c	2022-05-12 11:50:59.000000000 +0000
@@ -25,6 +25,7 @@
 
 #include <inttypes.h>
 #include <string.h>
+#include <strings.h>
 #include <time.h>
 
 #include "asterisk/time.h"
@@ -143,3 +144,31 @@
 {
 	return ast_time_create_by_unit(val, ast_time_str_to_unit(unit));
 }
+
+/*!
+ * \brief Returns a string representation of a time_t as decimal seconds
+ * since the epoch.
+ */
+int ast_time_t_to_string(time_t time, char *buf, size_t length)
+{
+	struct tm tm;
+
+	localtime_r(&time, &tm);
+	return (strftime(buf, length, "%s", &tm) == 0) ? -1 : 0;
+}
+
+/*!
+ * \brief Returns a time_t from a string containing seconds since the epoch.
+ */
+time_t ast_string_to_time_t(const char *str)
+{
+	struct tm tm = { 0, };
+
+	/* handle leading spaces */
+	if (strptime(str, " %s", &tm) == NULL) {
+		return (time_t)-1;
+	}
+	tm.tm_isdst = -1;
+	return mktime(&tm);
+}
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/menuselect/configure asterisk-18.12.0~dfsg+~cs6.12.40431413/menuselect/configure
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/menuselect/configure	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/menuselect/configure	2022-05-12 11:50:59.000000000 +0000
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.
+# Generated by GNU Autoconf 2.71.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -16,14 +17,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -33,46 +36,46 @@
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -81,13 +84,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -96,8 +92,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -109,30 +109,10 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -154,20 +134,22 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else
+else \$as_nop
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -187,42 +169,53 @@
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
 
-else
+else \$as_nop
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
+  if (eval "$as_required") 2>/dev/null
+then :
   as_have_required=yes
-else
+else $as_nop
   as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
 
-else
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
+	     as_shell=$as_dir$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
   break 2
 fi
 fi
@@ -230,14 +223,21 @@
        esac
   as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
 
 
-      if test "x$CONFIG_SHELL" != x; then :
+      if test "x$CONFIG_SHELL" != x
+then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -255,18 +255,19 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno
+then :
+  printf "%s\n" "$0: This script requires a shell more modern than all"
+  printf "%s\n" "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -293,6 +294,7 @@
 }
 as_unset=as_fn_unset
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -310,6 +312,14 @@
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -324,7 +334,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -333,7 +343,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -372,12 +382,13 @@
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -389,18 +400,27 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
@@ -412,9 +432,9 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -441,7 +461,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -485,7 +505,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -499,6 +519,10 @@
   exit
 }
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -512,6 +536,13 @@
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -577,51 +608,47 @@
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
+PACKAGE_NAME=''
+PACKAGE_TARNAME=''
+PACKAGE_VERSION=''
+PACKAGE_STRING=''
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
 
 ac_unique_file="menuselect"
 ac_unique_file="menuselect.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
 #endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
 #endif
 #ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
+ac_header_c_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 GTK2_LIB
@@ -629,11 +656,10 @@
 PBX_GTK2
 GTK2_LIBS
 GTK2_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
 CONFIG_LIBXML2
 SED
+LIBXML2_LIBS
+LIBXML2_CFLAGS
 HAVE_NCURSES_SUBDIR
 PBX_TINFO
 TINFO_DIR
@@ -656,10 +682,10 @@
 NEWT_INCLUDE
 NEWT_LIB
 ALLOCA
-EGREP
-GREP
-CPP
 MENUSELECT_DEBUG
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
 GNU_MAKE
 OBJEXT
 EXEEXT
@@ -734,10 +760,11 @@
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
+LIBXML2_CFLAGS
+LIBXML2_LIBS
 GTK2_CFLAGS
 GTK2_LIBS'
 
@@ -808,8 +835,6 @@
   *)    ac_optarg=yes ;;
   esac
 
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -850,9 +875,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -876,9 +901,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1089,9 +1114,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1105,9 +1130,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1151,9 +1176,9 @@
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1169,7 +1194,7 @@
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1233,7 +1258,7 @@
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1381,12 +1406,15 @@
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
+  LIBXML2_CFLAGS
+              C compiler flags for LIBXML2, overriding pkg-config
+  LIBXML2_LIBS
+              linker flags for LIBXML2, overriding pkg-config
   GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config
   GTK2_LIBS   linker flags for GTK2, overriding pkg-config
 
@@ -1409,9 +1437,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1439,7 +1467,8 @@
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1447,7 +1476,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1457,9 +1486,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.69
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
@@ -1478,14 +1507,14 @@
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1493,14 +1522,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1517,17 +1547,18 @@
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof ($2))
 	 return 0;
@@ -1535,12 +1566,13 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof (($2)))
 	    return 0;
@@ -1548,101 +1580,23 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   eval "$3=yes"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
 
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -1650,26 +1604,28 @@
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -1680,14 +1636,14 @@
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1695,17 +1651,18 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1720,17 +1677,61 @@
 
 } # ac_fn_c_try_link
 
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
+# executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+then :
+  ac_retval=0
+else $as_nop
+  printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+       printf "%s\n" "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
@@ -1738,16 +1739,9 @@
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+   which can conflict with char $2 (); below.  */
 
+#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -1765,122 +1759,56 @@
 #endif
 
 int
-main ()
+main (void)
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
+    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
 esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_c_check_header_mongrel
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
-  $ $0 $@
+  $ $0$ac_configure_args_raw
 
 _ACEOF
 exec 5>>config.log
@@ -1913,8 +1841,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf "%s\n" "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -1949,7 +1881,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -1984,11 +1916,13 @@
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    $as_echo "## ---------------- ##
+    printf "%s\n" "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -1999,8 +1933,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2024,7 +1958,7 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    printf "%s\n" "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -2032,14 +1966,14 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      printf "%s\n" "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      printf "%s\n" "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -2047,15 +1981,15 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      printf "%s\n" "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -2063,8 +1997,8 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      printf "%s\n" "$as_me: caught signal $ac_signal"
+    printf "%s\n" "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2078,63 +2012,48 @@
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_files="$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+  case $ac_site_file in #(
+  */*) :
+     ;; #(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
@@ -2144,63 +2063,478 @@
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+   Do not test the value of __STDC__, because some compilers set it to 0
+   while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
+
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not \xHH hex character constants.
+   These do not provoke an error unfortunately, instead are silently treated
+   as an "x".  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
+   array size at least.  It is necessary to write \x00 == 0 to get something
+   that is true only with -std.  */
+int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) '\''x'\''
+int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+               int, int);'
+
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
+'
+
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+  #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str = "";
+  int number = 0;
+  float fnumber = 0;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case '\''s'\'': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case '\''d'\'': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case '\''f'\'': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+
+  return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+  // Check bool.
+  _Bool success = false;
+  success |= (argc != 0);
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[0] = argv[0][0];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
+	 || dynamic_array[ni.number - 1] != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+  int_alignment = _Alignof (int),
+  int_array_alignment = _Alignof (int[100]),
+  char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+  int x;
+  _Static_assert (sizeof (int) <= sizeof (long int),
+                  "_Static_assert does not work in struct");
+  long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal[] = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+  union {
+    struct { int i; int j; };
+    struct { int k; long int l; } w;
+  };
+  int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+  _Static_assert ((offsetof (struct anonymous, i)
+		   == offsetof (struct anonymous, w.k)),
+		  "Anonymous union alignment botch");
+  v1.i = 2;
+  v1.w.k = 5;
+  ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  ${ac_c_conftest_c11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+
+# Auxiliary files required by this configure script.
+ac_aux_files="config.guess config.sub"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  ac_aux_dir_found=yes
+  ac_install_sh=
+  for ac_aux in $ac_aux_files
+  do
+    # As a special case, if "install-sh" is required, that requirement
+    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+    # and $ac_install_sh is set appropriately for whichever one is found.
+    if test x"$ac_aux" = x"install-sh"
+    then
+      if test -f "${as_dir}install-sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        ac_install_sh="${as_dir}install-sh -c"
+      elif test -f "${as_dir}install.sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        ac_install_sh="${as_dir}install.sh -c"
+      elif test -f "${as_dir}shtool"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        ac_install_sh="${as_dir}shtool install -c"
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+        else
+          break
+        fi
+      fi
+    else
+      if test -f "${as_dir}${ac_aux}"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+        else
+          break
+        fi
+      fi
+    fi
+  done
+  if test "$ac_aux_dir_found" = yes; then
+    ac_aux_dir="$as_dir"
+    break
+  fi
+  ac_first_candidate=false
+
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+  ac_configure="$SHELL ${ac_aux_dir}configure"
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
       *) as_fn_append ac_configure_args " '$ac_arg'" ;;
@@ -2208,11 +2542,12 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+	    and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2235,55 +2570,30 @@
 
 
 
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
 
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  # Make sure we can run config.sub.
+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -2302,21 +2612,22 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -2359,6 +2670,15 @@
 
 
 # Checks for programs.
+
+
+
+
+
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2367,11 +2687,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2379,11 +2700,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2394,11 +2719,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2407,11 +2732,12 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -2419,11 +2745,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2434,11 +2764,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2446,8 +2776,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2460,11 +2790,12 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2472,11 +2803,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2487,11 +2822,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2500,11 +2835,12 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2513,15 +2849,19 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2537,18 +2877,18 @@
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2559,11 +2899,12 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2571,11 +2912,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2586,11 +2931,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2603,11 +2948,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -2615,11 +2961,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2630,11 +2980,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2646,34 +2996,138 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
   fi
+else
+  CC="$ac_cv_prog_CC"
 fi
 
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
+for ac_option in --version -v -V -qversion -version; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2683,7 +3137,7 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -2691,7 +3145,7 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -2703,9 +3157,9 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -2726,11 +3180,12 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -2747,7 +3202,7 @@
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -2763,44 +3218,46 @@
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else
+else $as_nop
   ac_file=''
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2814,15 +3271,15 @@
     * ) break;;
   esac
 done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -2831,7 +3288,7 @@
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
@@ -2843,8 +3300,8 @@
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -2852,10 +3309,10 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -2863,39 +3320,40 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -2909,11 +3367,12 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -2922,31 +3381,32 @@
        break;;
   esac
 done
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -2956,29 +3416,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+set}
+ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -2987,57 +3451,60 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
-else
+else $as_nop
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -3052,94 +3519,144 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c89_program
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
+  if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
+fi
 fi
 
 ac_ext=c
@@ -3148,11 +3665,12 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
-$as_echo_n "checking for GNU make... " >&6; }
-if ${ac_cv_GNU_MAKE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
+printf %s "checking for GNU make... " >&6; }
+if test ${ac_cv_GNU_MAKE+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_GNU_MAKE='Not Found' ;
    ac_cv_GNU_MAKE_VERSION_MAJOR=0 ;
    ac_cv_GNU_MAKE_VERSION_MINOR=0 ;
@@ -3167,8 +3685,8 @@
    done ;
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_GNU_MAKE" >&5
-$as_echo "$ac_cv_GNU_MAKE" >&6; } ;
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_GNU_MAKE" >&5
+printf "%s\n" "$ac_cv_GNU_MAKE" >&6; } ;
 if test  "x$ac_cv_GNU_MAKE" = "xNot Found"  ; then
    as_fn_error $? "*** Please install GNU make.  It is required to build Asterisk!" "$LINENO" 5
    exit 1
@@ -3178,444 +3696,207 @@
 
 
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug; case "${enableval}" in
-		y|ye|yes) MENUSELECT_DEBUG=yes ;;
-		n|no)  MENUSELECT_DEBUG=no ;;
-		*) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5  ;;
-    esac
-fi
-
-
 
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
 
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
 
-    done
-    ac_cv_prog_CPP=$CPP
 
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
 do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-else
-  # Broken: fails on valid input.
-continue
+  ;;
+esac
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
 else
-  # Passes both tests.
-ac_preproc_ok=:
-break
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
 
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
 fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
   done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
 
+  ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
 else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
 
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
   fi
 else
-  ac_cv_path_EGREP=$EGREP
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
 
-   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+	else
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+		PKG_CONFIG=""
+	fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
 
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+# Check whether --enable-debug was given.
+if test ${enable_debug+y}
+then :
+  enableval=$enable_debug; case "${enableval}" in
+		y|ye|yes) MENUSELECT_DEBUG=yes ;;
+		n|no)  MENUSELECT_DEBUG=no ;;
+		*) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5  ;;
+    esac
 fi
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
 
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
 
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+    fi
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
+  fi
+done
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
 
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
 
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
-fi
 
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
-fi
 
-done
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
 
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
 
+fi
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = xyes
+then :
 
-else
+else $as_nop
 
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
+printf "%s\n" "#define size_t unsigned int" >>confdefs.h
 
 fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+printf %s "checking for working alloca.h... " >&6; }
+if test ${ac_cv_working_alloca_h+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
-main ()
+main (void)
 {
 char *p = (char *) alloca (2 * sizeof (int));
 			  if (p) return 0;
@@ -3623,52 +3904,52 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_working_alloca_h=yes
-else
+else $as_nop
   ac_cv_working_alloca_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+printf "%s\n" "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
-  $as_echo_n "(cached) " >&6
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+printf %s "checking for alloca... " >&6; }
+if test ${ac_cv_func_alloca_works+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test $ac_cv_working_alloca_h = yes; then
+  ac_cv_func_alloca_works=yes
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
+#include <stdlib.h>
+#include <stddef.h>
+#ifndef alloca
+# ifdef __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
 # else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
-#    endif
-#   endif
+#  ifdef  __cplusplus
+extern "C"
 #  endif
+void *alloca (size_t);
 # endif
 #endif
 
 int
-main ()
+main (void)
 {
 char *p = (char *) alloca (1);
 				    if (p) return 0;
@@ -3676,20 +3957,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_func_alloca_works=yes
-else
+else $as_nop
   ac_cv_func_alloca_works=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
+fi
 
 if test $ac_cv_func_alloca_works = yes; then
 
-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -3699,58 +3982,19 @@
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-$as_echo "#define C_ALLOCA 1" >>confdefs.h
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then :
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
+printf "%s\n" "#define C_ALLOCA 1" >>confdefs.h
 
-    break
-fi
 
-  done
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+printf %s "checking stack direction for C alloca... " >&6; }
+if test ${ac_cv_c_stack_direction+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test "$cross_compiling" = yes
+then :
   ac_cv_c_stack_direction=0
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
@@ -3771,36 +4015,78 @@
   return find_stack_direction (0, argc + !argv + 20) < 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_c_stack_direction=1
-else
+else $as_nop
   ac_cv_c_stack_direction=-1
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+printf "%s\n" "$ac_cv_c_stack_direction" >&6; }
+printf "%s\n" "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
+
+
+fi
+
+ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf"
+if test "x$ac_cv_func_asprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_ASPRINTF 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
+if test "x$ac_cv_func_getloadavg" = xyes
+then :
+  printf "%s\n" "#define HAVE_GETLOADAVG 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv"
+if test "x$ac_cv_func_setenv" = xyes
+then :
+  printf "%s\n" "#define HAVE_SETENV 1" >>confdefs.h
+
 fi
+ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr"
+if test "x$ac_cv_func_strcasestr" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRCASESTR 1" >>confdefs.h
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
+ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup"
+if test "x$ac_cv_func_strndup" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRNDUP 1" >>confdefs.h
 
+fi
+ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
+if test "x$ac_cv_func_strnlen" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h
 
 fi
+ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep"
+if test "x$ac_cv_func_strsep" = xyes
+then :
+  printf "%s\n" "#define HAVE_STRSEP 1" >>confdefs.h
 
-for ac_func in asprintf getloadavg setenv strcasestr strndup strnlen strsep unsetenv vasprintf
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+fi
+ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv"
+if test "x$ac_cv_func_unsetenv" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h
+
+fi
+ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
+if test "x$ac_cv_func_vasprintf" = xyes
+then :
+  printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h
 
 fi
-done
 
 
 # The frontend can use curses, ncurses, newt or GTK2 so check for all of them
@@ -3811,7 +4097,8 @@
     PBX_NEWT=0
 
 # Check whether --with-newt was given.
-if test "${with_newt+set}" = set; then :
+if test ${with_newt+y}
+then :
   withval=$with_newt;
 	case ${withval} in
 	n|no)
@@ -3843,7 +4130,8 @@
     PBX_CURSES=0
 
 # Check whether --with-curses was given.
-if test "${with_curses+set}" = set; then :
+if test ${with_curses+y}
+then :
   withval=$with_curses;
 	case ${withval} in
 	n|no)
@@ -3875,7 +4163,8 @@
     PBX_NCURSES=0
 
 # Check whether --with-ncurses was given.
-if test "${with_ncurses+set}" = set; then :
+if test ${with_ncurses+y}
+then :
   withval=$with_ncurses;
 	case ${withval} in
 	n|no)
@@ -3907,7 +4196,8 @@
     PBX_LIBXML2=0
 
 # Check whether --with-libxml2 was given.
-if test "${with_libxml2+set}" = set; then :
+if test ${with_libxml2+y}
+then :
   withval=$with_libxml2;
 	case ${withval} in
 	n|no)
@@ -3939,7 +4229,8 @@
     PBX_TINFO=0
 
 # Check whether --with-libtinfo was given.
-if test "${with_libtinfo+set}" = set; then :
+if test ${with_libtinfo+y}
+then :
   withval=$with_libtinfo;
 	case ${withval} in
 	n|no)
@@ -3980,11 +4271,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for newtBell in -lnewt" >&5
-$as_echo_n "checking for newtBell in -lnewt... " >&6; }
-if ${ac_cv_lib_newt_newtBell+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for newtBell in -lnewt" >&5
+printf %s "checking for newtBell in -lnewt... " >&6; }
+if test ${ac_cv_lib_newt_newtBell+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnewt ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3993,32 +4285,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char newtBell ();
 int
-main ()
+main (void)
 {
 return newtBell ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_newt_newtBell=yes
-else
+else $as_nop
   ac_cv_lib_newt_newtBell=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_newt_newtBell" >&5
-$as_echo "$ac_cv_lib_newt_newtBell" >&6; }
-if test "x$ac_cv_lib_newt_newtBell" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_newt_newtBell" >&5
+printf "%s\n" "$ac_cv_lib_newt_newtBell" >&6; }
+if test "x$ac_cv_lib_newt_newtBell" = xyes
+then :
   AST_NEWT_FOUND=yes
-else
+else $as_nop
   AST_NEWT_FOUND=no
 fi
 
@@ -4037,14 +4328,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${NEWT_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "newt.h" "ac_cv_header_newt_h" "$ac_includes_default"
-if test "x$ac_cv_header_newt_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "newt.h" "ac_cv_header_newt_h" "$ac_includes_default"
+if test "x$ac_cv_header_newt_h" = xyes
+then :
   NEWT_HEADER_FOUND=1
-else
+else $as_nop
   NEWT_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${NEWT_HEADER_FOUND}" = "x0" ; then
@@ -4076,11 +4367,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
-$as_echo_n "checking for initscr in -lncurses... " >&6; }
-if ${ac_cv_lib_ncurses_initscr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
+printf %s "checking for initscr in -lncurses... " >&6; }
+if test ${ac_cv_lib_ncurses_initscr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4089,32 +4381,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char initscr ();
 int
-main ()
+main (void)
 {
 return initscr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ncurses_initscr=yes
-else
+else $as_nop
   ac_cv_lib_ncurses_initscr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
-$as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
-if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
+printf "%s\n" "$ac_cv_lib_ncurses_initscr" >&6; }
+if test "x$ac_cv_lib_ncurses_initscr" = xyes
+then :
   AST_NCURSES_FOUND=yes
-else
+else $as_nop
   AST_NCURSES_FOUND=no
 fi
 
@@ -4133,14 +4424,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${NCURSES_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
+if test "x$ac_cv_header_ncurses_h" = xyes
+then :
   NCURSES_HEADER_FOUND=1
-else
+else $as_nop
   NCURSES_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then
@@ -4174,11 +4465,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
-$as_echo_n "checking for initscr in -lncurses... " >&6; }
-if ${ac_cv_lib_ncurses_initscr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
+printf %s "checking for initscr in -lncurses... " >&6; }
+if test ${ac_cv_lib_ncurses_initscr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4187,32 +4479,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char initscr ();
 int
-main ()
+main (void)
 {
 return initscr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ncurses_initscr=yes
-else
+else $as_nop
   ac_cv_lib_ncurses_initscr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
-$as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
-if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
+printf "%s\n" "$ac_cv_lib_ncurses_initscr" >&6; }
+if test "x$ac_cv_lib_ncurses_initscr" = xyes
+then :
   AST_NCURSES_FOUND=yes
-else
+else $as_nop
   AST_NCURSES_FOUND=no
 fi
 
@@ -4231,14 +4522,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${NCURSES_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "ncurses/ncurses.h" "ac_cv_header_ncurses_ncurses_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_ncurses_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "ncurses/ncurses.h" "ac_cv_header_ncurses_ncurses_h" "$ac_includes_default"
+if test "x$ac_cv_header_ncurses_ncurses_h" = xyes
+then :
   NCURSES_HEADER_FOUND=1
-else
+else $as_nop
   NCURSES_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then
@@ -4271,11 +4562,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
-$as_echo_n "checking for initscr in -lcurses... " >&6; }
-if ${ac_cv_lib_curses_initscr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
+printf %s "checking for initscr in -lcurses... " >&6; }
+if test ${ac_cv_lib_curses_initscr+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4284,32 +4576,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char initscr ();
 int
-main ()
+main (void)
 {
 return initscr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_curses_initscr=yes
-else
+else $as_nop
   ac_cv_lib_curses_initscr=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5
-$as_echo "$ac_cv_lib_curses_initscr" >&6; }
-if test "x$ac_cv_lib_curses_initscr" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5
+printf "%s\n" "$ac_cv_lib_curses_initscr" >&6; }
+if test "x$ac_cv_lib_curses_initscr" = xyes
+then :
   AST_CURSES_FOUND=yes
-else
+else $as_nop
   AST_CURSES_FOUND=no
 fi
 
@@ -4328,14 +4619,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${CURSES_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
-if test "x$ac_cv_header_curses_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
+if test "x$ac_cv_header_curses_h" = xyes
+then :
   CURSES_HEADER_FOUND=1
-else
+else $as_nop
   CURSES_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${CURSES_HEADER_FOUND}" = "x0" ; then
@@ -4375,11 +4666,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keypad in -ltinfo" >&5
-$as_echo_n "checking for keypad in -ltinfo... " >&6; }
-if ${ac_cv_lib_tinfo_keypad+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for keypad in -ltinfo" >&5
+printf %s "checking for keypad in -ltinfo... " >&6; }
+if test ${ac_cv_lib_tinfo_keypad+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltinfo ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4388,32 +4680,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char keypad ();
 int
-main ()
+main (void)
 {
 return keypad ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_tinfo_keypad=yes
-else
+else $as_nop
   ac_cv_lib_tinfo_keypad=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_keypad" >&5
-$as_echo "$ac_cv_lib_tinfo_keypad" >&6; }
-if test "x$ac_cv_lib_tinfo_keypad" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_keypad" >&5
+printf "%s\n" "$ac_cv_lib_tinfo_keypad" >&6; }
+if test "x$ac_cv_lib_tinfo_keypad" = xyes
+then :
   AST_TINFO_FOUND=yes
-else
+else $as_nop
   AST_TINFO_FOUND=no
 fi
 
@@ -4432,14 +4723,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${TINFO_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "ncurses/ncurses.h" "ac_cv_header_ncurses_ncurses_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_ncurses_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "ncurses/ncurses.h" "ac_cv_header_ncurses_ncurses_h" "$ac_includes_default"
+if test "x$ac_cv_header_ncurses_ncurses_h" = xyes
+then :
   TINFO_HEADER_FOUND=1
-else
+else $as_nop
   TINFO_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${TINFO_HEADER_FOUND}" = "x0" ; then
@@ -4472,11 +4763,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keypad in -ltinfo" >&5
-$as_echo_n "checking for keypad in -ltinfo... " >&6; }
-if ${ac_cv_lib_tinfo_keypad+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for keypad in -ltinfo" >&5
+printf %s "checking for keypad in -ltinfo... " >&6; }
+if test ${ac_cv_lib_tinfo_keypad+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltinfo ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4485,32 +4777,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char keypad ();
 int
-main ()
+main (void)
 {
 return keypad ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_tinfo_keypad=yes
-else
+else $as_nop
   ac_cv_lib_tinfo_keypad=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_keypad" >&5
-$as_echo "$ac_cv_lib_tinfo_keypad" >&6; }
-if test "x$ac_cv_lib_tinfo_keypad" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_keypad" >&5
+printf "%s\n" "$ac_cv_lib_tinfo_keypad" >&6; }
+if test "x$ac_cv_lib_tinfo_keypad" = xyes
+then :
   AST_TINFO_FOUND=yes
-else
+else $as_nop
   AST_TINFO_FOUND=no
 fi
 
@@ -4529,14 +4820,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${TINFO_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
+if test "x$ac_cv_header_ncurses_h" = xyes
+then :
   TINFO_HEADER_FOUND=1
-else
+else $as_nop
   TINFO_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${TINFO_HEADER_FOUND}" = "x0" ; then
@@ -4570,11 +4861,12 @@
 
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
       CFLAGS="${CFLAGS} "
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keypad in -ltinfo" >&5
-$as_echo_n "checking for keypad in -ltinfo... " >&6; }
-if ${ac_cv_lib_tinfo_keypad+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for keypad in -ltinfo" >&5
+printf %s "checking for keypad in -ltinfo... " >&6; }
+if test ${ac_cv_lib_tinfo_keypad+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltinfo ${pbxlibdir}  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4583,32 +4875,31 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char keypad ();
 int
-main ()
+main (void)
 {
 return keypad ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_tinfo_keypad=yes
-else
+else $as_nop
   ac_cv_lib_tinfo_keypad=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_keypad" >&5
-$as_echo "$ac_cv_lib_tinfo_keypad" >&6; }
-if test "x$ac_cv_lib_tinfo_keypad" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_keypad" >&5
+printf "%s\n" "$ac_cv_lib_tinfo_keypad" >&6; }
+if test "x$ac_cv_lib_tinfo_keypad" = xyes
+then :
   AST_TINFO_FOUND=yes
-else
+else $as_nop
   AST_TINFO_FOUND=no
 fi
 
@@ -4627,14 +4918,14 @@
          # check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${TINFO_INCLUDE}"
-         ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
-if test "x$ac_cv_header_curses_h" = xyes; then :
+         ac_fn_c_check_header_compile "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
+if test "x$ac_cv_header_curses_h" = xyes
+then :
   TINFO_HEADER_FOUND=1
-else
+else $as_nop
   TINFO_HEADER_FOUND=0
 fi
 
-
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
 
       if test "x${TINFO_HEADER_FOUND}" = "x0" ; then
@@ -4654,11 +4945,100 @@
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
+
+   if test "x${PBX_LIBXML2}" != "x1" -a "${USE_LIBXML2}" != "no"; then
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0" >&5
+printf %s "checking for libxml-2.0... " >&6; }
+
+if test -n "$LIBXML2_CFLAGS"; then
+    pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBXML2_LIBS"; then
+    pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1`
+        else
+	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBXML2_PKG_ERRORS" >&5
+
+
+            PBX_LIBXML2=0
+
+
+elif test $pkg_failed = untried; then
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+            PBX_LIBXML2=0
+
+
 else
+	LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
+	LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+            PBX_LIBXML2=1
+            LIBXML2_INCLUDE=$(echo ${LIBXML2_CFLAGS} | $SED -e "s|-std=c99||g")
+            LIBXML2_LIB="$LIBXML2_LIBS"
+
+printf "%s\n" "#define HAVE_LIBXML2 1" >>confdefs.h
+
+
+fi
+   fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
@@ -4672,10 +5052,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in sed gsed
+   do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
@@ -4684,13 +5069,13 @@
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
   ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
+  printf %s 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
+    printf "%s\n" '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4718,8 +5103,8 @@
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf "%s\n" "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -4729,11 +5114,12 @@
 		if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}xml2-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}xml2-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CONFIG_LIBXML2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CONFIG_LIBXML2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $CONFIG_LIBXML2 in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_CONFIG_LIBXML2="$CONFIG_LIBXML2" # Let the user override the test with a path.
@@ -4744,11 +5130,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CONFIG_LIBXML2="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_CONFIG_LIBXML2="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4760,11 +5150,11 @@
 fi
 CONFIG_LIBXML2=$ac_cv_path_CONFIG_LIBXML2
 if test -n "$CONFIG_LIBXML2"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_LIBXML2" >&5
-$as_echo "$CONFIG_LIBXML2" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CONFIG_LIBXML2" >&5
+printf "%s\n" "$CONFIG_LIBXML2" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4773,11 +5163,12 @@
   ac_pt_CONFIG_LIBXML2=$CONFIG_LIBXML2
   # Extract the first word of "xml2-config", so it can be a program name with args.
 set dummy xml2-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_CONFIG_LIBXML2+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_CONFIG_LIBXML2+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_CONFIG_LIBXML2 in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_CONFIG_LIBXML2="$ac_pt_CONFIG_LIBXML2" # Let the user override the test with a path.
@@ -4788,11 +5179,15 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_CONFIG_LIBXML2="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_CONFIG_LIBXML2="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4804,11 +5199,11 @@
 fi
 ac_pt_CONFIG_LIBXML2=$ac_cv_path_ac_pt_CONFIG_LIBXML2
 if test -n "$ac_pt_CONFIG_LIBXML2"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_LIBXML2" >&5
-$as_echo "$ac_pt_CONFIG_LIBXML2" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_LIBXML2" >&5
+printf "%s\n" "$ac_pt_CONFIG_LIBXML2" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_CONFIG_LIBXML2" = x; then
@@ -4816,8 +5211,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CONFIG_LIBXML2=$ac_pt_CONFIG_LIBXML2
@@ -4845,19 +5240,20 @@
   #include <libxml/tree.h>
         #include <libxml/parser.h>
 int
-main ()
+main (void)
 {
  LIBXML_TEST_VERSION;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
    PBX_LIBXML2=1
-$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBXML2 1" >>confdefs.h
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 				CPPFLAGS="${saved_cppflags}"
 				LIBS="${saved_libs}"
@@ -4871,140 +5267,20 @@
 fi
 
 
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
-
    if test "x${PBX_GTK2}" != "x1" -a "${USE_GTK2}" != "no"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5
-$as_echo_n "checking for GTK2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5
+printf %s "checking for gtk+-2.0... " >&6; }
 
 if test -n "$GTK2_CFLAGS"; then
     pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -5018,10 +5294,10 @@
     pkg_cv_GTK2_LIBS="$GTK2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -5035,8 +5311,8 @@
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -5056,8 +5332,8 @@
 
 
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
             PBX_GTK2=0
 
@@ -5065,14 +5341,14 @@
 else
 	GTK2_CFLAGS=$pkg_cv_GTK2_CFLAGS
 	GTK2_LIBS=$pkg_cv_GTK2_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
             PBX_GTK2=1
             GTK2_INCLUDE=$(echo ${GTK2_CFLAGS} | $SED -e "s|-std=c99||g")
             GTK2_LIB="$GTK2_LIBS"
 
-$as_echo "#define HAVE_GTK2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GTK2 1" >>confdefs.h
 
 
 fi
@@ -5113,8 +5389,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -5144,15 +5420,15 @@
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
      t end
      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -5166,8 +5442,8 @@
       fi
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -5184,7 +5460,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -5200,8 +5476,8 @@
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -5224,14 +5500,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -5241,46 +5519,46 @@
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -5289,13 +5567,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -5304,8 +5575,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -5317,30 +5592,10 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -5353,13 +5608,14 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -5386,18 +5642,20 @@
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
+
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -5409,12 +5667,13 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -5445,7 +5704,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -5467,6 +5726,10 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -5480,6 +5743,12 @@
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -5521,7 +5790,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -5530,7 +5799,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -5593,7 +5862,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -5651,14 +5920,16 @@
 Report bugs to the package provider."
 
 _ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.69,
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -5695,15 +5966,15 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    printf "%s\n" "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
+    printf "%s\n" "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -5711,7 +5982,7 @@
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -5720,7 +5991,7 @@
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    printf "%s\n" "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -5748,7 +6019,7 @@
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -5762,7 +6033,7 @@
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  printf "%s\n" "$ac_log"
 } >&5
 
 _ACEOF
@@ -5788,8 +6059,8 @@
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -6125,7 +6396,7 @@
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -6133,17 +6404,17 @@
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
+       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -6160,7 +6431,7 @@
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6184,9 +6455,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -6239,8 +6510,8 @@
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -6282,9 +6553,9 @@
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -6300,20 +6571,20 @@
   #
   if test x"$ac_file" != x-; then
     {
-      $as_echo "/* $configure_input  */" \
+      printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    $as_echo "/* $configure_input  */" \
+    printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -6354,10 +6625,11 @@
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Menuselect build configuration successfully completed" >&5
-$as_echo "$as_me: Menuselect build configuration successfully completed" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Menuselect build configuration successfully completed" >&5
+printf "%s\n" "$as_me: Menuselect build configuration successfully completed" >&6;}
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/menuselect/configure.ac asterisk-18.12.0~dfsg+~cs6.12.40431413/menuselect/configure.ac
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/menuselect/configure.ac	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/menuselect/configure.ac	2022-05-12 11:50:59.000000000 +0000
@@ -45,6 +45,7 @@
 AC_PROG_CC
 AST_CHECK_GNU_MAKE
 
+PKG_PROG_PKG_CONFIG
 
 AC_LANG(C)
 AC_ARG_ENABLE([debug],
@@ -90,6 +91,7 @@
   AST_EXT_LIB_CHECK([TINFO], [tinfo], [keypad], [curses.h])
 fi
 
+AST_PKG_CONFIG_CHECK([LIBXML2], [libxml-2.0])
 AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , ,
         [#include <libxml/tree.h>
         #include <libxml/parser.h>],
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/menuselect/menuselect.c asterisk-18.12.0~dfsg+~cs6.12.40431413/menuselect/menuselect.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/menuselect/menuselect.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/menuselect/menuselect.c	2022-05-12 11:50:59.000000000 +0000
@@ -1130,8 +1130,7 @@
 	return res;
 }
 
-/*! \brief Given the string representation of a member and category, mark it as present in a given input file */
-static void mark_as_present(const char *member, const char *category)
+static void mark_as_present_helper(const char *member, const char *category, int present)
 {
 	struct category *cat;
 	struct member *mem;
@@ -1142,31 +1141,44 @@
 		negate = 1;
 	}
 
-	print_debug("Marking %s of %s as present\n", member, category);
+	print_debug("Marking %s of %s as %s\n", member, category, present ? "present" : "not present");
 
 	AST_LIST_TRAVERSE(&categories, cat, list) {
-		if (strcmp(category, cat->name))
+		if (strcmp(category, cat->name)) {
 			continue;
+		}
 		AST_LIST_TRAVERSE(&cat->members, mem, list) {
 			if (mem->is_separator) {
 				continue;
 			}
 
 			if (!strcmp(member, mem->name)) {
-				mem->was_enabled = mem->enabled = (negate ? !cat->positive_output : cat->positive_output);
+				if (present) {
+					mem->was_enabled = mem->enabled = (negate ? !cat->positive_output : cat->positive_output);
+				} else {
+					mem->was_enabled = mem->enabled = 0;
+				}
 				print_debug("Just set %s enabled to %d\n", mem->name, mem->enabled);
 				break;
 			}
 		}
-		if (!mem)
+		if (!mem) {
 			fprintf(stderr, "member '%s' in category '%s' not found, ignoring.\n", member, category);
+		}
 		break;
 	}
 
-	if (!cat)
+	if (!cat) {
 		fprintf(stderr, "category '%s' not found! Can't mark '%s' as disabled.\n", category, member);
+	}
 }
 
+/*! \brief Given the string representation of a member and category, mark it as present in a given input file */
+#define mark_as_present(member, category) mark_as_present_helper(member, category, 1)
+
+/*! \brief Given the string representation of a member and category, mark it as not present in a given input file */
+#define mark_as_not_present(member, category) mark_as_present_helper(member, category, 0)
+
 unsigned int enable_member(struct member *mem)
 {
 	struct reference *dep;
@@ -1380,6 +1392,9 @@
 	}
 
 	while (fgets(buf, PARSE_BUF_SIZE, f)) {
+		struct category *cat;
+		struct member *mem;
+
 		lineno++;
 
 		if (strlen_zero(buf))
@@ -1414,11 +1429,44 @@
 			continue;
 		}
 
-		while ((member = strsep(&parse, " \n"))) {
-			member = skip_blanks(member);
-			if (strlen_zero(member))
+		AST_LIST_TRAVERSE(&categories, cat, list) {
+			if (strcmp(category, cat->name)) {
 				continue;
-			mark_as_present(member, category);
+			}
+			if (!cat->positive_output) {
+				print_debug("Category %s is NOT positive output\n", cat->name);
+				/* if NOT positive_output, then if listed in makeopts, it's disabled! */
+				/* this means that what's listed in menuselect.makeopts is a list of modules
+				 * that are NOT selected, so we can't use that to mark things as present.
+				 * In fact, we need to mark everything as present, UNLESS it's listed
+				* in menuselect.makeopts */
+				AST_LIST_TRAVERSE(&cat->members, mem, list) {
+					if (mem->is_separator) {
+						continue;
+					}
+					mem->was_enabled = 1;
+					print_debug("Just set %s enabled to %d\n", mem->name, mem->enabled);
+				}	
+				/* okay, now go ahead, and mark anything listed in makeopts as NOT present */
+				while ((member = strsep(&parse, " \n"))) {
+					member = skip_blanks(member);
+					if (strlen_zero(member)) {
+						continue;
+					}
+					mark_as_not_present(member, category);
+				}
+			} else {
+				print_debug("Category %s is positive output\n", cat->name);
+				/* if present, it was enabled (e.g. MENUSELECT_CFLAGS, MENUSELECT_UTILS, MENUSELECT_MOH, etc. */
+				while ((member = strsep(&parse, " \n"))) {
+					member = skip_blanks(member);
+					if (strlen_zero(member)) {
+						continue;
+					}
+					mark_as_present(member, category);
+				}
+			}
+			break;
 		}
 	}
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/README.md asterisk-18.12.0~dfsg+~cs6.12.40431413/README.md
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/README.md	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/README.md	2022-05-12 11:50:59.000000000 +0000
@@ -91,7 +91,10 @@
 2. Run `./configure`
 
   Execute the configure script to guess values for system-dependent
-variables used during compilation.
+variables used during compilation. If the script indicates that some required 
+components are missing, you can run `./contrib/scripts/install_prereq install`
+to install the necessary components. Note that this will install all dependencies for every functionality of Asterisk. After running the script, you will need
+to rerun `./configure`.
 
 3. Run `make menuselect` _\[optional]_
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/Makefile asterisk-18.12.0~dfsg+~cs6.12.40431413/res/Makefile
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/Makefile	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/Makefile	2022-05-12 11:50:59.000000000 +0000
@@ -69,6 +69,7 @@
 $(call MOD_ADD_C,res_ari_model,ari/ari_model_validators.c)
 $(call MOD_ADD_C,res_stasis_recording,stasis_recording/stored.c)
 $(call MOD_ADD_C,res_stir_shaken,$(wildcard res_stir_shaken/*.c))
+$(call MOD_ADD_C,res_aeap,$(wildcard res_aeap/*.c))
 
 res_parking.o: _ASTCFLAGS+=$(AST_NO_FORMAT_TRUNCATION)
 snmp/agent.o: _ASTCFLAGS+=-fPIC
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/aeap.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/aeap.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/aeap.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/aeap.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,501 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#include "asterisk.h"
+
+#include <pthread.h>
+
+#include "asterisk/astobj2.h"
+#include "asterisk/strings.h"
+
+#include "asterisk/res_aeap.h"
+#include "asterisk/res_aeap_message.h"
+
+#include "logger.h"
+#include "transaction.h"
+#include "transport.h"
+
+#define AEAP_RECV_SIZE 32768
+
+struct aeap_user_data {
+	/*! The user data object */
+	void *obj;
+	/*! A user data identifier */
+	char id[0];
+};
+
+AO2_STRING_FIELD_HASH_FN(aeap_user_data, id);
+AO2_STRING_FIELD_CMP_FN(aeap_user_data, id);
+
+#define USER_DATA_BUCKETS 11
+
+struct ast_aeap {
+	/*! This object's configuration parameters */
+	const struct ast_aeap_params *params;
+	/*! Container for registered user data objects */
+	struct ao2_container *user_data;
+	/*! Transactions container */
+	struct ao2_container *transactions;
+	/*! Transport layer communicator */
+	struct aeap_transport *transport;
+	/*! Id of thread that reads data from the transport */
+	pthread_t read_thread_id;
+};
+
+static int tsx_end(void *obj, void *arg, int flags)
+{
+	aeap_transaction_end(obj, -1);
+
+	return 0;
+}
+
+static void aeap_destructor(void *obj)
+{
+	struct ast_aeap *aeap = obj;
+
+	/* Disconnect things first, which keeps transactions from further executing */
+	ast_aeap_disconnect(aeap);
+
+	aeap_transport_destroy(aeap->transport);
+
+	/*
+	 * Each contained transaction holds a pointer back to this transactions container,
+	 * which is removed upon transaction end. Thus by explicitly ending each transaction
+	 * here we can ensure all references to the transactions container are removed.
+	 */
+	ao2_callback(aeap->transactions, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE,
+			tsx_end, NULL);
+	ao2_cleanup(aeap->transactions);
+
+	ao2_cleanup(aeap->user_data);
+}
+
+struct ast_aeap *ast_aeap_create(const char *transport_type,
+	const struct ast_aeap_params *params)
+{
+	struct ast_aeap *aeap;
+
+	aeap = ao2_alloc(sizeof(*aeap), aeap_destructor);
+	if (!aeap) {
+		ast_log(LOG_ERROR, "AEAP: unable to create");
+		return NULL;
+	}
+
+	aeap->params = params;
+	aeap->read_thread_id = AST_PTHREADT_NULL;
+
+	aeap->user_data = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, USER_DATA_BUCKETS,
+		aeap_user_data_hash_fn, NULL, aeap_user_data_cmp_fn);
+	if (!aeap->user_data) {
+		aeap_error(aeap, NULL, "unable to create user data container");
+		ao2_ref(aeap, -1);
+		return NULL;
+	}
+
+	aeap->transactions = aeap_transactions_create();
+	if (!aeap->transactions) {
+		aeap_error(aeap, NULL, "unable to create transactions container");
+		ao2_ref(aeap, -1);
+		return NULL;
+	}
+
+	aeap->transport = aeap_transport_create(transport_type);
+	if (!aeap->transport) {
+		aeap_error(aeap, NULL, "unable to create transport");
+		ao2_ref(aeap, -1);
+		return NULL;
+	}
+
+	return aeap;
+}
+
+static struct aeap_user_data *aeap_user_data_create(const char *id, void *obj,
+	ast_aeap_user_obj_cleanup cleanup)
+{
+	struct aeap_user_data *data;
+
+	ast_assert(id != NULL);
+
+	data = ao2_t_alloc_options(sizeof(*data) + strlen(id) + 1, cleanup,
+		AO2_ALLOC_OPT_LOCK_NOLOCK, "");
+	if (!data) {
+		if (cleanup) {
+			cleanup(obj);
+		}
+
+		return NULL;
+	}
+
+	strcpy(data->id, id); /* safe */
+	data->obj = obj;
+
+	return data;
+}
+
+int ast_aeap_user_data_register(struct ast_aeap *aeap, const char *id, void *obj,
+	ast_aeap_user_obj_cleanup cleanup)
+{
+	struct aeap_user_data *data;
+
+	data = aeap_user_data_create(id, obj, cleanup);
+	if (!data) {
+		return -1;
+	}
+
+	if (!ao2_link(aeap->user_data, data)) {
+		ao2_ref(data, -1);
+		return -1;
+	}
+
+	ao2_ref(data, -1);
+	return 0;
+}
+
+void ast_aeap_user_data_unregister(struct ast_aeap *aeap, const char *id)
+{
+	ao2_find(aeap->user_data, id, OBJ_SEARCH_KEY | OBJ_UNLINK | OBJ_NODATA);
+}
+
+void *ast_aeap_user_data_object_by_id(struct ast_aeap *aeap, const char *id)
+{
+	struct aeap_user_data *data;
+	void *obj;
+
+	data = ao2_find(aeap->user_data, id, OBJ_SEARCH_KEY);
+	if (!data) {
+		return NULL;
+	}
+
+	obj = data->obj;
+	ao2_ref(data, -1);
+
+	/*
+	 * Returned object's lifetime is based on how it was registered.
+	 * See public function docs for more info
+	 */
+	return obj;
+}
+
+static int raise_msg_handler(struct ast_aeap *aeap,	const struct ast_aeap_message_handler *handlers,
+	size_t size, struct ast_aeap_message *msg, void *data)
+{
+	ast_aeap_on_message on_message = NULL;
+	size_t i;
+
+	if (!aeap->params->emit_error) {
+		const char *error_msg = ast_aeap_message_error_msg(msg);
+
+		if (error_msg) {
+			aeap_error(aeap, NULL, "%s", error_msg);
+			return -1;
+		}
+
+		/* If no error_msg then it's assumed this is not an error message */
+	}
+
+	for (i = 0; i < size; ++i) {
+		if (ast_strlen_zero(handlers[i].name)) {
+			/* A default handler is specified. Use it if no other match is found */
+			on_message = handlers[i].on_message;
+			continue;
+		}
+
+		if (ast_aeap_message_is_named(msg, handlers[i].name)) {
+			on_message = handlers[i].on_message;
+			break;
+		}
+	}
+
+	if (on_message) {
+		return on_message(aeap, msg, data);
+	}
+
+	/* Respond with un-handled error */
+	ast_aeap_send_msg(aeap, ast_aeap_message_create_error(aeap->params->msg_type,
+		ast_aeap_message_name(msg), ast_aeap_message_id(msg),
+		"Unsupported and/or un-handled message"));
+
+	return 0;
+}
+
+static void raise_msg(struct ast_aeap *aeap, const void *buf, intmax_t size,
+	enum AST_AEAP_DATA_TYPE serial_type)
+{
+	struct ast_aeap_message *msg;
+	struct aeap_transaction *tsx;
+	int res = 0;
+
+	if (!aeap->params || !aeap->params->msg_type ||
+		ast_aeap_message_serial_type(aeap->params->msg_type) != serial_type ||
+		!(msg = ast_aeap_message_deserialize(aeap->params->msg_type, buf, size))) {
+		return;
+	}
+
+	/* See if this msg is involved in a transaction */
+	tsx = aeap_transaction_get(aeap->transactions, ast_aeap_message_id(msg));
+
+	/* If so go ahead and cancel the timeout timer */
+	aeap_transaction_cancel_timer(tsx);
+
+	if (aeap->params->request_handlers && ast_aeap_message_is_request(msg)) {
+		res = raise_msg_handler(aeap, aeap->params->request_handlers, aeap->params->request_handlers_size,
+			msg, tsx ? aeap_transaction_user_obj(tsx) : NULL);
+	} else if (aeap->params->response_handlers && ast_aeap_message_is_response(msg)) {
+		res = raise_msg_handler(aeap, aeap->params->response_handlers, aeap->params->response_handlers_size,
+			msg, tsx ? aeap_transaction_user_obj(tsx) : NULL);
+	}
+
+	/* Complete transaction (Note, removes tsx ref) */
+	aeap_transaction_end(tsx, res);
+
+	ao2_ref(msg, -1);
+}
+
+static void *aeap_receive(void *data)
+{
+	struct ast_aeap *aeap = data;
+	void *buf;
+
+	buf = ast_calloc(1, AEAP_RECV_SIZE);
+	if (!buf) {
+		aeap_error(aeap, NULL, "unable to create read buffer");
+		goto aeap_receive_error;
+	}
+
+	while (aeap_transport_is_connected(aeap->transport)) {
+		enum AST_AEAP_DATA_TYPE rtype;
+		intmax_t size;
+
+		size = aeap_transport_read(aeap->transport, buf, AEAP_RECV_SIZE, &rtype);
+		if (size < 0) {
+			goto aeap_receive_error;
+		}
+
+		if (!size) {
+			continue;
+		}
+
+		switch (rtype) {
+		case AST_AEAP_DATA_TYPE_BINARY:
+			if (aeap->params && aeap->params->on_binary) {
+				aeap->params->on_binary(aeap, buf, size);
+			}
+			break;
+		case AST_AEAP_DATA_TYPE_STRING:
+			ast_debug(3, "AEAP: received message: %s\n", (char *)buf);
+			if (aeap->params && aeap->params->on_string) {
+				aeap->params->on_string(aeap, (const char *)buf, size - 1);
+			}
+			break;
+		default:
+			break;
+		}
+
+		raise_msg(aeap, buf, size, rtype);
+	};
+
+	ast_free(buf);
+	return NULL;
+
+aeap_receive_error:
+	/*
+	 * An unrecoverable error occurred so ensure the aeap and transport reset
+	 * to a disconnected state. We don't want this thread to "join" itself so set
+	 * its id to NULL prior to disconnecting.
+	 */
+	aeap_error(aeap, NULL, "unrecoverable read error, disconnecting");
+
+	ao2_lock(aeap);
+	aeap->read_thread_id = AST_PTHREADT_NULL;
+	ao2_unlock(aeap);
+
+	ast_aeap_disconnect(aeap);
+
+	ast_free(buf);
+
+	if (aeap->params && aeap->params->on_error) {
+		aeap->params->on_error(aeap);
+	}
+
+	return NULL;
+}
+
+int ast_aeap_connect(struct ast_aeap *aeap, const char *url, const char *protocol, int timeout)
+{
+	SCOPED_AO2LOCK(lock, aeap);
+
+	if (aeap_transport_is_connected(aeap->transport)) {
+		/* Should already be connected, so nothing to do */
+		return 0;
+	}
+
+	if (aeap_transport_connect(aeap->transport, url, protocol, timeout)) {
+		aeap_error(aeap, NULL, "unable to connect transport");
+		return -1;
+	}
+
+	if (ast_pthread_create_background(&aeap->read_thread_id, NULL,
+			aeap_receive, aeap)) {
+		aeap_error(aeap, NULL, "unable to start read thread: %s",
+			strerror(errno));
+		ast_aeap_disconnect(aeap);
+		return -1;
+	}
+
+	return 0;
+}
+
+struct ast_aeap *ast_aeap_create_and_connect(const char *type,
+	const struct ast_aeap_params *params, const char *url, const char *protocol, int timeout)
+{
+	struct ast_aeap *aeap;
+
+	aeap = ast_aeap_create(type, params);
+	if (!aeap) {
+		return NULL;
+	}
+
+	if (ast_aeap_connect(aeap, url, protocol, timeout)) {
+		ao2_ref(aeap, -1);
+		return NULL;
+	}
+
+	return aeap;
+}
+
+int ast_aeap_disconnect(struct ast_aeap *aeap)
+{
+	ao2_lock(aeap);
+
+	aeap_transport_disconnect(aeap->transport);
+
+	if (aeap->read_thread_id != AST_PTHREADT_NULL) {
+		/*
+		 * The read thread calls disconnect if an error occurs, so
+		 * unlock the aeap before "joining" to avoid a deadlock.
+		 */
+		ao2_unlock(aeap);
+		pthread_join(aeap->read_thread_id, NULL);
+		ao2_lock(aeap);
+
+		aeap->read_thread_id = AST_PTHREADT_NULL;
+	}
+
+	ao2_unlock(aeap);
+
+	return 0;
+}
+
+static int aeap_send(struct ast_aeap *aeap, const void *buf, uintmax_t size,
+	enum AST_AEAP_DATA_TYPE type)
+{
+	intmax_t num;
+
+	num = aeap_transport_write(aeap->transport, buf, size, type);
+
+	if (num == 0) {
+		/* Nothing written, could be disconnected */
+		return 0;
+	}
+
+	if (num < 0) {
+		aeap_error(aeap, NULL, "error sending data");
+		return -1;
+	}
+
+	if (num < size) {
+		aeap_error(aeap, NULL, "not all data sent");
+		return -1;
+	}
+
+	if (num > size) {
+		aeap_error(aeap, NULL, "sent data truncated");
+		return -1;
+	}
+
+	return 0;
+}
+
+int ast_aeap_send_binary(struct ast_aeap *aeap, const void *buf, uintmax_t size)
+{
+	return aeap_send(aeap, buf, size, AST_AEAP_DATA_TYPE_BINARY);
+}
+
+int ast_aeap_send_msg(struct ast_aeap *aeap, struct ast_aeap_message *msg)
+{
+	void *buf;
+	intmax_t size;
+	int res;
+
+	if (!msg) {
+		aeap_error(aeap, NULL, "no message to send");
+		return -1;
+	}
+
+	if (ast_aeap_message_serialize(msg, &buf, &size)) {
+		aeap_error(aeap, NULL, "unable to serialize outgoing message");
+		ao2_ref(msg, -1);
+		return -1;
+	}
+
+	res = aeap_send(aeap, buf, size, msg->type->serial_type);
+
+	ast_free(buf);
+	ao2_ref(msg, -1);
+
+	return res;
+}
+
+int ast_aeap_send_msg_tsx(struct ast_aeap *aeap, struct ast_aeap_tsx_params *params)
+{
+	struct aeap_transaction *tsx = NULL;
+	int res = 0;
+
+	if (!params) {
+		return -1;
+	}
+
+	if (!params->msg) {
+		aeap_transaction_params_cleanup(params);
+		aeap_error(aeap, NULL, "no message to send");
+		return -1;
+	}
+
+	/* The transaction will take over params cleanup, which includes the msg reference */
+	tsx = aeap_transaction_create_and_add(aeap->transactions,
+		ast_aeap_message_id(params->msg), params, aeap);
+	if (!tsx) {
+		return -1;
+	}
+
+	if (ast_aeap_send_msg(aeap, ao2_bump(params->msg))) {
+		aeap_transaction_end(tsx, -1); /* Removes container, and tsx ref */
+		return -1;
+	}
+
+	if (aeap_transaction_start(tsx)) {
+		aeap_transaction_end(tsx, -1); /* Removes container, and tsx ref */
+		return -1;
+	}
+
+	res = aeap_transaction_result(tsx);
+
+	ao2_ref(tsx, -1);
+
+	return res;
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/general.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/general.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/general.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/general.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#include "asterisk.h"
+
+#include "asterisk/astobj2.h"
+#include "asterisk/sched.h"
+
+#include "general.h"
+
+/*! \brief Scheduler for transaction timeouts */
+static struct ast_sched_context *sched = NULL;
+
+struct ast_sched_context *aeap_sched_context(void)
+{
+	return sched;
+}
+
+void aeap_general_finalize(void)
+{
+	if (sched) {
+		ast_sched_context_destroy(sched);
+		sched = NULL;
+	}
+}
+
+int aeap_general_initialize(void)
+{
+	sched = ast_sched_context_create();
+	if (!sched) {
+		ast_log(LOG_ERROR, "AEAP scheduler: unable to create context");
+		return -1;
+	}
+
+	if (ast_sched_start_thread(sched)) {
+		ast_log(LOG_ERROR, "AEAP scheduler: unable to start thread");
+		aeap_general_finalize();
+		return -1;
+	}
+
+	return 0;
+}
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/general.h asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/general.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/general.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/general.h	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#ifndef RES_AEAP_GENERAL_H
+#define RES_AEAP_GENERAL_H
+
+/*!
+ * \brief Retrieve the scheduling context
+ *
+ * \returns The scheduling context
+ */
+struct ast_sched_context *aeap_sched_context(void);
+
+/*!
+ * \brief Initialize general/common AEAP facilities
+ *
+ * \returns 0 on success, -1 on error
+ */
+int aeap_general_initialize(void);
+
+/*!
+ * \brief Finalize/cleanup general AEAP facilities
+ */
+void aeap_general_finalize(void);
+
+#endif /* RES_AEAP_GENERAL_H */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/logger.h asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/logger.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/logger.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/logger.h	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#ifndef RES_AEAP_LOGGER_H
+#define RES_AEAP_LOGGER_H
+
+#include "asterisk.h"
+
+#include "asterisk/logger.h"
+#include "asterisk/strings.h"
+
+/*!
+ * \brief Log an Asterisk external application message
+ *
+ * \param level The logging level
+ * \param obj The object being logged
+ * \param name Optional subsystem name
+ * \param fmt Format string
+ * \param ... Parameters for the format string
+ */
+#define aeap_log(level, obj, name, fmt, ...) \
+	ast_log(level, "AEAP%s%s (%p): " fmt "\n", ast_strlen_zero(name) ? "" : " ", \
+			ast_strlen_zero(name) ? "" : name, obj, ##__VA_ARGS__)
+
+/*!
+ * \brief Log an Asterisk external application error
+ *
+ * \param obj The object being logged
+ * \param name Optional subsystem name
+ * \param fmt Format string
+ * \param ... Parameters for the format string
+ */
+#define aeap_error(obj, name, fmt, ...) aeap_log(LOG_ERROR, obj, name, fmt, ##__VA_ARGS__)
+
+/*!
+ * \brief Log an Asterisk external application warning
+ *
+ * \param obj The object being logged
+ * \param name Optional subsystem name
+ * \param fmt Format string
+ * \param ... Parameters for the format string
+ */
+#define aeap_warn(obj, name, fmt, ...) aeap_log(LOG_WARNING, obj, name, fmt, ##__VA_ARGS__)
+
+#endif /* RES_AEAP_LOGGER_H */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/message.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/message.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/message.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/message.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,270 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#include "asterisk.h"
+
+#include "asterisk/astobj2.h"
+#include "asterisk/utils.h"
+#include "asterisk/uuid.h"
+#include "asterisk/res_aeap.h"
+#include "asterisk/res_aeap_message.h"
+
+enum AST_AEAP_DATA_TYPE ast_aeap_message_serial_type(const struct ast_aeap_message_type *type)
+{
+	ast_assert(type != NULL);
+
+	return type->serial_type;
+}
+
+static void message_destructor(void *obj)
+{
+	struct ast_aeap_message *msg = obj;
+
+	if (msg->type->destruct) {
+		msg->type->destruct(msg);
+	}
+}
+
+static struct ast_aeap_message *message_create(const struct ast_aeap_message_type *type)
+{
+	struct ast_aeap_message *msg;
+
+	msg = ao2_t_alloc_options(type->type_size, message_destructor,
+		AO2_ALLOC_OPT_LOCK_NOLOCK, type->type_name);
+	if (!msg) {
+		ast_log(LOG_ERROR, "AEAP message %s: unable to create\n", type->type_name);
+		return NULL;
+	}
+
+	msg->type = type;
+
+	return msg;
+}
+
+struct ast_aeap_message *ast_aeap_message_create1(const struct ast_aeap_message_type *type,
+	const void *params)
+{
+	struct ast_aeap_message *msg;
+
+	ast_assert(type != NULL);
+	ast_assert(type->construct1 != NULL);
+
+	msg = message_create(type);
+	if (!msg) {
+		return NULL;
+	}
+
+	if (type->construct1(msg, params)) {
+		ast_log(LOG_ERROR, "AEAP message %s: unable to construct1\n", type->type_name);
+		ao2_ref(msg, -1);
+		return NULL;
+	}
+
+	return msg;
+}
+
+struct ast_aeap_message *ast_aeap_message_create2(const struct ast_aeap_message_type *type,
+	const char *msg_type, const char *name, const char *id, const void *params)
+{
+	struct ast_aeap_message *msg;
+
+	ast_assert(type != NULL);
+	ast_assert(type->construct2 != NULL);
+	ast_assert(msg_type != NULL);
+	ast_assert(name != NULL);
+
+	msg = message_create(type);
+	if (!msg) {
+		return NULL;
+	}
+
+	if (type->construct2(msg, msg_type, name, id, params)) {
+		ast_log(LOG_ERROR, "AEAP message %s: unable to construct2\n", type->type_name);
+		ao2_ref(msg, -1);
+		return NULL;
+	}
+
+	return msg;
+}
+
+struct ast_aeap_message *ast_aeap_message_create_request(const struct ast_aeap_message_type *type,
+	const char *name, const char *id, const void *params)
+{
+	struct ast_aeap_message *msg;
+
+	msg = ast_aeap_message_create2(type, "request", name, id, params);
+	if (!msg) {
+		return NULL;
+	}
+
+	if (!id && !ast_aeap_message_id_generate(msg)) {
+		ao2_ref(msg, -1);
+		return NULL;
+	}
+
+	return msg;
+}
+
+struct ast_aeap_message *ast_aeap_message_create_response(const struct ast_aeap_message_type *type,
+	const char *name, const char *id, const void *params)
+{
+	return ast_aeap_message_create2(type, "response", name, id, params);
+}
+
+struct ast_aeap_message *ast_aeap_message_create_error(const struct ast_aeap_message_type *type,
+	const char *name, const char *id, const char *error_msg)
+{
+	struct ast_aeap_message *msg;
+
+	msg = ast_aeap_message_create_response(type, name, id, NULL);
+	if (!msg) {
+		return NULL;
+	}
+
+	if (ast_aeap_message_error_msg_set(msg, error_msg)) {
+		ao2_ref(msg, -1);
+		return NULL;
+	}
+
+	return msg;
+}
+
+struct ast_aeap_message *ast_aeap_message_deserialize(const struct ast_aeap_message_type *type,
+	const void *buf, intmax_t size)
+{
+	struct ast_aeap_message *msg;
+
+	ast_assert(type != NULL);
+	ast_assert(type->deserialize != NULL);
+
+	msg = ast_aeap_message_create1(type, NULL);
+	if (!msg) {
+		return NULL;
+	}
+
+	if (type->deserialize(msg, buf, size)) {
+		ao2_ref(msg, -1);
+		return NULL;
+	}
+
+	return msg;
+}
+
+int ast_aeap_message_serialize(const struct ast_aeap_message *message,
+	void **buf, intmax_t *size)
+{
+	ast_assert(message != NULL);
+	ast_assert(message->type != NULL);
+
+	return message->type->serialize ? message->type->serialize(message, buf, size) : 0;
+}
+
+const char *ast_aeap_message_id(const struct ast_aeap_message *message)
+{
+	const char *id = NULL;
+
+	ast_assert(message != NULL);
+	ast_assert(message->type != NULL);
+
+	if (message->type->id) {
+		id = message->type->id(message);
+	}
+
+	return id ? id : "";
+}
+
+int ast_aeap_message_id_set(struct ast_aeap_message *message, const char *id)
+{
+	ast_assert(message != NULL);
+	ast_assert(message->type != NULL);
+
+	return message->type->id_set ? message->type->id_set(message, id) : 0;
+}
+
+const char *ast_aeap_message_id_generate(struct ast_aeap_message *message)
+{
+	char uuid_str[AST_UUID_STR_LEN];
+
+	ast_uuid_generate_str(uuid_str, sizeof(uuid_str));
+	if (strlen(uuid_str) != (AST_UUID_STR_LEN - 1)) {
+		ast_log(LOG_ERROR, "AEAP message %s failed to generate UUID for message '%s'",
+			message->type->type_name, ast_aeap_message_name(message));
+		return NULL;
+	}
+
+	return ast_aeap_message_id_set(message, uuid_str) ? NULL : ast_aeap_message_id(message);
+}
+
+const char *ast_aeap_message_name(const struct ast_aeap_message *message)
+{
+	const char *name = NULL;
+
+	ast_assert(message != NULL);
+	ast_assert(message->type != NULL);
+
+	if (message->type->name) {
+		name = message->type->name(message);
+	}
+
+	return name ? name : "";
+}
+
+int ast_aeap_message_is_named(const struct ast_aeap_message *message, const char *name)
+{
+	return name ? !strcasecmp(ast_aeap_message_name(message), name) : 0;
+}
+
+void *ast_aeap_message_data(struct ast_aeap_message *message)
+{
+	ast_assert(message != NULL);
+	ast_assert(message->type != NULL);
+
+	return message->type->data ? message->type->data(message) : NULL;
+}
+
+int ast_aeap_message_is_request(const struct ast_aeap_message *message)
+{
+	ast_assert(message != NULL);
+	ast_assert(message->type != NULL);
+
+	return message->type->is_request ? message->type->is_request(message) : 0;
+}
+
+int ast_aeap_message_is_response(const struct ast_aeap_message *message)
+{
+	ast_assert(message != NULL);
+	ast_assert(message->type != NULL);
+
+	return message->type->is_response ? message->type->is_response(message) : 0;
+}
+
+const char *ast_aeap_message_error_msg(const struct ast_aeap_message *message)
+{
+	ast_assert(message != NULL);
+	ast_assert(message->type != NULL);
+
+	return message->type->error_msg ? message->type->error_msg(message) : NULL;
+}
+
+int ast_aeap_message_error_msg_set(struct ast_aeap_message *message, const char *error_msg)
+{
+	ast_assert(message != NULL);
+	ast_assert(message->type != NULL);
+
+	return message->type->error_msg_set ? message->type->error_msg_set(message, error_msg) : 0;
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/message_json.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/message_json.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/message_json.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/message_json.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,191 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#include "asterisk.h"
+
+#include "asterisk/json.h"
+
+#include "asterisk/res_aeap_message.h"
+
+#define JSON_MSG(lvalue, rvalue) struct message_json *lvalue = \
+		((struct message_json *)rvalue)
+
+/*!
+ * \brief Asterisk external application JSON message type
+ */
+struct message_json {
+	/*! The base message type (must be first) */
+	struct ast_aeap_message base;
+	/*! Underlying JSON data structure */
+	struct ast_json *json;
+};
+
+static int message_json_construct1(struct ast_aeap_message *self, const void *params)
+{
+	JSON_MSG(msg, self);
+
+	msg->json = ast_json_ref((struct ast_json *)params) ?: ast_json_object_create();
+
+	return msg->json ? 0 : -1;
+}
+
+static int message_json_construct2(struct ast_aeap_message *self, const char *msg_type,
+	const char *name, const char *id, const void *params)
+{
+	struct ast_json *msg_data;
+	int res;
+
+	msg_data = ast_json_pack("{s:s,s:s*}", msg_type, name, "id", id);
+
+	if (!msg_data) {
+		ast_log(LOG_ERROR, "AEAP message json: failed to create data for '%s: %s'", msg_type, name);
+		return -1;
+	}
+
+	if (params && ast_json_object_update(msg_data, (struct ast_json *)params)) {
+		ast_log(LOG_ERROR, "AEAP message json: failed to update data for '%s: %s'", msg_type, name);
+		ast_json_unref(msg_data);
+		return -1;
+	}
+
+	res = message_json_construct1(self, msg_data);
+	ast_json_unref(msg_data);
+	return res;
+}
+
+static void message_json_destruct(struct ast_aeap_message *self)
+{
+	JSON_MSG(msg, self);
+
+	ast_json_unref(msg->json);
+}
+
+static int message_json_deserialize(struct ast_aeap_message *self, const void *buf, intmax_t size)
+{
+	JSON_MSG(msg, self);
+
+	msg->json = ast_json_load_buf(buf, size, NULL);
+
+	return msg->json ? 0 : -1;
+}
+
+static int message_json_serialize(const struct ast_aeap_message *self, void **buf, intmax_t *size)
+{
+	const JSON_MSG(msg, self);
+
+	*buf = ast_json_dump_string(msg->json);
+	if (!*buf) {
+		*size = 0;
+		return -1;
+	}
+
+	*size = strlen(*buf);
+
+	return 0;
+}
+
+static const char *message_json_id(const struct ast_aeap_message *self)
+{
+	const JSON_MSG(msg, self);
+
+	return ast_json_object_string_get(msg->json, "id");
+}
+
+static int message_json_id_set(struct ast_aeap_message *self, const char *id)
+{
+	JSON_MSG(msg, self);
+
+	if (ast_json_object_set(msg->json, "id", ast_json_string_create(id))) {
+		return -1;
+	}
+
+	return 0;
+}
+
+static const char *message_json_name(const struct ast_aeap_message *self)
+{
+	const JSON_MSG(msg, self);
+	struct ast_json_iter *iter;
+
+	iter = ast_json_object_iter_at(msg->json, "response");
+	if (!iter) {
+		iter = ast_json_object_iter_at(msg->json, "request");
+	}
+
+	return iter ? ast_json_string_get(ast_json_object_iter_value(iter)) : "";
+}
+
+static void *message_json_data(struct ast_aeap_message *self)
+{
+	JSON_MSG(msg, self);
+
+	return msg->json;
+}
+
+static int message_json_is_request(const struct ast_aeap_message *self)
+{
+	const JSON_MSG(msg, self);
+
+	return ast_json_object_iter_at(msg->json, "request") != NULL;
+}
+
+static int message_json_is_response(const struct ast_aeap_message *self)
+{
+	const JSON_MSG(msg, self);
+
+	return ast_json_object_iter_at(msg->json, "response") != NULL;
+}
+
+static const char *message_json_error_msg(const struct ast_aeap_message *self)
+{
+	const JSON_MSG(msg, self);
+
+	return ast_json_object_string_get(msg->json, "error_msg");
+}
+
+static int message_json_error_msg_set(struct ast_aeap_message *self, const char *error_msg)
+{
+	JSON_MSG(msg, self);
+
+	if (ast_json_object_set(msg->json, "error_msg", ast_json_string_create(error_msg))) {
+		return -1;
+	}
+
+	return 0;
+}
+
+static const struct ast_aeap_message_type message_type_json = {
+	.type_size = sizeof(struct message_json),
+	.type_name = "json",
+	.serial_type = AST_AEAP_DATA_TYPE_STRING,
+	.construct1 = message_json_construct1,
+	.construct2 = message_json_construct2,
+	.destruct = message_json_destruct,
+	.deserialize = message_json_deserialize,
+	.serialize = message_json_serialize,
+	.id = message_json_id,
+	.id_set = message_json_id_set,
+	.name = message_json_name,
+	.data = message_json_data,
+	.is_request = message_json_is_request,
+	.is_response = message_json_is_response,
+	.error_msg = message_json_error_msg,
+	.error_msg_set = message_json_error_msg_set,
+};
+
+const struct ast_aeap_message_type *ast_aeap_message_type_json = &message_type_json;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/transaction.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/transaction.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/transaction.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/transaction.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,284 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#include "asterisk.h"
+
+#include "asterisk/astobj2.h"
+#include "asterisk/sched.h"
+#include "asterisk/utils.h"
+
+#include "asterisk/res_aeap.h"
+#include "asterisk/res_aeap_message.h"
+
+#include "general.h"
+#include "logger.h"
+#include "transaction.h"
+
+struct aeap_transaction {
+	/*! Pointer back to owner object */
+	struct ast_aeap *aeap;
+	/*! The container this transaction is in */
+	struct ao2_container *container;
+	/*! Scheduler ID message timeout */
+	int sched_id;
+	/*! Whether or not the handler has been executed */
+	int handled;
+	/*! Used to sync matching received messages */
+	ast_cond_t handled_cond;
+	/*! The result of this transaction */
+	int result;
+	/*! The timeout data */
+	struct ast_aeap_tsx_params params;
+	/*! The transaction identifier */
+	char id[0];
+};
+
+/*! \brief Number of transaction buckets */
+#define AEAP_TRANSACTION_BUCKETS 11
+
+AO2_STRING_FIELD_HASH_FN(aeap_transaction, id);
+AO2_STRING_FIELD_CMP_FN(aeap_transaction, id);
+
+int aeap_transaction_cancel_timer(struct aeap_transaction *tsx)
+{
+	if (tsx && tsx->sched_id != -1) {
+		AST_SCHED_DEL_UNREF(aeap_sched_context(), tsx->sched_id, ao2_ref(tsx, -1));
+		return tsx->sched_id != -1;
+	}
+
+	return 0;
+}
+
+void aeap_transaction_params_cleanup(struct ast_aeap_tsx_params *params)
+{
+	ao2_cleanup(params->msg);
+
+	if (params->obj_cleanup) {
+		params->obj_cleanup(params->obj);
+	}
+}
+
+static void transaction_destructor(void *obj)
+{
+	struct aeap_transaction *tsx = obj;
+
+	/* Ensure timer is canceled */
+	aeap_transaction_cancel_timer(tsx);
+
+	aeap_transaction_params_cleanup(&tsx->params);
+
+	ast_cond_destroy(&tsx->handled_cond);
+}
+
+static struct aeap_transaction *transaction_create(const char *id,
+	struct ast_aeap_tsx_params *params, struct ast_aeap *aeap)
+{
+	struct aeap_transaction *tsx;
+
+	if (!id) {
+		aeap_error(aeap, "transaction", "missing transaction id");
+		aeap_transaction_params_cleanup(params);
+		return NULL;
+	}
+
+	tsx = ao2_alloc(sizeof(*tsx) + strlen(id) + 1, transaction_destructor);
+	if (!tsx) {
+		aeap_error(aeap, "transaction", "unable to create for '%s'", id);
+		aeap_transaction_params_cleanup(params);
+		return NULL;
+	}
+
+	strcpy(tsx->id, id); /* safe */
+	tsx->sched_id = -1;
+
+	ast_cond_init(&tsx->handled_cond, NULL);
+
+	/*
+	 * Currently, transactions, and their lifetimes are fully managed by the given 'aeap'
+	 * object, so do not bump its reference here as we want the 'aeap' object to stop
+	 * transactions and not transactions potentially stopping the 'aeap' object.
+	 */
+	tsx->aeap = aeap;
+	tsx->params = *params;
+
+	return tsx;
+}
+
+static void transaction_end(struct aeap_transaction *tsx, int timed_out, int result)
+{
+	if (!tsx) {
+		return;
+	}
+
+	ao2_lock(tsx);
+
+	tsx->result = result;
+
+	if (tsx->container) {
+		ao2_unlink(tsx->container, tsx);
+		tsx->container = NULL;
+	}
+
+	if (!timed_out) {
+		aeap_transaction_cancel_timer(tsx);
+	} else if (tsx->sched_id != -1) {
+		tsx->sched_id = -1;
+	}
+
+	if (!tsx->handled) {
+		if (timed_out) {
+			if (tsx->params.on_timeout) {
+				tsx->params.on_timeout(tsx->aeap, tsx->params.msg, tsx->params.obj);
+			} else {
+				aeap_error(tsx->aeap, "transaction", "message '%s' timed out",
+					ast_aeap_message_name(tsx->params.msg));
+			}
+		}
+
+		tsx->handled = 1;
+		ast_cond_signal(&tsx->handled_cond);
+	}
+
+	ao2_unlock(tsx);
+
+	ao2_ref(tsx, -1);
+}
+
+static int transaction_raise_timeout(const void *data)
+{
+	/* Ref added added at timer creation removed in end call */
+	transaction_end((struct aeap_transaction *)data, 1, -1);
+
+	return 0;
+}
+
+static int transaction_sched_timer(struct aeap_transaction *tsx)
+{
+	if (tsx->params.timeout <= 0 || tsx->sched_id != -1) {
+		return 0;
+	}
+
+	tsx->sched_id = ast_sched_add(aeap_sched_context(), tsx->params.timeout,
+			transaction_raise_timeout, ao2_bump(tsx));
+	if (tsx->sched_id == -1) {
+		aeap_error(tsx->aeap, "transaction", "unable to schedule timeout for '%s'", tsx->id);
+		ao2_ref(tsx, -1);
+		return -1;
+	}
+
+	return 0;
+}
+
+static void transaction_wait(struct aeap_transaction *tsx)
+{
+	ao2_lock(tsx);
+
+	while (!tsx->handled) {
+		ast_cond_wait(&tsx->handled_cond, ao2_object_get_lockaddr(tsx));
+	}
+
+	ao2_unlock(tsx);
+}
+
+int aeap_transaction_start(struct aeap_transaction *tsx)
+{
+	if (transaction_sched_timer(tsx)) {
+		return -1;
+	}
+
+	if (tsx->params.wait) {
+		/* Wait until transaction completes, or times out */
+		transaction_wait(tsx);
+	}
+
+	return 0;
+}
+
+struct aeap_transaction *aeap_transaction_get(struct ao2_container *transactions, const char *id)
+{
+	return ao2_find(transactions, id, OBJ_SEARCH_KEY);
+}
+
+void aeap_transaction_end(struct aeap_transaction *tsx, int result)
+{
+	transaction_end(tsx, 0, result);
+}
+
+int aeap_transaction_result(struct aeap_transaction *tsx)
+{
+	return tsx->result;
+}
+
+void *aeap_transaction_user_obj(struct aeap_transaction *tsx)
+{
+	return tsx->params.obj;
+}
+
+struct aeap_transaction *aeap_transaction_create_and_add(struct ao2_container *transactions,
+	const char *id, struct ast_aeap_tsx_params *params, struct ast_aeap *aeap)
+{
+	struct aeap_transaction *tsx;
+
+	tsx = transaction_create(id, params, aeap);
+	if (!tsx) {
+		return NULL;
+	}
+
+	if (!ao2_link(transactions, tsx)) {
+		aeap_error(tsx->aeap, "transaction", "unable to add '%s' to container", id);
+		ao2_ref(tsx, -1);
+		return NULL;
+	}
+
+	/*
+	 * Yes, this creates a circular reference. This reference is removed though
+	 * upon transaction end. It's assumed here that the given transactions container
+	 * takes "ownership", and ultimate responsibility of its contained transactions.
+	 * Thus when the given container needs to be unref'ed/freed it must call
+	 * aeap_transaction_end for each transaction prior to doing so.
+	 */
+	/* tsx->container = ao2_bump(transactions); */
+
+	/*
+	 * The transaction needs to know what container manages it, so it can remove
+	 * itself from the given container under certain conditions (e.g. transaction
+	 * timeout).
+	 *
+	 * It's expected that the given container will out live any contained transaction
+	 * (i.e. the container will not itself be destroyed before ensuring all contained
+	 * transactions are ended, and removed). Thus there is no reason to bump the given
+	 * container's reference here.
+	 */
+	tsx->container = transactions;
+
+	return tsx;
+}
+
+struct ao2_container *aeap_transactions_create(void)
+{
+	struct ao2_container *transactions;
+
+	transactions = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, AEAP_TRANSACTION_BUCKETS,
+		aeap_transaction_hash_fn, NULL, aeap_transaction_cmp_fn);
+	if (!transactions) {
+		ast_log(LOG_ERROR, "AEAP transaction: unable to create container\n");
+		return NULL;
+	}
+
+	return transactions;
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/transaction.h asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/transaction.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/transaction.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/transaction.h	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,123 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#ifndef RES_AEAP_TRANSACTION_H
+#define RES_AEAP_TRANSACTION_H
+
+#include "asterisk/res_aeap.h"
+
+struct ao2_container;
+struct ast_aeap_tsx_params;
+struct aeap_transaction;
+
+/*!
+ * \brief Create an Asterisk external application transactions container
+ *
+ * \returns A transaction object, or NULL on error
+ */
+struct ao2_container *aeap_transactions_create(void);
+
+/*!
+ * \brief Create a transaction object, and add it to the given container
+ *
+ * \param transactions A transactions container
+ * \param id An id to use for the transaction
+ * \param params Transaction parameters
+ * \param aeap The aeap object that "owns" this transaction
+ *
+ * \returns 0 if successfully create and added, -1 on error
+ */
+struct aeap_transaction *aeap_transaction_create_and_add(struct ao2_container *transactions,
+	const char *id, struct ast_aeap_tsx_params *params, struct ast_aeap *aeap);
+
+/*!
+ * \brief Clean up parameter references, and possibly call optional user object cleanup
+ *
+ * \param params Transaction parameters
+ */
+void aeap_transaction_params_cleanup(struct ast_aeap_tsx_params *params);
+
+/*!
+ * \brief Retrieve a transaction for the id from the container
+ *
+ * \param transactions A transactions container
+ * \param id A transaction id
+ *
+ * \returns an AEAP transaction object, NULL if no transaction is found
+ */
+struct aeap_transaction *aeap_transaction_get(struct ao2_container *transactions,
+	const char *id);
+
+/*!
+ * \brief Start the transaction
+ *
+ * \param tsx The transaction to initiate
+ *
+ * \returns 0 if successfully raised, and handled. Otherwise non zero.
+ */
+int aeap_transaction_start(struct aeap_transaction *tsx);
+
+/*!
+ * \brief End a transaction, and remove it from the given container
+ *
+ * The "result" parameter is a value representing the state (success/failure,
+ * perhaps even something else) of transactional processing upon ending.
+ *
+ * \param tsx A transaction to end
+ * \param result A result to give to the transaction
+ */
+void aeap_transaction_end(struct aeap_transaction *tsx, int result);
+
+/*!
+ * \brief Get a transaction's result
+ *
+ * A transaction's result is a value that represents the relative success (0), or
+ * failure (-1) of a transaction. For example, a timeout is considered a failure
+ * and will elicit a -1.
+ *
+ * This value though is also dependent upon the result of the message handler
+ * associated with the transaction. Meaning if an associated message is handled,
+ * then its result is stored as the transaction result and returned here.
+ *
+ * \param tsx A transaction object
+ *
+ * \returns The transaction result
+ */
+int aeap_transaction_result(struct aeap_transaction *tsx);
+
+/*!
+ * \brief Cancel the transaction timer
+ *
+ * Stops the transaction timer, but does not end/stop the transaction itself
+ *
+ * \param transaction A transaction to cancel the timer on
+ *
+ * \returns 0 if canceled, non zero otherwise
+ */
+int aeap_transaction_cancel_timer(struct aeap_transaction *tsx);
+
+/*!
+ * \brief Retrieve the user object associated with the transaction
+ *
+ * \param transaction A transaction object
+ *
+ * \returns A user object, or NULL if non associated
+ */
+void *aeap_transaction_user_obj(struct aeap_transaction *tsx);
+
+#endif /* RES_AEAP_TRANSACTION_H */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/transport.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/transport.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/transport.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/transport.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,156 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#include "asterisk.h"
+
+#include "asterisk/utils.h"
+
+#include "logger.h"
+#include "transport.h"
+#include "transport_websocket.h"
+
+struct aeap_transport *aeap_transport_create(const char *type)
+{
+	struct aeap_transport *transport = NULL;
+
+	if (!strncasecmp(type, "ws", 2)) {
+		transport = (struct aeap_transport *)aeap_transport_websocket_create();
+	}
+
+	if (!transport) {
+		ast_log(LOG_ERROR, "AEAP transport: failed to create for type '%s'\n", type);
+		return NULL;
+	}
+
+	ast_mutex_init(&transport->read_lock);
+	ast_mutex_init(&transport->write_lock);
+
+	transport->connected = 0;
+
+	return transport;
+}
+
+int aeap_transport_connect(struct aeap_transport *transport, const char *url,
+	const char *protocol, int timeout)
+{
+	int res;
+
+	SCOPED_MUTEX(rlock, &transport->read_lock);
+	SCOPED_MUTEX(wlock, &transport->write_lock);
+
+	if (aeap_transport_is_connected(transport)) {
+		return 0;
+	}
+
+	res = transport->vtable->connect(transport, url, protocol, timeout);
+	if (!res) {
+		transport->connected = 1;
+	}
+
+	return res;
+}
+
+struct aeap_transport *aeap_transport_create_and_connect(const char *type,
+	const char *url, const char *protocol, int timeout)
+{
+	struct aeap_transport *transport = aeap_transport_create(type);
+
+	if (!transport) {
+		return NULL;
+	}
+
+	if (aeap_transport_connect(transport, url, protocol, timeout)) {
+		aeap_transport_destroy(transport);
+		return NULL;
+	}
+
+	return transport;
+}
+
+int aeap_transport_is_connected(struct aeap_transport *transport)
+{
+	/*
+	 * Avoid using a lock to 'read' the 'connected' variable in order to
+	 * keep things slightly more efficient.
+	 */
+	return ast_atomic_fetch_add(&transport->connected, 0, __ATOMIC_RELAXED);
+}
+
+int aeap_transport_disconnect(struct aeap_transport *transport)
+{
+	int res;
+
+	SCOPED_MUTEX(rlock, &transport->read_lock);
+	SCOPED_MUTEX(wlock, &transport->write_lock);
+
+	if (!aeap_transport_is_connected(transport)) {
+		return 0;
+	}
+
+	res = transport->vtable->disconnect(transport);
+
+	/*
+	 * Even though the transport is locked here use atomics to set the value of
+	 * 'connected' since it's possible the variable is being 'read' by another
+	 * thread via the 'is_connected' call.
+	 */
+	ast_atomic_fetch_sub(&transport->connected, 1, __ATOMIC_RELAXED);
+
+	return res;
+}
+
+void aeap_transport_destroy(struct aeap_transport *transport)
+{
+	if (!transport) {
+		return;
+	}
+
+	/* Ensure an orderly disconnect occurs before final destruction */
+	aeap_transport_disconnect(transport);
+
+	transport->vtable->destroy(transport);
+
+	ast_mutex_destroy(&transport->read_lock);
+	ast_mutex_destroy(&transport->write_lock);
+
+	ast_free(transport);
+}
+
+intmax_t aeap_transport_read(struct aeap_transport *transport, void *buf, intmax_t size,
+	enum AST_AEAP_DATA_TYPE *rtype)
+{
+	SCOPED_MUTEX(lock, &transport->read_lock);
+
+	if (!aeap_transport_is_connected(transport)) {
+		return 0;
+	}
+
+	return transport->vtable->read(transport, buf, size, rtype);
+}
+
+intmax_t aeap_transport_write(struct aeap_transport *transport, const void *buf, intmax_t size,
+	enum AST_AEAP_DATA_TYPE wtype)
+{
+	SCOPED_MUTEX(lock, &transport->write_lock);
+
+	if (!aeap_transport_is_connected(transport)) {
+		return 0;
+	}
+
+	return transport->vtable->write(transport, buf, size, wtype);
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/transport.h asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/transport.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/transport.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/transport.h	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,209 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#ifndef RES_AEAP_TRANSPORT_H
+#define RES_AEAP_TRANSPORT_H
+
+#include <stdint.h>
+
+#include "asterisk/res_aeap.h"
+
+struct aeap_transport;
+
+/*!
+ * \brief Asterisk external application transport virtual table
+ *
+ * Callbacks to be implemented by "derived" transports
+ */
+struct aeap_transport_vtable {
+	/*!
+	 * \brief Connect a transport
+	 *
+	 * \param self The transport object
+	 * \param url The URL to connect to
+	 * \param protocol The connection protocol to use if applicable
+	 * \param timeout How long (in milliseconds) to attempt to connect (-1 equals infinite)
+	 *
+	 * \returns 0 on success, or -1 on error
+	 */
+	int (*connect)(struct aeap_transport *self, const char *url, const char *protocol, int timeout);
+
+	/*!
+	 * \brief Disconnect a transport
+	 *
+	 * \param self The transport object
+	 *
+	 * \returns 0 on success, or -1 on error
+	 */
+	int (*disconnect)(struct aeap_transport *self);
+
+	/*!
+	 * \brief Destroy a transport
+	 *
+	 * \param self The transport object
+	 */
+	void (*destroy)(struct aeap_transport *self);
+
+	/*!
+	 * \brief Read data from a transport
+	 *
+	 * \param self The transport object
+	 * \param buf The buffer data is read read into
+	 * \param size The size of the given data buffer
+	 * \param rtype [out] The type of data read
+	 *
+	 * \returns Total number of bytes read, or less than zero on error
+	 */
+	intmax_t (*read)(struct aeap_transport *self, void *buf, intmax_t size,
+		enum AST_AEAP_DATA_TYPE *rtype);
+
+	/*!
+	 * \brief Write data to a transport
+	 *
+	 * \param self The transport object
+	 * \param buf The data to write
+	 * \param size The size of data to write
+	 * \param wtype The type of data to write
+	 *
+	 * \returns Total number of bytes written, or less than zero on error
+	 */
+	intmax_t (*write)(struct aeap_transport *self, const void *buf, intmax_t size,
+		enum AST_AEAP_DATA_TYPE wtype);
+};
+
+/*!
+ * \brief Asterisk external application transport structure to be
+ *        "derived" by specific transport implementation types
+ *
+ * Transports are assumed to support simultaneous reading and writing,
+ * thus separate read and write locks. A transport type not supporting
+ * such can simply apply the opposing lock during a read or write, i.e.
+ * lock the write lock during a read and vice versa.
+ */
+struct aeap_transport {
+	/*! Transport virtual table */
+	struct aeap_transport_vtable *vtable;
+	/*! Whether or not the transport is connected */
+	unsigned int connected;
+	/*! Lock used when reading */
+	ast_mutex_t read_lock;
+	/*! Lock used when writing */
+	ast_mutex_t write_lock;
+};
+
+/*!
+ * \brief Create an Asterisk external application transport
+ *
+ * \param type The type of transport to create
+ *
+ * \returns An Asterisk external application transport, or NULL on error
+ */
+struct aeap_transport *aeap_transport_create(const char *type);
+
+/*!
+ * \brief Connect a transport
+ *
+ * \param transport The transport to connect
+ * \param url The URL to connect to
+ * \param protocol The connection protocol to use if applicable
+ * \param timeout How long (in milliseconds) to attempt to connect (-1 equals infinite)
+ *
+ * \returns 0 on success, or -1 on error
+ */
+int aeap_transport_connect(struct aeap_transport *transport, const char *url,
+	const char *protocol, int timeout);
+
+/*!
+ * \brief Create an Asterisk external application transport, and connect it
+ *
+ * \param type The type of transport to create
+ * \param url The URL to connect to
+ * \param protocol The connection protocol to use if applicable
+ * \param timeout How long (in milliseconds) to attempt to connect (-1 equals infinite)
+ *
+ * \returns An Asterisk external application transport, or NULL on error
+ */
+struct aeap_transport *aeap_transport_create_and_connect(const char* type,
+	const char *url, const char *protocol, int timeout);
+
+/*!
+ * \brief Disconnect a transport
+ *
+ * \note Locks both the transport's read and write locks before calling transport
+ *       instance's disconnect, and unlocks both before returning.
+ *
+ * \param transport The transport to disconnect
+ *
+ * \returns 0 on success, or -1 on error
+ */
+int aeap_transport_disconnect(struct aeap_transport *transport);
+
+/*!
+ * \brief Whether or not the transport is in a connected state
+ *
+ * \param transport The transport object
+ *
+ * \returns True if connected, false otherwise
+ */
+int aeap_transport_is_connected(struct aeap_transport *transport);
+
+/*!
+ * \brief Destroy a transport
+ *
+ * \param transport The transport to destroy
+ *
+ * \returns 0 on success, or -1 on error
+ */
+void aeap_transport_destroy(struct aeap_transport *transport);
+
+/*!
+ * \brief Read data from the transport
+ *
+ * This is a blocking read, and will not return until the transport
+ * implementation returns.
+ *
+ * \note Locks transport's read lock before calling transport instance's
+ *       read, and unlocks it before returning.
+ *
+ * \param transport The transport to read from
+ * \param buf The buffer data is read into
+ * \param size The size of data given data buffer
+ * \param rtype [out] The type of data read
+ *
+ * \returns Total number of bytes read, or less than zero on error
+ */
+intmax_t aeap_transport_read(struct aeap_transport *transport, void *buf, intmax_t size,
+	enum AST_AEAP_DATA_TYPE *rtype);
+
+/*!
+ * \brief Write data to the transport
+ *
+ * \note Locks transport's write lock before calling transport instance's
+ *       write, and unlocks it before returning.
+ *
+ * \param transport The transport to write to
+ * \param buf The data to write
+ * \param size The size of data to write
+ * \param wtype The type of data to write
+ *
+ * \returns Total number of bytes written, or less than zero on error
+ */
+intmax_t aeap_transport_write(struct aeap_transport *transport, const void *buf, intmax_t size,
+	enum AST_AEAP_DATA_TYPE wtype);
+
+#endif /* RES_AEAP_TRANSPORT_H */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/transport_websocket.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/transport_websocket.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/transport_websocket.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/transport_websocket.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,249 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#include "asterisk.h"
+
+#include "asterisk/http_websocket.h"
+#include "asterisk/utils.h"
+
+#include "logger.h"
+#include "transport.h"
+#include "transport_websocket.h"
+
+#define log_error(obj, fmt, ...) aeap_error(obj, "websocket", fmt, ##__VA_ARGS__)
+
+struct aeap_transport_websocket {
+	/*! Derive from base transport (must be first attribute) */
+	struct aeap_transport base;
+	/*! The underlying websocket */
+	struct ast_websocket *ws;
+};
+
+static int websocket_connect(struct aeap_transport *self, const char *url,
+	const char *protocol, int timeout)
+{
+	struct aeap_transport_websocket *transport = (struct aeap_transport_websocket *)self;
+	enum ast_websocket_result ws_result;
+	struct ast_websocket_client_options ws_options = {
+		.uri = url,
+		.protocols = protocol,
+		.timeout = timeout,
+		.tls_cfg = NULL,
+	};
+
+	transport->ws = ast_websocket_client_create_with_options(&ws_options, &ws_result);
+	if (ws_result != WS_OK) {
+		log_error(self, "connect failure (%d)", (int)ws_result);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int websocket_disconnect(struct aeap_transport *self)
+{
+	struct aeap_transport_websocket *transport = (struct aeap_transport_websocket *)self;
+
+	if (transport->ws) {
+		ast_websocket_unref(transport->ws);
+		transport->ws = NULL;
+	}
+
+	return 0;
+}
+
+static void websocket_destroy(struct aeap_transport *self)
+{
+	/*
+	 * Disconnect takes care of cleaning up the websocket. Note, disconnect
+	 * was called by the base/dispatch interface prior to calling this
+	 * function so nothing to do here.
+	 */
+}
+
+static intmax_t websocket_read(struct aeap_transport *self, void *buf, intmax_t size,
+	enum AST_AEAP_DATA_TYPE *rtype)
+{
+	struct aeap_transport_websocket *transport = (struct aeap_transport_websocket *)self;
+
+	char *payload;
+	uint64_t bytes_read = 0;
+	uint64_t total_bytes_read = 0;
+	enum ast_websocket_opcode opcode;
+	int fragmented = 0;
+
+	*rtype = AST_AEAP_DATA_TYPE_NONE;
+
+	if (ast_websocket_fd(transport->ws) < 0) {
+		log_error(self, "unavailable for reading");
+		/* Ensure this transport is in a disconnected state */
+		aeap_transport_disconnect(self);
+		return -1;
+	}
+
+	/*
+	 * This function is called with the read_lock locked. However, the lock needs to be
+	 * unlocked while waiting for input otherwise a deadlock can occur during disconnect
+	 * (disconnect attempts to grab the lock but can't because read holds it here). So
+	 * unlock it prior to waiting.
+	 */
+	ast_mutex_unlock(&transport->base.read_lock);
+	if (ast_websocket_wait_for_input(transport->ws, -1) <= 0) {
+		ast_mutex_lock(&transport->base.read_lock);
+		log_error(self, "poll failure: %s", strerror(errno));
+		/* Ensure this transport is in a disconnected state */
+		aeap_transport_disconnect(self);
+		return -1;
+	}
+	ast_mutex_lock(&transport->base.read_lock);
+
+	if (!transport->ws) {
+		/*
+		 * It's possible the transport was told to disconnect while waiting for input.
+		 * If so then the websocket will be NULL, so we don't want to continue.
+		 */
+		return 0;
+	}
+
+	do {
+		if (ast_websocket_read(transport->ws, &payload, &bytes_read, &opcode,
+				&fragmented) != 0) {
+			log_error(self, "read failure (%d): %s", opcode, strerror(errno));
+			return -1;
+		}
+
+		if (!bytes_read) {
+			continue;
+		}
+
+		if (total_bytes_read + bytes_read > size) {
+			log_error(self, "attempted to read too many bytes into (%jd) sized buffer", size);
+			return -1;
+		}
+
+		memcpy(buf + total_bytes_read, payload, bytes_read);
+		total_bytes_read += bytes_read;
+
+	} while (opcode == AST_WEBSOCKET_OPCODE_CONTINUATION);
+
+	switch (opcode) {
+	case AST_WEBSOCKET_OPCODE_CLOSE:
+		log_error(self, "closed");
+		return -1;
+	case AST_WEBSOCKET_OPCODE_BINARY:
+		*rtype = AST_AEAP_DATA_TYPE_BINARY;
+		break;
+	case AST_WEBSOCKET_OPCODE_TEXT:
+		*rtype = AST_AEAP_DATA_TYPE_STRING;
+
+		/* Append terminator, but check for overflow first */
+		if (total_bytes_read == size) {
+			log_error(self, "unable to write string terminator");
+			return -1;
+		}
+
+		*((char *)(buf + total_bytes_read)) = '\0';
+		break;
+	default:
+		/* Ignore all other message types */
+		return 0;
+	}
+
+	return total_bytes_read;
+}
+
+static intmax_t websocket_write(struct aeap_transport *self, const void *buf, intmax_t size,
+	enum AST_AEAP_DATA_TYPE wtype)
+{
+	struct aeap_transport_websocket *transport = (struct aeap_transport_websocket *)self;
+	intmax_t res = 0;
+
+	switch (wtype) {
+	case AST_AEAP_DATA_TYPE_BINARY:
+		res = ast_websocket_write(transport->ws, AST_WEBSOCKET_OPCODE_BINARY,
+			(char *)buf, size);
+		break;
+	case AST_AEAP_DATA_TYPE_STRING:
+		res = ast_websocket_write(transport->ws, AST_WEBSOCKET_OPCODE_TEXT,
+			(char *)buf, size);
+		break;
+	default:
+		break;
+	}
+
+	if (res < 0) {
+		log_error(self, "problem writing to websocket (closed)");
+
+		/*
+		 * If the underlying socket is closed then ensure the
+		 * transport is in a disconnected state as well.
+		 */
+		aeap_transport_disconnect(self);
+
+		return res;
+	}
+
+	return size;
+}
+
+static struct aeap_transport_vtable *transport_websocket_vtable(void)
+{
+	static struct aeap_transport_vtable websocket_vtable = {
+		.connect = websocket_connect,
+		.disconnect = websocket_disconnect,
+		.destroy = websocket_destroy,
+		.read = websocket_read,
+		.write = websocket_write,
+	};
+
+	return &websocket_vtable;
+}
+
+/*!
+ * \brief Initialize a transport websocket object, and set its virtual table
+ *
+ * \param transport The transport to initialize
+ *
+ * \returns 0 on success, -1 on error
+ */
+static int transport_websocket_init(struct aeap_transport_websocket *transport)
+{
+	transport->ws = NULL;
+
+	((struct aeap_transport *)transport)->vtable = transport_websocket_vtable();
+
+	return 0;
+}
+
+struct aeap_transport_websocket *aeap_transport_websocket_create(void)
+{
+	struct aeap_transport_websocket *transport;
+
+	transport = ast_calloc(1, sizeof(*transport));
+	if (!transport) {
+		ast_log(LOG_ERROR, "AEAP websocket: unable to create transport websocket");
+		return NULL;
+	}
+
+	if (transport_websocket_init(transport)) {
+		ast_free(transport);
+		return NULL;
+	}
+
+	return transport;
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/transport_websocket.h asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/transport_websocket.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap/transport_websocket.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap/transport_websocket.h	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#ifndef RES_AEAP_TRANSPORT_WEBSOCKET_H
+#define RES_AEAP_TRANSPORT_WEBSOCKET_H
+
+/*!
+ * \brief Asterisk external application protocol websocket transport
+ */
+struct aeap_transport_websocket;
+
+/*!
+ * \brief Creates (heap allocated), and initializes a transport websocket
+ *
+ * \returns A transport websocket object, or NULL on error
+ */
+struct aeap_transport_websocket *aeap_transport_websocket_create(void);
+
+#endif /* RES_AEAP_TRANSPORT_WEBSOCKET_H */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,404 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Ben Ford <bford@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*** MODULEINFO
+	<depend>res_http_websocket</depend>
+	<support_level>core</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#include "asterisk/astobj2.h"
+#include "asterisk/module.h"
+#include "asterisk/sorcery.h"
+#include "asterisk/cli.h"
+#include "asterisk/format.h"
+#include "asterisk/format_cap.h"
+#include "asterisk/res_aeap.h"
+
+#include "res_aeap/general.h"
+
+/*** DOCUMENTATION
+	<configInfo name="res_aeap" language="en_US">
+		<synopsis>Asterisk External Application Protocol (AEAP) module for Asterisk</synopsis>
+		<configFile name="aeap.conf">
+			<configObject name="client">
+				<synopsis>AEAP client options</synopsis>
+				<configOption name="type">
+					<synopsis>Must be of type 'client'.</synopsis>
+				</configOption>
+				<configOption name="url">
+					<synopsis>The URL of the server to connect to.</synopsis>
+				</configOption>
+				<configOption name="protocol">
+					<synopsis>The application protocol.</synopsis>
+				</configOption>
+				<configOption name="codecs">
+				        <synopsis>Optional media codec(s)</synopsis>
+					<description><para>
+					If this is specified, Asterisk will use this for codec related negotiations
+					with the external application. Otherwise, Asterisk will default to using the
+					codecs configured on the endpoint.
+					</para></description>
+				</configOption>
+			</configObject>
+		</configFile>
+	</configInfo>
+ ***/
+
+/* Asterisk External Application Protocol sorcery object */
+static struct ast_sorcery *aeap_sorcery;
+
+struct ast_sorcery *ast_aeap_sorcery(void) {
+	return aeap_sorcery;
+}
+
+struct ast_aeap_client_config
+{
+	SORCERY_OBJECT(details);
+	AST_DECLARE_STRING_FIELDS(
+		/*! The URL of the server to connect to */
+		AST_STRING_FIELD(url);
+		/*! The application protocol */
+		AST_STRING_FIELD(protocol);
+	);
+	/*! An optional list of codecs that will be used if provided */
+	struct ast_format_cap *codecs;
+};
+
+static void client_config_destructor(void *obj)
+{
+	struct ast_aeap_client_config *cfg = obj;
+
+	ast_string_field_free_memory(cfg);
+	ao2_cleanup(cfg->codecs);
+}
+
+static void *client_config_alloc(const char *name)
+{
+	struct ast_aeap_client_config *cfg;
+
+	cfg = ast_sorcery_generic_alloc(sizeof(*cfg), client_config_destructor);
+	if (!cfg) {
+		return NULL;
+	}
+
+	if (ast_string_field_init(cfg, 512)) {
+		ao2_ref(cfg, -1);
+		return NULL;
+	}
+
+	if (!(cfg->codecs = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) {
+		ao2_ref(cfg, -1);
+		return NULL;
+	}
+
+	return cfg;
+}
+
+static int client_config_apply(const struct ast_sorcery *sorcery, void *obj)
+{
+	struct ast_aeap_client_config *cfg = obj;
+
+	if (ast_strlen_zero(cfg->url)) {
+		ast_log(LOG_ERROR, "AEAP - URL must be present for '%s'\n", ast_sorcery_object_get_id(cfg));
+		return -1;
+	}
+
+	if (!ast_begins_with(cfg->url, "ws")) {
+		ast_log(LOG_ERROR, "AEAP - URL must be ws or wss for '%s'\n", ast_sorcery_object_get_id(cfg));
+		return -1;
+	}
+
+	return 0;
+}
+
+const struct ast_format_cap *ast_aeap_client_config_codecs(const struct ast_aeap_client_config *cfg)
+{
+	return cfg->codecs;
+}
+
+int ast_aeap_client_config_has_protocol(const struct ast_aeap_client_config *cfg,
+	const char *protocol)
+{
+	return !strcmp(protocol, cfg->protocol);
+}
+
+struct ao2_container *ast_aeap_client_configs_get(const char *protocol)
+{
+	struct ao2_container *container;
+	struct ast_variable *var;
+
+	var = protocol ? ast_variable_new("protocol ==", protocol, "") : NULL;
+
+	container = ast_sorcery_retrieve_by_fields(aeap_sorcery,
+		AEAP_CONFIG_CLIENT, AST_RETRIEVE_FLAG_MULTIPLE | AST_RETRIEVE_FLAG_ALL, var);
+
+	ast_variables_destroy(var);
+
+	return container;
+}
+
+static struct ast_aeap_client_config *client_config_get(const char *id)
+{
+	return ast_sorcery_retrieve_by_id(aeap_sorcery, AEAP_CONFIG_CLIENT, id);
+}
+
+static char *aeap_tab_complete_name(const char *word, struct ao2_container *container)
+{
+	void *obj;
+	struct ao2_iterator it;
+	int wordlen = strlen(word);
+	int ret;
+
+	it = ao2_iterator_init(container, 0);
+	while ((obj = ao2_iterator_next(&it))) {
+		if (!strncasecmp(word, ast_sorcery_object_get_id(obj), wordlen)) {
+			ret = ast_cli_completion_add(ast_strdup(ast_sorcery_object_get_id(obj)));
+			if (ret) {
+				ao2_ref(obj, -1);
+				break;
+			}
+		}
+		ao2_ref(obj, -1);
+	}
+	ao2_iterator_destroy(&it);
+
+	ao2_ref(container, -1);
+
+	return NULL;
+}
+
+static int aeap_cli_show(void *obj, void *arg, int flags)
+{
+	struct ast_cli_args *a = arg;
+	struct ast_variable *options;
+	struct ast_variable *i;
+
+	if (!obj) {
+		ast_cli(a->fd, "No AEAP configuration found\n");
+		return 0;
+	}
+
+	options = ast_variable_list_sort(ast_sorcery_objectset_create(aeap_sorcery, obj));
+	if (!options) {
+		return 0;
+	}
+
+	ast_cli(a->fd, "%s: %s\n", ast_sorcery_object_get_type(obj),
+		ast_sorcery_object_get_id(obj));
+
+	for (i = options; i; i = i->next) {
+		ast_cli(a->fd, "\t%s: %s\n", i->name, i->value);
+	}
+
+	ast_cli(a->fd, "\n");
+
+	ast_variables_destroy(options);
+
+	return 0;
+}
+
+static char *client_config_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+	struct ast_aeap_client_config *cfg;
+
+	switch(cmd) {
+	case CLI_INIT:
+		e->command = "aeap show client";
+		e->usage =
+			"Usage: aeap show client <id>\n"
+			"       Show the AEAP settings for a given client\n";
+		return NULL;
+	case CLI_GENERATE:
+		if (a->pos == 3) {
+			return aeap_tab_complete_name(a->word, ast_aeap_client_configs_get(NULL));
+		} else {
+			return NULL;
+		}
+	}
+
+	if (a->argc != 4) {
+		return CLI_SHOWUSAGE;
+	}
+
+	cfg = client_config_get(a->argv[3]);
+	aeap_cli_show(cfg, a, 0);
+	ao2_cleanup(cfg);
+
+	return CLI_SUCCESS;
+}
+
+static char *client_config_show_all(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+	struct ao2_container *container;
+
+	switch(cmd) {
+	case CLI_INIT:
+		e->command = "aeap show clients";
+		e->usage =
+			"Usage: aeap show clients\n"
+			"       Show all configured AEAP clients\n";
+		return NULL;
+	case CLI_GENERATE:
+		return NULL;
+	}
+
+	if (a->argc != 3) {
+		return CLI_SHOWUSAGE;
+	}
+
+	container = ast_aeap_client_configs_get(NULL);
+	if (!container || ao2_container_count(container) == 0) {
+		ast_cli(a->fd, "No AEAP clients found\n");
+		ao2_cleanup(container);
+		return CLI_SUCCESS;
+	}
+
+	ao2_callback(container, OBJ_NODATA, aeap_cli_show, a);
+	ao2_ref(container, -1);
+
+	return CLI_SUCCESS;
+}
+
+static struct ast_cli_entry aeap_cli[] = {
+	AST_CLI_DEFINE(client_config_show, "Show AEAP client configuration by id"),
+	AST_CLI_DEFINE(client_config_show_all, "Show all AEAP client configurations"),
+};
+
+static struct ast_aeap *aeap_create(const char *id,	const struct ast_aeap_params *params,
+	int connect, int timeout)
+{
+	struct ast_aeap_client_config *cfg;
+	struct ast_aeap *aeap;
+	const char *url = NULL;
+	const char *protocol = NULL;
+
+	cfg = client_config_get(id);
+	if (cfg) {
+		url = cfg->url;
+		protocol = cfg->protocol;
+	}
+
+#ifdef TEST_FRAMEWORK
+	else if (ast_begins_with(id, "_aeap_test_")) {
+		url = "ws://127.0.0.1:8088/ws";
+		protocol = id;
+	}
+#endif
+
+	if (!url && !protocol) {
+		ast_log(LOG_ERROR, "AEAP: unable to get configuration for '%s'\n", id);
+		return NULL;
+	}
+
+	aeap = connect ? ast_aeap_create_and_connect(url, params, url, protocol, timeout) :
+		ast_aeap_create(url, params);
+
+	ao2_cleanup(cfg);
+	return aeap;
+}
+
+struct ast_aeap *ast_aeap_create_by_id(const char *id, const struct ast_aeap_params *params)
+{
+	return aeap_create(id, params, 0, 0);
+}
+
+struct ast_aeap *ast_aeap_create_and_connect_by_id(const char *id,
+	const struct ast_aeap_params *params, int timeout)
+{
+	return aeap_create(id, params, 1, timeout);
+}
+
+struct ast_variable *ast_aeap_custom_fields_get(const char *id)
+{
+	struct ast_aeap_client_config *cfg;
+	struct ast_variable *vars;
+
+	cfg = client_config_get(id);
+	if (!cfg) {
+		ast_log(LOG_WARNING, "AEAP: no client configuration '%s' to get fields\n", id);
+		return NULL;
+	}
+
+	vars = ast_sorcery_objectset_create(aeap_sorcery, cfg);
+
+	ao2_ref(cfg, -1);
+	return vars;
+}
+
+static int reload_module(void)
+{
+	ast_sorcery_reload(aeap_sorcery);
+
+	return 0;
+}
+
+static int unload_module(void)
+{
+	ast_sorcery_unref(aeap_sorcery);
+	aeap_sorcery = NULL;
+
+	ast_cli_unregister_multiple(aeap_cli, ARRAY_LEN(aeap_cli));
+
+	aeap_general_finalize();
+
+	return 0;
+}
+
+static int load_module(void)
+{
+	if (aeap_general_initialize()) {
+		return AST_MODULE_LOAD_DECLINE;
+	}
+
+	if (!(aeap_sorcery = ast_sorcery_open()))
+	{
+		ast_log(LOG_ERROR, "AEAP - failed to open sorcery\n");
+		return AST_MODULE_LOAD_DECLINE;
+	}
+
+	ast_sorcery_apply_default(aeap_sorcery, AEAP_CONFIG_CLIENT, "config", "aeap.conf,criteria=type=client");
+
+	if (ast_sorcery_object_register(aeap_sorcery, "client", client_config_alloc,
+		NULL, client_config_apply)) {
+		ast_log(LOG_ERROR, "AEAP - failed to register client sorcery object\n");
+		return AST_MODULE_LOAD_DECLINE;
+	}
+
+	ast_sorcery_object_field_register(aeap_sorcery, AEAP_CONFIG_CLIENT, "type", "", OPT_NOOP_T, 0, 0);
+	ast_sorcery_object_field_register(aeap_sorcery, AEAP_CONFIG_CLIENT, "url", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_aeap_client_config, url));
+	ast_sorcery_object_field_register(aeap_sorcery, AEAP_CONFIG_CLIENT, "protocol", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_aeap_client_config, protocol));
+	ast_sorcery_object_field_register(aeap_sorcery, AEAP_CONFIG_CLIENT, "codecs", "", OPT_CODEC_T, 1, FLDSET(struct ast_aeap_client_config, codecs));
+
+	ast_sorcery_load(aeap_sorcery);
+
+	ast_cli_register_multiple(aeap_cli, ARRAY_LEN(aeap_cli));
+
+	return 0;
+}
+
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
+	"Asterisk External Application Protocol Module for Asterisk",
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.reload = reload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.requires = "res_http_websocket",
+);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap.exports.in asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap.exports.in
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_aeap.exports.in	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_aeap.exports.in	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,7 @@
+{
+	global:
+		LINKER_SYMBOL_PREFIXaeap_*;
+		LINKER_SYMBOL_PREFIXast_aeap_*;
+	local:
+		*;
+};
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_agi.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_agi.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_agi.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_agi.c	2022-05-12 11:50:59.000000000 +0000
@@ -794,14 +794,10 @@
 			Enable/Disable Music on hold generator
 		</synopsis>
 		<syntax>
-			<parameter required="true">
+			<parameter name="boolean" required="true">
 				<enumlist>
-					<enum>
-						<parameter name="on" literal="true" required="true" />
-					</enum>
-					<enum>
-						<parameter name="off" literal="true" required="true" />
-					</enum>
+					<enum name="on" />
+					<enum name="off" />
 				</enumlist>
 			</parameter>
 			<parameter name="class" required="true" />
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_calendar_caldav.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_calendar_caldav.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_calendar_caldav.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_calendar_caldav.c	2022-05-12 11:50:59.000000000 +0000
@@ -404,8 +404,8 @@
 		if (!ast_strlen_zero(event->summary)) {
 			ast_string_field_set(event, uid, event->summary);
 		} else {
-			char tmp[100];
-			snprintf(tmp, sizeof(tmp), "%ld", event->start);
+			char tmp[AST_TIME_T_LEN];
+			ast_time_t_to_string(event->start, tmp, sizeof(tmp));
 			ast_string_field_set(event, uid, tmp);
 		}
 	}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_calendar_icalendar.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_calendar_icalendar.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_calendar_icalendar.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_calendar_icalendar.c	2022-05-12 11:50:59.000000000 +0000
@@ -245,8 +245,8 @@
 		if (!ast_strlen_zero(event->summary)) {
 			ast_string_field_set(event, uid, event->summary);
 		} else {
-			char tmp[100];
-			snprintf(tmp, sizeof(tmp), "%ld", event->start);
+			char tmp[AST_TIME_T_LEN];
+			ast_time_t_to_string(event->start, tmp, sizeof(tmp));
 			ast_string_field_set(event, uid, tmp);
 		}
 	}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_crypto.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_crypto.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_crypto.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_crypto.c	2022-05-12 11:50:59.000000000 +0000
@@ -35,6 +35,8 @@
 
 #include <dirent.h>                 /* for closedir, opendir, readdir, DIR */
 
+#define OPENSSL_SUPPRESS_DEPRECATED 1
+
 #include <openssl/aes.h>            /* for AES_decrypt, AES_encrypt, AES_set... */
 #include <openssl/err.h>            /* for ERR_print_errors_fp */
 #include <openssl/ssl.h>            /* for NID_sha1, RSA */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_http_media_cache.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_http_media_cache.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_http_media_cache.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_http_media_cache.c	2022-05-12 11:50:59.000000000 +0000
@@ -116,7 +116,7 @@
 static void bucket_file_set_expiration(struct ast_bucket_file *bucket_file)
 {
 	struct ast_bucket_metadata *metadata;
-	char time_buf[32];
+	char time_buf[32], secs[AST_TIME_T_LEN];
 	struct timeval actual_expires = ast_tvnow();
 
 	metadata = ast_bucket_file_metadata_get(bucket_file, "cache-control");
@@ -150,7 +150,8 @@
 	}
 
 	/* Use 'now' if we didn't get an expiration time */
-	snprintf(time_buf, sizeof(time_buf), "%30lu", actual_expires.tv_sec);
+	ast_time_t_to_string(actual_expires.tv_sec, secs, sizeof(secs));
+	snprintf(time_buf, sizeof(time_buf), "%30s", secs);
 
 	ast_bucket_file_metadata_set(bucket_file, "__actual_expires", time_buf);
 }
@@ -314,7 +315,7 @@
 		return 1;
 	}
 
-	if (sscanf(metadata->value, "%lu", &expires.tv_sec) != 1) {
+	if ((expires.tv_sec = ast_string_to_time_t(metadata->value)) == -1) {
 		return 1;
 	}
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_odbc.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_odbc.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_odbc.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_odbc.c	2022-05-12 11:50:59.000000000 +0000
@@ -1029,7 +1029,9 @@
 	/* Dont connect while server is marked as unreachable via negative_connection_cache */
 	negative_cache_expiration = obj->parent->last_negative_connect.tv_sec + obj->parent->negative_connection_cache.tv_sec;
 	if (time(NULL) < negative_cache_expiration) {
-		ast_log(LOG_WARNING, "Not connecting to %s. Negative connection cache for %ld seconds\n", obj->parent->name, negative_cache_expiration - time(NULL));
+		char secs[AST_TIME_T_LEN];
+		ast_time_t_to_string(negative_cache_expiration - time(NULL), secs, sizeof(secs));
+		ast_log(LOG_WARNING, "Not connecting to %s. Negative connection cache for %s seconds\n", obj->parent->name, secs);
 		return ODBC_FAIL;
 	}
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip/config_global.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip/config_global.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip/config_global.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip/config_global.c	2022-05-12 11:50:59.000000000 +0000
@@ -48,6 +48,7 @@
 #define DEFAULT_MWI_TPS_QUEUE_HIGH AST_TASKPROCESSOR_HIGH_WATER_LEVEL
 #define DEFAULT_MWI_TPS_QUEUE_LOW -1
 #define DEFAULT_MWI_DISABLE_INITIAL_UNSOLICITED 0
+#define DEFAULT_ALLOW_SENDING_180_AFTER_183 0
 #define DEFAULT_IGNORE_URI_USER_OPTIONS 0
 #define DEFAULT_USE_CALLERID_CONTACT 0
 #define DEFAULT_SEND_CONTACT_STATUS_ON_UPDATE_REGISTRATION 0
@@ -92,6 +93,8 @@
 	unsigned int contact_expiration_check_interval;
 	/*! Nonzero to disable multi domain support */
 	unsigned int disable_multi_domain;
+	/*! Nonzero to disable changing 180/SDP to 183/SDP */
+	unsigned int allow_sending_180_after_183;
 	/*! The maximum number of unidentified requests per source IP address before a security event is logged */
 	unsigned int unidentified_request_count;
 	/*! The period during which unidentified requests are accumulated */
@@ -444,6 +447,21 @@
 	return disable_initial_unsolicited;
 }
 
+unsigned int ast_sip_get_allow_sending_180_after_183(void)
+{
+	unsigned int allow_sending_180_after_183;
+	struct global_config *cfg;
+
+	cfg = get_global_cfg();
+	if (!cfg) {
+		return DEFAULT_ALLOW_SENDING_180_AFTER_183;
+	}
+
+	allow_sending_180_after_183 = cfg->allow_sending_180_after_183;
+	ao2_ref(cfg, -1);
+	return allow_sending_180_after_183;
+}
+
 unsigned int ast_sip_get_ignore_uri_user_options(void)
 {
 	unsigned int ignore_uri_user_options;
@@ -708,6 +726,9 @@
 	ast_sorcery_object_field_register(sorcery, "global", "mwi_disable_initial_unsolicited",
 		DEFAULT_MWI_DISABLE_INITIAL_UNSOLICITED ? "yes" : "no",
 		OPT_BOOL_T, 1, FLDSET(struct global_config, mwi.disable_initial_unsolicited));
+	ast_sorcery_object_field_register(sorcery, "global", "allow_sending_180_after_183",
+		DEFAULT_ALLOW_SENDING_180_AFTER_183 ? "yes" : "no",
+		OPT_BOOL_T, 1, FLDSET(struct global_config, allow_sending_180_after_183));
 	ast_sorcery_object_field_register(sorcery, "global", "ignore_uri_user_options",
 		DEFAULT_IGNORE_URI_USER_OPTIONS ? "yes" : "no",
 		OPT_BOOL_T, 1, FLDSET(struct global_config, ignore_uri_user_options));
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip/config_transport.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip/config_transport.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip/config_transport.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip/config_transport.c	2022-05-12 11:50:59.000000000 +0000
@@ -659,6 +659,12 @@
 		return -1;
 	}
 
+	if (transport->async_operations != 1) {
+		ast_log(LOG_WARNING, "The async_operations setting on transport '%s' has been set to '%d'. The setting can no longer be set and is always 1.\n",
+			transport_id, transport->async_operations);
+		transport->async_operations = 1;
+	}
+
 	perm_state = find_internal_state_by_transport(transport);
 	if (perm_state) {
 		ast_sorcery_diff(sorcery, perm_state->transport, transport, &changes);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip/location.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip/location.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip/location.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip/location.c	2022-05-12 11:50:59.000000000 +0000
@@ -489,7 +489,10 @@
 static int expiration_struct2str(const void *obj, const intptr_t *args, char **buf)
 {
 	const struct ast_sip_contact *contact = obj;
-	return (ast_asprintf(buf, "%ld", contact->expiration_time.tv_sec) < 0) ? -1 : 0;
+	char secs[AST_TIME_T_LEN];
+
+	ast_time_t_to_string(contact->expiration_time.tv_sec, secs, sizeof(secs));
+	return (ast_asprintf(buf, "%s", secs) < 0) ? -1 : 0;
 }
 
 static int permanent_uri_sort_fn(const void *obj_left, const void *obj_right, int flags)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip/pjsip_config.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip/pjsip_config.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip/pjsip_config.xml	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip/pjsip_config.xml	2022-05-12 11:50:59.000000000 +0000
@@ -1622,7 +1622,7 @@
 						will not suffice.</para></note>
 				</description>
 				<configOption name="async_operations" default="1">
-					<synopsis>Number of simultaneous Asynchronous Operations</synopsis>
+					<synopsis>Number of simultaneous Asynchronous Operations, can no longer be set, always set to 1</synopsis>
 				</configOption>
 				<configOption name="bind">
 					<synopsis>IP Address and optional port to bind to for this transport</synopsis>
@@ -2348,6 +2348,17 @@
 				<configOption name="norefersub" default="yes">
 					<synopsis>Advertise support for RFC4488 REFER subscription suppression</synopsis>
 				</configOption>
+				<configOption name="allow_sending_180_after_183" default="no">
+					<synopsis>Allow 180 after 183</synopsis>
+					<description><para>
+						Allow Asterisk to send 180 Ringing to an endpoint
+						after 183 Session Progress has been send.
+						If disabled Asterisk will instead send only a
+						183 Session Progress to the endpoint.
+						(default: "no")
+						</para>
+					</description>
+				</configOption>
 			</configObject>
 		</configFile>
 	</configInfo>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip/pjsip_options.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip/pjsip_options.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip/pjsip_options.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip/pjsip_options.c	2022-05-12 11:50:59.000000000 +0000
@@ -2722,6 +2722,7 @@
 	struct ast_sip_contact_status *status;
 	struct ast_str *buf;
 	const struct ast_sip_endpoint *endpoint = ami->arg;
+	char secs[AST_TIME_T_LEN];
 
 	buf = ast_sip_create_ami_event("ContactStatusDetail", ami);
 	if (!buf) {
@@ -2733,7 +2734,8 @@
 	ast_str_append(&buf, 0, "AOR: %s\r\n", wrapper->aor_id);
 	ast_str_append(&buf, 0, "URI: %s\r\n", contact->uri);
 	ast_str_append(&buf, 0, "UserAgent: %s\r\n", contact->user_agent);
-	ast_str_append(&buf, 0, "RegExpire: %ld\r\n", contact->expiration_time.tv_sec);
+	ast_time_t_to_string(contact->expiration_time.tv_sec, secs, sizeof(secs));
+	ast_str_append(&buf, 0, "RegExpire: %s\r\n", secs);
 	if (!ast_strlen_zero(contact->via_addr)) {
 		ast_str_append(&buf, 0, "ViaAddress: %s", contact->via_addr);
 		if (contact->via_port) {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip_header_funcs.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip_header_funcs.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip_header_funcs.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip_header_funcs.c	2022-05-12 11:50:59.000000000 +0000
@@ -146,6 +146,11 @@
 		</description>
 	</function>
 	<function name="PJSIP_HEADERS" language="en_US">
+		<since>
+			<version>16.20.0</version>
+			<version>18.6.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Gets the list of SIP header names from an INVITE message.
 		</synopsis>
@@ -747,7 +752,6 @@
  */
 static void outgoing_request(struct ast_sip_session *session, pjsip_tx_data * tdata)
 {
-	pj_pool_t *pool = session->inv_session->dlg->pool;
 	struct hdr_list *list;
 	struct hdr_list_entry *le;
 	RAII_VAR(struct ast_datastore *, datastore,
@@ -760,7 +764,7 @@
 
 	list = datastore->data;
 	AST_LIST_TRAVERSE(list, le, nextptr) {
-		pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr *) pjsip_hdr_clone(pool, le->hdr));
+		pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr *) pjsip_hdr_clone(tdata->pool, le->hdr));
 	}
 	ast_sip_session_remove_datastore(session, datastore->uid);
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip_history.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip_history.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip_history.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip_history.c	2022-05-12 11:50:59.000000000 +0000
@@ -199,7 +199,7 @@
 	{
 		struct timeval right = { 0, };
 
-		if (sscanf(op_right->field, "%ld", &right.tv_sec) != 1) {
+		if ((right.tv_sec = ast_string_to_time_t(op_right->field)) == -1) {
 			ast_log(LOG_WARNING, "Unable to extract field '%s': not a timestamp\n", op_right->field);
 			return -1;
 		}
@@ -270,7 +270,7 @@
 	{
 		struct timeval right = { 0, };
 
-		if (sscanf(op_right->field, "%ld", &right.tv_sec) != 1) {
+		if ((right.tv_sec = ast_string_to_time_t(op_right->field)) == -1) {
 			ast_log(LOG_WARNING, "Unable to extract field '%s': not a timestamp\n", op_right->field);
 			return -1;
 		}
@@ -319,7 +319,7 @@
 	{
 		struct timeval right = { 0, };
 
-		if (sscanf(op_right->field, "%ld", &right.tv_sec) != 1) {
+		if ((right.tv_sec = ast_string_to_time_t(op_right->field)) == -1) {
 			ast_log(LOG_WARNING, "Unable to extract field '%s': not a timestamp\n", op_right->field);
 			return -1;
 		}
@@ -656,7 +656,7 @@
 /*! \brief Format single line history entry */
 static void sprint_list_entry(struct pjsip_history_entry *entry, char *line, int len)
 {
-	char addr[64];
+	char addr[64], secs[AST_TIME_T_LEN];
 
 	if (entry->transmitted) {
 		pj_sockaddr_print(&entry->dst, addr, sizeof(addr), 3);
@@ -664,22 +664,24 @@
 		pj_sockaddr_print(&entry->src, addr, sizeof(addr), 3);
 	}
 
+	ast_time_t_to_string(entry->timestamp.tv_sec, secs, sizeof(secs));
+
 	if (entry->msg->type == PJSIP_REQUEST_MSG) {
 		char uri[128];
 
 		pjsip_uri_print(PJSIP_URI_IN_REQ_URI, entry->msg->line.req.uri, uri, sizeof(uri));
-		snprintf(line, len, "%-5.5d %-10.10ld %-5.5s %-24.24s %.*s %s SIP/2.0",
+		snprintf(line, len, "%-5.5d %-10.10s %-5.5s %-24.24s %.*s %s SIP/2.0",
 			entry->number,
-			entry->timestamp.tv_sec,
+			secs,
 			entry->transmitted ? "* ==>" : "* <==",
 			addr,
 			(int)pj_strlen(&entry->msg->line.req.method.name),
 			pj_strbuf(&entry->msg->line.req.method.name),
 			uri);
 	} else {
-		snprintf(line, len, "%-5.5d %-10.10ld %-5.5s %-24.24s SIP/2.0 %u %.*s",
+		snprintf(line, len, "%-5.5d %-10.10s %-5.5s %-24.24s SIP/2.0 %u %.*s",
 			entry->number,
-			entry->timestamp.tv_sec,
+			secs,
 			entry->transmitted ? "* ==>" : "* <==",
 			addr,
 			entry->msg->line.status.code,
@@ -1149,7 +1151,7 @@
 /*! \brief Print a detailed view of a single entry in the history to the CLI */
 static void display_single_entry(struct ast_cli_args *a, struct pjsip_history_entry *entry)
 {
-	char addr[64];
+	char addr[64], secs[AST_TIME_T_LEN];
 	char *buf;
 
 	buf = ast_calloc(1, PJSIP_MAX_PKT_LEN * sizeof(char));
@@ -1169,11 +1171,12 @@
 		pj_sockaddr_print(&entry->src, addr, sizeof(addr), 3);
 	}
 
-	ast_cli(a->fd, "<--- History Entry %d %s %s at %-10.10ld --->\n",
+	ast_time_t_to_string(entry->timestamp.tv_sec, secs, sizeof(secs));
+	ast_cli(a->fd, "<--- History Entry %d %s %s at %-10.10s --->\n",
 		entry->number,
 		entry->transmitted ? "Sent to" : "Received from",
 		addr,
-		entry->timestamp.tv_sec);
+		secs);
 	ast_cli(a->fd, "%s\n", buf);
 
 	ast_free(buf);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip_pubsub.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip_pubsub.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip_pubsub.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip_pubsub.c	2022-05-12 11:50:59.000000000 +0000
@@ -1257,7 +1257,14 @@
 		const char *resource, const char *display_name, struct sip_subscription_tree *tree)
 {
 	struct ast_sip_subscription *sub;
-	pjsip_sip_uri *contact_uri;
+	pjsip_msg *msg;
+	pjsip_sip_uri *request_uri;
+
+	msg = ast_sip_mod_data_get(tree->dlg->mod_data, pubsub_module.id, MOD_DATA_MSG);
+	if (!msg) {
+		ast_log(LOG_ERROR, "No dialog message saved for SIP subscription. Cannot allocate subscription for resource %s\n", resource);
+		return NULL;
+	}
 
 	sub = ast_calloc(1, sizeof(*sub) + strlen(resource) + 1);
 	if (!sub) {
@@ -1280,8 +1287,8 @@
 	}
 
 	sub->uri = pjsip_sip_uri_create(tree->dlg->pool, PJ_FALSE);
-	contact_uri = pjsip_uri_get_uri(tree->dlg->local.contact->uri);
-	pjsip_sip_uri_assign(tree->dlg->pool, sub->uri, contact_uri);
+	request_uri = pjsip_uri_get_uri(msg->line.req.uri);
+	pjsip_sip_uri_assign(tree->dlg->pool, sub->uri, request_uri);
 	pj_strdup2(tree->dlg->pool, &sub->uri->user, resource);
 
 	/* If there is any persistence information available for this subscription that was persisted
@@ -4872,7 +4879,11 @@
 static int persistence_expires_struct2str(const void *obj, const intptr_t *args, char **buf)
 {
 	const struct subscription_persistence *persistence = obj;
-	return (ast_asprintf(buf, "%ld", persistence->expires.tv_sec) < 0) ? -1 : 0;
+	char secs[AST_TIME_T_LEN];
+
+	ast_time_t_to_string(persistence->expires.tv_sec, secs, sizeof(secs));
+
+	return (ast_asprintf(buf, "%s", secs) < 0) ? -1 : 0;
 }
 
 #define RESOURCE_LIST_INIT_SIZE 4
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip_registrar.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip_registrar.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip_registrar.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip_registrar.c	2022-05-12 11:50:59.000000000 +0000
@@ -1365,12 +1365,13 @@
 {
 	struct ao2_container *contacts;
 	struct ast_variable *var;
-	char *time = alloca(64);
+	char time[AST_TIME_T_LEN];
 
 	while (check_interval) {
 		sleep(check_interval);
 
-		sprintf(time, "%ld", ast_tvnow().tv_sec);
+		ast_time_t_to_string(ast_tvnow().tv_sec, time, sizeof(time));
+
 		var = ast_variable_new("expiration_time <=", time, "");
 
 		ast_debug(4, "Woke up at %s  Interval: %d\n", time, check_interval);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip_sdp_rtp.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip_sdp_rtp.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip_sdp_rtp.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip_sdp_rtp.c	2022-05-12 11:50:59.000000000 +0000
@@ -106,9 +106,10 @@
 {
 	struct ast_sip_session_media *session_media = (struct ast_sip_session_media *)data;
 	struct ast_rtp_instance *rtp = session_media->rtp;
+	struct ast_channel *chan;
 	int elapsed;
+	int now;
 	int timeout;
-	struct ast_channel *chan;
 
 	if (!rtp) {
 		return 0;
@@ -119,41 +120,37 @@
 		return 0;
 	}
 
-	/* Get channel lock to make sure that we access a consistent set of values
-	 * (last_rx and direct_media_addr) - the lock is held when values are modified
-	 * (see send_direct_media_request()/check_for_rtp_changes() in chan_pjsip.c). We
-	 * are trying to avoid a situation where direct_media_addr has been reset but the
-	 * last-rx time was not set yet.
-	 */
-	ast_channel_lock(chan);
-
-	elapsed = time(NULL) - ast_rtp_instance_get_last_rx(rtp);
+	/* Store these values locally to avoid multiple function calls */
+	now = time(NULL);
 	timeout = ast_rtp_instance_get_timeout(rtp);
-	if (elapsed < timeout) {
-		ast_channel_unlock(chan);
+
+	/* If the channel is not in UP state or call is redirected
+	 * outside Asterisk return for later check.
+	 */
+	if (ast_channel_state(chan) != AST_STATE_UP || !ast_sockaddr_isnull(&session_media->direct_media_addr)) {
+		/* Avoiding immediately disconnect after channel up or direct media has been stopped */
+		ast_rtp_instance_set_last_rx(rtp, now);
 		ast_channel_unref(chan);
-		return (timeout - elapsed) * 1000;
+		/* Recheck after half timeout for avoiding possible races
+		* and faster reacting to cases while there is no an RTP at all.
+		*/
+		return timeout * 500;
 	}
 
-	/* Last RTP packet was received too long ago
-	 * - disconnect channel unless direct media is in use.
-	 */
-	if (!ast_sockaddr_isnull(&session_media->direct_media_addr)) {
-		ast_debug_rtp(3, "(%p) RTP not disconnecting channel '%s' for lack of %s RTP activity in %d seconds "
-			"since direct media is in use\n", rtp, ast_channel_name(chan),
-			ast_codec_media_type2str(session_media->type), elapsed);
-		ast_channel_unlock(chan);
+	elapsed = now - ast_rtp_instance_get_last_rx(rtp);
+	if (elapsed < timeout) {
 		ast_channel_unref(chan);
-		return timeout * 1000; /* recheck later, direct media may have ended then */
+		return (timeout - elapsed) * 1000;
 	}
 
 	ast_log(LOG_NOTICE, "Disconnecting channel '%s' for lack of %s RTP activity in %d seconds\n",
 		ast_channel_name(chan), ast_codec_media_type2str(session_media->type), elapsed);
 
+	ast_channel_lock(chan);
 	ast_channel_hangupcause_set(chan, AST_CAUSE_REQUESTED_CHAN_UNAVAIL);
-	ast_softhangup(chan, AST_SOFTHANGUP_DEV);
-
 	ast_channel_unlock(chan);
+
+	ast_softhangup(chan, AST_SOFTHANGUP_DEV);
 	ast_channel_unref(chan);
 
 	return 0;
@@ -2234,8 +2231,7 @@
 	}
 
 	if (ast_rtp_instance_get_timeout(session_media->rtp)) {
-		session_media->timeout_sched_id = ast_sched_add_variable(sched,
-			ast_rtp_instance_get_timeout(session_media->rtp) * 1000, rtp_check_timeout,
+		session_media->timeout_sched_id = ast_sched_add_variable(sched,	500, rtp_check_timeout,
 			session_media, 1);
 	}
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip_stir_shaken.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip_stir_shaken.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_pjsip_stir_shaken.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_pjsip_stir_shaken.c	2022-05-12 11:50:59.000000000 +0000
@@ -225,8 +225,13 @@
 	}
 
 	profile = ast_stir_shaken_get_profile(session->endpoint->stir_shaken_profile);
+	/* Profile should be checked first as it takes priority over anything else.
+	 * If there is a profile and it doesn't have verification enabled, do nothing.
+	 * If there is no profile and the stir_shaken option is either not set or does
+	 * not support verification, do nothing.
+	 */
 	if ((profile && !ast_stir_shaken_profile_supports_verification(profile))
-		&& ((session->endpoint->stir_shaken & AST_SIP_STIR_SHAKEN_VERIFY) == 0)) {
+		|| (!profile && (session->endpoint->stir_shaken & AST_SIP_STIR_SHAKEN_VERIFY) == 0)) {
 		return 0;
 	}
 
@@ -478,8 +483,13 @@
 	RAII_VAR(struct stir_shaken_profile *, profile, NULL, ao2_cleanup);
 
 	profile = ast_stir_shaken_get_profile(session->endpoint->stir_shaken_profile);
+	/* Profile should be checked first as it takes priority over anything else.
+	 * If there is a profile and it doesn't have attestation enabled, do nothing.
+	 * If there is no profile and the stir_shaken option is either not set or does
+	 * not support attestation, do nothing.
+	 */
 	if ((profile && !ast_stir_shaken_profile_supports_attestation(profile))
-		&& ((session->endpoint->stir_shaken & AST_SIP_STIR_SHAKEN_ATTEST) == 0)) {
+		|| (!profile && (session->endpoint->stir_shaken & AST_SIP_STIR_SHAKEN_ATTEST) == 0)) {
 		return;
 	}
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_rtp_asterisk.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_rtp_asterisk.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_rtp_asterisk.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_rtp_asterisk.c	2022-05-12 11:50:59.000000000 +0000
@@ -47,6 +47,7 @@
 #include <math.h>
 
 #ifdef HAVE_OPENSSL
+#define OPENSSL_SUPPRESS_DEPRECATED 1
 #include <openssl/opensslconf.h>
 #include <openssl/opensslv.h>
 #if !defined(OPENSSL_NO_SRTP) && (OPENSSL_VERSION_NUMBER >= 0x10001000L)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_speech_aeap.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_speech_aeap.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_speech_aeap.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_speech_aeap.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,731 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ *
+ * \brief Asterisk External Application Speech Engine
+ *
+ */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#include "asterisk/astobj2.h"
+#include "asterisk/config.h"
+#include "asterisk/format.h"
+#include "asterisk/format_cap.h"
+#include "asterisk/json.h"
+#include "asterisk/module.h"
+#include "asterisk/speech.h"
+#include "asterisk/sorcery.h"
+
+#include "asterisk/res_aeap.h"
+#include "asterisk/res_aeap_message.h"
+
+#define SPEECH_AEAP_VERSION "0.1.0"
+#define SPEECH_PROTOCOL "speech_to_text"
+
+#define CONNECTION_TIMEOUT 2000
+
+#define log_error(obj, fmt, ...) \
+	ast_log(LOG_ERROR, "AEAP speech (%p): " fmt "\n", obj, ##__VA_ARGS__)
+
+static struct ast_json *custom_fields_to_params(const struct ast_variable *variables)
+{
+	const struct ast_variable *i;
+	struct ast_json *obj;
+
+	if (!variables) {
+		return NULL;
+	}
+
+	obj = ast_json_object_create();
+	if (!obj) {
+		return NULL;
+	}
+
+	for (i = variables; i; i = i->next) {
+		if (i->name[0] == '@' && i->name[1]) {
+			ast_json_object_set(obj, i->name + 1, ast_json_string_create(i->value));
+		}
+	}
+
+	return obj;
+}
+
+/*!
+ * \internal
+ * \brief Create, and send a request to the external application
+ *
+ * Create, then sends a request to an Asterisk external application, and then blocks
+ * until a response is received or a time out occurs. Since this method waits until
+ * receiving a response the returned result is guaranteed to be pass/fail based upon
+ * a response handler's result.
+ *
+ * \param name The name of the request to send
+ * \param json The core json request data
+ * \param data Optional user data to associate with request/response
+ *
+ * \returns 0 on success, -1 on error
+ */
+static int speech_aeap_send_request(struct ast_aeap *aeap, const char *name,
+	struct ast_json *json, void *obj)
+{
+	/*
+	 * Wait for a response. Also since we're blocking,
+	 * data is expected to be on the stack so no cleanup required.
+	 */
+	struct ast_aeap_tsx_params tsx_params = {
+		.timeout = 1000,
+		.wait = 1,
+		.obj = obj,
+	};
+
+	/* "steals" the json ref */
+	tsx_params.msg = ast_aeap_message_create_request(
+		ast_aeap_message_type_json, name, NULL, json);
+	if (!tsx_params.msg) {
+		return -1;
+	}
+
+	/* Send "steals" the json msg ref */
+	return ast_aeap_send_msg_tsx(aeap, &tsx_params);
+}
+
+/*!
+ * \internal
+ * \brief Create, and send a "get" request to an external application
+ *
+ * Basic structure of the JSON message to send:
+ *
+ *   { param: [<param>, ...] }
+ *
+ * \param speech The speech engine
+ * \param param The name of the parameter to retrieve
+ * \param data User data passed to the response handler
+ *
+ * \returns 0 on success, -1 on error
+ */
+static int speech_aeap_get(struct ast_speech *speech, const char *param, void *data)
+{
+	if (!param) {
+		return -1;
+	}
+
+	/* send_request handles json ref */
+	return speech_aeap_send_request(speech->data,
+		"get", ast_json_pack("{s:[s]}", "params", param), data);
+}
+
+struct speech_param {
+	const char *name;
+	const char *value;
+};
+
+/*!
+ * \internal
+ * \brief Create, and send a "set" request to an external application
+ *
+ * Basic structure of the JSON message to send:
+ *
+ *   { params: { <name> : <value> }  }
+ *
+ * \param speech The speech engine
+ * \param name The name of the parameter to set
+ * \param value The value of the parameter to set
+ *
+ * \returns 0 on success, -1 on error
+ */
+static int speech_aeap_set(struct ast_speech *speech, const char *name, const char *value)
+{
+	if (!name) {
+		return -1;
+	}
+
+	/* send_request handles json ref */
+	return speech_aeap_send_request(speech->data,
+		"set", ast_json_pack("{s:{s:s}}", "params", name, value), NULL);
+}
+
+static int handle_response_set(struct ast_aeap *aeap, struct ast_aeap_message *message, void *data)
+{
+	return 0;
+}
+
+struct speech_setting {
+	const char *param;
+	size_t len;
+	char *buf;
+};
+
+static int handle_setting(struct ast_aeap *aeap, struct ast_json_iter *iter,
+	struct speech_setting *setting)
+{
+	const char *value;
+
+	if (strcmp(ast_json_object_iter_key(iter), setting->param)) {
+		log_error(aeap, "Unable to 'get' speech setting for '%s'", setting->param);
+		return -1;
+	}
+
+	value = ast_json_string_get(ast_json_object_iter_value(iter));
+	if (!value) {
+		log_error(aeap, "No value for speech setting '%s'", setting->param);
+		return -1;
+	}
+
+	ast_copy_string(setting->buf, value, setting->len);
+	return 0;
+}
+
+static int handle_results(struct ast_aeap *aeap, struct ast_json_iter *iter,
+	struct ast_speech_result **speech_results)
+{
+	struct ast_speech_result *result = NULL;
+	struct ast_json *json_results;
+	struct ast_json *json_result;
+	size_t i;
+
+	json_results = ast_json_object_iter_value(iter);
+	if (!json_results || !speech_results) {
+		log_error(aeap, "Unable to 'get' speech results");
+		return -1;
+	}
+
+	for (i = 0; i < ast_json_array_size(json_results); ++i) {
+		if (!(result = ast_calloc(1, sizeof(*result)))) {
+			continue;
+		}
+
+		json_result = ast_json_array_get(json_results, i);
+
+		result->text = ast_strdup(ast_json_object_string_get(json_result, "text"));
+		result->score = ast_json_object_integer_get(json_result, "score");
+		result->grammar = ast_strdup(ast_json_object_string_get(json_result, "grammar"));
+		result->nbest_num = ast_json_object_integer_get(json_result, "best");
+		if (*speech_results) {
+			AST_LIST_NEXT(result, list) = *speech_results;
+			*speech_results = result;
+		} else {
+			*speech_results = result;
+		}
+	}
+
+	return 0;
+}
+
+/*!
+ * \internal
+ * \brief Handle a "get" response from an external application
+ *
+ * Basic structure of the expected JSON message to received:
+ *
+ *   {
+ *     response: "get"
+ *     "params" : { <name>: <value> | [ <results> ] }
+ *   }
+ *
+ * \param speech The speech engine
+ * \param param The name of the parameter to retrieve
+ * \param data User data passed to the response handler
+ *
+ * \returns 0 on success, -1 on error
+ */
+static int handle_response_get(struct ast_aeap *aeap, struct ast_aeap_message *message, void *data)
+{
+	struct ast_json_iter *iter;
+
+	iter = ast_json_object_iter(ast_json_object_get(ast_aeap_message_data(message), "params"));
+	if (!iter) {
+		log_error(aeap, "no 'get' parameters returned");
+		return -1;
+	}
+
+	if (!strcmp(ast_json_object_iter_key(iter), "results")) {
+		return handle_results(aeap, iter, data);
+	}
+
+	return handle_setting(aeap, iter, data);
+}
+
+static int handle_response_setup(struct ast_aeap *aeap, struct ast_aeap_message *message, void *data)
+{
+	struct ast_format *format = data;
+	struct ast_json *json = ast_aeap_message_data(message);
+	const char *codec_name;
+
+	if (!json) {
+		log_error(aeap, "no 'setup' object returned");
+		return -1;
+	}
+
+	json = ast_json_object_get(json, "codecs");
+	if (!json || ast_json_array_size(json) == 0) {
+		log_error(aeap, "no 'setup' codecs available");
+		return -1;
+	}
+
+	codec_name = ast_json_object_string_get(ast_json_array_get(json, 0), "name");
+	if (!codec_name || strcmp(codec_name, ast_format_get_codec_name(format))) {
+		log_error(aeap, "setup  codec '%s' unsupported", ast_format_get_codec_name(format));
+		return -1;
+	}
+
+	return 0;
+}
+
+static const struct ast_aeap_message_handler response_handlers[] = {
+	{ "setup", handle_response_setup },
+	{ "get", handle_response_get },
+	{ "set", handle_response_set },
+};
+
+static int handle_request_set(struct ast_aeap *aeap, struct ast_aeap_message *message, void *data)
+{
+	struct ast_json_iter *iter;
+	const char *error_msg = NULL;
+
+	iter = ast_json_object_iter(ast_json_object_get(ast_aeap_message_data(message), "params"));
+	if (!iter) {
+		error_msg = "no parameter(s) requested";
+	} else if (!strcmp(ast_json_object_iter_key(iter), "results")) {
+		struct ast_speech *speech = ast_aeap_user_data_object_by_id(aeap, "speech");
+
+		if (!speech) {
+			error_msg = "no associated speech object";
+		} else if (handle_results(aeap, iter, &speech->results)) {
+			error_msg = "unable to handle results";
+		} else {
+			ast_speech_change_state(speech, AST_SPEECH_STATE_DONE);
+		}
+	} else {
+		error_msg = "can only set 'results'";
+	}
+
+	if (error_msg) {
+		log_error(aeap, "set - %s", error_msg);
+		message = ast_aeap_message_create_error(ast_aeap_message_type_json,
+			ast_aeap_message_name(message), ast_aeap_message_id(message), error_msg);
+	} else {
+		message = ast_aeap_message_create_response(ast_aeap_message_type_json,
+			ast_aeap_message_name(message), ast_aeap_message_id(message), NULL);
+	}
+
+	ast_aeap_send_msg(aeap, message);
+
+	return 0;
+}
+
+static const struct ast_aeap_message_handler request_handlers[] = {
+	{ "set", handle_request_set },
+};
+
+static struct ast_aeap_params speech_aeap_params = {
+	.response_handlers = response_handlers,
+	.response_handlers_size = ARRAY_LEN(response_handlers),
+	.request_handlers = request_handlers,
+	.request_handlers_size = ARRAY_LEN(request_handlers),
+};
+
+/*!
+ * \internal
+ * \brief Create, and connect to an external application and send initial setup
+ *
+ * Basic structure of the JSON message to send:
+ *
+ *   {
+ *     "request": "setup"
+ *     "codecs": [
+ *         {
+ *             "name": <name>,
+ *             "attributes": { <name>: <value>, ..., }
+ *         },
+ *         ...,
+ *     ],
+ *     "params": { <name>: <value>, ..., }
+ *   }
+ *
+ * \param speech The speech engine
+ * \param format The format codec to use
+ *
+ * \returns 0 on success, -1 on error
+ */
+static int speech_aeap_engine_create(struct ast_speech *speech, struct ast_format *format)
+{
+	struct ast_aeap *aeap;
+	struct ast_variable *vars;
+	struct ast_json *json;
+
+	aeap = ast_aeap_create_and_connect_by_id(
+		speech->engine->name, &speech_aeap_params, CONNECTION_TIMEOUT);
+	if (!aeap) {
+		return -1;
+	}
+
+	speech->data = aeap;
+
+	/* Don't allow unloading of this module while an external application is in use */
+	ast_module_ref(ast_module_info->self);
+
+	vars = ast_aeap_custom_fields_get(speech->engine->name);
+
+	/* While the protocol allows sending of codec attributes, for now don't */
+	json = ast_json_pack("{s:s,s:[{s:s}],s:o*}", "version", SPEECH_AEAP_VERSION, "codecs",
+		"name", ast_format_get_codec_name(format), "params", custom_fields_to_params(vars));
+
+	ast_variables_destroy(vars);
+
+	if (ast_aeap_user_data_register(aeap, "speech", speech, NULL)) {
+		ast_module_unref(ast_module_info->self);
+		return -1;
+	}
+
+	/* send_request handles json ref */
+	if (speech_aeap_send_request(speech->data, "setup", json, format)) {
+		ast_module_unref(ast_module_info->self);
+		return -1;
+	}
+
+	/*
+	 * Add a reference to the engine here, so if it happens to get unregistered
+	 * while executing it won't disappear.
+	 */
+	ao2_ref(speech->engine, 1);
+
+	return 0;
+}
+
+static int speech_aeap_engine_destroy(struct ast_speech *speech)
+{
+	ao2_ref(speech->engine, -1);
+	ao2_cleanup(speech->data);
+
+	ast_module_unref(ast_module_info->self);
+
+	return 0;
+}
+
+static int speech_aeap_engine_write(struct ast_speech *speech, void *data, int len)
+{
+	return ast_aeap_send_binary(speech->data, data, len);
+}
+
+static int speech_aeap_engine_dtmf(struct ast_speech *speech, const char *dtmf)
+{
+	return speech_aeap_set(speech, "dtmf", dtmf);
+}
+
+static int speech_aeap_engine_start(struct ast_speech *speech)
+{
+	ast_speech_change_state(speech, AST_SPEECH_STATE_READY);
+
+	return 0;
+}
+
+static int speech_aeap_engine_change(struct ast_speech *speech, const char *name, const char *value)
+{
+	return speech_aeap_set(speech, name, value);
+}
+
+static int speech_aeap_engine_get_setting(struct ast_speech *speech, const char *name,
+	char *buf, size_t len)
+{
+	struct speech_setting setting = {
+		.param = name,
+		.len = len,
+		.buf = buf,
+	};
+
+	return speech_aeap_get(speech, name, &setting);
+}
+
+static int speech_aeap_engine_change_results_type(struct ast_speech *speech,
+	enum ast_speech_results_type results_type)
+{
+	return speech_aeap_set(speech, "results_type",
+		ast_speech_results_type_to_string(results_type));
+}
+
+static struct ast_speech_result *speech_aeap_engine_get(struct ast_speech *speech)
+{
+	struct ast_speech_result *results = NULL;
+
+	if (speech->results) {
+		return speech->results;
+	}
+
+	if (speech_aeap_get(speech, "results", &results)) {
+		return NULL;
+	}
+
+	return results;
+}
+
+static void speech_engine_destroy(void *obj)
+{
+	struct ast_speech_engine *engine = obj;
+
+	ao2_cleanup(engine->formats);
+	ast_free(engine->name);
+}
+
+static struct ast_speech_engine *speech_engine_alloc(const char *name)
+{
+	struct ast_speech_engine *engine;
+
+	engine = ao2_t_alloc_options(sizeof(*engine), speech_engine_destroy,
+		AO2_ALLOC_OPT_LOCK_NOLOCK, name);
+	if (!engine) {
+		ast_log(LOG_ERROR, "AEAP speech: unable create engine '%s'\n", name);
+		return NULL;
+	}
+
+	engine->name = ast_strdup(name);
+	if (!engine->name) {
+		ao2_ref(engine, -1);
+		return NULL;
+	}
+
+	engine->create = speech_aeap_engine_create;
+	engine->destroy = speech_aeap_engine_destroy;
+	engine->write = speech_aeap_engine_write;
+	engine->dtmf = speech_aeap_engine_dtmf;
+	engine->start = speech_aeap_engine_start;
+	engine->change = speech_aeap_engine_change;
+	engine->get_setting = speech_aeap_engine_get_setting;
+	engine->change_results_type = speech_aeap_engine_change_results_type;
+	engine->get = speech_aeap_engine_get;
+
+	engine->formats = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
+
+	return engine;
+}
+
+static void speech_engine_alloc_and_register(const char *name, const struct ast_format_cap *formats)
+{
+	struct ast_speech_engine *engine;
+
+	engine = speech_engine_alloc(name);
+	if (!engine) {
+		return;
+	}
+
+	if (formats && ast_format_cap_append_from_cap(engine->formats,
+			formats, AST_MEDIA_TYPE_AUDIO)) {
+		ast_log(LOG_WARNING, "AEAP speech: Unable to add engine '%s' formats\n", name);
+		ao2_ref(engine, -1);
+		return;
+	}
+
+	if (ast_speech_register(engine)) {
+		ast_log(LOG_WARNING, "AEAP speech: Unable to register engine '%s'\n", name);
+		ao2_ref(engine, -1);
+	}
+}
+
+#ifdef TEST_FRAMEWORK
+
+static void speech_engine_alloc_and_register2(const char *name, const char *codec_names)
+{
+	struct ast_speech_engine *engine;
+
+	engine = speech_engine_alloc(name);
+	if (!engine) {
+		return;
+	}
+
+	if (codec_names && ast_format_cap_update_by_allow_disallow(engine->formats, codec_names, 1)) {
+		ast_log(LOG_WARNING, "AEAP speech: Unable to add engine '%s' codecs\n", name);
+		ao2_ref(engine, -1);
+		return;
+	}
+
+	if (ast_speech_register(engine)) {
+		ast_log(LOG_WARNING, "AEAP speech: Unable to register engine '%s'\n", name);
+		ao2_ref(engine, -1);
+	}
+}
+
+#endif
+
+static int unload_engine(void *obj, void *arg, int flags)
+{
+	if (ast_aeap_client_config_has_protocol(obj, SPEECH_PROTOCOL)) {
+		ao2_cleanup(ast_speech_unregister2(ast_sorcery_object_get_id(obj)));
+	}
+
+	return 0;
+}
+
+static int load_engine(void *obj, void *arg, int flags)
+{
+	const char *id;
+	const struct ast_format_cap *formats;
+	const struct ast_speech_engine *engine;
+
+	if (!ast_aeap_client_config_has_protocol(obj, SPEECH_PROTOCOL)) {
+		return 0;
+	}
+
+	id = ast_sorcery_object_get_id(obj);
+	formats = ast_aeap_client_config_codecs(obj);
+	if (!formats) {
+		formats = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
+		if (!formats) {
+			ast_log(LOG_ERROR, "AEAP speech: unable to allocate default engine format for '%s'\n", id);
+			return 0;
+		}
+	}
+
+	engine = ast_speech_find_engine(id);
+	if (!engine) {
+		speech_engine_alloc_and_register(id, formats);
+		return 0;
+	}
+
+	if (ast_format_cap_identical(formats, engine->formats)) {
+		/* Same name, same formats then nothing changed */
+		return 0;
+	}
+
+	ao2_ref(ast_speech_unregister2(engine->name), -1);
+	speech_engine_alloc_and_register(id, formats);
+
+	return 0;
+}
+
+static int matches_engine(void *obj, void *arg, int flags)
+{
+	const struct ast_speech_engine *engine = arg;
+
+	return strcmp(ast_sorcery_object_get_id(obj), engine->name) ? 0 : CMP_MATCH;
+}
+
+static int should_unregister(const struct ast_speech_engine *engine, void *data)
+{
+	void *obj;
+
+	if (engine->create != speech_aeap_engine_create) {
+		/* Only want to potentially unregister AEAP speech engines */
+		return 0;
+	}
+
+#ifdef TEST_FRAMEWORK
+	if (!strcmp("_aeap_test_speech_", engine->name)) {
+		/* Don't remove the test engine */
+		return 0;
+	}
+#endif
+
+	obj = ao2_callback(data, 0, matches_engine, (void*)engine);
+
+	if (obj) {
+		ao2_ref(obj, -1);
+		return 0;
+	}
+
+	/* If no match in given container then unregister engine */
+	return 1;
+}
+
+static void speech_observer_loaded(const char *object_type)
+{
+	struct ao2_container *container;
+
+	if (strcmp(object_type, AEAP_CONFIG_CLIENT)) {
+		return;
+	}
+
+	container = ast_aeap_client_configs_get(SPEECH_PROTOCOL);
+	if (!container) {
+		return;
+	}
+
+	/*
+	 * An AEAP module reload has occurred. First
+	 * remove all engines that no longer exist.
+	 */
+	ast_speech_unregister_engines(should_unregister, container, __ao2_cleanup);
+
+	/* Now add or update engines */
+	ao2_callback(container, 0, load_engine, NULL);
+	ao2_ref(container, -1);
+}
+
+/*! \brief Observer for AEAP reloads */
+static const struct ast_sorcery_observer speech_observer = {
+	.loaded = speech_observer_loaded,
+};
+
+static int unload_module(void)
+{
+	struct ao2_container *container;
+
+#ifdef TEST_FRAMEWORK
+	ao2_cleanup(ast_speech_unregister2("_aeap_test_speech_"));
+#endif
+
+	ast_sorcery_observer_remove(ast_aeap_sorcery(), AEAP_CONFIG_CLIENT, &speech_observer);
+
+	container = ast_aeap_client_configs_get(SPEECH_PROTOCOL);
+	if (container) {
+		ao2_callback(container, 0, unload_engine, NULL);
+		ao2_ref(container, -1);
+	}
+
+	return 0;
+}
+
+static int load_module(void)
+{
+	struct ao2_container *container;
+
+	speech_aeap_params.msg_type = ast_aeap_message_type_json;
+
+	container = ast_aeap_client_configs_get(SPEECH_PROTOCOL);
+	if (container) {
+		ao2_callback(container, 0, load_engine, NULL);
+		ao2_ref(container, -1);
+	}
+
+	/*
+	 * Add an observer since a named speech server must be created,
+	 * registered, and eventually removed for all AEAP client
+	 * configuration matching the "speech_to_text" protocol.
+	*/
+	if (ast_sorcery_observer_add(ast_aeap_sorcery(), AEAP_CONFIG_CLIENT, &speech_observer)) {
+		return AST_MODULE_LOAD_DECLINE;
+	}
+
+#ifdef TEST_FRAMEWORK
+	speech_engine_alloc_and_register2("_aeap_test_speech_", "ulaw");
+#endif
+
+	return AST_MODULE_LOAD_SUCCESS;
+}
+
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk External Application Speech Engine",
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DEPEND,
+	.requires = "res_speech,res_aeap",
+);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_speech.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_speech.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_speech.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_speech.c	2022-05-12 11:50:59.000000000 +0000
@@ -42,7 +42,7 @@
 static struct ast_speech_engine *default_engine = NULL;
 
 /*! \brief Find a speech recognition engine of specified name, if NULL then use the default one */
-static struct ast_speech_engine *find_engine(const char *engine_name)
+struct ast_speech_engine *ast_speech_find_engine(const char *engine_name)
 {
 	struct ast_speech_engine *engine = NULL;
 
@@ -185,7 +185,7 @@
 	RAII_VAR(struct ast_format *, best, NULL, ao2_cleanup);
 
 	/* Try to find the speech recognition engine that was requested */
-	if (!(engine = find_engine(engine_name)))
+	if (!(engine = ast_speech_find_engine(engine_name)))
 		return NULL;
 
 	joint = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
@@ -313,7 +313,7 @@
 	}
 
 	/* If an engine is already loaded with this name, error out */
-	if (find_engine(engine->name)) {
+	if (ast_speech_find_engine(engine->name)) {
 		ast_log(LOG_WARNING, "Speech recognition engine '%s' already exists.\n", engine->name);
 		return -1;
 	}
@@ -366,6 +366,36 @@
 	return engine;
 }
 
+void ast_speech_unregister_engines(
+	int (*should_unregister)(const struct ast_speech_engine *engine, void *data), void *data,
+	void (*on_unregistered)(void *obj))
+{
+	struct ast_speech_engine *engine = NULL;
+
+	if (!should_unregister) {
+		return;
+	}
+
+	AST_RWLIST_WRLOCK(&engines);
+	AST_RWLIST_TRAVERSE_SAFE_BEGIN(&engines, engine, list) {
+		if (should_unregister(engine, data)) {
+			/* We have our engine... removed it */
+			AST_RWLIST_REMOVE_CURRENT(list);
+			/* If this was the default engine, we need to pick a new one */
+			if (engine == default_engine) {
+				default_engine = AST_RWLIST_FIRST(&engines);
+			}
+			ast_verb(2, "Unregistered speech recognition engine '%s'\n", engine->name);
+			/* All went well */
+			if (on_unregistered) {
+				on_unregistered(engine);
+			}
+		}
+	}
+	AST_RWLIST_TRAVERSE_SAFE_END;
+	AST_RWLIST_UNLOCK(&engines);
+}
+
 static int unload_module(void)
 {
 	/* We can not be unloaded */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_stir_shaken.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_stir_shaken.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_stir_shaken.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_stir_shaken.c	2022-05-12 11:50:59.000000000 +0000
@@ -403,7 +403,7 @@
  */
 static void set_public_key_expiration(const char *public_cert_url, const struct curl_cb_data *data)
 {
-	char time_buf[32];
+	char time_buf[32], secs[AST_TIME_T_LEN];
 	char *value;
 	struct timeval actual_expires = ast_tvnow();
 	char hash[41];
@@ -441,7 +441,9 @@
 		actual_expires.tv_sec += EXPIRATION_BUFFER;
 	}
 
-	snprintf(time_buf, sizeof(time_buf), "%30lu", actual_expires.tv_sec);
+	ast_time_t_to_string(actual_expires.tv_sec, secs, sizeof(secs));
+
+	snprintf(time_buf, sizeof(time_buf), "%30s", secs);
 
 	ast_db_put(hash, "expiration", time_buf);
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_tonedetect.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_tonedetect.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res_tonedetect.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res_tonedetect.c	2022-05-12 11:50:59.000000000 +0000
@@ -46,6 +46,11 @@
 
 /*** DOCUMENTATION
 	<application name="WaitForTone" language="en_US">
+		<since>
+			<version>16.21.0</version>
+			<version>18.7.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Wait for tone
 		</synopsis>
@@ -94,6 +99,11 @@
 		</see-also>
 	</application>
 	<application name="ToneScan" language="en_US">
+		<since>
+			<version>16.23.0</version>
+			<version>18.9.0</version>
+			<version>19.1.0</version>
+		</since>
 		<synopsis>
 			Wait for period of time while scanning for call progress tones
 		</synopsis>
@@ -169,6 +179,11 @@
 		</see-also>
 	</application>
 	<function name="TONE_DETECT" language="en_US">
+		<since>
+			<version>16.21.0</version>
+			<version>18.7.0</version>
+			<version>19.0.0</version>
+		</since>
 		<synopsis>
 			Asynchronously detects a tone
 		</synopsis>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/res.xml	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/res.xml	2022-05-12 11:50:59.000000000 +0000
@@ -1,4 +1,4 @@
-<member name="res_digium_phone" displayname="Download the Digium Phone Module for Asterisk.  See http://downloads.digium.com/pub/telephony/res_digium_phone/README.">
+<member name="res_digium_phone" displayname="Download the Digium Phone Module for Asterisk.  See https://downloads.digium.com/pub/telephony/res_digium_phone/README.">
 	<support_level>external</support_level>
 	<conflict>no_binary_modules</conflict>
 	<depend>xmlstarlet</depend>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/res/stasis_recording/stored.c asterisk-18.12.0~dfsg+~cs6.12.40431413/res/stasis_recording/stored.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/res/stasis_recording/stored.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/res/stasis_recording/stored.c	2022-05-12 11:50:59.000000000 +0000
@@ -130,6 +130,7 @@
 
 struct match_recording_data {
 	const char *file;
+	size_t length;
 	char *file_with_ext;
 };
 
@@ -160,7 +161,9 @@
 	int num;
 
 	/* If not a recording or the names do not match the keep searching */
-	if (!(num = is_recording(filename)) || strncmp(data->file, filename, num)) {
+	if (!(num = is_recording(filename))
+	   || data->length != num
+	   || strncmp(data->file, filename, num)) {
 		return 0;
 	}
 
@@ -186,6 +189,7 @@
 {
 	struct match_recording_data data = {
 		.file = file,
+		.length = strlen(file),
 		.file_with_ext = NULL
 	};
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/tests/test_aeap.c asterisk-18.12.0~dfsg+~cs6.12.40431413/tests/test_aeap.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/tests/test_aeap.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/tests/test_aeap.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,252 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*** MODULEINFO
+	<depend>TEST_FRAMEWORK</depend>
+	<depend>res_aeap</depend>
+	<support_level>core</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#include "asterisk/test.h"
+#include "asterisk/module.h"
+#include "asterisk/file.h"
+#include "asterisk/http_websocket.h"
+#include "asterisk/json.h"
+
+#include "asterisk/res_aeap.h"
+#include "asterisk/res_aeap_message.h"
+
+#define CATEGORY "/res/aeap/"
+
+#define ADDR "127.0.0.1:8088"
+#define AEAP_TRANSPORT_TYPE "ws"
+#define AEAP_REMOTE_URL "ws://" ADDR "/ws"
+#define AEAP_REMOTE_PROTOCOL "echo"
+#define AEAP_MESSAGE_ID "foo"
+#define AEAP_CONNECTION_TIMEOUT 2000
+
+AST_TEST_DEFINE(create_and_connect)
+{
+	RAII_VAR(struct ast_aeap *, aeap, NULL, ao2_cleanup);
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = __func__;
+		info->explicit_only = 0;
+		info->category = CATEGORY;
+		info->summary = "test creating and connecting to an AEAP application";
+		info->description = info->summary;
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	ast_test_validate(test, (aeap = ast_aeap_create_and_connect(AEAP_TRANSPORT_TYPE,
+		NULL, AEAP_REMOTE_URL, AEAP_REMOTE_PROTOCOL, AEAP_CONNECTION_TIMEOUT)));
+
+	return AST_TEST_PASS;
+}
+
+static void handle_string(struct ast_aeap *aeap, const char *buf, intmax_t size)
+{
+	int *passed = ast_aeap_user_data_object_by_id(aeap, AEAP_MESSAGE_ID);
+
+	if (strstr(buf, AEAP_MESSAGE_ID)) {
+		++*passed;
+	}
+}
+
+static void handle_timeout(struct ast_aeap *aeap, struct ast_aeap_message *message, void *data)
+{
+	int *passed = ast_aeap_user_data_object_by_id(aeap, AEAP_MESSAGE_ID);
+
+	++*passed;
+}
+
+AST_TEST_DEFINE(send_msg_handle_string)
+{
+	int passed = 0;
+	RAII_VAR(struct ast_aeap *, aeap, NULL, ao2_cleanup);
+	struct ast_aeap_tsx_params tsx_params = {0};
+	struct ast_aeap_params aeap_params = {
+		.on_string = handle_string,
+	};
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = __func__;
+		info->explicit_only = 0;
+		info->category = CATEGORY;
+		info->summary = "test an AEAP application string handler";
+		info->description = info->summary;
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	tsx_params.timeout = 2000; /* Test will end by timing out */
+	tsx_params.on_timeout = handle_timeout;
+	tsx_params.wait = 1;
+
+	ast_test_validate(test, (aeap = ast_aeap_create_and_connect(AEAP_TRANSPORT_TYPE,
+		&aeap_params, AEAP_REMOTE_URL, AEAP_REMOTE_PROTOCOL, AEAP_CONNECTION_TIMEOUT)));
+
+	ast_test_validate(test, (!ast_aeap_user_data_register(aeap, AEAP_MESSAGE_ID, &passed, NULL)));
+	ast_test_validate(test, (tsx_params.msg = ast_aeap_message_create_request(
+		ast_aeap_message_type_json, "foo", AEAP_MESSAGE_ID, NULL)));
+	ast_test_validate(test, ast_aeap_send_msg_tsx(aeap, &tsx_params)); /* Returns fail on timeout */
+	ast_aeap_user_data_unregister(aeap, AEAP_MESSAGE_ID);
+
+	return passed == 2 ? AST_TEST_PASS : AST_TEST_FAIL;
+}
+
+static int handle_msg(struct ast_aeap *aeap, struct ast_aeap_message *message, void *data)
+{
+	int *passed = ast_aeap_user_data_object_by_id(aeap, AEAP_MESSAGE_ID);
+
+	*passed = !strcmp(ast_aeap_message_id(message), AEAP_MESSAGE_ID) &&
+		ast_aeap_message_is_named(message, data);
+
+	if (!*passed) {
+		ast_log(LOG_ERROR, "Name '%s' did not equal '%s' for message '%s'",
+			ast_aeap_message_name(message), (char *)data, ast_aeap_message_id(message));
+	}
+
+	return 0;
+}
+
+static const struct ast_aeap_message_handler handlers[] = {
+	{ "foo", handle_msg },
+};
+
+AST_TEST_DEFINE(send_msg_handle_response)
+{
+	int passed = 0;
+	RAII_VAR(struct ast_aeap *, aeap, NULL, ao2_cleanup);
+	char *name = "foo";
+	struct ast_aeap_params aeap_params = {
+		.response_handlers = handlers,
+		.response_handlers_size = ARRAY_LEN(handlers),
+	};
+	struct ast_aeap_tsx_params tsx_params = {0};
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = __func__;
+		info->explicit_only = 0;
+		info->category = CATEGORY;
+		info->summary = "test an AEAP application response handler";
+		info->description = info->summary;
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	aeap_params.msg_type = ast_aeap_message_type_json;
+
+	tsx_params.timeout = 2000;
+	tsx_params.wait = 1;
+	tsx_params.obj = name;
+
+	ast_test_validate(test, (aeap = ast_aeap_create_and_connect(AEAP_TRANSPORT_TYPE,
+		&aeap_params, AEAP_REMOTE_URL, AEAP_REMOTE_PROTOCOL, AEAP_CONNECTION_TIMEOUT)));
+	ast_test_validate(test, (!ast_aeap_user_data_register(aeap, AEAP_MESSAGE_ID, &passed, NULL)));
+	ast_test_validate(test, (tsx_params.msg = ast_aeap_message_create_response(
+		ast_aeap_message_type_json, name, AEAP_MESSAGE_ID, NULL)));
+	ast_test_validate(test, !ast_aeap_send_msg_tsx(aeap, &tsx_params));
+	ast_aeap_user_data_unregister(aeap, AEAP_MESSAGE_ID);
+
+	return passed ? AST_TEST_PASS : AST_TEST_FAIL;
+}
+
+AST_TEST_DEFINE(send_msg_handle_request)
+{
+	int passed = 0;
+	RAII_VAR(struct ast_aeap *, aeap, NULL, ao2_cleanup);
+	char *name = "foo";
+	struct ast_aeap_params aeap_params = {
+		.request_handlers = handlers,
+		.request_handlers_size = ARRAY_LEN(handlers),
+	};
+	struct ast_aeap_tsx_params tsx_params = {0};
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = __func__;
+		info->explicit_only = 0;
+		info->category = CATEGORY;
+		info->summary = "test an AEAP application request handler";
+		info->description = info->summary;
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	aeap_params.msg_type = ast_aeap_message_type_json;
+
+	tsx_params.timeout = 2000;
+	tsx_params.wait = 1;
+	tsx_params.obj = name;
+
+	ast_test_validate(test, (aeap = ast_aeap_create_and_connect(AEAP_TRANSPORT_TYPE,
+		&aeap_params, AEAP_REMOTE_URL, AEAP_REMOTE_PROTOCOL, AEAP_CONNECTION_TIMEOUT)));
+	ast_test_validate(test, (!ast_aeap_user_data_register(aeap, AEAP_MESSAGE_ID, &passed, NULL)));
+	ast_test_validate(test, (tsx_params.msg = ast_aeap_message_create_request(
+		ast_aeap_message_type_json, name, AEAP_MESSAGE_ID, NULL)));
+	ast_test_validate(test, !ast_aeap_send_msg_tsx(aeap, &tsx_params));
+	ast_aeap_user_data_unregister(aeap, AEAP_MESSAGE_ID);
+
+	return passed ? AST_TEST_PASS : AST_TEST_FAIL;
+}
+
+static struct ast_http_server *http_server;
+
+static int load_module(void)
+{
+	if (!(http_server = ast_http_test_server_get("aeap transport http server", NULL))) {
+		return AST_MODULE_LOAD_DECLINE;
+	}
+
+	AST_TEST_REGISTER(create_and_connect);
+	AST_TEST_REGISTER(send_msg_handle_string);
+	AST_TEST_REGISTER(send_msg_handle_response);
+	AST_TEST_REGISTER(send_msg_handle_request);
+
+	return AST_MODULE_LOAD_SUCCESS;
+}
+
+static int unload_module(void)
+{
+	AST_TEST_UNREGISTER(send_msg_handle_request);
+	AST_TEST_UNREGISTER(send_msg_handle_response);
+	AST_TEST_UNREGISTER(send_msg_handle_string);
+	AST_TEST_UNREGISTER(create_and_connect);
+
+	ast_http_test_server_discard(http_server);
+
+	return 0;
+}
+
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk External Application Protocol Object Tests",
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.requires = "res_aeap",
+);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/tests/test_aeap_speech.c asterisk-18.12.0~dfsg+~cs6.12.40431413/tests/test_aeap_speech.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/tests/test_aeap_speech.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/tests/test_aeap_speech.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,287 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*** MODULEINFO
+	<depend>TEST_FRAMEWORK</depend>
+	<depend>res_aeap</depend>
+	<support_level>core</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#include "asterisk/test.h"
+#include "asterisk/module.h"
+#include "asterisk/file.h"
+#include "asterisk/format_cap.h"
+#include "asterisk/http.h"
+#include "asterisk/http_websocket.h"
+#include "asterisk/json.h"
+#include "asterisk/speech.h"
+
+#include "asterisk/res_aeap.h"
+#include "asterisk/res_aeap_message.h"
+
+#define ADDR "127.0.0.1:8088"
+
+static int speech_test_server_setup(struct ast_json *req, struct ast_json *resp)
+{
+	struct ast_json *params;
+
+	if (ast_json_object_set(resp, "codecs", ast_json_ref(ast_json_object_get(req, "codecs")))) {
+		return -1;
+	}
+
+	params = ast_json_object_get(req, "params"); /* Optional */
+	if (params && ast_json_object_set(resp, "params", ast_json_ref(params))) {
+		return -1;
+	}
+
+	return 0;
+}
+
+#define TEST_SPEECH_RESULTS_TEXT "foo"
+#define TEST_SPEECH_RESULTS_SCORE 7
+#define TEST_SPEECH_RESULTS_GRAMMAR "bar"
+#define TEST_SPEECH_RESULTS_BEST 1
+
+static int speech_test_server_get(struct ast_json *req, struct ast_json *resp)
+{
+	const char *param;
+	struct ast_json *json = NULL;
+
+	param = ast_json_string_get(ast_json_array_get(ast_json_object_get(req, "params"), 0));
+	if (!param) {
+		return -1;
+	}
+
+	if (!strcmp(param, "results")) {
+		json = ast_json_pack("{s:[{s:s,s:i,s:s,s:i}]}",
+			param,
+			"text", TEST_SPEECH_RESULTS_TEXT,
+			"score", TEST_SPEECH_RESULTS_SCORE,
+			"grammar", TEST_SPEECH_RESULTS_GRAMMAR,
+			"best", TEST_SPEECH_RESULTS_BEST);
+	} else {
+		/* Assume setting */
+		json = ast_json_pack("{s:s}", param, "bar");
+	}
+
+	if (!json || ast_json_object_set(resp, "params", json)) {
+		return -1;
+	}
+
+	return 0;
+}
+
+static int speech_test_server_set(struct ast_json *req, struct ast_json *resp)
+{
+	if (ast_json_object_set(resp, "params", ast_json_ref(ast_json_object_get(req, "params")))) {
+		return -1;
+	}
+
+	return 0;
+}
+
+static int speech_test_server_handle_request(struct ast_websocket *ws, const void *buf, uint64_t size)
+{
+	struct ast_json *req;
+	struct ast_json *resp;
+	const char *name;
+	char *resp_buf;
+	int res = 0;
+
+	req = ast_json_load_buf(buf, size, NULL);
+	if (!req) {
+		ast_log(LOG_ERROR, "speech test handle request: unable to load json\n");
+		return -1;
+	}
+
+	name = ast_json_object_string_get(req, "request");
+	if (!name) {
+		ast_log(LOG_ERROR, "speech test handle request: no name\n");
+		ast_json_unref(req);
+		return -1;
+	}
+
+	resp = ast_json_pack("{s:s, s:s}", "response", name,
+		"id", ast_json_object_string_get(req, "id"));
+	if (!resp) {
+		ast_log(LOG_ERROR, "speech test handle request: unable to create response '%s'\n", name);
+		ast_json_unref(req);
+		return -1;
+	}
+
+	if (!strcmp(name, "setup")) {
+		res = speech_test_server_setup(req, resp);
+	} else if (!strcmp(name, "get")) {
+		res = speech_test_server_get(req, resp);
+	} else if (!strcmp(name, "set")) {
+		res = speech_test_server_set(req, resp);
+	} else {
+		ast_log(LOG_ERROR, "speech test handle request: unsupported request '%s'\n", name);
+		return -1;
+	}
+
+	if (res) {
+		ast_log(LOG_ERROR, "speech test handle request: unable to build response '%s'\n", name);
+		ast_json_unref(resp);
+		ast_json_unref(req);
+		return -1;
+	}
+
+	resp_buf = ast_json_dump_string(resp);
+	ast_json_unref(resp);
+
+	if (!resp_buf) {
+		ast_log(LOG_ERROR, "speech test handle request: unable to dump response '%s'\n", name);
+		ast_json_unref(req);
+		return -1;
+	}
+
+	res = ast_websocket_write_string(ws, resp_buf);
+	if (res) {
+		ast_log(LOG_ERROR, "speech test handle request: unable to write response '%s'\n", name);
+	}
+
+	ast_json_unref(req);
+	ast_free(resp_buf);
+
+	return res;
+}
+
+static void speech_test_server_cb(struct ast_websocket *ws, struct ast_variable *parameters,
+	struct ast_variable *headers)
+{
+	int res;
+
+	if (ast_fd_set_flags(ast_websocket_fd(ws), O_NONBLOCK)) {
+		ast_websocket_unref(ws);
+		return;
+	}
+
+	while ((res = ast_websocket_wait_for_input(ws, -1)) > 0) {
+		char *payload;
+		uint64_t payload_len;
+		enum ast_websocket_opcode opcode;
+		int fragmented;
+
+		if (ast_websocket_read(ws, &payload, &payload_len, &opcode, &fragmented)) {
+			ast_log(LOG_ERROR, "speech test: Read failure in server loop\n");
+			break;
+		}
+
+		switch (opcode) {
+			case AST_WEBSOCKET_OPCODE_CLOSE:
+				ast_websocket_unref(ws);
+				return;
+			case AST_WEBSOCKET_OPCODE_BINARY:
+				ast_websocket_write(ws, opcode, payload, payload_len);
+				break;
+			case AST_WEBSOCKET_OPCODE_TEXT:
+				ast_debug(3, "payload=%.*s\n", (int)payload_len, payload);
+				if (speech_test_server_handle_request(ws, payload, payload_len)) {
+					ast_websocket_unref(ws);
+					return;
+				}
+				break;
+			default:
+				break;
+		}
+	}
+	ast_websocket_unref(ws);
+}
+
+AST_TEST_DEFINE(res_speech_aeap_test)
+{
+	RAII_VAR(struct ast_format_cap *, cap, NULL, ao2_cleanup);
+	RAII_VAR(struct ast_speech_result *, results, NULL, ast_speech_results_free);
+	struct ast_speech *speech = NULL;
+	enum ast_test_result_state res = AST_TEST_PASS;
+	char buf[8] = "";
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = __func__;
+		info->explicit_only = 0;
+		info->category = "/res/aeap/speech/";
+		info->summary = "test the speech AEAP interface";
+		info->description = info->summary;
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	ast_test_validate(test, !ast_websocket_add_protocol("_aeap_test_speech_", speech_test_server_cb));
+
+	ast_test_validate(test, (cap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT)));
+	ast_test_validate(test, !ast_format_cap_update_by_allow_disallow(cap, "ulaw", 1));
+
+	ast_test_validate_cleanup(test, (speech = ast_speech_new("_aeap_test_speech_", cap)), res, cleanup);
+	ast_speech_start(speech);
+	ast_test_validate_cleanup(test, !ast_speech_dtmf(speech, "1"), res, cleanup);
+	ast_test_validate_cleanup(test, !ast_speech_change(speech, "foo", "bar"), res, cleanup);
+	ast_test_validate_cleanup(test, !ast_speech_change_results_type(
+		speech, AST_SPEECH_RESULTS_TYPE_NBEST), res, cleanup);
+
+	ast_test_validate_cleanup(test, !ast_speech_get_setting(
+		speech, "foo", buf, sizeof(buf)), res, cleanup);
+	ast_test_validate_cleanup(test, !strcmp(buf, "bar"), res, cleanup);
+
+	ast_test_validate_cleanup(test, (results = ast_speech_results_get(speech)), res, cleanup);
+	ast_test_validate_cleanup(test, !strcmp(results->text, TEST_SPEECH_RESULTS_TEXT), res, cleanup);
+	ast_test_validate_cleanup(test, results->score == TEST_SPEECH_RESULTS_SCORE, res, cleanup);
+	ast_test_validate_cleanup(test, !strcmp(results->grammar, TEST_SPEECH_RESULTS_GRAMMAR), res, cleanup);
+	ast_test_validate_cleanup(test, results->nbest_num == TEST_SPEECH_RESULTS_BEST, res, cleanup);
+
+cleanup:
+	if (speech) {
+		ast_speech_destroy(speech);
+	}
+	ast_websocket_remove_protocol("_aeap_test_speech_", speech_test_server_cb);
+
+	return res;
+}
+
+static struct ast_http_server *http_server;
+
+static int load_module(void)
+{
+	if (!(http_server = ast_http_test_server_get("aeap transport http server", NULL))) {
+		return AST_MODULE_LOAD_DECLINE;
+	}
+
+	AST_TEST_REGISTER(res_speech_aeap_test);
+
+	return AST_MODULE_LOAD_SUCCESS;
+}
+
+static int unload_module(void)
+{
+	AST_TEST_UNREGISTER(res_speech_aeap_test);
+
+	ast_http_test_server_discard(http_server);
+
+	return 0;
+}
+
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk External Application Protocol Speech test(s)",
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.requires = "res_speech_aeap",
+);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/tests/test_aeap_transaction.c asterisk-18.12.0~dfsg+~cs6.12.40431413/tests/test_aeap_transaction.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/tests/test_aeap_transaction.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/tests/test_aeap_transaction.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,179 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*** MODULEINFO
+	<depend>TEST_FRAMEWORK</depend>
+	<depend>res_aeap</depend>
+	<support_level>core</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#include <pthread.h>
+
+#include "asterisk/lock.h"
+#include "asterisk/test.h"
+#include "asterisk/module.h"
+#include "asterisk/res_aeap.h"
+#include "asterisk/res_aeap_message.h"
+
+#include "../res/res_aeap/general.h"
+#include "../res/res_aeap/transaction.h"
+
+#define CATEGORY "/res/aeap/transaction/"
+
+#define AEAP_TRANSACTION_ID "foo"
+
+static void handle_timeout(struct ast_aeap *aeap, struct ast_aeap_message *msg, void *obj)
+{
+	int *passed = obj;
+
+	++*passed;
+}
+
+static void *end_transaction(void *data)
+{
+	/* Delay a second before ending transaction */
+	struct timespec delay = { 1, 0 };
+	int *passed = aeap_transaction_user_obj(data);
+
+	while (nanosleep(&delay, &delay));
+
+	++*passed;
+	aeap_transaction_end(data, 0);
+
+	return NULL;
+}
+
+static enum ast_test_result_state exec(struct ast_test *test,
+	struct ast_aeap_tsx_params *params)
+{
+	pthread_t thread_id = AST_PTHREADT_NULL;
+	struct ao2_container *tsxs = NULL;
+	struct aeap_transaction *tsx = NULL;
+	enum ast_test_result_state res = AST_TEST_FAIL;
+	int passed = 0;
+
+	tsxs = aeap_transactions_create();
+	if (!tsxs) {
+		ast_test_status_update(test, "Failed to create transactions object\n");
+		goto exec_cleanup;
+	}
+
+	params->wait = 1;
+	params->obj = &passed;
+
+	tsx = aeap_transaction_create_and_add(tsxs, AEAP_TRANSACTION_ID, params, NULL);
+	if (!tsx) {
+		ast_test_status_update(test, "Failed to create transaction object\n");
+		goto exec_cleanup;
+	}
+
+	if (ast_pthread_create(&thread_id, NULL, end_transaction, ao2_bump(tsx))) {
+		ast_test_status_update(test, "Failed to create response thread\n");
+		ao2_ref(tsx, -1);
+		goto exec_cleanup;
+	}
+
+	if (aeap_transaction_start(tsx)) {
+		ast_test_status_update(test, "Failed to start transaction request\n");
+		goto exec_cleanup;
+	}
+
+	if (passed == 1) {
+		res = AST_TEST_PASS;
+	}
+
+exec_cleanup:
+
+	if (thread_id != AST_PTHREADT_NULL) {
+		pthread_cancel(thread_id);
+		pthread_join(thread_id, NULL);
+	}
+
+	aeap_transaction_end(tsx, 0);
+	ao2_cleanup(tsxs);
+
+	return res;
+}
+
+AST_TEST_DEFINE(transaction_exec)
+{
+	struct ast_aeap_tsx_params params = {
+		.timeout = 5000, /* Give plenty of time for test thread to end */
+	};
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = __func__;
+		info->explicit_only = 0;
+		info->category = CATEGORY;
+		info->summary = "test creating a basic AEAP transaction request";
+		info->description = info->summary;
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	return exec(test, &params);
+}
+
+AST_TEST_DEFINE(transaction_exec_timeout)
+{
+	struct ast_aeap_tsx_params params = {
+		.timeout = 100, /* Ensure timeout occurs before test thread ends */
+		.on_timeout = handle_timeout,
+	};
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = __func__;
+		info->explicit_only = 0;
+		info->category = CATEGORY;
+		info->summary = "test creating a AEAP transaction request that times out";
+		info->description = info->summary;
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	return exec(test, &params);
+}
+
+static int load_module(void)
+{
+	AST_TEST_REGISTER(transaction_exec);
+	AST_TEST_REGISTER(transaction_exec_timeout);
+
+	return AST_MODULE_LOAD_SUCCESS;
+}
+
+static int unload_module(void)
+{
+	AST_TEST_UNREGISTER(transaction_exec_timeout);
+	AST_TEST_UNREGISTER(transaction_exec);
+
+	return 0;
+}
+
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk External Application Protocol Transaction Tests",
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.requires = "res_aeap",
+);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/tests/test_aeap_transport.c asterisk-18.12.0~dfsg+~cs6.12.40431413/tests/test_aeap_transport.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/tests/test_aeap_transport.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/tests/test_aeap_transport.c	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,249 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2021, Sangoma Technologies Corporation
+ *
+ * Kevin Harwell <kharwell@sangoma.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*** MODULEINFO
+	<depend>TEST_FRAMEWORK</depend>
+	<depend>res_aeap</depend>
+	<support_level>core</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#include "asterisk/http.h"
+#include "asterisk/test.h"
+#include "asterisk/module.h"
+
+#include "../res/res_aeap/transport.h"
+
+#define CATEGORY "/res/aeap/transport/"
+
+#define ADDR "127.0.0.1:8088"
+#define TRANSPORT_URL "ws://" ADDR "/ws"
+#define TRANSPORT_URL_INVALID "ws://" ADDR "/invalid"
+#define TRANSPORT_PROTOCOL "echo"
+#define TRANSPORT_PROTOCOL_INVALID "invalid"
+#define TRANSPORT_TIMEOUT 2000
+
+AST_TEST_DEFINE(transport_create_invalid)
+{
+	RAII_VAR(struct aeap_transport *, transport, NULL, aeap_transport_destroy);
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = __func__;
+		info->explicit_only = 0;
+		info->category = CATEGORY;
+		info->summary = "test creating an AEAP invalid transport type";
+		info->description = info->summary;
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	/* Transport is expected to be NULL here */
+	ast_test_validate(test, !(transport = aeap_transport_create("invalid")));
+
+	return AST_TEST_PASS;
+}
+
+AST_TEST_DEFINE(transport_create)
+{
+	RAII_VAR(struct aeap_transport *, transport, NULL, aeap_transport_destroy);
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = __func__;
+		info->explicit_only = 0;
+		info->category = CATEGORY;
+		info->summary = "test creating an AEAP transport";
+		info->description = info->summary;
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	/* Type is based off the scheme, so just pass in the URL here */
+	ast_test_validate(test, (transport = aeap_transport_create(TRANSPORT_URL)));
+
+	return AST_TEST_PASS;
+}
+
+AST_TEST_DEFINE(transport_connect)
+{
+	RAII_VAR(struct aeap_transport *, transport, NULL, aeap_transport_destroy);
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = __func__;
+		info->explicit_only = 0;
+		info->category = CATEGORY;
+		info->summary = "test connecting to an AEAP transport";
+		info->description = info->summary;
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	/* Type is based off the scheme, so just pass in the URL for the type */
+	ast_test_validate(test, (transport = aeap_transport_create_and_connect(
+		TRANSPORT_URL, TRANSPORT_URL, TRANSPORT_PROTOCOL, TRANSPORT_TIMEOUT)));
+
+	ast_test_validate(test, aeap_transport_is_connected(transport));
+	ast_test_validate(test, !aeap_transport_disconnect(transport));
+	ast_test_validate(test, !aeap_transport_is_connected(transport));
+
+	return AST_TEST_PASS;
+}
+
+AST_TEST_DEFINE(transport_connect_fail)
+{
+	RAII_VAR(struct aeap_transport *, transport, NULL, aeap_transport_destroy);
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = __func__;
+		info->explicit_only = 0;
+		info->category = CATEGORY;
+		info->summary = "test connecting failure for an AEAP transport";
+		info->description = info->summary;
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	/* Test invalid address */
+	ast_test_validate(test, (transport = aeap_transport_create(TRANSPORT_URL)));
+
+	ast_test_validate(test, aeap_transport_connect(transport,
+		TRANSPORT_URL_INVALID, TRANSPORT_PROTOCOL, TRANSPORT_TIMEOUT));
+
+	ast_test_validate(test, !aeap_transport_is_connected(transport));
+
+	aeap_transport_destroy(transport);
+
+	/* Test invalid protocol */
+	ast_test_validate(test, (transport = aeap_transport_create(TRANSPORT_URL)));
+
+	ast_test_validate(test, aeap_transport_connect(transport,
+		TRANSPORT_URL, TRANSPORT_PROTOCOL_INVALID, TRANSPORT_TIMEOUT));
+
+	ast_test_validate(test, !aeap_transport_is_connected(transport));
+
+	return AST_TEST_PASS;
+}
+
+AST_TEST_DEFINE(transport_binary)
+{
+	RAII_VAR(struct aeap_transport *, transport, NULL, aeap_transport_destroy);
+	int num = 38;
+	enum AST_AEAP_DATA_TYPE rtype;
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = __func__;
+		info->explicit_only = 0;
+		info->category = CATEGORY;
+		info->summary = "test binary I/O from an AEAP transport";
+		info->description = info->summary;
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	ast_test_validate(test, (transport = aeap_transport_create_and_connect(
+		TRANSPORT_URL, TRANSPORT_URL, TRANSPORT_PROTOCOL, TRANSPORT_TIMEOUT)));
+
+	ast_test_validate(test, aeap_transport_write(transport, &num, sizeof(num),
+		AST_AEAP_DATA_TYPE_BINARY) == sizeof(num));
+	ast_test_validate(test, aeap_transport_read(transport, &num,
+		sizeof(num), &rtype) == sizeof(num));
+	ast_test_validate(test, rtype == AST_AEAP_DATA_TYPE_BINARY);
+	ast_test_validate(test, num == 38);
+
+	return AST_TEST_PASS;
+}
+
+AST_TEST_DEFINE(transport_string)
+{
+	RAII_VAR(struct aeap_transport *, transport, NULL, aeap_transport_destroy);
+	char buf[16];
+	enum AST_AEAP_DATA_TYPE rtype;
+
+	switch (cmd) {
+	case TEST_INIT:
+		info->name = __func__;
+		info->explicit_only = 0;
+		info->category = CATEGORY;
+		info->summary = "test string I/O from an AEAP transport";
+		info->description = info->summary;
+		return AST_TEST_NOT_RUN;
+	case TEST_EXECUTE:
+		break;
+	}
+
+	ast_test_validate(test, (transport = aeap_transport_create_and_connect(
+		TRANSPORT_URL, TRANSPORT_URL, TRANSPORT_PROTOCOL, TRANSPORT_TIMEOUT)));
+
+	ast_test_validate(test, aeap_transport_write(transport, "foo bar baz", 11,
+		AST_AEAP_DATA_TYPE_STRING) == 11);
+	ast_test_validate(test, aeap_transport_read(transport, buf,
+		sizeof(buf) / sizeof(char), &rtype) == 11);
+	ast_test_validate(test, rtype == AST_AEAP_DATA_TYPE_STRING);
+	ast_test_validate(test, !strcmp(buf, "foo bar baz"));
+
+	return AST_TEST_PASS;
+}
+
+static struct ast_http_server *http_server;
+
+static int load_module(void)
+{
+	if (!(http_server = ast_http_test_server_get("aeap transport http server", NULL))) {
+		return AST_MODULE_LOAD_DECLINE;
+	}
+
+	AST_TEST_REGISTER(transport_string);
+	AST_TEST_REGISTER(transport_binary);
+	AST_TEST_REGISTER(transport_connect_fail);
+	AST_TEST_REGISTER(transport_connect);
+	AST_TEST_REGISTER(transport_create);
+	AST_TEST_REGISTER(transport_create_invalid);
+
+	return AST_MODULE_LOAD_SUCCESS;
+}
+
+static int unload_module(void)
+{
+	AST_TEST_UNREGISTER(transport_string);
+	AST_TEST_UNREGISTER(transport_binary);
+	AST_TEST_UNREGISTER(transport_connect_fail);
+	AST_TEST_UNREGISTER(transport_connect);
+	AST_TEST_UNREGISTER(transport_create);
+	AST_TEST_UNREGISTER(transport_create_invalid);
+
+	ast_http_test_server_discard(http_server);
+
+	return 0;
+}
+
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk External Application Protocol Transport Tests",
+	.support_level = AST_MODULE_SUPPORT_CORE,
+	.load = load_module,
+	.unload = unload_module,
+	.requires = "res_aeap",
+);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/tests/test_conversions.c asterisk-18.12.0~dfsg+~cs6.12.40431413/tests/test_conversions.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/tests/test_conversions.c	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/tests/test_conversions.c	2022-05-12 11:50:59.000000000 +0000
@@ -48,6 +48,7 @@
 	const char *spaces = "  ";
 	const char *valid = "7";
 	const char *valid_spaces = "  7";
+	const char *valid_decimal = "08";
 	int val;
 	char str[64];
 
@@ -73,6 +74,7 @@
 	ast_test_validate(test, ast_str_to_int(spaces, &val));
 	ast_test_validate(test, !ast_str_to_int(valid, &val));
 	ast_test_validate(test, !ast_str_to_int(valid_spaces, &val));
+	ast_test_validate(test, !ast_str_to_int(valid_decimal, &val));
 
 	ast_test_validate(test, snprintf(str, sizeof(str), "%d", INT_MAX) > 0);
 	ast_test_validate(test, !ast_str_to_int(str, &val));
@@ -95,6 +97,7 @@
 	const char *spaces = "  ";
 	const char *valid = "7";
 	const char *valid_spaces = "  7";
+	const char *valid_decimal = "08";
 	unsigned int val;
 	char str[64];
 
@@ -119,6 +122,7 @@
 	ast_test_validate(test, ast_str_to_uint(spaces, &val));
 	ast_test_validate(test, !ast_str_to_uint(valid, &val));
 	ast_test_validate(test, !ast_str_to_uint(valid_spaces, &val));
+	ast_test_validate(test, !ast_str_to_uint(valid_decimal, &val));
 
 	ast_test_validate(test, snprintf(str, sizeof(str), "%u", UINT_MAX) > 0);
 	ast_test_validate(test, !ast_str_to_uint(str, &val));
@@ -138,6 +142,7 @@
 	const char *spaces = "  ";
 	const char *valid = "7";
 	const char *valid_spaces = "  7";
+	const char *valid_decimal = "08";
 	long val;
 	char str[64];
 
@@ -163,6 +168,7 @@
 	ast_test_validate(test, ast_str_to_long(spaces, &val));
 	ast_test_validate(test, !ast_str_to_long(valid, &val));
 	ast_test_validate(test, !ast_str_to_long(valid_spaces, &val));
+	ast_test_validate(test, !ast_str_to_long(valid_decimal, &val));
 
 	ast_test_validate(test, snprintf(str, sizeof(str), "%ld", LONG_MAX) > 0);
 	ast_test_validate(test, !ast_str_to_long(str, &val));
@@ -185,6 +191,7 @@
 	const char *spaces = "  ";
 	const char *valid = "7";
 	const char *valid_spaces = "  7";
+	const char *valid_decimal = "08";
 	unsigned long val;
 	char str[64];
 
@@ -209,6 +216,7 @@
 	ast_test_validate(test, ast_str_to_ulong(spaces, &val));
 	ast_test_validate(test, !ast_str_to_ulong(valid, &val));
 	ast_test_validate(test, !ast_str_to_ulong(valid_spaces, &val));
+	ast_test_validate(test, !ast_str_to_ulong(valid_decimal, &val));
 
 	ast_test_validate(test, snprintf(str, sizeof(str), "%lu", ULONG_MAX) > 0);
 	ast_test_validate(test, !ast_str_to_ulong(str, &val));
@@ -228,6 +236,7 @@
 	const char *spaces = "  ";
 	const char *valid = "7";
 	const char *valid_spaces = "  7";
+	const char *valid_decimal = "08";
 	intmax_t val;
 	char str[64];
 
@@ -253,6 +262,7 @@
 	ast_test_validate(test, ast_str_to_imax(spaces, &val));
 	ast_test_validate(test, !ast_str_to_imax(valid, &val));
 	ast_test_validate(test, !ast_str_to_imax(valid_spaces, &val));
+	ast_test_validate(test, !ast_str_to_imax(valid_decimal, &val));
 
 	ast_test_validate(test, snprintf(str, sizeof(str), "%jd", INTMAX_MAX) > 0);
 	ast_test_validate(test, !ast_str_to_imax(str, &val));
@@ -276,6 +286,7 @@
 	const char *spaces = "  ";
 	const char *valid = "7";
 	const char *valid_spaces = "  7";
+	const char *valid_decimal = "08";
 	uintmax_t val;
 	char str[64];
 
@@ -300,6 +311,7 @@
 	ast_test_validate(test, ast_str_to_umax(spaces, &val));
 	ast_test_validate(test, !ast_str_to_umax(valid, &val));
 	ast_test_validate(test, !ast_str_to_umax(valid_spaces, &val));
+	ast_test_validate(test, !ast_str_to_umax(valid_decimal, &val));
 
 	ast_test_validate(test, snprintf(str, sizeof(str), "%ju", UINTMAX_MAX) > 0);
 	ast_test_validate(test, !ast_str_to_umax(str, &val));
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0000-configure-ssl-library-path.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0000-configure-ssl-library-path.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0000-configure-ssl-library-path.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0000-configure-ssl-library-path.patch	2022-05-12 11:50:59.000000000 +0000
@@ -1,19 +1,9 @@
-From e8000cc80e5f8ba02cc52852edc02cdb0e949525 Mon Sep 17 00:00:00 2001
-From: Richard Mudgett <rmudgett@digium.com>
-Date: Mon, 6 Aug 2018 11:24:25 -0500
-Subject: [PATCH 1/5] 0000-configure-ssl-library-path.patch
-
----
- aconfigure    | 6 +++++-
- aconfigure.ac | 6 +++++-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
 diff --git a/aconfigure b/aconfigure
-index 1c449b8..c4c6060 100755
+index d6f0e8809..9dcd46398 100755
 --- a/aconfigure
 +++ b/aconfigure
-@@ -7954,7 +7954,11 @@ else
-                 if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
+@@ -8986,7 +8986,11 @@ else $as_nop
+ 	        if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
                      CFLAGS="$CFLAGS -I$with_ssl/include"
                      CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
 -                    LDFLAGS="$LDFLAGS -L$with_ssl/lib"
@@ -22,15 +12,15 @@
 +                    else
 +                        LDFLAGS="$LDFLAGS -L$with_ssl"
 +                    fi
-                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5
- $as_echo "Using SSL prefix... $with_ssl" >&6; }
+                     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5
+ printf "%s\n" "Using SSL prefix... $with_ssl" >&6; }
                  fi
 diff --git a/aconfigure.ac b/aconfigure.ac
-index 2c272cd..a5d6d97 100644
+index 16b311045..849da81ab 100644
 --- a/aconfigure.ac
 +++ b/aconfigure.ac
-@@ -1580,7 +1580,11 @@ AC_ARG_ENABLE(ssl,
-                 if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
+@@ -1838,7 +1838,11 @@ AC_ARG_ENABLE(ssl,
+ 	        if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
                      CFLAGS="$CFLAGS -I$with_ssl/include"
                      CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
 -                    LDFLAGS="$LDFLAGS -L$with_ssl/lib"
@@ -42,6 +32,3 @@
                      AC_MSG_RESULT([Using SSL prefix... $with_ssl])
                  fi
  
--- 
-2.7.4
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0000-remove-third-party.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0000-remove-third-party.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0000-remove-third-party.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0000-remove-third-party.patch	2022-05-12 11:50:59.000000000 +0000
@@ -1,14 +1,5 @@
-From 665a2fbc3a09a71cd77988ae2deb3f5d3e205f63 Mon Sep 17 00:00:00 2001
-From: Richard Mudgett <rmudgett@digium.com>
-Date: Thu, 23 Feb 2017 17:10:07 -0600
-Subject: [PATCH 2/5] 0000-remove-third-party.patch
-
----
- build.mak.in | 97 ------------------------------------------------------------
- 1 file changed, 97 deletions(-)
-
 diff --git a/build.mak.in b/build.mak.in
-index 80ccad1..41ec64e 100644
+index 4bc464f8c..80681d961 100644
 --- a/build.mak.in
 +++ b/build.mak.in
 @@ -1,4 +1,3 @@
@@ -16,7 +7,7 @@
  include $(PJDIR)/version.mak
  export PJ_DIR := $(PJDIR)
  
-@@ -37,19 +36,6 @@ export APP_THIRD_PARTY_EXT :=
+@@ -41,19 +40,6 @@ export APP_THIRD_PARTY_EXT :=
  export APP_THIRD_PARTY_LIBS :=
  export APP_THIRD_PARTY_LIB_FILES :=
  
@@ -36,7 +27,7 @@
  ifeq (@ac_pjmedia_resample@,libresample)
  APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX)
  ifeq ($(PJ_SHARED_LIBRARIES),)
-@@ -66,89 +52,6 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFI
+@@ -70,102 +56,6 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFI
  endif
  endif
  
@@ -122,10 +113,20 @@
 -endif
 -endif
 -
+-ifneq (@ac_no_webrtc_aec3@,1)
+-ifeq (@ac_external_webrtc_aec3@,1)
+-APP_THIRD_PARTY_EXT += -lwebrtc-aec3
+-else
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-aec3-$(LIB_SUFFIX)
+-ifeq ($(PJ_SHARED_LIBRARIES),)
+-APP_THIRD_PARTY_LIBS += -lwebrtc-aec3-$(TARGET_NAME)
+-else
+-APP_THIRD_PARTY_LIBS += -lwebrtc-aec3
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-aec3.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX)
+-endif
+-endif
+-endif
 -
+
  # Additional flags
  @ac_build_mak_vars@
- 
--- 
-2.7.4
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-From c40ad6ba454fdf6456d8ffa92faa4cd49f2c807d Mon Sep 17 00:00:00 2001
-From: Richard Mudgett <rmudgett@digium.com>
-Date: Thu, 23 Feb 2017 17:11:00 -0600
-Subject: [PATCH 3/5] 0000-set_apps_initial_log_level.patch
-
----
- pjsip-apps/src/pjsua/main.c             | 2 ++
- pjsip-apps/src/pjsystest/main_console.c | 2 ++
- pjsip-apps/src/python/_pjsua.c          | 3 ++-
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/pjsip-apps/src/pjsua/main.c b/pjsip-apps/src/pjsua/main.c
-index 2baaf82..11831f2 100644
---- a/pjsip-apps/src/pjsua/main.c
-+++ b/pjsip-apps/src/pjsua/main.c
-@@ -126,5 +126,7 @@ int main_func(int argc, char *argv[])
- 
- int main(int argc, char *argv[])
- {
-+    pj_log_set_level(1);
-+
-     return pj_run_app(&main_func, argc, argv, 0);
- }
-diff --git a/pjsip-apps/src/pjsystest/main_console.c b/pjsip-apps/src/pjsystest/main_console.c
-index 122cdc7..dc79eab 100644
---- a/pjsip-apps/src/pjsystest/main_console.c
-+++ b/pjsip-apps/src/pjsystest/main_console.c
-@@ -133,6 +133,8 @@ void gui_sleep(unsigned sec)
- 
- int main()
- {
-+    pj_log_set_level(1);
-+
-     if (systest_init() != PJ_SUCCESS)
- 	return 1;
- 
-diff --git a/pjsip-apps/src/python/_pjsua.c b/pjsip-apps/src/python/_pjsua.c
-index 31b835e..3e15030 100644
---- a/pjsip-apps/src/python/_pjsua.c
-+++ b/pjsip-apps/src/python/_pjsua.c
-@@ -4434,7 +4434,8 @@ init_pjsua(void)
-     PyObject* m = NULL;
- #define ADD_CONSTANT(mod,name)	PyModule_AddIntConstant(mod,#name,name)
- 
--    
-+    pj_log_set_level(1);
-+
-     PyEval_InitThreads();
- 
-     if (PyType_Ready(&PyTyp_pjsua_callback) < 0)
--- 
-2.7.4
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0000-solaris.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0000-solaris.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0000-solaris.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0000-solaris.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,135 +0,0 @@
-From 1ac599a0f29500a15faf0dbbdc2565cc7dce2420 Mon Sep 17 00:00:00 2001
-From: Shaun Ruffell <sruffell@digium.com>
-Date: Fri, 7 Sep 2012 14:31:19 -0500
-Subject: [PATCH 4/5] pjproject: Fix for Solaris builds. Do not undef s_addr.
-
-pjproject, in order to solve build problems on Windows [1], undefines s_addr in
-one of it's headers that is included in res_rtp_asterisk.c. On Solaris s_addr is
-not a structure member, but defined to map to the real strucuture member,
-therefore when building on Solaris it's possible to get build errors like:
-
-    [CC] res_rtp_asterisk.c -> res_rtp_asterisk.o
-    In file included from /export/home/admin/asterisk-11-svn/include/asterisk/stun.h:29,
-                     from res_rtp_asterisk.c:51:
-    /export/home/admin/asterisk-11-svn/include/asterisk/network.h: In function `inaddrcmp':
-    /export/home/admin/asterisk-11-svn/include/asterisk/network.h:92: error: structure has no member named `s_addr'
-    /export/home/admin/asterisk-11-svn/include/asterisk/network.h:92: error: structure has no member named `s_addr'
-    res_rtp_asterisk.c: In function `ast_rtp_on_ice_tx_pkt':
-    res_rtp_asterisk.c:706: warning: dereferencing type-punned pointer will break strict-aliasing rules
-    res_rtp_asterisk.c:710: warning: dereferencing type-punned pointer will break strict-aliasing rules
-    res_rtp_asterisk.c: In function `rtp_add_candidates_to_ice':
-    res_rtp_asterisk.c:1085: error: structure has no member named `s_addr'
-    make[2]: *** [res_rtp_asterisk.o] Error 1
-    make[1]: *** [res] Error 2
-    make[1]: Leaving directory `/export/home/admin/asterisk-11-svn'
-    gmake: *** [_cleantest_all] Error 2
-
-Unfortunately, in order to make this work, I also had to make sure pjproject
-only used the typdef pj_in_addr and not the struct pj_in_addr so that when
-building Asterisk I could "typedef struct in_addr pj_in_addr". It's possible
-then that the library and users of those interfaces in Asterisk have a different
-idea about the type of the argument. While on the surface it looks like they are
-all 32 bit big endian values.
-
-[1] http://trac.pjsip.org/repos/changeset/484
-
-Reported-by: Ben Klang
-(issues ASTERISK-20366)
-
-Updated by ASTERISK-27997
----
- pjlib/include/pj/sock.h         | 8 +++++++-
- pjlib/src/pj/sock_bsd.c         | 2 +-
- pjlib/src/pj/sock_symbian.cpp   | 2 +-
- pjlib/src/pj/sock_uwp.cpp       | 2 +-
- pjsip/src/test/transport_test.c | 2 +-
- 5 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/pjlib/include/pj/sock.h b/pjlib/include/pj/sock.h
-index 4daf298..c35833c 100644
---- a/pjlib/include/pj/sock.h
-+++ b/pjlib/include/pj/sock.h
-@@ -484,6 +484,7 @@ typedef enum pj_socket_sd_type
-  */
- #define PJ_INVALID_SOCKET   (-1)
- 
-+#ifndef _ASTERISK_H
- /* Must undefine s_addr because of pj_in_addr below */
- #undef s_addr
- 
-@@ -495,6 +496,11 @@ typedef struct pj_in_addr
-     pj_uint32_t	s_addr;		/**< The 32bit IP address.	    */
- } pj_in_addr;
- 
-+#else
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+typedef struct in_addr pj_in_addr;
-+#endif
- 
- /**
-  * Maximum length of text representation of an IPv4 address.
-@@ -712,7 +718,7 @@ PJ_DECL(char*) pj_inet_ntoa(pj_in_addr inaddr);
-  *
-  * @return	nonzero if the address is valid, zero if not.
-  */
--PJ_DECL(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp);
-+PJ_DECL(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp);
- 
- /**
-  * This function converts an address in its standard text presentation form
-diff --git a/pjlib/src/pj/sock_bsd.c b/pjlib/src/pj/sock_bsd.c
-index e416991..940fce1 100644
---- a/pjlib/src/pj/sock_bsd.c
-+++ b/pjlib/src/pj/sock_bsd.c
-@@ -244,7 +244,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr)
-  * numbers-and-dots notation into binary data and stores it in the structure
-  * that inp points to. 
-  */
--PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp)
-+PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp)
- {
-     char tempaddr[PJ_INET_ADDRSTRLEN];
- 
-diff --git a/pjlib/src/pj/sock_symbian.cpp b/pjlib/src/pj/sock_symbian.cpp
-index 09239b0..e72bbda 100644
---- a/pjlib/src/pj/sock_symbian.cpp
-+++ b/pjlib/src/pj/sock_symbian.cpp
-@@ -299,7 +299,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr)
-  * numbers-and-dots notation into binary data and stores it in the structure
-  * that inp points to. 
-  */
--PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp)
-+PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp)
- {
-     enum { MAXIPLEN = PJ_INET_ADDRSTRLEN };
- 
-diff --git a/pjlib/src/pj/sock_uwp.cpp b/pjlib/src/pj/sock_uwp.cpp
-index 876c328..40250bf 100644
---- a/pjlib/src/pj/sock_uwp.cpp
-+++ b/pjlib/src/pj/sock_uwp.cpp
-@@ -933,7 +933,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr)
-  * numbers-and-dots notation into binary data and stores it in the structure
-  * that inp points to. 
-  */
--PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp)
-+PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp)
- {
-     char tempaddr[PJ_INET_ADDRSTRLEN];
- 
-diff --git a/pjsip/src/test/transport_test.c b/pjsip/src/test/transport_test.c
-index e5083d1..c429cc7 100644
---- a/pjsip/src/test/transport_test.c
-+++ b/pjsip/src/test/transport_test.c
-@@ -35,7 +35,7 @@ int generic_transport_test(pjsip_transport *tp)
- 
-     /* Check that local address name is valid. */
-     {
--	struct pj_in_addr addr;
-+	pj_in_addr addr;
- 
- 	if (pj_inet_pton(pj_AF_INET(), &tp->local_name.host,
- 			 &addr) == PJ_SUCCESS)
--- 
-2.7.4
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0011-sip_inv_patch.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0011-sip_inv_patch.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0011-sip_inv_patch.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0011-sip_inv_patch.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-commit c3c1bf45cae2a35003aa16c267d59f97027f9c5e
-Author: Kevin Harwell <kharwell@digium.com>
-Date:   Thu Jun 11 11:11:13 2020 -0500
-
-    sip_inv - fix invite session ref count crash
-    
-    Ensure the session's ref count is only decremented under proper conditons.
-    
-    For more details see the following issue report:
-    https://github.com/pjsip/pjproject/issues/2443
-    
-    Patch supplied by sauwming
-
-diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c
-index ca225015b..7c11b1c8e 100644
---- a/pjsip/src/pjsip-ua/sip_inv.c
-+++ b/pjsip/src/pjsip-ua/sip_inv.c
-@@ -323,9 +323,19 @@ static void inv_set_state(pjsip_inv_session *inv, pjsip_inv_state state,
- 	(*mod_inv.cb.on_state_changed)(inv, e);
-     pjsip_inv_dec_ref(inv);
- 
--    /* Only decrement when previous state is not already DISCONNECTED */
-+    /* The above callback may change the state, so we need to be careful here
-+     * and only decrement inv under the following conditions:
-+     * 1. If the state parameter is DISCONNECTED, and previous state is not
-+     *    already DISCONNECTED.
-+     *    This is to make sure that dec_ref() is not called more than once.
-+     * 2. If current state is PJSIP_INV_STATE_DISCONNECTED.
-+     *    This is to make sure that dec_ref() is not called if user restarts
-+     *    inv within the callback. Note that this check must be last since
-+     *    inv may have already been destroyed.
-+     */
-     if (state == PJSIP_INV_STATE_DISCONNECTED &&
--	prev_state != PJSIP_INV_STATE_DISCONNECTED) 
-+	prev_state != PJSIP_INV_STATE_DISCONNECTED &&
-+	inv->state == PJSIP_INV_STATE_DISCONNECTED) 
-     {
- 	pjsip_inv_dec_ref(inv);
-     }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0020-pjlib_cancel_timer_0.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0020-pjlib_cancel_timer_0.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0020-pjlib_cancel_timer_0.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0020-pjlib_cancel_timer_0.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-commit 40dd48d10911f4ff9b8dfbf16428fbc9acc434ba
-Author: Riza Sulistyo <trengginas@users.noreply.github.com>
-Date:   Thu Jul 9 17:47:24 2020 +0700
-
-    Modify timer_id check on cancel() (#2463)
-    
-    * modify timer_id check on cancel().
-    
-    * modification based on comments.
-
-diff --git a/pjlib/include/pj/timer.h b/pjlib/include/pj/timer.h
-index b738a6e76..4b76ab65d 100644
---- a/pjlib/include/pj/timer.h
-+++ b/pjlib/include/pj/timer.h
-@@ -120,7 +120,10 @@ typedef struct pj_timer_entry
- 
-     /** 
-      * Internal unique timer ID, which is assigned by the timer heap. 
--     * Application should not touch this ID.
-+     * Positive values indicate that the timer entry is running, 
-+     * while -1 means that it's not. Any other value may indicate that it 
-+     * hasn't been properly initialised or is in a bad state.
-+     * Application should not touch this ID. 
-      */
-     pj_timer_id_t _timer_id;
- 
-diff --git a/pjlib/src/pj/timer.c b/pjlib/src/pj/timer.c
-index 66516fce8..34966c481 100644
---- a/pjlib/src/pj/timer.c
-+++ b/pjlib/src/pj/timer.c
-@@ -535,7 +535,7 @@ static int cancel( pj_timer_heap_t *ht,
-     PJ_CHECK_STACK();
- 
-     // Check to see if the timer_id is out of range
--    if (entry->_timer_id < 0 || (pj_size_t)entry->_timer_id > ht->max_size) {
-+    if (entry->_timer_id < 1 || (pj_size_t)entry->_timer_id >= ht->max_size) {
- 	entry->_timer_id = -1;
-     	return 0;
-     }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0050-fix-race-parallel-build.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0050-fix-race-parallel-build.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0050-fix-race-parallel-build.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0050-fix-race-parallel-build.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-From 78683646c8bc670ec730a42494e075f671a08e28 Mon Sep 17 00:00:00 2001
-From: Guido Falsi <mad@madpilot.net>
-Date: Mon, 11 May 2020 08:50:39 +0200
-Subject: [PATCH] Fix race condition in parallel builds (#2426)
-
-* Some targets residing in `OBJDIRS` are missing a dependency on that directory, which results in a race condition, causing build to fail sometimes due to the directory not existing when running parallel builds.
-
-* The `PJSUA_LIB` variable is not defined anywhere, resulting in an empty value, and no correct dependency on the pjsua shared library for `pjsua2`. The correct variable seems to be `PJSUA_LIB_LIB`, defined at the start of this same `Makefile`.
----
- build/rules.mak      | 12 ++++++------
- pjsip/build/Makefile |  2 +-
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/build/rules.mak b/build/rules.mak
-index 8fa98655e..912199c41 100644
---- a/build/rules.mak
-+++ b/build/rules.mak
-@@ -129,7 +129,7 @@ endif
- $(OBJDIR)/$(app).o: $(OBJDIRS) $(OBJS)
- 	$(CROSS_COMPILE)ld -r -o $@ $(OBJS)
- 
--$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o
-+$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o | $(OBJDIRS)
- 	@echo Creating kbuild Makefile...
- 	@echo "# Our module name:" > $(OBJDIR)/Makefile
- 	@echo 'obj-m += $(app).o' >> $(OBJDIR)/Makefile
-@@ -154,27 +154,27 @@ $(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o
- ../lib/$(app).ko: $(LIB) $(OBJDIR)/$(app).ko
- 	cp $(OBJDIR)/$(app).ko ../lib
- 
--$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m
-+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m | $(OBJDIRS)
- 	$(CC) $($(APP)_CFLAGS) \
- 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
- 		$(subst /,$(HOST_PSEP),$<) 
- 
--$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c
-+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c | $(OBJDIRS)
- 	$(CC) $($(APP)_CFLAGS) \
- 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
- 		$(subst /,$(HOST_PSEP),$<) 
- 
--$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S
-+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S | $(OBJDIRS)
- 	$(CC) $($(APP)_CFLAGS) \
- 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
- 		$(subst /,$(HOST_PSEP),$<) 
- 
--$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp
-+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp | $(OBJDIRS)
- 	$(CXX) $($(APP)_CXXFLAGS) \
- 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
- 		$(subst /,$(HOST_PSEP),$<)
- 
--$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc
-+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc | $(OBJDIRS)
- 	$(CXX) $($(APP)_CXXFLAGS) \
- 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
- 		$(subst /,$(HOST_PSEP),$<)
-diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
-index b85c7817a..20777909f 100644
---- a/pjsip/build/Makefile
-+++ b/pjsip/build/Makefile
-@@ -262,7 +262,7 @@ $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME): $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPL
- 
- pjsua2-lib: $(PJSUA2_LIB_LIB)
- $(PJSUA2_LIB_SONAME): $(PJSUA2_LIB_LIB)
--$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB) $(PSJUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME)
-+$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME)
- 	$(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
- 
- pjsip-test: $(TEST_EXE)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0060-clone-sdp-for-sip-timer-refresh-invite.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0060-clone-sdp-for-sip-timer-refresh-invite.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0060-clone-sdp-for-sip-timer-refresh-invite.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0060-clone-sdp-for-sip-timer-refresh-invite.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-diff -ur source.orig/pjmedia/src/pjmedia/sdp_neg.c source/pjmedia/src/pjmedia/sdp_neg.c
---- source.orig/pjmedia/src/pjmedia/sdp_neg.c	2020-07-02 10:35:42.022459904 +0200
-+++ source/pjmedia/src/pjmedia/sdp_neg.c	2020-07-02 10:33:24.996316867 +0200
-@@ -906,7 +906,7 @@
-  * after receiving remote answer.
-  */
- static pj_status_t process_answer(pj_pool_t *pool,
--				  pjmedia_sdp_session *offer,
-+				  pjmedia_sdp_session *local_offer,
- 				  pjmedia_sdp_session *answer,
- 				  pj_bool_t allow_asym,
- 				  pjmedia_sdp_session **p_active)
-@@ -914,10 +914,14 @@
-     unsigned omi = 0; /* Offer media index */
-     unsigned ami = 0; /* Answer media index */
-     pj_bool_t has_active = PJ_FALSE;
-+    pjmedia_sdp_session *offer;
-     pj_status_t status;
- 
-     /* Check arguments. */
--    PJ_ASSERT_RETURN(pool && offer && answer && p_active, PJ_EINVAL);
-+    PJ_ASSERT_RETURN(pool && local_offer && answer && p_active, PJ_EINVAL);
-+
-+    /* Duplicate local offer SDP. */
-+    offer = pjmedia_sdp_session_clone(pool, local_offer);
- 
-     /* Check that media count match between offer and answer */
-     // Ticket #527, different media count is allowed for more interoperability,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0070-fix-incorrect-copying-when-creating-cancel.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-From ce18018cc17bef8f80c08686e3a7b28384ef3ba5 Mon Sep 17 00:00:00 2001
-From: sauwming <ming@teluu.com>
-Date: Mon, 12 Oct 2020 13:31:25 +0800
-Subject: [PATCH] Fix incorrect copying of destination info when creating
- CANCEL (#2546)
-
----
- pjsip/src/pjsip/sip_util.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/pjsip/src/pjsip/sip_util.c b/pjsip/src/pjsip/sip_util.c
-index d10a6fa30..a1bf878ea 100644
---- a/pjsip/src/pjsip/sip_util.c
-+++ b/pjsip/src/pjsip/sip_util.c
-@@ -779,14 +779,14 @@ PJ_DEF(pj_status_t) pjsip_endpt_create_cancel( pjsip_endpoint *endpt,
- 	    pjsip_hdr_clone(cancel_tdata->pool, req_tdata->saved_strict_route);
-     }
- 
--    /* Copy the destination host name from the original request */
--    pj_strdup(cancel_tdata->pool, &cancel_tdata->dest_info.name,
--	      &req_tdata->dest_info.name);
--
--    /* Finally copy the destination info from the original request */
-+    /* Copy the destination info from the original request */
-     pj_memcpy(&cancel_tdata->dest_info, &req_tdata->dest_info,
- 	      sizeof(req_tdata->dest_info));
- 
-+    /* Finally, copy the destination host name from the original request */
-+    pj_strdup(cancel_tdata->pool, &cancel_tdata->dest_info.name,
-+	      &req_tdata->dest_info.name);
-+
-     /* Done.
-      * Return the transmit buffer containing the CANCEL request.
-      */
--- 
-2.25.1
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0080-fix-sdp-neg-modify-local-offer.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c
-index 3b85b4273..a14009662 100644
---- a/pjmedia/src/pjmedia/sdp_neg.c
-+++ b/pjmedia/src/pjmedia/sdp_neg.c
-@@ -304,7 +304,6 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2(
- {
-     pjmedia_sdp_session *new_offer;
-     pjmedia_sdp_session *old_offer;
--    char media_used[PJMEDIA_MAX_SDP_MEDIA];
-     unsigned oi; /* old offer media index */
-     pj_status_t status;
- 
-@@ -323,8 +322,19 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2(
-     /* Change state to STATE_LOCAL_OFFER */
-     neg->state = PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER;
- 
-+    /* When there is no active local SDP in state PJMEDIA_SDP_NEG_STATE_DONE,
-+     * it means that the previous initial SDP nego must have been failed,
-+     * so we'll just set the local SDP offer here.
-+     */
-+    if (!neg->active_local_sdp) {
-+	neg->initial_sdp_tmp = NULL;
-+	neg->initial_sdp = pjmedia_sdp_session_clone(pool, local);
-+	neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local);
-+
-+	return PJ_SUCCESS;
-+    }
-+
-     /* Init vars */
--    pj_bzero(media_used, sizeof(media_used));
-     old_offer = neg->active_local_sdp;
-     new_offer = pjmedia_sdp_session_clone(pool, local);
- 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0090-Skip-unsupported-digest-algorithm-2408.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0090-Skip-unsupported-digest-algorithm-2408.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0090-Skip-unsupported-digest-algorithm-2408.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0090-Skip-unsupported-digest-algorithm-2408.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,212 +0,0 @@
-From bdbeb7c4b2b11efc2e59f5dee7aa4360a2bc9fff Mon Sep 17 00:00:00 2001
-From: sauwming <ming@teluu.com>
-Date: Thu, 22 Apr 2021 14:03:28 +0800
-Subject: [PATCH 90/90] Skip unsupported digest algorithm (#2408)
-
-Co-authored-by: Nanang Izzuddin <nanang@teluu.com>
----
- pjsip/src/pjsip/sip_auth_client.c             | 32 +++++--
- tests/pjsua/scripts-sipp/uas-auth-two-algo.py |  7 ++
- .../pjsua/scripts-sipp/uas-auth-two-algo.xml  | 83 +++++++++++++++++++
- 3 files changed, 117 insertions(+), 5 deletions(-)
- create mode 100644 tests/pjsua/scripts-sipp/uas-auth-two-algo.py
- create mode 100644 tests/pjsua/scripts-sipp/uas-auth-two-algo.xml
-
-diff --git a/pjsip/src/pjsip/sip_auth_client.c b/pjsip/src/pjsip/sip_auth_client.c
-index 828b04db9..7eb2f5cd1 100644
---- a/pjsip/src/pjsip/sip_auth_client.c
-+++ b/pjsip/src/pjsip/sip_auth_client.c
-@@ -1042,7 +1042,7 @@ static pj_status_t process_auth( pj_pool_t *req_pool,
-     pjsip_hdr *hdr;
-     pj_status_t status;
- 
--    /* See if we have sent authorization header for this realm */
-+    /* See if we have sent authorization header for this realm (and scheme) */
-     hdr = tdata->msg->hdr.next;
-     while (hdr != &tdata->msg->hdr) {
- 	if ((hchal->type == PJSIP_H_WWW_AUTHENTICATE &&
-@@ -1052,7 +1052,8 @@ static pj_status_t process_auth( pj_pool_t *req_pool,
- 	{
- 	    sent_auth = (pjsip_authorization_hdr*) hdr;
- 	    if (pj_stricmp(&hchal->challenge.common.realm,
--			   &sent_auth->credential.common.realm )==0)
-+			   &sent_auth->credential.common.realm)==0 &&
-+		pj_stricmp(&hchal->scheme, &sent_auth->scheme)==0)
- 	    {
- 		/* If this authorization has empty response, remove it. */
- 		if (pj_stricmp(&sent_auth->scheme, &pjsip_DIGEST_STR)==0 &&
-@@ -1062,6 +1063,14 @@ static pj_status_t process_auth( pj_pool_t *req_pool,
- 		    hdr = hdr->next;
- 		    pj_list_erase(sent_auth);
- 		    continue;
-+		} else
-+		if (pj_stricmp(&sent_auth->scheme, &pjsip_DIGEST_STR)==0 &&
-+		    pj_stricmp(&sent_auth->credential.digest.algorithm,
-+		               &hchal->challenge.digest.algorithm)!=0)
-+		{
-+		    /* Same 'digest' scheme but different algo */
-+		    hdr = hdr->next;
-+		    continue;
- 		} else {
- 		    /* Found previous authorization attempt */
- 		    break;
-@@ -1155,9 +1164,10 @@ PJ_DEF(pj_status_t) pjsip_auth_clt_reinit_req(	pjsip_auth_clt_sess *sess,
- {
-     pjsip_tx_data *tdata;
-     const pjsip_hdr *hdr;
--    unsigned chal_cnt;
-+    unsigned chal_cnt, auth_cnt;
-     pjsip_via_hdr *via;
-     pj_status_t status;
-+    pj_status_t last_auth_err;
- 
-     PJ_ASSERT_RETURN(sess && rdata && old_request && new_request,
- 		     PJ_EINVAL);
-@@ -1178,6 +1188,8 @@ PJ_DEF(pj_status_t) pjsip_auth_clt_reinit_req(	pjsip_auth_clt_sess *sess,
-      */
-     hdr = rdata->msg_info.msg->hdr.next;
-     chal_cnt = 0;
-+    auth_cnt = 0;
-+    last_auth_err = PJSIP_EAUTHNOAUTH;
-     while (hdr != &rdata->msg_info.msg->hdr) {
- 	pjsip_cached_auth *cached_auth;
- 	const pjsip_www_authenticate_hdr *hchal;
-@@ -1222,8 +1234,13 @@ PJ_DEF(pj_status_t) pjsip_auth_clt_reinit_req(	pjsip_auth_clt_sess *sess,
- 	 */
- 	status = process_auth(tdata->pool, hchal, tdata->msg->line.req.uri,
- 			      tdata, sess, cached_auth, &hauth);
--	if (status != PJ_SUCCESS)
--	    return status;
-+	if (status != PJ_SUCCESS) {
-+	    last_auth_err = status;
-+
-+	    /* Process next header. */
-+	    hdr = hdr->next;
-+	    continue;
-+	}
- 
- 	if (pj_pool_get_used_size(cached_auth->pool) >
- 	    PJSIP_AUTH_CACHED_POOL_MAX_SIZE) 
-@@ -1236,12 +1253,17 @@ PJ_DEF(pj_status_t) pjsip_auth_clt_reinit_req(	pjsip_auth_clt_sess *sess,
- 
- 	/* Process next header. */
- 	hdr = hdr->next;
-+	auth_cnt++;
-     }
- 
-     /* Check if challenge is present */
-     if (chal_cnt == 0)
- 	return PJSIP_EAUTHNOCHAL;
- 
-+    /* Check if any authorization header has been created */
-+    if (auth_cnt == 0)
-+	return last_auth_err;
-+
-     /* Remove branch param in Via header. */
-     via = (pjsip_via_hdr*) pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL);
-     via->branch_param.slen = 0;
-diff --git a/tests/pjsua/scripts-sipp/uas-auth-two-algo.py b/tests/pjsua/scripts-sipp/uas-auth-two-algo.py
-new file mode 100644
-index 000000000..c79c9f6d3
---- /dev/null
-+++ b/tests/pjsua/scripts-sipp/uas-auth-two-algo.py
-@@ -0,0 +1,7 @@
-+# $Id$
-+#
-+import inc_const as const
-+
-+PJSUA = ["--null-audio --max-calls=1 --id=sip:a@localhost --username=a --realm=* --registrar=$SIPP_URI"]
-+
-+PJSUA_EXPECTS = [[0, "registration success", ""]]
-diff --git a/tests/pjsua/scripts-sipp/uas-auth-two-algo.xml b/tests/pjsua/scripts-sipp/uas-auth-two-algo.xml
-new file mode 100644
-index 000000000..bd4871940
---- /dev/null
-+++ b/tests/pjsua/scripts-sipp/uas-auth-two-algo.xml
-@@ -0,0 +1,83 @@
-+<?xml version="1.0" encoding="ISO-8859-1" ?>
-+<!DOCTYPE scenario SYSTEM "sipp.dtd">
-+
-+<scenario name="Basic UAS responder">
-+  <recv request="REGISTER" crlf="true">
-+  </recv>
-+
-+  <send>
-+    <![CDATA[
-+      SIP/2.0 100 Trying
-+      [last_Via:];received=1.1.1.1;rport=1111
-+      [last_From:]
-+      [last_To:];tag=[call_number]
-+      [last_Call-ID:]
-+      [last_CSeq:]
-+      Content-Length: 0
-+    ]]>
-+  </send>
-+
-+  <send>
-+    <![CDATA[
-+      SIP/2.0 401 Unauthorized
-+      [last_Via:];received=1.1.1.1;rport=1111
-+      [last_From:]
-+      [last_To:];tag=[call_number]
-+      [last_Call-ID:]
-+      [last_CSeq:]
-+      WWW-Authenticate: Digest realm="sip.linphone.org", nonce="PARV4gAAAADgw3asAADW8zsi5BEAAAAA", opaque="+GNywA==", algorithm=SHA-256, qop="auth"
-+      WWW-Authenticate: Digest realm="sip.linphone.org", nonce="PARV4gAAAADgw3asAADW8zsi5BEAAAAA", opaque="+GNywA==", algorithm=MD5, qop="auth"
-+      WWW-Authenticate: Digest realm="sip.linphone.org", nonce="PARV4gAAAADgw3asAADW8zsi5BEAAAAA", opaque="+GNywA==", algorithm=MD2, qop="auth"
-+      Content-Length: 0
-+    ]]>
-+  </send>
-+
-+  <recv request="REGISTER" crlf="true">
-+    <action>
-+      <ereg regexp=".*"
-+            search_in="hdr"
-+	    header="Authorization:"
-+	    assign_to="have_auth" />
-+    </action>
-+  </recv>
-+
-+  <nop next="resp_okay" test="have_auth" />
-+  
-+  <send next="end">
-+    <![CDATA[
-+      SIP/2.0 403 no auth
-+      [last_Via:];received=1.1.1.1;rport=1111
-+      [last_From:]
-+      [last_To:];tag=[call_number]
-+      [last_Call-ID:]
-+      [last_CSeq:]
-+      [last_Contact:]
-+      Content-Length: 0
-+    ]]>
-+  </send>
-+
-+  <label id="resp_okay" />
-+  
-+  <send>
-+    <![CDATA[
-+      SIP/2.0 200 OK
-+      [last_Via:];received=1.1.1.1;rport=1111
-+      [last_From:]
-+      [last_To:];tag=[call_number]
-+      [last_Call-ID:]
-+      [last_CSeq:]
-+      [last_Contact:]
-+      Content-Length: 0
-+    ]]>
-+  </send>
-+
-+  <label id="end" />
-+
-+  <!-- definition of the response time repartition table (unit is ms)   -->
-+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
-+
-+  <!-- definition of the call length repartition table (unit is ms)     -->
-+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
-+
-+</scenario>
-+
--- 
-2.31.1
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0100-allow_multiple_auth_headers.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0100-allow_multiple_auth_headers.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0100-allow_multiple_auth_headers.patch	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0100-allow_multiple_auth_headers.patch	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1,413 @@
+commit 8e95490e37938f45d9d812905246036c3185b94f
+Author: Riza Sulistyo <trengginas@users.noreply.github.com>
+Date:   Thu Mar 24 12:53:03 2022 +0700
+
+    Add compile time option to allow multiple Authorization header (#3010)
+
+diff --git a/pjsip/include/pjsip/sip_config.h b/pjsip/include/pjsip/sip_config.h
+index dfd9ce977..ccce6ed01 100644
+--- a/pjsip/include/pjsip/sip_config.h
++++ b/pjsip/include/pjsip/sip_config.h
+@@ -1280,6 +1280,18 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void)
+ #   define PJSIP_AUTH_CNONCE_USE_DIGITS_ONLY	1
+ #endif
+ 
++/**
++ * Allow client to send multiple Authorization header when receiving multiple 
++ * WWW-Authenticate header fields. If this is disabled, the stack will send
++ * Authorization header field containing credentials that match the
++ * topmost header field.
++ *
++ * Default is 0
++ */
++#ifndef PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER
++#   define PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER 0
++#endif
++
+ /*****************************************************************************
+  *  SIP Event framework and presence settings.
+  */
+@@ -1458,6 +1470,11 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void)
+ #   define PJSIP_INV_ACCEPT_UNKNOWN_BODY    PJ_FALSE
+ #endif
+ 
++/**
++ * Dump configuration to log with verbosity equal to info(3).
++ */
++PJ_DECL(void) pjsip_dump_config(void);
++
+ PJ_END_DECL
+ 
+ /**
+diff --git a/pjsip/src/pjsip/sip_auth_client.c b/pjsip/src/pjsip/sip_auth_client.c
+index 35460d01e..ab1a0cd87 100644
+--- a/pjsip/src/pjsip/sip_auth_client.c
++++ b/pjsip/src/pjsip/sip_auth_client.c
+@@ -1367,7 +1367,7 @@ PJ_DEF(pj_status_t) pjsip_auth_clt_reinit_req(	pjsip_auth_clt_sess *sess,
+     chal_cnt = 0;
+     auth_cnt = 0;
+     last_auth_err = PJSIP_EAUTHNOAUTH;
+-    while (hdr != &rdata->msg_info.msg->hdr && auth_cnt == 0) {
++    while (hdr != &rdata->msg_info.msg->hdr) {
+ 	pjsip_cached_auth *cached_auth;
+ 	const pjsip_www_authenticate_hdr *hchal;
+ 	pjsip_authorization_hdr *hauth;
+@@ -1431,6 +1431,11 @@ PJ_DEF(pj_status_t) pjsip_auth_clt_reinit_req(	pjsip_auth_clt_sess *sess,
+ 	/* Process next header. */
+ 	hdr = hdr->next;
+ 	auth_cnt++;
++
++#if defined(PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER) && \
++	    PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER==0
++	break;
++#endif
+     }
+ 
+     /* Check if challenge is present */
+diff --git a/pjsip/src/pjsip/sip_config.c b/pjsip/src/pjsip/sip_config.c
+index 957f9fad4..6920b3dfe 100644
+--- a/pjsip/src/pjsip/sip_config.c
++++ b/pjsip/src/pjsip/sip_config.c
+@@ -19,6 +19,9 @@
+  */
+ 
+ #include <pjsip/sip_config.h>
++#include <pj/log.h>
++
++static const char *id = "sip_config.c";
+ 
+ /* pjsip configuration instance, initialized with default values */
+ pjsip_cfg_t pjsip_sip_cfg_var =
+@@ -65,6 +68,195 @@ pjsip_cfg_t pjsip_sip_cfg_var =
+     }
+ };
+ 
++PJ_DEF(void) pjsip_dump_config(void)
++{
++    PJ_LOG(3, (id, "Dumping PJSIP configurations:"));
++    PJ_LOG(3, (id, " PJSIP_MAX_DIALOG_COUNT                             : %d", 
++	       PJSIP_MAX_DIALOG_COUNT));
++    PJ_LOG(3, (id, " PJSIP_MAX_TRANSPORTS                               : %d", 
++	       PJSIP_MAX_TRANSPORTS));
++    PJ_LOG(3, (id, " PJSIP_TPMGR_HTABLE_SIZE                            : %d", 
++	       PJSIP_TPMGR_HTABLE_SIZE));
++    PJ_LOG(3, (id, " PJSIP_MAX_URL_SIZE                                 : %d", 
++	       PJSIP_MAX_URL_SIZE));
++    PJ_LOG(3, (id, " PJSIP_MAX_MODULE                                   : %d", 
++	       PJSIP_MAX_MODULE));
++    PJ_LOG(3, (id, " PJSIP_MAX_PKT_LEN                                  : %d", 
++	       PJSIP_MAX_PKT_LEN));
++    PJ_LOG(3, (id, " PJSIP_HANDLE_EVENTS_HAS_SLEEP_ON_ERR               : %d", 
++	       PJSIP_HANDLE_EVENTS_HAS_SLEEP_ON_ERR));
++    PJ_LOG(3, (id, " PJSIP_ACCEPT_MULTIPLE_SDP_ANSWERS                  : %d", 
++	       PJSIP_ACCEPT_MULTIPLE_SDP_ANSWERS));
++    PJ_LOG(3, (id, " PJSIP_UDP_SIZE_THRESHOLD                           : %d", 
++	       PJSIP_UDP_SIZE_THRESHOLD));
++    PJ_LOG(3, (id, " PJSIP_INCLUDE_ALLOW_HDR_IN_DLG                     : %d", 
++	       PJSIP_INCLUDE_ALLOW_HDR_IN_DLG));
++    PJ_LOG(3, (id, " PJSIP_SAFE_MODULE                                  : %d", 
++	       PJSIP_SAFE_MODULE));
++    PJ_LOG(3, (id, " PJSIP_CHECK_VIA_SENT_BY                            : %d", 
++	       PJSIP_CHECK_VIA_SENT_BY));
++    PJ_LOG(3, (id, " PJSIP_UNESCAPE_IN_PLACE                            : %d", 
++	       PJSIP_UNESCAPE_IN_PLACE));
++    PJ_LOG(3, (id, " PJSIP_MAX_NET_EVENTS                               : %d", 
++	       PJSIP_MAX_NET_EVENTS));
++    PJ_LOG(3, (id, " PJSIP_MAX_TIMED_OUT_ENTRIES                        : %d", 
++	       PJSIP_MAX_TIMED_OUT_ENTRIES));
++    PJ_LOG(3, (id, " PJSIP_TRANSPORT_IDLE_TIME                          : %d", 
++	       PJSIP_TRANSPORT_IDLE_TIME));
++    PJ_LOG(3, (id, " PJSIP_TRANSPORT_SERVER_IDLE_TIME                   : %d", 
++	       PJSIP_TRANSPORT_SERVER_IDLE_TIME));
++    PJ_LOG(3, (id, " PJSIP_MAX_TRANSPORT_USAGE                          : %d", 
++	       PJSIP_MAX_TRANSPORT_USAGE));
++    PJ_LOG(3, (id, " PJSIP_TCP_TRANSPORT_BACKLOG                        : %d", 
++	       PJSIP_TCP_TRANSPORT_BACKLOG));
++    PJ_LOG(3, (id, " PJSIP_TCP_TRANSPORT_REUSEADDR                      : %d", 
++	       PJSIP_TCP_TRANSPORT_REUSEADDR));
++    PJ_LOG(3, (id, " PJSIP_TCP_TRANSPORT_DONT_CREATE_LISTENER           : %d", 
++	       PJSIP_TCP_TRANSPORT_DONT_CREATE_LISTENER));
++    PJ_LOG(3, (id, " PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER           : %d", 
++	       PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER));
++    PJ_LOG(3, (id, " PJSIP_TCP_KEEP_ALIVE_INTERVAL                      : %d", 
++	       PJSIP_TCP_KEEP_ALIVE_INTERVAL));
++    PJ_LOG(3, (id, " PJSIP_POOL_INC_TRANSPORT                           : %d", 
++	       PJSIP_POOL_INC_TRANSPORT));
++    PJ_LOG(3, (id, " PJSIP_POOL_LEN_TDATA                               : %d", 
++	       PJSIP_POOL_LEN_TDATA));
++    PJ_LOG(3, (id, " PJSIP_POOL_INC_TDATA                               : %d", 
++	       PJSIP_POOL_INC_TDATA));
++    PJ_LOG(3, (id, " PJSIP_POOL_LEN_UA                                  : %d", 
++	       PJSIP_POOL_LEN_UA));
++    PJ_LOG(3, (id, " PJSIP_POOL_INC_UA                                  : %d", 
++	       PJSIP_POOL_INC_UA));
++    PJ_LOG(3, (id, " PJSIP_POOL_EVSUB_LEN                               : %d", 
++	       PJSIP_POOL_EVSUB_LEN));
++    PJ_LOG(3, (id, " PJSIP_POOL_EVSUB_INC                               : %d", 
++	       PJSIP_POOL_EVSUB_INC));
++    PJ_LOG(3, (id, " PJSIP_MAX_FORWARDS_VALUE                           : %d", 
++	       PJSIP_MAX_FORWARDS_VALUE));
++    PJ_LOG(3, (id, " PJSIP_RFC3261_BRANCH_ID                            : %s", 
++	       PJSIP_RFC3261_BRANCH_ID));
++    PJ_LOG(3, (id, " PJSIP_RFC3261_BRANCH_LEN                           : %d", 
++	       PJSIP_RFC3261_BRANCH_LEN));
++    PJ_LOG(3, (id, " PJSIP_POOL_TSX_LAYER_LEN                           : %d", 
++	       PJSIP_POOL_TSX_LAYER_LEN));
++    PJ_LOG(3, (id, " PJSIP_POOL_TSX_LAYER_INC                           : %d", 
++	       PJSIP_POOL_TSX_LAYER_INC));
++    PJ_LOG(3, (id, " PJSIP_POOL_TSX_LEN                                 : %d", 
++	       PJSIP_POOL_TSX_LEN));
++    PJ_LOG(3, (id, " PJSIP_POOL_TSX_INC                                 : %d", 
++	       PJSIP_POOL_TSX_INC));
++    PJ_LOG(3, (id, " PJSIP_TSX_1XX_RETRANS_DELAY                        : %d", 
++	       PJSIP_TSX_1XX_RETRANS_DELAY));
++    PJ_LOG(3, (id, " PJSIP_TSX_UAS_CONTINUE_ON_TP_ERROR                 : %d", 
++	       PJSIP_TSX_UAS_CONTINUE_ON_TP_ERROR));
++    PJ_LOG(3, (id, " PJSIP_MAX_TSX_KEY_LEN                              : %d", 
++	       PJSIP_MAX_TSX_KEY_LEN));
++    PJ_LOG(3, (id, " PJSIP_POOL_LEN_USER_AGENT                          : %d", 
++	       PJSIP_POOL_LEN_USER_AGENT));
++    PJ_LOG(3, (id, " PJSIP_POOL_INC_USER_AGENT                          : %d", 
++	       PJSIP_POOL_INC_USER_AGENT));
++    PJ_LOG(3, (id, " PJSIP_MAX_BRANCH_LEN                               : %d", 
++	       PJSIP_MAX_HNAME_LEN));
++    PJ_LOG(3, (id, " PJSIP_POOL_LEN_DIALOG                              : %d", 
++	       PJSIP_POOL_LEN_DIALOG));
++    PJ_LOG(3, (id, " PJSIP_POOL_INC_DIALOG                              : %d", 
++	       PJSIP_POOL_INC_DIALOG));
++    PJ_LOG(3, (id, " PJSIP_MAX_HEADER_TYPES                             : %d", 
++	       PJSIP_MAX_HEADER_TYPES));
++    PJ_LOG(3, (id, " PJSIP_MAX_URI_TYPES                                : %d", 
++	       PJSIP_MAX_URI_TYPES));
++    PJ_LOG(3, (id, " PJSIP_AUTH_HEADER_CACHING                          : %d", 
++	       PJSIP_AUTH_HEADER_CACHING));
++    PJ_LOG(3, (id, " PJSIP_AUTH_AUTO_SEND_NEXT                          : %d", 
++	       PJSIP_AUTH_AUTO_SEND_NEXT));
++    PJ_LOG(3, (id, " PJSIP_AUTH_QOP_SUPPORT                             : %d", 
++	       PJSIP_AUTH_QOP_SUPPORT));
++    PJ_LOG(3, (id, " PJSIP_MAX_STALE_COUNT                              : %d", 
++	       PJSIP_MAX_STALE_COUNT));
++    PJ_LOG(3, (id, " PJSIP_HAS_DIGEST_AKA_AUTH                          : %d", 
++	       PJSIP_HAS_DIGEST_AKA_AUTH));
++    PJ_LOG(3, (id, " PJSIP_REGISTER_CLIENT_DELAY_BEFORE_REFRESH         : %d", 
++	       PJSIP_REGISTER_CLIENT_DELAY_BEFORE_REFRESH));
++    PJ_LOG(3, (id, " PJSIP_REGISTER_ALLOW_EXP_REFRESH                   : %d", 
++	       PJSIP_REGISTER_ALLOW_EXP_REFRESH));
++    PJ_LOG(3, (id, " PJSIP_AUTH_CACHED_POOL_MAX_SIZE                    : %d", 
++	       PJSIP_AUTH_CACHED_POOL_MAX_SIZE));
++    PJ_LOG(3, (id, " PJSIP_AUTH_CNONCE_USE_DIGITS_ONLY                  : %d", 
++	       PJSIP_AUTH_CNONCE_USE_DIGITS_ONLY));
++    PJ_LOG(3, (id, " PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER              : %d", 
++	       PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER));
++    PJ_LOG(3, (id, " PJSIP_EVSUB_TIME_UAC_REFRESH                       : %d", 
++	       PJSIP_EVSUB_TIME_UAC_REFRESH));
++    PJ_LOG(3, (id, " PJSIP_PUBLISHC_DELAY_BEFORE_REFRESH                : %d", 
++	       PJSIP_PUBLISHC_DELAY_BEFORE_REFRESH));
++    PJ_LOG(3, (id, " PJSIP_EVSUB_TIME_UAC_TERMINATE                     : %d", 
++	       PJSIP_EVSUB_TIME_UAC_TERMINATE));
++    PJ_LOG(3, (id, " PJSIP_EVSUB_TIME_UAC_WAIT_NOTIFY                   : %d", 
++	       PJSIP_EVSUB_TIME_UAC_WAIT_NOTIFY));
++    PJ_LOG(3, (id, " PJSIP_PRES_DEFAULT_EXPIRES                         : %d", 
++	       PJSIP_PRES_DEFAULT_EXPIRES));
++    PJ_LOG(3, (id, " PJSIP_PRES_BAD_CONTENT_RESPONSE                    : %d", 
++	       PJSIP_PRES_BAD_CONTENT_RESPONSE));
++    PJ_LOG(3, (id, " PJSIP_PRES_PIDF_ADD_TIMESTAMP                      : %d", 
++	       PJSIP_PRES_PIDF_ADD_TIMESTAMP));
++    PJ_LOG(3, (id, " PJSIP_SESS_TIMER_DEF_SE                            : %d", 
++	       PJSIP_SESS_TIMER_DEF_SE));
++    PJ_LOG(3, (id, " PJSIP_SESS_TIMER_RETRY_DELAY                       : %d", 
++	       PJSIP_SESS_TIMER_RETRY_DELAY));
++    PJ_LOG(3, (id, " PJSIP_PUBLISHC_QUEUE_REQUEST                       : %d", 
++	       PJSIP_PUBLISHC_QUEUE_REQUEST));
++    PJ_LOG(3, (id, " PJSIP_MWI_DEFAULT_EXPIRES                          : %d", 
++	       PJSIP_MWI_DEFAULT_EXPIRES));
++    PJ_LOG(3, (id, " PJSIP_HAS_TX_DATA_LIST                             : %d", 
++	       PJSIP_HAS_TX_DATA_LIST));
++    PJ_LOG(3, (id, " PJSIP_INV_ACCEPT_UNKNOWN_BODY                      : %d", 
++	       PJSIP_INV_ACCEPT_UNKNOWN_BODY));
++    PJ_LOG(3, (id, " pjsip_cfg()->endpt.allow_port_in_fromto_hdr        : %d", 
++	       pjsip_cfg()->endpt.allow_port_in_fromto_hdr));
++    PJ_LOG(3, (id, " pjsip_cfg()->endpt.accept_replace_in_early_state   : %d", 
++	       pjsip_cfg()->endpt.accept_replace_in_early_state));
++    PJ_LOG(3, (id, " pjsip_cfg()->endpt.allow_tx_hash_in_uri            : %d", 
++	       pjsip_cfg()->endpt.allow_tx_hash_in_uri));
++    PJ_LOG(3, (id, " pjsip_cfg()->endpt.disable_rport                   : %d", 
++	       pjsip_cfg()->endpt.disable_rport));
++    PJ_LOG(3, (id, " pjsip_cfg()->endpt.disable_tcp_switch              : %d", 
++	       pjsip_cfg()->endpt.disable_tcp_switch));
++    PJ_LOG(3, (id, " pjsip_cfg()->endpt.disable_tls_switch              : %d", 
++	       pjsip_cfg()->endpt.disable_tls_switch));
++    PJ_LOG(3, (id, " pjsip_cfg()->endpt.follow_early_media_fork         : %d", 
++	       pjsip_cfg()->endpt.follow_early_media_fork));
++    PJ_LOG(3, (id, " pjsip_cfg()->endpt.req_has_via_alias               : %d", 
++	       pjsip_cfg()->endpt.req_has_via_alias));
++    PJ_LOG(3, (id, " pjsip_cfg()->endpt.resolve_hostname_to_get_interface:%d", 
++	       pjsip_cfg()->endpt.resolve_hostname_to_get_interface));
++    PJ_LOG(3, (id, " pjsip_cfg()->endpt.disable_secure_dlg_check        : %d", 
++	       pjsip_cfg()->endpt.disable_secure_dlg_check));
++    PJ_LOG(3, (id, " pjsip_cfg()->endpt.use_compact_form                : %d", 
++	       pjsip_cfg()->endpt.use_compact_form));
++    PJ_LOG(3, (id, " pjsip_cfg()->endpt.accept_multiple_sdp_answers     : %d", 
++	       pjsip_cfg()->endpt.accept_multiple_sdp_answers));
++    PJ_LOG(3, (id, " pjsip_cfg()->endpt.keep_inv_after_tsx_timeout      : %d", 
++	       pjsip_cfg()->endpt.keep_inv_after_tsx_timeout));
++    PJ_LOG(3, (id, " pjsip_cfg()->tsx.max_count                         : %d", 
++	       pjsip_cfg()->tsx.max_count));
++    PJ_LOG(3, (id, " pjsip_cfg()->tsx.t1                                : %d", 
++	       pjsip_cfg()->tsx.t1));
++    PJ_LOG(3, (id, " pjsip_cfg()->tsx.t2                                : %d", 
++	       pjsip_cfg()->tsx.t2));
++    PJ_LOG(3, (id, " pjsip_cfg()->tsx.t4                                : %d", 
++	       pjsip_cfg()->tsx.t4));
++    PJ_LOG(3, (id, " pjsip_cfg()->td                                    : %d", 
++	       pjsip_cfg()->tsx.td));
++    PJ_LOG(3, (id, " pjsip_cfg()->regc.check_contact                    : %d", 
++	       pjsip_cfg()->regc.check_contact));
++    PJ_LOG(3, (id, " pjsip_cfg()->regc.add_xuid_param                   : %d", 
++	       pjsip_cfg()->regc.add_xuid_param));
++    PJ_LOG(3, (id, " pjsip_cfg()->tcp.keep_alive_interval               : %d", 
++	       pjsip_cfg()->tcp.keep_alive_interval));
++    PJ_LOG(3, (id, " pjsip_cfg()->tls.keep_alive_interval               : %d", 
++	       pjsip_cfg()->tls.keep_alive_interval));
++}
++
+ 
+ #ifdef PJ_DLL
+ PJ_DEF(pjsip_cfg_t*) pjsip_cfg(void)
+diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c
+index c437011b5..343316b56 100644
+--- a/pjsip/src/pjsua-lib/pjsua_core.c
++++ b/pjsip/src/pjsua-lib/pjsua_core.c
+@@ -3443,8 +3443,10 @@ PJ_DEF(void) pjsua_dump(pj_bool_t detail)
+     old_decor = pj_log_get_decor();
+     pj_log_set_decor(old_decor & (PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_CR));
+ 
+-    if (detail)
++    if (detail) {
+ 	pj_dump_config();
++	pjsip_dump_config();
++    }
+ 
+     pjsip_endpt_dump(pjsua_get_pjsip_endpt(), detail);
+ 
+diff --git a/tests/pjsua/inc_sip.py b/tests/pjsua/inc_sip.py
+index f7e64816e..2cc1a17a8 100644
+--- a/tests/pjsua/inc_sip.py
++++ b/tests/pjsua/inc_sip.py
+@@ -306,9 +306,11 @@ class RecvfromTransaction:
+ 	body = None
+ 	# Pattern to be expected on pjsua when receiving the response
+ 	expect = ""
++	# Required config
++	pj_config = ""
+ 	
+ 	def __init__(self, title, resp_code, check_cseq=True,
+-			include=[], exclude=[], cmds=[], resp_hdr=[], resp_body=None, expect=""):
++			include=[], exclude=[], cmds=[], resp_hdr=[], resp_body=None, expect="", pj_config=""):
+ 		self.title = title
+ 		self.cmds = cmds
+ 		self.include = include
+@@ -317,6 +319,7 @@ class RecvfromTransaction:
+ 		self.resp_hdr = resp_hdr
+ 		self.body = resp_body
+ 		self.expect = expect
++		self.pj_config=pj_config
+ 			
+ 
+ class RecvfromCfg:
+@@ -328,15 +331,18 @@ class RecvfromCfg:
+ 	transaction = None
+ 	# Use TCP?
+ 	tcp = False
++	# Required config
++	pj_config = ""
+ 
+ 	# Note:
+ 	#  Any "$PORT" string in the pjsua_args will be replaced
+ 	#  by server port
+-	def __init__(self, name, pjsua_args, transaction, tcp=False):
++	def __init__(self, name, pjsua_args, transaction, tcp=False, pj_config=""):
+ 		self.name = name
+ 		self.inst_param = cfg.InstanceParam("pjsua", pjsua_args)
+ 		self.transaction = transaction
+ 		self.tcp=tcp
++		self.pj_config=pj_config
+ 
+ 
+ 
+diff --git a/tests/pjsua/mod_recvfrom.py b/tests/pjsua/mod_recvfrom.py
+index 918006aff..4305bfb42 100644
+--- a/tests/pjsua/mod_recvfrom.py
++++ b/tests/pjsua/mod_recvfrom.py
+@@ -18,10 +18,20 @@ def test_func(test):
+              local_port=srv_port, 
+              tcp=cfg_file.recvfrom_cfg.tcp)
+ 
++    config = pjsua.get_config(cfg_file.recvfrom_cfg.pj_config)
++    print "Config : " + config
++
+     last_cseq = 0
+     last_method = ""
+     last_call_id = ""
+     for t in cfg_file.recvfrom_cfg.transaction:
++        # Check if transaction requires configuration
++        if t.pj_config != "":
++            r = re.compile(t.pj_config, re.I)
++            if r.search(config) == None:
++                print "Configuration : " + t.pj_config + " not found, skipping"
++                continue
++
+         # Print transaction title
+         if t.title != "":
+             dlg.trace(t.title)
+diff --git a/tests/pjsua/run.py b/tests/pjsua/run.py
+index 35b00dec5..cffc38470 100644
+--- a/tests/pjsua/run.py
++++ b/tests/pjsua/run.py
+@@ -249,6 +249,10 @@ class Expect(threading.Thread):
+                     time.sleep(0.01)
+         return None
+                             
++    def get_config(self, key_config):
++        self.send("dd")
++        line = self.expect(key_config);
++        return line
+ 
+     def sync_stdout(self):
+         if not self.use_telnet:
+diff --git a/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py b/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py
+index a98b8b1d8..909ba229b 100644
+--- a/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py
++++ b/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py
+@@ -14,16 +14,27 @@ req1 = sip.RecvfromTransaction("Initial registration", 401,
+ 				expect="SIP/2.0 401"
+ 			  )
+ 
+-req2 = sip.RecvfromTransaction("Registration retry with auth", 200,
++req2 = sip.RecvfromTransaction("Registration retry with auth (not allowed multiple auth)", 200,
+ 				include=["REGISTER sip", 
+-					 # Must only have 1 Auth hdr since #2887
+ 					 "Authorization:", # [\\s\\S]+Authorization:"
+ 					 "realm=\"python1\"", # "realm=\"python2\"", 
+ 					 "username=\"theuser1\"", # "username=\"theuser2\"", 
+ 					 "nonce=\"1234\"", # "nonce=\"6789\"", 
+ 					 "response="],
+-				expect="registration success"	     
++				expect="registration success",
++				pj_config="PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER.*: 0"
+ 			  )
+ 
++req3 = sip.RecvfromTransaction("Registration retry with auth (allowed multiple auth)", 200,
++				include=["REGISTER sip", 
++					 "Authorization:[\\s\\S]+Authorization:", # Must have 2 Auth hdrs
++					 "realm=\"python1\"", "realm=\"python2\"", 
++					 "username=\"theuser1\"", "username=\"theuser2\"", 
++					 "nonce=\"1234\"", "nonce=\"6789\"", 
++					 "response="],
++				expect="registration success",
++				pj_config="PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER.*: 1"	     
++			  )                          
++
+ recvfrom_cfg = sip.RecvfromCfg("Multiple authentication challenges",
+-			       pjsua, [req1, req2])
++			       pjsua, [req1, req2, req3], pj_config="PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER")
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0100-fix-double-stun-free.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0100-fix-double-stun-free.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0100-fix-double-stun-free.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0100-fix-double-stun-free.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-commit f0ff5817d0647bdecd1ec99488db9378e304cf83
-Author: sauwming <ming@teluu.com>
-Date:   Mon May 17 09:56:27 2021 +0800
-
-    Fix double free of stun session (#2709)
-
-diff --git a/pjnath/include/pjnath/stun_session.h b/pjnath/include/pjnath/stun_session.h
-index bee630ab4..afca06911 100644
---- a/pjnath/include/pjnath/stun_session.h
-+++ b/pjnath/include/pjnath/stun_session.h
-@@ -341,6 +341,7 @@ struct pj_stun_tx_data
-     pj_pool_t		*pool;		/**< Pool.			    */
-     pj_stun_session	*sess;		/**< The STUN session.		    */
-     pj_stun_msg		*msg;		/**< The STUN message.		    */
-+    pj_bool_t		 is_destroying; /**< Is destroying?		    */
- 
-     void		*token;		/**< The token.			    */
- 
-diff --git a/pjnath/src/pjnath/stun_session.c b/pjnath/src/pjnath/stun_session.c
-index f2b4f7058..d436b94bf 100644
---- a/pjnath/src/pjnath/stun_session.c
-+++ b/pjnath/src/pjnath/stun_session.c
-@@ -167,16 +167,27 @@ static void tdata_on_destroy(void *arg)
- {
-     pj_stun_tx_data *tdata = (pj_stun_tx_data*)arg;
- 
-+    if (tdata->grp_lock) {
-+	pj_grp_lock_dec_ref(tdata->sess->grp_lock);
-+    }
-+
-     pj_pool_safe_release(&tdata->pool);
- }
- 
- static void destroy_tdata(pj_stun_tx_data *tdata, pj_bool_t force)
- {
--    TRACE_((THIS_FILE, "tdata %p destroy request, force=%d, tsx=%p", tdata,
--	    force, tdata->client_tsx));
-+    TRACE_((THIS_FILE,
-+	    "tdata %p destroy request, force=%d, tsx=%p, destroying=%d",
-+	    tdata, force, tdata->client_tsx, tdata->is_destroying));
-+
-+    /* Just return if destroy has been requested before */
-+    if (tdata->is_destroying)
-+	return;
- 
-     /* STUN session may have been destroyed, except when tdata is cached. */
- 
-+    tdata->is_destroying = PJ_TRUE;
-+
-     if (tdata->res_timer.id != PJ_FALSE) {
- 	pj_timer_heap_cancel_if_active(tdata->sess->cfg->timer_heap,
- 				       &tdata->res_timer, PJ_FALSE);
-@@ -189,7 +200,6 @@ static void destroy_tdata(pj_stun_tx_data *tdata, pj_bool_t force)
- 	    pj_stun_client_tsx_set_data(tdata->client_tsx, NULL);
- 	}
- 	if (tdata->grp_lock) {
--	    pj_grp_lock_dec_ref(tdata->sess->grp_lock);
- 	    pj_grp_lock_dec_ref(tdata->grp_lock);
- 	} else {
- 	    tdata_on_destroy(tdata);
-@@ -200,11 +210,11 @@ static void destroy_tdata(pj_stun_tx_data *tdata, pj_bool_t force)
- 	    /* "Probably" this is to absorb retransmission */
- 	    pj_time_val delay = {0, 300};
- 	    pj_stun_client_tsx_schedule_destroy(tdata->client_tsx, &delay);
-+	    tdata->is_destroying = PJ_FALSE;
- 
- 	} else {
- 	    pj_list_erase(tdata);
- 	    if (tdata->grp_lock) {
--		pj_grp_lock_dec_ref(tdata->sess->grp_lock);
- 		pj_grp_lock_dec_ref(tdata->grp_lock);
- 	    } else {
- 		tdata_on_destroy(tdata);
-@@ -238,7 +248,7 @@ static void on_cache_timeout(pj_timer_heap_t *timer_heap,
-     sess = tdata->sess;
- 
-     pj_grp_lock_acquire(sess->grp_lock);
--    if (sess->is_destroying) {
-+    if (sess->is_destroying || tdata->is_destroying) {
- 	pj_grp_lock_release(sess->grp_lock);
- 	return;
-     }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0110-tls-parent-listener-destroyed.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0110-tls-parent-listener-destroyed.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0110-tls-parent-listener-destroyed.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0110-tls-parent-listener-destroyed.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,166 +0,0 @@
-From bb92c97ea512aa0ef316c9b2335c7d57b84dfc9a Mon Sep 17 00:00:00 2001
-From: Nanang Izzuddin <nanang@teluu.com>
-Date: Wed, 16 Jun 2021 12:12:35 +0700
-Subject: [PATCH 1/2] - Avoid SSL socket parent/listener getting destroyed
- during handshake by increasing parent's reference count. - Add missing SSL
- socket close when the newly accepted SSL socket is discarded in SIP TLS
- transport.
-
----
- pjlib/src/pj/ssl_sock_imp_common.c  | 44 +++++++++++++++++++++--------
- pjsip/src/pjsip/sip_transport_tls.c | 23 ++++++++++++++-
- 2 files changed, 55 insertions(+), 12 deletions(-)
-
-diff --git a/pjlib/src/pj/ssl_sock_imp_common.c b/pjlib/src/pj/ssl_sock_imp_common.c
-index bc468bcb3..abec31805 100644
---- a/pjlib/src/pj/ssl_sock_imp_common.c
-+++ b/pjlib/src/pj/ssl_sock_imp_common.c
-@@ -224,6 +224,8 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock,
- 
-     /* Accepting */
-     if (ssock->is_server) {
-+	pj_bool_t ret = PJ_TRUE;
-+
- 	if (status != PJ_SUCCESS) {
- 	    /* Handshake failed in accepting, destroy our self silently. */
- 
-@@ -241,6 +243,12 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock,
- 		      status);
- 	    }
- 
-+	    /* Decrement ref count of parent */
-+	    if (ssock->parent->param.grp_lock) {
-+		pj_grp_lock_dec_ref(ssock->parent->param.grp_lock);
-+		ssock->parent = NULL;
-+	    }
-+
- 	    /* Originally, this is a workaround for ticket #985. However,
- 	     * a race condition may occur in multiple worker threads
- 	     * environment when we are destroying SSL objects while other
-@@ -284,23 +292,29 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock,
- 
- 	    return PJ_FALSE;
- 	}
-+
- 	/* Notify application the newly accepted SSL socket */
- 	if (ssock->param.cb.on_accept_complete2) {
--	    pj_bool_t ret;
- 	    ret = (*ssock->param.cb.on_accept_complete2) 
- 		    (ssock->parent, ssock, (pj_sockaddr_t*)&ssock->rem_addr, 
- 		    pj_sockaddr_get_len((pj_sockaddr_t*)&ssock->rem_addr), 
- 		    status);
--	    if (ret == PJ_FALSE)
--		return PJ_FALSE;	
- 	} else if (ssock->param.cb.on_accept_complete) {
--	    pj_bool_t ret;
- 	    ret = (*ssock->param.cb.on_accept_complete)
- 		      (ssock->parent, ssock, (pj_sockaddr_t*)&ssock->rem_addr,
- 		       pj_sockaddr_get_len((pj_sockaddr_t*)&ssock->rem_addr));
--	    if (ret == PJ_FALSE)
--		return PJ_FALSE;
- 	}
-+
-+	/* Decrement ref count of parent and reset parent (we don't need it
-+	 * anymore, right?).
-+	 */
-+	if (ssock->parent->param.grp_lock) {
-+	    pj_grp_lock_dec_ref(ssock->parent->param.grp_lock);
-+	    ssock->parent = NULL;
-+	}
-+
-+	if (ret == PJ_FALSE)
-+	    return PJ_FALSE;
-     }
- 
-     /* Connecting */
-@@ -864,9 +878,13 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock,
-     if (status != PJ_SUCCESS)
- 	goto on_return;
- 
-+    /* Set parent and add ref count (avoid parent destroy during handshake) */
-+    ssock->parent = ssock_parent;
-+    if (ssock->parent->param.grp_lock)
-+	pj_grp_lock_add_ref(ssock->parent->param.grp_lock);
-+
-     /* Update new SSL socket attributes */
-     ssock->sock = newsock;
--    ssock->parent = ssock_parent;
-     ssock->is_server = PJ_TRUE;
-     if (ssock_parent->cert) {
- 	status = pj_ssl_sock_set_certificate(ssock, ssock->pool, 
-@@ -913,16 +931,20 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock,
-     ssock->asock_rbuf = (void**)pj_pool_calloc(ssock->pool, 
- 					       ssock->param.async_cnt,
- 					       sizeof(void*));
--    if (!ssock->asock_rbuf)
--        return PJ_ENOMEM;
-+    if (!ssock->asock_rbuf) {
-+		status = PJ_ENOMEM;
-+		goto on_return;
-+	}
- 
-     for (i = 0; i<ssock->param.async_cnt; ++i) {
--	ssock->asock_rbuf[i] = (void*) pj_pool_alloc(
-+		ssock->asock_rbuf[i] = (void*) pj_pool_alloc(
- 					    ssock->pool, 
- 					    ssock->param.read_buffer_size + 
- 					    sizeof(read_data_t*));
--        if (!ssock->asock_rbuf[i])
--            return PJ_ENOMEM;
-+		if (!ssock->asock_rbuf[i]) {
-+			status = PJ_ENOMEM;
-+			goto on_return;
-+		}
-     }
- 
-     /* Create active socket */
-diff --git a/pjsip/src/pjsip/sip_transport_tls.c b/pjsip/src/pjsip/sip_transport_tls.c
-index 17b7ae3de..ce524d53f 100644
---- a/pjsip/src/pjsip/sip_transport_tls.c
-+++ b/pjsip/src/pjsip/sip_transport_tls.c
-@@ -1325,9 +1325,26 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock,
-     PJ_UNUSED_ARG(src_addr_len);
- 
-     listener = (struct tls_listener*) pj_ssl_sock_get_user_data(ssock);
-+    if (!listener) {
-+	/* Listener already destroyed, e.g: after TCP accept but before SSL
-+	 * handshake is completed.
-+	 */
-+	if (new_ssock && accept_status == PJ_SUCCESS) {
-+	    /* Close the SSL socket if the accept op is successful */
-+	    PJ_LOG(4,(THIS_FILE,
-+		      "Incoming TLS connection from %s (sock=%d) is discarded "
-+		      "because listener is already destroyed",
-+		      pj_sockaddr_print(src_addr, addr, sizeof(addr), 3),
-+		      new_ssock));
-+
-+	    pj_ssl_sock_close(new_ssock);
-+	}
-+
-+	return PJ_FALSE;
-+    }
- 
-     if (accept_status != PJ_SUCCESS) {
--	if (listener && listener->tls_setting.on_accept_fail_cb) {
-+	if (listener->tls_setting.on_accept_fail_cb) {
- 	    pjsip_tls_on_accept_fail_param param;
- 	    pj_ssl_sock_info ssi;
- 
-@@ -1350,6 +1367,8 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock,
-     PJ_ASSERT_RETURN(new_ssock, PJ_TRUE);
- 
-     if (!listener->is_registered) {
-+	pj_ssl_sock_close(new_ssock);
-+
- 	if (listener->tls_setting.on_accept_fail_cb) {
- 	    pjsip_tls_on_accept_fail_param param;
- 	    pj_bzero(&param, sizeof(param));
-@@ -1401,6 +1420,8 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock,
- 			 ssl_info.grp_lock, &tls);
-     
-     if (status != PJ_SUCCESS) {
-+	pj_ssl_sock_close(new_ssock);
-+
- 	if (listener->tls_setting.on_accept_fail_cb) {
- 	    pjsip_tls_on_accept_fail_param param;
- 	    pj_bzero(&param, sizeof(param));
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0111-ssl-premature-destroy.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0111-ssl-premature-destroy.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0111-ssl-premature-destroy.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0111-ssl-premature-destroy.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,136 +0,0 @@
-From 68c69f516f95df1faa42e5647e9ce7cfdc41ac38 Mon Sep 17 00:00:00 2001
-From: Nanang Izzuddin <nanang@teluu.com>
-Date: Wed, 16 Jun 2021 12:15:29 +0700
-Subject: [PATCH 2/2] - Fix silly mistake: accepted active socket created
- without group lock in SSL socket. - Replace assertion with normal validation
- check of SSL socket instance in OpenSSL verification callback (verify_cb())
- to avoid crash, e.g: if somehow race condition with SSL socket destroy
- happens or OpenSSL application data index somehow gets corrupted.
-
----
- pjlib/src/pj/ssl_sock_imp_common.c |  3 +-
- pjlib/src/pj/ssl_sock_ossl.c       | 45 +++++++++++++++++++++++++-----
- 2 files changed, 40 insertions(+), 8 deletions(-)
-
-diff --git a/pjlib/src/pj/ssl_sock_imp_common.c b/pjlib/src/pj/ssl_sock_imp_common.c
-index bc468bcb3..c2b8a846b 100644
---- a/pjlib/src/pj/ssl_sock_imp_common.c
-+++ b/pjlib/src/pj/ssl_sock_imp_common.c
-@@ -927,6 +927,7 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock,
- 
-     /* Create active socket */
-     pj_activesock_cfg_default(&asock_cfg);
-+    asock_cfg.grp_lock = ssock->param.grp_lock;
-     asock_cfg.async_cnt = ssock->param.async_cnt;
-     asock_cfg.concurrency = ssock->param.concurrency;
-     asock_cfg.whole_data = PJ_TRUE;
-@@ -942,7 +943,7 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock,
- 	    goto on_return;
- 
- 	pj_grp_lock_add_ref(glock);
--	asock_cfg.grp_lock = ssock->param.grp_lock = glock;
-+	ssock->param.grp_lock = glock;
- 	pj_grp_lock_add_handler(ssock->param.grp_lock, ssock->pool, ssock,
- 				ssl_on_destroy);
-     }
-diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c
-index a95b339a5..56841f80a 100644
---- a/pjlib/src/pj/ssl_sock_ossl.c
-+++ b/pjlib/src/pj/ssl_sock_ossl.c
-@@ -327,7 +327,8 @@ static pj_status_t STATUS_FROM_SSL_ERR(char *action, pj_ssl_sock_t *ssock,
- 	ERROR_LOG("STATUS_FROM_SSL_ERR", err, ssock);
-     }
- 
--    ssock->last_err = err;
-+    if (ssock)
-+	ssock->last_err = err;
-     return GET_STATUS_FROM_SSL_ERR(err);
- }
- 
-@@ -344,7 +345,8 @@ static pj_status_t STATUS_FROM_SSL_ERR2(char *action, pj_ssl_sock_t *ssock,
-     /* Dig for more from OpenSSL error queue */
-     SSLLogErrors(action, ret, err, len, ssock);
- 
--    ssock->last_err = ssl_err;
-+    if (ssock)
-+	ssock->last_err = ssl_err;
-     return GET_STATUS_FROM_SSL_ERR(ssl_err);
- }
- 
-@@ -587,6 +589,13 @@ static pj_status_t init_openssl(void)
- 
-     /* Create OpenSSL application data index for SSL socket */
-     sslsock_idx = SSL_get_ex_new_index(0, "SSL socket", NULL, NULL, NULL);
-+	if (sslsock_idx == -1) {
-+		status = STATUS_FROM_SSL_ERR2("Init", NULL, -1, ERR_get_error(), 0);
-+		PJ_LOG(1,(THIS_FILE,
-+				  "Fatal error: failed to get application data index for "
-+				  "SSL socket"));
-+		return status;
-+	}
- 
-     return status;
- }
-@@ -614,21 +623,36 @@ static int password_cb(char *buf, int num, int rwflag, void *user_data)
- }
- 
- 
--/* SSL password callback. */
-+/* SSL certificate verification result callback.
-+ * Note that this callback seems to be always called from library worker
-+ * thread, e.g: active socket on_read_complete callback, which should have
-+ * already been equipped with race condition avoidance mechanism (should not
-+ * be destroyed while callback is being invoked).
-+ */
- static int verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
- {
--    pj_ssl_sock_t *ssock;
--    SSL *ossl_ssl;
-+    pj_ssl_sock_t *ssock = NULL;
-+    SSL *ossl_ssl = NULL;
-     int err;
- 
-     /* Get SSL instance */
-     ossl_ssl = X509_STORE_CTX_get_ex_data(x509_ctx, 
- 				    SSL_get_ex_data_X509_STORE_CTX_idx());
--    pj_assert(ossl_ssl);
-+    if (!ossl_ssl) {
-+	PJ_LOG(1,(THIS_FILE,
-+		  "SSL verification callback failed to get SSL instance"));
-+	goto on_return;
-+    }
- 
-     /* Get SSL socket instance */
-     ssock = SSL_get_ex_data(ossl_ssl, sslsock_idx);
--    pj_assert(ssock);
-+    if (!ssock) {
-+	/* SSL socket may have been destroyed */
-+	PJ_LOG(1,(THIS_FILE,
-+		  "SSL verification callback failed to get SSL socket "
-+		  "instance (sslsock_idx=%d).", sslsock_idx));
-+	goto on_return;
-+    }
- 
-     /* Store verification status */
-     err = X509_STORE_CTX_get_error(x509_ctx);
-@@ -706,6 +730,7 @@ static int verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
-     if (PJ_FALSE == ssock->param.verify_peer)
- 	preverify_ok = 1;
- 
-+on_return:
-     return preverify_ok;
- }
- 
-@@ -1213,6 +1238,12 @@ static void ssl_destroy(pj_ssl_sock_t *ssock)
- static void ssl_reset_sock_state(pj_ssl_sock_t *ssock)
- {
-     ossl_sock_t *ossock = (ossl_sock_t *)ssock;
-+
-+    /* Detach from SSL instance */
-+    if (ossock->ossl_ssl) {
-+	SSL_set_ex_data(ossock->ossl_ssl, sslsock_idx, NULL);
-+    }
-+
-     /**
-      * Avoid calling SSL_shutdown() if handshake wasn't completed.
-      * OpenSSL 1.0.2f complains if SSL_shutdown() is called during an
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0120-pjmedia_sdp_attr_get_rtpmap-Strip-param-trailing-whi.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-From 2ae784030b0d9cf217c3d562af20e4967f19a3dc Mon Sep 17 00:00:00 2001
-From: George Joseph <gjoseph@sangoma.com>
-Date: Tue, 14 Sep 2021 10:47:29 -0600
-Subject: [PATCH] pjmedia_sdp_attr_get_rtpmap: Strip param trailing whitespace
-
-Use pj_scan_get() to parse the param part of rtpmap so
-trailing whitespace is automatically stripped.
-
-Fixes #2827
----
- pjmedia/src/pjmedia/sdp.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c
-index 5d05a0d9c..3448749c9 100644
---- a/pjmedia/src/pjmedia/sdp.c
-+++ b/pjmedia/src/pjmedia/sdp.c
-@@ -313,9 +313,9 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_rtpmap( const pjmedia_sdp_attr *attr,
- 
- 	/* Expecting either '/' or EOF */
- 	if (*scanner.curptr == '/') {
-+	    /* Skip the '/' */
- 	    pj_scan_get_char(&scanner);
--	    rtpmap->param.ptr = scanner.curptr;
--	    rtpmap->param.slen = scanner.end - scanner.curptr;
-+	    pj_scan_get(&scanner, &cs_token, &rtpmap->param);
- 	} else {
- 	    rtpmap->param.slen = 0;
- 	}
--- 
-2.31.1
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0130-sip_inv-Additional-multipart-support-2919-2920.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0130-sip_inv-Additional-multipart-support-2919-2920.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0130-sip_inv-Additional-multipart-support-2919-2920.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0130-sip_inv-Additional-multipart-support-2919-2920.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,661 +0,0 @@
-From 0ed41eb5fd0e4192e1b7dc374f819d17aef3e805 Mon Sep 17 00:00:00 2001
-From: George Joseph <gtjoseph@users.noreply.github.com>
-Date: Tue, 21 Dec 2021 19:32:22 -0700
-Subject: [PATCH] sip_inv:  Additional multipart support (#2919) (#2920)
-
----
- pjsip/include/pjsip-ua/sip_inv.h       | 108 ++++++++++-
- pjsip/src/pjsip-ua/sip_inv.c           | 240 ++++++++++++++++++++-----
- pjsip/src/test/inv_offer_answer_test.c | 103 ++++++++++-
- 3 files changed, 394 insertions(+), 57 deletions(-)
-
-diff --git a/pjsip/include/pjsip-ua/sip_inv.h b/pjsip/include/pjsip-ua/sip_inv.h
-index 14f2d23fa..c33551786 100644
---- a/pjsip/include/pjsip-ua/sip_inv.h
-+++ b/pjsip/include/pjsip-ua/sip_inv.h
-@@ -451,11 +451,11 @@ struct pjsip_inv_session
- 
- 
- /**
-- * This structure represents SDP information in a pjsip_rx_data. Application
-- * retrieve this information by calling #pjsip_rdata_get_sdp_info(). This
-+ * This structure represents SDP information in a pjsip_(rx|tx)_data. Application
-+ * retrieve this information by calling #pjsip_get_sdp_info(). This
-  * mechanism supports multipart message body.
-  */
--typedef struct pjsip_rdata_sdp_info
-+typedef struct pjsip_sdp_info
- {
-     /**
-      * Pointer and length of the text body in the incoming message. If
-@@ -475,7 +475,15 @@ typedef struct pjsip_rdata_sdp_info
-      */
-     pjmedia_sdp_session *sdp;
- 
--} pjsip_rdata_sdp_info;
-+} pjsip_sdp_info;
-+
-+/**
-+ * For backwards compatibility and completeness,
-+ * pjsip_rdata_sdp_info and pjsip_tdata_sdp_info
-+ * are typedef'd to pjsip_sdp_info.
-+ */
-+typedef pjsip_sdp_info pjsip_rdata_sdp_info;
-+typedef pjsip_sdp_info pjsip_tdata_sdp_info;
- 
- 
- /**
-@@ -1045,6 +1053,44 @@ PJ_DECL(pj_status_t) pjsip_create_sdp_body(pj_pool_t *pool,
- 					   pjmedia_sdp_session *sdp,
- 					   pjsip_msg_body **p_body);
- 
-+/**
-+ * This is a utility function to create a multipart body with the
-+ * SIP body as the first part.
-+ *
-+ * @param pool		Pool to allocate memory.
-+ * @param sdp		SDP session to be put in the SIP message body.
-+ * @param p_body	Pointer to receive SIP message body containing
-+ *			the SDP session.
-+ *
-+ * @return		PJ_SUCCESS on success.
-+ */
-+PJ_DECL(pj_status_t) pjsip_create_multipart_sdp_body( pj_pool_t *pool,
-+                                           pjmedia_sdp_session *sdp,
-+                                           pjsip_msg_body **p_body);
-+
-+/**
-+ * Retrieve SDP information from a message body. Application should
-+ * prefer to use this function rather than parsing the SDP manually since
-+ * this function supports multipart message body.
-+ *
-+ * This function will only parse the SDP once, the first time it is called
-+ * on the same message. Subsequent call on the same message will just pick
-+ * up the already parsed SDP from the message.
-+ *
-+ * @param pool               Pool to allocate memory.
-+ * @param body               The message body.
-+ * @param msg_media_type     From the rdata or tdata Content-Type header, if available.
-+ *                           If NULL, the content_type from the body will be used.
-+ * @param search_media_type  The media type to search for.
-+ *                           If NULL, "application/sdp" will be used.
-+ *
-+ * @return                   The SDP info.
-+ */
-+PJ_DECL(pjsip_sdp_info*) pjsip_get_sdp_info(pj_pool_t *pool,
-+					   pjsip_msg_body *body,
-+					   pjsip_media_type *msg_media_type,
-+					   const pjsip_media_type *search_media_type);
-+
- /**
-  * Retrieve SDP information from an incoming message. Application should
-  * prefer to use this function rather than parsing the SDP manually since
-@@ -1061,6 +1107,60 @@ PJ_DECL(pj_status_t) pjsip_create_sdp_body(pj_pool_t *pool,
- PJ_DECL(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info(pjsip_rx_data *rdata);
- 
- 
-+/**
-+ * Retrieve SDP information from an incoming message. Application should
-+ * prefer to use this function rather than parsing the SDP manually since
-+ * this function supports multipart message body.
-+ *
-+ * This function will only parse the SDP once, the first time it is called
-+ * on the same message. Subsequent call on the same message will just pick
-+ * up the already parsed SDP from the message.
-+ *
-+ * @param rdata               The incoming message.
-+ * @param search_media_type   The SDP media type to search for.
-+ *                            If NULL, "application/sdp" will be used.
-+ *
-+ * @return                    The SDP info.
-+ */
-+PJ_DECL(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info2(
-+					    pjsip_rx_data *rdata,
-+					    const pjsip_media_type *search_media_type);
-+
-+/**
-+ * Retrieve SDP information from an outgoing message. Application should
-+ * prefer to use this function rather than parsing the SDP manually since
-+ * this function supports multipart message body.
-+ *
-+ * This function will only parse the SDP once, the first time it is called
-+ * on the same message. Subsequent call on the same message will just pick
-+ * up the already parsed SDP from the message.
-+ *
-+ * @param tdata    The outgoing message.
-+ *
-+ * @return         The SDP info.
-+ */
-+PJ_DECL(pjsip_tdata_sdp_info*) pjsip_tdata_get_sdp_info(pjsip_tx_data *tdata);
-+
-+/**
-+ * Retrieve SDP information from an outgoing message. Application should
-+ * prefer to use this function rather than parsing the SDP manually since
-+ * this function supports multipart message body.
-+ *
-+ * This function will only parse the SDP once, the first time it is called
-+ * on the same message. Subsequent call on the same message will just pick
-+ * up the already parsed SDP from the message.
-+ *
-+ * @param tdata               The outgoing message.
-+ * @param search_media_type   The SDP media type to search for.
-+ *                            If NULL, "application/sdp" will be used.
-+ *
-+ * @return                    The SDP info.
-+ */
-+PJ_DECL(pjsip_tdata_sdp_info*) pjsip_tdata_get_sdp_info2(
-+					    pjsip_tx_data *tdata,
-+					    const pjsip_media_type *search_media_type);
-+
-+
- PJ_END_DECL
- 
- /**
-diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c
-index ca225015b..b68ae0f16 100644
---- a/pjsip/src/pjsip-ua/sip_inv.c
-+++ b/pjsip/src/pjsip-ua/sip_inv.c
-@@ -118,6 +118,8 @@ static pj_status_t handle_timer_response(pjsip_inv_session *inv,
- static pj_bool_t inv_check_secure_dlg(pjsip_inv_session *inv,
- 				      pjsip_event *e);
- 
-+static int print_sdp(pjsip_msg_body *body, char *buf, pj_size_t len);
-+
- static void (*inv_state_handler[])( pjsip_inv_session *inv, pjsip_event *e) = 
- {
-     &inv_on_state_null,
-@@ -946,66 +948,170 @@ PJ_DEF(pj_status_t) pjsip_inv_create_uac( pjsip_dialog *dlg,
-     return PJ_SUCCESS;
- }
- 
--PJ_DEF(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info(pjsip_rx_data *rdata)
-+PJ_DEF(pjsip_sdp_info*) pjsip_get_sdp_info(pj_pool_t *pool,
-+                                           pjsip_msg_body *body,
-+                                           pjsip_media_type *msg_media_type,
-+                                           const pjsip_media_type *search_media_type)
- {
--    pjsip_rdata_sdp_info *sdp_info;
--    pjsip_msg_body *body = rdata->msg_info.msg->body;
--    pjsip_ctype_hdr *ctype_hdr = rdata->msg_info.ctype;
--    pjsip_media_type app_sdp;
-+    pjsip_sdp_info *sdp_info;
-+    pjsip_media_type search_type;
-+    pjsip_media_type multipart_mixed;
-+    pjsip_media_type multipart_alternative;
-+    pjsip_media_type *msg_type;
-+    pj_status_t status;
- 
--    sdp_info = (pjsip_rdata_sdp_info*)
--	       rdata->endpt_info.mod_data[mod_inv.mod.id];
--    if (sdp_info)
--	return sdp_info;
-+    sdp_info = PJ_POOL_ZALLOC_T(pool,
-+                                pjsip_sdp_info);
- 
--    sdp_info = PJ_POOL_ZALLOC_T(rdata->tp_info.pool,
--				pjsip_rdata_sdp_info);
-     PJ_ASSERT_RETURN(mod_inv.mod.id >= 0, sdp_info);
--    rdata->endpt_info.mod_data[mod_inv.mod.id] = sdp_info;
- 
--    pjsip_media_type_init2(&app_sdp, "application", "sdp");
-+    if (!body) {
-+        return sdp_info;
-+    }
- 
--    if (body && ctype_hdr &&
--	pj_stricmp(&ctype_hdr->media.type, &app_sdp.type)==0 &&
--	pj_stricmp(&ctype_hdr->media.subtype, &app_sdp.subtype)==0)
-+    if (msg_media_type) {
-+	msg_type = msg_media_type;
-+    } else {
-+	if (body->content_type.type.slen == 0) {
-+	    return sdp_info;
-+	}
-+	msg_type = &body->content_type;
-+    }
-+
-+    if (!search_media_type) {
-+        pjsip_media_type_init2(&search_type, "application", "sdp");
-+    } else {
-+        pj_memcpy(&search_type, search_media_type, sizeof(search_type));
-+    }
-+
-+    pjsip_media_type_init2(&multipart_mixed, "multipart", "mixed");
-+    pjsip_media_type_init2(&multipart_alternative, "multipart", "alternative");
-+
-+    if (pjsip_media_type_cmp(msg_type, &search_type, PJ_FALSE) == 0)
-     {
--	sdp_info->body.ptr = (char*)body->data;
--	sdp_info->body.slen = body->len;
--    } else if  (body && ctype_hdr &&
--	    	pj_stricmp2(&ctype_hdr->media.type, "multipart")==0 &&
--	    	(pj_stricmp2(&ctype_hdr->media.subtype, "mixed")==0 ||
--	    	 pj_stricmp2(&ctype_hdr->media.subtype, "alternative")==0))
-+	/*
-+	 * If the print_body function is print_sdp, we know that
-+	 * body->data is a pjmedia_sdp_session object and came from
-+	 * a tx_data.  If not, it's the text representation of the
-+	 * sdp from an rx_data.
-+	 */
-+        if (body->print_body == print_sdp) {
-+            sdp_info->sdp = body->data;
-+        } else {
-+            sdp_info->body.ptr = (char*)body->data;
-+            sdp_info->body.slen = body->len;
-+        }
-+    } else if (pjsip_media_type_cmp(&multipart_mixed, msg_type, PJ_FALSE) == 0 ||
-+	pjsip_media_type_cmp(&multipart_alternative, msg_type, PJ_FALSE) == 0)
-     {
--	pjsip_multipart_part *part;
-+        pjsip_multipart_part *part;
-+        part = pjsip_multipart_find_part(body, &search_type, NULL);
-+        if (part) {
-+            if (part->body->print_body == print_sdp) {
-+                sdp_info->sdp = part->body->data;
-+            } else {
-+                sdp_info->body.ptr = (char*)part->body->data;
-+                sdp_info->body.slen = part->body->len;
-+            }
-+        }
-+    }
- 
--	part = pjsip_multipart_find_part(body, &app_sdp, NULL);
--	if (part) {
--	    sdp_info->body.ptr = (char*)part->body->data;
--	    sdp_info->body.slen = part->body->len;
--	}
-+    /*
-+     * If the body was already a pjmedia_sdp_session, we can just
-+     * return it.  If not and there wasn't a text representation
-+     * of the sdp either, we can also just return.
-+     */
-+    if (sdp_info->sdp || !sdp_info->body.ptr) {
-+	return sdp_info;
-     }
- 
--    if (sdp_info->body.ptr) {
--	pj_status_t status;
--	status = pjmedia_sdp_parse(rdata->tp_info.pool,
--				   sdp_info->body.ptr,
--				   sdp_info->body.slen,
--				   &sdp_info->sdp);
--	if (status == PJ_SUCCESS)
--	    status = pjmedia_sdp_validate2(sdp_info->sdp, PJ_FALSE);
-+    /*
-+     * If the body was the text representation of teh SDP, we need
-+     * to parse it to create a pjmedia_sdp_session object.
-+     */
-+    status = pjmedia_sdp_parse(pool,
-+				sdp_info->body.ptr,
-+				sdp_info->body.slen,
-+				&sdp_info->sdp);
-+    if (status == PJ_SUCCESS)
-+	status = pjmedia_sdp_validate2(sdp_info->sdp, PJ_FALSE);
- 
--	if (status != PJ_SUCCESS) {
--	    sdp_info->sdp = NULL;
--	    PJ_PERROR(1,(THIS_FILE, status,
--			 "Error parsing/validating SDP body"));
--	}
-+    if (status != PJ_SUCCESS) {
-+	sdp_info->sdp = NULL;
-+	PJ_PERROR(1, (THIS_FILE, status,
-+	    "Error parsing/validating SDP body"));
-+    }
-+
-+    sdp_info->sdp_err = status;
-+
-+    return sdp_info;
-+}
- 
--	sdp_info->sdp_err = status;
-+PJ_DEF(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info2(
-+                                            pjsip_rx_data *rdata,
-+                                            const pjsip_media_type *search_media_type)
-+{
-+    pjsip_media_type *msg_media_type = NULL;
-+    pjsip_rdata_sdp_info *sdp_info;
-+
-+    if (rdata->endpt_info.mod_data[mod_inv.mod.id]) {
-+	return (pjsip_rdata_sdp_info *)rdata->endpt_info.mod_data[mod_inv.mod.id];
-+    }
-+
-+    /*
-+     * rdata should have a Content-Type header at this point but we'll
-+     * make sure.
-+     */
-+    if (rdata->msg_info.ctype) {
-+	msg_media_type = &rdata->msg_info.ctype->media;
-+    }
-+    sdp_info = pjsip_get_sdp_info(rdata->tp_info.pool,
-+				   rdata->msg_info.msg->body,
-+				   msg_media_type,
-+				   search_media_type);
-+    rdata->endpt_info.mod_data[mod_inv.mod.id] = sdp_info;
-+
-+    return sdp_info;
-+}
-+
-+PJ_DEF(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info(pjsip_rx_data *rdata)
-+{
-+    return pjsip_rdata_get_sdp_info2(rdata, NULL);
-+}
-+
-+PJ_DEF(pjsip_tdata_sdp_info*) pjsip_tdata_get_sdp_info2(
-+                                            pjsip_tx_data *tdata,
-+                                            const pjsip_media_type *search_media_type)
-+{
-+    pjsip_ctype_hdr *ctype_hdr = NULL;
-+    pjsip_media_type *msg_media_type = NULL;
-+    pjsip_tdata_sdp_info *sdp_info;
-+
-+    if (tdata->mod_data[mod_inv.mod.id]) {
-+	return (pjsip_tdata_sdp_info *)tdata->mod_data[mod_inv.mod.id];
-+    }
-+    /*
-+     * tdata won't usually have a Content-Type header at this point
-+     * but we'll check just the same,
-+     */
-+    ctype_hdr = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CONTENT_TYPE, NULL);
-+    if (ctype_hdr) {
-+	msg_media_type = &ctype_hdr->media;
-     }
- 
-+    sdp_info = pjsip_get_sdp_info(tdata->pool,
-+				   tdata->msg->body,
-+				   msg_media_type,
-+				   search_media_type);
-+    tdata->mod_data[mod_inv.mod.id] = sdp_info;
-+
-     return sdp_info;
- }
- 
-+PJ_DEF(pjsip_tdata_sdp_info*) pjsip_tdata_get_sdp_info(pjsip_tx_data *tdata)
-+{
-+    return pjsip_tdata_get_sdp_info2(tdata, NULL);
-+}
- 
- /*
-  * Verify incoming INVITE request.
-@@ -1730,13 +1836,55 @@ PJ_DEF(pj_status_t) pjsip_create_sdp_body( pj_pool_t *pool,
-     return PJ_SUCCESS;
- }
- 
-+static pjsip_multipart_part* create_sdp_part(pj_pool_t *pool, pjmedia_sdp_session *sdp)
-+{
-+    pjsip_multipart_part *sdp_part;
-+    pjsip_media_type media_type;
-+
-+    pjsip_media_type_init2(&media_type, "application", "sdp");
-+
-+    sdp_part = pjsip_multipart_create_part(pool);
-+    PJ_ASSERT_RETURN(sdp_part != NULL, NULL);
-+
-+    sdp_part->body = PJ_POOL_ZALLOC_T(pool, pjsip_msg_body);
-+    PJ_ASSERT_RETURN(sdp_part->body != NULL, NULL);
-+
-+    pjsip_media_type_cp(pool, &sdp_part->body->content_type, &media_type);
-+
-+    sdp_part->body->data = sdp;
-+    sdp_part->body->clone_data = clone_sdp;
-+    sdp_part->body->print_body = print_sdp;
-+
-+    return sdp_part;
-+}
-+
-+PJ_DEF(pj_status_t) pjsip_create_multipart_sdp_body(pj_pool_t *pool,
-+						     pjmedia_sdp_session *sdp,
-+						     pjsip_msg_body **p_body)
-+{
-+    pjsip_media_type media_type;
-+    pjsip_msg_body *multipart;
-+    pjsip_multipart_part *sdp_part;
-+
-+    pjsip_media_type_init2(&media_type, "multipart", "mixed");
-+    multipart = pjsip_multipart_create(pool, &media_type, NULL);
-+    PJ_ASSERT_RETURN(multipart != NULL, PJ_ENOMEM);
-+
-+    sdp_part = create_sdp_part(pool, sdp);
-+    PJ_ASSERT_RETURN(sdp_part != NULL, PJ_ENOMEM);
-+    pjsip_multipart_add_part(pool, multipart, sdp_part);
-+    *p_body = multipart;
-+
-+    return PJ_SUCCESS;
-+}
-+
- static pjsip_msg_body *create_sdp_body(pj_pool_t *pool,
- 				       const pjmedia_sdp_session *c_sdp)
- {
-     pjsip_msg_body *body;
-     pj_status_t status;
- 
--    status = pjsip_create_sdp_body(pool, 
-+    status = pjsip_create_sdp_body(pool,
- 				   pjmedia_sdp_session_clone(pool, c_sdp),
- 				   &body);
- 
-@@ -2059,6 +2207,7 @@ static pj_status_t inv_check_sdp_in_incoming_msg( pjsip_inv_session *inv,
- 	       )
- 	   )
- 	{
-+	    pjsip_sdp_info *tdata_sdp_info;
- 	    const pjmedia_sdp_session *reoffer_sdp = NULL;
- 
- 	    PJ_LOG(4,(inv->obj_name, "Received %s response "
-@@ -2067,14 +2216,15 @@ static pj_status_t inv_check_sdp_in_incoming_msg( pjsip_inv_session *inv,
- 		      (st_code/10==18? "early" : "final" )));
- 
- 	    /* Retrieve original SDP offer from INVITE request */
--	    reoffer_sdp = (const pjmedia_sdp_session*) 
--			  tsx->last_tx->msg->body->data;
-+	    tdata_sdp_info = pjsip_tdata_get_sdp_info(tsx->last_tx);
-+	    reoffer_sdp = tdata_sdp_info->sdp;
- 
- 	    /* Feed the original offer to negotiator */
- 	    status = pjmedia_sdp_neg_modify_local_offer2(inv->pool_prov, 
- 							 inv->neg,
-                                                          inv->sdp_neg_flags,
- 						         reoffer_sdp);
-+
- 	    if (status != PJ_SUCCESS) {
- 		PJ_LOG(1,(inv->obj_name, "Error updating local offer for "
- 			  "forked 2xx/18x response (err=%d)", status));
-diff --git a/pjsip/src/test/inv_offer_answer_test.c b/pjsip/src/test/inv_offer_answer_test.c
-index ad5fcd409..9cdd2654b 100644
---- a/pjsip/src/test/inv_offer_answer_test.c
-+++ b/pjsip/src/test/inv_offer_answer_test.c
-@@ -137,6 +137,7 @@ typedef struct inv_test_param_t
-     pj_bool_t	need_established;
-     unsigned	count;
-     oa_t	oa[4];
-+    pj_bool_t	multipart_body;
- } inv_test_param_t;
- 
- typedef struct inv_test_t
-@@ -257,6 +258,17 @@ static void on_media_update(pjsip_inv_session *inv_ses,
- 	    }
- 	}
- 
-+	/* Special handling for standard offer/answer */
-+	if (inv_test.param.count == 1 &&
-+	    inv_test.param.oa[0] == OFFERER_UAC &&
-+	    inv_test.param.need_established)
-+	{
-+	    jobs[job_cnt].type = ESTABLISH_CALL;
-+	    jobs[job_cnt].who = PJSIP_ROLE_UAS;
-+	    job_cnt++;
-+	    TRACE_((THIS_FILE, "      C+++"));
-+	}
-+
- 	pj_assert(job_cnt <= PJ_ARRAY_SIZE(jobs));
-     }
- }
-@@ -333,6 +345,15 @@ static pj_bool_t on_rx_request(pjsip_rx_data *rdata)
- 					  NULL, &tdata);
- 	pj_assert(status == PJ_SUCCESS);
- 
-+	/* Use multipart body, if configured */
-+	if (sdp && inv_test.param.multipart_body) {
-+	     status = pjsip_create_multipart_sdp_body(
-+				tdata->pool,
-+				pjmedia_sdp_session_clone(tdata->pool, sdp),
-+				&tdata->msg->body);
-+	}
-+	pj_assert(status == PJ_SUCCESS);
-+
- 	status = pjsip_inv_send_msg(inv_test.uas, tdata);
- 	pj_assert(status == PJ_SUCCESS);
- 
-@@ -426,6 +447,7 @@ static int perform_test(inv_test_param_t *param)
- 	sdp = NULL;
- 
-     status = pjsip_inv_create_uac(dlg, sdp, inv_test.param.inv_option, &inv_test.uac);
-+    //inv_test.uac->create_multipart = param->multipart_body;
-     PJ_ASSERT_RETURN(status==PJ_SUCCESS, -20);
- 
-     TRACE_((THIS_FILE, "    Sending INVITE %s offer", (sdp ? "with" : "without")));
-@@ -436,8 +458,17 @@ static int perform_test(inv_test_param_t *param)
-     status = pjsip_inv_invite(inv_test.uac, &tdata);
-     PJ_ASSERT_RETURN(status==PJ_SUCCESS, -30);
- 
-+    /* Use multipart body, if configured */
-+    if (sdp && param->multipart_body) {
-+	 status = pjsip_create_multipart_sdp_body(
-+			    tdata->pool,
-+			    pjmedia_sdp_session_clone(tdata->pool, sdp),
-+			    &tdata->msg->body);
-+    }
-+    PJ_ASSERT_RETURN(status==PJ_SUCCESS, -40);
-+
-     status = pjsip_inv_send_msg(inv_test.uac, tdata);
--    PJ_ASSERT_RETURN(status==PJ_SUCCESS, -30);
-+    PJ_ASSERT_RETURN(status==PJ_SUCCESS, -50);
- 
-     /*
-      * Wait until test completes
-@@ -525,13 +556,14 @@ static inv_test_param_t test_params[] =
-     200/INVITE (answer)	<--
-     ACK    		-->
-  */
--#if 0
-+#if 1
-     {
- 	"Standard INVITE with offer",
- 	0,
- 	PJ_TRUE,
- 	1,
--	{ OFFERER_UAC }
-+	{ OFFERER_UAC },
-+	PJ_FALSE
-     },
- 
-     {
-@@ -539,7 +571,25 @@ static inv_test_param_t test_params[] =
- 	PJSIP_INV_REQUIRE_100REL,
- 	PJ_TRUE,
- 	1,
--	{ OFFERER_UAC }
-+	{ OFFERER_UAC },
-+	PJ_FALSE
-+    },
-+    {
-+	"Standard INVITE with offer, with Multipart",
-+	0,
-+	PJ_TRUE,
-+	1,
-+	{ OFFERER_UAC },
-+	PJ_TRUE
-+    },
-+
-+    {
-+	"Standard INVITE with offer, with 100rel, with Multipart",
-+	PJSIP_INV_REQUIRE_100REL,
-+	PJ_TRUE,
-+	1,
-+	{ OFFERER_UAC },
-+	PJ_TRUE
-     },
- #endif
- 
-@@ -555,7 +605,8 @@ static inv_test_param_t test_params[] =
- 	0,
- 	PJ_TRUE,
- 	1,
--	{ OFFERER_UAS }
-+	{ OFFERER_UAS },
-+	PJ_FALSE
-     },
- 
-     {
-@@ -563,7 +614,25 @@ static inv_test_param_t test_params[] =
- 	PJSIP_INV_REQUIRE_100REL,
- 	PJ_TRUE,
- 	1,
--	{ OFFERER_UAS }
-+	{ OFFERER_UAS },
-+	PJ_FALSE
-+    },
-+    {
-+	"INVITE with no offer, with Multipart",
-+	0,
-+	PJ_TRUE,
-+	1,
-+	{ OFFERER_UAS },
-+	PJ_TRUE
-+    },
-+
-+    {
-+	"INVITE with no offer, with 100rel, with Multipart",
-+	PJSIP_INV_REQUIRE_100REL,
-+	PJ_TRUE,
-+	1,
-+	{ OFFERER_UAS },
-+	PJ_TRUE
-     },
- #endif
- 
-@@ -584,14 +653,24 @@ static inv_test_param_t test_params[] =
- 	0,
- 	PJ_TRUE,
- 	2,
--	{ OFFERER_UAC, OFFERER_UAC }
-+	{ OFFERER_UAC, OFFERER_UAC },
-+	PJ_FALSE
-+    },
-+    {
-+	"INVITE and UPDATE by UAC, with Multipart",
-+	0,
-+	PJ_TRUE,
-+	2,
-+	{ OFFERER_UAC, OFFERER_UAC },
-+	PJ_TRUE
-     },
-     {
- 	"INVITE and UPDATE by UAC, with 100rel",
- 	PJSIP_INV_REQUIRE_100REL,
- 	PJ_TRUE,
- 	2,
--	{ OFFERER_UAC, OFFERER_UAC }
-+	{ OFFERER_UAC, OFFERER_UAC },
-+	PJ_FALSE
-     },
- #endif
- 
-@@ -617,6 +696,14 @@ static inv_test_param_t test_params[] =
- 	4,
- 	{ OFFERER_UAC, OFFERER_UAS, OFFERER_UAC, OFFERER_UAS }
-     },
-+    {
-+	"INVITE and many UPDATE by UAC and UAS, with Multipart",
-+	0,
-+	PJ_TRUE,
-+	4,
-+	{ OFFERER_UAC, OFFERER_UAS, OFFERER_UAC, OFFERER_UAS },
-+	PJ_TRUE
-+    },
- 
- };
- 
--- 
-2.33.1
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0140-Fix-incorrect-unescaping-of-tokens-during-parsing-29.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0140-Fix-incorrect-unescaping-of-tokens-during-parsing-29.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0140-Fix-incorrect-unescaping-of-tokens-during-parsing-29.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0140-Fix-incorrect-unescaping-of-tokens-during-parsing-29.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-From 3faf1d2b4da553bbaee04f9a13a5d084b381e5fb Mon Sep 17 00:00:00 2001
-From: sauwming <ming@teluu.com>
-Date: Tue, 4 Jan 2022 15:28:49 +0800
-Subject: [PATCH] Fix incorrect unescaping of tokens during parsing (#2933)
-
----
- pjsip/src/pjsip/sip_parser.c | 29 +++++++++++++++++++++++++----
- pjsip/src/test/msg_test.c    |  6 +++---
- 2 files changed, 28 insertions(+), 7 deletions(-)
-
-diff --git a/pjsip/src/pjsip/sip_parser.c b/pjsip/src/pjsip/sip_parser.c
-index c2add3299..b9a7c6a5c 100644
---- a/pjsip/src/pjsip/sip_parser.c
-+++ b/pjsip/src/pjsip/sip_parser.c
-@@ -378,17 +378,23 @@ static pj_status_t init_parser()
-     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
-     pj_cis_add_str( &pconst.pjsip_TOKEN_SPEC, TOKEN);
- 
-+    /* Token is allowed to have '%' so we do not need this. */
-+    /*
-     status = pj_cis_dup(&pconst.pjsip_TOKEN_SPEC_ESC, &pconst.pjsip_TOKEN_SPEC);
-     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
-     pj_cis_del_str(&pconst.pjsip_TOKEN_SPEC_ESC, "%");
-+    */
- 
-     status = pj_cis_dup(&pconst.pjsip_VIA_PARAM_SPEC, &pconst.pjsip_TOKEN_SPEC);
-     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
-     pj_cis_add_str(&pconst.pjsip_VIA_PARAM_SPEC, "[:]");
- 
-+    /* Token is allowed to have '%' */
-+    /*
-     status = pj_cis_dup(&pconst.pjsip_VIA_PARAM_SPEC_ESC, &pconst.pjsip_TOKEN_SPEC_ESC);
-     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
-     pj_cis_add_str(&pconst.pjsip_VIA_PARAM_SPEC_ESC, "[:]");
-+    */
- 
-     status = pj_cis_dup(&pconst.pjsip_HOST_SPEC, &pconst.pjsip_ALNUM_SPEC);
-     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
-@@ -1210,7 +1216,11 @@ static void parse_param_imp( pj_scanner *scanner, pj_pool_t *pool,
- 			     unsigned option)
- {
-     /* pname */
--    parser_get_and_unescape(scanner, pool, spec, esc_spec, pname);
-+    if (!esc_spec) {
-+    	pj_scan_get(scanner, spec, pname);
-+    } else {
-+	parser_get_and_unescape(scanner, pool, spec, esc_spec, pname);
-+    }
- 
-     /* init pvalue */
-     pvalue->ptr = NULL;
-@@ -1240,7 +1250,12 @@ static void parse_param_imp( pj_scanner *scanner, pj_pool_t *pool,
- 		// pj_scan_get_until_ch(scanner, ']', pvalue);
- 		// pj_scan_get_char(scanner);
- 	    } else if(pj_cis_match(spec, *scanner->curptr)) {
--		parser_get_and_unescape(scanner, pool, spec, esc_spec, pvalue);
-+	    	if (!esc_spec) {
-+    		    pj_scan_get(scanner, spec, pvalue);
-+    		} else {
-+		    parser_get_and_unescape(scanner, pool, spec, esc_spec,
-+		    			    pvalue);
-+		}
- 	    }
- 	}
-     }
-@@ -1252,7 +1267,10 @@ PJ_DEF(void) pjsip_parse_param_imp(pj_scanner *scanner, pj_pool_t *pool,
- 			     	   unsigned option)
- {
-     parse_param_imp(scanner, pool, pname, pvalue, &pconst.pjsip_TOKEN_SPEC,
--		    &pconst.pjsip_TOKEN_SPEC_ESC, option);
-+		    // Token does not need to be unescaped.
-+		    // Refer to PR #2933.
-+		    // &pconst.pjsip_TOKEN_SPEC_ESC,
-+		    NULL, option);
- }
- 
- 
-@@ -2168,7 +2186,10 @@ static void int_parse_via_param( pjsip_via_hdr *hdr, pj_scanner *scanner,
- 	pj_scan_get_char(scanner);
- 	parse_param_imp(scanner, pool, &pname, &pvalue,
- 			&pconst.pjsip_VIA_PARAM_SPEC,
--			&pconst.pjsip_VIA_PARAM_SPEC_ESC,
-+		    	// Token does not need to be unescaped.
-+		     	// Refer to PR #2933.
-+		    	// &pconst.pjsip_VIA_PARAM_SPEC_ESC,
-+			NULL,
- 			0);
- 
- 	if (!parser_stricmp(pname, pconst.pjsip_BRANCH_STR) && pvalue.slen) {
-diff --git a/pjsip/src/test/msg_test.c b/pjsip/src/test/msg_test.c
-index c511e1cf6..24e3d405d 100644
---- a/pjsip/src/test/msg_test.c
-+++ b/pjsip/src/test/msg_test.c
-@@ -953,7 +953,7 @@ static int hdr_test_subject_utf(pjsip_hdr *h);
- 
- 
- #define GENERIC_PARAM	     "p0=a;p1=\"ab:;cd\";p2=ab%3acd;p3"
--#define GENERIC_PARAM_PARSED "p0=a;p1=\"ab:;cd\";p2=ab:cd;p3"
-+#define GENERIC_PARAM_PARSED "p0=a;p1=\"ab:;cd\";p2=ab%3acd;p3"
- #define PARAM_CHAR	     "][/:&+$"
- #define SIMPLE_ADDR_SPEC     "sip:host"
- #define ADDR_SPEC	     SIMPLE_ADDR_SPEC ";"PARAM_CHAR"="PARAM_CHAR ";p1=\";\""
-@@ -1401,7 +1401,7 @@ static int generic_param_test(pjsip_param *param_head)
-     param = param->next;
-     if (pj_strcmp2(&param->name, "p2"))
- 	return -956;
--    if (pj_strcmp2(&param->value, "ab:cd"))
-+    if (pj_strcmp2(&param->value, "ab%3acd"))
- 	return -957;
- 
-     param = param->next;
-@@ -1621,7 +1621,7 @@ static int hdr_test_content_type(pjsip_hdr *h)
-     prm = prm->next;
-     if (prm == &hdr->media.param) return -1960;
-     if (pj_strcmp2(&prm->name, "p2")) return -1961;
--    if (pj_strcmp2(&prm->value, "ab:cd")) return -1962;
-+    if (pj_strcmp2(&prm->value, "ab%3acd")) return -1962;
- 
-     prm = prm->next;
-     if (prm == &hdr->media.param) return -1970;
--- 
-2.32.0
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0150-Create-generic-pjsip_hdr_find-functions.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0150-Create-generic-pjsip_hdr_find-functions.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0150-Create-generic-pjsip_hdr_find-functions.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0150-Create-generic-pjsip_hdr_find-functions.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,176 +0,0 @@
-From 7e3dfd8a15fd0f98dbf0e04d2d7a5bded90ee401 Mon Sep 17 00:00:00 2001
-From: George Joseph <gjoseph@sangoma.com>
-Date: Tue, 11 Jan 2022 09:27:23 -0700
-Subject: [PATCH] Create generic pjsip_hdr_find functions
-
-pjsip_msg_find_hdr(), pjsip_msg_find_hdr_by_name(), and
-pjsip_msg_find_hdr_by_names() require a pjsip_msg to be passed in
-so if you need to search a header list that's not in a pjsip_msg,
-you have to do it yourself.  This commit adds generic versions of
-those 3 functions that take in the actual header list head instead
-of a pjsip_msg so if you need to search a list of headers in
-something like a pjsip_multipart_part, you can do so easily.
----
- pjsip/include/pjsip/sip_msg.h | 53 +++++++++++++++++++++++++++++++++++
- pjsip/src/pjsip/sip_msg.c     | 51 +++++++++++++++++++++++----------
- 2 files changed, 89 insertions(+), 15 deletions(-)
-
-diff --git a/pjsip/include/pjsip/sip_msg.h b/pjsip/include/pjsip/sip_msg.h
-index 4c9100d39..e3502e94e 100644
---- a/pjsip/include/pjsip/sip_msg.h
-+++ b/pjsip/include/pjsip/sip_msg.h
-@@ -362,6 +362,59 @@ PJ_DECL(void*) pjsip_hdr_shallow_clone( pj_pool_t *pool, const void *hdr );
-  */
- PJ_DECL(int) pjsip_hdr_print_on( void *hdr, char *buf, pj_size_t len);
- 
-+/**
-+ * Find a header in a header list by the header type.
-+ *
-+ * @param hdr_list  The "head" of the header list.
-+ * @param type      The header type to find.
-+ * @param start     The first header field where the search should begin.
-+ *                  If NULL is specified, then the search will begin from the
-+ *                  first header, otherwise the search will begin at the
-+ *                  specified header.
-+ *
-+ * @return          The header field, or NULL if no header with the specified
-+ *                  type is found.
-+ */
-+PJ_DECL(void*)  pjsip_hdr_find( const void *hdr_list,
-+				pjsip_hdr_e type,
-+				const void *start);
-+
-+/**
-+ * Find a header in a header list by its name.
-+ *
-+ * @param hdr_list  The "head" of the header list.
-+ * @param name      The header name to find.
-+ * @param start     The first header field where the search should begin.
-+ *                  If NULL is specified, then the search will begin from the
-+ *                  first header, otherwise the search will begin at the
-+ *                  specified header.
-+ *
-+ * @return          The header field, or NULL if no header with the specified
-+ *                  type is found.
-+ */
-+PJ_DECL(void*)  pjsip_hdr_find_by_name( const void *hdr_list,
-+					const pj_str_t *name,
-+					const void *start);
-+
-+/**
-+ * Find a header in a header list by its name and short name version.
-+ *
-+ * @param hdr_list  The "head" of the header list.
-+ * @param name      The header name to find.
-+ * @param sname     The short name version of the header name.
-+ * @param start     The first header field where the search should begin.
-+ *                  If NULL is specified, then the search will begin from the
-+ *                  first header, otherwise the search will begin at the
-+ *                  specified header.
-+ *
-+ * @return	    The header field, or NULL if no header with the specified
-+ *		    type is found.
-+ */
-+PJ_DECL(void*)  pjsip_hdr_find_by_names( const void *hdr_list,
-+					 const pj_str_t *name,
-+					 const pj_str_t *sname,
-+					 const void *start);
-+
- /**
-  * @}
-  */
-diff --git a/pjsip/src/pjsip/sip_msg.c b/pjsip/src/pjsip/sip_msg.c
-index 6ba3054da..2a6a96af0 100644
---- a/pjsip/src/pjsip/sip_msg.c
-+++ b/pjsip/src/pjsip/sip_msg.c
-@@ -356,13 +356,13 @@ PJ_DEF(pjsip_msg*) pjsip_msg_clone( pj_pool_t *pool, const pjsip_msg *src)
-     return dst;
- }
- 
--PJ_DEF(void*)  pjsip_msg_find_hdr( const pjsip_msg *msg, 
--				   pjsip_hdr_e hdr_type, const void *start)
-+PJ_DEF(void*)  pjsip_hdr_find( const void *hdr_list,
-+			       pjsip_hdr_e hdr_type, const void *start)
- {
--    const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=&msg->hdr;
-+    const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=hdr_list;
- 
-     if (hdr == NULL) {
--	hdr = msg->hdr.next;
-+	hdr = end->next;
-     }
-     for (; hdr!=end; hdr = hdr->next) {
- 	if (hdr->type == hdr_type)
-@@ -371,14 +371,14 @@ PJ_DEF(void*)  pjsip_msg_find_hdr( const pjsip_msg *msg,
-     return NULL;
- }
- 
--PJ_DEF(void*)  pjsip_msg_find_hdr_by_name( const pjsip_msg *msg, 
--					   const pj_str_t *name, 
--					   const void *start)
-+PJ_DEF(void*)  pjsip_hdr_find_by_name( const void *hdr_list,
-+				       const pj_str_t *name,
-+				       const void *start)
- {
--    const pjsip_hdr *hdr=(const pjsip_hdr*)start, *end=&msg->hdr;
-+    const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=hdr_list;
- 
-     if (hdr == NULL) {
--	hdr = msg->hdr.next;
-+	hdr = end->next;
-     }
-     for (; hdr!=end; hdr = hdr->next) {
- 	if (pj_stricmp(&hdr->name, name) == 0)
-@@ -387,15 +387,15 @@ PJ_DEF(void*)  pjsip_msg_find_hdr_by_name( const pjsip_msg *msg,
-     return NULL;
- }
- 
--PJ_DEF(void*)  pjsip_msg_find_hdr_by_names( const pjsip_msg *msg, 
--					    const pj_str_t *name, 
--					    const pj_str_t *sname,
--					    const void *start)
-+PJ_DEF(void*)  pjsip_hdr_find_by_names( const void *hdr_list,
-+					const pj_str_t *name,
-+					const pj_str_t *sname,
-+					const void *start)
- {
--    const pjsip_hdr *hdr=(const pjsip_hdr*)start, *end=&msg->hdr;
-+    const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=hdr_list;
- 
-     if (hdr == NULL) {
--	hdr = msg->hdr.next;
-+	hdr = end->next;
-     }
-     for (; hdr!=end; hdr = hdr->next) {
- 	if (pj_stricmp(&hdr->name, name) == 0)
-@@ -406,6 +406,27 @@ PJ_DEF(void*)  pjsip_msg_find_hdr_by_names( const pjsip_msg *msg,
-     return NULL;
- }
- 
-+PJ_DEF(void*)  pjsip_msg_find_hdr( const pjsip_msg *msg,
-+				   pjsip_hdr_e hdr_type, const void *start)
-+{
-+    return pjsip_hdr_find(&msg->hdr, hdr_type, start);
-+}
-+
-+PJ_DEF(void*)  pjsip_msg_find_hdr_by_name( const pjsip_msg *msg,
-+					   const pj_str_t *name,
-+					   const void *start)
-+{
-+    return pjsip_hdr_find_by_name(&msg->hdr, name, start);
-+}
-+
-+PJ_DEF(void*)  pjsip_msg_find_hdr_by_names( const pjsip_msg *msg,
-+					    const pj_str_t *name,
-+					    const pj_str_t *sname,
-+					    const void *start)
-+{
-+    return pjsip_hdr_find_by_names(&msg->hdr, name, sname, start);
-+}
-+
- PJ_DEF(void*) pjsip_msg_find_remove_hdr( pjsip_msg *msg, 
- 				         pjsip_hdr_e hdr_type, void *start)
- {
--- 
-2.34.1
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0160-Additional-multipart-improvements.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0160-Additional-multipart-improvements.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0160-Additional-multipart-improvements.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0160-Additional-multipart-improvements.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,644 +0,0 @@
-From b7ecff22e77887626fd8e8608c4dd73bc7b7366f Mon Sep 17 00:00:00 2001
-From: George Joseph <gjoseph@sangoma.com>
-Date: Tue, 18 Jan 2022 06:14:31 -0700
-Subject: [PATCH] Additional multipart improvements
-
-Added the following APIs:
-pjsip_multipart_find_part_by_header()
-pjsip_multipart_find_part_by_header_str()
-pjsip_multipart_find_part_by_cid_str()
-pjsip_multipart_find_part_by_cid_uri()
----
- pjsip/include/pjsip/sip_multipart.h |  83 ++++++++++
- pjsip/src/pjsip/sip_multipart.c     | 223 +++++++++++++++++++++++++++
- pjsip/src/test/multipart_test.c     | 225 +++++++++++++++++++++++++++-
- 3 files changed, 530 insertions(+), 1 deletion(-)
-
-diff --git a/pjsip/include/pjsip/sip_multipart.h b/pjsip/include/pjsip/sip_multipart.h
-index 1c05767c5..c6b82b0b4 100644
---- a/pjsip/include/pjsip/sip_multipart.h
-+++ b/pjsip/include/pjsip/sip_multipart.h
-@@ -153,6 +153,89 @@ pjsip_multipart_find_part( const pjsip_msg_body *mp,
- 			   const pjsip_media_type *content_type,
- 			   const pjsip_multipart_part *start);
- 
-+/**
-+ * Find a body inside multipart bodies which has a header matching the
-+ * supplied one. Most useful for finding a part with a specific Content-ID.
-+ *
-+ * @param pool		Memory pool to use for temp space.
-+ * @param mp		The multipart body.
-+ * @param search_hdr	Header to search for.
-+ * @param start		If specified, the search will begin at
-+ * 			start->next part. Otherwise it will begin at
-+ * 			the first part in the multipart bodies.
-+ *
-+ * @return		The first part which has a header matching the
-+ * 			specified one, or NULL if not found.
-+ */
-+PJ_DECL(pjsip_multipart_part*)
-+pjsip_multipart_find_part_by_header(pj_pool_t *pool,
-+				    const pjsip_msg_body *mp,
-+				    void *search_hdr,
-+				    const pjsip_multipart_part *start);
-+
-+/**
-+ * Find a body inside multipart bodies which has a header matching the
-+ * supplied name and value. Most useful for finding a part with a specific
-+ * Content-ID.
-+ *
-+ * @param pool		Memory pool to use for temp space.
-+ * @param mp		The multipart body.
-+ * @param hdr_name	Header name to search for.
-+ * @param hdr_value	Header value search for.
-+ * @param start		If specified, the search will begin at
-+ * 			start->next part. Otherwise it will begin at
-+ * 			the first part in the multipart bodies.
-+ *
-+ * @return		The first part which has a header matching the
-+ * 			specified one, or NULL if not found.
-+ */
-+PJ_DECL(pjsip_multipart_part*)
-+pjsip_multipart_find_part_by_header_str(pj_pool_t *pool,
-+				    const pjsip_msg_body *mp,
-+				    const pj_str_t *hdr_name,
-+				    const pj_str_t *hdr_value,
-+				    const pjsip_multipart_part *start);
-+
-+
-+
-+/**
-+ * Find a body inside multipart bodies which has a Content-ID value matching the
-+ * supplied "cid" URI in pj_str form.  The "cid:" scheme will be assumed if the
-+ * URL doesn't start with it.  Enclosing angle brackets will also be handled
-+ * correctly if they exist.
-+ *
-+ * @see RFC2392 Content-ID and Message-ID Uniform Resource Locators
-+ *
-+ * @param pool	Memory pool to use for temp space.
-+ * @param mp	The multipart body.
-+ * @param cid	The "cid" URI to search for in pj_str form.
-+ *
-+ * @return		The first part which has a Content-ID header matching the
-+ * 			specified "cid" URI. or NULL if not found.
-+ */
-+PJ_DECL(pjsip_multipart_part*)
-+pjsip_multipart_find_part_by_cid_str(pj_pool_t *pool,
-+				 const pjsip_msg_body *mp,
-+				 pj_str_t *cid);
-+
-+/**
-+ * Find a body inside multipart bodies which has a Content-ID value matching the
-+ * supplied "cid" URI.
-+ *
-+ * @see RFC2392 Content-ID and Message-ID Uniform Resource Locators
-+ *
-+ * @param pool	Memory pool to use for temp space.
-+ * @param mp	The multipart body.
-+ * @param cid	The "cid" URI to search for.
-+ *
-+ * @return		The first part which had a Content-ID header matching the
-+ * 			specified "cid" URI. or NULL if not found.
-+ */
-+PJ_DECL(pjsip_multipart_part*)
-+pjsip_multipart_find_part_by_cid_uri(pj_pool_t *pool,
-+				 const pjsip_msg_body *mp,
-+				 pjsip_other_uri *cid_uri);
-+
- /**
-  * Parse multipart message.
-  *
-diff --git a/pjsip/src/pjsip/sip_multipart.c b/pjsip/src/pjsip/sip_multipart.c
-index e7d722d2e..9d8be55b0 100644
---- a/pjsip/src/pjsip/sip_multipart.c
-+++ b/pjsip/src/pjsip/sip_multipart.c
-@@ -19,6 +19,7 @@
- #include <pjsip/sip_multipart.h>
- #include <pjsip/sip_parser.h>
- #include <pjlib-util/scanner.h>
-+#include <pjlib-util/string.h>
- #include <pj/assert.h>
- #include <pj/ctype.h>
- #include <pj/errno.h>
-@@ -416,6 +417,220 @@ pjsip_multipart_find_part( const pjsip_msg_body *mp,
-     return NULL;
- }
- 
-+/*
-+ * Find a body inside multipart bodies which has the header and value.
-+ */
-+PJ_DEF(pjsip_multipart_part*)
-+pjsip_multipart_find_part_by_header_str(pj_pool_t *pool,
-+				    const pjsip_msg_body *mp,
-+				    const pj_str_t *hdr_name,
-+				    const pj_str_t *hdr_value,
-+				    const pjsip_multipart_part *start)
-+{
-+    struct multipart_data *m_data;
-+    pjsip_multipart_part *part;
-+    pjsip_hdr *found_hdr;
-+    pj_str_t found_hdr_str;
-+    pj_str_t found_hdr_value;
-+    pj_size_t expected_hdr_slen;
-+    pj_size_t buf_size;
-+    int hdr_name_len;
-+#define REASONABLE_PADDING 32
-+#define SEPARATOR_LEN 2
-+    /* Must specify mandatory params */
-+    PJ_ASSERT_RETURN(mp && hdr_name && hdr_value, NULL);
-+
-+    /* mp must really point to an actual multipart msg body */
-+    PJ_ASSERT_RETURN(mp->print_body==&multipart_print_body, NULL);
-+
-+    /*
-+     * We'll need to "print" each header we find to test it but
-+     * allocating a buffer of PJSIP_MAX_URL_SIZE is overkill.
-+     * Instead, we'll allocate one large enough to hold the search
-+     * header name, the ": " separator, the search hdr value, and
-+     * the NULL terminator.  If we can't print the found header
-+     * into that buffer then it can't be a match.
-+     *
-+     * Some header print functions such as generic_int require enough
-+     * space to print the maximum possible header length so we'll
-+     * add a reasonable amount to the print buffer size.
-+     */
-+    expected_hdr_slen = hdr_name->slen + SEPARATOR_LEN + hdr_value->slen;
-+    buf_size = expected_hdr_slen + REASONABLE_PADDING;
-+    found_hdr_str.ptr = pj_pool_alloc(pool, buf_size);
-+    found_hdr_str.slen = 0;
-+    hdr_name_len = hdr_name->slen + SEPARATOR_LEN;
-+
-+    m_data = (struct multipart_data*)mp->data;
-+
-+    if (start)
-+	part = start->next;
-+    else
-+	part = m_data->part_head.next;
-+
-+    while (part != &m_data->part_head) {
-+	found_hdr = NULL;
-+	while ((found_hdr = pjsip_hdr_find_by_name(&part->hdr, hdr_name,
-+	    (found_hdr ? found_hdr->next : NULL))) != NULL) {
-+
-+	    found_hdr_str.slen = pjsip_hdr_print_on((void*) found_hdr, found_hdr_str.ptr, buf_size);
-+	    /*
-+	     * If the buffer was too small (slen = -1) or the result wasn't
-+	     * the same length as the search header, it can't be a match.
-+	     */
-+	    if (found_hdr_str.slen != expected_hdr_slen) {
-+		continue;
-+	    }
-+	    /*
-+	     * Set the value overlay to start at the found header value...
-+	     */
-+	    found_hdr_value.ptr = found_hdr_str.ptr + hdr_name_len;
-+	    found_hdr_value.slen = found_hdr_str.slen - hdr_name_len;
-+	    /* ...and compare it to the supplied header value. */
-+	    if (pj_strcmp(hdr_value, &found_hdr_value) == 0) {
-+		return part;
-+	    }
-+	}
-+	part = part->next;
-+    }
-+    return NULL;
-+#undef SEPARATOR_LEN
-+#undef REASONABLE_PADDING
-+}
-+
-+PJ_DEF(pjsip_multipart_part*)
-+pjsip_multipart_find_part_by_header(pj_pool_t *pool,
-+				    const pjsip_msg_body *mp,
-+				    void *search_for,
-+				    const pjsip_multipart_part *start)
-+{
-+    struct multipart_data *m_data;
-+    pjsip_hdr *search_hdr = search_for;
-+    pj_str_t search_buf;
-+
-+    /* Must specify mandatory params */
-+    PJ_ASSERT_RETURN(mp && search_hdr, NULL);
-+
-+    /* mp must really point to an actual multipart msg body */
-+    PJ_ASSERT_RETURN(mp->print_body==&multipart_print_body, NULL);
-+
-+    /*
-+     * Unfortunately, there isn't enough information to determine
-+     * the maximum printed size of search_hdr at this point so we
-+     * have to allocate a reasonable max.
-+     */
-+    search_buf.ptr = pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
-+    search_buf.slen = pjsip_hdr_print_on(search_hdr, search_buf.ptr, PJSIP_MAX_URL_SIZE - 1);
-+    if (search_buf.slen <= 0) {
-+	return NULL;
-+    }
-+    /*
-+     * Set the header value to start after the header name plus the ":", then
-+     * strip leading and trailing whitespace.
-+     */
-+    search_buf.ptr += (search_hdr->name.slen + 1);
-+    search_buf.slen -= (search_hdr->name.slen + 1);
-+    pj_strtrim(&search_buf);
-+
-+    return pjsip_multipart_find_part_by_header_str(pool, mp, &search_hdr->name, &search_buf, start);
-+}
-+
-+/*
-+ * Convert a Content-ID URI to it's corresponding header value.
-+ * RFC2392 says...
-+ * A "cid" URL is converted to the corresponding Content-ID message
-+ * header by removing the "cid:" prefix, converting the % encoded
-+ * character(s) to their equivalent US-ASCII characters, and enclosing
-+ * the remaining parts with an angle bracket pair, "<" and ">".
-+ *
-+ * This implementation will accept URIs with or without the "cid:"
-+ * scheme and optional angle brackets.
-+ */
-+static pj_str_t cid_uri_to_hdr_value(pj_pool_t *pool, pj_str_t *cid_uri)
-+{
-+    pj_size_t cid_len = pj_strlen(cid_uri);
-+    pj_size_t alloc_len = cid_len + 2 /* for the leading and trailing angle brackets */;
-+    pj_str_t uri_overlay;
-+    pj_str_t cid_hdr;
-+    pj_str_t hdr_overlay;
-+
-+    pj_strassign(&uri_overlay, cid_uri);
-+    /* If the URI is already enclosed in angle brackets, remove them. */
-+    if (uri_overlay.ptr[0] == '<') {
-+	uri_overlay.ptr++;
-+	uri_overlay.slen -= 2;
-+    }
-+    /* If the URI starts with the "cid:" scheme, skip over it. */
-+    if (pj_strncmp2(&uri_overlay, "cid:", 4) == 0) {
-+	uri_overlay.ptr += 4;
-+	uri_overlay.slen -= 4;
-+    }
-+    /* Start building */
-+    cid_hdr.ptr = pj_pool_alloc(pool, alloc_len);
-+    cid_hdr.ptr[0] = '<';
-+    cid_hdr.slen = 1;
-+    hdr_overlay.ptr = cid_hdr.ptr + 1;
-+    hdr_overlay.slen = 0;
-+    pj_strcpy_unescape(&hdr_overlay, &uri_overlay);
-+    cid_hdr.slen += hdr_overlay.slen;
-+    cid_hdr.ptr[cid_hdr.slen] = '>';
-+    cid_hdr.slen++;
-+
-+    return cid_hdr;
-+}
-+
-+PJ_DEF(pjsip_multipart_part*)
-+pjsip_multipart_find_part_by_cid_str(pj_pool_t *pool,
-+				 const pjsip_msg_body *mp,
-+				 pj_str_t *cid)
-+{
-+    struct multipart_data *m_data;
-+    pjsip_multipart_part *part;
-+    pjsip_generic_string_hdr *found_hdr;
-+    pj_str_t found_hdr_value;
-+    static pj_str_t hdr_name = { "Content-ID", 10};
-+    pj_str_t hdr_value;
-+
-+    PJ_ASSERT_RETURN(pool && mp && cid && (pj_strlen(cid) > 0), NULL);
-+
-+    hdr_value = cid_uri_to_hdr_value(pool, cid);
-+    if (pj_strlen(&hdr_value) == 0) {
-+	return NULL;
-+    }
-+
-+    m_data = (struct multipart_data*)mp->data;
-+    part = m_data->part_head.next;
-+
-+    while (part != &m_data->part_head) {
-+	found_hdr = NULL;
-+	while ((found_hdr = pjsip_hdr_find_by_name(&part->hdr, &hdr_name,
-+	    (found_hdr ? found_hdr->next : NULL))) != NULL) {
-+	    if (pj_strcmp(&hdr_value, &found_hdr->hvalue) == 0) {
-+		return part;
-+	    }
-+	}
-+	part = part->next;
-+    }
-+    return NULL;
-+}
-+
-+PJ_DEF(pjsip_multipart_part*)
-+pjsip_multipart_find_part_by_cid_uri(pj_pool_t *pool,
-+				 const pjsip_msg_body *mp,
-+				 pjsip_other_uri *cid_uri)
-+{
-+    PJ_ASSERT_RETURN(pool && mp && cid_uri, NULL);
-+
-+    if (pj_strcmp2(&cid_uri->scheme, "cid") != 0) {
-+	return NULL;
-+    }
-+    /*
-+     * We only need to pass the URI content so we
-+     * can do that directly.
-+     */
-+    return pjsip_multipart_find_part_by_cid_str(pool, mp, &cid_uri->content);
-+}
-+
- /* Parse a multipart part. "pct" is parent content-type  */
- static pjsip_multipart_part *parse_multipart_part(pj_pool_t *pool,
- 						  char *start,
-@@ -584,6 +799,7 @@ PJ_DEF(pjsip_msg_body*) pjsip_multipart_parse(pj_pool_t *pool,
- 		(int)boundary.slen, boundary.ptr));
-     }
- 
-+
-     /* Build the delimiter:
-      *   delimiter = "--" boundary
-      */
-@@ -630,6 +846,8 @@ PJ_DEF(pjsip_msg_body*) pjsip_multipart_parse(pj_pool_t *pool,
- 	if (*curptr=='\r') ++curptr;
- 	if (*curptr!='\n') {
- 	    /* Expecting a newline here */
-+	    PJ_LOG(2, (THIS_FILE, "Failed to find newline"));
-+
- 	    return NULL;
- 	}
- 	++curptr;
-@@ -645,6 +863,7 @@ PJ_DEF(pjsip_msg_body*) pjsip_multipart_parse(pj_pool_t *pool,
- 	    curptr = pj_strstr(&subbody, &delim);
- 	    if (!curptr) {
- 		/* We're really expecting end delimiter to be found. */
-+		PJ_LOG(2, (THIS_FILE, "Failed to find end-delimiter"));
- 		return NULL;
- 	    }
- 	}
-@@ -670,9 +889,13 @@ PJ_DEF(pjsip_msg_body*) pjsip_multipart_parse(pj_pool_t *pool,
- 	part = parse_multipart_part(pool, start_body, end_body - start_body,
- 				    ctype);
- 	if (part) {
-+	    TRACE_((THIS_FILE, "Adding part"));
- 	    pjsip_multipart_add_part(pool, body, part);
-+	} else {
-+	    PJ_LOG(2, (THIS_FILE, "Failed to add part"));
- 	}
-     }
-+    TRACE_((THIS_FILE, "pjsip_multipart_parse finished: %p", body));
- 
-     return body;
- }
-diff --git a/pjsip/src/test/multipart_test.c b/pjsip/src/test/multipart_test.c
-index 4f16e68bf..97267a290 100644
---- a/pjsip/src/test/multipart_test.c
-+++ b/pjsip/src/test/multipart_test.c
-@@ -28,6 +28,7 @@
- typedef pj_status_t (*verify_ptr)(pj_pool_t*,pjsip_msg_body*);
- 
- static pj_status_t verify1(pj_pool_t *pool, pjsip_msg_body *body);
-+static pj_status_t verify2(pj_pool_t *pool, pjsip_msg_body *body);
- 
- static struct test_t
- {
-@@ -68,7 +69,41 @@ static struct test_t
- 		"This is epilogue, which should be ignored too",
- 
- 		&verify1
-+	},
-+	{
-+		/* Content-type */
-+		"multipart", "mixed", "12345",
-+
-+		/* Body: */
-+		"This is the prolog, which should be ignored.\r\n"
-+		"--12345\r\n"
-+		"Content-Type: text/plain\r\n"
-+		"Content-ID: <header1@example.org>\r\n"
-+		"Content-ID: <\"header1\"@example.org>\r\n"
-+		"Content-Length: 13\r\n"
-+		"\r\n"
-+		"has header1\r\n"
-+		"--12345 \t\r\n"
-+		"Content-Type: application/pidf+xml\r\n"
-+		"Content-ID: <my header2@example.org>\r\n"
-+		"Content-ID: <my\xffheader2@example.org>\r\n"
-+		"Content-Length: 13\r\n"
-+		"\r\n"
-+		"has header2\r\n"
-+		"--12345\r\n"
-+		"Content-Type: text/plain\r\n"
-+		"Content-ID: <my header3@example.org>\r\n"
-+		"Content-ID: <header1@example.org>\r\n"
-+		"Content-ID: <my header4@example.org>\r\n"
-+		"Content-Length: 13\r\n"
-+		"\r\n"
-+		"has header4\r\n"
-+		"--12345--\r\n"
-+		"This is epilogue, which should be ignored too",
-+
-+		&verify2
- 	}
-+
- };
- 
- static void init_media_type(pjsip_media_type *mt,
-@@ -87,6 +122,192 @@ static void init_media_type(pjsip_media_type *mt,
-     }
- }
- 
-+static int verify_hdr(pj_pool_t *pool, pjsip_msg_body *multipart_body,
-+    void *hdr, char *part_body)
-+{
-+    pjsip_media_type mt;
-+    pjsip_multipart_part *part;
-+    pj_str_t the_body;
-+
-+
-+    part = pjsip_multipart_find_part_by_header(pool, multipart_body, hdr, NULL);
-+    if (!part) {
-+	return -1;
-+    }
-+
-+    the_body.ptr = (char*)part->body->data;
-+    the_body.slen = part->body->len;
-+
-+    if (pj_strcmp2(&the_body, part_body) != 0) {
-+	return -2;
-+    }
-+
-+    return 0;
-+}
-+
-+static int verify_cid_str(pj_pool_t *pool, pjsip_msg_body *multipart_body,
-+    pj_str_t cid_url, char *part_body)
-+{
-+    pjsip_media_type mt;
-+    pjsip_multipart_part *part;
-+    pj_str_t the_body;
-+
-+    part = pjsip_multipart_find_part_by_cid_str(pool, multipart_body, &cid_url);
-+    if (!part) {
-+	return -3;
-+    }
-+
-+    the_body.ptr = (char*)part->body->data;
-+    the_body.slen = part->body->len;
-+
-+    if (pj_strcmp2(&the_body, part_body) != 0) {
-+	return -4;
-+    }
-+
-+    return 0;
-+}
-+
-+static int verify_cid_uri(pj_pool_t *pool, pjsip_msg_body *multipart_body,
-+    pjsip_other_uri *cid_uri, char *part_body)
-+{
-+    pjsip_media_type mt;
-+    pjsip_multipart_part *part;
-+    pj_str_t the_body;
-+
-+    part = pjsip_multipart_find_part_by_cid_uri(pool, multipart_body, cid_uri);
-+    if (!part) {
-+	return -5;
-+    }
-+
-+    the_body.ptr = (char*)part->body->data;
-+    the_body.slen = part->body->len;
-+
-+    if (pj_strcmp2(&the_body, part_body) != 0) {
-+	return -6;
-+    }
-+
-+    return 0;
-+}
-+
-+static pj_status_t verify2(pj_pool_t *pool, pjsip_msg_body *body)
-+{
-+    int rc = 0;
-+    int rcbase = 300;
-+    pjsip_other_uri *cid_uri;
-+    pjsip_ctype_hdr *ctype_hdr = pjsip_ctype_hdr_create(pool);
-+
-+    ctype_hdr->media.type = pj_str("application");
-+    ctype_hdr->media.subtype = pj_str("pidf+xml");
-+
-+    rc = verify_hdr(pool, body, ctype_hdr, "has header2");
-+    if (rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    rcbase += 10;
-+    rc = verify_cid_str(pool, body, pj_str("cid:header1@example.org"), "has header1");
-+    if (rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    rcbase += 10;
-+    rc = verify_cid_str(pool, body, pj_str("%22header1%22@example.org"), "has header1");
-+    if (rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    cid_uri = pjsip_uri_get_uri(pjsip_parse_uri(pool, "<cid:%22header1%22@example.org>",
-+	strlen("<cid:%22header1%22@example.org>"), 0));
-+    rcbase += 10;
-+    rc = verify_cid_uri(pool, body, cid_uri, "has header1");
-+    if (rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    rcbase += 10;
-+    rc = verify_cid_str(pool, body, pj_str("<cid:my%20header2@example.org>"), "has header2");
-+    if (rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    rcbase += 10;
-+    rc = verify_cid_str(pool, body, pj_str("cid:my%ffheader2@example.org"), "has header2");
-+    if (rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    cid_uri = pjsip_uri_get_uri(pjsip_parse_uri(pool, "<cid:my%ffheader2@example.org>",
-+	strlen("<cid:my%ffheader2@example.org>"), 0));
-+    rcbase += 10;
-+    rc = verify_cid_uri(pool, body, cid_uri, "has header2");
-+    if (rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    rcbase += 10;
-+    rc = verify_cid_str(pool, body, pj_str("cid:my%20header3@example.org"), "has header4");
-+    if (rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    rcbase += 10;
-+    rc = verify_cid_str(pool, body, pj_str("<cid:my%20header4@example.org>"), "has header4");
-+    if (rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    cid_uri = pjsip_uri_get_uri(pjsip_parse_uri(pool, "<cid:my%20header4@example.org>",
-+	strlen("<cid:my%20header4@example.org>"), 0));
-+    rcbase += 10;
-+    rc = verify_cid_uri(pool, body, cid_uri, "has header4");
-+    if (rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    rcbase += 10;
-+    rc = verify_cid_str(pool, body, pj_str("<my%20header3@example.org>"), "has header4");
-+    if (rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    /* These should all fail for malformed or missing URI */
-+    rcbase += 10;
-+    rc = verify_cid_str(pool, body, pj_str("cid:"), "has header4");
-+    if (!rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    rcbase += 10;
-+    rc = verify_cid_str(pool, body, pj_str(""), "has header4");
-+    if (!rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    rcbase += 10;
-+    rc = verify_cid_str(pool, body, pj_str("<>"), "has header4");
-+    if (!rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    rcbase += 10;
-+    rc = verify_cid_str(pool, body, pj_str("<cid>"), "has header4");
-+    if (!rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    /*
-+     * This is going to pass but the ' ' in the uri is un-encoded which is invalid
-+     * so we should never see it.
-+     */
-+    rcbase += 10;
-+    rc = verify_cid_str(pool, body, pj_str("cid:my header3@example.org"), "has header4");
-+    if (rc) {
-+	return (rc - rcbase);
-+    }
-+
-+    return 0;
-+}
-+
- static int verify_part(pjsip_multipart_part *part,
- 		       char *h_content_type,
- 		       char *h_content_subtype,
-@@ -236,8 +457,10 @@ static int parse_test(void)
- 
- 	pj_strdup2_with_null(pool, &str, p_tests[i].msg);
- 	body = pjsip_multipart_parse(pool, str.ptr, str.slen, &ctype, 0);
--	if (!body)
-+	if (!body) {
-+	    pj_pool_release(pool);
- 	    return -100;
-+	}
- 
- 	if (p_tests[i].verify) {
- 	    rc = p_tests[i].verify(pool, body);
--- 
-2.34.1
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0170-stun-integer-underflow.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0170-stun-integer-underflow.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0170-stun-integer-underflow.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0170-stun-integer-underflow.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-From 15663e3f37091069b8c98a7fce680dc04bc8e865 Mon Sep 17 00:00:00 2001
-From: sauwming <ming@teluu.com>
-Date: Tue, 10 Aug 2021 11:53:25 +0800
-Subject: [PATCH] Merge pull request from GHSA-2qpg-f6wf-w984
-
----
- pjnath/src/pjnath/stun_msg.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c
-index cd5870f82..bd83351e6 100644
---- a/pjnath/src/pjnath/stun_msg.c
-+++ b/pjnath/src/pjnath/stun_msg.c
-@@ -1763,6 +1763,9 @@ static pj_status_t decode_errcode_attr(pj_pool_t *pool,
-     /* Get pointer to the string in the message */
-     value.ptr = ((char*)buf + ATTR_HDR_LEN + 4);
-     value.slen = attr->hdr.length - 4;
-+    /* Make sure the length is never negative */
-+    if (value.slen < 0)
-+    	value.slen = 0;
- 
-     /* Copy the string to the attribute */
-     pj_strdup(pool, &attr->reason, &value);
--- 
-2.25.1
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0171-dialog-set-free.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0171-dialog-set-free.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0171-dialog-set-free.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0171-dialog-set-free.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-From db3235953baa56d2fb0e276ca510fefca751643f Mon Sep 17 00:00:00 2001
-From: Nanang Izzuddin <nanang@teluu.com>
-Date: Mon, 21 Feb 2022 06:24:52 +0700
-Subject: [PATCH] Merge pull request from GHSA-ffff-m5fm-qm62
-
-* Update pjsip_ua_unregister_dlg():
-- update the hash key if the dialog being unregistered is used as hash key.
-- add an assertion check to make sure that the dlg_set to be removed is valid (can be found in the hash table).
-
-* Change hash key string comparison method.
----
- pjsip/src/pjsip/sip_ua_layer.c | 48 +++++++++++++++++++++++++++++-----
- 1 file changed, 42 insertions(+), 6 deletions(-)
-
-diff --git a/pjsip/src/pjsip/sip_ua_layer.c b/pjsip/src/pjsip/sip_ua_layer.c
-index 59c2524ba..5d79882a1 100644
---- a/pjsip/src/pjsip/sip_ua_layer.c
-+++ b/pjsip/src/pjsip/sip_ua_layer.c
-@@ -65,6 +65,9 @@ struct dlg_set
-     /* This is the buffer to store this entry in the hash table. */
-     pj_hash_entry_buf ht_entry;
- 
-+    /* Entry key in the hash table */
-+    pj_str_t ht_key;
-+
-     /* List of dialog in this dialog set. */
-     struct dlg_set_head  dlg_list;
- };
-@@ -327,6 +330,7 @@ PJ_DEF(pj_status_t) pjsip_ua_register_dlg( pjsip_user_agent *ua,
- 	     * Create the dialog set and add this dialog to it.
- 	     */
- 	    dlg_set = alloc_dlgset_node();
-+	    dlg_set->ht_key = dlg->local.info->tag;
- 	    pj_list_init(&dlg_set->dlg_list);
- 	    pj_list_push_back(&dlg_set->dlg_list, dlg);
- 
-@@ -334,8 +338,8 @@ PJ_DEF(pj_status_t) pjsip_ua_register_dlg( pjsip_user_agent *ua,
- 
- 	    /* Register the dialog set in the hash table. */
- 	    pj_hash_set_np_lower(mod_ua.dlg_table, 
--			         dlg->local.info->tag.ptr,
--                                 (unsigned)dlg->local.info->tag.slen,
-+			         dlg_set->ht_key.ptr,
-+                                 (unsigned)dlg_set->ht_key.slen,
- 			         dlg->local.tag_hval, dlg_set->ht_entry,
-                                  dlg_set);
- 	}
-@@ -345,14 +349,15 @@ PJ_DEF(pj_status_t) pjsip_ua_register_dlg( pjsip_user_agent *ua,
- 	struct dlg_set *dlg_set;
- 
- 	dlg_set = alloc_dlgset_node();
-+	dlg_set->ht_key = dlg->local.info->tag;
- 	pj_list_init(&dlg_set->dlg_list);
- 	pj_list_push_back(&dlg_set->dlg_list, dlg);
- 
- 	dlg->dlg_set = dlg_set;
- 
- 	pj_hash_set_np_lower(mod_ua.dlg_table, 
--		             dlg->local.info->tag.ptr,
--                             (unsigned)dlg->local.info->tag.slen,
-+		             dlg_set->ht_key.ptr,
-+                             (unsigned)dlg_set->ht_key.slen,
- 		             dlg->local.tag_hval, dlg_set->ht_entry, dlg_set);
-     }
- 
-@@ -397,12 +402,43 @@ PJ_DEF(pj_status_t) pjsip_ua_unregister_dlg( pjsip_user_agent *ua,
- 
-     /* If dialog list is empty, remove the dialog set from the hash table. */
-     if (pj_list_empty(&dlg_set->dlg_list)) {
--	pj_hash_set_lower(NULL, mod_ua.dlg_table, dlg->local.info->tag.ptr,
--		          (unsigned)dlg->local.info->tag.slen, 
-+
-+	/* Verify that the dialog set is valid */
-+	pj_assert(pj_hash_get_lower(mod_ua.dlg_table, dlg_set->ht_key.ptr,
-+				    (unsigned)dlg_set->ht_key.slen,
-+				    &dlg->local.tag_hval) == dlg_set);
-+
-+	pj_hash_set_lower(NULL, mod_ua.dlg_table, dlg_set->ht_key.ptr,
-+		          (unsigned)dlg_set->ht_key.slen,
- 			  dlg->local.tag_hval, NULL);
- 
- 	/* Return dlg_set to free nodes. */
- 	pj_list_push_back(&mod_ua.free_dlgset_nodes, dlg_set);
-+    } else {
-+	/* If the just unregistered dialog is being used as hash key,
-+	 * reset the dlg_set entry with a new key (i.e: from the first dialog
-+	 * in dlg_set).
-+	 */
-+	if (dlg_set->ht_key.ptr  == dlg->local.info->tag.ptr &&
-+	    dlg_set->ht_key.slen == dlg->local.info->tag.slen)
-+	{
-+	    pjsip_dialog* key_dlg = dlg_set->dlg_list.next;
-+
-+	    /* Verify that the old & new keys share the hash value */
-+	    pj_assert(key_dlg->local.tag_hval == dlg->local.tag_hval);
-+
-+	    pj_hash_set_lower(NULL, mod_ua.dlg_table, dlg_set->ht_key.ptr,
-+			      (unsigned)dlg_set->ht_key.slen,
-+			      dlg->local.tag_hval, NULL);
-+
-+	    dlg_set->ht_key = key_dlg->local.info->tag;
-+
-+	    pj_hash_set_np_lower(mod_ua.dlg_table,
-+				 dlg_set->ht_key.ptr,
-+				 (unsigned)dlg_set->ht_key.slen,
-+				 key_dlg->local.tag_hval, dlg_set->ht_entry,
-+				 dlg_set);
-+	}
-     }
- 
-     /* Unlock user agent. */
--- 
-2.25.1
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0172-prevent-multipart-oob.patch asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0172-prevent-multipart-oob.patch
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/0172-prevent-multipart-oob.patch	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/0172-prevent-multipart-oob.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-From 077b465c33f0aec05a49cd2ca456f9a1b112e896 Mon Sep 17 00:00:00 2001
-From: sauwming <ming@teluu.com>
-Date: Wed, 26 Jan 2022 13:28:57 +0800
-Subject: [PATCH] Merge pull request from GHSA-7fw8-54cv-r7pm
-
----
- pjlib-util/src/pjlib-util/scanner.c | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/pjlib-util/src/pjlib-util/scanner.c b/pjlib-util/src/pjlib-util/scanner.c
-index 27a0b8831..a54edf2d8 100644
---- a/pjlib-util/src/pjlib-util/scanner.c
-+++ b/pjlib-util/src/pjlib-util/scanner.c
-@@ -444,16 +444,21 @@ PJ_DEF(void) pj_scan_get_n( pj_scanner *scanner,
- 
- PJ_DEF(int) pj_scan_get_char( pj_scanner *scanner )
- {
--    int chr = *scanner->curptr;
-+    register char *s = scanner->curptr;
-+    int chr;
- 
--    if (!chr) {
-+    if (s >= scanner->end || !*s) {
- 	pj_scan_syntax_err(scanner);
- 	return 0;
-     }
- 
--    ++scanner->curptr;
-+    chr = *s;
- 
--    if (PJ_SCAN_IS_PROBABLY_SPACE(*scanner->curptr) && scanner->skip_ws) {
-+    ++s;
-+    scanner->curptr = s;
-+    if (PJ_SCAN_CHECK_EOF(s) && PJ_SCAN_IS_PROBABLY_SPACE(*s) &&
-+    	scanner->skip_ws)
-+    {
- 	pj_scan_skip_whitespace(scanner);
-     }
-     return chr;
--- 
-2.25.1
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/config_site.h asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/config_site.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/patches/config_site.h	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/patches/config_site.h	2022-05-12 11:50:59.000000000 +0000
@@ -77,7 +77,7 @@
 /* Increase limits to allow more formats */
 #define	PJMEDIA_MAX_SDP_FMT   64
 #define	PJMEDIA_MAX_SDP_BANDW   4
-#define	PJMEDIA_MAX_SDP_ATTR   (PJMEDIA_MAX_SDP_FMT*2 + 4)
+#define	PJMEDIA_MAX_SDP_ATTR   (PJMEDIA_MAX_SDP_FMT*3 + 4)
 #define	PJMEDIA_MAX_SDP_MEDIA   16
 
 /*
@@ -87,3 +87,7 @@
  */
 #define PJSIP_TCP_KEEP_ALIVE_INTERVAL	0
 #define PJSIP_TLS_KEEP_ALIVE_INTERVAL	0
+
+#define PJSIP_TSX_UAS_CONTINUE_ON_TP_ERROR 0
+#define PJ_SSL_SOCK_OSSL_USE_THREAD_CB 0
+#define PJSIP_AUTH_ALLOW_MULTIPLE_AUTH_HEADER 1
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/pjproject-2.10.tar.bz2.md5 asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/pjproject-2.10.tar.bz2.md5
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/pjproject-2.10.tar.bz2.md5	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/pjproject-2.10.tar.bz2.md5	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-5d0202f79a7aeb14873c45b0e4c14a70 *pjproject-2.10.zip
-4fffc49b461133f0a4143b05a22fb30e  pjproject-2.10.tar.bz2
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/pjproject-2.12.tar.bz2.md5 asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/pjproject-2.12.tar.bz2.md5
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/pjproject/pjproject-2.12.tar.bz2.md5	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/pjproject/pjproject-2.12.tar.bz2.md5	2022-05-12 11:50:59.000000000 +0000
@@ -0,0 +1 @@
+ad796d38f5f0357cb5b2fe1b4460b581  pjproject-2.12.tar.bz2
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/versions.mak asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/versions.mak
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/third-party/versions.mak	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/third-party/versions.mak	2022-05-12 11:50:59.000000000 +0000
@@ -1,2 +1,2 @@
 JANSSON_VERSION = 2.14
-PJPROJECT_VERSION = 2.10
+PJPROJECT_VERSION = 2.12
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/UPGRADE.txt asterisk-18.12.0~dfsg+~cs6.12.40431413/UPGRADE.txt
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/UPGRADE.txt	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/UPGRADE.txt	2022-05-12 11:50:59.000000000 +0000
@@ -19,6 +19,18 @@
 ===========================================================
 
 ------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 18.11.3 to Asterisk 18.12.0 ----------
+------------------------------------------------------------------------------
+
+res_pjsip
+------------------
+ * The 'async_operations' setting on transports is no longer
+   obeyed and instead is always set to 1. This is due to the
+   functionality not being applicable to Asterisk and causing
+   excess unnecessary memory usage. This setting will now be
+   ignored but can also be removed from the configuration file.
+
+------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 18.10.0 to Asterisk 18.11.0 ----------
 ------------------------------------------------------------------------------
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/.version asterisk-18.12.0~dfsg+~cs6.12.40431413/.version
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/.version	2022-04-14 21:53:34.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/.version	2022-05-12 11:50:59.000000000 +0000
@@ -1 +1 @@
-18.11.2
\ No newline at end of file
+18.12.0
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/aconfigure asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/aconfigure
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/aconfigure	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/aconfigure	2022-02-24 07:54:38.000000000 +0000
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pjproject 2.x.
+# Generated by GNU Autoconf 2.71 for pjproject 2.x.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -14,14 +15,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -31,46 +34,46 @@
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -79,13 +82,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -94,8 +90,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -107,30 +107,10 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -152,20 +132,22 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else
+else \$as_nop
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -185,42 +167,52 @@
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
 
-else
+else \$as_nop
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
+  if (eval "$as_required") 2>/dev/null
+then :
   as_have_required=yes
-else
+else $as_nop
   as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
 
-else
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
+	     as_shell=$as_dir$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
   break 2
 fi
 fi
@@ -228,14 +220,21 @@
        esac
   as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
 
 
-      if test "x$CONFIG_SHELL" != x; then :
+      if test "x$CONFIG_SHELL" != x
+then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -253,18 +252,19 @@
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno
+then :
+  printf "%s\n" "$0: This script requires a shell more modern than all"
+  printf "%s\n" "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -291,6 +291,7 @@
 }
 as_unset=as_fn_unset
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -308,6 +309,14 @@
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -322,7 +331,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -331,7 +340,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -370,12 +379,13 @@
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -387,18 +397,27 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
@@ -410,9 +429,9 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -439,7 +458,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -483,7 +502,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -497,6 +516,10 @@
   exit
 }
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -510,6 +533,13 @@
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -584,44 +614,44 @@
 
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
 #endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
 #endif
 #ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
+ac_header_c_list=
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
 ac_main_obj
 ac_host
+ac_webrtc_aec3_ldflags
+ac_webrtc_aec3_cflags
+ac_webrtc_aec3_instset
+ac_no_webrtc_aec3
 ac_webrtc_ldflags
 ac_webrtc_cflags
 ac_webrtc_instset
@@ -650,6 +680,7 @@
 ac_ssl_backend
 ac_ssl_has_aes_gcm
 ac_no_ssl
+ac_no_mediacodec
 ac_vpx_ldflags
 ac_vpx_cflags
 ac_openh264_ldflags
@@ -681,14 +712,20 @@
 ac_pjmedia_video_has_ios_opengl
 ac_pjmedia_video_has_vtoolbox
 ac_pjmedia_video_has_darwin
+ac_dshow_ldflags
+ac_dshow_cflags
+ac_pjmedia_video_dev_has_dshow
 ac_android_cflags
 ac_pjmedia_video_has_android
 ac_pjmedia_video
 ac_pjmedia_audiodev_objs
+ac_oboe_ldflags
+ac_oboe_cflags
 ac_pa_cflags
 ac_external_pa
 ac_pjmedia_snd
 ac_pjmedia_resample
+ac_external_webrtc_aec3
 ac_external_webrtc
 ac_external_yuv
 ac_srtp_shutdown_present
@@ -697,15 +734,14 @@
 ac_external_srtp
 ac_external_gsm
 ac_external_speex
+ac_no_pjsua2
 ac_shared_libraries
 ac_linux_poll
 ac_os_objs
 ac_target_arch
-EGREP
-GREP
-CPP
 ac_cross_compile
 ac_shlib_suffix
+ac_cflags
 ac_build_mak_vars
 ac_pjdir
 CC_CFLAGS
@@ -762,6 +798,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -787,14 +824,17 @@
 enable_floating_point
 enable_epoll
 enable_shared
+enable_pjsua2
 with_external_speex
 with_external_gsm
 with_external_srtp
 with_external_yuv
 with_external_webrtc
+with_external_webrtc_aec3
 enable_resample
 enable_sound
 with_external_pa
+with_oboe
 enable_video
 enable_ext_sound
 enable_small_filter
@@ -809,6 +849,7 @@
 enable_ilbc_codec
 enable_libsamplerate
 enable_resample_dll
+enable_speex_resample
 with_sdl
 enable_sdl
 with_ffmpeg
@@ -822,6 +863,7 @@
 with_ipp
 with_ipp_samples
 with_ipp_arch
+enable_android_mediacodec
 with_ssl
 with_gnutls
 enable_darwin_ssl
@@ -838,6 +880,7 @@
 enable_bcg729
 enable_libyuv
 enable_libwebrtc
+enable_libwebrtc_aec3
 '
       ac_precious_vars='build_alias
 host_alias
@@ -849,8 +892,7 @@
 CPPFLAGS
 CXX
 CXXFLAGS
-CCC
-CPP'
+CCC'
 
 
 # Initialize some variables set by options.
@@ -889,6 +931,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -918,8 +961,6 @@
   *)    ac_optarg=yes ;;
   esac
 
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -960,9 +1001,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -986,9 +1027,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1141,6 +1182,15 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1190,9 +1240,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1206,9 +1256,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1252,9 +1302,9 @@
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1270,7 +1320,7 @@
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1278,7 +1328,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1334,7 +1384,7 @@
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1431,6 +1481,7 @@
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1469,6 +1520,8 @@
                           Disable floating point where possible
   --enable-epoll          Use /dev/epoll ioqueue on Linux (experimental)
   --enable-shared         Build shared libraries
+  --disable-pjsua2        Exclude pjsua2 library and application from the
+                          build
   --disable-resample      Disable resampling implementations
   --disable-sound         Exclude sound (i.e. use null sound)
   --disable-video         Disable video feature
@@ -1485,6 +1538,7 @@
   --disable-ilbc-codec    Exclude iLBC codec in the build
   --enable-libsamplerate  Link with libsamplerate when available.
   --enable-resample-dll   Build libresample as shared library
+  --enable-speex-resample Enable Speex resample
   --disable-sdl           Disable SDL (default: not disabled)
   --disable-ffmpeg        Disable ffmpeg (default: not disabled)
   --disable-v4l2          Disable Video4Linux2 (default: not disabled)
@@ -1494,6 +1548,8 @@
                           package and samples location using IPPROOT and
                           IPPSAMPLES env var or with --with-ipp and
                           --with-ipp-samples options
+  --disable-android-mediacodec
+                          Exclude Android MediaCodec (default: autodetect)
   --disable-darwin-ssl    Exclude Darwin SSL (default: autodetect)
   --disable-ssl           Exclude SSL support the build (default: autodetect)
 
@@ -1509,6 +1565,7 @@
   --disable-bcg729        Disable bcg729 (default: not disabled)
   --disable-libyuv        Exclude libyuv in the build
   --disable-libwebrtc     Exclude libwebrtc in the build
+  --enable-libwebrtc-aec3 Build libwebrtc-aec3 that's included in PJSIP
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1538,10 +1595,17 @@
                           make sure that webrtc is accessible to use (hint:
                           use CFLAGS and LDFLAGS env var to set the
                           include/lib paths)
+  --with-external-webrtc-aec3
+                          Use external webrtc AEC3 development files, not the
+                          one in "third_party" directory. When this option is
+                          set, make sure that webrtc is accessible to use
+                          (hint: use CFLAGS and LDFLAGS env var to set the
+                          include/lib paths)
   --with-external-pa      Use external PortAudio development files. When this
                           option is set, make sure that PortAudio is
                           accessible to use (hint: use CFLAGS and LDFLAGS env
                           var to set the include/lib paths)
+  --with-oboe             Enable Android Oboe audio device backend.
   --with-sdl=DIR          Specify alternate libSDL prefix
   --with-ffmpeg=DIR       Specify alternate FFMPEG prefix
   --with-openh264=DIR     Specify alternate OpenH264 prefix
@@ -1575,7 +1639,6 @@
               you have headers in a nonstandard directory <include dir>
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
-  CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1596,9 +1659,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1626,7 +1689,8 @@
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1634,7 +1698,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1644,9 +1708,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 pjproject configure 2.x
-generated by GNU Autoconf 2.69
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1663,14 +1727,14 @@
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1678,14 +1742,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1701,14 +1766,14 @@
 ac_fn_cxx_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1716,14 +1781,15 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1739,14 +1805,14 @@
 ac_fn_cxx_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1754,17 +1820,18 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1785,14 +1852,14 @@
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1800,17 +1867,18 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1827,8 +1895,8 @@
 
 # ac_fn_c_try_run LINENO
 # ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
+# executables *can* be run.
 ac_fn_c_try_run ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
@@ -1838,25 +1906,26 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+       printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status
@@ -1867,43 +1936,6 @@
 
 } # ac_fn_c_try_run
 
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -1911,128 +1943,44 @@
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
@@ -2040,16 +1988,9 @@
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+   which can conflict with char $2 (); below.  */
 
+#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -2067,24 +2008,25 @@
 #endif
 
 int
-main ()
+main (void)
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
@@ -2096,17 +2038,18 @@
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof ($2))
 	 return 0;
@@ -2114,12 +2057,13 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main ()
+main (void)
 {
 if (sizeof (($2)))
 	    return 0;
@@ -2127,29 +2071,50 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   eval "$3=yes"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
+    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by pjproject $as_me 2.x, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
-  $ $0 $@
+  $ $0$ac_configure_args_raw
 
 _ACEOF
 exec 5>>config.log
@@ -2182,8 +2147,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf "%s\n" "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -2218,7 +2187,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -2253,11 +2222,13 @@
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    $as_echo "## ---------------- ##
+    printf "%s\n" "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -2268,8 +2239,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2293,7 +2264,7 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    printf "%s\n" "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -2301,14 +2272,14 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      printf "%s\n" "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      printf "%s\n" "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -2316,15 +2287,15 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      printf "%s\n" "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -2332,8 +2303,8 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      printf "%s\n" "$as_me: caught signal $ac_signal"
+    printf "%s\n" "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2347,63 +2318,48 @@
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_files="$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+  case $ac_site_file in #(
+  */*) :
+     ;; #(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
@@ -2413,139 +2369,746 @@
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+   Do not test the value of __STDC__, because some compilers set it to 0
+   while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
 
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not \xHH hex character constants.
+   These do not provoke an error unfortunately, instead are silently treated
+   as an "x".  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
+   array size at least.  It is necessary to write \x00 == 0 to get something
+   that is true only with -std.  */
+int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) '\''x'\''
+int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
 
-host_orig="$host"
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+               int, int);'
 
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
+'
 
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+  #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
 
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
 
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str = "";
+  int number = 0;
+  float fnumber = 0;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case '\''s'\'': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case '\''d'\'': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case '\''f'\'': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+
+  return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+  // Check bool.
+  _Bool success = false;
+  success |= (argc != 0);
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[0] = argv[0][0];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
+	 || dynamic_array[ni.number - 1] != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+  int_alignment = _Alignof (int),
+  int_array_alignment = _Alignof (int[100]),
+  char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+  int x;
+  _Static_assert (sizeof (int) <= sizeof (long int),
+                  "_Static_assert does not work in struct");
+  long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal[] = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+  union {
+    struct { int i; int j; };
+    struct { int k; long int l; } w;
+  };
+  int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+  _Static_assert ((offsetof (struct anonymous, i)
+		   == offsetof (struct anonymous, w.k)),
+		  "Anonymous union alignment botch");
+  v1.i = 2;
+  v1.w.k = 5;
+  ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  ${ac_c_conftest_c11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  return ok;
+}
+"
+
+# Test code for whether the C++ compiler supports C++98 (global declarations)
+ac_cxx_conftest_cxx98_globals='
+// Does the compiler advertise C++98 conformance?
+#if !defined __cplusplus || __cplusplus < 199711L
+# error "Compiler does not advertise C++98 conformance"
+#endif
+
+// These inclusions are to reject old compilers that
+// lack the unsuffixed header files.
+#include <cstdlib>
+#include <exception>
+
+// <cassert> and <cstring> are *not* freestanding headers in C++98.
+extern void assert (int);
+namespace std {
+  extern int strcmp (const char *, const char *);
+}
+
+// Namespaces, exceptions, and templates were all added after "C++ 2.0".
+using std::exception;
+using std::strcmp;
+
+namespace {
+
+void test_exception_syntax()
+{
+  try {
+    throw "test";
+  } catch (const char *s) {
+    // Extra parentheses suppress a warning when building autoconf itself,
+    // due to lint rules shared with more typical C programs.
+    assert (!(strcmp) (s, "test"));
+  }
+}
+
+template <typename T> struct test_template
+{
+  T const val;
+  explicit test_template(T t) : val(t) {}
+  template <typename U> T add(U u) { return static_cast<T>(u) + val; }
+};
+
+} // anonymous namespace
+'
+
+# Test code for whether the C++ compiler supports C++98 (body of main)
+ac_cxx_conftest_cxx98_main='
+  assert (argc);
+  assert (! argv[0]);
+{
+  test_exception_syntax ();
+  test_template<double> tt (2.0);
+  assert (tt.add (4) == 6.0);
+  assert (true && !false);
+}
+'
+
+# Test code for whether the C++ compiler supports C++11 (global declarations)
+ac_cxx_conftest_cxx11_globals='
+// Does the compiler advertise C++ 2011 conformance?
+#if !defined __cplusplus || __cplusplus < 201103L
+# error "Compiler does not advertise C++11 conformance"
+#endif
+
+namespace cxx11test
+{
+  constexpr int get_val() { return 20; }
+
+  struct testinit
+  {
+    int i;
+    double d;
+  };
+
+  class delegate
+  {
+  public:
+    delegate(int n) : n(n) {}
+    delegate(): delegate(2354) {}
+
+    virtual int getval() { return this->n; };
+  protected:
+    int n;
+  };
+
+  class overridden : public delegate
+  {
+  public:
+    overridden(int n): delegate(n) {}
+    virtual int getval() override final { return this->n * 2; }
+  };
+
+  class nocopy
+  {
+  public:
+    nocopy(int i): i(i) {}
+    nocopy() = default;
+    nocopy(const nocopy&) = delete;
+    nocopy & operator=(const nocopy&) = delete;
+  private:
+    int i;
+  };
+
+  // for testing lambda expressions
+  template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
+  {
+    return f(v);
+  }
+
+  // for testing variadic templates and trailing return types
+  template <typename V> auto sum(V first) -> V
+  {
+    return first;
+  }
+  template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
+  {
+    return first + sum(rest...);
+  }
+}
+'
+
+# Test code for whether the C++ compiler supports C++11 (body of main)
+ac_cxx_conftest_cxx11_main='
+{
+  // Test auto and decltype
+  auto a1 = 6538;
+  auto a2 = 48573953.4;
+  auto a3 = "String literal";
+
+  int total = 0;
+  for (auto i = a3; *i; ++i) { total += *i; }
+
+  decltype(a2) a4 = 34895.034;
+}
+{
+  // Test constexpr
+  short sa[cxx11test::get_val()] = { 0 };
+}
+{
+  // Test initializer lists
+  cxx11test::testinit il = { 4323, 435234.23544 };
+}
+{
+  // Test range-based for
+  int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
+                 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
+  for (auto &x : array) { x += 23; }
+}
+{
+  // Test lambda expressions
+  using cxx11test::eval;
+  assert (eval ([](int x) { return x*2; }, 21) == 42);
+  double d = 2.0;
+  assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0);
+  assert (d == 5.0);
+  assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0);
+  assert (d == 5.0);
+}
+{
+  // Test use of variadic templates
+  using cxx11test::sum;
+  auto a = sum(1);
+  auto b = sum(1, 2);
+  auto c = sum(1.0, 2.0, 3.0);
+}
+{
+  // Test constructor delegation
+  cxx11test::delegate d1;
+  cxx11test::delegate d2();
+  cxx11test::delegate d3(45);
+}
+{
+  // Test override and final
+  cxx11test::overridden o1(55464);
+}
+{
+  // Test nullptr
+  char *c = nullptr;
+}
+{
+  // Test template brackets
+  test_template<::test_template<int>> v(test_template<int>(12));
+}
+{
+  // Unicode literals
+  char const *utf8 = u8"UTF-8 string \u2500";
+  char16_t const *utf16 = u"UTF-8 string \u2500";
+  char32_t const *utf32 = U"UTF-32 string \u2500";
+}
+'
+
+# Test code for whether the C compiler supports C++11 (complete).
+ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals}
+${ac_cxx_conftest_cxx11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_cxx_conftest_cxx98_main}
+  ${ac_cxx_conftest_cxx11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C++98 (complete).
+ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals}
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_cxx_conftest_cxx98_main}
+  return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+
+# Auxiliary files required by this configure script.
+ac_aux_files="config.guess config.sub"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  ac_aux_dir_found=yes
+  ac_install_sh=
+  for ac_aux in $ac_aux_files
+  do
+    # As a special case, if "install-sh" is required, that requirement
+    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+    # and $ac_install_sh is set appropriately for whichever one is found.
+    if test x"$ac_aux" = x"install-sh"
+    then
+      if test -f "${as_dir}install-sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        ac_install_sh="${as_dir}install-sh -c"
+      elif test -f "${as_dir}install.sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        ac_install_sh="${as_dir}install.sh -c"
+      elif test -f "${as_dir}shtool"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        ac_install_sh="${as_dir}shtool install -c"
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+        else
+          break
+        fi
+      fi
+    else
+      if test -f "${as_dir}${ac_aux}"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+        else
+          break
+        fi
+      fi
+    fi
+  done
+  if test "$ac_aux_dir_found" = yes; then
+    ac_aux_dir="$as_dir"
+    break
+  fi
+  ac_first_candidate=false
+
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+  ac_configure="$SHELL ${ac_aux_dir}configure"
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+	    and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+host_orig="$host"
+
+
+
+
+  # Make sure we can run config.sub.
+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -2564,21 +3127,22 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -2597,21 +3161,22 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+printf %s "checking target system type... " >&6; }
+if test ${ac_cv_target+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+  ac_cv_target=`$SHELL "${ac_aux_dir}config.sub" $target_alias` ||
+    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $target_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+printf "%s\n" "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
@@ -2646,6 +3211,15 @@
   CFLAGS="-O2"
 fi
 
+
+
+
+
+
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2654,11 +3228,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2666,11 +3241,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2681,11 +3260,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2694,11 +3273,12 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -2706,11 +3286,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2721,11 +3305,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2733,8 +3317,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2747,11 +3331,12 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2759,11 +3344,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2774,11 +3363,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2787,11 +3376,12 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2800,15 +3390,19 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2824,18 +3418,18 @@
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2846,11 +3440,12 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2858,11 +3453,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2873,11 +3472,11 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2890,11 +3489,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -2902,11 +3502,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2917,11 +3521,11 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2933,34 +3537,138 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
   fi
+else
+  CC="$ac_cv_prog_CC"
 fi
 
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
+for ac_option in --version -v -V -qversion -version; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2970,7 +3678,7 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -2978,7 +3686,7 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -2990,9 +3698,9 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -3013,11 +3721,12 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -3034,7 +3743,7 @@
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -3050,44 +3759,46 @@
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else
+else $as_nop
   ac_file=''
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3101,15 +3812,15 @@
     * ) break;;
   esac
 done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -3118,7 +3829,7 @@
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
@@ -3130,8 +3841,8 @@
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -3139,10 +3850,10 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -3150,39 +3861,40 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -3196,11 +3908,12 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -3209,31 +3922,32 @@
        break;;
   esac
 done
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -3243,29 +3957,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+set}
+ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -3274,57 +3992,60 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
-else
+else $as_nop
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -3339,94 +4060,144 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c89_program
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
+  if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
+fi
 fi
 
 ac_ext=c
@@ -3435,6 +4206,12 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+
+
+
+
+
+
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3445,15 +4222,16 @@
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
@@ -3461,11 +4239,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3476,11 +4258,11 @@
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3489,15 +4271,16 @@
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CXX+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
@@ -3505,11 +4288,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3520,11 +4307,11 @@
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+printf "%s\n" "$ac_ct_CXX" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3536,8 +4323,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -3547,7 +4334,7 @@
   fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -3557,7 +4344,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3567,20 +4354,21 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
+printf %s "checking whether the compiler supports GNU C++... " >&6; }
+if test ${ac_cv_cxx_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -3590,29 +4378,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GXX=yes
 else
   GXX=
 fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_test_CXXFLAGS=${CXXFLAGS+y}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+printf %s "checking whether $CXX accepts -g... " >&6; }
+if test ${ac_cv_prog_cxx_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
@@ -3621,57 +4413,60 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_cv_prog_cxx_g=yes
-else
+else $as_nop
   CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
+if test $ac_test_CXXFLAGS; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
@@ -3686,6 +4481,100 @@
     CXXFLAGS=
   fi
 fi
+ac_prog_cxx_stdcxx=no
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
+printf %s "checking for $CXX option to enable C++11 features... " >&6; }
+if test ${ac_cv_prog_cxx_11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cxx_11=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_cxx_conftest_cxx11_program
+_ACEOF
+for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
+do
+  CXX="$ac_save_CXX $ac_arg"
+  if ac_fn_cxx_try_compile "$LINENO"
+then :
+  ac_cv_prog_cxx_cxx11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX
+fi
+
+if test "x$ac_cv_prog_cxx_cxx11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cxx_cxx11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
+     CXX="$CXX $ac_cv_prog_cxx_cxx11"
+fi
+  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
+  ac_prog_cxx_stdcxx=cxx11
+fi
+fi
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
+printf %s "checking for $CXX option to enable C++98 features... " >&6; }
+if test ${ac_cv_prog_cxx_98+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cxx_98=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_cxx_conftest_cxx98_program
+_ACEOF
+for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
+do
+  CXX="$ac_save_CXX $ac_arg"
+  if ac_fn_cxx_try_compile "$LINENO"
+then :
+  ac_cv_prog_cxx_cxx98=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX
+fi
+
+if test "x$ac_cv_prog_cxx_cxx98" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cxx_cxx98" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
+     CXX="$CXX $ac_cv_prog_cxx_cxx98"
+fi
+  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
+  ac_prog_cxx_stdcxx=cxx98
+fi
+fi
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3710,19 +4599,20 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
+if ac_fn_cxx_try_link "$LINENO"
+then :
 
-else
+else $as_nop
   as_fn_error $? "C++ compiler does not work" "$LINENO" 5
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3734,11 +4624,12 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
@@ -3746,11 +4637,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3761,11 +4656,11 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf "%s\n" "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3774,11 +4669,12 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
@@ -3786,11 +4682,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3801,11 +4701,11 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf "%s\n" "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -3813,8 +4713,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -3828,11 +4728,12 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
@@ -3840,11 +4741,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3855,11 +4760,11 @@
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf "%s\n" "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3872,11 +4777,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
@@ -3884,11 +4790,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3899,11 +4809,11 @@
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf "%s\n" "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3915,8 +4825,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -3952,6 +4862,7 @@
 
 
 
+
 case $host in
     *mingw* | *cygw* | *win32* | *w32* )
 	if pwd -W 2&> /dev/null; then
@@ -3987,11 +4898,12 @@
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+printf %s "checking for pthread_create in -lpthread... " >&6; }
+if test ${ac_cv_lib_pthread_pthread_create+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4000,43 +4912,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pthread_create ();
 int
-main ()
+main (void)
 {
 return pthread_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pthread_pthread_create=yes
-else
+else $as_nop
   ac_cv_lib_pthread_pthread_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+printf "%s\n" "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBPTHREAD 1" >>confdefs.h
 
   LIBS="-lpthread $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lwsock32" >&5
-$as_echo_n "checking for puts in -lwsock32... " >&6; }
-if ${ac_cv_lib_wsock32_puts+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for puts in -lwsock32" >&5
+printf %s "checking for puts in -lwsock32... " >&6; }
+if test ${ac_cv_lib_wsock32_puts+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwsock32  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4045,43 +4955,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char puts ();
 int
-main ()
+main (void)
 {
 return puts ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_wsock32_puts=yes
-else
+else $as_nop
   ac_cv_lib_wsock32_puts=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wsock32_puts" >&5
-$as_echo "$ac_cv_lib_wsock32_puts" >&6; }
-if test "x$ac_cv_lib_wsock32_puts" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBWSOCK32 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wsock32_puts" >&5
+printf "%s\n" "$ac_cv_lib_wsock32_puts" >&6; }
+if test "x$ac_cv_lib_wsock32_puts" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBWSOCK32 1" >>confdefs.h
 
   LIBS="-lwsock32 $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lws2_32" >&5
-$as_echo_n "checking for puts in -lws2_32... " >&6; }
-if ${ac_cv_lib_ws2_32_puts+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for puts in -lws2_32" >&5
+printf %s "checking for puts in -lws2_32... " >&6; }
+if test ${ac_cv_lib_ws2_32_puts+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lws2_32  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4090,43 +4998,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char puts ();
 int
-main ()
+main (void)
 {
 return puts ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ws2_32_puts=yes
-else
+else $as_nop
   ac_cv_lib_ws2_32_puts=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_puts" >&5
-$as_echo "$ac_cv_lib_ws2_32_puts" >&6; }
-if test "x$ac_cv_lib_ws2_32_puts" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBWS2_32 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_puts" >&5
+printf "%s\n" "$ac_cv_lib_ws2_32_puts" >&6; }
+if test "x$ac_cv_lib_ws2_32_puts" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBWS2_32 1" >>confdefs.h
 
   LIBS="-lws2_32 $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lole32" >&5
-$as_echo_n "checking for puts in -lole32... " >&6; }
-if ${ac_cv_lib_ole32_puts+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for puts in -lole32" >&5
+printf %s "checking for puts in -lole32... " >&6; }
+if test ${ac_cv_lib_ole32_puts+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lole32  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4135,43 +5041,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char puts ();
 int
-main ()
+main (void)
 {
 return puts ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ole32_puts=yes
-else
+else $as_nop
   ac_cv_lib_ole32_puts=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ole32_puts" >&5
-$as_echo "$ac_cv_lib_ole32_puts" >&6; }
-if test "x$ac_cv_lib_ole32_puts" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBOLE32 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ole32_puts" >&5
+printf "%s\n" "$ac_cv_lib_ole32_puts" >&6; }
+if test "x$ac_cv_lib_ole32_puts" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBOLE32 1" >>confdefs.h
 
   LIBS="-lole32 $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lwinmm" >&5
-$as_echo_n "checking for puts in -lwinmm... " >&6; }
-if ${ac_cv_lib_winmm_puts+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for puts in -lwinmm" >&5
+printf %s "checking for puts in -lwinmm... " >&6; }
+if test ${ac_cv_lib_winmm_puts+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwinmm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4180,43 +5084,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char puts ();
 int
-main ()
+main (void)
 {
 return puts ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_winmm_puts=yes
-else
+else $as_nop
   ac_cv_lib_winmm_puts=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_winmm_puts" >&5
-$as_echo "$ac_cv_lib_winmm_puts" >&6; }
-if test "x$ac_cv_lib_winmm_puts" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBWINMM 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_winmm_puts" >&5
+printf "%s\n" "$ac_cv_lib_winmm_puts" >&6; }
+if test "x$ac_cv_lib_winmm_puts" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBWINMM 1" >>confdefs.h
 
   LIBS="-lwinmm $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lsocket" >&5
-$as_echo_n "checking for puts in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_puts+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for puts in -lsocket" >&5
+printf %s "checking for puts in -lsocket... " >&6; }
+if test ${ac_cv_lib_socket_puts+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4225,43 +5127,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char puts ();
 int
-main ()
+main (void)
 {
 return puts ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_socket_puts=yes
-else
+else $as_nop
   ac_cv_lib_socket_puts=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_puts" >&5
-$as_echo "$ac_cv_lib_socket_puts" >&6; }
-if test "x$ac_cv_lib_socket_puts" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_puts" >&5
+printf "%s\n" "$ac_cv_lib_socket_puts" >&6; }
+if test "x$ac_cv_lib_socket_puts" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
   LIBS="-lsocket $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for puts in -lrt" >&5
-$as_echo_n "checking for puts in -lrt... " >&6; }
-if ${ac_cv_lib_rt_puts+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for puts in -lrt" >&5
+printf %s "checking for puts in -lrt... " >&6; }
+if test ${ac_cv_lib_rt_puts+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4270,43 +5170,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char puts ();
 int
-main ()
+main (void)
 {
 return puts ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_rt_puts=yes
-else
+else $as_nop
   ac_cv_lib_rt_puts=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_puts" >&5
-$as_echo "$ac_cv_lib_rt_puts" >&6; }
-if test "x$ac_cv_lib_rt_puts" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBRT 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_puts" >&5
+printf "%s\n" "$ac_cv_lib_rt_puts" >&6; }
+if test "x$ac_cv_lib_rt_puts" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBRT 1" >>confdefs.h
 
   LIBS="-lrt $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
-$as_echo_n "checking for sin in -lm... " >&6; }
-if ${ac_cv_lib_m_sin+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
+printf %s "checking for sin in -lm... " >&6; }
+if test ${ac_cv_lib_m_sin+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4315,43 +5213,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sin ();
 int
-main ()
+main (void)
 {
 return sin ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_m_sin=yes
-else
+else $as_nop
   ac_cv_lib_m_sin=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
-$as_echo "$ac_cv_lib_m_sin" >&6; }
-if test "x$ac_cv_lib_m_sin" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
+printf "%s\n" "$ac_cv_lib_m_sin" >&6; }
+if test "x$ac_cv_lib_m_sin" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBM 1" >>confdefs.h
 
   LIBS="-lm $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
-$as_echo_n "checking for uuid_generate in -luuid... " >&6; }
-if ${ac_cv_lib_uuid_uuid_generate+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
+printf %s "checking for uuid_generate in -luuid... " >&6; }
+if test ${ac_cv_lib_uuid_uuid_generate+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-luuid  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4360,43 +5256,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char uuid_generate ();
 int
-main ()
+main (void)
 {
 return uuid_generate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_uuid_uuid_generate=yes
-else
+else $as_nop
   ac_cv_lib_uuid_uuid_generate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
-$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
-if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUUID 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
+printf "%s\n" "$ac_cv_lib_uuid_uuid_generate" >&6; }
+if test "x$ac_cv_lib_uuid_uuid_generate" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBUUID 1" >>confdefs.h
 
   LIBS="-luuid $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
-$as_echo_n "checking for uuid_generate in -luuid... " >&6; }
-if ${ac_cv_lib_uuid_uuid_generate+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
+printf %s "checking for uuid_generate in -luuid... " >&6; }
+if test ${ac_cv_lib_uuid_uuid_generate+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-luuid  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4405,38 +5299,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char uuid_generate ();
 int
-main ()
+main (void)
 {
 return uuid_generate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_uuid_uuid_generate=yes
-else
+else $as_nop
   ac_cv_lib_uuid_uuid_generate=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
-$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
-if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
+printf "%s\n" "$ac_cv_lib_uuid_uuid_generate" >&6; }
+if test "x$ac_cv_lib_uuid_uuid_generate" = xyes
+then :
   ac_has_uuid_lib=1
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
-$as_echo_n "checking for library containing gethostbyname... " >&6; }
-if ${ac_cv_search_gethostbyname+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
+printf %s "checking for library containing gethostbyname... " >&6; }
+if test ${ac_cv_search_gethostbyname+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4444,478 +5338,111 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gethostbyname ();
 int
-main ()
+main (void)
 {
 return gethostbyname ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' nsl; do
+for ac_lib in '' nsl
+do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"; then :
+  if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_search_gethostbyname=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext
-  if ${ac_cv_search_gethostbyname+:} false; then :
+  if test ${ac_cv_search_gethostbyname+y}
+then :
   break
 fi
 done
-if ${ac_cv_search_gethostbyname+:} false; then :
+if test ${ac_cv_search_gethostbyname+y}
+then :
 
-else
+else $as_nop
   ac_cv_search_gethostbyname=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
-$as_echo "$ac_cv_search_gethostbyname" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
+printf "%s\n" "$ac_cv_search_gethostbyname" >&6; }
 ac_res=$ac_cv_search_gethostbyname
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_M_NAME to $target_cpu" >&5
-$as_echo "Setting PJ_M_NAME to $target_cpu" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define PJ_M_NAME "$target_cpu"
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Setting PJ_M_NAME to $target_cpu" >&5
+printf "%s\n" "Setting PJ_M_NAME to $target_cpu" >&6; }
+printf "%s\n" "#define PJ_M_NAME \"$target_cpu\"" >>confdefs.h
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking memory alignment" >&5
-$as_echo_n "checking memory alignment... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking memory alignment" >&5
+printf %s "checking memory alignment... " >&6; }
 case $target in
     sparc64-* | ia64-* | x86_64-* | arm64-* | aarch64-* | mips64* )
-	$as_echo "#define PJ_POOL_ALIGNMENT 8" >>confdefs.h
+	printf "%s\n" "#define PJ_POOL_ALIGNMENT 8" >>confdefs.h
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 8 bytes" >&5
-$as_echo "8 bytes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 8 bytes" >&5
+printf "%s\n" "8 bytes" >&6; }
 	;;
     * )
-	$as_echo "#define PJ_POOL_ALIGNMENT 4" >>confdefs.h
+	printf "%s\n" "#define PJ_POOL_ALIGNMENT 4" >>confdefs.h
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 4 bytes (default)" >&5
-$as_echo "4 bytes (default)" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 4 bytes (default)" >&5
+printf "%s\n" "4 bytes (default)" >&6; }
 	;;
 esac
 
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "#define $ac_item 1" >> confdefs.h
+    fi
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
+  fi
+done
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
 
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
 
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
-fi
 
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
-fi
 
-done
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
 
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+printf %s "checking whether byte ordering is bigendian... " >&6; }
+if test ${ac_cv_c_bigendian+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_c_bigendian=unknown
     # See if we're dealing with a universal compiler.
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4926,7 +5453,8 @@
 	     typedef int dummy;
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 	# Check for potential -arch flags.  It is not universal unless
 	# there are at least two -arch flags with different values.
@@ -4950,7 +5478,7 @@
 	 fi
        done
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     if test $ac_cv_c_bigendian = unknown; then
       # See if sys/param.h defines the BYTE_ORDER macro.
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4959,7 +5487,7 @@
 	     #include <sys/param.h>
 
 int
-main ()
+main (void)
 {
 #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
 		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
@@ -4971,7 +5499,8 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   # It does; now see whether it defined to BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4979,7 +5508,7 @@
 		#include <sys/param.h>
 
 int
-main ()
+main (void)
 {
 #if BYTE_ORDER != BIG_ENDIAN
 		 not big endian
@@ -4989,14 +5518,15 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_bigendian=yes
-else
+else $as_nop
   ac_cv_c_bigendian=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
@@ -5005,7 +5535,7 @@
 #include <limits.h>
 
 int
-main ()
+main (void)
 {
 #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
 	      bogus endian macros
@@ -5015,14 +5545,15 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   # It does; now see whether it defined to _BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <limits.h>
 
 int
-main ()
+main (void)
 {
 #ifndef _BIG_ENDIAN
 		 not big endian
@@ -5032,31 +5563,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_c_bigendian=yes
-else
+else $as_nop
   ac_cv_c_bigendian=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     fi
     if test $ac_cv_c_bigendian = unknown; then
       # Compile a test program.
-      if test "$cross_compiling" = yes; then :
+      if test "$cross_compiling" = yes
+then :
   # Try to guess by grepping values from an object file.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-short int ascii_mm[] =
+unsigned short int ascii_mm[] =
 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
+		unsigned short int ascii_ii[] =
 		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 		int use_ascii (int i) {
 		  return ascii_mm[i] + ascii_ii[i];
 		}
-		short int ebcdic_ii[] =
+		unsigned short int ebcdic_ii[] =
 		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
+		unsigned short int ebcdic_mm[] =
 		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
 		int use_ebcdic (int i) {
 		  return ebcdic_mm[i] + ebcdic_ii[i];
@@ -5064,14 +5597,15 @@
 		extern int foo;
 
 int
-main ()
+main (void)
 {
 return use_ascii (foo) == use_ebcdic (foo);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
 	      ac_cv_c_bigendian=yes
 	    fi
@@ -5084,13 +5618,13 @@
 	      fi
 	    fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
-main ()
+main (void)
 {
 
 	     /* Are we little or big endian?  From Harbison&Steele.  */
@@ -5106,9 +5640,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
   ac_cv_c_bigendian=no
-else
+else $as_nop
   ac_cv_c_bigendian=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -5117,17 +5652,17 @@
 
     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf "%s\n" "$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in #(
    yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+     printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
    no)
       ;; #(
    universal)
 
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
@@ -5138,40 +5673,48 @@
 
 if test "x$ac_cv_c_bigendian" = "xyes"; then
   CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=1 -DPJ_IS_LITTLE_ENDIAN=0"
+  ac_cflags="$ac_cflags -DPJ_IS_BIG_ENDIAN=1 -DPJ_IS_LITTLE_ENDIAN=0"
 else
   CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=0 -DPJ_IS_LITTLE_ENDIAN=1"
+  ac_cflags="$ac_cflags -DPJ_IS_BIG_ENDIAN=0 -DPJ_IS_LITTLE_ENDIAN=1"
 fi
 
 
 case $target in
     *android*)
-	$as_echo "#define PJ_ANDROID 1" >>confdefs.h
+	printf "%s\n" "#define PJ_ANDROID 1" >>confdefs.h
 
 	ac_target_arch=$TARGET_ABI
 	;;
     *mingw* | *cygw* | *win32* | *w32* )
-	$as_echo "#define PJ_WIN32 1" >>confdefs.h
+	printf "%s\n" "#define PJ_WIN32 1" >>confdefs.h
+
+	printf "%s\n" "#define PJ_WIN32_WINNT 0x0400" >>confdefs.h
 
-	$as_echo "#define PJ_WIN32_WINNT 0x0400" >>confdefs.h
+	printf "%s\n" "#define WIN32_LEAN_AND_MEAN 1" >>confdefs.h
 
-	$as_echo "#define WIN32_LEAN_AND_MEAN 1" >>confdefs.h
+	case $target in
+	    *_64-w64-mingw* )
+		printf "%s\n" "#define PJ_WIN64 1" >>confdefs.h
 
+	    ;;
+	esac
 	;;
     *darwin*)
-	$as_echo "#define PJ_DARWINOS 1" >>confdefs.h
+	printf "%s\n" "#define PJ_DARWINOS 1" >>confdefs.h
 
     	ac_target_arch=$ARCH_VAL
 	;;
     *linux*)
-	$as_echo "#define PJ_LINUX 1" >>confdefs.h
+	printf "%s\n" "#define PJ_LINUX 1" >>confdefs.h
 
 	;;
     *rtems*)
-	$as_echo "#define PJ_RTEMS 1" >>confdefs.h
+	printf "%s\n" "#define PJ_RTEMS 1" >>confdefs.h
 
 	;;
     *sunos* | *solaris* )
-	$as_echo "#define PJ_SUNOS 1" >>confdefs.h
+	printf "%s\n" "#define PJ_SUNOS 1" >>confdefs.h
 
 	;;
     *)
@@ -5182,111 +5725,112 @@
 
 
 # Check whether --enable-floating-point was given.
-if test "${enable_floating_point+set}" = set; then :
+if test ${enable_floating_point+y}
+then :
   enableval=$enable_floating_point; if test "$enable_floating_point" = "no"; then
-		$as_echo "#define PJ_HAS_FLOATING_POINT 0" >>confdefs.h
+		printf "%s\n" "#define PJ_HAS_FLOATING_POINT 0" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... yes" >&5
-$as_echo "Checking if floating point is disabled... yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... yes" >&5
+printf "%s\n" "Checking if floating point is disabled... yes" >&6; }
 	       fi
-else
+else $as_nop
 
-		$as_echo "#define PJ_HAS_FLOATING_POINT 1" >>confdefs.h
+		printf "%s\n" "#define PJ_HAS_FLOATING_POINT 1" >>confdefs.h
 
-	        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... no" >&5
-$as_echo "Checking if floating point is disabled... no" >&6; }
+	        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... no" >&5
+printf "%s\n" "Checking if floating point is disabled... no" >&6; }
 
 fi
 
 
 
-ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
-if test "x$ac_cv_header_arpa_inet_h" = xyes; then :
-  $as_echo "#define PJ_HAS_ARPA_INET_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
+if test "x$ac_cv_header_arpa_inet_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_ARPA_INET_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "assert.h" "ac_cv_header_assert_h" "$ac_includes_default"
-if test "x$ac_cv_header_assert_h" = xyes; then :
-  $as_echo "#define PJ_HAS_ASSERT_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "assert.h" "ac_cv_header_assert_h" "$ac_includes_default"
+if test "x$ac_cv_header_assert_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_ASSERT_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "ctype.h" "ac_cv_header_ctype_h" "$ac_includes_default"
-if test "x$ac_cv_header_ctype_h" = xyes; then :
-  $as_echo "#define PJ_HAS_CTYPE_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "ctype.h" "ac_cv_header_ctype_h" "$ac_includes_default"
+if test "x$ac_cv_header_ctype_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_CTYPE_H 1" >>confdefs.h
 
 fi
 
 
-
 case $target in
     *mingw* | *cygw* | *win32* | *w32* )
-	$as_echo "#define PJ_HAS_ERRNO_H 0" >>confdefs.h
+	printf "%s\n" "#define PJ_HAS_ERRNO_H 0" >>confdefs.h
 
 	;;
     *)
-	ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
-if test "x$ac_cv_header_errno_h" = xyes; then :
-  $as_echo "#define PJ_HAS_ERRNO_H 1" >>confdefs.h
+	ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
+if test "x$ac_cv_header_errno_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_ERRNO_H 1" >>confdefs.h
 
 fi
 
-
 	;;
 esac
 
-ac_fn_c_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
-if test "x$ac_cv_header_fcntl_h" = xyes; then :
-  $as_echo "#define PJ_HAS_FCNTL_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
+if test "x$ac_cv_header_fcntl_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_FCNTL_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "linux/socket.h" "ac_cv_header_linux_socket_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_socket_h" = xyes; then :
-  $as_echo "#define PJ_HAS_LINUX_SOCKET_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "linux/socket.h" "ac_cv_header_linux_socket_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_socket_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_LINUX_SOCKET_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default"
-if test "x$ac_cv_header_limits_h" = xyes; then :
-  $as_echo "#define PJ_HAS_LIMITS_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default"
+if test "x$ac_cv_header_limits_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_LIMITS_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
-if test "x$ac_cv_header_malloc_h" = xyes; then :
-  $as_echo "#define PJ_HAS_MALLOC_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
+if test "x$ac_cv_header_malloc_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_MALLOC_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default"
-if test "x$ac_cv_header_netdb_h" = xyes; then :
-  $as_echo "#define PJ_HAS_NETDB_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "netdb.h" "ac_cv_header_netdb_h" "$ac_includes_default"
+if test "x$ac_cv_header_netdb_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_NETDB_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default"
-if test "x$ac_cv_header_netinet_in_systm_h" = xyes; then :
-  $as_echo "#define PJ_HAS_NETINET_IN_SYSTM_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default"
+if test "x$ac_cv_header_netinet_in_systm_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_NETINET_IN_SYSTM_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default"
-if test "x$ac_cv_header_netinet_in_h" = xyes; then :
-  $as_echo "#define PJ_HAS_NETINET_IN_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default"
+if test "x$ac_cv_header_netinet_in_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_NETINET_IN_H 1" >>confdefs.h
 
 fi
 
-
 ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "#if PJ_HAS_SYS_TYPES_H
           	  #	include <sys/types.h>
           	  #endif
@@ -5298,177 +5842,178 @@
           	  #endif
 
 "
-if test "x$ac_cv_header_netinet_ip_h" = xyes; then :
-  $as_echo "#define PJ_HAS_NETINET_IP_H 1" >>confdefs.h
+if test "x$ac_cv_header_netinet_ip_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_NETINET_IP_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "netinet/tcp.h" "ac_cv_header_netinet_tcp_h" "$ac_includes_default"
-if test "x$ac_cv_header_netinet_tcp_h" = xyes; then :
-  $as_echo "#define PJ_HAS_NETINET_TCP_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "netinet/tcp.h" "ac_cv_header_netinet_tcp_h" "$ac_includes_default"
+if test "x$ac_cv_header_netinet_tcp_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_NETINET_TCP_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
-if test "x$ac_cv_header_ifaddrs_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
+if test "x$ac_cv_header_ifaddrs_h" = xyes
+then :
   ac_fn_c_check_func "$LINENO" "getifaddrs" "ac_cv_func_getifaddrs"
-if test "x$ac_cv_func_getifaddrs" = xyes; then :
-  $as_echo "#define PJ_HAS_IFADDRS_H 1" >>confdefs.h
+if test "x$ac_cv_func_getifaddrs" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_IFADDRS_H 1" >>confdefs.h
 
 fi
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "semaphore.h" "ac_cv_header_semaphore_h" "$ac_includes_default"
-if test "x$ac_cv_header_semaphore_h" = xyes; then :
-  $as_echo "#define PJ_HAS_SEMAPHORE_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "semaphore.h" "ac_cv_header_semaphore_h" "$ac_includes_default"
+if test "x$ac_cv_header_semaphore_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_SEMAPHORE_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "setjmp.h" "ac_cv_header_setjmp_h" "$ac_includes_default"
-if test "x$ac_cv_header_setjmp_h" = xyes; then :
-  $as_echo "#define PJ_HAS_SETJMP_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "setjmp.h" "ac_cv_header_setjmp_h" "$ac_includes_default"
+if test "x$ac_cv_header_setjmp_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_SETJMP_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdarg_h" = xyes; then :
-  $as_echo "#define PJ_HAS_STDARG_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdarg_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_STDARG_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default"
-if test "x$ac_cv_header_stddef_h" = xyes; then :
-  $as_echo "#define PJ_HAS_STDDEF_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default"
+if test "x$ac_cv_header_stddef_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_STDDEF_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdio_h" = xyes; then :
-  $as_echo "#define PJ_HAS_STDIO_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdio_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_STDIO_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = xyes; then :
-  $as_echo "#define PJ_HAS_STDINT_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdint_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_STDINT_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
-  $as_echo "#define PJ_HAS_STDLIB_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_STDLIB_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
-if test "x$ac_cv_header_string_h" = xyes; then :
-  $as_echo "#define PJ_HAS_STRING_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
+if test "x$ac_cv_header_string_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_STRING_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ioctl_h" = xyes; then :
-  $as_echo "#define PJ_HAS_SYS_IOCTL_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_ioctl_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_SYS_IOCTL_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_select_h" = xyes; then :
-  $as_echo "#define PJ_HAS_SYS_SELECT_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_select_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_SYS_SELECT_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_socket_h" = xyes; then :
-  $as_echo "#define PJ_HAS_SYS_SOCKET_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_socket_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_SYS_SOCKET_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_time_h" = xyes; then :
-  $as_echo "#define PJ_HAS_SYS_TIME_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_time_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_SYS_TIME_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_timeb_h" = xyes; then :
-  $as_echo "#define PJ_HAS_SYS_TIMEB_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_timeb_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_SYS_TIMEB_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_types_h" = xyes; then :
-  $as_echo "#define PJ_HAS_SYS_TYPES_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_types_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_SYS_TYPES_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "sys/filio.h" "ac_cv_header_sys_filio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_filio_h" = xyes; then :
-  $as_echo "#define PJ_HAS_SYS_FILIO_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "sys/filio.h" "ac_cv_header_sys_filio_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_filio_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_SYS_FILIO_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sockio_h" = xyes; then :
-  $as_echo "#define PJ_HAS_SYS_SOCKIO_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sockio_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_SYS_SOCKIO_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_utsname_h" = xyes; then :
-  $as_echo "#define PJ_HAS_SYS_UTSNAME_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_utsname_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_SYS_UTSNAME_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "time.h" "ac_cv_header_time_h" "$ac_includes_default"
-if test "x$ac_cv_header_time_h" = xyes; then :
-  $as_echo "#define PJ_HAS_TIME_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "time.h" "ac_cv_header_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_time_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_TIME_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-if test "x$ac_cv_header_unistd_h" = xyes; then :
-  $as_echo "#define PJ_HAS_UNISTD_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
+if test "x$ac_cv_header_unistd_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_UNISTD_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "winsock.h" "ac_cv_header_winsock_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock_h" = xyes; then :
-  $as_echo "#define PJ_HAS_WINSOCK_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "winsock.h" "ac_cv_header_winsock_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_WINSOCK_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock2_h" = xyes; then :
-  $as_echo "#define PJ_HAS_WINSOCK2_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock2_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_WINSOCK2_H 1" >>confdefs.h
 
 fi
 
-
 ac_fn_c_check_header_compile "$LINENO" "mswsock.h" "ac_cv_header_mswsock_h" "#if PJ_HAS_WINSOCK2_H
           	  #	include <winsock2.h>
 		  #elif PJ_HAS_WINSOCK_H
@@ -5476,25 +6021,25 @@
           	  #endif
 
 "
-if test "x$ac_cv_header_mswsock_h" = xyes; then :
-  $as_echo "#define PJ_HAS_MSWSOCK_H 1" >>confdefs.h
+if test "x$ac_cv_header_mswsock_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_MSWSOCK_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default"
-if test "x$ac_cv_header_ws2tcpip_h" = xyes; then :
-  $as_echo "#define PJ_HAS_WS2TCPIP_H 1" >>confdefs.h
+ac_fn_c_check_header_compile "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default"
+if test "x$ac_cv_header_ws2tcpip_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_WS2TCPIP_H 1" >>confdefs.h
 
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
-if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
+if test "x$ac_cv_header_uuid_uuid_h" = xyes
+then :
   ac_has_uuid_h=1
 fi
 
-
 ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "#if PJ_HAS_SYS_TYPES_H
           	  #	include <sys/types.h>
           	  #endif
@@ -5504,170 +6049,173 @@
           	  #endif
 
 "
-if test "x$ac_cv_header_net_if_h" = xyes; then :
-  $as_echo "#define PJ_HAS_NET_IF_H 1" >>confdefs.h
+if test "x$ac_cv_header_net_if_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_NET_IF_H 1" >>confdefs.h
 
 fi
 
 
-
 case $target in
   *android*)
-	ac_fn_c_check_header_mongrel "$LINENO" "linux/android_alarm.h" "ac_cv_header_linux_android_alarm_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_android_alarm_h" = xyes; then :
-  $as_echo "#define PJ_HAS_ANDROID_ALARM_H 1" >>confdefs.h
+	ac_fn_c_check_header_compile "$LINENO" "linux/android_alarm.h" "ac_cv_header_linux_android_alarm_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_android_alarm_h" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_ANDROID_ALARM_H 1" >>confdefs.h
 
 fi
 
-
 	;;
 esac
 
 ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
-if test "x$ac_cv_func_localtime_r" = xyes; then :
-  $as_echo "#define PJ_HAS_LOCALTIME_R 1" >>confdefs.h
+if test "x$ac_cv_func_localtime_r" = xyes
+then :
+  printf "%s\n" "#define PJ_HAS_LOCALTIME_R 1" >>confdefs.h
 
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_OS_NAME to $target" >&5
-$as_echo "Setting PJ_OS_NAME to $target" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define PJ_OS_NAME "$target"
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Setting PJ_OS_NAME to $target" >&5
+printf "%s\n" "Setting PJ_OS_NAME to $target" >&6; }
+printf "%s\n" "#define PJ_OS_NAME \"$target\"" >>confdefs.h
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_HAS_ERRNO_VAR to 1" >&5
-$as_echo "Setting PJ_HAS_ERRNO_VAR to 1" >&6; }
-$as_echo "#define PJ_HAS_ERRNO_VAR 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Setting PJ_HAS_ERRNO_VAR to 1" >&5
+printf "%s\n" "Setting PJ_HAS_ERRNO_VAR to 1" >&6; }
+printf "%s\n" "#define PJ_HAS_ERRNO_VAR 1" >>confdefs.h
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_HAS_HIGH_RES_TIMER to 1" >&5
-$as_echo "Setting PJ_HAS_HIGH_RES_TIMER to 1" >&6; }
-$as_echo "#define PJ_HAS_HIGH_RES_TIMER 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Setting PJ_HAS_HIGH_RES_TIMER to 1" >&5
+printf "%s\n" "Setting PJ_HAS_HIGH_RES_TIMER to 1" >&6; }
+printf "%s\n" "#define PJ_HAS_HIGH_RES_TIMER 1" >>confdefs.h
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_HAS_MALLOC to 1" >&5
-$as_echo "Setting PJ_HAS_MALLOC to 1" >&6; }
-$as_echo "#define PJ_HAS_MALLOC 1" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Setting PJ_HAS_MALLOC to 1" >&5
+printf "%s\n" "Setting PJ_HAS_MALLOC to 1" >&6; }
+printf "%s\n" "#define PJ_HAS_MALLOC 1" >>confdefs.h
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_NATIVE_STRING_IS_UNICODE to 0" >&5
-$as_echo "Setting PJ_NATIVE_STRING_IS_UNICODE to 0" >&6; }
-$as_echo "#define PJ_NATIVE_STRING_IS_UNICODE 0" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Setting PJ_NATIVE_STRING_IS_UNICODE to 0" >&5
+printf "%s\n" "Setting PJ_NATIVE_STRING_IS_UNICODE to 0" >&6; }
+printf "%s\n" "#define PJ_NATIVE_STRING_IS_UNICODE 0" >>confdefs.h
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Setting PJ_ATOMIC_VALUE_TYPE to long" >&5
-$as_echo "Setting PJ_ATOMIC_VALUE_TYPE to long" >&6; }
-$as_echo "#define PJ_ATOMIC_VALUE_TYPE long" >>confdefs.h
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Setting PJ_ATOMIC_VALUE_TYPE to long" >&5
+printf "%s\n" "Setting PJ_ATOMIC_VALUE_TYPE to long" >&6; }
+printf "%s\n" "#define PJ_ATOMIC_VALUE_TYPE long" >>confdefs.h
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if inet_aton() is available" >&5
-$as_echo_n "checking if inet_aton() is available... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if inet_aton() is available" >&5
+printf %s "checking if inet_aton() is available... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 				     #include <sys/socket.h>
 				     #include <arpa/inet.h>
 int
-main ()
+main (void)
 {
 inet_aton(0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  $as_echo "#define PJ_SOCK_HAS_INET_ATON 1" >>confdefs.h
-
-		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  printf "%s\n" "#define PJ_SOCK_HAS_INET_ATON 1" >>confdefs.h
+
+		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if inet_pton() is available" >&5
-$as_echo_n "checking if inet_pton() is available... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if inet_pton() is available" >&5
+printf %s "checking if inet_pton() is available... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 				     #include <sys/socket.h>
 				     #include <arpa/inet.h>
 int
-main ()
+main (void)
 {
 inet_pton(0, 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  $as_echo "#define PJ_SOCK_HAS_INET_PTON 1" >>confdefs.h
-
-		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  printf "%s\n" "#define PJ_SOCK_HAS_INET_PTON 1" >>confdefs.h
+
+		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if inet_ntop() is available" >&5
-$as_echo_n "checking if inet_ntop() is available... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if inet_ntop() is available" >&5
+printf %s "checking if inet_ntop() is available... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 				     #include <sys/socket.h>
 				     #include <arpa/inet.h>
 int
-main ()
+main (void)
 {
 inet_ntop(0, 0, 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  $as_echo "#define PJ_SOCK_HAS_INET_NTOP 1" >>confdefs.h
-
-		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  printf "%s\n" "#define PJ_SOCK_HAS_INET_NTOP 1" >>confdefs.h
+
+		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo() is available" >&5
-$as_echo_n "checking if getaddrinfo() is available... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo() is available" >&5
+printf %s "checking if getaddrinfo() is available... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 				     #include <sys/socket.h>
 				     #include <netdb.h>
 int
-main ()
+main (void)
 {
 getaddrinfo(0, 0, 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  $as_echo "#define PJ_SOCK_HAS_GETADDRINFO 1" >>confdefs.h
-
-		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  printf "%s\n" "#define PJ_SOCK_HAS_GETADDRINFO 1" >>confdefs.h
+
+		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sockaddr_in has sin_len member" >&5
-$as_echo_n "checking if sockaddr_in has sin_len member... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if sockaddr_in has sin_len member" >&5
+printf %s "checking if sockaddr_in has sin_len member... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
@@ -5675,82 +6223,85 @@
 		    		     #include <netinet/in.h>
 		    		     #include <arpa/inet.h>
 int
-main ()
+main (void)
 {
 struct sockaddr_in a; a.sin_len=0;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  $as_echo "#define PJ_SOCKADDR_HAS_LEN 1" >>confdefs.h
-
-		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  printf "%s\n" "#define PJ_SOCKADDR_HAS_LEN 1" >>confdefs.h
+
+		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if socklen_t is available" >&5
-$as_echo_n "checking if socklen_t is available... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if socklen_t is available" >&5
+printf %s "checking if socklen_t is available... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
                                      #include <sys/socket.h>
 int
-main ()
+main (void)
 {
 socklen_t xxx = 0;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  $as_echo "#define PJ_HAS_SOCKLEN_T 1" >>confdefs.h
-
-		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  printf "%s\n" "#define PJ_HAS_SOCKLEN_T 1" >>confdefs.h
+
+		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if IPV6_V6ONLY is available" >&5
-$as_echo_n "checking if IPV6_V6ONLY is available... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if IPV6_V6ONLY is available" >&5
+printf %s "checking if IPV6_V6ONLY is available... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/socket.h>
                                      #include <netinet/in.h>
 int
-main ()
+main (void)
 {
 int opt = IPV6_V6ONLY;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  $as_echo "#define PJ_SOCK_HAS_IPV6_V6ONLY 1" >>confdefs.h
-
-		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  printf "%s\n" "#define PJ_SOCK_HAS_IPV6_V6ONLY 1" >>confdefs.h
+
+		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if SO_ERROR is available" >&5
-$as_echo_n "checking if SO_ERROR is available... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if SO_ERROR is available" >&5
+printf %s "checking if SO_ERROR is available... " >&6; }
 case $target in
     *mingw* | *cygw* | *win32* | *w32* )
-	$as_echo "#define PJ_HAS_SO_ERROR 1" >>confdefs.h
+	printf "%s\n" "#define PJ_HAS_SO_ERROR 1" >>confdefs.h
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	;;
     *)
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5760,116 +6311,120 @@
 					     #include <netinet/in.h>
 					     #include <arpa/inet.h>
 int
-main ()
+main (void)
 {
 int i=SO_ERROR;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  $as_echo "#define PJ_HAS_SO_ERROR 1" >>confdefs.h
+if ac_fn_c_try_compile "$LINENO"
+then :
+  printf "%s\n" "#define PJ_HAS_SO_ERROR 1" >>confdefs.h
 
-			   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+			   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	;;
 esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pthread_rwlock_t is available" >&5
-$as_echo_n "checking if pthread_rwlock_t is available... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if pthread_rwlock_t is available" >&5
+printf %s "checking if pthread_rwlock_t is available... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 pthread_rwlock_t *x;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  $as_echo "#define PJ_EMULATE_RWMUTEX 0" >>confdefs.h
+if ac_fn_c_try_compile "$LINENO"
+then :
+  printf "%s\n" "#define PJ_EMULATE_RWMUTEX 0" >>confdefs.h
 
 		   ac_rwmutex="yes"
-  		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  $as_echo "#define PJ_EMULATE_RWMUTEX 1" >>confdefs.h
+  		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  printf "%s\n" "#define PJ_EMULATE_RWMUTEX 1" >>confdefs.h
 
 		   ac_rwmutex="no"
-		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 if test "$ac_rwmutex" = "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if pthread_rwlock_t is available with _POSIX_READER_WRITER_LOCKS" >&5
-$as_echo_n "checking if pthread_rwlock_t is available with _POSIX_READER_WRITER_LOCKS... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if pthread_rwlock_t is available with _POSIX_READER_WRITER_LOCKS" >&5
+printf %s "checking if pthread_rwlock_t is available with _POSIX_READER_WRITER_LOCKS... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _POSIX_READER_WRITER_LOCKS
 					 #include <pthread.h>
 int
-main ()
+main (void)
 {
 pthread_rwlock_t *x;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  $as_echo "#define PJ_EMULATE_RWMUTEX 0" >>confdefs.h
+if ac_fn_c_try_compile "$LINENO"
+then :
+  printf "%s\n" "#define PJ_EMULATE_RWMUTEX 0" >>confdefs.h
 
 		       CFLAGS="$CFLAGS -D_POSIX_THREADS -D_POSIX_READER_WRITER_LOCKS"
-		       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  $as_echo "#define PJ_EMULATE_RWMUTEX 1" >>confdefs.h
+		       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  printf "%s\n" "#define PJ_EMULATE_RWMUTEX 1" >>confdefs.h
 
-		       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pthread_mutexattr_settype() is available" >&5
-$as_echo_n "checking if pthread_mutexattr_settype() is available... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if pthread_mutexattr_settype() is available" >&5
+printf %s "checking if pthread_mutexattr_settype() is available... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 pthread_mutexattr_settype(0,PTHREAD_MUTEX_FAST_NP);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  $as_echo "#define PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE 1" >>confdefs.h
-
-  		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  printf "%s\n" "#define PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE 1" >>confdefs.h
+
+  		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pthread_mutexattr_t has recursive member" >&5
-$as_echo_n "checking if pthread_mutexattr_t has recursive member... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if pthread_mutexattr_t has recursive member" >&5
+printf %s "checking if pthread_mutexattr_t has recursive member... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 int
-main ()
+main (void)
 {
 pthread_mutexattr_t attr;
 				     attr.recursive=1;
@@ -5877,36 +6432,38 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  $as_echo "#define PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE 1" >>confdefs.h
+if ac_fn_c_try_compile "$LINENO"
+then :
+  printf "%s\n" "#define PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE 1" >>confdefs.h
 
-  		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ioqueue backend" >&5
-$as_echo_n "checking ioqueue backend... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ioqueue backend" >&5
+printf %s "checking ioqueue backend... " >&6; }
 # Check whether --enable-epoll was given.
-if test "${enable_epoll+set}" = set; then :
+if test ${enable_epoll+y}
+then :
   enableval=$enable_epoll;
 		ac_os_objs=ioqueue_epoll.o
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: /dev/epoll" >&5
-$as_echo "/dev/epoll" >&6; }
-		$as_echo "#define PJ_HAS_LINUX_EPOLL 1" >>confdefs.h
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: /dev/epoll" >&5
+printf "%s\n" "/dev/epoll" >&6; }
+		printf "%s\n" "#define PJ_HAS_LINUX_EPOLL 1" >>confdefs.h
 
 		ac_linux_poll=epoll
 
-else
+else $as_nop
 
 		ac_os_objs=ioqueue_select.o
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: select()" >&5
-$as_echo "select()" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: select()" >&5
+printf "%s\n" "select()" >&6; }
 		ac_linux_poll=select
 
 fi
@@ -5914,16 +6471,33 @@
 
 
 # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
+if test ${enable_shared+y}
+then :
   enableval=$enable_shared; if test "$enable_shared" = "yes"; then
 		ac_shared_libraries=1
 		CFLAGS="$CFLAGS -fPIC"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Building shared libraries... yes" >&5
-$as_echo "Building shared libraries... yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building shared libraries... yes" >&5
+printf "%s\n" "Building shared libraries... yes" >&6; }
 	       fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building shared libraries... no" >&5
-$as_echo "Building shared libraries... no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building shared libraries... no" >&5
+printf "%s\n" "Building shared libraries... no" >&6; }
+
+fi
+
+
+
+# Check whether --enable-pjsua2 was given.
+if test ${enable_pjsua2+y}
+then :
+  enableval=$enable_pjsua2; if test "$enable_pjsua2" = "no"; then
+		ac_no_pjsua2=1
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building pjsua2 library and application... no" >&5
+printf "%s\n" "Building pjsua2 library and application... no" >&6; }
+	       fi
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building pjsua2 library and application... yes" >&5
+printf "%s\n" "Building pjsua2 library and application... yes" >&6; }
 
 fi
 
@@ -5952,11 +6526,23 @@
 		ac_os_objs="$ac_os_objs sock_qos_bsd.o"
 		;;
 	esac
+	# SSL
+	case $target in
+	  *darwin*)
+		ac_os_objs="$ac_os_objs ssl_sock_apple.o"
+		;;
+	esac
 	# UUID
 	case $target in
 	  *android*)
 	  	ac_os_objs="$ac_os_objs guid_android.o"
 	  	;;
+	  *darwin*)
+	  	ac_os_objs="$ac_os_objs guid_darwin.o"
+	  	;;
+	  *bsd*)
+	  	ac_os_objs="$ac_os_objs guid_bsd.o"
+	  	;;
 	  *)
 		if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
 			ac_os_objs="$ac_os_objs guid_uuid.o"
@@ -5973,36 +6559,38 @@
 
 
 # Check whether --with-external-speex was given.
-if test "${with_external_speex+set}" = set; then :
+if test ${with_external_speex+y}
+then :
   withval=$with_external_speex;
 	if test "x$with_external_speex" != "xno"; then
 		# Test Speex installation
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if external Speex devkit is installed" >&5
-$as_echo_n "checking if external Speex devkit is installed... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external Speex devkit is installed" >&5
+printf %s "checking if external Speex devkit is installed... " >&6; }
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <speex/speex.h>
 						     #include <speex/speex_echo.h>
 
 int
-main ()
+main (void)
 {
 speex_echo_state_init(0, 0); speex_encoder_init(0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5
-$as_echo "yes!!" >&6; }
-				   $as_echo "#define PJMEDIA_EXTERNAL_SPEEX_CODEC 1" >>confdefs.h
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5
+printf "%s\n" "yes!!" >&6; }
+				   printf "%s\n" "#define PJMEDIA_EXTERNAL_SPEEX_CODEC 1" >>confdefs.h
 
 				   ac_external_speex="1"
 
-else
+else $as_nop
   as_fn_error $? "Unable to use external Speex library. If Speex development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	fi
 
 
@@ -6013,68 +6601,71 @@
 
 
 # Check whether --with-external-gsm was given.
-if test "${with_external_gsm+set}" = set; then :
+if test ${with_external_gsm+y}
+then :
   withval=$with_external_gsm;
 	if test "x$with_external_gsm" != "xno"; then
                 # Test GSM library installation
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking if external GSM devkit is installed as gsm/gsm.h" >&5
-$as_echo_n "checking if external GSM devkit is installed as gsm/gsm.h... " >&6; }
+                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external GSM devkit is installed as gsm/gsm.h" >&5
+printf %s "checking if external GSM devkit is installed as gsm/gsm.h... " >&6; }
                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <gsm/gsm.h>
 int
-main ()
+main (void)
 {
 gsm_create();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5
-$as_echo "yes!!" >&6; }
-                     $as_echo "#define PJMEDIA_EXTERNAL_GSM_CODEC 1" >>confdefs.h
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5
+printf "%s\n" "yes!!" >&6; }
+                     printf "%s\n" "#define PJMEDIA_EXTERNAL_GSM_CODEC 1" >>confdefs.h
 
-                     $as_echo "#define PJMEDIA_EXTERNAL_GSM_GSM_H 1" >>confdefs.h
+                     printf "%s\n" "#define PJMEDIA_EXTERNAL_GSM_GSM_H 1" >>confdefs.h
 
                      ac_external_gsm="1"
 
-else
+else $as_nop
 
-                     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if external GSM devkit is installed as gsm.h" >&5
-$as_echo_n "checking if external GSM devkit is installed as gsm.h... " >&6; }
+                     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+                     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external GSM devkit is installed as gsm.h" >&5
+printf %s "checking if external GSM devkit is installed as gsm.h... " >&6; }
                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <gsm.h>
 int
-main ()
+main (void)
 {
 gsm_create();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5
-$as_echo "yes!!" >&6; }
-                         $as_echo "#define PJMEDIA_EXTERNAL_GSM_CODEC 1" >>confdefs.h
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5
+printf "%s\n" "yes!!" >&6; }
+                         printf "%s\n" "#define PJMEDIA_EXTERNAL_GSM_CODEC 1" >>confdefs.h
 
-                         $as_echo "#define PJMEDIA_EXTERNAL_GSM_H 1" >>confdefs.h
+                         printf "%s\n" "#define PJMEDIA_EXTERNAL_GSM_H 1" >>confdefs.h
 
                          ac_external_gsm="1"
 
-else
+else $as_nop
   as_fn_error $? "Unable to use external GSM library. If GSM development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	fi
 
 
@@ -6087,55 +6678,58 @@
 
 
 # Check whether --with-external-srtp was given.
-if test "${with_external_srtp+set}" = set; then :
+if test ${with_external_srtp+y}
+then :
   withval=$with_external_srtp;
 	if test "x$with_external_srtp" != "xno"; then
 		# Test SRTP installation
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if external SRTP devkit is installed" >&5
-$as_echo_n "checking if external SRTP devkit is installed... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external SRTP devkit is installed" >&5
+printf %s "checking if external SRTP devkit is installed... " >&6; }
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <srtp2/srtp.h>
 
 int
-main ()
+main (void)
 {
 srtp_init();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes: version 2.x" >&5
-$as_echo "yes: version 2.x" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes: version 2.x" >&5
+printf "%s\n" "yes: version 2.x" >&6; }
 				   ac_external_srtp="2"
 				   ac_external_srtp_lib="srtp2"
 
-else
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <srtp/srtp.h>
 
 int
-main ()
+main (void)
 {
 srtp_init();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes: version 1.x" >&5
-$as_echo "yes: version 1.x" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes: version 1.x" >&5
+printf "%s\n" "yes: version 1.x" >&6; }
 				   ac_external_srtp="1"
 				   ac_external_srtp_lib="srtp"
 
-else
+else $as_nop
   as_fn_error $? "Unable to use SRTP. If SRTP development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	fi
 
 
@@ -6147,12 +6741,13 @@
 
 	ac_srtp_shutdown_present=0
 
-	as_ac_Lib=`$as_echo "ac_cv_lib_$ac_external_srtp_lib''_srtp_deinit" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_deinit in -l$ac_external_srtp_lib" >&5
-$as_echo_n "checking for srtp_deinit in -l$ac_external_srtp_lib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+	as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ac_external_srtp_lib""_srtp_deinit" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srtp_deinit in -l$ac_external_srtp_lib" >&5
+printf %s "checking for srtp_deinit in -l$ac_external_srtp_lib... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$ac_external_srtp_lib  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6161,41 +6756,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char srtp_deinit ();
 int
-main ()
+main (void)
 {
 return srtp_deinit ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
   ac_srtp_deinit_present=1
 fi
 
 	if test "x$ac_srtp_deinit_present" != "x1"; then
-		as_ac_Lib=`$as_echo "ac_cv_lib_$ac_external_srtp_lib''_srtp_shutdown" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for srtp_shutdown in -l$ac_external_srtp_lib" >&5
-$as_echo_n "checking for srtp_shutdown in -l$ac_external_srtp_lib... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+		as_ac_Lib=`printf "%s\n" "ac_cv_lib_$ac_external_srtp_lib""_srtp_shutdown" | $as_tr_sh`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for srtp_shutdown in -l$ac_external_srtp_lib" >&5
+printf %s "checking for srtp_shutdown in -l$ac_external_srtp_lib... " >&6; }
+if eval test \${$as_ac_Lib+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$ac_external_srtp_lib  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6204,31 +6799,30 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char srtp_shutdown ();
 int
-main ()
+main (void)
 {
 return srtp_shutdown ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$as_ac_Lib=yes"
-else
+else $as_nop
   eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"
+then :
   ac_srtp_shutdown_present=1
 fi
 
@@ -6240,32 +6834,34 @@
 
 
 # Check whether --with-external-yuv was given.
-if test "${with_external_yuv+set}" = set; then :
+if test ${with_external_yuv+y}
+then :
   withval=$with_external_yuv;
 	if test "x$with_external_yuv" != "xno"; then
 		# Test libyuv installation
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if external libyuv devkit is installed" >&5
-$as_echo_n "checking if external libyuv devkit is installed... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external libyuv devkit is installed" >&5
+printf %s "checking if external libyuv devkit is installed... " >&6; }
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libyuv.h>
 int
-main ()
+main (void)
 {
 RGB24ToI420(0,0,0,0,0,0,0,0,0,0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5
-$as_echo "yes!!" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5
+printf "%s\n" "yes!!" >&6; }
 				   ac_external_yuv="1"
 
-else
+else $as_nop
   as_fn_error $? "Unable to use external libyuv. If libyuv development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	fi
 
 
@@ -6277,34 +6873,76 @@
 
 
 # Check whether --with-external-webrtc was given.
-if test "${with_external_webrtc+set}" = set; then :
+if test ${with_external_webrtc+y}
+then :
   withval=$with_external_webrtc;
 	if test "x$with_external_webrtc" != "xno"; then
 		# Test webrtc installation
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if external webrtc devkit is installed" >&5
-$as_echo_n "checking if external webrtc devkit is installed... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external webrtc devkit is installed" >&5
+printf %s "checking if external webrtc devkit is installed... " >&6; }
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <webrtc/modules/audio_processing/aec/aec_core.h>
 						     #include <webrtc/modules/audio_processing/aec/include/echo_cancellation.h>
 
 int
-main ()
+main (void)
 {
 WebRtcAec_Create();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5
-$as_echo "yes!!" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5
+printf "%s\n" "yes!!" >&6; }
 				   ac_external_webrtc="1"
 
-else
+else $as_nop
   as_fn_error $? "Unable to use external webrtc. If webrtc development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+	fi
+
+
+fi
+
+
+
+ac_external_webrtc_aec3=0
+
+
+# Check whether --with-external-webrtc-aec3 was given.
+if test ${with_external_webrtc_aec3+y}
+then :
+  withval=$with_external_webrtc_aec3;
+	if test "x$with_external_webrtc_aec3" != "xno"; then
+		# Test webrtc AEC3 installation
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external webrtc AEC3 is installed" >&5
+printf %s "checking if external webrtc AEC3 is installed... " >&6; }
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include "modules/audio_processing/aec3/echo_canceller3.h"
+
+int
+main (void)
+{
+EchoCanceller3 ec(EchoCanceller3Config(), 16000, 1, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5
+printf "%s\n" "yes!!" >&6; }
+				   ac_external_webrtc_aec3="1"
+
+else $as_nop
+  as_fn_error $? "Unable to use external webrtc AEC3. If webrtc development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	fi
 
 
@@ -6315,11 +6953,12 @@
 ac_pjmedia_resample=libresample
 
 # Check whether --enable-resample was given.
-if test "${enable_resample+set}" = set; then :
+if test ${enable_resample+y}
+then :
   enableval=$enable_resample; if test "$enable_resample" = "no"; then
 		ac_pjmedia_resample=none
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if resampling is disabled...yes" >&5
-$as_echo "Checking if resampling is disabled...yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if resampling is disabled...yes" >&5
+printf "%s\n" "Checking if resampling is disabled...yes" >&6; }
 	       fi
 
 fi
@@ -6327,11 +6966,12 @@
 
 
 # Check whether --enable-sound was given.
-if test "${enable_sound+set}" = set; then :
+if test ${enable_sound+y}
+then :
   enableval=$enable_sound; if test "$enable_sound" = "no"; then
 		ac_pjmedia_snd=null
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if sound is disabled... yes" >&5
-$as_echo "Checking if sound is disabled... yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if sound is disabled... yes" >&5
+printf "%s\n" "Checking if sound is disabled... yes" >&6; }
 	       fi
 
 fi
@@ -6341,33 +6981,35 @@
 
 
 # Check whether --with-external-pa was given.
-if test "${with_external_pa+set}" = set; then :
+if test ${with_external_pa+y}
+then :
   withval=$with_external_pa;
 	if test "x$with_external_pa" != "xno"; then
 		# Test PortAudio installation
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if external PortAudio devkit is installed" >&5
-$as_echo_n "checking if external PortAudio devkit is installed... " >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if external PortAudio devkit is installed" >&5
+printf %s "checking if external PortAudio devkit is installed... " >&6; }
 		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <portaudio.h>
 
 int
-main ()
+main (void)
 {
 Pa_Initialize();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5
-$as_echo "yes!!" >&6; }
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes!!" >&5
+printf "%s\n" "yes!!" >&6; }
 				   ac_external_pa="1"
 
-else
+else $as_nop
   as_fn_error $? "Unable to use PortAudio. If PortAudio development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths" "$LINENO" 5
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 	fi
 
 
@@ -6375,46 +7017,133 @@
 
 
 
-ac_fn_c_check_header_mongrel "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_soundcard_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_soundcard_h" = xyes
+then :
   ac_pa_cflags="$ac_pa_cflags -DHAVE_SYS_SOUNDCARD_H"
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "linux/soundcard.h" "ac_cv_header_linux_soundcard_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_soundcard_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "linux/soundcard.h" "ac_cv_header_linux_soundcard_h" "$ac_includes_default"
+if test "x$ac_cv_header_linux_soundcard_h" = xyes
+then :
   ac_pa_cflags="$ac_pa_cflags -DHAVE_LINUX_SOUNDCARD_H"
 fi
 
-
-ac_fn_c_check_header_mongrel "$LINENO" "machine/soundcard.h" "ac_cv_header_machine_soundcard_h" "$ac_includes_default"
-if test "x$ac_cv_header_machine_soundcard_h" = xyes; then :
+ac_fn_c_check_header_compile "$LINENO" "machine/soundcard.h" "ac_cv_header_machine_soundcard_h" "$ac_includes_default"
+if test "x$ac_cv_header_machine_soundcard_h" = xyes
+then :
   ac_pa_cflags="$ac_pa_cflags -DHAVE_MACHINE_SOUNDCARD_H"
 fi
 
 
-
 if test "x$ac_cv_c_bigendian" = "xyes"; then
   ac_pa_cflags="$ac_pa_cflags -DPA_BIG_ENDIAN"
 else
   ac_pa_cflags="$ac_pa_cflags -DPA_LITTLE_ENDIAN"
 fi
 
+
+
+
+
+# Check whether --with-oboe was given.
+if test ${with_oboe+y}
+then :
+  withval=$with_oboe;
+	if test "x$with_oboe" != "xno" -a "x$with_oboe" != "x"; then
+		OBOE_PREFIX=$with_oboe
+		OBOE_CFLAGS="-I$OBOE_PREFIX/prefab/modules/oboe/include"
+		OBOE_LDFLAGS="-L$OBOE_PREFIX/prefab/modules/oboe/libs/android.$TARGET_ABI"
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using Oboe prefix... $with_oboe" >&5
+printf "%s\n" "Using Oboe prefix... $with_oboe" >&6; }
+	else
+		OBOE_CFLAGS=""
+		OBOE_LDFLAGS=""
+	fi
+
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oboe usability" >&5
+printf %s "checking Oboe usability... " >&6; }
+
+	OBOE_LIBS="-loboe -lOpenSLES -llog"
+
+	SAVED_LIBS="$LIBS"
+	SAVED_LDFLAGS="$LDFLAGS"
+	SAVED_CXXFLAGS="$CXXFLAGS"
+
+	LIBS="$OBOE_LIBS $LIBS"
+	LDFLAGS="$OBOE_LDFLAGS $LDFLAGS"
+	CXXFLAGS="$OBOE_CFLAGS $CXXFLAGS"
+
+	ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <oboe/Oboe.h>
+int
+main (void)
+{
+oboe::AudioStreamBuilder sb; sb.setDeviceId(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"
+then :
+   ac_oboe_cflags="-DPJMEDIA_AUDIO_DEV_HAS_OBOE=1 $OBOE_CFLAGS"
+		   ac_oboe_ldflags="$OBOE_LDFLAGS $OBOE_LIBS"
+		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+else $as_nop
+
+		   LIBS="$SAVED_LIBS"
+		   LDFLAGS="$SAVED_LDFLAGS"
+		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+	ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+	# Put back original CXXFLAGS as app won't needed it.
+	CXXFLAGS="$SAVED_CFLAGS"
+
+
+fi
+
+
+
 if test "$enable_sound" = "no"; then
   true;
 else
 
  case $target in
   *android*)
-	LIBS="$LIBS -lOpenSLES"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... OpenSL ES" >&5
-$as_echo "Checking sound device backend... OpenSL ES" >&6; }
+	if test "x$ac_oboe_cflags" != "x"; then
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... Oboe" >&5
+printf "%s\n" "Checking sound device backend... Oboe" >&6; }
+	else
+		LIBS="$LIBS -lOpenSLES"
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... Android" >&5
+printf "%s\n" "Checking sound device backend... Android" >&6; }
+	fi
 	;;
   *-apple-darwin_ios*)
 	LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit -framework AVFoundation"
 	ac_pjmedia_audiodev_objs="coreaudio_dev.o"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... AudioUnit" >&5
-$as_echo "Checking sound device backend... AudioUnit" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... AudioUnit" >&5
+printf "%s\n" "Checking sound device backend... AudioUnit" >&6; }
 	;;
   *darwin*)
 	LIBS="$LIBS -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox"
@@ -6423,40 +7152,40 @@
 		#ac_pa_cflags="$ac_pa_cflags -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS"
 		#AC_MSG_RESULT([Setting additional PortAudio CFLAGS.. -DPA_OLD_CORE_AUDIO -DMOSX_USE_NON_ATOMIC_FLAG_BITS])
 		#ac_pjmedia_snd=pa_old_darwinos
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... old coreaudio" >&5
-$as_echo "Checking sound device backend... old coreaudio" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... old coreaudio" >&5
+printf "%s\n" "Checking sound device backend... old coreaudio" >&6; }
 	else
 		ac_pjmedia_snd=coreaudio
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... coreaudio" >&5
-$as_echo "Checking sound device backend... coreaudio" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... coreaudio" >&5
+printf "%s\n" "Checking sound device backend... coreaudio" >&6; }
 	fi
 	;;
   *cygwin* | *mingw*)
 	ac_pjmedia_snd=win32
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... win32 sound" >&5
-$as_echo "Checking sound device backend... win32 sound" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... win32 sound" >&5
+printf "%s\n" "Checking sound device backend... win32 sound" >&6; }
 	;;
   *rtems*)
 	ac_pjmedia_snd=null
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... null sound" >&5
-$as_echo "Checking sound device backend... null sound" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... null sound" >&5
+printf "%s\n" "Checking sound device backend... null sound" >&6; }
 	;;
   *)
 	if test "x$ac_external_pa" != "x1"; then
-				ac_fn_c_check_header_mongrel "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default"
-if test "x$ac_cv_header_alsa_version_h" = xyes; then :
+				ac_fn_c_check_header_compile "$LINENO" "alsa/version.h" "ac_cv_header_alsa_version_h" "$ac_includes_default"
+if test "x$ac_cv_header_alsa_version_h" = xyes
+then :
   LIBS="$LIBS -lasound"
 				 ac_pjmedia_snd=alsa
 fi
 
-
 		if test "x$ac_pjmedia_snd" = "xalsa"; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... alsa" >&5
-$as_echo "Checking sound device backend... alsa" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... alsa" >&5
+printf "%s\n" "Checking sound device backend... alsa" >&6; }
 		else
 			ac_pjmedia_snd=null
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... null sound" >&5
-$as_echo "Checking sound device backend... null sound" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... null sound" >&5
+printf "%s\n" "Checking sound device backend... null sound" >&6; }
 		fi
 	fi
 	;;
@@ -6465,24 +7194,28 @@
 
 
 
-# Disable video on mingw
+# Disable video on mingw by default (but respect --enable-video=yes)
 case $target in
  *mingw*)
+	if test ! "$enable_video" = "yes"; then
 	enable_video="no"
+	fi
 	;;
 esac
 
 # Check whether --enable-video was given.
-if test "${enable_video+set}" = set; then :
+if test ${enable_video+y}
+then :
   enableval=$enable_video; if test "$enable_video" = "no"; then
 	        #AC_DEFINE(PJMEDIA_HAS_VIDEO,0)
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: Video is disabled" >&5
-$as_echo "Video is disabled" >&6; }
+                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Video is disabled" >&5
+printf "%s\n" "Video is disabled" >&6; }
                 enable_sdl="no"
                 enable_ffmpeg="no"
                 enable_v4l2="no"
                 enable_openh264="no"
                 enable_libyuv="no"
+                enable_vpx="no"
                fi
 fi
 
@@ -6508,37 +7241,50 @@
 
 
 	SAVED_LIBS="$LIBS"
-	LIBS="-lGLESv2 -lEGL -landroid -lgcc -lc"
+	LIBS="-lGLESv2 -lEGL -landroid -lc"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_pjmedia_video_has_android=yes
-else
+else $as_nop
   ac_pjmedia_video_has_android=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	LIBS="$SAVED_LIBS"
 	if test "$ac_pjmedia_video_has_android" = "yes"; then
 	  ac_android_cflags="-DPJMEDIA_VIDEO_DEV_HAS_ANDROID_OPENGL=1"
 	  LIBS="$LIBS -lGLESv2 -lEGL -landroid"
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGL ES 2 is available... yes" >&5
-$as_echo "Checking if OpenGL ES 2 is available... yes" >&6; }
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGL ES 2 is available... yes" >&5
+printf "%s\n" "Checking if OpenGL ES 2 is available... yes" >&6; }
 	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGL ES 2 is available... no" >&5
-$as_echo "Checking if OpenGL ES 2 is available... no" >&6; }
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGL ES 2 is available... no" >&5
+printf "%s\n" "Checking if OpenGL ES 2 is available... no" >&6; }
 	fi
 	ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1"
 	;;
+  *mingw*)
+	if test "$enable_video" = "yes"; then
+	  ac_pjmedia_video=windows_os
+
+	  ac_pjmedia_video_dev_has_dshow=yes
+
+	  ac_dshow_cflags="-DPJMEDIA_HAS_VIDEO=1 -DPJMEDIA_VIDEO_DEV_HAS_DSHOW=1"
+
+	  ac_dshow_ldflags=" -lstdc++ -lquartz -lole32 -loleaut32 -lrpcrt4 -lwinmm -luuid -lmingwex -lstrmiids "
+	  LIBS="$LIBS -lstdc++ -lquartz -lole32 -loleaut32 -lrpcrt4 -lwinmm -luuid -lmingwex -lstrmiids "
+	fi
+	;;
   *darwin*)
 	ac_pjmedia_video=darwin_os
 
@@ -6551,85 +7297,88 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_pjmedia_video_has_darwin=yes
-else
+else $as_nop
   ac_pjmedia_video_has_darwin=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	LIBS="-framework VideoToolbox"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_pjmedia_video_has_vtoolbox=yes
-else
+else $as_nop
   ac_pjmedia_video_has_vtoolbox=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	LIBS="-framework OpenGLES"
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_pjmedia_video_has_ios_opengl=yes
-else
+else $as_nop
   ac_pjmedia_video_has_ios_opengl=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	LIBS="$SAVED_LIBS"
 	if test "$ac_pjmedia_video_has_darwin" = "yes"; then
 	  ac_darwin_cflags="-DPJMEDIA_VIDEO_DEV_HAS_DARWIN=1"
 	  LIBS="$LIBS -framework AVFoundation -framework CoreGraphics -framework QuartzCore -framework CoreVideo -framework CoreMedia"
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if AVFoundation framework is available... yes" >&5
-$as_echo "Checking if AVFoundation framework is available... yes" >&6; }
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if AVFoundation framework is available... yes" >&5
+printf "%s\n" "Checking if AVFoundation framework is available... yes" >&6; }
 	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if AVFoundation framework is available... no" >&5
-$as_echo "Checking if AVFoundation framework is available... no" >&6; }
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if AVFoundation framework is available... no" >&5
+printf "%s\n" "Checking if AVFoundation framework is available... no" >&6; }
 	fi
 	if test "$ac_pjmedia_video_has_vtoolbox" = "yes"; then
 	  #ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1"
 	  LIBS="$LIBS -framework VideoToolbox"
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if VideoToolbox framework is available... yes" >&5
-$as_echo "Checking if VideoToolbox framework is available... yes" >&6; }
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if VideoToolbox framework is available... yes" >&5
+printf "%s\n" "Checking if VideoToolbox framework is available... yes" >&6; }
 	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if VideoToolbox framework is available... no" >&5
-$as_echo "Checking if VideoToolbox framework is available... no" >&6; }
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if VideoToolbox framework is available... no" >&5
+printf "%s\n" "Checking if VideoToolbox framework is available... no" >&6; }
 	fi
 	if test "$ac_pjmedia_video_has_ios_opengl" = "yes"; then
 	  ac_darwin_cflags+=" -DPJMEDIA_VIDEO_DEV_HAS_IOS_OPENGL=1"
 	  LIBS="$LIBS -framework OpenGLES"
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGLES framework is available... yes" >&5
-$as_echo "Checking if OpenGLES framework is available... yes" >&6; }
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGLES framework is available... yes" >&5
+printf "%s\n" "Checking if OpenGLES framework is available... yes" >&6; }
 	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGLES framework is available... no" >&5
-$as_echo "Checking if OpenGLES framework is available... no" >&6; }
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGLES framework is available... no" >&5
+printf "%s\n" "Checking if OpenGLES framework is available... no" >&6; }
 	fi
         if false; then
           # QTKit is deprecated, see ticket #1931.
@@ -6642,29 +7391,30 @@
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_pjmedia_video_has_qt=yes
-else
+else $as_nop
   ac_pjmedia_video_has_qt=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	  LIBS="$SAVED_LIBS"
 	  if test "$ac_pjmedia_video_has_qt" = "yes"; then
 	    ac_qt_cflags="-DPJMEDIA_VIDEO_DEV_HAS_QT=1"
 	    LIBS="$LIBS -framework QTKit -framework QuartzCore -framework OpenGL"
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if QTKit framework is available... yes" >&5
-$as_echo "Checking if QTKit framework is available... yes" >&6; }
+	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if QTKit framework is available... yes" >&5
+printf "%s\n" "Checking if QTKit framework is available... yes" >&6; }
 	  else
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if QTKit framework is available... no" >&5
-$as_echo "Checking if QTKit framework is available... no" >&6; }
+	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if QTKit framework is available... no" >&5
+printf "%s\n" "Checking if QTKit framework is available... no" >&6; }
  	  fi
  	fi
  	;;
@@ -6672,11 +7422,12 @@
 fi
 
 # Check whether --enable-ext_sound was given.
-if test "${enable_ext_sound+set}" = set; then :
+if test ${enable_ext_sound+y}
+then :
   enableval=$enable_ext_sound; if test "$enable_ext_sound" = "yes"; then
 		ac_pjmedia_snd=external
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if external sound is set... yes" >&5
-$as_echo "Checking if external sound is set... yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if external sound is set... yes" >&5
+printf "%s\n" "Checking if external sound is set... yes" >&6; }
 	       fi
 
 fi
@@ -6684,171 +7435,183 @@
 
 
 # Check whether --enable-small-filter was given.
-if test "${enable_small_filter+set}" = set; then :
+if test ${enable_small_filter+y}
+then :
   enableval=$enable_small_filter; if test "$enable_small_filter" = "no"; then
 		ac_no_small_filter='-DPJMEDIA_HAS_SMALL_FILTER=0'
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if small filter is disabled... yes" >&5
-$as_echo "Checking if small filter is disabled... yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if small filter is disabled... yes" >&5
+printf "%s\n" "Checking if small filter is disabled... yes" >&6; }
 	       fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if small filter is disabled... no" >&5
-$as_echo "Checking if small filter is disabled... no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if small filter is disabled... no" >&5
+printf "%s\n" "Checking if small filter is disabled... no" >&6; }
 fi
 
 
 
 # Check whether --enable-large-filter was given.
-if test "${enable_large_filter+set}" = set; then :
+if test ${enable_large_filter+y}
+then :
   enableval=$enable_large_filter; if test "$enable_large_filter" = "no"; then
 		ac_no_large_filter='-DPJMEDIA_HAS_LARGE_FILTER=0'
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if large filter is disabled... yes" >&5
-$as_echo "Checking if large filter is disabled... yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if large filter is disabled... yes" >&5
+printf "%s\n" "Checking if large filter is disabled... yes" >&6; }
 	       fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if large filter is disabled... no" >&5
-$as_echo "Checking if large filter is disabled... no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if large filter is disabled... no" >&5
+printf "%s\n" "Checking if large filter is disabled... no" >&6; }
 fi
 
 
 
 # Check whether --enable-speex-aec was given.
-if test "${enable_speex_aec+set}" = set; then :
+if test ${enable_speex_aec+y}
+then :
   enableval=$enable_speex_aec; if test "$enable_speex_aec" = "no"; then
 		ac_no_speex_aec='-DPJMEDIA_HAS_SPEEX_AEC=0'
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if Speex AEC is disabled...yes" >&5
-$as_echo "Checking if Speex AEC is disabled...yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex AEC is disabled...yes" >&5
+printf "%s\n" "Checking if Speex AEC is disabled...yes" >&6; }
 	       fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if Speex AEC is disabled...no" >&5
-$as_echo "Checking if Speex AEC is disabled...no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex AEC is disabled...no" >&5
+printf "%s\n" "Checking if Speex AEC is disabled...no" >&6; }
 fi
 
 
 
 # Check whether --enable-g711-codec was given.
-if test "${enable_g711_codec+set}" = set; then :
+if test ${enable_g711_codec+y}
+then :
   enableval=$enable_g711_codec; if test "$enable_g711_codec" = "no"; then
 		ac_no_g711_codec=1
-		$as_echo "#define PJMEDIA_HAS_G711_CODEC 0" >>confdefs.h
+		printf "%s\n" "#define PJMEDIA_HAS_G711_CODEC 0" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.711 codec is disabled...yes" >&5
-$as_echo "Checking if G.711 codec is disabled...yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.711 codec is disabled...yes" >&5
+printf "%s\n" "Checking if G.711 codec is disabled...yes" >&6; }
 	       fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.711 codec is disabled...no" >&5
-$as_echo "Checking if G.711 codec is disabled...no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.711 codec is disabled...no" >&5
+printf "%s\n" "Checking if G.711 codec is disabled...no" >&6; }
 fi
 
 
 
 
 # Check whether --enable-l16-codec was given.
-if test "${enable_l16_codec+set}" = set; then :
+if test ${enable_l16_codec+y}
+then :
   enableval=$enable_l16_codec; if test "$enable_l16_codec" = "no"; then
 		ac_no_l16_codec=1
-		$as_echo "#define PJMEDIA_HAS_L16_CODEC 0" >>confdefs.h
+		printf "%s\n" "#define PJMEDIA_HAS_L16_CODEC 0" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if L16 codecs are disabled...yes" >&5
-$as_echo "Checking if L16 codecs are disabled...yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if L16 codecs are disabled...yes" >&5
+printf "%s\n" "Checking if L16 codecs are disabled...yes" >&6; }
 	       fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if L16 codec is disabled...no" >&5
-$as_echo "Checking if L16 codec is disabled...no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if L16 codec is disabled...no" >&5
+printf "%s\n" "Checking if L16 codec is disabled...no" >&6; }
 fi
 
 
 
 
 # Check whether --enable-gsm-codec was given.
-if test "${enable_gsm_codec+set}" = set; then :
+if test ${enable_gsm_codec+y}
+then :
   enableval=$enable_gsm_codec; if test "$enable_gsm_codec" = "no"; then
 		ac_no_gsm_codec=1
-		$as_echo "#define PJMEDIA_HAS_GSM_CODEC 0" >>confdefs.h
+		printf "%s\n" "#define PJMEDIA_HAS_GSM_CODEC 0" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if GSM codec is disabled...yes" >&5
-$as_echo "Checking if GSM codec is disabled...yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if GSM codec is disabled...yes" >&5
+printf "%s\n" "Checking if GSM codec is disabled...yes" >&6; }
 	       fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if GSM codec is disabled...no" >&5
-$as_echo "Checking if GSM codec is disabled...no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if GSM codec is disabled...no" >&5
+printf "%s\n" "Checking if GSM codec is disabled...no" >&6; }
 fi
 
 
 
 # Check whether --enable-g722-codec was given.
-if test "${enable_g722_codec+set}" = set; then :
+if test ${enable_g722_codec+y}
+then :
   enableval=$enable_g722_codec; if test "$enable_g722_codec" = "no"; then
 		ac_no_g722_codec=1
-		$as_echo "#define PJMEDIA_HAS_G722_CODEC 0" >>confdefs.h
+		printf "%s\n" "#define PJMEDIA_HAS_G722_CODEC 0" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.722 codec is disabled...yes" >&5
-$as_echo "Checking if G.722 codec is disabled...yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.722 codec is disabled...yes" >&5
+printf "%s\n" "Checking if G.722 codec is disabled...yes" >&6; }
 	       fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.722 codec is disabled...no" >&5
-$as_echo "Checking if G.722 codec is disabled...no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.722 codec is disabled...no" >&5
+printf "%s\n" "Checking if G.722 codec is disabled...no" >&6; }
 fi
 
 
 
 # Check whether --enable-g7221-codec was given.
-if test "${enable_g7221_codec+set}" = set; then :
+if test ${enable_g7221_codec+y}
+then :
   enableval=$enable_g7221_codec; if test "$enable_g7221_codec" = "no"; then
 		ac_no_g7221_codec=1
-		$as_echo "#define PJMEDIA_HAS_G7221_CODEC 0" >>confdefs.h
+		printf "%s\n" "#define PJMEDIA_HAS_G7221_CODEC 0" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.722.1 codec is disabled...yes" >&5
-$as_echo "Checking if G.722.1 codec is disabled...yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.722.1 codec is disabled...yes" >&5
+printf "%s\n" "Checking if G.722.1 codec is disabled...yes" >&6; }
 	       fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if G.722.1 codec is disabled...no" >&5
-$as_echo "Checking if G.722.1 codec is disabled...no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if G.722.1 codec is disabled...no" >&5
+printf "%s\n" "Checking if G.722.1 codec is disabled...no" >&6; }
 fi
 
 
 
 # Check whether --enable-speex-codec was given.
-if test "${enable_speex_codec+set}" = set; then :
+if test ${enable_speex_codec+y}
+then :
   enableval=$enable_speex_codec; if test "$enable_speex_codec" = "no"; then
 		ac_no_speex_codec=1
-		$as_echo "#define PJMEDIA_HAS_SPEEX_CODEC 0" >>confdefs.h
+		printf "%s\n" "#define PJMEDIA_HAS_SPEEX_CODEC 0" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if Speex codec is disabled...yes" >&5
-$as_echo "Checking if Speex codec is disabled...yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex codec is disabled...yes" >&5
+printf "%s\n" "Checking if Speex codec is disabled...yes" >&6; }
 	       fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if Speex codec is disabled...no" >&5
-$as_echo "Checking if Speex codec is disabled...no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex codec is disabled...no" >&5
+printf "%s\n" "Checking if Speex codec is disabled...no" >&6; }
 fi
 
 
 
 # Check whether --enable-ilbc-codec was given.
-if test "${enable_ilbc_codec+set}" = set; then :
+if test ${enable_ilbc_codec+y}
+then :
   enableval=$enable_ilbc_codec; if test "$enable_ilbc_codec" = "no"; then
 		ac_no_ilbc_codec=1
-		$as_echo "#define PJMEDIA_HAS_ILBC_CODEC 0" >>confdefs.h
+		printf "%s\n" "#define PJMEDIA_HAS_ILBC_CODEC 0" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if iLBC codec is disabled...yes" >&5
-$as_echo "Checking if iLBC codec is disabled...yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if iLBC codec is disabled...yes" >&5
+printf "%s\n" "Checking if iLBC codec is disabled...yes" >&6; }
 	       fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if iLBC codec is disabled...no" >&5
-$as_echo "Checking if iLBC codec is disabled...no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if iLBC codec is disabled...no" >&5
+printf "%s\n" "Checking if iLBC codec is disabled...no" >&6; }
 fi
 
 
 # Check whether --enable-libsamplerate was given.
-if test "${enable_libsamplerate+set}" = set; then :
+if test ${enable_libsamplerate+y}
+then :
   enableval=$enable_libsamplerate;
            if test "$enable_libsamplerate" = "yes"; then
-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if libsamplerate is enabled...yes" >&5
-$as_echo "Checking if libsamplerate is enabled...yes" >&6; }
-             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for src_new in -lsamplerate" >&5
-$as_echo_n "checking for src_new in -lsamplerate... " >&6; }
-if ${ac_cv_lib_samplerate_src_new+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+             { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libsamplerate is enabled...yes" >&5
+printf "%s\n" "Checking if libsamplerate is enabled...yes" >&6; }
+             { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for src_new in -lsamplerate" >&5
+printf %s "checking for src_new in -lsamplerate... " >&6; }
+if test ${ac_cv_lib_samplerate_src_new+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsamplerate  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6857,33 +7620,30 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char src_new ();
 int
-main ()
+main (void)
 {
 return src_new ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_samplerate_src_new=yes
-else
+else $as_nop
   ac_cv_lib_samplerate_src_new=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_samplerate_src_new" >&5
-$as_echo "$ac_cv_lib_samplerate_src_new" >&6; }
-if test "x$ac_cv_lib_samplerate_src_new" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSAMPLERATE 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_samplerate_src_new" >&5
+printf "%s\n" "$ac_cv_lib_samplerate_src_new" >&6; }
+if test "x$ac_cv_lib_samplerate_src_new" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBSAMPLERATE 1" >>confdefs.h
 
   LIBS="-lsamplerate $LIBS"
 
@@ -6891,36 +7651,57 @@
 
              ac_pjmedia_resample=libsamplerate
            else
-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if libsamplerate is enabled...no" >&5
-$as_echo "Checking if libsamplerate is enabled...no" >&6; }
+             { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libsamplerate is enabled...no" >&5
+printf "%s\n" "Checking if libsamplerate is enabled...no" >&6; }
            fi
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if libsamplerate is enabled...no" >&5
-$as_echo "Checking if libsamplerate is enabled...no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libsamplerate is enabled...no" >&5
+printf "%s\n" "Checking if libsamplerate is enabled...no" >&6; }
 fi
 
 
 
 # Check whether --enable-resample_dll was given.
-if test "${enable_resample_dll+set}" = set; then :
+if test ${enable_resample_dll+y}
+then :
   enableval=$enable_resample_dll; if test "$enable_resample_dll" = "yes"; then
 		ac_resample_dll=1
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Building libresample as shared library... yes" >&5
-$as_echo "Building libresample as shared library... yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building libresample as shared library... yes" >&5
+printf "%s\n" "Building libresample as shared library... yes" >&6; }
 	       fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Building libresample as shared library... no" >&5
-$as_echo "Building libresample as shared library... no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Building libresample as shared library... no" >&5
+printf "%s\n" "Building libresample as shared library... no" >&6; }
+
+fi
+
 
+# Check whether --enable-speex-resample was given.
+if test ${enable_speex_resample+y}
+then :
+  enableval=$enable_speex_resample;
+           if test "$enable_speex_resample" = "yes"; then
+             { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex resample is enabled... yes" >&5
+printf "%s\n" "Checking if Speex resample is enabled... yes" >&6; }
+             ac_pjmedia_resample=speex
+           else
+             { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex resample is enabled... no" >&5
+printf "%s\n" "Checking if Speex resample is enabled... no" >&6; }
+           fi
+
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Speex resample is enabled... no" >&5
+printf "%s\n" "Checking if Speex resample is enabled... no" >&6; }
 fi
 
 
 
 # Check whether --with-sdl was given.
-if test "${with_sdl+set}" = set; then :
+if test ${with_sdl+y}
+then :
   withval=$with_sdl;
-else
+else $as_nop
   with_sdl=no
 
 fi
@@ -6931,27 +7712,29 @@
 fi
 
 # Check whether --enable-sdl was given.
-if test "${enable_sdl+set}" = set; then :
+if test ${enable_sdl+y}
+then :
   enableval=$enable_sdl;
 		if test "$enable_sdl" = "no"; then
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if SDL is disabled... yes" >&5
-$as_echo "Checking if SDL is disabled... yes" >&6; }
+		  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if SDL is disabled... yes" >&5
+printf "%s\n" "Checking if SDL is disabled... yes" >&6; }
 		fi
 
-else
+else $as_nop
 
 		  if test "x$with_sdl" != "xno" -a "x$with_sdl" != "x"; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using SDL prefix... $with_sdl" >&5
-$as_echo "Using SDL prefix... $with_sdl" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SDL prefix... $with_sdl" >&5
+printf "%s\n" "Using SDL prefix... $with_sdl" >&6; }
 			for ac_prog in sdl2-config sdl-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SDL_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_SDL_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $SDL_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path.
@@ -6961,11 +7744,15 @@
 for as_dir in $with_sdl/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_SDL_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6977,11 +7764,11 @@
 fi
 SDL_CONFIG=$ac_cv_path_SDL_CONFIG
 if test -n "$SDL_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5
-$as_echo "$SDL_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5
+printf "%s\n" "$SDL_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -6993,11 +7780,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SDL_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_SDL_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $SDL_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path.
@@ -7007,11 +7795,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_SDL_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7023,11 +7815,11 @@
 fi
 SDL_CONFIG=$ac_cv_path_SDL_CONFIG
 if test -n "$SDL_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5
-$as_echo "$SDL_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5
+printf "%s\n" "$SDL_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7036,21 +7828,22 @@
 
 		  fi
 
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: checking SDL availability" >&5
-$as_echo_n "checking SDL availability... " >&6; }
+		  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking SDL availability" >&5
+printf %s "checking SDL availability... " >&6; }
 		  if test "x$SDL_CONFIG" = "x"; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+printf "%s\n" "not found" >&6; }
 		  elif (sh -c "$SDL_CONFIG --version" | grep -e '^1\.3' -e '^2\.') then
 
 
 			ac_sdl_cflags=`$SDL_CONFIG --cflags`
 			ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
 			ac_sdl_ldflags=`$SDL_CONFIG --libs`
+			ac_sdl_ldflags=${ac_sdl_ldflags//-mwindows/}
 			LIBS="$LIBS $ac_sdl_ldflags"
 		  else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Unsupported SDL version" >&5
-$as_echo "Unsupported SDL version" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Unsupported SDL version" >&5
+printf "%s\n" "Unsupported SDL version" >&6; }
 		  fi
 
 fi
@@ -7059,9 +7852,10 @@
 
 
 # Check whether --with-ffmpeg was given.
-if test "${with_ffmpeg+set}" = set; then :
+if test ${with_ffmpeg+y}
+then :
   withval=$with_ffmpeg;
-else
+else $as_nop
   with_ffmpeg=no
 
 fi
@@ -7072,16 +7866,17 @@
 fi
 
 # Check whether --enable-ffmpeg was given.
-if test "${enable_ffmpeg+set}" = set; then :
+if test ${enable_ffmpeg+y}
+then :
   enableval=$enable_ffmpeg;
 	        ac_has_ffmpeg=0
 
 		if test "$enable_ffmpeg" = "no"; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if ffmpeg is disabled... yes" >&5
-$as_echo "Checking if ffmpeg is disabled... yes" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if ffmpeg is disabled... yes" >&5
+printf "%s\n" "Checking if ffmpeg is disabled... yes" >&6; }
 		fi
 
-else
+else $as_nop
 
 
 
@@ -7091,8 +7886,8 @@
 		SAVED_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
     		if test "x$with_ffmpeg" != "xno" -a "x$with_ffmpeg" != "x"; then
 			FFMPEG_PREFIX=$with_ffmpeg
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5
-$as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5
+printf "%s\n" "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }
 			export PKG_CONFIG_PATH=$FFMPEG_PREFIX/lib/pkgconfig
 		fi
 
@@ -7100,11 +7895,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$PKG_CONFIG"; then
   ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
 else
@@ -7112,11 +7908,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_PKG_CONFIG="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7127,11 +7927,11 @@
 fi
 PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7141,8 +7941,8 @@
 
 
 		if test "$PKG_CONFIG" != "none"; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ffmpeg packages" >&5
-$as_echo_n "checking ffmpeg packages... " >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ffmpeg packages" >&5
+printf %s "checking ffmpeg packages... " >&6; }
 			av_pkg=""
 			if $PKG_CONFIG --exists libavdevice; then
 				ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1"
@@ -7166,11 +7966,11 @@
 			fi
 
 			if test "x$av_pkg" == "x"; then
-			   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none detected (check the prefix)! **" >&5
-$as_echo "none detected (check the prefix)! **" >&6; }
+			   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none detected (check the prefix)! **" >&5
+printf "%s\n" "none detected (check the prefix)! **" >&6; }
 			else
-			   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $av_pkg" >&5
-$as_echo "$av_pkg" >&6; }
+			   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $av_pkg" >&5
+printf "%s\n" "$av_pkg" >&6; }
 			fi
 
 			ac_ffmpeg_cflags="$ac_ffmpeg_cflags `$PKG_CONFIG --cflags $av_pkg`"
@@ -7178,18 +7978,19 @@
 
 		else
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** Warning: neither pkg-config nor python is available, ffmpeg dependency cannot be calculated. If ffmpeg libraries are not detected, you need to specify the correct CFLAGS and LDFLAGS settings for ffmpeg prior to invoking configure ***" >&5
-$as_echo "*** Warning: neither pkg-config nor python is available, ffmpeg dependency cannot be calculated. If ffmpeg libraries are not detected, you need to specify the correct CFLAGS and LDFLAGS settings for ffmpeg prior to invoking configure ***" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: *** Warning: neither pkg-config nor python is available, ffmpeg dependency cannot be calculated. If ffmpeg libraries are not detected, you need to specify the correct CFLAGS and LDFLAGS settings for ffmpeg prior to invoking configure ***" >&5
+printf "%s\n" "*** Warning: neither pkg-config nor python is available, ffmpeg dependency cannot be calculated. If ffmpeg libraries are not detected, you need to specify the correct CFLAGS and LDFLAGS settings for ffmpeg prior to invoking configure ***" >&6; }
 
 			LIBS="-L$FFMPEG_PREFIX/lib $LIBS"
 			LDFLAGS="-L$FFMPEG_PREFIX/lib $LDFLAGS"
 			CFLAGS="-I$FFMPEG_PREFIX/include $CFLAGS"
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avdevice_version in -lavdevice" >&5
-$as_echo_n "checking for avdevice_version in -lavdevice... " >&6; }
-if ${ac_cv_lib_avdevice_avdevice_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avdevice_version in -lavdevice" >&5
+printf %s "checking for avdevice_version in -lavdevice... " >&6; }
+if test ${ac_cv_lib_avdevice_avdevice_version+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lavdevice  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7198,41 +7999,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char avdevice_version ();
 int
-main ()
+main (void)
 {
 return avdevice_version ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_avdevice_avdevice_version=yes
-else
+else $as_nop
   ac_cv_lib_avdevice_avdevice_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avdevice_avdevice_version" >&5
-$as_echo "$ac_cv_lib_avdevice_avdevice_version" >&6; }
-if test "x$ac_cv_lib_avdevice_avdevice_version" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avdevice_avdevice_version" >&5
+printf "%s\n" "$ac_cv_lib_avdevice_avdevice_version" >&6; }
+if test "x$ac_cv_lib_avdevice_avdevice_version" = xyes
+then :
   ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVDEVICE=1"
 				      ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavdevice"
 
 
 fi
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_malloc in -lavutil" >&5
-$as_echo_n "checking for av_malloc in -lavutil... " >&6; }
-if ${ac_cv_lib_avutil_av_malloc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for av_malloc in -lavutil" >&5
+printf %s "checking for av_malloc in -lavutil... " >&6; }
+if test ${ac_cv_lib_avutil_av_malloc+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lavutil  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7241,41 +8042,41 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char av_malloc ();
 int
-main ()
+main (void)
 {
 return av_malloc ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_avutil_av_malloc=yes
-else
+else $as_nop
   ac_cv_lib_avutil_av_malloc=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_av_malloc" >&5
-$as_echo "$ac_cv_lib_avutil_av_malloc" >&6; }
-if test "x$ac_cv_lib_avutil_av_malloc" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_av_malloc" >&5
+printf "%s\n" "$ac_cv_lib_avutil_av_malloc" >&6; }
+if test "x$ac_cv_lib_avutil_av_malloc" = xyes
+then :
   ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVUTIL=1"
 				      ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavutil"
 
 
 fi
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_init in -lavcodec" >&5
-$as_echo_n "checking for avcodec_init in -lavcodec... " >&6; }
-if ${ac_cv_lib_avcodec_avcodec_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avcodec_init in -lavcodec" >&5
+printf %s "checking for avcodec_init in -lavcodec... " >&6; }
+if test ${ac_cv_lib_avcodec_avcodec_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lavcodec -lavutil
 				      $LIBS"
@@ -7284,41 +8085,41 @@
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
+   builtin and then its argument prototype would still apply.  */
 char avcodec_init ();
 int
-main ()
+main (void)
 {
 return avcodec_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_avcodec_avcodec_init=yes
-else
+else $as_nop
   ac_cv_lib_avcodec_avcodec_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_init" >&5
-$as_echo "$ac_cv_lib_avcodec_avcodec_init" >&6; }
-if test "x$ac_cv_lib_avcodec_avcodec_init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_init" >&5
+printf "%s\n" "$ac_cv_lib_avcodec_avcodec_init" >&6; }
+if test "x$ac_cv_lib_avcodec_avcodec_init" = xyes
+then :
   ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCODEC=1"
 				      ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavcodec"
 
 fi
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_register_all in -lavformat" >&5
-$as_echo_n "checking for av_register_all in -lavformat... " >&6; }
-if ${ac_cv_lib_avformat_av_register_all+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for av_register_all in -lavformat" >&5
+printf %s "checking for av_register_all in -lavformat... " >&6; }
+if test ${ac_cv_lib_avformat_av_register_all+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lavformat -lavcodec -lavutil
 				      $LIBS"
@@ -7328,40 +8129,40 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char av_register_all ();
 int
-main ()
+main (void)
 {
 return av_register_all ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_avformat_av_register_all=yes
-else
+else $as_nop
   ac_cv_lib_avformat_av_register_all=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_register_all" >&5
-$as_echo "$ac_cv_lib_avformat_av_register_all" >&6; }
-if test "x$ac_cv_lib_avformat_av_register_all" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_register_all" >&5
+printf "%s\n" "$ac_cv_lib_avformat_av_register_all" >&6; }
+if test "x$ac_cv_lib_avformat_av_register_all" = xyes
+then :
   ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVFORMAT=1"
 				      ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavformat"
 
 fi
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sws_scale in -lswscale" >&5
-$as_echo_n "checking for sws_scale in -lswscale... " >&6; }
-if ${ac_cv_lib_swscale_sws_scale+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sws_scale in -lswscale" >&5
+printf %s "checking for sws_scale in -lswscale... " >&6; }
+if test ${ac_cv_lib_swscale_sws_scale+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lswscale -lavutil
 				      $LIBS"
@@ -7371,40 +8172,40 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sws_scale ();
 int
-main ()
+main (void)
 {
 return sws_scale ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_swscale_sws_scale=yes
-else
+else $as_nop
   ac_cv_lib_swscale_sws_scale=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_swscale_sws_scale" >&5
-$as_echo "$ac_cv_lib_swscale_sws_scale" >&6; }
-if test "x$ac_cv_lib_swscale_sws_scale" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_swscale_sws_scale" >&5
+printf "%s\n" "$ac_cv_lib_swscale_sws_scale" >&6; }
+if test "x$ac_cv_lib_swscale_sws_scale" = xyes
+then :
   ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBSWSCALE=1"
 				      ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lswscale"
 
 fi
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcore_version in -lavcore" >&5
-$as_echo_n "checking for avcore_version in -lavcore... " >&6; }
-if ${ac_cv_lib_avcore_avcore_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for avcore_version in -lavcore" >&5
+printf %s "checking for avcore_version in -lavcore... " >&6; }
+if test ${ac_cv_lib_avcore_avcore_version+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lavcore  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7413,30 +8214,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char avcore_version ();
 int
-main ()
+main (void)
 {
 return avcore_version ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_avcore_avcore_version=yes
-else
+else $as_nop
   ac_cv_lib_avcore_avcore_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcore_avcore_version" >&5
-$as_echo "$ac_cv_lib_avcore_avcore_version" >&6; }
-if test "x$ac_cv_lib_avcore_avcore_version" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcore_avcore_version" >&5
+printf "%s\n" "$ac_cv_lib_avcore_avcore_version" >&6; }
+if test "x$ac_cv_lib_avcore_avcore_version" = xyes
+then :
   ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_HAS_LIBAVCORE=1"
 				      ac_ffmpeg_ldflags="$ac_ffmpeg_ldflags -lavcore"
 
@@ -7449,14 +8249,13 @@
 		ac_fn_c_check_type "$LINENO" "enum AVPixelFormat" "ac_cv_type_enum_AVPixelFormat" "#include <libavformat/avformat.h>
 
 "
-if test "x$ac_cv_type_enum_AVPixelFormat" = xyes; then :
+if test "x$ac_cv_type_enum_AVPixelFormat" = xyes
+then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ENUM_AVPIXELFORMAT 1
-_ACEOF
+printf "%s\n" "#define HAVE_ENUM_AVPIXELFORMAT 1" >>confdefs.h
 
 
-else
+else $as_nop
   ac_ffmpeg_cflags="$ac_ffmpeg_cflags -DPJMEDIA_USE_OLD_FFMPEG=1"
 fi
 
@@ -7469,22 +8268,24 @@
 
 
 # Check whether --enable-v4l2 was given.
-if test "${enable_v4l2+set}" = set; then :
+if test ${enable_v4l2+y}
+then :
   enableval=$enable_v4l2;
 		if test "$enable_v4l2" = "no"; then
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if V4L2 is disabled... yes" >&5
-$as_echo "Checking if V4L2 is disabled... yes" >&6; }
+		  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if V4L2 is disabled... yes" >&5
+printf "%s\n" "Checking if V4L2 is disabled... yes" >&6; }
 		fi
 
-else
+else $as_nop
 
 
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for v4l2_open in -lv4l2" >&5
-$as_echo_n "checking for v4l2_open in -lv4l2... " >&6; }
-if ${ac_cv_lib_v4l2_v4l2_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for v4l2_open in -lv4l2" >&5
+printf %s "checking for v4l2_open in -lv4l2... " >&6; }
+if test ${ac_cv_lib_v4l2_v4l2_open+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lv4l2  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7493,30 +8294,29 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char v4l2_open ();
 int
-main ()
+main (void)
 {
 return v4l2_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_v4l2_v4l2_open=yes
-else
+else $as_nop
   ac_cv_lib_v4l2_v4l2_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_v4l2_v4l2_open" >&5
-$as_echo "$ac_cv_lib_v4l2_v4l2_open" >&6; }
-if test "x$ac_cv_lib_v4l2_v4l2_open" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_v4l2_v4l2_open" >&5
+printf "%s\n" "$ac_cv_lib_v4l2_v4l2_open" >&6; }
+if test "x$ac_cv_lib_v4l2_v4l2_open" = xyes
+then :
   ac_v4l2_cflags="-DPJMEDIA_VIDEO_DEV_HAS_V4L2=1"
 			      ac_v4l2_ldflags="-lv4l2"
 			      LIBS="$LIBS -lv4l2"
@@ -7530,9 +8330,10 @@
 
 
 # Check whether --with-openh264 was given.
-if test "${with_openh264+set}" = set; then :
+if test ${with_openh264+y}
+then :
   withval=$with_openh264;
-else
+else $as_nop
   with_openh264=no
 
 fi
@@ -7545,28 +8346,29 @@
 
 
 # Check whether --enable-openh264 was given.
-if test "${enable_openh264+set}" = set; then :
+if test ${enable_openh264+y}
+then :
   enableval=$enable_openh264;
 		if test "$enable_openh264" = "no"; then
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenH264 is disabled... yes" >&5
-$as_echo "Checking if OpenH264 is disabled... yes" >&6; }
+		  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenH264 is disabled... yes" >&5
+printf "%s\n" "Checking if OpenH264 is disabled... yes" >&6; }
 		fi
 
-else
+else $as_nop
 
 		  if test "x$with_openh264" != "xno" -a "x$with_openh264" != "x"; then
 		        OPENH264_PREFIX=$with_openh264
 		  	OPENH264_CFLAGS="-I$OPENH264_PREFIX/include"
 			OPENH264_LDFLAGS="-L$OPENH264_PREFIX/lib"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using OpenH264 prefix... $with_openh264" >&5
-$as_echo "Using OpenH264 prefix... $with_openh264" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using OpenH264 prefix... $with_openh264" >&5
+printf "%s\n" "Using OpenH264 prefix... $with_openh264" >&6; }
 		  else
 		  	OPENH264_CFLAGS=""
 			OPENH264_LDFLAGS=""
 		  fi
 
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH264 usability" >&5
-$as_echo_n "checking OpenH264 usability... " >&6; }
+		  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OpenH264 usability" >&5
+printf %s "checking OpenH264 usability... " >&6; }
 
 		  OPENH264_LIBS="-lopenh264 -lstdc++"
 
@@ -7584,7 +8386,7 @@
 		                                    #include <wels/codec_app_def.h>
 
 int
-main ()
+main (void)
 {
 WelsCreateSVCEncoder(0);
 
@@ -7592,22 +8394,23 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
    ac_openh264_cflags="-DPJMEDIA_HAS_OPENH264_CODEC=1 $OPENH264_CFLAGS"
 		  		   ac_openh264_ldflags="$OPENH264_LDFLAGS $OPENH264_LIBS"
-		  		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+		  		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
 				   LIBS="$SAVED_LIBS"
 				   LDFLAGS="$SAVED_LDFLAGS"
 				   CFLAGS="$SAVED_CFLAGS"
-		  		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		  		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
@@ -7616,9 +8419,10 @@
 
 
 # Check whether --with-vpx was given.
-if test "${with_vpx+set}" = set; then :
+if test ${with_vpx+y}
+then :
   withval=$with_vpx;
-else
+else $as_nop
   with_vpx=no
 
 fi
@@ -7631,28 +8435,29 @@
 
 
 # Check whether --enable-vpx was given.
-if test "${enable_vpx+set}" = set; then :
+if test ${enable_vpx+y}
+then :
   enableval=$enable_vpx;
 		if test "$enable_vpx" = "no"; then
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if VPX is disabled... yes" >&5
-$as_echo "Checking if VPX is disabled... yes" >&6; }
+		  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if VPX is disabled... yes" >&5
+printf "%s\n" "Checking if VPX is disabled... yes" >&6; }
 		fi
 
-else
+else $as_nop
 
 		  if test "x$with_vpx" != "xno" -a "x$with_vpx" != "x"; then
 		        VPX_PREFIX=$with_vpx
 		  	VPX_CFLAGS="-I$VPX_PREFIX/include"
 			VPX_LDFLAGS="-L$VPX_PREFIX/lib"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using VPX prefix... $with_vpx" >&5
-$as_echo "Using VPX prefix... $with_vpx" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using VPX prefix... $with_vpx" >&5
+printf "%s\n" "Using VPX prefix... $with_vpx" >&6; }
 		  else
 		  	VPX_CFLAGS=""
 			VPX_LDFLAGS=""
 		  fi
 
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: checking VPX usability" >&5
-$as_echo_n "checking VPX usability... " >&6; }
+		  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking VPX usability" >&5
+printf %s "checking VPX usability... " >&6; }
 
 		  VPX_LIBS="-lvpx"
 
@@ -7670,7 +8475,7 @@
 						    #include <vpx/vp8cx.h>
 
 int
-main ()
+main (void)
 {
 vpx_codec_iface_t *(*enc_if)() = &vpx_codec_vp8_cx;
 
@@ -7678,22 +8483,23 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
    ac_vpx_cflags="-DPJMEDIA_HAS_VPX_CODEC=1 $VPX_CFLAGS"
 		  		   ac_vpx_ldflags="$VPX_LDFLAGS $VPX_LIBS"
-		  		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+		  		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
 				   LIBS="$SAVED_LIBS"
 				   LDFLAGS="$SAVED_LDFLAGS"
 				   CFLAGS="$SAVED_CFLAGS"
-		  		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		  		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
@@ -7702,9 +8508,10 @@
 
 
 # Check whether --enable-ipp was given.
-if test "${enable_ipp+set}" = set; then :
+if test ${enable_ipp+y}
+then :
   enableval=$enable_ipp;
-else
+else $as_nop
   enable_ipp=no
 
 fi
@@ -7712,9 +8519,10 @@
 
 
 # Check whether --with-ipp was given.
-if test "${with_ipp+set}" = set; then :
+if test ${with_ipp+y}
+then :
   withval=$with_ipp;
-else
+else $as_nop
   with_ipp=no
 
 fi
@@ -7722,9 +8530,10 @@
 
 
 # Check whether --with-ipp-samples was given.
-if test "${with_ipp_samples+set}" = set; then :
+if test ${with_ipp_samples+y}
+then :
   withval=$with_ipp_samples;
-else
+else $as_nop
   with_ipp_samples=no
 
 fi
@@ -7732,41 +8541,42 @@
 
 
 # Check whether --with-ipp-arch was given.
-if test "${with_ipp_arch+set}" = set; then :
+if test ${with_ipp_arch+y}
+then :
   withval=$with_ipp_arch;
-else
+else $as_nop
   with_ipp_arch=no
 
 fi
 
 
 if test "x$enable_ipp" != "xno"; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking Intel IPP location" >&5
-$as_echo_n "checking Intel IPP location... " >&6; }
+                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Intel IPP location" >&5
+printf %s "checking Intel IPP location... " >&6; }
 
     if test "x$with_ipp" != "xno" -a "x$with_ipp" != "x"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ipp" >&5
-$as_echo "$with_ipp" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ipp" >&5
+printf "%s\n" "$with_ipp" >&6; }
 	IPPROOT=$with_ipp
     elif test "x$IPPROOT" = "x"; then
 	if test -d /opt/intel/ipp; then
 	    IPPROOT=`ls -d /opt/intel/ipp/*/* | head -1`
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: autodetected in $IPPROOT" >&5
-$as_echo "autodetected in $IPPROOT" >&6; }
+	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: autodetected in $IPPROOT" >&5
+printf "%s\n" "autodetected in $IPPROOT" >&6; }
 	fi
     else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPPROOT" >&5
-$as_echo "$IPPROOT" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IPPROOT" >&5
+printf "%s\n" "$IPPROOT" >&6; }
     fi
 
     if test "x$with_ipp_arch" != "xno"; then
 	IPP_SUFFIX=$with_ipp_arch
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: IPP arch suffix is set to $IPP_SUFFIX" >&5
-$as_echo "IPP arch suffix is set to $IPP_SUFFIX" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IPP arch suffix is set to $IPP_SUFFIX" >&5
+printf "%s\n" "IPP arch suffix is set to $IPP_SUFFIX" >&6; }
     else
 	IPP_SUFFIX=""
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: IPP arch suffix is set to empty" >&5
-$as_echo "IPP arch suffix is set to empty" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: IPP arch suffix is set to empty" >&5
+printf "%s\n" "IPP arch suffix is set to empty" >&6; }
     fi
 
     if test x$IPPROOT = x; then
@@ -7829,30 +8639,31 @@
 	LIBS="$IPP_LIBS $LIBS"
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Intel IPP usability" >&5
-$as_echo_n "checking Intel IPP usability... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Intel IPP usability" >&5
+printf %s "checking Intel IPP usability... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ippcore.h>
 
 int
-main ()
+main (void)
 {
 ippStaticInit();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info
 See \`config.log' for more details" "$LINENO" 5; }
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 	CFLAGS="$SAVED_CFLAGS"
@@ -7860,22 +8671,22 @@
 	LIBS="$SAVED_LIBS"
     fi
 
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking Intel IPP samples location" >&5
-$as_echo_n "checking Intel IPP samples location... " >&6; }
+                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Intel IPP samples location" >&5
+printf %s "checking Intel IPP samples location... " >&6; }
 
     if test "x$with_ipp_samples" != "xno" -a "x$with_ipp_samples" != "x"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ipp_samples" >&5
-$as_echo "$with_ipp_samples" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_ipp_samples" >&5
+printf "%s\n" "$with_ipp_samples" >&6; }
 	IPPSAMPLES=$with_ipp_samples
     elif test "x$IPPSAMPLES" = "x"; then
 	if test -d /opt/intel/ipp-samples; then
 	    IPPSAMPLES=/opt/intel/ipp-samples
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: autodetected in $IPPSAMPLES" >&5
-$as_echo "autodetected in $IPPSAMPLES" >&6; }
+	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: autodetected in $IPPSAMPLES" >&5
+printf "%s\n" "autodetected in $IPPSAMPLES" >&6; }
 	fi
     else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPPSAMPLES" >&5
-$as_echo "$IPPSAMPLES" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IPPSAMPLES" >&5
+printf "%s\n" "$IPPSAMPLES" >&6; }
     fi
 
     if test x$IPPSAMPLES = x; then
@@ -7889,8 +8700,8 @@
 	IPPSAMPLES=`echo $IPPSAMPLES | sed 's/\/$//'`
 
 	# Guess the libusc.a/libspeech.a build location
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Intel IPP USC build location" >&5
-$as_echo_n "checking Intel IPP USC build location... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Intel IPP USC build location" >&5
+printf %s "checking Intel IPP USC build location... " >&6; }
 	if test -d $IPPSAMPLES/speech-codecs/bin; then
 	    IPPVER=5
 	    IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/bin/*gcc*/lib | head -1`
@@ -7903,22 +8714,22 @@
 		# icc compiler
 	    	IPPSAMP_DIR=`ls -d $IPPSAMPLES/speech-codecs/_bin/*icc*/lib | head -1`
 	    else
-		{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+		{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "Unable to find to find built binaries under $IPPSAMPLES/speech-codecs/{bin,_bin}. Have you built the IPP samples?
 See \`config.log' for more details" "$LINENO" 5; }
 	    fi
 	else
-	    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+	    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "unable to find $IPPSAMPLES/speech-codecs/bin/*gcc*/lib or $IPPSAMPLES/speech-codecs/_bin/*gcc*/lib directory. Have you built the samples?
 See \`config.log' for more details" "$LINENO" 5; }
 	fi
 
 	# Test the directory
 	if test ! -d $IPPSAMP_DIR; then
-	    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+	    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "There's something wrong with this script, directory $IPPSAMP_DIR does not exist
 See \`config.log' for more details" "$LINENO" 5; }
 	    exit 1;
@@ -7931,21 +8742,21 @@
 	    IPPSAMP_LIBS="libspeech.a"
 	    IPPSAMP_LDLIBS="-lspeech"
 	else
-	    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+	    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "bug in this script: unsupported IPP version
 See \`config.log' for more details" "$LINENO" 5; }
 	fi
 
 	if test ! -f $IPPSAMP_DIR/$IPPSAMP_LIBS; then
-	    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+	    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "$IPPSAMP_LIBS doesn't exist in $IPPSAMP_DIR
 See \`config.log' for more details" "$LINENO" 5; }
 	fi
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPPSAMP_DIR" >&5
-$as_echo "$IPPSAMP_DIR" >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IPPSAMP_DIR" >&5
+printf "%s\n" "$IPPSAMP_DIR" >&6; }
 
 	SAVED_CFLAGS="$CFLAGS"
 	SAVED_LDFLAGS="$LDFLAGS"
@@ -7956,30 +8767,31 @@
 	LDFLAGS="$LDFLAGS -L$IPPSAMP_DIR"
 	LIBS="$IPPSAMP_LDLIBS $LIBS"
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Intel IPP USC usability" >&5
-$as_echo_n "checking Intel IPP USC usability... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Intel IPP USC usability" >&5
+printf %s "checking Intel IPP USC usability... " >&6; }
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <usc.h>
 
 int
-main ()
+main (void)
 {
 extern USC_Fxns USC_G729AFP_Fxns;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+if ac_fn_c_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no
 See \`config.log' for more details" "$LINENO" 5; }
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 	CFLAGS="$SAVED_CFLAGS"
@@ -8000,17 +8812,86 @@
 export IPP_LDFLAGS=$IPP_LDFLAGS\n\
 export IPP_LIBS=$IPP_LIBS"
 else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Skipping Intel IPP settings (not wanted)" >&5
-$as_echo "Skipping Intel IPP settings (not wanted)" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Skipping Intel IPP settings (not wanted)" >&5
+printf "%s\n" "Skipping Intel IPP settings (not wanted)" >&6; }
+fi
+
+
+
+# Check whether --enable-android-mediacodec was given.
+if test ${enable_android_mediacodec+y}
+then :
+  enableval=$enable_android_mediacodec; if test "$enable_android_mediacodec" = "no"; then
+	     ac_no_mediacodec=1
+		 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Android MediaCodec support is disabled... yes" >&5
+printf "%s\n" "Checking if Android MediaCodec support is disabled... yes" >&6; }
+	        fi
+else $as_nop
+
+		case $target in
+        *android*)
+	      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for AMediaCodec_createDecoderByType in -lmediandk" >&5
+printf %s "checking for AMediaCodec_createDecoderByType in -lmediandk... " >&6; }
+if test ${ac_cv_lib_mediandk_AMediaCodec_createDecoderByType+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmediandk  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+char AMediaCodec_createDecoderByType ();
+int
+main (void)
+{
+return AMediaCodec_createDecoderByType ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_mediandk_AMediaCodec_createDecoderByType=yes
+else $as_nop
+  ac_cv_lib_mediandk_AMediaCodec_createDecoderByType=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mediandk_AMediaCodec_createDecoderByType" >&5
+printf "%s\n" "$ac_cv_lib_mediandk_AMediaCodec_createDecoderByType" >&6; }
+if test "x$ac_cv_lib_mediandk_AMediaCodec_createDecoderByType" = xyes
+then :
+  ac_pjmedia_has_amediacodec=1 && LIBS="-lmediandk $LIBS"
+fi
+
+	      if test "x$ac_pjmedia_has_amediacodec" = "x1"; then
+		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Android AMediaCodec library is available... yes" >&5
+printf "%s\n" "Checking if Android AMediaCodec library is available... yes" >&6; }
+		    printf "%s\n" "#define PJMEDIA_HAS_ANDROID_MEDIACODEC 1" >>confdefs.h
+
+	      else
+		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Android AMediaCodec library is available... no" >&5
+printf "%s\n" "Checking if Android AMediaCodec library is available... no" >&6; }
+	      fi
+		  ;;
+		esac
+
 fi
 
 
 
 
 # Check whether --with-ssl was given.
-if test "${with_ssl+set}" = set; then :
+if test ${with_ssl+y}
+then :
   withval=$with_ssl;
-else
+else $as_nop
   with_ssl=no
 
 fi
@@ -8018,9 +8899,10 @@
 
 
 # Check whether --with-gnutls was given.
-if test "${with_gnutls+set}" = set; then :
+if test ${with_gnutls+y}
+then :
   withval=$with_gnutls;
-else
+else $as_nop
   with_gnutls=no
 
 fi
@@ -8036,12 +8918,13 @@
 
 
 # Check whether --enable-darwin-ssl was given.
-if test "${enable_darwin_ssl+set}" = set; then :
+if test ${enable_darwin_ssl+y}
+then :
   enableval=$enable_darwin_ssl; if test "$enable_darwin_ssl" = "no"; then
-		 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if Darwin SSL support is disabled... yes" >&5
-$as_echo "Checking if Darwin SSL support is disabled... yes" >&6; }
+		 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Darwin SSL support is disabled... yes" >&5
+printf "%s\n" "Checking if Darwin SSL support is disabled... yes" >&6; }
 	        fi
-else
+else $as_nop
 
 		case $target in
 	  	*darwin*)
@@ -8053,7 +8936,7 @@
 /* end confdefs.h.  */
 #include <Security/SecureTransport.h>
 int
-main ()
+main (void)
 {
 if (__builtin_available(macOS 10.12, iOS 10.0, *)) {
 			     SSLContextRef ssl_ctx;
@@ -8063,23 +8946,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_ssl_backend=darwin
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 		    CFLAGS="$SAVED_CFLAGS"
 		    LIBS="$SAVED_LIBS"
 	            if test "x$ac_ssl_backend" = "xdarwin"; then
-		        $as_echo "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h
+		        printf "%s\n" "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h
 
-		        $as_echo "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_DARWIN" >>confdefs.h
+		        printf "%s\n" "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_DARWIN" >>confdefs.h
 
 		        LIBS="$LIBS -framework Security"
-	  	        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if Darwin SSL is available... yes" >&5
-$as_echo "Checking if Darwin SSL is available... yes" >&6; }
+	  	        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Darwin SSL is available... yes" >&5
+printf "%s\n" "Checking if Darwin SSL is available... yes" >&6; }
 	            else
-	                { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if Darwin SSL is available... no" >&5
-$as_echo "Checking if Darwin SSL is available... no" >&6; }
+	                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if Darwin SSL is available... no" >&5
+printf "%s\n" "Checking if Darwin SSL is available... no" >&6; }
 		    fi
 		    ;;
 		esac
@@ -8088,43 +8972,45 @@
 
 
 # Check whether --enable-ssl was given.
-if test "${enable_ssl+set}" = set; then :
+if test ${enable_ssl+y}
+then :
   enableval=$enable_ssl;
 		if test "$enable_ssl" = "no"; then
 		 ac_no_ssl=1
-		 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if SSL support is disabled... yes" >&5
-$as_echo "Checking if SSL support is disabled... yes" >&6; }
+		 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if SSL support is disabled... yes" >&5
+printf "%s\n" "Checking if SSL support is disabled... yes" >&6; }
 	        fi
 
-else
+else $as_nop
 
 	        if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
                     CFLAGS="$CFLAGS -I$with_ssl/include"
                     CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
                     LDFLAGS="$LDFLAGS -L$with_ssl/lib"
-                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5
-$as_echo "Using SSL prefix... $with_ssl" >&6; }
+                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5
+printf "%s\n" "Using SSL prefix... $with_ssl" >&6; }
                 fi
 
 	        if test "x$with_gnutls" = "xno"; then
 		    # We still need to check for OpenSSL installations even if
 		    # we find Darwin SSL above since DTLS requires OpenSSL.
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for OpenSSL installations.." >&5
-$as_echo "checking for OpenSSL installations.." >&6; }
+		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for OpenSSL installations.." >&5
+printf "%s\n" "checking for OpenSSL installations.." >&6; }
 
 
 
-		    ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
+		    ac_fn_c_check_header_compile "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_ssl_h" = xyes
+then :
   openssl_h_present=1
 fi
 
-
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ERR_load_BIO_strings in -lcrypto" >&5
-$as_echo_n "checking for ERR_load_BIO_strings in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_ERR_load_BIO_strings+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ERR_load_BIO_strings in -lcrypto" >&5
+printf %s "checking for ERR_load_BIO_strings in -lcrypto... " >&6; }
+if test ${ac_cv_lib_crypto_ERR_load_BIO_strings+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8133,38 +9019,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char ERR_load_BIO_strings ();
 int
-main ()
+main (void)
 {
 return ERR_load_BIO_strings ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_crypto_ERR_load_BIO_strings=yes
-else
+else $as_nop
   ac_cv_lib_crypto_ERR_load_BIO_strings=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_ERR_load_BIO_strings" >&5
-$as_echo "$ac_cv_lib_crypto_ERR_load_BIO_strings" >&6; }
-if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_ERR_load_BIO_strings" >&5
+printf "%s\n" "$ac_cv_lib_crypto_ERR_load_BIO_strings" >&6; }
+if test "x$ac_cv_lib_crypto_ERR_load_BIO_strings" = xyes
+then :
   libcrypto_present=1 && LIBS="-lcrypto $LIBS"
 fi
 
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5
-$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; }
-if ${ac_cv_lib_ssl_SSL_CTX_new+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_new in -lssl" >&5
+printf %s "checking for SSL_CTX_new in -lssl... " >&6; }
+if test ${ac_cv_lib_ssl_SSL_CTX_new+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8173,36 +9059,35 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char SSL_CTX_new ();
 int
-main ()
+main (void)
 {
 return SSL_CTX_new ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_ssl_SSL_CTX_new=yes
-else
+else $as_nop
   ac_cv_lib_ssl_SSL_CTX_new=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
-$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
-if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
+printf "%s\n" "$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_CTX_new" = xyes
+then :
   libssl_present=1 && LIBS="-lssl $LIBS"
 fi
 
 		    if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
-	        	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL library found, SSL support enabled" >&5
-$as_echo "OpenSSL library found, SSL support enabled" >&6; }
+	        	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenSSL library found, SSL support enabled" >&5
+printf "%s\n" "OpenSSL library found, SSL support enabled" >&6; }
 
 			# Check if SRTP should be compiled with OpenSSL
 			# support, to enable cryptos such as AES GCM.
@@ -8214,19 +9099,21 @@
 /* end confdefs.h.  */
 #include <openssl/evp.h>
 int
-main ()
+main (void)
 {
 EVP_CIPHER_CTX *ctx;EVP_aes_128_gcm();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_aes_128_gcm in -lcrypto" >&5
-$as_echo_n "checking for EVP_aes_128_gcm in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_EVP_aes_128_gcm+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if ac_fn_c_try_compile "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for EVP_aes_128_gcm in -lcrypto" >&5
+printf %s "checking for EVP_aes_128_gcm in -lcrypto... " >&6; }
+if test ${ac_cv_lib_crypto_EVP_aes_128_gcm+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8235,55 +9122,54 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char EVP_aes_128_gcm ();
 int
-main ()
+main (void)
 {
 return EVP_aes_128_gcm ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_crypto_EVP_aes_128_gcm=yes
-else
+else $as_nop
   ac_cv_lib_crypto_EVP_aes_128_gcm=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_aes_128_gcm" >&5
-$as_echo "$ac_cv_lib_crypto_EVP_aes_128_gcm" >&6; }
-if test "x$ac_cv_lib_crypto_EVP_aes_128_gcm" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_aes_128_gcm" >&5
+printf "%s\n" "$ac_cv_lib_crypto_EVP_aes_128_gcm" >&6; }
+if test "x$ac_cv_lib_crypto_EVP_aes_128_gcm" = xyes
+then :
   ac_ssl_has_aes_gcm=1
 fi
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 			if test "x$ac_ssl_has_aes_gcm" = "x1"; then
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL has AES GCM support, SRTP will use OpenSSL" >&5
-$as_echo "OpenSSL has AES GCM support, SRTP will use OpenSSL" >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenSSL has AES GCM support, SRTP will use OpenSSL" >&5
+printf "%s\n" "OpenSSL has AES GCM support, SRTP will use OpenSSL" >&6; }
 			else
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos" >&5
-$as_echo "OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos" >&6; }
+				{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos" >&5
+printf "%s\n" "OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos" >&6; }
 			fi
 
     		        if test "x$ac_ssl_backend" = "x"; then
 			    # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK
 			    #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1)
-			    $as_echo "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h
+			    printf "%s\n" "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h
 
-			    $as_echo "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_OPENSSL" >>confdefs.h
+			    printf "%s\n" "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_OPENSSL" >>confdefs.h
 
 			    ac_ssl_backend="openssl"
 			fi
 		    else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ** OpenSSL libraries not found **" >&5
-$as_echo "** OpenSSL libraries not found **" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** OpenSSL libraries not found **" >&5
+printf "%s\n" "** OpenSSL libraries not found **" >&6; }
 		    fi
 
 		fi
@@ -8293,19 +9179,20 @@
 		    if test "x$with_gnutls" != "xno" -a "x$with_gnutls" != "x"; then
         	        CFLAGS="$CFLAGS -I$with_gnutls/include"
         	        LDFLAGS="$LDFLAGS -L$with_gnutls/lib"
-        	        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using GnuTLS prefix... $with_gnutls" >&5
-$as_echo "Using GnuTLS prefix... $with_gnutls" >&6; }
+        	        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using GnuTLS prefix... $with_gnutls" >&5
+printf "%s\n" "Using GnuTLS prefix... $with_gnutls" >&6; }
     		    fi
 
         	    for ac_prog in $host-pkg-config pkg-config "python pkgconfig.py"
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$PKG_CONFIG"; then
   ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
 else
@@ -8313,11 +9200,15 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_PKG_CONFIG="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8328,11 +9219,11 @@
 fi
 PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -8340,27 +9231,28 @@
 done
 test -n "$PKG_CONFIG" || PKG_CONFIG="none"
 
-        	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for GnuTLS installations.." >&5
-$as_echo "checking for GnuTLS installations.." >&6; }
+        	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for GnuTLS installations.." >&5
+printf "%s\n" "checking for GnuTLS installations.." >&6; }
 
 
-        	    ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
-if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then :
+        	    ac_fn_c_check_header_compile "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
+if test "x$ac_cv_header_gnutls_gnutls_h" = xyes
+then :
   gnutls_h_present=1
 fi
 
 
-
         	    if test "$PKG_CONFIG" != "none"; then
             	    	if $PKG_CONFIG --exists gnutls; then
                 	    LIBS="$LIBS `$PKG_CONFIG --libs gnutls`"
                 	    libgnutls_present=1
             		else
-                	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_certificate_set_x509_system_trust in -lgnutls" >&5
-$as_echo_n "checking for gnutls_certificate_set_x509_system_trust in -lgnutls... " >&6; }
-if ${ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+                	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gnutls_certificate_set_x509_system_trust in -lgnutls" >&5
+printf %s "checking for gnutls_certificate_set_x509_system_trust in -lgnutls... " >&6; }
+if test ${ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8369,51 +9261,50 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char gnutls_certificate_set_x509_system_trust ();
 int
-main ()
+main (void)
 {
 return gnutls_certificate_set_x509_system_trust ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust=yes
-else
+else $as_nop
   ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust" >&5
-$as_echo "$ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust" >&6; }
-if test "x$ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust" >&5
+printf "%s\n" "$ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust" >&6; }
+if test "x$ac_cv_lib_gnutls_gnutls_certificate_set_x509_system_trust" = xyes
+then :
   libgnutls_present=1 &&
                               LIBS="$LIBS -lgnutls"
 fi
 
             		fi
         	    else
-            		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** Warning: neither pkg-config nor python is available, disabling gnutls. ***" >&5
-$as_echo "*** Warning: neither pkg-config nor python is available, disabling gnutls. ***" >&6; }
+            		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: *** Warning: neither pkg-config nor python is available, disabling gnutls. ***" >&5
+printf "%s\n" "*** Warning: neither pkg-config nor python is available, disabling gnutls. ***" >&6; }
         	    fi
 
         	    if test "x$gnutls_h_present" = "x1" -a "x$libgnutls_present" = "x1"; then
-           		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: GnuTLS library found, SSL support enabled" >&5
-$as_echo "GnuTLS library found, SSL support enabled" >&6; }
-			$as_echo "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h
+           		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GnuTLS library found, SSL support enabled" >&5
+printf "%s\n" "GnuTLS library found, SSL support enabled" >&6; }
+			printf "%s\n" "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h
 
-			$as_echo "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_GNUTLS" >>confdefs.h
+			printf "%s\n" "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_GNUTLS" >>confdefs.h
 
             		ac_ssl_backend="gnutls"
         	    else
-            		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ** No GnuTLS libraries found, disabling SSL support **" >&5
-$as_echo "** No GnuTLS libraries found, disabling SSL support **" >&6; }
+            		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** No GnuTLS libraries found, disabling SSL support **" >&5
+printf "%s\n" "** No GnuTLS libraries found, disabling SSL support **" >&6; }
         	    fi
 
         	fi
@@ -8423,9 +9314,10 @@
 
 
 # Check whether --with-opencore-amrnb was given.
-if test "${with_opencore_amrnb+set}" = set; then :
+if test ${with_opencore_amrnb+y}
+then :
   withval=$with_opencore_amrnb; as_fn_error $? "This option is obsolete and replaced by --with-opencore-amr=DIR" "$LINENO" 5
-else
+else $as_nop
   true;
 
 fi
@@ -8433,9 +9325,10 @@
 
 
 # Check whether --with-opencore-amr was given.
-if test "${with_opencore_amr+set}" = set; then :
+if test ${with_opencore_amr+y}
+then :
   withval=$with_opencore_amr;
-else
+else $as_nop
   with_opencore_amr=no
 
 fi
@@ -8447,9 +9340,10 @@
 
 
 # Check whether --with-opencore-amrwbenc was given.
-if test "${with_opencore_amrwbenc+set}" = set; then :
+if test ${with_opencore_amrwbenc+y}
+then :
   withval=$with_opencore_amrwbenc;
-else
+else $as_nop
   with_opencore_amrwbenc=no
 
 fi
@@ -8463,50 +9357,52 @@
 
 
 # Check whether --enable-opencore_amr was given.
-if test "${enable_opencore_amr+set}" = set; then :
+if test ${enable_opencore_amr+y}
+then :
   enableval=$enable_opencore_amr;
 		if test "$enable_opencore_amr" = "no"; then
 		 ac_no_opencore_amrnb=1
 		 ac_no_opencore_amrwb=1
-		 $as_echo "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 0" >>confdefs.h
+		 printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 0" >>confdefs.h
 
-		 $as_echo "#define PJMEDIA_HAS_OPENCORE_AMRWB_CODEC 0" >>confdefs.h
+		 printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRWB_CODEC 0" >>confdefs.h
 
-		 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenCORE AMR support is disabled... yes" >&5
-$as_echo "Checking if OpenCORE AMR support is disabled... yes" >&6; }
+		 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OpenCORE AMR support is disabled... yes" >&5
+printf "%s\n" "Checking if OpenCORE AMR support is disabled... yes" >&6; }
 	        fi
 
-else
+else $as_nop
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for OpenCORE AMR installations.." >&5
-$as_echo "checking for OpenCORE AMR installations.." >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for OpenCORE AMR installations.." >&5
+printf "%s\n" "checking for OpenCORE AMR installations.." >&6; }
                 if test "x$with_opencore_amr" != "xno" -a "x$with_opencore_amr" != "x"; then
                     CFLAGS="$CFLAGS -I$with_opencore_amr/include"
                     CPPFLAGS="$CPPFLAGS -I$with_opencore_amr/include"
                     LDFLAGS="$LDFLAGS -L$with_opencore_amr/lib"
-                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using OpenCORE AMR prefix... $with_opencore_amr" >&5
-$as_echo "Using OpenCORE AMR prefix... $with_opencore_amr" >&6; }
+                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using OpenCORE AMR prefix... $with_opencore_amr" >&5
+printf "%s\n" "Using OpenCORE AMR prefix... $with_opencore_amr" >&6; }
                 fi
                 if test "x$with_opencore_amrwbenc" != "xno" -a "x$with_opencore_amrwbenc" != "x"; then
                     CFLAGS="$CFLAGS -I$with_opencore_amrwbenc/include"
                     CPPFLAGS="$CPPFLAGS -I$with_opencore_amrwbenc/include"
                     LDFLAGS="$LDFLAGS -L$with_opencore_amrwbenc/lib"
-                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using OpenCORE AMRWB-enc prefix... $with_opencore_amrwbenc" >&5
-$as_echo "Using OpenCORE AMRWB-enc prefix... $with_opencore_amrwbenc" >&6; }
+                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using OpenCORE AMRWB-enc prefix... $with_opencore_amrwbenc" >&5
+printf "%s\n" "Using OpenCORE AMRWB-enc prefix... $with_opencore_amrwbenc" >&6; }
                 fi
 
 
-		ac_fn_c_check_header_mongrel "$LINENO" "opencore-amrnb/interf_enc.h" "ac_cv_header_opencore_amrnb_interf_enc_h" "$ac_includes_default"
-if test "x$ac_cv_header_opencore_amrnb_interf_enc_h" = xyes; then :
+		ac_fn_c_check_header_compile "$LINENO" "opencore-amrnb/interf_enc.h" "ac_cv_header_opencore_amrnb_interf_enc_h" "$ac_includes_default"
+if test "x$ac_cv_header_opencore_amrnb_interf_enc_h" = xyes
+then :
   opencore_amrnb_h_present=1
 fi
 
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Encoder_Interface_init in -lopencore-amrnb" >&5
-$as_echo_n "checking for Encoder_Interface_init in -lopencore-amrnb... " >&6; }
-if ${ac_cv_lib_opencore_amrnb_Encoder_Interface_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Encoder_Interface_init in -lopencore-amrnb" >&5
+printf %s "checking for Encoder_Interface_init in -lopencore-amrnb... " >&6; }
+if test ${ac_cv_lib_opencore_amrnb_Encoder_Interface_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lopencore-amrnb  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8515,64 +9411,64 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char Encoder_Interface_init ();
 int
-main ()
+main (void)
 {
 return Encoder_Interface_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_opencore_amrnb_Encoder_Interface_init=yes
-else
+else $as_nop
   ac_cv_lib_opencore_amrnb_Encoder_Interface_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opencore_amrnb_Encoder_Interface_init" >&5
-$as_echo "$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" >&6; }
-if test "x$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opencore_amrnb_Encoder_Interface_init" >&5
+printf "%s\n" "$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" >&6; }
+if test "x$ac_cv_lib_opencore_amrnb_Encoder_Interface_init" = xyes
+then :
   opencore_amrnb_present=1 && LIBS="$LIBS -lopencore-amrnb"
 fi
 
 		if test "x$opencore_amrnb_h_present" = "x1" -a "x$opencore_amrnb_present" = "x1"; then
-	        	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenCORE AMR-NB library found, AMR-NB support enabled" >&5
-$as_echo "OpenCORE AMR-NB library found, AMR-NB support enabled" >&6; }
-	        	$as_echo "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 1" >>confdefs.h
+	        	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenCORE AMR-NB library found, AMR-NB support enabled" >&5
+printf "%s\n" "OpenCORE AMR-NB library found, AMR-NB support enabled" >&6; }
+	        	printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 1" >>confdefs.h
 
 		else
 			ac_no_opencore_amrnb=1
-			$as_echo "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 0" >>confdefs.h
+			printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRNB_CODEC 0" >>confdefs.h
 
 		fi
 
 
 
 
-		ac_fn_c_check_header_mongrel "$LINENO" "vo-amrwbenc/enc_if.h" "ac_cv_header_vo_amrwbenc_enc_if_h" "$ac_includes_default"
-if test "x$ac_cv_header_vo_amrwbenc_enc_if_h" = xyes; then :
+		ac_fn_c_check_header_compile "$LINENO" "vo-amrwbenc/enc_if.h" "ac_cv_header_vo_amrwbenc_enc_if_h" "$ac_includes_default"
+if test "x$ac_cv_header_vo_amrwbenc_enc_if_h" = xyes
+then :
   opencore_amrwb_enc_h_present=1
 fi
 
-
-		ac_fn_c_check_header_mongrel "$LINENO" "opencore-amrwb/dec_if.h" "ac_cv_header_opencore_amrwb_dec_if_h" "$ac_includes_default"
-if test "x$ac_cv_header_opencore_amrwb_dec_if_h" = xyes; then :
+		ac_fn_c_check_header_compile "$LINENO" "opencore-amrwb/dec_if.h" "ac_cv_header_opencore_amrwb_dec_if_h" "$ac_includes_default"
+if test "x$ac_cv_header_opencore_amrwb_dec_if_h" = xyes
+then :
   opencore_amrwb_dec_h_present=1
 fi
 
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for D_IF_init in -lopencore-amrwb" >&5
-$as_echo_n "checking for D_IF_init in -lopencore-amrwb... " >&6; }
-if ${ac_cv_lib_opencore_amrwb_D_IF_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for D_IF_init in -lopencore-amrwb" >&5
+printf %s "checking for D_IF_init in -lopencore-amrwb... " >&6; }
+if test ${ac_cv_lib_opencore_amrwb_D_IF_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lopencore-amrwb  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8581,38 +9477,38 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char D_IF_init ();
 int
-main ()
+main (void)
 {
 return D_IF_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_opencore_amrwb_D_IF_init=yes
-else
+else $as_nop
   ac_cv_lib_opencore_amrwb_D_IF_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opencore_amrwb_D_IF_init" >&5
-$as_echo "$ac_cv_lib_opencore_amrwb_D_IF_init" >&6; }
-if test "x$ac_cv_lib_opencore_amrwb_D_IF_init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opencore_amrwb_D_IF_init" >&5
+printf "%s\n" "$ac_cv_lib_opencore_amrwb_D_IF_init" >&6; }
+if test "x$ac_cv_lib_opencore_amrwb_D_IF_init" = xyes
+then :
   opencore_amrwb_dec_present=1 && LIBS="$LIBS -lopencore-amrwb"
 fi
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for E_IF_init in -lvo-amrwbenc" >&5
-$as_echo_n "checking for E_IF_init in -lvo-amrwbenc... " >&6; }
-if ${ac_cv_lib_vo_amrwbenc_E_IF_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for E_IF_init in -lvo-amrwbenc" >&5
+printf %s "checking for E_IF_init in -lvo-amrwbenc... " >&6; }
+if test ${ac_cv_lib_vo_amrwbenc_E_IF_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lvo-amrwbenc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8621,41 +9517,40 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char E_IF_init ();
 int
-main ()
+main (void)
 {
 return E_IF_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_vo_amrwbenc_E_IF_init=yes
-else
+else $as_nop
   ac_cv_lib_vo_amrwbenc_E_IF_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vo_amrwbenc_E_IF_init" >&5
-$as_echo "$ac_cv_lib_vo_amrwbenc_E_IF_init" >&6; }
-if test "x$ac_cv_lib_vo_amrwbenc_E_IF_init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vo_amrwbenc_E_IF_init" >&5
+printf "%s\n" "$ac_cv_lib_vo_amrwbenc_E_IF_init" >&6; }
+if test "x$ac_cv_lib_vo_amrwbenc_E_IF_init" = xyes
+then :
   opencore_amrwb_enc_present=1 && LIBS="$LIBS -lvo-amrwbenc"
 fi
 
 		if test "x$opencore_amrwb_enc_h_present" = "x1" -a "x$opencore_amrwb_dec_h_present" = "x1" -a "x$opencore_amrwb_enc_present" = "x1" -a "x$opencore_amrwb_dec_present" = "x1"; then
-	        	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenCORE AMR-WB library found, AMR-WB support enabled" >&5
-$as_echo "OpenCORE AMR-WB library found, AMR-WB support enabled" >&6; }
-	        	$as_echo "#define PJMEDIA_HAS_OPENCORE_AMRWB_CODEC 1" >>confdefs.h
+	        	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenCORE AMR-WB library found, AMR-WB support enabled" >&5
+printf "%s\n" "OpenCORE AMR-WB library found, AMR-WB support enabled" >&6; }
+	        	printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRWB_CODEC 1" >>confdefs.h
 
 		else
 			ac_no_opencore_amrwb=1
-			$as_echo "#define PJMEDIA_HAS_OPENCORE_AMRWB_CODEC 0" >>confdefs.h
+			printf "%s\n" "#define PJMEDIA_HAS_OPENCORE_AMRWB_CODEC 0" >>confdefs.h
 
 		fi
 
@@ -8665,9 +9560,10 @@
 
 
 # Check whether --with-silk was given.
-if test "${with_silk+set}" = set; then :
+if test ${with_silk+y}
+then :
   withval=$with_silk;
-else
+else $as_nop
   with_silk=no
 
 fi
@@ -8679,40 +9575,42 @@
 
 
 # Check whether --enable-silk was given.
-if test "${enable_silk+set}" = set; then :
+if test ${enable_silk+y}
+then :
   enableval=$enable_silk;
 		if test "$enable_silk" = "no"; then
 		 ac_no_silk=1
-		 $as_echo "#define PJMEDIA_HAS_SILK_CODEC 0" >>confdefs.h
+		 printf "%s\n" "#define PJMEDIA_HAS_SILK_CODEC 0" >>confdefs.h
 
-		 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if SILK support is disabled... yes" >&5
-$as_echo "Checking if SILK support is disabled... yes" >&6; }
+		 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if SILK support is disabled... yes" >&5
+printf "%s\n" "Checking if SILK support is disabled... yes" >&6; }
 	        fi
 
-else
+else $as_nop
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for SILK installations.." >&5
-$as_echo "checking for SILK installations.." >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for SILK installations.." >&5
+printf "%s\n" "checking for SILK installations.." >&6; }
                 if test "x$with_silk" != "xno" -a "x$with_silk" != "x"; then
                     CFLAGS="$CFLAGS -I$with_silk/interface"
                     CPPFLAGS="$CPPFLAGS -I$with_silk/interface"
                     LDFLAGS="$LDFLAGS -L$with_silk"
-                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using SILK prefix... $with_silk" >&5
-$as_echo "Using SILK prefix... $with_silk" >&6; }
+                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using SILK prefix... $with_silk" >&5
+printf "%s\n" "Using SILK prefix... $with_silk" >&6; }
                 fi
 
 
-		ac_fn_c_check_header_mongrel "$LINENO" "SKP_Silk_SDK_API.h" "ac_cv_header_SKP_Silk_SDK_API_h" "$ac_includes_default"
-if test "x$ac_cv_header_SKP_Silk_SDK_API_h" = xyes; then :
+		ac_fn_c_check_header_compile "$LINENO" "SKP_Silk_SDK_API.h" "ac_cv_header_SKP_Silk_SDK_API_h" "$ac_includes_default"
+if test "x$ac_cv_header_SKP_Silk_SDK_API_h" = xyes
+then :
   silk_h_present=1
 fi
 
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SKP_Silk_SDK_get_version in -lSKP_SILK_SDK" >&5
-$as_echo_n "checking for SKP_Silk_SDK_get_version in -lSKP_SILK_SDK... " >&6; }
-if ${ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SKP_Silk_SDK_get_version in -lSKP_SILK_SDK" >&5
+printf %s "checking for SKP_Silk_SDK_get_version in -lSKP_SILK_SDK... " >&6; }
+if test ${ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lSKP_SILK_SDK  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8721,41 +9619,40 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char SKP_Silk_SDK_get_version ();
 int
-main ()
+main (void)
 {
 return SKP_Silk_SDK_get_version ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version=yes
-else
+else $as_nop
   ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" >&5
-$as_echo "$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" >&6; }
-if test "x$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" >&5
+printf "%s\n" "$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" >&6; }
+if test "x$ac_cv_lib_SKP_SILK_SDK_SKP_Silk_SDK_get_version" = xyes
+then :
   silk_present=1 && LIBS="$LIBS -lSKP_SILK_SDK"
 fi
 
 		if test "x$silk_h_present" = "x1" -a "x$silk_present" = "x1"; then
-	        	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: SILK library found, SILK support enabled" >&5
-$as_echo "SILK library found, SILK support enabled" >&6; }
-	        	$as_echo "#define PJMEDIA_HAS_SILK_CODEC 1" >>confdefs.h
+	        	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: SILK library found, SILK support enabled" >&5
+printf "%s\n" "SILK library found, SILK support enabled" >&6; }
+	        	printf "%s\n" "#define PJMEDIA_HAS_SILK_CODEC 1" >>confdefs.h
 
 		else
 			ac_no_silk=1
-			$as_echo "#define PJMEDIA_HAS_SILK_CODEC 0" >>confdefs.h
+			printf "%s\n" "#define PJMEDIA_HAS_SILK_CODEC 0" >>confdefs.h
 
 		fi
 
@@ -8768,9 +9665,10 @@
 
 
 # Check whether --with-opus was given.
-if test "${with_opus+set}" = set; then :
+if test ${with_opus+y}
+then :
   withval=$with_opus;
-else
+else $as_nop
   with_opus=no
 
 fi
@@ -8778,40 +9676,42 @@
 
 
 # Check whether --enable-opus was given.
-if test "${enable_opus+set}" = set; then :
+if test ${enable_opus+y}
+then :
   enableval=$enable_opus;
 		if test "$enable_opus" = "no"; then
 		 ac_no_opus=1
-		 $as_echo "#define PJMEDIA_HAS_OPUS_CODEC 0" >>confdefs.h
+		 printf "%s\n" "#define PJMEDIA_HAS_OPUS_CODEC 0" >>confdefs.h
 
-		 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OPUS support is disabled... yes" >&5
-$as_echo "Checking if OPUS support is disabled... yes" >&6; }
+		 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if OPUS support is disabled... yes" >&5
+printf "%s\n" "Checking if OPUS support is disabled... yes" >&6; }
 	        fi
 
-else
+else $as_nop
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for OPUS installations.." >&5
-$as_echo "checking for OPUS installations.." >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: checking for OPUS installations.." >&5
+printf "%s\n" "checking for OPUS installations.." >&6; }
                 if test "x$with_opus" != "xno" -a "x$with_opus" != "x"; then
                     CFLAGS="$CFLAGS -I$with_opus/include"
                     CPPFLAGS="$CPPFLAGS -I$with_opus/include"
                     LDFLAGS="$LDFLAGS -L$with_opus/lib"
-                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using OPUS prefix... $with_opus" >&5
-$as_echo "Using OPUS prefix... $with_opus" >&6; }
+                    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using OPUS prefix... $with_opus" >&5
+printf "%s\n" "Using OPUS prefix... $with_opus" >&6; }
                 fi
 
 
-		ac_fn_c_check_header_mongrel "$LINENO" "opus/opus.h" "ac_cv_header_opus_opus_h" "$ac_includes_default"
-if test "x$ac_cv_header_opus_opus_h" = xyes; then :
+		ac_fn_c_check_header_compile "$LINENO" "opus/opus.h" "ac_cv_header_opus_opus_h" "$ac_includes_default"
+if test "x$ac_cv_header_opus_opus_h" = xyes
+then :
   opus_h_present=1
 fi
 
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opus_repacketizer_get_size in -lopus" >&5
-$as_echo_n "checking for opus_repacketizer_get_size in -lopus... " >&6; }
-if ${ac_cv_lib_opus_opus_repacketizer_get_size+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for opus_repacketizer_get_size in -lopus" >&5
+printf %s "checking for opus_repacketizer_get_size in -lopus... " >&6; }
+if test ${ac_cv_lib_opus_opus_repacketizer_get_size+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lopus  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8820,43 +9720,42 @@
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char opus_repacketizer_get_size ();
 int
-main ()
+main (void)
 {
 return opus_repacketizer_get_size ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_opus_opus_repacketizer_get_size=yes
-else
+else $as_nop
   ac_cv_lib_opus_opus_repacketizer_get_size=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opus_opus_repacketizer_get_size" >&5
-$as_echo "$ac_cv_lib_opus_opus_repacketizer_get_size" >&6; }
-if test "x$ac_cv_lib_opus_opus_repacketizer_get_size" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opus_opus_repacketizer_get_size" >&5
+printf "%s\n" "$ac_cv_lib_opus_opus_repacketizer_get_size" >&6; }
+if test "x$ac_cv_lib_opus_opus_repacketizer_get_size" = xyes
+then :
   opus_present=1 && LIBS="-lopus $LIBS"
 fi
 
 		if test "x$opus_h_present" = "x1" -a "x$opus_present" = "x1"; then
-	        	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OPUS library found, OPUS support enabled" >&5
-$as_echo "OPUS library found, OPUS support enabled" >&6; }
-	        	$as_echo "#define PJMEDIA_HAS_OPUS_CODEC 1" >>confdefs.h
+	        	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OPUS library found, OPUS support enabled" >&5
+printf "%s\n" "OPUS library found, OPUS support enabled" >&6; }
+	        	printf "%s\n" "#define PJMEDIA_HAS_OPUS_CODEC 1" >>confdefs.h
 
 		else
 			ac_no_opus=1
-	        	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OPUS library not found, OPUS support disabled" >&5
-$as_echo "OPUS library not found, OPUS support disabled" >&6; }
-			$as_echo "#define PJMEDIA_HAS_OPUS_CODEC 0" >>confdefs.h
+	        	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OPUS library not found, OPUS support disabled" >&5
+printf "%s\n" "OPUS library not found, OPUS support disabled" >&6; }
+			printf "%s\n" "#define PJMEDIA_HAS_OPUS_CODEC 0" >>confdefs.h
 
 		fi
 
@@ -8865,9 +9764,10 @@
 
 
 # Check whether --with-bcg729 was given.
-if test "${with_bcg729+set}" = set; then :
+if test ${with_bcg729+y}
+then :
   withval=$with_bcg729;
-else
+else $as_nop
   with_bcg729=no
 
 fi
@@ -8879,31 +9779,32 @@
 
 
 # Check whether --enable-bcg729 was given.
-if test "${enable_bcg729+set}" = set; then :
+if test ${enable_bcg729+y}
+then :
   enableval=$enable_bcg729;
 		if test "$enable_bcg729" = "no"; then
 		  ac_no_bcg729=1
-		  $as_echo "#define PJMEDIA_HAS_BCG729 0" >>confdefs.h
+		  printf "%s\n" "#define PJMEDIA_HAS_BCG729 0" >>confdefs.h
 
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if bcg729 is disabled... yes" >&5
-$as_echo "Checking if bcg729 is disabled... yes" >&6; }
+		  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if bcg729 is disabled... yes" >&5
+printf "%s\n" "Checking if bcg729 is disabled... yes" >&6; }
 		fi
 
-else
+else $as_nop
 
 		  if test "x$with_bcg729" != "xno" -a "x$with_bcg729" != "x"; then
 		        BCG729_PREFIX=$with_bcg729
 		  	BCG729_CFLAGS="-I$BCG729_PREFIX/include"
 			BCG729_LDFLAGS="-L$BCG729_PREFIX/lib"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using bcg729 prefix... $with_bcg729" >&5
-$as_echo "Using bcg729 prefix... $with_bcg729" >&6; }
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using bcg729 prefix... $with_bcg729" >&5
+printf "%s\n" "Using bcg729 prefix... $with_bcg729" >&6; }
 		  else
 		  	BCG729_CFLAGS=""
 			BCG729_LDFLAGS=""
 		  fi
 
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: checking bcg729 usability" >&5
-$as_echo_n "checking bcg729 usability... " >&6; }
+		  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking bcg729 usability" >&5
+printf %s "checking bcg729 usability... " >&6; }
 
 		  BCG729_LIBS="-lbcg729"
 
@@ -8921,7 +9822,7 @@
 		                                    #include <bcg729/decoder.h>
 
 int
-main ()
+main (void)
 {
 initBcg729EncoderChannel(0);
 
@@ -8929,26 +9830,27 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 
-				   $as_echo "#define PJMEDIA_HAS_BCG729 1" >>confdefs.h
+				   printf "%s\n" "#define PJMEDIA_HAS_BCG729 1" >>confdefs.h
 
-		  		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+		  		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-else
+else $as_nop
 
 				   ac_no_bcg729=1
-				   $as_echo "#define PJMEDIA_HAS_BCG729 0" >>confdefs.h
+				   printf "%s\n" "#define PJMEDIA_HAS_BCG729 0" >>confdefs.h
 
 				   LIBS="$SAVED_LIBS"
 				   LDFLAGS="$SAVED_LDFLAGS"
 				   CFLAGS="$SAVED_CFLAGS"
-		  		   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		  		   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
 
@@ -8958,17 +9860,18 @@
 
 
 # Check whether --enable-libyuv was given.
-if test "${enable_libyuv+set}" = set; then :
+if test ${enable_libyuv+y}
+then :
   enableval=$enable_libyuv; if test "$enable_libyuv" = "no"; then
 		ac_no_yuv=1
-		$as_echo "#define PJMEDIA_HAS_LIBYUV 0" >>confdefs.h
+		printf "%s\n" "#define PJMEDIA_HAS_LIBYUV 0" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if libyuv is disabled...yes" >&5
-$as_echo "Checking if libyuv is disabled...yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libyuv is disabled...yes" >&5
+printf "%s\n" "Checking if libyuv is disabled...yes" >&6; }
 	       fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if libyuv is disabled...no" >&5
-$as_echo "Checking if libyuv is disabled...no" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libyuv is disabled...no" >&5
+printf "%s\n" "Checking if libyuv is disabled...no" >&6; }
 fi
 
 
@@ -8978,18 +9881,19 @@
 
 
 # Check whether --enable-libwebrtc was given.
-if test "${enable_libwebrtc+set}" = set; then :
+if test ${enable_libwebrtc+y}
+then :
   enableval=$enable_libwebrtc; if test "$enable_libwebrtc" = "no"; then
 		ac_no_webrtc=1
-		$as_echo "#define PJMEDIA_HAS_LIBWEBRTC 0" >>confdefs.h
+		printf "%s\n" "#define PJMEDIA_HAS_LIBWEBRTC 0" >>confdefs.h
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc is disabled...yes" >&5
-$as_echo "Checking if libwebrtc is disabled...yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc is disabled...yes" >&5
+printf "%s\n" "Checking if libwebrtc is disabled...yes" >&6; }
 	       fi
-else
+else $as_nop
 
-		  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc is disabled...no" >&5
-$as_echo "Checking if libwebrtc is disabled...no" >&6; }
+		  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc is disabled...no" >&5
+printf "%s\n" "Checking if libwebrtc is disabled...no" >&6; }
 		  case $target in
 		      *-apple-darwin_ios*)
 			case $target in
@@ -9043,6 +9947,10 @@
                                  ac_webrtc_instset=neon
                                  ac_webrtc_cflags="-DWEBRTC_ARCH_ARMV7 -mfloat-abi=hard -mfpu=neon"
                                  ;;
+			     arm-apple-darwin* | aarch64*)
+				 ac_webrtc_instset=neon
+				 ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64"
+			    	 ;;
                              *)
                                  ac_webrtc_instset=sse2
                                  ;;
@@ -9058,74 +9966,215 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if select() needs correct nfds" >&5
-$as_echo_n "checking if select() needs correct nfds... " >&6; }
+
+
+# Check whether --enable-libwebrtc_aec3 was given.
+if test ${enable_libwebrtc_aec3+y}
+then :
+  enableval=$enable_libwebrtc_aec3;
+           	if test "$enable_libwebrtc_aec3" = "yes"; then
+		  # Test if we can build WebRtc AEC3
+		  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if WebRtc AEC3 can be compiled with C++17" >&5
+printf %s "checking if WebRtc AEC3 can be compiled with C++17... " >&6; }
+
+		  SAVED_CXXFLAGS="$CXXFLAGS"
+		  CXXFLAGS="$CXXFLAGS -std=c++17"
+
+		  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+		  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+		   LD="$CXX"
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+		   CXXFLAGS="$SAVED_CXXFLAGS"
+		   ac_no_webrtc_aec3=1
+		   printf "%s\n" "#define PJMEDIA_HAS_LIBWEBRTC_AEC3 0" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+		  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+		  case $target in
+		      *-apple-darwin_ios*)
+			case $target in
+			    arm64*)
+				ac_webrtc_aec3_instset=neon
+				ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64"
+			    	;;
+			    *arm*)
+				ac_webrtc_aec3_instset=neon
+			    	;;
+			    *)
+				ac_webrtc_aec3_instset=sse2
+			    	;;
+			esac
+                	ac_webrtc_aec3_cflags+=" -DWEBRTC_IOS=1"
+		        ;;
+		      *android*)
+			case $TARGET_ABI in
+			    armeabi-v7a)
+				ac_webrtc_aec3_instset=neon
+				ac_webrtc_aec3_cflags="-mfloat-abi=softfp -mfpu=neon"
+			    	;;
+			    armeabi)
+				ac_webrtc_aec3_instset=neon
+				ac_webrtc_aec3_cflags="-mthumb -mfloat-abi=softfp -mfpu=neon -march=armv7"
+			    	;;
+			    arm64*)
+				ac_webrtc_aec3_instset=neon
+				ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64"
+			    	;;
+			    x86*)
+			    	ac_webrtc_aec3_instset=sse2
+			    	;;
+			esac
+                	ac_webrtc_aec3_cflags+=" -DWEBRTC_ANDROID=1"
+		        ;;
+		     *mingw* | *cygw*)
+			ac_webrtc_aec3_instset=sse2
+			ac_webrtc_aec3_cflags="-msse2"
+			;;
+		     *win32* | *w32* | *darwin* | *linux*)
+                         case $target in
+                             armv7l*gnueabihf)
+                                 ac_webrtc_aec3_instset=neon
+                                 ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARMV7 -mfloat-abi=hard -mfpu=neon"
+                                 ;;
+			     arm-apple-darwin* | aarch64*)
+				 ac_webrtc_aec3_instset=neon
+				 ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64"
+			    	 ;;
+                             *)
+                                 ac_webrtc_aec3_instset=sse2
+                                 ;;
+                         esac
+                         case $target in
+                             *darwin*)
+                                 ac_webrtc_aec3_cflags+=" -DWEBRTC_MAC=1"
+                                 ;;
+                            *linux*)
+                                ac_webrtc_aec3_cflags+=" -DWEBRTC_LINUX=1"
+                                ;;
+                         esac
+			;;
+		     *)
+			;;
+		  esac
+		  ac_webrtc_aec3_cflags+=" -DWEBRTC_APM_DEBUG_DUMP=0 -DWEBRTC_POSIX=1"
+           	else
+           	  ac_no_webrtc_aec3=1
+           	  printf "%s\n" "#define PJMEDIA_HAS_LIBWEBRTC_AEC3 0" >>confdefs.h
+
+             	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc-aec3 is enabled...no" >&5
+printf "%s\n" "Checking if libwebrtc-aec3 is enabled...no" >&6; }
+          	fi
+
+else $as_nop
+  ac_no_webrtc_aec3=1
+	       printf "%s\n" "#define PJMEDIA_HAS_LIBWEBRTC_AEC3 0" >>confdefs.h
+
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libwebrtc-aec3 is enabled...no" >&5
+printf "%s\n" "Checking if libwebrtc-aec3 is enabled...no" >&6; }
+
+fi
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if select() needs correct nfds" >&5
+printf %s "checking if select() needs correct nfds... " >&6; }
 case $target in
-  *rtems*) $as_echo "#define PJ_SELECT_NEEDS_NFDS 1" >>confdefs.h
+  *rtems*) printf "%s\n" "#define PJ_SELECT_NEEDS_NFDS 1" >>confdefs.h
 
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	;;
-  *) $as_echo "#define PJ_SELECT_NEEDS_NFDS 0" >>confdefs.h
+  *) printf "%s\n" "#define PJ_SELECT_NEEDS_NFDS 0" >>confdefs.h
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5
-$as_echo "no (default)" >&6; }
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** Decided that select() doesn't need correct nfds (please check)" >&5
-$as_echo "** Decided that select() doesn't need correct nfds (please check)" >&6; }
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5
+printf "%s\n" "no (default)" >&6; }
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** Decided that select() doesn't need correct nfds (please check)" >&5
+printf "%s\n" "** Decided that select() doesn't need correct nfds (please check)" >&6; }
 	;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pj_thread_create() should enforce stack size" >&5
-$as_echo_n "checking if pj_thread_create() should enforce stack size... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if pj_thread_create() should enforce stack size" >&5
+printf %s "checking if pj_thread_create() should enforce stack size... " >&6; }
 case $target in
-  *rtems*) $as_echo "#define PJ_THREAD_SET_STACK_SIZE 1" >>confdefs.h
+  *rtems*) printf "%s\n" "#define PJ_THREAD_SET_STACK_SIZE 1" >>confdefs.h
 
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	;;
-  *) $as_echo "#define PJ_THREAD_SET_STACK_SIZE 0" >>confdefs.h
+  *) printf "%s\n" "#define PJ_THREAD_SET_STACK_SIZE 0" >>confdefs.h
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5
-$as_echo "no (default)" >&6; }
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5
+printf "%s\n" "no (default)" >&6; }
 	;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pj_thread_create() should allocate stack" >&5
-$as_echo_n "checking if pj_thread_create() should allocate stack... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if pj_thread_create() should allocate stack" >&5
+printf %s "checking if pj_thread_create() should allocate stack... " >&6; }
 case $target in
-  *rtems*) $as_echo "#define PJ_THREAD_ALLOCATE_STACK 1" >>confdefs.h
+  *rtems*) printf "%s\n" "#define PJ_THREAD_ALLOCATE_STACK 1" >>confdefs.h
 
-	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	;;
-  *) $as_echo "#define PJ_THREAD_ALLOCATE_STACK 0" >>confdefs.h
+  *) printf "%s\n" "#define PJ_THREAD_ALLOCATE_STACK 0" >>confdefs.h
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5
-$as_echo "no (default)" >&6; }
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (default)" >&5
+printf "%s\n" "no (default)" >&6; }
 	;;
 esac
 
 case $target in
   *mingw* | *cygw* | *win32* | *w32* )
-	$as_echo "#define PJ_BLOCKING_ERROR_VAL WSAEWOULDBLOCK" >>confdefs.h
+	printf "%s\n" "#define PJ_BLOCKING_ERROR_VAL WSAEWOULDBLOCK" >>confdefs.h
 
 	;;
-  *) $as_echo "#define PJ_BLOCKING_ERROR_VAL EAGAIN" >>confdefs.h
+  *) printf "%s\n" "#define PJ_BLOCKING_ERROR_VAL EAGAIN" >>confdefs.h
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** Setting non-blocking recv() retval to EAGAIN (please check)" >&5
-$as_echo "** Setting non-blocking recv() retval to EAGAIN (please check)" >&6; }
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** Setting non-blocking recv() retval to EAGAIN (please check)" >&5
+printf "%s\n" "** Setting non-blocking recv() retval to EAGAIN (please check)" >&6; }
 	;;
 esac
 
 case $target in
   *mingw* | *cygw* | *win32* | *w32* )
-	$as_echo "#define PJ_BLOCKING_CONNECT_ERROR_VAL WSAEWOULDBLOCK" >>confdefs.h
+	printf "%s\n" "#define PJ_BLOCKING_CONNECT_ERROR_VAL WSAEWOULDBLOCK" >>confdefs.h
 
 	;;
-  *) $as_echo "#define PJ_BLOCKING_CONNECT_ERROR_VAL EINPROGRESS" >>confdefs.h
+  *) printf "%s\n" "#define PJ_BLOCKING_CONNECT_ERROR_VAL EINPROGRESS" >>confdefs.h
 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: ** Setting non-blocking connect() retval to EINPROGRESS (please check)" >&5
-$as_echo "** Setting non-blocking connect() retval to EINPROGRESS (please check)" >&6; }
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ** Setting non-blocking connect() retval to EINPROGRESS (please check)" >&5
+printf "%s\n" "** Setting non-blocking connect() retval to EINPROGRESS (please check)" >&6; }
 	;;
 esac
 
@@ -9172,8 +10221,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -9203,15 +10252,15 @@
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
      t end
      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -9225,8 +10274,8 @@
       fi
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -9243,7 +10292,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -9260,8 +10309,8 @@
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -9284,14 +10333,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -9301,46 +10352,46 @@
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -9349,13 +10400,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -9364,8 +10408,12 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -9377,30 +10425,10 @@
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -9413,13 +10441,14 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -9446,18 +10475,20 @@
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
+
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -9469,12 +10500,13 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -9505,7 +10537,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -9527,6 +10559,10 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -9540,6 +10576,12 @@
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -9581,7 +10623,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -9590,7 +10632,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -9653,7 +10695,7 @@
 # values after options handling.
 ac_log="
 This file was extended by pjproject $as_me 2.x, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -9711,14 +10753,16 @@
 Report bugs to the package provider."
 
 _ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 pjproject config.status 2.x
-configured by $0, generated by GNU Autoconf 2.69,
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -9755,15 +10799,15 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    printf "%s\n" "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
+    printf "%s\n" "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -9771,7 +10815,7 @@
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -9780,7 +10824,7 @@
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    printf "%s\n" "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -9808,7 +10852,7 @@
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -9822,7 +10866,7 @@
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  printf "%s\n" "$ac_log"
 } >&5
 
 _ACEOF
@@ -9859,8 +10903,8 @@
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -10196,7 +11240,7 @@
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -10204,17 +11248,17 @@
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
+       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -10231,7 +11275,7 @@
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10255,9 +11299,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -10310,8 +11354,8 @@
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -10353,9 +11397,9 @@
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -10371,20 +11415,20 @@
   #
   if test x"$ac_file" != x-; then
     {
-      $as_echo "/* $configure_input  */" \
+      printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    $as_echo "/* $configure_input  */" \
+    printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -10425,13 +11469,13 @@
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
 
 Configurations for current target have been written to 'build.mak', and 'os-auto.mak' in various build directories, and pjlib/include/pj/compat/os_auto.h.
 
@@ -10441,7 +11485,7 @@
 
 The next step now is to run 'make dep' and 'make'.
 " >&5
-$as_echo "
+printf "%s\n" "
 
 Configurations for current target have been written to 'build.mak', and 'os-auto.mak' in various build directories, and pjlib/include/pj/compat/os_auto.h.
 
@@ -10452,3 +11496,4 @@
 The next step now is to run 'make dep' and 'make'.
 " >&6; }
 
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/aconfigure.ac asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/aconfigure.ac
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/aconfigure.ac	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/aconfigure.ac	2022-02-24 07:54:38.000000000 +0000
@@ -5,7 +5,7 @@
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
-AC_CONFIG_HEADER([pjlib/include/pj/compat/os_auto.h
+AC_CONFIG_HEADERS([pjlib/include/pj/compat/os_auto.h
 		  pjlib/include/pj/compat/m_auto.h
 		  pjmedia/include/pjmedia/config_auto.h
 		  pjmedia/include/pjmedia-codec/config_auto.h
@@ -38,7 +38,7 @@
 
 dnl Make sure C++ compiler works
 AC_LANG_PUSH([C++])
-AC_TRY_LINK([], [], , AC_MSG_ERROR([C++ compiler does not work]))
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[AC_MSG_ERROR(C++ compiler does not work)])
 AC_LANG_POP([C++])
 
 AC_PROG_RANLIB
@@ -71,6 +71,7 @@
 
 AC_SUBST(ac_pjdir)
 AC_SUBST(ac_build_mak_vars)
+AC_SUBST(ac_cflags)
 
 case $host in 
     *mingw* | *cygw* | *win32* | *w32* )
@@ -144,8 +145,10 @@
 
 if test "x$ac_cv_c_bigendian" = "xyes"; then
   CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=1 -DPJ_IS_LITTLE_ENDIAN=0"
+  ac_cflags="$ac_cflags -DPJ_IS_BIG_ENDIAN=1 -DPJ_IS_LITTLE_ENDIAN=0"
 else
   CFLAGS="$CFLAGS -DPJ_IS_BIG_ENDIAN=0 -DPJ_IS_LITTLE_ENDIAN=1"
+  ac_cflags="$ac_cflags -DPJ_IS_BIG_ENDIAN=0 -DPJ_IS_LITTLE_ENDIAN=1"
 fi
 
 dnl
@@ -161,6 +164,11 @@
 	AC_DEFINE(PJ_WIN32,1)
 	AC_DEFINE(PJ_WIN32_WINNT,0x0400)
 	AC_DEFINE(WIN32_LEAN_AND_MEAN)
+	case $target in
+	    *_64-w64-mingw* )
+		AC_DEFINE(PJ_WIN64,1)
+	    ;;
+	esac
 	;;
     *darwin*)
 	AC_DEFINE(PJ_DARWINOS,1)
@@ -460,6 +468,17 @@
 	      AC_MSG_RESULT([Building shared libraries... no])
 	      )
 
+AC_SUBST(ac_no_pjsua2)
+AC_ARG_ENABLE(pjsua2,
+	      AS_HELP_STRING([--disable-pjsua2],
+			     [Exclude pjsua2 library and application from the build]),
+	      [if test "$enable_pjsua2" = "no"; then
+		[ac_no_pjsua2=1]
+		AC_MSG_RESULT([Building pjsua2 library and application... no])
+	       fi],
+	      AC_MSG_RESULT([Building pjsua2 library and application... yes])
+	      )
+
 
 dnl ######################
 dnl # OS specific files
@@ -487,11 +506,23 @@
 		ac_os_objs="$ac_os_objs sock_qos_bsd.o"
 		;;
 	esac
+	# SSL
+	case $target in
+	  *darwin*)
+		ac_os_objs="$ac_os_objs ssl_sock_apple.o"
+		;;
+	esac
 	# UUID
 	case $target in
 	  *android*)
 	  	ac_os_objs="$ac_os_objs guid_android.o"
 	  	;;
+	  *darwin*)
+	  	ac_os_objs="$ac_os_objs guid_darwin.o"
+	  	;;
+	  *bsd*)
+	  	ac_os_objs="$ac_os_objs guid_bsd.o"
+	  	;;
 	  *)
 		if test "$ac_has_uuid_lib" = "1" -a "$ac_has_uuid_h" = "1"; then
 			ac_os_objs="$ac_os_objs guid_uuid.o"
@@ -648,6 +679,27 @@
     )
 
 
+dnl # Use external webrtc AEC3 installation
+AC_SUBST(ac_external_webrtc_aec3,0)
+AC_ARG_WITH(external-webrtc-aec3,
+    AS_HELP_STRING([--with-external-webrtc-aec3],
+		   [Use external webrtc AEC3 development files, not the one in "third_party" directory. When this option is set, make sure that webrtc is accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]),
+    [
+	if test "x$with_external_webrtc_aec3" != "xno"; then
+		# Test webrtc AEC3 installation
+		AC_MSG_CHECKING([if external webrtc AEC3 is installed])
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "modules/audio_processing/aec3/echo_canceller3.h"
+		]],
+						  [EchoCanceller3 ec(EchoCanceller3Config(), 16000, 1, 1);])],
+				  [AC_MSG_RESULT(yes!!)
+				   ac_external_webrtc_aec3="1"
+				   ],
+				  [AC_MSG_ERROR([Unable to use external webrtc AEC3. If webrtc development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])])
+	fi
+    ]
+    )
+
+
 dnl # Resample implementation
 AC_SUBST(ac_pjmedia_resample,libresample)
 AC_ARG_ENABLE(resample,
@@ -704,14 +756,69 @@
   ac_pa_cflags="$ac_pa_cflags -DPA_LITTLE_ENDIAN"
 fi
 
+
+dnl # Enable Android Oboe audio device
+AC_SUBST(ac_oboe_cflags)
+AC_SUBST(ac_oboe_ldflags)
+AC_ARG_WITH(oboe,
+    AS_HELP_STRING([--with-oboe],
+		   [Enable Android Oboe audio device backend.]),
+    [
+	if test "x$with_oboe" != "xno" -a "x$with_oboe" != "x"; then
+		OBOE_PREFIX=$with_oboe
+		OBOE_CFLAGS="-I$OBOE_PREFIX/prefab/modules/oboe/include"
+		OBOE_LDFLAGS="-L$OBOE_PREFIX/prefab/modules/oboe/libs/android.$TARGET_ABI"
+		AC_MSG_RESULT([Using Oboe prefix... $with_oboe])
+	else
+		OBOE_CFLAGS=""
+		OBOE_LDFLAGS=""
+	fi
+
+	AC_MSG_CHECKING([Oboe usability])
+
+	OBOE_LIBS="-loboe -lOpenSLES -llog"
+
+	SAVED_LIBS="$LIBS"
+	SAVED_LDFLAGS="$LDFLAGS"
+	SAVED_CXXFLAGS="$CXXFLAGS"
+
+	LIBS="$OBOE_LIBS $LIBS"
+	LDFLAGS="$OBOE_LDFLAGS $LDFLAGS"
+	CXXFLAGS="$OBOE_CFLAGS $CXXFLAGS"
+
+	AC_LANG_PUSH([C++])
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <oboe/Oboe.h>]],
+					[oboe::AudioStreamBuilder sb; sb.setDeviceId(0);]
+			)],
+		 [ ac_oboe_cflags="-DPJMEDIA_AUDIO_DEV_HAS_OBOE=1 $OBOE_CFLAGS"
+		   ac_oboe_ldflags="$OBOE_LDFLAGS $OBOE_LIBS"
+		   AC_MSG_RESULT(yes)
+		  ],
+		 [
+		   LIBS="$SAVED_LIBS"
+		   LDFLAGS="$SAVED_LDFLAGS"
+		   AC_MSG_RESULT(no)
+		 ])
+	AC_LANG_POP([C++])
+
+	# Put back original CXXFLAGS as app won't needed it.
+	CXXFLAGS="$SAVED_CFLAGS"
+    ]
+    )
+
+
 if test "$enable_sound" = "no"; then
   true;
 else
  AC_SUBST(ac_pjmedia_audiodev_objs)
  case $target in
   *android*)
-	LIBS="$LIBS -lOpenSLES"
-	AC_MSG_RESULT([Checking sound device backend... OpenSL ES])
+	if test "x$ac_oboe_cflags" != "x"; then
+		AC_MSG_RESULT([Checking sound device backend... Oboe])
+	else
+		LIBS="$LIBS -lOpenSLES"
+		AC_MSG_RESULT([Checking sound device backend... Android])
+	fi
 	;;
   *-apple-darwin_ios*)
 	LIBS="$LIBS -framework CoreAudio -framework CoreFoundation -framework AudioToolbox -framework CFNetwork -framework UIKit -framework AVFoundation"
@@ -758,10 +865,12 @@
 
 AC_SUBST(ac_pjmedia_video)
 
-# Disable video on mingw
+# Disable video on mingw by default (but respect --enable-video=yes)
 case $target in
  *mingw*)
+	if test ! "$enable_video" = "yes"; then
 	enable_video="no"
+	fi
 	;;
 esac
 
@@ -777,6 +886,7 @@
                 enable_v4l2="no"
                 enable_openh264="no"
                 enable_libyuv="no"
+                enable_vpx="no"
                fi],
 	      [])
 
@@ -801,7 +911,7 @@
 	AC_SUBST(ac_pjmedia_video_has_android)
 	AC_SUBST(ac_android_cflags)
 	SAVED_LIBS="$LIBS"
-	LIBS="-lGLESv2 -lEGL -landroid -lgcc -lc"
+	LIBS="-lGLESv2 -lEGL -landroid -lc"
 	AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])],[ac_pjmedia_video_has_android=yes],[ac_pjmedia_video_has_android=no])
 	LIBS="$SAVED_LIBS"
 	if test "$ac_pjmedia_video_has_android" = "yes"; then
@@ -813,6 +923,18 @@
 	fi
 	ac_android_cflags="$ac_android_cflags -DPJMEDIA_VIDEO_DEV_HAS_ANDROID=1"
 	;;
+  *mingw*)
+	if test "$enable_video" = "yes"; then
+	  ac_pjmedia_video=windows_os
+	  AC_SUBST(ac_pjmedia_video_dev_has_dshow)
+	  ac_pjmedia_video_dev_has_dshow=yes
+	  AC_SUBST(ac_dshow_cflags)
+	  ac_dshow_cflags="-DPJMEDIA_HAS_VIDEO=1 -DPJMEDIA_VIDEO_DEV_HAS_DSHOW=1"
+	  AC_SUBST(ac_dshow_ldflags)
+	  ac_dshow_ldflags=" -lstdc++ -lquartz -lole32 -loleaut32 -lrpcrt4 -lwinmm -luuid -lmingwex -lstrmiids "
+	  LIBS="$LIBS -lstdc++ -lquartz -lole32 -loleaut32 -lrpcrt4 -lwinmm -luuid -lmingwex -lstrmiids "
+	fi
+	;;
   *darwin*)
 	ac_pjmedia_video=darwin_os
 	AC_SUBST(ac_pjmedia_video_has_darwin)
@@ -1028,6 +1150,19 @@
 	      AC_MSG_RESULT([Building libresample as shared library... no])
 	      )
 
+dnl # Include Speex resample
+AC_ARG_ENABLE(speex-resample,
+           AS_HELP_STRING([--enable-speex-resample],
+			  [Enable Speex resample]),
+           [
+           if test "$enable_speex_resample" = "yes"; then
+             AC_MSG_RESULT([Checking if Speex resample is enabled... yes])
+             [ac_pjmedia_resample=speex]
+           else
+             AC_MSG_RESULT([Checking if Speex resample is enabled... no])
+           fi
+           ], AC_MSG_RESULT([Checking if Speex resample is enabled... no]))
+
 dnl # SDL alt prefix
 AC_ARG_WITH(sdl,
     AS_HELP_STRING([--with-sdl=DIR],
@@ -1067,6 +1202,7 @@
 			ac_sdl_cflags=`$SDL_CONFIG --cflags`
 			ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
 			ac_sdl_ldflags=`$SDL_CONFIG --libs`
+			ac_sdl_ldflags=${ac_sdl_ldflags//-mwindows/}
 			LIBS="$LIBS $ac_sdl_ldflags"
 		  else
 			AC_MSG_RESULT([Unsupported SDL version])
@@ -1286,7 +1422,7 @@
 					         )],
 		  		 [ ac_openh264_cflags="-DPJMEDIA_HAS_OPENH264_CODEC=1 $OPENH264_CFLAGS"
 		  		   ac_openh264_ldflags="$OPENH264_LDFLAGS $OPENH264_LIBS"
-		  		   AC_MSG_RESULT(ok)
+		  		   AC_MSG_RESULT(yes)
 		  		  ],
 		  		 [
 				   LIBS="$SAVED_LIBS"
@@ -1351,7 +1487,7 @@
 					         )],
 		  		 [ ac_vpx_cflags="-DPJMEDIA_HAS_VPX_CODEC=1 $VPX_CFLAGS"
 		  		   ac_vpx_ldflags="$VPX_LDFLAGS $VPX_LIBS"
-		  		   AC_MSG_RESULT(ok)
+		  		   AC_MSG_RESULT(yes)
 		  		  ],
 		  		 [
 				   LIBS="$SAVED_LIBS"
@@ -1484,7 +1620,7 @@
 	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <ippcore.h>
 					   ]],
 					   [ippStaticInit();])],
-		  [AC_MSG_RESULT(ok)],
+		  [AC_MSG_RESULT(yes)],
 		  [AC_MSG_FAILURE([Error: unable to recognize your IPP installation. Make sure the paths and ARCH suffix are set correctly, run with --help for more info])])
 
 	CFLAGS="$SAVED_CFLAGS"
@@ -1574,7 +1710,7 @@
 	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <usc.h>
 					   ]],
 					   [extern USC_Fxns USC_G729AFP_Fxns;])],
-		  [AC_MSG_RESULT(ok)],
+		  [AC_MSG_RESULT(yes)],
 		  [AC_MSG_FAILURE(no)])
 
 	CFLAGS="$SAVED_CFLAGS"
@@ -1598,6 +1734,29 @@
     AC_MSG_RESULT([Skipping Intel IPP settings (not wanted)])
 fi
 
+dnl # Include Android MediaCodec
+AC_SUBST(ac_no_mediacodec)
+
+AC_ARG_ENABLE(android-mediacodec,
+	      AS_HELP_STRING([--disable-android-mediacodec],
+			     [Exclude Android MediaCodec (default: autodetect)]),
+	      [if test "$enable_android_mediacodec" = "no"; then
+	     [ac_no_mediacodec=1]
+		 AC_MSG_RESULT([Checking if Android MediaCodec support is disabled... yes])
+	        fi],
+	      [
+		case $target in
+        *android*)
+	      AC_CHECK_LIB(mediandk,AMediaCodec_createDecoderByType,[ac_pjmedia_has_amediacodec=1 && LIBS="-lmediandk $LIBS"])
+	      if test "x$ac_pjmedia_has_amediacodec" = "x1"; then
+		    AC_MSG_RESULT([Checking if Android AMediaCodec library is available... yes])
+		    AC_DEFINE(PJMEDIA_HAS_ANDROID_MEDIACODEC, 1)
+	      else
+		    AC_MSG_RESULT([Checking if Android AMediaCodec library is available... no])
+	      fi
+		  ;;
+		esac
+	      ])
 
 dnl ##########################################
 dnl #
@@ -2010,7 +2169,7 @@
 					         )],
 		  		 [ 
 				   AC_DEFINE(PJMEDIA_HAS_BCG729,1)
-		  		   AC_MSG_RESULT(ok)
+		  		   AC_MSG_RESULT(yes)
 		  		  ],
 		  		 [
 				   [ac_no_bcg729=1]
@@ -2105,6 +2264,10 @@
                                  ac_webrtc_instset=neon
                                  ac_webrtc_cflags="-DWEBRTC_ARCH_ARMV7 -mfloat-abi=hard -mfpu=neon"
                                  ;;
+			     arm-apple-darwin* | aarch64*)
+				 ac_webrtc_instset=neon
+				 ac_webrtc_cflags="-DWEBRTC_ARCH_ARM64"
+			    	 ;;
                              *)
                                  ac_webrtc_instset=sse2
                                  ;;
@@ -2116,6 +2279,111 @@
 	      ])
 
 
+dnl # Include webrtc AEC3
+AC_SUBST(ac_no_webrtc_aec3)
+AC_SUBST(ac_webrtc_aec3_instset)
+AC_SUBST(ac_webrtc_aec3_cflags)
+AC_SUBST(ac_webrtc_aec3_ldflags)
+AC_ARG_ENABLE(libwebrtc_aec3,
+	      AS_HELP_STRING([--enable-libwebrtc-aec3],
+			     [Build libwebrtc-aec3 that's included in PJSIP]),
+	      [
+           	if test "$enable_libwebrtc_aec3" = "yes"; then
+		  # Test if we can build WebRtc AEC3
+		  AC_MSG_CHECKING([if WebRtc AEC3 can be compiled with C++17])
+	
+		  SAVED_CXXFLAGS="$CXXFLAGS"
+		  CXXFLAGS="$CXXFLAGS -std=c++17"
+		  
+		  AC_LANG_PUSH([C++])
+		  AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])],
+		  [AC_MSG_RESULT(yes)
+		   LD="$CXX"],
+		  [AC_MSG_RESULT(no)
+		   CXXFLAGS="$SAVED_CXXFLAGS"
+		   ac_no_webrtc_aec3=1
+		   AC_DEFINE(PJMEDIA_HAS_LIBWEBRTC_AEC3,0)])
+		  AC_LANG_POP([C++])
+
+		  case $target in
+		      *-apple-darwin_ios*)
+			case $target in
+			    arm64*)
+				ac_webrtc_aec3_instset=neon
+				ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64"
+			    	;;
+			    *arm*)
+				ac_webrtc_aec3_instset=neon
+			    	;;
+			    *)
+				ac_webrtc_aec3_instset=sse2
+			    	;;
+			esac
+                	ac_webrtc_aec3_cflags+=" -DWEBRTC_IOS=1"
+		        ;;
+		      *android*)
+			case $TARGET_ABI in
+			    armeabi-v7a)
+				ac_webrtc_aec3_instset=neon
+				ac_webrtc_aec3_cflags="-mfloat-abi=softfp -mfpu=neon"
+			    	;;
+			    armeabi)
+				ac_webrtc_aec3_instset=neon
+				ac_webrtc_aec3_cflags="-mthumb -mfloat-abi=softfp -mfpu=neon -march=armv7"
+			    	;;
+			    arm64*)
+				ac_webrtc_aec3_instset=neon
+				ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64"
+			    	;;
+			    x86*)
+			    	ac_webrtc_aec3_instset=sse2
+			    	;;
+			esac
+                	ac_webrtc_aec3_cflags+=" -DWEBRTC_ANDROID=1"
+		        ;;
+		     *mingw* | *cygw*)
+			ac_webrtc_aec3_instset=sse2
+			ac_webrtc_aec3_cflags="-msse2"
+			;;
+		     *win32* | *w32* | *darwin* | *linux*)
+                         case $target in
+                             armv7l*gnueabihf)
+                                 ac_webrtc_aec3_instset=neon
+                                 ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARMV7 -mfloat-abi=hard -mfpu=neon"
+                                 ;;
+			     arm-apple-darwin* | aarch64*)
+				 ac_webrtc_aec3_instset=neon
+				 ac_webrtc_aec3_cflags="-DWEBRTC_ARCH_ARM64"
+			    	 ;;
+                             *)
+                                 ac_webrtc_aec3_instset=sse2
+                                 ;;
+                         esac
+                         case $target in
+                             *darwin*)
+                                 ac_webrtc_aec3_cflags+=" -DWEBRTC_MAC=1"
+                                 ;;
+                            *linux*)
+                                ac_webrtc_aec3_cflags+=" -DWEBRTC_LINUX=1"
+                                ;;
+                         esac
+			;;
+		     *)
+			;;
+		  esac
+		  ac_webrtc_aec3_cflags+=" -DWEBRTC_APM_DEBUG_DUMP=0 -DWEBRTC_POSIX=1"
+           	else
+           	  ac_no_webrtc_aec3=1
+           	  AC_DEFINE(PJMEDIA_HAS_LIBWEBRTC_AEC3,0)
+             	  AC_MSG_RESULT([Checking if libwebrtc-aec3 is enabled...no])
+          	fi
+	      ],
+	      [ac_no_webrtc_aec3=1
+	       AC_DEFINE(PJMEDIA_HAS_LIBWEBRTC_AEC3,0)
+	       AC_MSG_RESULT([Checking if libwebrtc-aec3 is enabled...no])
+	      ])
+
+
 dnl ##########################################
 dnl #
 dnl # MANUAL CONFIG
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/build/rules.mak asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/build/rules.mak
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/build/rules.mak	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/build/rules.mak	2022-02-24 07:54:38.000000000 +0000
@@ -129,7 +129,7 @@
 $(OBJDIR)/$(app).o: $(OBJDIRS) $(OBJS)
 	$(CROSS_COMPILE)ld -r -o $@ $(OBJS)
 
-$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o
+$(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o | $(OBJDIRS)
 	@echo Creating kbuild Makefile...
 	@echo "# Our module name:" > $(OBJDIR)/Makefile
 	@echo 'obj-m += $(app).o' >> $(OBJDIR)/Makefile
@@ -154,27 +154,32 @@
 ../lib/$(app).ko: $(LIB) $(OBJDIR)/$(app).ko
 	cp $(OBJDIR)/$(app).ko ../lib
 
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.m | $(OBJDIRS)
 	$(CC) $($(APP)_CFLAGS) \
 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
 		$(subst /,$(HOST_PSEP),$<) 
 
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.c | $(OBJDIRS)
 	$(CC) $($(APP)_CFLAGS) \
 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
 		$(subst /,$(HOST_PSEP),$<) 
 
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.S | $(OBJDIRS)
 	$(CC) $($(APP)_CFLAGS) \
 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
 		$(subst /,$(HOST_PSEP),$<) 
 
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp
+$(OBJDIR)/dshowclasses.o: $(SRCDIR)/dshowclasses.cpp | $(OBJDIRS)
+	$(CXX) $($(APP)_CXXFLAGS) -I$(SRCDIR)/../../../third_party/BaseClasses -fpermissive \
+		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
+		$(subst /,$(HOST_PSEP),$<)
+
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cpp | $(OBJDIRS)
 	$(CXX) $($(APP)_CXXFLAGS) \
 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
 		$(subst /,$(HOST_PSEP),$<)
 
-$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc
+$(OBJDIR)/%$(OBJEXT): $(SRCDIR)/%.cc | $(OBJDIRS)
 	$(CXX) $($(APP)_CXXFLAGS) \
 		$(CC_OUT)$(subst /,$(HOST_PSEP),$@) \
 		$(subst /,$(HOST_PSEP),$<)
@@ -223,8 +228,8 @@
 	for F in $(FULL_SRCS); do \
 	   if test -f $$F; then \
 	     echo "$(OBJDIR)/" | tr -d '\n' >> $(DEP_FILE); \
-	     if echo $$F | grep -q .cpp$$; then \
-		dep="$(CC) -M $(DEPCXXFLAGS) $$F"; \
+	     if echo $$F | grep -q "\.c[c|pp]"; then \
+		dep="$(CXX) -M $(DEPCXXFLAGS) $$F"; \
 	     else \
 		dep="$(CC) -M $(DEPCFLAGS) $$F"; \
 	     fi; \
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/build/vs/pjproject-vs14-arm64-common-defaults.props asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/build/vs/pjproject-vs14-arm64-common-defaults.props
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/build/vs/pjproject-vs14-arm64-common-defaults.props	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/build/vs/pjproject-vs14-arm64-common-defaults.props	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <TargetCPU>ARM64</TargetCPU>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineARM64</TargetMachine>
+    </Link>
+    <Lib>
+      <AdditionalOptions>/ignore:4221</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="TargetCPU">
+      <Value>$(TargetCPU)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/build/vs/pjproject-vs14-arm64-release-defaults.props asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/build/vs/pjproject-vs14-arm64-release-defaults.props
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/build/vs/pjproject-vs14-arm64-release-defaults.props	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/build/vs/pjproject-vs14-arm64-release-defaults.props	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="pjproject-vs14-arm64-common-defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/build/vs/pjproject-vs14-common-config.props asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/build/vs/pjproject-vs14-common-config.props
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/build/vs/pjproject-vs14-common-config.props	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/build/vs/pjproject-vs14-common-config.props	2022-02-24 07:54:38.000000000 +0000
@@ -26,6 +26,7 @@
         <BuildToolset>v140</BuildToolset>
         <PreprocessorDef Condition="'$(Platform)'=='Win32'">WIN32;PJ_WIN32=1;PJ_M_I386=1;</PreprocessorDef>
         <PreprocessorDef Condition="'$(Platform)'=='x64'">WIN64;PJ_WIN64=1;PJ_M_X86_64=1;</PreprocessorDef>
+	<PreprocessorDef Condition="'$(Platform)'=='ARM64'">PJ_M_ARM64=1;</PreprocessorDef>
       </PropertyGroup>
     </When>
     <When Condition="'$(API_Family)'=='UWP'">
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/build.mak.in asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/build.mak.in
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/build.mak.in	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/build.mak.in	2022-02-24 07:54:38.000000000 +0000
@@ -24,6 +24,10 @@
 export PJ_SHARED_LIBRARIES := 1
 endif
 
+ifeq (@ac_no_pjsua2@,1)
+export PJ_EXCLUDE_PJSUA2 := 1
+endif
+
 ifndef EXCLUDE_APP
 ifeq ($(findstring android,$(TARGET_NAME)),)
 export EXCLUDE_APP := 0
@@ -148,6 +152,20 @@
 endif
 endif
 
+ifneq (@ac_no_webrtc_aec3@,1)
+ifeq (@ac_external_webrtc_aec3@,1)
+APP_THIRD_PARTY_EXT += -lwebrtc-aec3
+else
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-aec3-$(LIB_SUFFIX)
+ifeq ($(PJ_SHARED_LIBRARIES),)
+APP_THIRD_PARTY_LIBS += -lwebrtc-aec3-$(TARGET_NAME)
+else
+APP_THIRD_PARTY_LIBS += -lwebrtc-aec3
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-aec3.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX)
+endif
+endif
+endif
+
 
 # Additional flags
 @ac_build_mak_vars@
@@ -187,13 +205,23 @@
 AC_PJMEDIA_VIDEO_HAS_IOS_OPENGL = @ac_pjmedia_video_has_ios_opengl@
 DARWIN_CFLAGS = @ac_darwin_cflags@
 
+# mingw
+AC_PJMEDIA_VIDEO_DEV_HAS_DSHOW = @ac_pjmedia_video_dev_has_dshow@
+ifeq (@ac_pjmedia_video_dev_has_dshow@,yes)
+DSHOW_CFLAGS = @ac_dshow_cflags@
+DSHOW_LDFLAGS = @ac_dshow_ldflags@
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libbaseclasses-$(LIB_SUFFIX)
+APP_THIRD_PARTY_LIBS += -lbaseclasses-$(TARGET_NAME)
+endif
+
 # Android
 ANDROID_CFLAGS = @ac_android_cflags@
+OBOE_CFLAGS = @ac_oboe_cflags@
 
 # PJMEDIA features exclusion
-PJ_VIDEO_CFLAGS += $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \
+PJ_VIDEO_CFLAGS += $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(DSHOW_CFLAGS) $(QT_CFLAGS) \
 		   $(OPENH264_CFLAGS) $(VPX_CFLAGS) $(DARWIN_CFLAGS)
-PJ_VIDEO_LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) \
+PJ_VIDEO_LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) $(DSHOW_LDFLAGS) \
                    $(OPENH264_LDFLAGS) $(VPX_LDFLAGS)
 
 # CFLAGS, LDFLAGS, and LIBS to be used by applications
@@ -280,6 +308,10 @@
 	$(ADD_LIB_FILES)
 endif
 
+ifeq ($(PJ_EXCLUDE_PJSUA2),1)
+export PJSUA2_LIB_LDLIB :=
+endif
+
 export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \
 	$(PJSIP_UA_LDLIB) \
 	$(PJSIP_SIMPLE_LDLIB) \
@@ -299,7 +331,7 @@
 	-lstdc++ \
 	$(APP_LDLIBS)
 
-# Here are the variabels to use if application is using the library
+# Here are the variables to use if application is using the library
 # from within the source distribution
 export PJ_CC := $(APP_CC)
 export PJ_CXX := $(APP_CXX)
@@ -317,6 +349,6 @@
 export PJ_INSTALL_DIR := @prefix@
 export PJ_INSTALL_INC_DIR := @includedir@
 export PJ_INSTALL_LIB_DIR := @libdir@
-export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1 @CFLAGS@
-export PJ_INSTALL_CXXFLAGS := @CXXFLAGS@ $(PJ_INSTALL_CFLAGS)
-export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(APP_LDLIBS)
+export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1 @ac_cflags@
+export PJ_INSTALL_LDFLAGS_PRIVATE := $(APP_THIRD_PARTY_LIBS) $(APP_THIRD_PARTY_EXT) @LIBS@
+export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(filter-out $(PJ_INSTALL_LDFLAGS_PRIVATE),$(APP_LDXXLIBS))
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/config.sub asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/config.sub
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/config.sub	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/config.sub	2022-02-24 07:54:38.000000000 +0000
@@ -123,7 +123,7 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/configure-android asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/configure-android
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/configure-android	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/configure-android	2022-02-24 07:54:38.000000000 +0000
@@ -42,8 +42,14 @@
 NDK_VER=`sed -n -E 's/^Pkg.Revision *= *([0-9]+).*/\1/p' ${ANDROID_NDK_ROOT}/source.properties`
 
 if test "x$APP_PLATFORM" = "x"; then
-  APP_PLATFORM=`ls ${ANDROID_NDK_ROOT}/platforms/ | sed 's/android-//' | sort -gr | head -1`
-  APP_PLATFORM="android-${APP_PLATFORM}"
+  if test -d ${ANDROID_NDK_ROOT}/platforms; then
+    APP_PLATFORM=`ls ${ANDROID_NDK_ROOT}/platforms/ | sed 's/android-//' | sort -gr | head -1`
+  fi
+  if test "x$APP_PLATFORM" != "x"; then
+    APP_PLATFORM="android-${APP_PLATFORM}"
+  else
+    APP_PLATFORM="latest"
+  fi
   echo "$F: APP_PLATFORM not specified, using ${APP_PLATFORM}"
 fi
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/configure-iphone asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/configure-iphone
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/configure-iphone	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/configure-iphone	2022-02-24 07:54:38.000000000 +0000
@@ -118,6 +118,10 @@
 fi
 export ARCH_VAL=`echo ${ARCH} | sed 's/\-arch //' | sed -e 's/^[ \t]*//;s/[ \t]*$//' `
 
+if test "${ARCH_VAL}" = "arm64e"; then
+ export ARCH_VAL="arm64"
+fi 
+
 if test "${MIN_IOS}" = ""; then
   MIN_IOS_VER="7.0"
   echo "$F: MIN_IOS is not specified, choosing ${MIN_IOS_VER}"
@@ -129,7 +133,7 @@
 
 # Set CXX if not set
 if test "${CXX}" = ""; then
-  export CXX=`echo ${CC} | sed 's/gcc/g++/'`
+  export CXX=`echo ${CC} | sed 's/clang/clang++/'`
   echo "$F: CXX is not specified, using ${CXX}"
 fi
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.github/ISSUE_TEMPLATE/bug_report.yml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.github/ISSUE_TEMPLATE/bug_report.yml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.github/ISSUE_TEMPLATE/bug_report.yml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.github/ISSUE_TEMPLATE/bug_report.yml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,62 @@
+name: Bug Report
+description: File a bug report
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: bug-desc
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+      placeholder: |
+        E.g: Assertion in answering an incoming video call with response code 183.
+    validations:
+      required: true
+  - type: textarea
+    id: bug-repro
+    attributes:
+      label: Steps to reproduce
+      description: Describe how to reproduce the bug using sample apps such as [pjsua app](https://www.pjsip.org/pjsua.htm), [pjsua2 android](https://trac.pjsip.org/repos/wiki/Getting-Started/Android#Tryingoursampleapplicationandcreatingyourown), [iOS ipjsua](https://trac.pjsip.org/repos/wiki/Getting-Started/iPhone#BuildingPJSIP), or [other sample apps](https://github.com/pjsip/pjproject/tree/master/pjsip-apps/src/samples).
+      placeholder: |
+        E.g:
+        1. run pjsua app with parameter: `--video --registrar sip:some.sip.registrar ...`
+        2. make video call from other SIP client or another pjsua instance
+        3. answer the call with 180 and soon 183, assertion occurs!
+        The assertion didn't occur if the call was answered with 183 directly.
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: PJSIP version
+      description: What PJSIP version are you using?
+      placeholder: |
+        E.g: 2.11
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Context
+      description: |
+        Context where the bug occurs, e.g: platform, device, OS version, configuration settings.
+      placeholder: |
+        E.g:
+        - The issue happens on Windows/Linux/MacOS desktop, iPhone 12, or Android device XYZ.
+        - App is built using Android NDK r20 or newer.
+        - 'configure-android' param: ...
+        - 'config_site.h' contents: ...
+        - Related third-party lib & version: ... (e.g: OpenSSL 1.1.1b)
+        - Applied patch(es): (e.g: patches from issue/PR #xyz)
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Log, call stack, etc
+      description: Please copy and paste any relevant PJSIP log output (with verbosity level 5), call stack trace, etc which may be useful for the investigation. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: true
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.github/ISSUE_TEMPLATE/config.yml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.github/ISSUE_TEMPLATE/config.yml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.github/ISSUE_TEMPLATE/config.yml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.github/ISSUE_TEMPLATE/config.yml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,4 @@
+blank_issues_enabled: false
+contact_links:
+  - name: PJSIP tag on Stack Overflow
+    url: https://stackoverflow.com/questions/tagged/pjsip
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.github/ISSUE_TEMPLATE/feature_request.md asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.github/ISSUE_TEMPLATE/feature_request.md
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.github/ISSUE_TEMPLATE/feature_request.md	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.github/ISSUE_TEMPLATE/feature_request.md	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'type: enhancement'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,31 @@
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Description
+<!--- Describe your changes in detail -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Screenshots (if appropriate):
+
+## Types of changes
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+
+## Checklist:
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+- [ ] My code follows the code style of this project.
+- [ ] My change requires a change to the documentation.
+- [ ] I have updated the documentation accordingly.
+- [ ] I have read the **CONTRIBUTING** document.
+- [ ] I have added tests to cover my changes.
+- [ ] All new and existing tests passed.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.github/workflows/ccpp.yml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.github/workflows/ccpp.yml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.github/workflows/ccpp.yml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.github/workflows/ccpp.yml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,733 @@
+name: C/C++ CI
+on: [push, pull_request]
+jobs:
+  build-ubuntu-default:
+  # checking pure lib source distribution with plain configure & make
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: configure
+      run: ./configure
+    - name: make
+      run: make
+
+  build-ubuntu-default-full-bundle-1:
+  # full bundle: enable all codecs + AEC + DTLS
+  # full bundle 1: running pjlib, pjlib-util, pjmedia, and pjsua tests
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y swig sip-tester libopencore-amrnb-dev
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h
+    - name: configure
+      run: CFLAGS="-g -fPIC" CXXFLAGS="-g -fPIC" LDFLAGS="-rdynamic" ./configure
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+    - name: set up Python 2.7 for pjsua test
+      uses: actions/setup-python@v2
+      with:
+        python-version: 2.7
+    - name: unit tests
+      run: make pjlib-test pjlib-util-test pjmedia-test pjsua-test
+
+  build-ubuntu-default-full-bundle-2:
+  # full bundle 2: running pjnath test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y libopencore-amrnb-dev
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h
+    - name: configure
+      run: CFLAGS="-g" LDFLAGS="-rdynamic" ./configure
+    - name: make
+      run: make
+    - name: unit tests
+      run: make pjnath-test
+
+  build-ubuntu-default-full-bundle-3:
+  # full bundle 3: running pjsip test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y libopencore-amrnb-dev
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h
+    - name: configure
+      run: CFLAGS="-g" LDFLAGS="-rdynamic" ./configure
+    - name: make
+      run: make
+    - name: unit tests
+      run: make pjsip-test
+
+  build-ubuntu-no-tls:
+  # no TLS
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y swig
+    - name: configure
+      run: CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure --disable-ssl
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+
+  # build-ubuntu-openssl
+  # TLS: with OpenSSL (same as build-ubuntu-default)
+
+  build-ubuntu-gnu-tls:
+  # TLS: with GnuTLS
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get update && sudo apt-get install -y --fix-missing swig libgnutls28-dev
+    - name: configure
+      run: CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure --with-gnutls=/usr/
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+
+  build-ubuntu-video-openh264-1:
+  # video: video enabled with vpx and openh264
+  # video 1: running pjlib, pjlib-util, pjmedia, and pjsua tests
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y swig nasm sip-tester libvpx-dev libopencore-amrnb-dev
+    - name: get openh264
+      run: git clone --single-branch --branch openh264v2.1.0 https://github.com/cisco/openh264.git
+    - name: build openh264
+      run: cd openh264 && make && sudo make install && sudo ldconfig
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h && echo "#define PJMEDIA_HAS_VIDEO 1" >> config_site.h
+    - name: configure
+      run: CFLAGS="-g -fPIC -DHAS_VID_CODEC_TEST=0" CXXFLAGS="-g -fPIC" LDFLAGS="-rdynamic" ./configure
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+    - name: set up Python 2.7 for pjsua test
+      uses: actions/setup-python@v2
+      with:
+        python-version: 2.7
+    - name: unit tests
+      run: make pjlib-test pjlib-util-test pjmedia-test pjsua-test
+
+  build-ubuntu-video-openh264-2:
+  # video 2: running pjnath test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y nasm libvpx-dev libopencore-amrnb-dev
+    - name: get openh264
+      run: git clone --single-branch --branch openh264v2.1.0 https://github.com/cisco/openh264.git
+    - name: build openh264
+      run: cd openh264 && make && sudo make install && sudo ldconfig
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h && echo "#define PJMEDIA_HAS_VIDEO 1" >> config_site.h
+    - name: configure
+      run: CFLAGS="-g" LDFLAGS="-rdynamic" ./configure
+    - name: make
+      run: make
+    - name: unit tests
+      run: make pjnath-test
+
+  build-ubuntu-video-openh264-3:
+  # video: 3: running pjsip test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y nasm libvpx-dev libopencore-amrnb-dev
+    - name: get openh264
+      run: git clone --single-branch --branch openh264v2.1.0 https://github.com/cisco/openh264.git
+    - name: build openh264
+      run: cd openh264 && make && sudo make install && sudo ldconfig
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h && echo "#define PJMEDIA_HAS_VIDEO 1" >> config_site.h
+    - name: configure
+      run: CFLAGS="-g" LDFLAGS="-rdynamic" ./configure
+    - name: make
+      run: make
+    - name: unit tests
+      run: make pjsip-test
+
+  build-ubuntu-video-ffmpeg:
+  # video enabled with vpx and ffmpeg and x264
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: sudo apt-get install -y swig nasm libx264-dev libvpx-dev
+    - name: get ffmpeg
+      run: git clone --single-branch --branch release/4.2 https://github.com/FFmpeg/FFmpeg.git
+    - name: configure ffmpeg
+      run: cd FFmpeg && ./configure --enable-shared --disable-static --enable-gpl --enable-libx264
+    - name: build ffmpeg
+      run: cd FFmpeg && make -j10 && sudo make install
+    - name: config site
+      run: echo -e "#define PJMEDIA_HAS_VIDEO 1\n" > pjlib/include/pj/config_site.h
+    - name: configure
+      run: CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+
+  build-mac-default:
+  # checking pure lib source distribution with plain configure & make
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: configure
+      run: ./configure
+    - name: make
+      run: make
+
+  build-mac-default-full-bundle-1:
+  # full bundle: enable all codecs + AEC + DTLS
+  # full bundle 1: running pjlib, pjlib-util, pjmedia, and pjsua tests
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl@1.1 opencore-amr swig sipp
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h
+    - name: configure
+      run: CFLAGS="-g -I/usr/local/include -I/usr/local/opt/openssl@1.1/include -fPIC" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/openssl@1.1/lib" CXXFLAGS="-g -fPIC" ./configure
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+    - name: disable firewall
+      run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+    - name: set up Python 2.7 for pjsua test
+      uses: actions/setup-python@v2
+      with:
+        python-version: 2.7
+    - name: unit tests
+      run: make pjlib-test pjmedia-test pjlib-util-test pjsua-test
+
+  build-mac-default-full-bundle-2:
+  # full bundle 2: running pjnath test
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl@1.1 opencore-amr
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h
+    - name: configure
+      run: CFLAGS="-g -I/usr/local/include -I/usr/local/opt/openssl@1.1/include" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/openssl@1.1/lib" ./configure
+    - name: make
+      run: make
+    - name: disable firewall
+      run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+    - name: unit tests
+      run: make pjnath-test
+
+  build-mac-default-full-bundle-3:
+  # full bundle 3: running pjsip test
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl@1.1 opencore-amr
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h
+    - name: configure
+      run: CFLAGS="-g -I/usr/local/include -I/usr/local/opt/openssl@1.1/include" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/openssl@1.1/lib" ./configure
+    - name: make
+      run: make
+    - name: disable firewall
+      run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+    - name: unit tests
+      run: make pjsip-test
+
+  # build-ubuntu-no-tls:
+  # no TLS (same as build-mac-default)
+
+  build-mac-openssl:
+  # TLS: with OpenSSL
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl@1.1 swig
+    - name: configure
+      run: CFLAGS="-I/usr/local/include -I/usr/local/opt/openssl@1.1/include -fPIC" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/openssl@1.1/lib" CXXFLAGS="-fPIC" ./configure
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+
+  build-mac-gnu-tls:
+  # TLS: with GnuTLS
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install swig
+    - name: configure
+      run: CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure --with-gnutls=/usr/local/
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+
+  build-mac-video-openh264-1:
+  # video: video enabled with vpx and openh264
+  # video 1: running pjlib, pjlib-util, pjmedia, and pjsua tests
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl@1.1 openh264 libvpx opencore-amr swig sipp 
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h && echo "#define PJMEDIA_HAS_VIDEO 1" >> config_site.h
+    - name: configure
+      run: CFLAGS="-g -I/usr/local/include -I/usr/local/opt/openssl@1.1/include -DHAS_VID_CODEC_TEST=0 -fPIC" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/openssl@1.1/lib" CXXFLAGS="-g -fPIC" ./configure
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+    - name: disable firewall
+      run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+    - name: set up Python 2.7 for pjsua test
+      uses: actions/setup-python@v2
+      with:
+        python-version: 2.7
+    - name: unit tests
+      run: make pjlib-test pjmedia-test pjlib-util-test pjsua-test
+
+  build-mac-video-openh264-2:
+  # video 2: running pjnath test
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl@1.1 openh264 libvpx opencore-amr
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h && echo "#define PJMEDIA_HAS_VIDEO 1" >> config_site.h
+    - name: configure
+      run: CFLAGS="-g -I/usr/local/include -I/usr/local/opt/openssl@1.1/include" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/openssl@1.1/lib" ./configure
+    - name: make
+      run: make
+    - name: disable firewall
+      run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+    - name: unit tests
+      run: make pjnath-test
+
+  build-mac-video-openh264-3:
+  # video 3: running pjsip test
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl@1.1 openh264 libvpx opencore-amr
+    - name: config site
+      run: cd pjlib/include/pj && cp config_site_test.h config_site.h && echo "#define PJMEDIA_HAS_VIDEO 1" >> config_site.h
+    - name: configure
+      run: CFLAGS="-g -I/usr/local/include -I/usr/local/opt/openssl@1.1/include" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/openssl@1.1/lib" ./configure
+    - name: make
+      run: make
+    - name: disable firewall
+      run: sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
+    - name: unit tests
+      run: make pjsip-test
+
+  build-mac-video-ffmpeg:
+  # video enabled with vpx and ffmpeg and x264
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl@1.1 x264 libvpx nasm swig
+    - name: get ffmpeg
+      run: git clone --single-branch --branch release/4.2 https://github.com/FFmpeg/FFmpeg.git
+    - name: configure ffmpeg
+      run: cd FFmpeg && ./configure --enable-shared --disable-static --enable-gpl --enable-libx264
+    - name: build ffmpeg
+      run: cd FFmpeg && make -j10 && sudo make install
+    - name: config site
+      run: echo -e "#define PJMEDIA_HAS_VIDEO 1\n" > pjlib/include/pj/config_site.h
+    - name: configure
+      run: CFLAGS="-I/usr/local/include -I/usr/local/opt/openssl@1.1/include -fPIC" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/openssl@1.1/lib" CXXFLAGS="-fPIC" ./configure
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+
+  build-mac-video-vid-toolbox:
+  # video enabled with vpx and video toolbox
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install dependencies
+      run: brew install openssl@1.1 libvpx swig
+    - name: config site
+      run: echo -e "#define PJMEDIA_HAS_VIDEO 1\n#define PJMEDIA_HAS_VID_TOOLBOX_CODEC 1\n" > pjlib/include/pj/config_site.h
+    - name: configure
+      run: CFLAGS="-I/usr/local/include -I/usr/local/opt/openssl@1.1/include -fPIC" LDFLAGS="-L/usr/local/lib -L/usr/local/opt/openssl@1.1/lib" CXXFLAGS="-fPIC" ./configure
+    - name: make
+      run: make
+    - name: swig bindings
+      run: cd pjsip-apps/src/swig && make
+
+  build-windows-default:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: get swig
+      run: Invoke-WebRequest -Uri "http://nchc.dl.sourceforge.net/project/swig/swigwin/swigwin-4.0.1/swigwin-4.0.1.zip"  -OutFile ".\swigwin.zip"
+      shell: powershell
+    - name: expand swig
+      run: |
+        Expand-Archive -LiteralPath .\swigwin.zip -DestinationPath .\swigwin\; pwd
+        cd swigwin\swigwin-4.0.1
+        Add-Content ..\..\swig_path.txt $pwd.Path
+      shell: powershell
+    - name: config site
+      run:
+        type nul > pjlib/include/pj/config_site.h
+      shell: cmd
+    - name: MSBuild
+      run: |
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        msbuild pjproject-vs14.sln /p:PlatformToolset=v143 /p:Configuration=Debug /p:Platform=win32
+      shell: cmd
+    - name: build swig
+      run: |
+        set /P SWIG_PATH=<swig_path.txt
+        set PATH=%PATH%;%SWIG_PATH%
+        dir pjlib/include/pj/config_site.h
+        type pjlib/include/pj/config_site.h
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        set INCLUDE=%INCLUDE%;%JAVA_HOME%\include;%JAVA_HOME%\include\win32
+        cd pjsip-apps/build
+        msbuild swig_java_pjsua2.vcxproj /p:PlatformToolset=v143 /p:Configuration=Debug /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+
+  build-windows-with-openssl-unit-test-1:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: get openssl
+      run: Invoke-WebRequest -Uri "https://mirror.firedaemon.com/OpenSSL/openssl-1.1.1l.zip" -OutFile ".\openssl.zip"
+      shell: powershell
+    - name: expand openssl
+      run: |
+        Expand-Archive -LiteralPath .\openssl.zip -DestinationPath .\openssl_build\;
+        cd openssl_build\openssl-1.1\x86
+        Add-Content ..\..\..\openssl_dir.txt $pwd.Path
+      shell: powershell
+    - name: check openssl folder
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        dir %OPENSSL_DIR%\include
+        dir %OPENSSL_DIR%\lib
+      shell: cmd
+    - name: config site
+      run:
+        cd pjlib/include/pj; cp config_site_test.h config_site.h; Add-Content config_site.h "#define PJ_HAS_SSL_SOCK 1"
+      shell: powershell
+    - name: check VsDevCmd.bat
+      run: dir "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+      shell: cmd
+    - name: MSBuild
+      working-directory: .
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        set INCLUDE=%INCLUDE%;%OPENSSL_DIR%\include
+        set LIB=%LIB%;%OPENSSL_DIR%\lib
+        msbuild pjproject-vs14.sln /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+    - name: unit tests
+      run: |
+        $env:OPENSSL_DIR = Get-Content .\openssl_dir.txt
+        $env:PATH+=";$env:OPENSSL_DIR\bin"
+        cd pjlib/bin; ./pjlib-test-i386-Win32-vc14-Release.exe
+        cd ../../pjlib-util/bin; ./pjlib-util-test-i386-Win32-vc14-Release.exe
+        cd ../../pjmedia/bin/; ./pjmedia-test-i386-Win32-vc14-Release.exe
+      shell: powershell
+
+  build-windows-with-openssl-unit-test-2:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: get openssl
+      run: Invoke-WebRequest -Uri "https://mirror.firedaemon.com/OpenSSL/openssl-1.1.1l.zip" -OutFile ".\openssl.zip"
+      shell: powershell
+    - name: expand openssl
+      run: |
+        Expand-Archive -LiteralPath .\openssl.zip -DestinationPath .\openssl_build\; pwd
+        cd openssl_build\openssl-1.1\x86
+        Add-Content ..\..\..\openssl_dir.txt $pwd.Path
+      shell: powershell
+    - name: check openssl folder
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        dir "%OPENSSL_DIR%\include"
+        dir "%OPENSSL_DIR%\lib"
+      shell: cmd
+    - name: config site
+      run:
+        cd pjlib/include/pj; cp config_site_test.h config_site.h; Add-Content config_site.h "#define PJ_HAS_SSL_SOCK 1"
+      shell: powershell
+    - name: check VsDevCmd.bat
+      run: dir "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+      shell: cmd
+    - name: MSBuild
+      working-directory: .
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        set INCLUDE=%INCLUDE%;%OPENSSL_DIR%\include
+        set LIB=%LIB%;%OPENSSL_DIR%\lib
+        msbuild pjproject-vs14.sln /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+    - name: build test tools cmp_wav
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        cd tests/pjsua/tools
+        set INCLUDE=%INCLUDE%;%OPENSSL_DIR%\include
+        set LIB=%LIB%;%OPENSSL_DIR%\lib
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        msbuild cmp_wav.vcxproj /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+    - name: set up Python 2.7 for pjsua test
+      uses: actions/setup-python@v2
+      with:
+        python-version: 2.7
+    - name: unit tests
+      run: |
+        $env:OPENSSL_DIR = Get-Content .\openssl_dir.txt
+        $env:PATH+=";$env:OPENSSL_DIR\bin"
+        cd tests/pjsua; python runall.py
+        cd ../../pjsip/bin; ./pjsip-test-i386-Win32-vc14-Release.exe
+      shell: powershell
+
+  build-windows-gnu-tls:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: get gnutls
+      run: Invoke-WebRequest -Uri "https://github.com/ShiftMediaProject/gnutls/releases/download/gnutls_3_6_11/libgnutls_gnutls_3_6_11_msvc14.zip" -Outfile ".\libgnutls.zip"
+      shell: powershell
+    - name: expand gnutls
+      run: |
+        Expand-Archive -LiteralPath .\libgnutls.zip -DestinationPath .\libgnutls_build\; pwd
+        cd libgnutls_build
+        Add-Content ..\libgnutls_dir.txt $pwd.Path
+      shell: powershell
+    - name: check gnutls folder
+      run: |
+        set /P LIBGNUTLS_DIR=<libgnutls_dir.txt
+        dir "%LIBGNUTLS_DIR%\include"
+        dir "%LIBGNUTLS_DIR%\lib\x86"
+      shell: cmd
+    - name: config site
+      run: |
+        echo "" > pjlib\include\pj\config_site.h
+        Add-Content config_site.h "#define PJ_HAS_SSL_SOCK 1"
+        Add-Content config_site.h "#define PJ_SSL_SOCK_IMP PJ_SSL_SOCK_IMP_GNUTLS"
+      shell: powershell
+    - name: check VsDevCmd.bat
+      run: dir "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+      shell: cmd
+    - name: MSBuild
+      working-directory: .
+      run: |
+        set /P LIBGNUTLS_DIR=<gnutls_dir.txt
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        set INCLUDE=%INCLUDE%;%LIBGNUTLS_DIR%\include
+        set LIB=%LIB%;%LIBGNUTLS_DIR%\lib\x86
+        msbuild pjproject-vs14.sln /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+
+  build-windows-with-video-libvpx-unit-test-1:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: get openssl
+      run: Invoke-WebRequest -Uri "https://mirror.firedaemon.com/OpenSSL/openssl-1.1.1l.zip" -OutFile ".\openssl.zip"
+      shell: powershell
+    - name: expand openssl
+      run: |
+        Expand-Archive -LiteralPath .\openssl.zip -DestinationPath .\openssl_build\; pwd
+        cd openssl_build\openssl-1.1\x86
+        Add-Content ..\..\..\openssl_dir.txt $pwd.Path
+      shell: powershell
+    - name: check openssl folder
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        dir "%OPENSSL_DIR%\include"
+        dir "%OPENSSL_DIR%\lib"
+      shell: cmd
+    - name: get libvpx
+      run: Invoke-WebRequest -Uri "https://github.com/ShiftMediaProject/libvpx/releases/download/v1.8.2/libvpx_v1.8.2_msvc14.zip" -Outfile "libvpx.zip"
+      shell: powershell
+    - name: expand libvpx
+      run: |
+        Expand-Archive -LiteralPath .\libvpx.zip -DestinationPath .\libvpx_build\; pwd
+        cd libvpx_build
+        Add-Content ..\libvpx_dir.txt $pwd.Path
+      shell: powershell
+    - name: check libvpx folder
+      run: |
+        set /P LIBVPX_DIR=<libvpx_dir.txt
+        dir "%LIBVPX_DIR%\include"
+        dir "%LIBVPX_DIR%\lib\x86"
+      shell: cmd
+    - name: get libsdl
+      run: Invoke-WebRequest -Uri "https://github.com/ShiftMediaProject/SDL/releases/download/release-2.0.9/libsdl_release-2.0.9_msvc14.zip" -Outfile ".\libsdl.zip"
+      shell: powershell
+    - name: expand libsdl
+      run: |
+        Expand-Archive -LiteralPath .\libsdl.zip -DestinationPath .\libsdl_build\; pwd
+        cd libsdl_build
+        Add-Content ..\libsdl_dir.txt $pwd.Path
+      shell: powershell
+    - name: check libsdl folder
+      run: |
+        set /P LIBSDL_DIR=<libsdl_dir.txt
+        dir "%LIBSDL_DIR%\include\SDL"
+        dir "%LIBSDL_DIR%\lib\x86"
+      shell: cmd
+    - name: config site
+      run: |
+        cd pjlib/include/pj; cp config_site_test.h config_site.h
+        Add-Content config_site.h "#define PJ_HAS_SSL_SOCK 1"
+        Add-Content config_site.h "#define PJMEDIA_HAS_VIDEO 1"
+        Add-Content config_site.h "#define PJMEDIA_VIDEO_DEV_HAS_DSHOW 1"
+        Add-Content config_site.h "#define PJMEDIA_HAS_LIBYUV 1"
+        Add-Content config_site.h "#define PJMEDIA_VIDEO_DEV_HAS_SDL 1"
+        Add-Content config_site.h "#define PJMEDIA_HAS_VPX_CODEC 1"
+      shell: powershell
+    - name: check VsDevCmd.bat
+      run: dir "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+      shell: cmd
+    - name: MSBuild
+      working-directory: .
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        set /P LIBVPX_DIR=<libvpx_dir.txt
+        set /P LIBSDL_DIR=<libsdl_dir.txt
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        set INCLUDE=%INCLUDE%;%OPENSSL_DIR%\include;%LIBVPX_DIR%\include;%LIBSDL_DIR%\include\SDL
+        set LIB=%LIB%;%OPENSSL_DIR%\lib;%LIBVPX_DIR%\lib\x86;%LIBSDL_DIR%\lib\x86
+        msbuild pjproject-vs14.sln /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+    - name: build test tools cmp_wav
+      run: |
+        set /P OPENSSL_DIR=<openssl_dir.txt
+        set /P LIBVPX_DIR=<libvpx_dir.txt
+        set /P LIBSDL_DIR=<libsdl_dir.txt
+        cd tests/pjsua/tools
+        set INCLUDE=%INCLUDE%;%OPENSSL_DIR%\include;%LIBVPX_DIR%\include;%LIBSDL_DIR%\include\SDL
+        set LIB=%LIB%;%OPENSSL_DIR%\lib;%LIBVPX_DIR%\lib\x86;%LIBSDL_DIR%\lib\x86
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        msbuild cmp_wav.vcxproj /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
+    - name: set up Python 2.7 for pjsua test
+      uses: actions/setup-python@v2
+      with:
+        python-version: 2.7
+    - name: unit tests
+      run: |
+        $env:OPENSSL_DIR = Get-Content .\openssl_dir.txt
+        $env:LIBVPX_DIR = Get-Content .\libvpx_dir.txt
+        $env:LIBSDL_DIR = Get-Content .\libsdl_dir.txt
+        $env:PATH+=";$env:OPENSSL_DIR\bin;$env:LIBVPX_DIR\bin\x86;$env:LIBSDL_DIR\bin\x86;"
+        cd tests/pjsua; python runall.py        
+        cd ../../pjlib/bin; ./pjlib-test-i386-Win32-vc14-Release.exe
+        cd ../../pjlib-util/bin; ./pjlib-util-test-i386-Win32-vc14-Release.exe
+        cd ../../pjmedia/bin/; ./pjmedia-test-i386-Win32-vc14-Release.exe
+      shell: powershell
+
+  build-windows-video-ffmpeg:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: get ffmpeg
+      run: Invoke-WebRequest -Uri "https://github.com/ShiftMediaProject/FFmpeg/releases/download/4.3.r96746/libffmpeg_4.3.r96746_msvc14_x86.zip" -Outfile "libffmpeg.zip"
+      shell: powershell
+    - name: expand ffmpeg
+      run: |
+        Expand-Archive -LiteralPath .\libffmpeg.zip -DestinationPath .\libffmpeg_build\; pwd
+        cd libffmpeg_build
+        Add-Content ..\libffmpeg_dir.txt $pwd.Path
+      shell: powershell
+    - name: check ffmpeg folder
+      run: |
+        set /P LIBFFMPEG_DIR=<libffmpeg_dir.txt
+        dir "%LIBFFMPEG_DIR%\include"
+        dir "%LIBFFMPEG_DIR%\lib\x86"
+      shell: cmd
+    - name: get libx264
+      run: Invoke-WebRequest -Uri "https://github.com/ShiftMediaProject/x264/releases/download/0.159.r2991/libx264_0.159.r2991_msvc14.zip" -Outfile ".\libx264.zip"
+      shell: powershell
+    - name: expand libx264
+      run: |
+        Expand-Archive -LiteralPath .\libx264.zip -DestinationPath .\libx264_build\; pwd
+        cd libx264_build
+        Add-Content ..\libx264_dir.txt $pwd.Path
+      shell: powershell
+    - name: check libx264 folder
+      run: |
+        set /P LIBX264_DIR=<libx264_dir.txt
+        dir "%LIBX264_DIR%\include"
+        dir "%LIBX264_DIR%\lib\x86"
+      shell: cmd
+    - name: get libsdl
+      run: Invoke-WebRequest -Uri "https://github.com/ShiftMediaProject/SDL/releases/download/release-2.0.9/libsdl_release-2.0.9_msvc14.zip" -Outfile ".\libsdl.zip"
+      shell: powershell
+    - name: expand libsdl
+      run: |
+        Expand-Archive -LiteralPath .\libsdl.zip -DestinationPath .\libsdl_build\; pwd
+        cd libsdl_build
+        Add-Content ..\libsdl_dir.txt $pwd.Path
+      shell: powershell
+    - name: check libsdl folder
+      run: |
+        set /P LIBSDL_DIR=<libsdl_dir.txt
+        dir "%LIBSDL_DIR%\include\SDL"
+        dir "%LIBSDL_DIR%\lib\x86"
+      shell: cmd
+    - name: config site
+      run: |
+        echo "" > pjlib\include\pj\config_site.h
+        Add-Content config_site.h "#define PJMEDIA_HAS_VIDEO 1"
+        Add-Content config_site.h "#define PJMEDIA_HAS_FFMPEG 1"
+        Add-Content config_site.h "#define PJMEDIA_HAS_FFMPEG_VID_CODEC 1"
+        Add-Content config_site.h "#define PJMEDIA_VIDEO_DEV_HAS_FFMPEG 1"
+        Add-Content config_site.h "#define PJMEDIA_VIDEO_DEV_HAS_SDL 1"
+      shell: powershell
+    - name: check VsDevCmd.bat
+      run: dir "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+      shell: cmd
+    - name: MSBuild
+      working-directory: .
+      run: |
+        set /P LIBFFMPEG_DIR=<libffmpeg_dir.txt
+        set /P LIBX264_DIR=<libx264_dir.txt
+        set /P LIBSDL_DIR=<libsdl_dir.txt
+        call "%PROGRAMFILES%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+        set INCLUDE=%INCLUDE%;%LIBFFMPEG_DIR%\include;%LIBX264_DIR%\include;%LIBSDL_DIR%\include\SDL
+        set LIB=%LIB%;%LIBFFMPEG_DIR%\lib\x86;%LIBX264_DIR%\lib\x86;%LIBSDL_DIR%\lib\x86
+        msbuild pjproject-vs14.sln /p:PlatformToolset=v143 /p:Configuration=Release /p:Platform=win32 /p:UseEnv=true
+      shell: cmd
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.github/workflows/codeql-analysis.yml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.github/workflows/codeql-analysis.yml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.github/workflows/codeql-analysis.yml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.github/workflows/codeql-analysis.yml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,66 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+  schedule:
+    - cron: '0 22 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['cpp', 'python']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file. 
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    # - name: Autobuild
+    #   uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+    - run: |
+       ./configure --disable-libyuv --disable-libwebrtc --disable-speex-codec --disable-speex-aec
+       make
+       mv tests/pjsua/inc_cfg.py tests/pjsua/inc_cfg.txt
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.gitignore asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.gitignore
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/.gitignore	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,72 @@
+pjlib/include/pj/config_site.h
+lib/
+bin/
+output/
+
+# VS stuff
+*.ncb
+*.suo
+*.cache
+*.resw
+.vs/
+.vscode/
+**/build/**/*.vcproj.*.user
+**/build/**/*.vcxproj.*.user
+**/build/**/*.vcproj.user
+**/build/**/*.vcxproj.user
+**/Win32/Debug
+**/x64/Debug
+**/x86/Debug
+UpgradeLog*.htm
+# VS 2015 stuff
+*.pdb
+*.db
+*.opendb
+samples.log
+
+# GNU stuff
+config.log
+config.status
+build.mak
+user.mak
+cc-auto.mak
+os-auto.mak
+m_auto.h
+os_auto.h
+config_auto.h
+sip_autoconf.h
+*.depend
+
+# Apple stuff
+*.DS_Store
+autom4te.cache
+xcuserdata
+pjsip-apps/src/pjsua/ios*/lib*.a
+pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.xcworkspace/
+pjsip-apps/src/pjsua/ios/ipjsua.xcworkspace/xcshareddata
+pjsip-apps/src/pjsua/ios-swift/Libraries/
+pjsip-apps/src/pjsua2/ios-swift-pjsua2/Libraries/
+
+# SWIG Java/Android stuff
+pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/*.java
+pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/PjCamera*.java
+pjsip-apps/src/swig/java/android/app/src/main/jniLibs/
+
+# SWIG CSharp/Xamarin stuff
+pjsip-apps/src/swig/csharp/pjsua2xamarin/
+
+# SWIG Python stuff
+pjsip-apps/src/swig/python/build/
+pjsip-apps/src/swig/python/pjsua2.py
+pjsip-apps/src/swig/python/pjsua2_wrap.*
+
+# unit tests files
+tests/pjsua/*.pyc
+tests/pjsua/scripts-*/*.pyc
+tests/pjsua/*.log
+tests/pjsua/wavs/tmp*.wav
+tests/pjsua/tools/cmp_wav
+tests/pjsua/tools/cmp_wav.dSYM
+tests/pjsua/logs
+# benchmark output
+*bench*.htm
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/libpjproject.pc.in asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/libpjproject.pc.in
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/libpjproject.pc.in	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/libpjproject.pc.in	2022-02-24 07:54:38.000000000 +0000
@@ -9,5 +9,6 @@
 Description: Multimedia communication library
 URL: http://www.pjsip.org
 Version: @PJ_VERSION@
-Libs: -L${libdir} @PJ_LDXXLIBS@
-Cflags: -I${includedir} @PJ_INSTALL_CXXFLAGS@
+Libs: @PJ_INSTALL_LDFLAGS@
+Libs.private: @PJ_INSTALL_LDFLAGS_PRIVATE@
+Cflags: @PJ_INSTALL_CFLAGS@
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/Makefile asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/Makefile
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/Makefile	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/Makefile	2022-02-24 07:54:38.000000000 +0000
@@ -54,14 +54,14 @@
 		    exit 1; \
 		fi; \
 	done
-	
+
 LIBS = 	pjlib/lib/libpj-$(TARGET_NAME).a \
 	pjlib-util/lib/libpjlib-util-$(TARGET_NAME).a \
 	pjnath/lib/libpjnath-$(TARGET_NAME).a \
 	pjmedia/lib/libpjmedia-$(TARGET_NAME).a \
 	pjmedia/lib/libpjmedia-audiodev-$(TARGET_NAME).a \
 	pjmedia/lib/libpjmedia-codec-$(TARGET_NAME).a \
-    	pjsip/lib/libpjsip-$(TARGET_NAME).a \
+	pjsip/lib/libpjsip-$(TARGET_NAME).a \
 	pjsip/lib/libpjsip-ua-$(TARGET_NAME).a \
 	pjsip/lib/libpjsip-simple-$(TARGET_NAME).a \
 	pjsip/lib/libpjsua-$(TARGET_NAME).a
@@ -113,13 +113,19 @@
 pjsip-test: pjsip/bin/pjsip-test-$(TARGET_NAME)
 	cd pjsip/build && ../bin/pjsip-test-$(TARGET_NAME)
 
-pjsua-test:
+pjsua-test: cmp_wav
 	cd tests/pjsua && python runall.py
 
+cmp_wav:
+	cd tests/pjsua/tools && make
+
 install:
 	mkdir -p $(DESTDIR)$(libdir)/
-#	cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/
-	cp -af $(APP_LIBXX_FILES) $(DESTDIR)$(libdir)/
+	if [ "$(PJ_EXCLUDE_PJSUA2)x" = "x" ] ; then \
+	    cp -af $(APP_LIBXX_FILES) $(DESTDIR)$(libdir)/; \
+	else \
+	    cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/; \
+	fi
 	mkdir -p $(DESTDIR)$(includedir)/
 	for d in pjlib pjlib-util pjnath pjmedia pjsip; do \
 		cp -RLf $$d/include/* $(DESTDIR)$(includedir)/; \
@@ -129,10 +135,9 @@
 		sed -e "s!@INCLUDEDIR@!$(includedir)!" | \
 		sed -e "s!@LIBDIR@!$(libdir)!" | \
 		sed -e "s/@PJ_VERSION@/$(PJ_VERSION)/" | \
-		sed -e "s!@PJ_LDLIBS@!!" | \
-		sed -e "s!@PJ_LDXXLIBS@!$(PJ_LDXXLIBS)!" | \
-		sed -e "s!@PJ_INSTALL_CFLAGS@!!" | \
-		sed -e "s!@PJ_INSTALL_CXXFLAGS@!$(PJ_INSTALL_CXXFLAGS)!" > $(DESTDIR)/$(libdir)/pkgconfig/libpjproject.pc
+		sed -e "s!@PJ_INSTALL_LDFLAGS@!$(PJ_INSTALL_LDFLAGS)!" | \
+		sed -e "s!@PJ_INSTALL_LDFLAGS_PRIVATE@!$(PJ_INSTALL_LDFLAGS_PRIVATE)!" | \
+		sed -e "s!@PJ_INSTALL_CFLAGS@!$(PJ_INSTALL_CFLAGS)!" > $(DESTDIR)$(libdir)/pkgconfig/libpjproject.pc
 
 uninstall:
 	$(RM) $(DESTDIR)$(libdir)/pkgconfig/libpjproject.pc
@@ -143,5 +148,5 @@
 		done; \
 	done
 	rmdir $(DESTDIR)$(includedir) 2> /dev/null || true
-	$(RM) $(addprefix $(DESTDIR)$(libdir)/,$(notdir $(APP_LIB_FILES)))
+	$(RM) $(addprefix $(DESTDIR)$(libdir)/,$(notdir $(APP_LIBXX_FILES)))
 	rmdir $(DESTDIR)$(libdir) 2> /dev/null || true
Binary files /tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/build/cacert.der and /tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/build/cacert.der differ
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/build/cacert.pem asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/build/cacert.pem
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/build/cacert.pem	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/build/cacert.pem	2022-02-24 07:54:38.000000000 +0000
@@ -1,14 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIJAIa9mZggMk2WMA0GCSqGSIb3DQEBBAUAMDMxEjAQBgNV
-BAMTCXBqc2lwLmxhYjEdMBsGCSqGSIb3DQEJARYOdGVzdEBwanNpcC5sYWIwHhcN
-MTAwMjEwMDkwNTQ0WhcNMjAwMjA4MDkwNTQ0WjAzMRIwEAYDVQQDEwlwanNpcC5s
-YWIxHTAbBgkqhkiG9w0BCQEWDnRlc3RAcGpzaXAubGFiMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDI9T0Pf+1gKOTOAGEpZ481Q6xfm5vz6n1+6udxzQtfPKlQ
-rPD5x5im2u3tmy6ABxZeY5tCdeikBPiGlc5bRIRng6KM8kidkg3gEhwhRUxHCMWb
-mBpkz7rFERf/pWAOCqYCiy1RT8QrK+XOFoFdJhdF85UPDEUw+pHEsYetTDs9RQID
-AQABo1AwTjBMBgNVHREERTBDgglwanNpcC5sYWKCDXNpcC5wanNpcC5sYWKBDnRl
-c3RAcGpzaXAubGFihhFzaXA6c2lwLnBqc2lwLmxhYocEfwAAATANBgkqhkiG9w0B
-AQQFAAOBgQCLPl/WF1QvjT36kVLH0nxfHwDOJuAzlh6nv9rYBviOLw9FTEMgW6hA
-oG55YSdVjTnMynTMOH/kVp4Vxlk46A8neE+/LI8RPh6lJh52vb+iPAtBpsQoq06T
-+u4DfJcN8Y/jy+QAn78jryKjwKuZWfuWny9gxsLWMUbH5Bc6v6wfQQ==
+MIIFNDCCAxygAwIBAgIUeMZNwp8GnetvaGka8ktFmsvLwbcwDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJcGpzaXAubGFiMB4XDTIwMTIxMTEwMTI1M1oXDTMwMTIw
+OTEwMTI1M1owFDESMBAGA1UEAwwJcGpzaXAubGFiMIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEAp2uZV8GB+s3A2UvBlGbHk5GdONHFXPT1PxZCTP+fsP3j
+A7SxwmCu7rq/oSGygHgkcX+bh7tGRtZDbS5DMzmhfRTUcHegTLFltf+L7JlT/M3O
+wbdssOI+YLlnGAY98qchMs8S9Ij5oaXvGh68PC21epyJHYoaWRqf33Qvndx3Wclo
+hgINHULPnDzT62HlkIeVgdGvgbitAaVwjUqIY2zQYVaKMxqurjeexeiPJpbwVvCy
+6MQ33lw16monU+jbnHHpnHsbEL7RMNDg+950figM8EFLyFMkUtK4ZZyOEWJhrbtS
+v/N692+EG2j2seC/QHkhDqlFYVKRDIYLelwIuR1lPWV5IXPPFX+yHgUcvSJQpsbp
+B/0SG0IbxQIol615MEpBGbeL1T4I6KXilTTdnD8ROIVx3rkvu+9SCD26L1eRfLl9
+N2N7wXScjInCRxMdvbb9Dja5hSjv2VSXJPmtK9b+8BL698XSkK4BfU6G0fYohDFg
+UJVFqDttOc4EhcwvNm5hNgiIgFzEoZ8y0BGtYwmi4B2BVtMud5LJZo/txLWkd/L+
+hdkO9FqPCDvFEIVtmD4xpczNpy4BhSczG7xUuul03qj0aZW94AdrO00fBMOTT8wF
+gyvtPkMP0CRnbyUpaGiv3NdO2AndIdHCE0oi67J5RajD1RGwPMErvfxXBYnek0UC
+AwEAAaN+MHwwHQYDVR0OBBYEFF6rnJ5vs8hTda7vbDQYWmekykW3MB8GA1UdIwQY
+MBaAFF6rnJ5vs8hTda7vbDQYWmekykW3MA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0R
+BCIwIIINc2lwLnBqc2lwLmxhYoIJcGpzaXAubGFihwR/AAABMA0GCSqGSIb3DQEB
+CwUAA4ICAQCXrMnVDhCAIZBduL8yeXOxKwnxDC9OB1GcOESbD3Rxorm2AI/jdbob
+xBG5yhU587NZDpkjZcwjyjAxQOwvuX8b/EXWKqSS1lf/nvLXm5bGwIORpbhpVtac
+UI6lmRPAyAEu59HLUuidqjkerGOeKYN91KSAFuWl78zBEXd58a6RfZ4ALpKO9X+a
+od1jGYLdRaWq8/pwZub/VOcgk/gCifpK/cgST/mg4pUBoPo1w2kR5kccxDMK+6jy
+3xbm18UItoxomLzUfyKNwQ1XTsZor3f9f0vX/hpPjpvcqzgSh0Ei6XiRFRClSaUv
+DrHqny6jOMzt92Nyu804ALpN9gRi5y2ayDYuR4RTZ8dSuEqUbhllfvHgRo1x6MmA
+i5uxVJca4nJwINWpZGkGk4RAeDVbdgHZoSsK3a1sWTqvvt/Dz5Srl6ilvG1ZiHZX
+Tbihc54gpNx5BzLndbaCMJ74MIOCcAvn5pos2CgPaOPUQPcAFG/0+IqIM2kzmr1Z
+LkdSVEOQ96BT4KEHKIEgTSNrv4/hA6XpmN0e/w07cNY3o5besXBfR85VV+nuceKw
+cg9WqbaooDjTLdb7c+lhifHFtZRuKr2YHW7UMEeJO36MLDtj52m5RRMB2T4+wL+V
+YaCSfdNI6I1/ZCY9FlwG+5qdmvJio6ueZDCX5CxcsZb4YraIis460A==
 -----END CERTIFICATE-----
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/build/pjlib_test.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/build/pjlib_test.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/build/pjlib_test.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/build/pjlib_test.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -78,7 +102,7 @@
   <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}</ProjectGuid>
-    <RootNamespace>pjlib_test</RootNamespace>    
+    <RootNamespace>pjlib_test</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -161,36 +185,72 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
@@ -267,31 +327,61 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -345,6 +435,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -383,6 +487,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -422,6 +539,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -460,6 +591,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -499,6 +643,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -537,6 +695,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjlib-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\pjlib-test\activesock.c" />
     <ClCompile Include="..\src\pjlib-test\atomic.c" />
@@ -557,41 +728,53 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pjlib-test\main_win32.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pjlib-test\mutex.c" />
     <ClCompile Include="..\src\pjlib-test\os.c" />
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/build/pjlib_test.vcxproj.filters asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/build/pjlib_test.vcxproj.filters
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/build/pjlib_test.vcxproj.filters	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/build/pjlib_test.vcxproj.filters	2022-02-24 07:54:38.000000000 +0000
@@ -117,6 +117,9 @@
     <ClCompile Include="..\src\pjlib-test\util.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\pjlib-test\main.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\pjlib-test\test.h">
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/build/pjlib.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/build/pjlib.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/build/pjlib.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/build/pjlib.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -148,31 +172,61 @@
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
@@ -247,31 +301,61 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -307,6 +391,16 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -332,6 +426,15 @@
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -357,6 +460,16 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -381,6 +494,15 @@
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -406,6 +528,16 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -430,6 +562,15 @@
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\third_party\threademulation\src\ThreadEmulation.cpp">
       <ExcludedFromBuild Condition="'$(API_Family)'=='WinDesktop'">true</ExcludedFromBuild>
@@ -450,21 +591,27 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\addr_resolv_sock.c" />
     <ClCompile Include="..\src\pj\array.c" />
@@ -478,21 +625,27 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\file_io_win32.c" />
     <ClCompile Include="..\src\pj\guid.c" />
@@ -500,21 +653,27 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\guid_win32.c" />
     <ClCompile Include="..\src\pj\hash.c" />
@@ -522,102 +681,132 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\ioqueue_dummy.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\ioqueue_epoll.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\ioqueue_select.c" />
     <ClCompile Include="..\src\pj\ioqueue_winnt.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\ip_helper_winphone8.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\ip_helper_win32.c">
       <ExcludedFromBuild Condition="'$(API_Family)'!='WinDesktop'">true</ExcludedFromBuild>
@@ -632,63 +821,81 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\log_writer_stdout.c" />
     <ClCompile Include="..\src\pj\os_core_unix.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\os_core_win32.c" />
     <ClCompile Include="..\src\pj\os_error_unix.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\os_error_win32.c" />
     <ClCompile Include="..\src\pj\os_info.c" />
@@ -697,21 +904,27 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\os_timestamp_win32.c" />
     <ClCompile Include="..\src\pj\os_time_win32.c" />
@@ -723,21 +936,27 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\pool_policy_malloc.c" />
     <ClCompile Include="..\src\pj\rand.c" />
@@ -755,21 +974,27 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>        
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\ssl_sock_ossl.c" />
     <ClCompile Include="..\src\pj\ssl_sock_gtls.c" />
@@ -778,21 +1003,27 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pj\timer.c" />
     <ClCompile Include="..\src\pj\types.c" />
Binary files /tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/build/privkey.p12 and /tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/build/privkey.p12 differ
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/build/privkey.pem asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/build/privkey.pem
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/build/privkey.pem	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/build/privkey.pem	2022-02-24 07:54:38.000000000 +0000
@@ -1,15 +1,54 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDI9T0Pf+1gKOTOAGEpZ481Q6xfm5vz6n1+6udxzQtfPKlQrPD5
-x5im2u3tmy6ABxZeY5tCdeikBPiGlc5bRIRng6KM8kidkg3gEhwhRUxHCMWbmBpk
-z7rFERf/pWAOCqYCiy1RT8QrK+XOFoFdJhdF85UPDEUw+pHEsYetTDs9RQIDAQAB
-AoGAGV+1xQY/H7wqH8S2f/begzg3RJ8uUt8R13urm5frTqwnKNOdXbyRDshn8G9+
-sJW0gliLWxnuNP+Xrc6ujqGZIguK/yAxJ3LprAN2Ay1lW2ONyZNMquBeIY5Txhyy
-SnU7U+NQYgA3+w9T7O7YQ575TTDm2gri558jIx8t55Wo9sUCQQDtjfGZ3sYXwpxR
-MvtdtfwDxSKhf6glT6dn7/37KITBZXFy6Eb/tHrEEUuwR46g30vTd2JElCB+QExu
-4sZDt813AkEA2I/WXdGVRXtHzVivf3AnqWyXfrfAAXlBmEkgPyIPwE1+mxeNxkU7
-TRn0MOqAfbQW4+GRIYCKSBLodRnRq2iKIwJBAJLYa8DyNQH7CyYmnbwQAvlRo1ax
-0v89ff6CHD5ljar/SmH9s+XdawZIqsENet13KyhNZDGAX5WrqZPiGy1BMYECQQC1
-FREawfUfdEZF3rJgzVdcxACpZNyYXtwKipr8L28cTbBf3wIdmCZOAjW98VgfxEaf
-pi3E5ca7HZRi1oQL4A4hAkEA5koHCQYl+5PDjbLtxl0VyVCpmT9BrcZ99MS+ZEaW
-2+HpKIhXrEFxePQaWbCaW7gjKmKUwC0qqu0moedqJC3mzg==
------END RSA PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIJnDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQILwghSQuUF7MCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHKyWOypiKo0BIIJSCS86LhyHmGK
+oXggCF/oKjtnvSU6r29qAw2SU9DaW8/vQP32JdTZE1EEPxRDe4NziSpPeXIJ6Vf9
+MlGHC5RG56Zr/riBdk0nT6opx/2JIpSFzpqZwTuxeFLAAJEoM1DwAjmiU9FDDzPv
+cHUoNBoFrsIRImcuOnsy8i5+uYT3QdIBUAA5w5mXwOdTlJ/F7h83SocgOKTc9xYW
+02A1DecA4OKcrfz6LBC5yFdoPsBXvFrSz78LTFzirbdq2RuI1Ae3oD7hn/8b/Yzc
+NwHZo4m8XMuu1XSQ0z36gmrwlYI0NQiPAL/nknpRCnQgjR8AJsk9n72VU+TfWTtR
+H1wshrBu0RYLX4YQA1uwz44BYgN2YLtQsjrgPdGm7pUhTfVcxc/zL/8bWpOOs04T
+2/oT2Ft/gmvvsHo08QhqzOcnkVxl7qnwuw1UI8TMLwZ1Rppsc1Malakj7s5GDLik
+ayol1RDT2NK+1Oxj1liQOJgx9ojL1Pxu0oBXLfT5P4rCUuShIx7jr6Kxlixg2A8B
+g+MHzcKtFSFHut9Ag5s5Car5JNFWc91zvqNVQXYLq49AqDV/Nl1Q5ulkZZvg1rl5
+PGWNkfRiok++OL8FdFKpmCCRhaUDg3M87iE293CDY/gwKlDXNv8QJZ2OTaDr2f4X
+ASpuZjJHsGhKJzUXMFK4eQT0JYpFzYvLNe84CPuml6IsfRaSuRIZnOnv724Dp6wd
+xdjtAtm0p6L/RRTTapt/TxEvB6aiy4J47ghbMCZvqI1QfCkw+otzbvg4LxcR/Rn8
+OQUhUVcmS+1NOCZPtA1S2vlZVCb97SfpveTSaQp6f1Tka8YBCyhd0OlbA/XnVEDb
+tMGGl4oXhj9P2x57y47eur/2eTXDnGxorMJA4zooLljEucbk5t8r8U2tacUJDsyQ
+K1tcOhY8bnrJudjTGYeewlI0W3pSAiUlBk8CtCNSsfJQr7MBoWcjasp/i6DQDBU1
+/wy7zCo1+2xIhWWw9KCQK5NBpGTvq0tUgkfre0ft+MNlqgWp1L58sNi9xqcb03cv
+F8rOPO24VM7LiJfm6vvSiQJW0+YKFHlQdA0wCyTiRO8Xx98w7Lc04+XunaS2o/25
+1uZ0iK2oYtMlLxALG1FPmAnMAXn/AeAdcYuy2OaztYltnMzeOP4myyh25iRRaSlI
+fuvQkZcn8FnoQYmVxlmWSlbQcJqIxbLlbCRIXCeqxz1jCEVurO9u1lSl5QsmN/Bm
+KYW7wEcQXTxQsu4n7Rh+9ddAEBETf3NuA3XcSNR8EjdMBWz7lyAnzM54A5SEA7rL
+J2YYkr3L05wJL0tWQjXx+bewe5mnDS8sYnQgE+xRvdasDuGYHXA35z7ORM5KatdG
+LTLxbdXjgjVunTrXvyULKyrAAO6knjFHS1SKKm4Qp9i0eyhB65P6Ow3d2A0xSooO
+z+eSiUEiTq1BeqJTLbds5blV/ivPkXIQOMwl2ziE2y4QR3qGlzgzO3uLdFcIWztQ
+Gl+D2sOMPZLJ+z9HgqRsqtXbK+Ne73zW7k52xwC6aqMZ0zuZWcIjpB7GEKuHCauO
+iJu8W7GkSHcfr39cvyVqXRHzYJs6MhVJSAMxaaoy6EL+5rqDD2bSbDjtsYXI4uvA
+mmXOnnBY86A+mDn9AgJpTvY6tnVyD/XnfCBOiV+jKKEXEgXNqoNm9CIzpcK+myl2
+5FpMYcV771ckYFrhe/4ckhs/0vCpiFXviqZwhQZz8CczoJvLIhitCW0/UkUhVM+x
+Y0lu10ju+w7WJsc9FyjdMl5AdCUIiXS10gOEgvW+iY1dIa/Z6jLFtmiPmgbleD+Q
+lqYDZnbMuVz6xUPVkeuJ9s+J2iFQhfLEg5ftKIX71WvXwA1R7CdEasQ5f78CiZiB
+E7hGIe5RcV5XA07lOQrrpJwR0kPsSHOrng/Sy+sYfbs6VkMUDR1gtGG1jXIeL4i3
+1QVTlHhJd5QiDQGCxkCU90ujDy1Syj2YSvMrpP7QJOLezyWHjoHdHEuRbsTlDuyo
+bLx/9AvU8wPdBP1/w2MTWtCCMhIcwA/HJyj7YchLfq4jRuSxBRpJXf1A2pR1zv4+
+0/a1szx/9bWFtgD3ouUxmOHQlXOaqbejUbrHq3JFyisHrew7wjqWXF01JeLQkTXC
+chwMSAKQBp69GpCOANyxjNQNFD6thV/AOoXGHWqwu37WfcKmAGmo39npNRGjd+m3
+nl4rHgXZ1lMtBuOeNLQP48+4HyecwnxRZ2fRQ+fH324vq0/qH4SVIddqcHCIIlsv
+9paiYbXu0igbXjMHsLO+mmER+a1zzyUV/2IlLFbnEfg1BGT+jeGJ872Msgn+r4I7
+WZdjvrhuc21EVqp3LMzciE19+baFPvbRA6pnGfctS2LGwVLEUhMnrUnr6rEvUdez
+auZGeAwkFpqO/HbchTiBsrppD3EhDlqFt7fh/cdJWjoSr4DBsNSbRJJ+txb0S2zr
+yTuSHP74DCxFduoq7gwzZAbzqGAnW2/AWVmb5K5zvKYrrogQiNVsMOF4mr1cAsqI
+jHsXLHIxpMOxN4xI5bgGWZR8RaPO8WxM0fjRm+gPqAxVZoW6mI+zD9pzAm4MTgR/
+JWi1eWQ+gQhRTa3FnZL/2egfafGAJpgGsSKTtN9s+/xWBC3CRzWA20djKxl0WO+7
+2awxrl6mPBsne+fh3QMGqriLtqSfSyp3TicLWp/jjxPAkZd14PxaRC8jUN4pCYIv
+mIMLvHhvMU2TxFRr8kKjNXHgueotU5f+HrJf36ZHBPt8+Ma/q41F9BfC0gB3aGtt
++AU2x5sfFPp4qJ86Pyv1PCMpdF8DTLfJQ18a6C9IPIzV+rQIjRJWtLqNr5EYUi9A
+BL3ZBn6UXp9R9eVKyp0Y4HuzYQdANqyfIK6XpAoPoM81SmAe2ZzpFghUFHVvi8Sr
+Nsb34VBe7kZAnI0KOV752UEROJ1w2OgpBDHqmp4+J69K/zInNaRcmesy/4dCRbah
+5c2AQC9pqONaKV8NOstf5/GNCGB8RWaEBZsJqWfkLVD8kTQN9pfN0piKU0YbsjuO
++qIHczZcJkgh2wcXiNGVErPBvkMhMg5MZSLn9DuitefeVtPF38Er2/l09bflCNVc
+6/95JjcPr4zf2WgDgXWA+uyTTCx+BIaCdZR5Oa3BkToC6nxD/61uGmiSrkNkcNXn
+M6S9qY7zKbxb/Hi8IdUYwA==
+-----END ENCRYPTED PRIVATE KEY-----
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/compat/os_auto.h.in asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/compat/os_auto.h.in
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/compat/os_auto.h.in	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/compat/os_auto.h.in	2022-02-24 07:54:38.000000000 +0000
@@ -30,6 +30,7 @@
 #undef PJ_OS_NAME
 
 /* Legacy macros */
+#undef PJ_WIN64
 #undef PJ_WIN32
 #undef PJ_WIN32_WINNT
 #undef WIN32_LEAN_AND_MEAN
@@ -191,7 +192,9 @@
 #    if TARGET_OS_IPHONE
 #	include "Availability.h"
 	/* Use CFHost API for pj_getaddrinfo() (see ticket #1246) */
-#	define PJ_GETADDRINFO_USE_CFHOST 1
+#	ifndef PJ_GETADDRINFO_USE_CFHOST
+#	    define PJ_GETADDRINFO_USE_CFHOST 0
+#	endif
 #    	ifdef __IPHONE_4_0
  	    /* Is multitasking support available?  (see ticket #1107) */
 #	    define PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT 	1
@@ -220,7 +223,7 @@
 #undef PJ_HAS_SSL_SOCK
 #endif
 #ifndef PJ_SSL_SOCK_IMP
-#   define PJ_SSL_SOCK_IMP	PJ_SSL_SOCK_IMP_NONE
+#undef PJ_SSL_SOCK_IMP
 #endif
 
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/compat/os_win32.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/compat/os_win32.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/compat/os_win32.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/compat/os_win32.h	2022-02-24 07:54:38.000000000 +0000
@@ -135,6 +135,14 @@
  */
 #define PJ_THREAD_ALLOCATE_STACK    	0
 
+/* Endianness */
+#if defined(_M_ARM64)
+#   ifndef PJ_IS_LITTLE_ENDIAN
+#       define PJ_IS_LITTLE_ENDIAN	1
+#       define PJ_IS_BIG_ENDIAN	0
+#   endif
+#endif
+
 
 #endif	/* __PJ_COMPAT_OS_WIN32_H__ */
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/compat/socket.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/compat/socket.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/compat/socket.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/compat/socket.h	2022-02-24 07:54:38.000000000 +0000
@@ -179,10 +179,12 @@
 
 /*
  * And undefine these..
+ * Note (see issue #2311): unfortunately, this may cause build failure
+ * to anyone who uses these standard macros.
  */
-#undef s_addr
-#undef s6_addr
-#undef sin_zero
+//#undef s_addr
+//#undef s6_addr
+//#undef sin_zero
 
 /*
  * This will finally be obsoleted, since it should be declared in
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/compat/string.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/compat/string.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/compat/string.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/compat/string.h	2022-02-24 07:54:38.000000000 +0000
@@ -46,8 +46,13 @@
 #if defined(_MSC_VER)
 #   define strcasecmp	_stricmp
 #   define strncasecmp	_strnicmp
+
+/* snprintf() and vsnprintf() are available since Visual Studio 2015 */
+#if _MSC_VER < 1900
 #   define snprintf	_snprintf
 #   define vsnprintf	_vsnprintf
+#endif
+
 #   define snwprintf	_snwprintf
 #   define wcsicmp	_wcsicmp
 #   define wcsnicmp	_wcsnicmp
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/config.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/config.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/config.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/config.h	2022-02-24 07:54:38.000000000 +0000
@@ -178,7 +178,6 @@
 #   define PJ_IS_LITTLE_ENDIAN	1
 #   define PJ_IS_BIG_ENDIAN	0
 
-
 #elif defined (PJ_M_X86_64) || defined(__amd64__) || defined(__amd64) || \
 	defined(__x86_64__) || defined(__x86_64) || \
 	defined(_M_X64) || defined(_M_AMD64)
@@ -255,7 +254,8 @@
 #   define PJ_IS_LITTLE_ENDIAN	0
 #   define PJ_IS_BIG_ENDIAN	1
 
-#elif defined(ARM) || defined(_ARM_) ||  defined(__arm__) || defined(_M_ARM)
+#elif defined(ARM) || defined(_ARM_) ||  defined(__arm__) || \
+       defined(_M_ARM) || defined(_M_ARM64)
 #   define PJ_HAS_PENTIUM	0
     /*
      * ARM, bi-endian, so raise error if endianness is not configured
@@ -271,6 +271,10 @@
 #	undef PJ_M_ARMV4
 #	define PJ_M_ARMV4		1
 #	define PJ_M_NAME		"armv4"
+#   elif defined (PJ_M_ARM64) || defined(ARM64)
+#	undef PJ_M_ARM64
+#	define PJ_M_ARM64		1
+#	define PJ_M_NAME		"arm64"
 #   endif 
 
 #elif defined (PJ_M_POWERPC) || defined(__powerpc) || defined(__powerpc__) || \
@@ -804,6 +808,19 @@
 #  define PJ_HAS_SEMAPHORE	    1
 #endif
 
+/**
+ * Use dispatch semaphores on Darwin.
+ *
+ * Default: 1 on Darwin, 0 otherwise
+ */
+#ifndef PJ_SEMAPHORE_USE_DISPATCH_SEM
+#   if defined(PJ_DARWINOS) && PJ_DARWINOS != 0
+#	define PJ_SEMAPHORE_USE_DISPATCH_SEM	1
+#   else
+#	define PJ_SEMAPHORE_USE_DISPATCH_SEM	0
+#   endif
+#endif
+
 
 /**
  * Event object (for synchronization, e.g. in Win32)
@@ -973,7 +990,11 @@
 #define PJ_SSL_SOCK_IMP_NONE 	    0	/**< Disable SSL socket.    */
 #define PJ_SSL_SOCK_IMP_OPENSSL	    1	/**< Using OpenSSL.	    */
 #define PJ_SSL_SOCK_IMP_GNUTLS      2	/**< Using GnuTLS.	    */
-
+#define PJ_SSL_SOCK_IMP_DARWIN      3	/**< Using Apple's Secure
+					     Transport (deprecated in
+					     MacOS 10.15 & iOS 13.0)*/
+#define PJ_SSL_SOCK_IMP_APPLE       4	/**< Using Apple's Network 
+					     framework.	    	    */
 
 /**
  * Select which SSL socket implementation to use. Currently pjlib supports
@@ -1024,6 +1045,18 @@
 #  define PJ_SSL_SOCK_MAX_CURVES   32
 #endif
 
+/**
+ * Use OpenSSL thread locking callback. This is only applicable for OpenSSL
+ * version prior to 1.1.0
+ *
+ * Default: 1 (enabled)
+ */
+#ifndef PJ_SSL_SOCK_OSSL_USE_THREAD_CB
+#   define PJ_SSL_SOCK_OSSL_USE_THREAD_CB   1
+#else
+#   define PJ_SSL_SOCK_OSSL_USE_THREAD_CB   0
+#endif
+
 
 /**
  * Disable WSAECONNRESET error for UDP sockets on Win32 platforms. See
@@ -1366,7 +1399,7 @@
 #define PJ_VERSION_NUM_MAJOR	2
 
 /** PJLIB version minor number. */
-#define PJ_VERSION_NUM_MINOR	10
+#define PJ_VERSION_NUM_MINOR	12
 
 /** PJLIB version revision number. */
 #define PJ_VERSION_NUM_REV      0
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/config_site_test.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/config_site_test.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/config_site_test.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/config_site_test.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,11 @@
+#define PJMEDIA_SRTP_HAS_DTLS 1
+#define PJMEDIA_HAS_WEBRTC_AEC 1
+#define PJMEDIA_CODEC_L16_HAS_8KHZ_MONO 1
+#define PJMEDIA_CODEC_L16_HAS_8KHZ_STEREO 1
+#define PJMEDIA_CODEC_L16_HAS_16KHZ_MONO 1
+#define PJMEDIA_CODEC_L16_HAS_16KHZ_STEREO 1
+#define PJMEDIA_CODEC_L16_HAS_48KHZ_MONO 1
+#define PJMEDIA_CODEC_L16_HAS_48KHZ_STEREO 1
+#define PJMEDIA_HAS_G7221_CODEC 1
+#define PJMEDIA_HAS_G722_CODEC 1
+#define PJ_EXCLUDE_BENCHMARK_TESTS 1
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/ioqueue.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/ioqueue.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/ioqueue.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/ioqueue.h	2022-02-24 07:54:38.000000000 +0000
@@ -589,6 +589,19 @@
                                                  pj_ssize_t bytes_status );
 
 
+/**
+ * Clear ioqueue key states. This function will cancel any outstanding
+ * operations on that key, without invoking any completion callback.
+ * After calling this function, application should reinit its all operation
+ * keys, i.e: using pj_ioqueue_op_key_init(), before reusing them.
+ *
+ * @param key           The key.
+ *
+ * @return		PJ_SUCCESS on success or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pj_ioqueue_clear_key( pj_ioqueue_key_t *key );
+
+
 
 #if defined(PJ_HAS_TCP) && PJ_HAS_TCP != 0
 /**
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/list.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/list.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/list.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/list.h	2022-02-24 07:54:38.000000000 +0000
@@ -111,7 +111,6 @@
  * @param pos	The element to which the node will be inserted before. 
  * @param node	The element to be inserted.
  *
- * @return void.
  */
 PJ_IDECL(void)	pj_list_insert_before(pj_list_type *pos, pj_list_type *node);
 
@@ -145,7 +144,6 @@
  *		    element.
  * @param node	    The element to be inserted after the position element.
  *
- * @return void.
  */
 PJ_IDECL(void) pj_list_insert_after(pj_list_type *pos, pj_list_type *node);
 
@@ -185,7 +183,6 @@
  * @param list1	The destination list.
  * @param list2	The source list.
  *
- * @return void.
  */
 PJ_IDECL(void) pj_list_merge_first(pj_list_type *list1, pj_list_type *list2);
 
@@ -203,7 +200,6 @@
  *		    element.
  * @param list2	    The element in the list to be inserted.
  *
- * @return void.
  */
 PJ_IDECL(void) pj_list_merge_last( pj_list_type *list1, pj_list_type *list2);
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/lock.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/lock.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/lock.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/lock.h	2022-02-24 07:54:38.000000000 +0000
@@ -195,6 +195,15 @@
 
 
 /**
+ * The group lock destroy handler, a destructor function called when
+ * a group lock is about to be destroyed.
+ *
+ * @param member	A pointer to be passed to the handler.
+ */
+typedef void (*pj_grp_lock_handler)(void *member);
+
+
+/**
  * Initialize the config with the default values.
  *
  * @param cfg		The config to be initialized.
@@ -203,7 +212,7 @@
 
 /**
  * Create a group lock object. Initially the group lock will have reference
- * counter of one.
+ * counter of zero.
  *
  * @param pool		The group lock only uses the pool parameter to get
  * 			the pool factory, from which it will create its own
@@ -220,7 +229,7 @@
 /**
  * Create a group lock object, with the specified destructor handler, to be
  * called by the group lock when it is about to be destroyed. Initially the
- * group lock will have reference counter of one.
+ * group lock will have reference counter of zero.
  *
  * @param pool		The group lock only uses the pool parameter to get
  * 			the pool factory, from which it will create its own
@@ -235,7 +244,7 @@
 PJ_DECL(pj_status_t) pj_grp_lock_create_w_handler(pj_pool_t *pool,
                                         	  const pj_grp_lock_config *cfg,
                                         	  void *member,
-                                                  void (*handler)(void *member),
+                                                  pj_grp_lock_handler handler,
                                         	  pj_grp_lock_t **p_grp_lock);
 
 /**
@@ -303,7 +312,7 @@
 PJ_DECL(pj_status_t) pj_grp_lock_add_handler(pj_grp_lock_t *grp_lock,
                                              pj_pool_t *pool,
                                              void *member,
-                                             void (*handler)(void *member));
+                                             pj_grp_lock_handler handler);
 
 /**
  * Remove previously registered handler. All parameters must be the same
@@ -317,7 +326,7 @@
  */
 PJ_DECL(pj_status_t) pj_grp_lock_del_handler(pj_grp_lock_t *grp_lock,
                                              void *member,
-                                             void (*handler)(void *member));
+                                             pj_grp_lock_handler handler);
 
 /**
  * Increment reference counter to prevent the group lock grom being destroyed.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/os.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/os.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/os.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/os.h	2022-02-24 07:54:38.000000000 +0000
@@ -246,6 +246,9 @@
  * value range, which can be retrieved with #pj_thread_get_prio_min() and
  * #pj_thread_get_prio_max() functions.
  *
+ * For Android, this function will only set the priority of the calling thread
+ * (the thread param must be set to NULL or the calling thread handle).
+ *
  * @param thread	Thread handle.
  * @param prio		New priority to be set to the thread.
  *
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/pool_alt.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/pool_alt.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/pool_alt.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/pool_alt.h	2022-02-24 07:54:38.000000000 +0000
@@ -56,8 +56,12 @@
  * This constant denotes the exception number that will be thrown by default
  * memory factory policy when memory allocation fails.
  */
-extern int PJ_NO_MEMORY_EXCEPTION;
+PJ_DECL_DATA(int) PJ_NO_MEMORY_EXCEPTION;
 
+/**
+ * Get #PJ_NO_MEMORY_EXCEPTION constant.
+ */
+PJ_DECL(int) pj_NO_MEMORY_EXCEPTION(void);
 
 
 /*
@@ -68,6 +72,8 @@
 	pj_pool_create_imp(__FILE__, __LINE__, fc, nm, init, inc, cb)
 
 #define pj_pool_release(pool)		    pj_pool_release_imp(pool)
+#define pj_pool_safe_release(pool)	    pj_pool_safe_release_imp(pool)
+#define pj_pool_secure_release(pool)	    pj_pool_secure_release_imp(pool)
 #define pj_pool_getobjname(pool)	    pj_pool_getobjname_imp(pool)
 #define pj_pool_reset(pool)		    pj_pool_reset_imp(pool)
 #define pj_pool_get_capacity(pool)	    pj_pool_get_capacity_imp(pool)
@@ -98,6 +104,12 @@
 /* Release pool */
 PJ_DECL(void) pj_pool_release_imp(pj_pool_t *pool);
 
+/* Safe release pool */
+PJ_DECL(void) pj_pool_safe_release_imp(pj_pool_t **pool);
+
+/* Secure release pool */
+PJ_DECL(void) pj_pool_secure_release_imp(pj_pool_t **pool);
+
 /* Get pool name */
 PJ_DECL(const char*) pj_pool_getobjname_imp(pj_pool_t *pool);
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/sock.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/sock.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/sock.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/sock.h	2022-02-24 07:54:38.000000000 +0000
@@ -26,6 +26,7 @@
  */
 
 #include <pj/types.h>
+#include <pj/compat/socket.h>
 
 PJ_BEGIN_DECL 
 
@@ -484,6 +485,11 @@
  */
 #define PJ_INVALID_SOCKET   (-1)
 
+/* Undefining UNIX standard library macro such as s_addr is not
+ * recommended as it may cause build issues for anyone who uses
+ * the macro. See #2311 for more details.
+ */
+#if 0
 /* Must undefine s_addr because of pj_in_addr below */
 #undef s_addr
 
@@ -495,6 +501,9 @@
     pj_uint32_t	s_addr;		/**< The 32bit IP address.	    */
 } pj_in_addr;
 
+#else
+typedef struct in_addr pj_in_addr;
+#endif
 
 /**
  * Maximum length of text representation of an IPv4 address.
@@ -532,10 +541,15 @@
 #endif
     pj_uint16_t	sin_port;	/**< Transport layer port number.   */
     pj_in_addr	sin_addr;	/**< IP address.		    */
-    char	sin_zero[PJ_SOCKADDR_IN_SIN_ZERO_LEN]; /**< Padding.*/
+    char	sin_zero_pad[PJ_SOCKADDR_IN_SIN_ZERO_LEN]; /**< Padding.*/
 };
 
 
+/* Undefining C standard library macro such as s6_addr is not
+ * recommended as it may cause build issues for anyone who uses
+ * the macro. See #2311 for more details.
+ */
+#if 0
 #undef s6_addr
 
 /**
@@ -560,6 +574,9 @@
 #endif
 
 } pj_in6_addr;
+#else
+typedef struct in6_addr pj_in6_addr;
+#endif
 
 
 /** Initializer value for pj_in6_addr. */
@@ -712,7 +729,7 @@
  *
  * @return	nonzero if the address is valid, zero if not.
  */
-PJ_DECL(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp);
+PJ_DECL(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp);
 
 /**
  * This function converts an address in its standard text presentation form
@@ -1502,7 +1519,7 @@
  * @param port	    The port address.
  * @param buf	    Text buffer.
  * @param size	    Size of buffer.
- * @param flags	    Bitmask combination of these value:
+ * @param flag	    Bitmask combination of these value:
  *		    - 1: port number is included. 
  *
  * @return	The address string.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/ssl_sock.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/ssl_sock.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/ssl_sock.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/ssl_sock.h	2022-02-24 07:54:38.000000000 +0000
@@ -250,9 +250,9 @@
  * Create credential from data buffer. The certificate expected is in 
  * PEM format.
  *
- * @param CA_file	The buffer of trusted CA list.
- * @param cert_file	The buffer of certificate.
- * @param privkey_file	The buffer of private key.
+ * @param CA_buf	The buffer of trusted CA list.
+ * @param cert_buf	The buffer of certificate.
+ * @param privkey_buf	The buffer of private key.
  * @param privkey_pass	The password of private key, if any.
  * @param p_cert	Pointer to credential instance to be created.
  *
@@ -479,7 +479,7 @@
  * Get curve list supported by SSL/TLS backend.
  *
  * @param curves	The curves buffer to receive curve list.
- * @param curves_num	Maximum number of curves to be received.
+ * @param curve_num	Maximum number of curves to be received.
  *
  * @return		PJ_SUCCESS when successful.
  */
@@ -668,6 +668,21 @@
      */
     pj_bool_t (*on_connect_complete)(pj_ssl_sock_t *ssock,
 				     pj_status_t status);
+    
+    /**
+     * This callback is called when certificate verification is being done.
+     * Certification info can be obtained from #pj_ssl_sock_info. Currently
+     * it's only implemented for OpenSSL backend.
+     *
+     * @param ssock	The secure socket.
+     * @param is_server	PJ_TRUE to indicate an incoming connection.
+     *
+     * @return		Return PJ_TRUE if verification is successful. 
+     *                  If verification failed, then the connection will be 
+     *			dropped immediately.
+     * 
+     */
+    pj_bool_t (*on_verify_cb)(pj_ssl_sock_t *ssock, pj_bool_t is_server);
 
 } pj_ssl_sock_cb;
 
@@ -708,6 +723,11 @@
      */
     PJ_SSL_SOCK_PROTO_TLS1_2  = (1 << 4),
 
+    /**
+     * TLSv1.3 protocol.
+     */
+    PJ_SSL_SOCK_PROTO_TLS1_3  = (1 << 5),
+
     /** 
      * Certain backend implementation e.g:OpenSSL, has feature to enable all
      * protocol. 
@@ -996,7 +1016,8 @@
      * (perform outgoing connection) and the server may host multiple
      * 'virtual' servers at a single underlying network address, setting
      * this will allow client to tell the server a name of the server
-     * it is contacting.
+     * it is contacting. This must be set to hostname and literal IP addresses
+     * are not allowed.
      *
      * Default value is zero/not-set.
      */
@@ -1350,7 +1371,7 @@
  * @param ssock		The secure socket.
  * @param pool		Pool used to allocate some internal data for the
  *			operation.
- * @param localaddr	Local address to bind on.
+ * @param local_addr	Local address to bind on.
  * @param addr_len	Length of buffer containing local address.
  *
  * @return		PJ_SUCCESS if the operation has been successful,
@@ -1371,7 +1392,7 @@
  * @param ssock		The secure socket.
  * @param pool		Pool used to allocate some internal data for the
  *			operation.
- * @param localaddr	Local address to bind on.
+ * @param local_addr	Local address to bind on.
  * @param addr_len	Length of buffer containing local address.
  * @param newsock_param	Secure socket parameter for new accepted sockets.
  *
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/string.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/string.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/string.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/string.h	2022-02-24 07:54:38.000000000 +0000
@@ -46,7 +46,7 @@
  *   typedef struct pj_str_t
  *   {
  *       char      *ptr;
- *       pj_size_t  slen;
+ *       pj_ssize_t  slen;
  *   } pj_str_t;
  * </pre>
  *
@@ -70,6 +70,18 @@
  */
 
 /**
+ * Check if a string is truncated and if yes, put a suffix of ".."
+ * to indicate the truncation.
+ * This macro is used to check the result of pj_ansi_snprintf().
+ *
+ * @param ret	    The return value of pj_ansi_snprintf().
+ * @param str	    The string.
+ * @param len	    The length of the string buffer.
+ */
+#define PJ_CHECK_TRUNC_STR(ret, str, len) \
+    if ((ret) >= (len) || (ret) < 0) pj_ansi_strcpy((str) + (len) - 3, "..")
+
+/**
  * Create string initializer from a normal C string.
  *
  * @param str	Null terminated string to be stored.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/string_i.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/string_i.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/string_i.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/string_i.h	2022-02-24 07:54:38.000000000 +0000
@@ -33,15 +33,17 @@
 			      pj_str_t *dst,
 			      const pj_str_t *src)
 {
+    pj_assert(src->slen >= 0);
+
     /* Without this, destination will be corrupted */
     if (dst == src)
 	return dst;
 
-    if (src->slen) {
+    if (src->slen > 0) {
 	dst->ptr = (char*)pj_pool_alloc(pool, src->slen);
 	pj_memcpy(dst->ptr, src->ptr, src->slen);
     }
-    dst->slen = src->slen;
+    dst->slen = (src->slen < 0)? 0: src->slen;
     return dst;
 }
 
@@ -49,11 +51,19 @@
 					pj_str_t *dst,
 					const pj_str_t *src)
 {
-    dst->ptr = (char*)pj_pool_alloc(pool, src->slen+1);
-    if (src->slen) {
-	pj_memcpy(dst->ptr, src->ptr, src->slen);
+    pj_size_t src_slen = src->slen;
+
+    pj_assert(src->slen >= 0);
+
+    /* Check if the source's length is invalid */
+    if (src_slen < 0)
+    	src_slen = 0;
+
+    dst->ptr = (char*)pj_pool_alloc(pool, src_slen+1);
+    if (src_slen) {
+	pj_memcpy(dst->ptr, src->ptr, src_slen);
     }
-    dst->slen = src->slen;
+    dst->slen = src_slen;
     dst->ptr[dst->slen] = '\0';
     return dst;
 }
@@ -101,7 +111,9 @@
 
 PJ_IDEF(pj_str_t*) pj_strcpy(pj_str_t *dst, const pj_str_t *src)
 {
-    dst->slen = src->slen;
+    pj_assert(src->slen >= 0);
+
+    dst->slen = (src->slen < 0)? 0: src->slen;
     if (src->slen > 0)
 	pj_memcpy(dst->ptr, src->ptr, src->slen);
     return dst;
@@ -118,25 +130,29 @@
 PJ_IDEF(pj_str_t*) pj_strncpy( pj_str_t *dst, const pj_str_t *src, 
 			       pj_ssize_t max)
 {
+    pj_assert(src->slen >= 0);
     pj_assert(max >= 0);
+
     if (max > src->slen) max = src->slen;
     if (max > 0)
 	pj_memcpy(dst->ptr, src->ptr, max);
-    dst->slen = max;
+    dst->slen = (max < 0)? 0: max;
     return dst;
 }
 
 PJ_IDEF(pj_str_t*) pj_strncpy_with_null( pj_str_t *dst, const pj_str_t *src,
 					 pj_ssize_t max)
 {
+    pj_assert(src->slen >= 0);
     pj_assert(max > 0);
 
     if (max <= src->slen)
-	max = max-1;
+	max = (max > 0)? max-1: 0;
     else
-	max = src->slen;
+	max = (src->slen < 0)? 0: src->slen;
 
-    pj_memcpy(dst->ptr, src->ptr, max);
+    if (max > 0)
+    	pj_memcpy(dst->ptr, src->ptr, max);
     dst->ptr[max] = '\0';
     dst->slen = max;
     return dst;
@@ -145,9 +161,12 @@
 
 PJ_IDEF(int) pj_strcmp( const pj_str_t *str1, const pj_str_t *str2)
 {
-    if (str1->slen == 0) {
-	return str2->slen==0 ? 0 : -1;
-    } else if (str2->slen == 0) {
+    pj_assert(str1->slen >= 0);
+    pj_assert(str2->slen >= 0);
+
+    if (str1->slen <= 0) {
+	return str2->slen<=0 ? 0 : -1;
+    } else if (str2->slen <= 0) {
 	return 1;
     } else {
 	pj_size_t min = (str1->slen < str2->slen)? str1->slen : str2->slen;
@@ -166,13 +185,16 @@
 {
     pj_str_t copy1, copy2;
 
-    if (len < (unsigned)str1->slen) {
+    pj_assert(str1->slen >= 0);
+    pj_assert(str2->slen >= 0);
+
+    if (len < (unsigned)str1->slen && str1->slen > 0) {
 	copy1.ptr = str1->ptr;
 	copy1.slen = len;
 	str1 = &copy1;
     }
 
-    if (len < (unsigned)str2->slen) {
+    if (len < (unsigned)str2->slen && str2->slen > 0) {
 	copy2.ptr = str2->ptr;
 	copy2.slen = len;
 	str2 = &copy2;
@@ -213,9 +235,12 @@
 
 PJ_IDEF(int) pj_stricmp( const pj_str_t *str1, const pj_str_t *str2)
 {
-    if (str1->slen == 0) {
-	return str2->slen==0 ? 0 : -1;
-    } else if (str2->slen == 0) {
+    pj_assert(str1->slen >= 0);
+    pj_assert(str2->slen >= 0);
+
+    if (str1->slen <= 0) {
+	return str2->slen<=0 ? 0 : -1;
+    } else if (str2->slen <= 0) {
 	return 1;
     } else {
 	pj_size_t min = (str1->slen < str2->slen)? str1->slen : str2->slen;
@@ -320,13 +345,13 @@
 {
     pj_str_t copy1, copy2;
 
-    if (len < (unsigned)str1->slen) {
+    if (len < (unsigned)str1->slen && str1->slen > 0) {
 	copy1.ptr = str1->ptr;
 	copy1.slen = len;
 	str1 = &copy1;
     }
 
-    if (len < (unsigned)str2->slen) {
+    if (len < (unsigned)str2->slen && str2->slen > 0) {
 	copy2.ptr = str2->ptr;
 	copy2.slen = len;
 	str2 = &copy2;
@@ -352,7 +377,10 @@
 
 PJ_IDEF(void) pj_strcat(pj_str_t *dst, const pj_str_t *src)
 {
-    if (src->slen) {
+    pj_assert(src->slen >= 0);
+    pj_assert(dst->slen >= 0);
+
+    if (src->slen > 0 && dst->slen >= 0) {
 	pj_memcpy(dst->ptr + dst->slen, src->ptr, src->slen);
 	dst->slen += src->slen;
     }
@@ -361,7 +389,10 @@
 PJ_IDEF(void) pj_strcat2(pj_str_t *dst, const char *str)
 {
     pj_size_t len = str? pj_ansi_strlen(str) : 0;
-    if (len) {
+
+    pj_assert(dst->slen >= 0);
+
+    if (len && dst->slen >= 0) {
 	pj_memcpy(dst->ptr + dst->slen, str, len);
 	dst->slen += len;
     }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/timer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/timer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/include/pj/timer.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/include/pj/timer.h	2022-02-24 07:54:38.000000000 +0000
@@ -120,7 +120,10 @@
 
     /** 
      * Internal unique timer ID, which is assigned by the timer heap. 
-     * Application should not touch this ID.
+     * Positive values indicate that the timer entry is running, 
+     * while -1 means that it's not. Any other value may indicate that it 
+     * hasn't been properly initialised or is in a bad state.
+     * Application should not touch this ID. 
      */
     pj_timer_id_t _timer_id;
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/addr_resolv_sock.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/addr_resolv_sock.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/addr_resolv_sock.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/addr_resolv_sock.c	2022-02-24 07:54:38.000000000 +0000
@@ -178,7 +178,9 @@
     /* Call getaddrinfo() */
     pj_bzero(&hint, sizeof(hint));
     hint.ai_family = af;
-    hint.ai_socktype = pj_SOCK_DGRAM() | pj_SOCK_STREAM();
+    /* Zero value of ai_socktype means the implementation shall attempt
+     * to resolve the service name for all supported socket types */
+    hint.ai_socktype = 0;
 
     rc = getaddrinfo(nodecopy, NULL, &hint, &res);
     if (rc != 0)
@@ -188,10 +190,35 @@
 
     /* Enumerate each item in the result */
     for (i=0; i<*count && res; res=res->ai_next) {
+	unsigned j;
+	pj_bool_t duplicate_found = PJ_FALSE;
+
 	/* Ignore unwanted address families */
 	if (af!=PJ_AF_UNSPEC && res->ai_family != af)
 	    continue;
 
+	if (res->ai_socktype != pj_SOCK_DGRAM() &&
+            res->ai_socktype != pj_SOCK_STREAM() &&
+            /* It is possible that the result's sock type
+             * is unspecified.
+             */
+            res->ai_socktype != 0)
+        {
+	        continue;
+	}
+
+	/* Add current address in the resulting list if there
+	 * is no duplicates only. */
+	for (j = 0; j < i; j++) {
+	    if (!pj_sockaddr_cmp(&ai[j].ai_addr, res->ai_addr)) {
+		duplicate_found = PJ_TRUE;
+		break;
+	    }
+	}
+	if (duplicate_found) {
+	    continue;
+	}
+
 	/* Store canonical name (possibly truncating the name) */
 	if (res->ai_canonname) {
 	    pj_ansi_strncpy(ai[i].ai_canonname, res->ai_canonname,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/array.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/array.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/array.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/array.c	2022-02-24 07:54:38.000000000 +0000
@@ -31,7 +31,7 @@
     if (count && pos < count) {
 	pj_memmove( (char*)array + (pos+1)*elem_size,
 		    (char*)array + pos*elem_size,
-		    (count-pos)*elem_size);
+		    (count-pos)*(pj_size_t)elem_size);
     }
     pj_memmove((char*)array + pos*elem_size, value, elem_size);
 }
@@ -45,7 +45,7 @@
     if (pos < count-1) {
 	pj_memmove( (char*)array + pos*elem_size,
 		    (char*)array + (pos+1)*elem_size,
-		    (count-pos-1)*elem_size);
+		    (count-pos-1)*(pj_size_t)elem_size);
     }
 }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/guid_bsd.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/guid_bsd.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/guid_bsd.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/guid_bsd.c	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,50 @@
+/* 
+ * Copyright (C) 2021-2021 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+#include <pj/guid.h>
+#include <pj/assert.h>
+#include <pj/os.h>
+#include <pj/string.h>
+#include <uuid.h>
+
+PJ_DEF_DATA(const unsigned) PJ_GUID_STRING_LENGTH = 36;
+
+PJ_DEF(unsigned) pj_GUID_STRING_LENGTH()
+{
+    return PJ_GUID_STRING_LENGTH;
+}
+
+PJ_DEF(pj_str_t *) pj_generate_unique_string(pj_str_t *str)
+{
+    uint32_t status;
+    uuid_t u;
+    char *s = NULL;
+    pj_str_t sguid;
+
+    PJ_ASSERT_RETURN(str && str->ptr, NULL);
+    PJ_CHECK_STACK();
+
+    uuid_create(&u, &status);
+    PJ_ASSERT_RETURN(status == uuid_s_ok, NULL);
+    uuid_to_string(&u, &s, &status);
+    PJ_ASSERT_RETURN(status == uuid_s_ok, NULL);
+    sguid = pj_str(s);
+    pj_strncpy(str, &sguid, PJ_GUID_STRING_LENGTH);
+    free(s);
+
+    return str;
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/guid_darwin.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/guid_darwin.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/guid_darwin.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/guid_darwin.c	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,56 @@
+/* 
+ * Copyright (C) 2021-2021 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+#include <pj/guid.h>
+#include <pj/assert.h>
+#include <pj/os.h>
+#include <pj/string.h>
+
+#include <CoreFoundation/CoreFoundation.h>
+
+PJ_DEF_DATA(const unsigned) PJ_GUID_STRING_LENGTH=36;
+
+PJ_DEF(unsigned) pj_GUID_STRING_LENGTH()
+{
+    return PJ_GUID_STRING_LENGTH;
+}
+
+PJ_DEF(pj_str_t*) pj_generate_unique_string(pj_str_t *str)
+{
+    CFUUIDRef uuid_obj;
+    CFStringRef uuid_str;
+    pj_str_t sguid;
+    
+    PJ_ASSERT_RETURN(str->ptr != NULL, NULL);
+    PJ_CHECK_STACK();
+
+    /* Create universally unique identifier (object). */
+    uuid_obj = CFUUIDCreate(kCFAllocatorDefault);
+    
+    /* Get the string representation of CFUUID object. */
+    uuid_str = CFUUIDCreateString(kCFAllocatorDefault, uuid_obj);
+    CFRelease(uuid_obj);
+
+    sguid.ptr = (char*)CFStringGetCStringPtr(uuid_str, kCFStringEncodingUTF8);
+    pj_assert(sguid.ptr);
+    sguid.slen = pj_ansi_strlen(sguid.ptr);
+
+    pj_strncpy(str, &sguid, PJ_GUID_STRING_LENGTH);
+    CFRelease(uuid_str);
+
+    return str;
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ioqueue_common_abs.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ioqueue_common_abs.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ioqueue_common_abs.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ioqueue_common_abs.c	2022-02-24 07:54:38.000000000 +0000
@@ -1282,6 +1282,7 @@
         if (op_rec == (void*)op_key) {
             pj_list_erase(op_rec);
             op_rec->op = PJ_IOQUEUE_OP_NONE;
+            ioqueue_remove_from_set(key->ioqueue, key, READABLE_EVENT);
             pj_ioqueue_unlock_key(key);
 
             if (key->cb.on_read_complete)
@@ -1297,6 +1298,7 @@
         if (op_rec == (void*)op_key) {
             pj_list_erase(op_rec);
             op_rec->op = PJ_IOQUEUE_OP_NONE;
+            ioqueue_remove_from_set(key->ioqueue, key, WRITEABLE_EVENT);
             pj_ioqueue_unlock_key(key);
 
             if (key->cb.on_write_complete)
@@ -1324,11 +1326,43 @@
         op_rec = op_rec->next;
     }
 
+    /* Clear connecting operation. */
+    if (key->connecting) {
+        key->connecting = 0;
+        ioqueue_remove_from_set(key->ioqueue, key, WRITEABLE_EVENT);
+        ioqueue_remove_from_set(key->ioqueue, key, EXCEPTION_EVENT);
+    }
+
     pj_ioqueue_unlock_key(key);
     
     return PJ_EINVALIDOP;
 }
 
+
+PJ_DEF(pj_status_t) pj_ioqueue_clear_key( pj_ioqueue_key_t *key )
+{
+    PJ_ASSERT_RETURN(key, PJ_EINVAL);
+
+    pj_ioqueue_lock_key(key);
+
+    /* Reset pending lists */
+    pj_list_init(&key->read_list);
+    pj_list_init(&key->write_list);
+    pj_list_init(&key->accept_list);
+    key->connecting = 0;
+
+    /* Remove key from sets */
+    ioqueue_remove_from_set(key->ioqueue, key, READABLE_EVENT);
+    ioqueue_remove_from_set(key->ioqueue, key, WRITEABLE_EVENT);
+    ioqueue_remove_from_set(key->ioqueue, key, EXCEPTION_EVENT);
+
+    pj_ioqueue_unlock_key(key);
+
+    return PJ_SUCCESS;
+
+}
+
+
 PJ_DEF(pj_status_t) pj_ioqueue_set_default_concurrency( pj_ioqueue_t *ioqueue,
 							pj_bool_t allow)
 {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ioqueue_epoll.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ioqueue_epoll.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ioqueue_epoll.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ioqueue_epoll.c	2022-02-24 07:54:38.000000000 +0000
@@ -53,6 +53,7 @@
 #define os_epoll_ctl		epoll_ctl
 #define os_epoll_wait		epoll_wait
 
+
 #define THIS_FILE   "ioq_epoll"
 
 //#define TRACE_(expr) PJ_LOG(3,expr)
@@ -108,12 +109,46 @@
 static void scan_closing_keys(pj_ioqueue_t *ioqueue);
 #endif
 
+
+/* EPOLLEXCLUSIVE or EPOLLONESHOT is reported to cause perm handshake error
+ * on OpenSSL 1.0.2, so let's disable this when using OpenSSL older than
+ * version 1.1.0.
+ */
+#if defined(PJ_HAS_SSL_SOCK) && PJ_HAS_SSL_SOCK != 0 && \
+    (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_OPENSSL)
+
+#  include <openssl/opensslv.h>
+#  if OPENSSL_VERSION_NUMBER < 0x10100000L
+#    define DONT_USE_EXCL_ONESHOT
+#  endif
+
+#endif
+
+/* Use EPOLLEXCLUSIVE or EPOLLONESHOT to signal one thread only at a time. */
+#if defined(EPOLLEXCLUSIVE) && !defined(DONT_USE_EXCL_ONESHOT)
+#  define USE_EPOLLEXCLUSIVE	1
+#  define USE_EPOLLONESHOT	0
+#elif defined(EPOLLONESHOT) && !defined(DONT_USE_EXCL_ONESHOT)
+#  define USE_EPOLLEXCLUSIVE	0
+#  define USE_EPOLLONESHOT	1
+#else
+#  define USE_EPOLLEXCLUSIVE	0
+#  define USE_EPOLLONESHOT	0
+#endif
+
+
 /*
  * pj_ioqueue_name()
  */
 PJ_DEF(const char*) pj_ioqueue_name(void)
 {
+#if USE_EPOLLEXCLUSIVE
+    return "epoll-exclusive";
+#elif USE_EPOLLONESHOT
+    return "epoll-oneshot";
+#else
     return "epoll";
+#endif
 }
 
 /*
@@ -196,6 +231,7 @@
 
     ioqueue->epfd = os_epoll_create(max_fd);
     if (ioqueue->epfd < 0) {
+    	pj_lock_acquire(ioqueue->lock);
 	ioqueue_destroy(ioqueue);
 	return PJ_RETURN_OS_ERROR(pj_get_native_os_error());
     }
@@ -206,7 +242,7 @@
     ioqueue->queue = pj_pool_calloc(pool, max_fd, sizeof(struct queue));
     PJ_ASSERT_RETURN(ioqueue->queue != NULL, PJ_ENOMEM);
    */
-    PJ_LOG(4, ("pjlib", "epoll I/O Queue created (%p)", ioqueue));
+    PJ_LOG(4, ("pjlib", "%s I/O Queue created (%p)", pj_ioqueue_name(), ioqueue));
 
     *p_ioqueue = ioqueue;
     return PJ_SUCCESS;
@@ -328,6 +364,11 @@
 */
     /* os_epoll_ctl. */
     ev.events = EPOLLIN | EPOLLERR;
+#if USE_EPOLLEXCLUSIVE
+    ev.events |= EPOLLEXCLUSIVE;
+#elif USE_EPOLLONESHOT
+    ev.events |= EPOLLONESHOT;
+#endif
     ev.epoll_data = (epoll_data_type)key;
     status = os_epoll_ctl(ioqueue->epfd, EPOLL_CTL_ADD, sock, &ev);
     if (status < 0) {
@@ -505,6 +546,29 @@
     return PJ_SUCCESS;
 }
 
+
+static void update_epoll_event_set(pj_ioqueue_t *ioqueue,
+                                   pj_ioqueue_key_t *key,
+				   pj_uint32_t events)
+{
+    struct epoll_event ev;
+
+    ev.epoll_data = (epoll_data_type)key;
+    ev.events = events;
+
+#if USE_EPOLLEXCLUSIVE
+    ev.events |= EPOLLEXCLUSIVE;
+    os_epoll_ctl( ioqueue->epfd, EPOLL_CTL_DEL, key->fd, &ev);
+    os_epoll_ctl( ioqueue->epfd, EPOLL_CTL_ADD, key->fd, &ev);
+#elif USE_EPOLLONESHOT
+    ev.events |= EPOLLONESHOT;
+    os_epoll_ctl( ioqueue->epfd, EPOLL_CTL_MOD, key->fd, &ev);
+#else
+    os_epoll_ctl( ioqueue->epfd, EPOLL_CTL_MOD, key->fd, &ev);
+#endif
+}
+
+
 /* ioqueue_remove_from_set()
  * This function is called from ioqueue_dispatch_event() to instruct
  * the ioqueue to remove the specified descriptor from ioqueue's descriptor
@@ -514,13 +578,20 @@
                                      pj_ioqueue_key_t *key, 
                                      enum ioqueue_event_type event_type)
 {
-    if (event_type == WRITEABLE_EVENT) {
-	struct epoll_event ev;
-
-	ev.events = EPOLLIN | EPOLLERR;
-	ev.epoll_data = (epoll_data_type)key;
-	os_epoll_ctl( ioqueue->epfd, EPOLL_CTL_MOD, key->fd, &ev);
-    }	
+#if USE_EPOLLONESHOT
+    /* For EPOLLONESHOT, always rearm ioqueue for events. */
+    PJ_UNUSED_ARG(event_type);
+    pj_uint32_t ev = EPOLLIN | EPOLLERR;
+    if (key_has_pending_write(key))
+	ev |= EPOLLOUT;
+    update_epoll_event_set(ioqueue, key, ev);
+#else
+    /* Remove EPOLLOUT if write event received and no pending send */
+    if (event_type == WRITEABLE_EVENT && !key_has_pending_write(key)) {
+	pj_uint32_t ev = EPOLLIN | EPOLLERR;
+	update_epoll_event_set(ioqueue, key, ev);
+    }
+#endif
 }
 
 /*
@@ -533,13 +604,14 @@
                                 pj_ioqueue_key_t *key,
                                 enum ioqueue_event_type event_type )
 {
+    /* Add EPOLLOUT if write-event requested (other events are always set) */
     if (event_type == WRITEABLE_EVENT) {
-	struct epoll_event ev;
+	pj_uint32_t ev = EPOLLIN | EPOLLERR;
+	if (key_has_pending_connect(key) || key_has_pending_write(key))
+	    ev |= EPOLLOUT;
 
-	ev.events = EPOLLIN | EPOLLOUT | EPOLLERR;
-	ev.epoll_data = (epoll_data_type)key;
-	os_epoll_ctl( ioqueue->epfd, EPOLL_CTL_MOD, key->fd, &ev);
-    }	
+	update_epoll_event_set(ioqueue, key, ev);
+    }
 }
 
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
@@ -755,7 +827,7 @@
 
     pj_get_timestamp(&t1);
     TRACE_((THIS_FILE, "ioqueue_poll() returns %d, time=%d usec",
-		       processed, pj_elapsed_usec(&t2, &t1)));
+		       processed_cnt, pj_elapsed_usec(&t2, &t1)));
 
     return processed_cnt;
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ioqueue_select.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ioqueue_select.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ioqueue_select.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ioqueue_select.c	2022-02-24 07:54:38.000000000 +0000
@@ -131,6 +131,12 @@
 static pj_status_t replace_udp_sock(pj_ioqueue_key_t *h);
 #endif
 
+#if defined(PJ_HAS_SSL_SOCK) && PJ_HAS_SSL_SOCK != 0 && \
+    (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_APPLE)
+    /* Call SSL Network framework poll */
+pj_status_t ssl_network_event_poll();
+#endif
+
 /* Include implementation for common abstraction after we declare
  * pj_ioqueue_key_t and pj_ioqueue_t.
  */
@@ -502,14 +508,15 @@
     /* Ticket #520, key will be erased more than once */
     pj_list_erase(key);
 #endif
-    PJ_FD_CLR(key->fd, &ioqueue->rfdset);
-    PJ_FD_CLR(key->fd, &ioqueue->wfdset);
+
+    /* Remove socket from sets and close socket. */
+    if (key->fd != PJ_INVALID_SOCKET) {
+	PJ_FD_CLR(key->fd, &ioqueue->rfdset);
+	PJ_FD_CLR(key->fd, &ioqueue->wfdset);
 #if PJ_HAS_TCP
-    PJ_FD_CLR(key->fd, &ioqueue->xfdset);
+	PJ_FD_CLR(key->fd, &ioqueue->xfdset);
 #endif
 
-    /* Close socket. */
-    if (key->fd != PJ_INVALID_SOCKET) {
         pj_sock_close(key->fd);
         key->fd = PJ_INVALID_SOCKET;
     }
@@ -926,6 +933,12 @@
 
     PJ_ASSERT_RETURN(ioqueue, -PJ_EINVAL);
 
+#if defined(PJ_HAS_SSL_SOCK) && PJ_HAS_SSL_SOCK != 0 && \
+    (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_APPLE)
+    /* Call SSL Network framework event poll */
+    ssl_network_event_poll();
+#endif
+
     /* Lock ioqueue before making fd_set copies */
     pj_lock_acquire(ioqueue->lock);
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ip_helper_generic.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ip_helper_generic.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ip_helper_generic.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ip_helper_generic.c	2022-02-24 07:54:38.000000000 +0000
@@ -97,6 +97,11 @@
 	    continue; /* Skip when interface is down */
 	}
 
+	if ((it->ifa_flags & IFF_RUNNING)==0) {
+	    TRACE_((THIS_FILE, "  interface is not running"));
+	    continue; /* Skip when interface is not running */
+	}
+
 #if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
 	if (it->ifa_flags & IFF_LOOPBACK) {
 	    TRACE_((THIS_FILE, "  loopback interface"));
@@ -116,6 +121,19 @@
 	    continue; /* Skip when interface is down */
 	}
 
+	/* Ignore 192.0.0.0/29 address.
+	 * Ref: https://datatracker.ietf.org/doc/html/rfc7335#section-4
+	 */
+	if (af==pj_AF_INET() &&
+	    (pj_ntohl(((pj_sockaddr_in*)ad)->sin_addr.s_addr) >> 4) ==
+	     201326592) /* 0b1100000000000000000000000000 which is
+	                   192.0.0.0 >> 4 */
+	{
+	    TRACE_((THIS_FILE, "  address %s ignored (192.0.0.0/29 class)",
+		    get_addr(ad), ad->sa_family));
+	    continue;
+	}
+
 	/* Ignore 0.0.0.0/8 address. This is a special address
 	 * which doesn't seem to have practical use.
 	 */
@@ -208,6 +226,11 @@
 	    continue; /* Skip when interface is down */
 	}
 
+	if ((iff.ifr_flags & IFF_RUNNING)==0) {
+	    TRACE_((THIS_FILE, "  interface is not running"));
+	    continue; /* Skip when interface is not running */
+	}
+
 #if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
 	if (iff.ifr_flags & IFF_LOOPBACK) {
 	    TRACE_((THIS_FILE, "  loopback interface"));
@@ -215,6 +238,19 @@
 	}
 #endif
 
+	/* Ignore 192.0.0.0/29 address.
+	 * Ref: https://datatracker.ietf.org/doc/html/rfc7335#section-4
+	 */
+	if (af==pj_AF_INET() &&
+	    (pj_ntohl(((pj_sockaddr_in*)ad)->sin_addr.s_addr) >> 4) ==
+	     201326592) /* 0b1100000000000000000000000000 which is
+	     		   192.0.0.0 >> 4 */
+	{
+	    TRACE_((THIS_FILE, "  address %s ignored (192.0.0.0/29 class)",
+		    get_addr(ad), ad->sa_family));
+	    continue;
+	}
+
 	/* Ignore 0.0.0.0/8 address. This is a special address
 	 * which doesn't seem to have practical use.
 	 */
@@ -286,6 +322,11 @@
 	    continue; /* Skip when interface is down */
 	}
 
+        if ((ifreq.ifr_flags & IFF_RUNNING)==0) {
+	    TRACE_((THIS_FILE, "  interface is not running"));
+	    continue; /* Skip when interface is not running */
+	}
+
 #if PJ_IP_HELPER_IGNORE_LOOPBACK_IF
 	if (ifreq.ifr_flags & IFF_LOOPBACK) {
 	    TRACE_((THIS_FILE, "  loopback interface"));
@@ -309,6 +350,19 @@
 	    continue;	/* Not address family that we want, continue */
 	}
 
+	/* Ignore 192.0.0.0/29 address.
+	 * Ref: https://datatracker.ietf.org/doc/html/rfc7335#section-4
+	 */
+	if (af==pj_AF_INET() &&
+	    (pj_ntohl(((pj_sockaddr_in*)ad)->sin_addr.s_addr) >> 4) ==
+	     201326592) /* 0b1100000000000000000000000000 which is
+	     		   192.0.0.0 >> 4 */
+	{
+	    TRACE_((THIS_FILE, "  address %s ignored (192.0.0.0/29 class)",
+		    get_addr(ad), ad->sa_family));
+	    continue;
+	}
+
 	/* Ignore 0.0.0.0/8 address. This is a special address
 	 * which doesn't seem to have practical use.
 	 */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/lock.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/lock.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/lock.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/lock.c	2022-02-24 07:54:38.000000000 +0000
@@ -260,17 +260,25 @@
 static void grp_lock_set_owner_thread(pj_grp_lock_t *glock)
 {
     if (!glock->owner) {
+#if PJ_HAS_THREADS
 	glock->owner = pj_thread_this();
+#else
+        glock->owner = (pj_thread_t *) -1;
+#endif
 	glock->owner_cnt = 1;
     } else {
+#if PJ_HAS_THREADS
 	pj_assert(glock->owner == pj_thread_this());
+#endif
 	glock->owner_cnt++;
     }
 }
 
 static void grp_lock_unset_owner_thread(pj_grp_lock_t *glock)
 {
+#if PJ_HAS_THREADS
     pj_assert(glock->owner == pj_thread_this());
+#endif
     pj_assert(glock->owner_cnt > 0);
     if (--glock->owner_cnt <= 0) {
 	glock->owner = NULL;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/log.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/log.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/log.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/log.c	2022-02-24 07:54:38.000000000 +0000
@@ -167,12 +167,28 @@
     }
 #endif
     g_last_thread = NULL;
+
+    /* Normalize log decor, e.g: unset thread flags when threading is
+     * disabled.
+     */
+    pj_log_set_decor(pj_log_get_decor());
+
     return PJ_SUCCESS;
 }
 
 PJ_DEF(void) pj_log_set_decor(unsigned decor)
 {
     log_decor = decor;
+
+#if !PJ_HAS_THREADS
+    /* Unset thread related flags */
+    if (log_decor & PJ_LOG_HAS_THREAD_ID) {
+       log_decor &= ~(PJ_LOG_HAS_THREAD_ID);
+    }
+    if (log_decor & PJ_LOG_HAS_THREAD_SWC) {
+       log_decor &= ~(PJ_LOG_HAS_THREAD_SWC);
+    }
+#endif
 }
 
 PJ_DEF(unsigned) pj_log_get_decor(void)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/os_core_unix.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/os_core_unix.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/os_core_unix.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/os_core_unix.c	2022-02-24 07:54:38.000000000 +0000
@@ -39,6 +39,10 @@
 #  include <semaphore.h>
 #endif
 
+#if defined(PJ_SEMAPHORE_USE_DISPATCH_SEM) && PJ_SEMAPHORE_USE_DISPATCH_SEM != 0
+#  include <dispatch/dispatch.h>
+#endif
+
 #include <unistd.h>	    // getpid()
 #include <errno.h>	    // errno
 
@@ -65,8 +69,10 @@
     
     return JNI_VERSION_1_4;
 }
+
 #endif
 
+
 struct pj_thread_t
 {
     char	    obj_name[PJ_MAX_OBJ_NAME];
@@ -107,7 +113,11 @@
 #if defined(PJ_HAS_SEMAPHORE) && PJ_HAS_SEMAPHORE != 0
 struct pj_sem_t
 {
+#if defined(PJ_SEMAPHORE_USE_DISPATCH_SEM) && PJ_SEMAPHORE_USE_DISPATCH_SEM != 0
+    dispatch_semaphore_t sem;
+#else
     sem_t	       *sem;
+#endif
     char		obj_name[PJ_MAX_OBJ_NAME];
 };
 #endif /* PJ_HAS_SEMAPHORE */
@@ -167,6 +177,9 @@
 	return PJ_SUCCESS;
     }
 
+    /* Init logging */
+    pj_log_init();
+
 #if PJ_HAS_THREADS
     /* Init this thread's TLS. */
     if ((rc=pj_thread_init()) != 0) {
@@ -179,9 +192,6 @@
 
 #endif
 
-    /* Init logging */
-    pj_log_init();
-
     /* Initialize exception ID for the pool.
      * Must do so after critical section is configured.
      */
@@ -295,6 +305,95 @@
 }
 
 
+/* Thread priority utils for Android (via JNI as NDK does not provide it).
+ * Set priority is probably not enough because it does not change the thread
+ * group in scheduler.
+ * Temporary solution is to call the Java API to set the thread priority.
+ * A cool solution would be to port (if possible) the code from the
+ * android os regarding set_sched groups.
+ */
+#if PJ_ANDROID
+
+#include <jni.h>
+#include <sys/resource.h>
+#include <sys/system_properties.h>
+
+PJ_DEF(pj_bool_t) pj_jni_attach_jvm(JNIEnv **jni_env)
+{
+    if ((*pj_jni_jvm)->GetEnv(pj_jni_jvm, (void **)jni_env,
+                               JNI_VERSION_1_4) < 0)
+    {
+        if ((*pj_jni_jvm)->AttachCurrentThread(pj_jni_jvm, jni_env, NULL) < 0)
+        {
+            jni_env = NULL;
+            return PJ_FALSE;
+        }
+        return PJ_TRUE;
+    }
+
+    return PJ_FALSE;
+}
+
+PJ_DEF(void) pj_jni_dettach_jvm(pj_bool_t attached)
+{
+    if (attached)
+        (*pj_jni_jvm)->DetachCurrentThread(pj_jni_jvm);
+}
+
+
+static pj_status_t set_android_thread_priority(int priority)
+{
+    jclass process_class;
+    jmethodID set_prio_method;
+    jthrowable exc;
+    pj_status_t result = PJ_SUCCESS;
+    JNIEnv *jni_env = 0;
+    pj_bool_t attached = pj_jni_attach_jvm(&jni_env);
+
+    PJ_ASSERT_RETURN(jni_env, PJ_FALSE);
+
+    /* Get pointer to the java class */
+    process_class = (jclass)(*jni_env)->NewGlobalRef(jni_env,
+                        (*jni_env)->FindClass(jni_env, "android/os/Process"));
+    if (process_class == 0) {
+        PJ_LOG(5, (THIS_FILE, "Unable to find class android.os.Process"));
+        result = PJ_EIGNORED;
+        goto on_return;
+    }
+
+    /* Get the id of set thread priority function */
+    set_prio_method = (*jni_env)->GetStaticMethodID(jni_env, process_class,
+                                                    "setThreadPriority",
+                                                    "(I)V");
+    if (set_prio_method == 0) {
+        PJ_LOG(5, (THIS_FILE, "Unable to find setThreadPriority() method"));
+        result = PJ_EIGNORED;
+        goto on_return;
+    }
+
+    /* Set the thread priority */
+    (*jni_env)->CallStaticVoidMethod(jni_env, process_class, set_prio_method,
+                                     priority);
+    exc = (*jni_env)->ExceptionOccurred(jni_env);
+    if (exc) {
+        (*jni_env)->ExceptionDescribe(jni_env);
+        (*jni_env)->ExceptionClear(jni_env);
+        PJ_LOG(4, (THIS_FILE, "Failure in setting thread priority using "
+                              "Java API, fallback to setpriority()"));
+        setpriority(PRIO_PROCESS, 0, priority);
+    } else {
+        PJ_LOG(5, (THIS_FILE, "Setting thread priority to %d successful",
+	           priority));
+    }
+
+on_return:
+    pj_jni_dettach_jvm(attached);
+    return result;
+}
+
+#endif
+
+
 /*
  * Get thread priority value for the thread.
  */
@@ -323,6 +422,12 @@
 PJ_DEF(pj_status_t) pj_thread_set_prio(pj_thread_t *thread,  int prio)
 {
 #if PJ_HAS_THREADS
+
+#  if PJ_ANDROID
+    PJ_ASSERT_RETURN(thread==NULL || thread==pj_thread_this(), PJ_EINVAL);
+    return set_android_thread_priority(prio);
+#  else
+
     struct sched_param param;
     int policy;
     int rc;
@@ -338,6 +443,9 @@
 	return PJ_RETURN_OS_ERROR(rc);
 
     return PJ_SUCCESS;
+
+#  endif /* PJ_ANDROID */
+
 #else
     PJ_UNUSED_ARG(thread);
     PJ_UNUSED_ARG(prio);
@@ -1569,6 +1677,11 @@
     PJ_ASSERT_RETURN(sem, PJ_ENOMEM);
 
 #if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
+#   if defined(PJ_SEMAPHORE_USE_DISPATCH_SEM) && PJ_SEMAPHORE_USE_DISPATCH_SEM != 0
+    sem->sem = dispatch_semaphore_create(initial);
+    if (sem->sem == NULL)
+        return PJ_RETURN_OS_ERROR(pj_get_native_os_error());
+#   else
     /* MacOS X doesn't support anonymous semaphore */
     {
 	char sem_name[PJ_GUID_MAX_LENGTH+1];
@@ -1599,6 +1712,7 @@
 	/* And immediately release the name as we don't need it */
 	sem_unlink(sem_name);
     }
+#   endif
 #else
     sem->sem = PJ_POOL_ALLOC_T(pool, sem_t);
     if (sem_init( sem->sem, 0, initial) != 0)
@@ -1632,7 +1746,7 @@
 PJ_DEF(pj_status_t) pj_sem_wait(pj_sem_t *sem)
 {
 #if PJ_HAS_THREADS
-    int result;
+    long result;
 
     PJ_CHECK_STACK();
     PJ_ASSERT_RETURN(sem, PJ_EINVAL);
@@ -1640,7 +1754,11 @@
     PJ_LOG(6, (sem->obj_name, "Semaphore: thread %s is waiting",
 			      pj_thread_this()->obj_name));
 
+#if defined(PJ_SEMAPHORE_USE_DISPATCH_SEM) && PJ_SEMAPHORE_USE_DISPATCH_SEM != 0
+    result = dispatch_semaphore_wait(sem->sem, DISPATCH_TIME_FOREVER);
+#else
     result = sem_wait( sem->sem );
+#endif
 
     if (result == 0) {
 	PJ_LOG(6, (sem->obj_name, "Semaphore acquired by thread %s",
@@ -1666,12 +1784,16 @@
 PJ_DEF(pj_status_t) pj_sem_trywait(pj_sem_t *sem)
 {
 #if PJ_HAS_THREADS
-    int result;
+    long result;
 
     PJ_CHECK_STACK();
     PJ_ASSERT_RETURN(sem, PJ_EINVAL);
 
+#if defined(PJ_SEMAPHORE_USE_DISPATCH_SEM) && PJ_SEMAPHORE_USE_DISPATCH_SEM != 0
+    result = dispatch_semaphore_wait(sem->sem, DISPATCH_TIME_NOW);
+#else
     result = sem_trywait( sem->sem );
+#endif
 
     if (result == 0) {
 	PJ_LOG(6, (sem->obj_name, "Semaphore acquired by thread %s",
@@ -1696,7 +1818,12 @@
     int result;
     PJ_LOG(6, (sem->obj_name, "Semaphore released by thread %s",
 			      pj_thread_this()->obj_name));
+#if defined(PJ_SEMAPHORE_USE_DISPATCH_SEM) && PJ_SEMAPHORE_USE_DISPATCH_SEM != 0
+    dispatch_semaphore_signal(sem->sem);
+    result = 0;
+#else
     result = sem_post( sem->sem );
+#endif
 
     if (result == 0)
 	return PJ_SUCCESS;
@@ -1722,7 +1849,12 @@
     PJ_LOG(6, (sem->obj_name, "Semaphore destroyed by thread %s",
 			      pj_thread_this()->obj_name));
 #if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
+#   if defined(PJ_SEMAPHORE_USE_DISPATCH_SEM) && PJ_SEMAPHORE_USE_DISPATCH_SEM != 0
+    dispatch_release(sem->sem);
+    result = 0;
+#   else
     result = sem_close( sem->sem );
+#   endif
 #else
     result = sem_destroy( sem->sem );
 #endif
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/os_time_common.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/os_time_common.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/os_time_common.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/os_time_common.c	2022-02-24 07:54:38.000000000 +0000
@@ -75,13 +75,31 @@
 #endif /* !PJ_WIN32 */
 
 
+static int get_tz_offset_secs()
+{
+    time_t epoch_plus_11h = 60 * 60 * 11;
+    struct tm ltime, gtime;
+    int offset_min;
+
+#if defined(PJ_HAS_LOCALTIME_R) && PJ_HAS_LOCALTIME_R != 0
+    localtime_r(&epoch_plus_11h, &ltime);
+    gmtime_r(&epoch_plus_11h, &gtime);
+#else
+    ltime = *localtime(&epoch_plus_11h);
+    gtime = *gmtime(&epoch_plus_11h);
+#endif
+
+    offset_min = (ltime.tm_hour*60+ltime.tm_min) - (gtime.tm_hour*60+gtime.tm_min);
+    return offset_min*60;
+}
+
 /**
  * Convert local time to GMT.
  */
 PJ_DEF(pj_status_t) pj_time_local_to_gmt(pj_time_val *tv)
 {
-    PJ_UNUSED_ARG(tv);
-    return PJ_EBUG;
+    tv->sec -= get_tz_offset_secs();
+    return PJ_SUCCESS;
 }
 
 /**
@@ -89,8 +107,8 @@
  */
 PJ_DEF(pj_status_t) pj_time_gmt_to_local(pj_time_val *tv)
 {
-    PJ_UNUSED_ARG(tv);
-    return PJ_EBUG;
+    tv->sec += get_tz_offset_secs();
+    return PJ_SUCCESS;
 }
 
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/os_timestamp_common.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/os_timestamp_common.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/os_timestamp_common.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/os_timestamp_common.c	2022-02-24 07:54:38.000000000 +0000
@@ -65,16 +65,19 @@
     freq += ts_freq.u32.lo;
 #endif
 
-    /* Avoid division by zero. */
-    if (freq == 0) freq = 1;
-
     /* Get elapsed time in cycles. */
     elapsed = get_elapsed(start, stop);
 
     /* usec = elapsed * MSEC / freq */
-    pj_highprec_mul(elapsed, MSEC);
-    pj_highprec_div(elapsed, freq);
-
+    pj_highprec_div(freq, MSEC);
+     
+    /* Avoid division by zero. */
+    if (freq == 0) {
+      /* Regard freq = 1 */
+      pj_highprec_mul(elapsed, MSEC);
+    } else {
+      pj_highprec_div(elapsed, freq);
+    }
     return elapsed;
 }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/os_time_win32.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/os_time_win32.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/os_time_win32.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/os_time_win32.c	2022-02-24 07:54:38.000000000 +0000
@@ -18,6 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
 #include <pj/os.h>
+#include <pj/errno.h>
 #include <pj/string.h>
 #include <pj/log.h>
 #include <windows.h>
@@ -293,11 +294,67 @@
 /**
  * Convert local time to GMT.
  */
-PJ_DEF(pj_status_t) pj_time_local_to_gmt(pj_time_val *tv);
+PJ_DEF(pj_status_t) pj_time_local_to_gmt(pj_time_val *tv)
+{
+#ifdef WINCE_TIME
+    return PJ_ENOTSUP;
+#else
+    LARGE_INTEGER li;
+    FILETIME ft_local;
+    FILETIME ft_gmt;
+
+    li.QuadPart = tv->sec;
+    li.QuadPart += base_time.QuadPart;
+    li.QuadPart *= SECS_TO_FT_MULT;
+
+    ft_local.dwLowDateTime = li.LowPart;
+    ft_local.dwHighDateTime = li.HighPart;
+
+    if (LocalFileTimeToFileTime(&ft_local, &ft_gmt) == 0)
+	return PJ_EINVAL;
+
+    li.LowPart = ft_gmt.dwLowDateTime;
+    li.HighPart = ft_gmt.dwHighDateTime;
+    li.QuadPart /= SECS_TO_FT_MULT;
+    li.QuadPart -= base_time.QuadPart;
+
+    tv->sec = li.LowPart;
+
+    return PJ_SUCCESS;
+#endif
+}
 
 /**
  * Convert GMT to local time.
  */
-PJ_DEF(pj_status_t) pj_time_gmt_to_local(pj_time_val *tv);
+PJ_DEF(pj_status_t) pj_time_gmt_to_local(pj_time_val *tv)
+{
+#ifdef WINCE_TIME
+    return PJ_ENOTSUP;
+#else
+    LARGE_INTEGER li;
+    FILETIME ft_local;
+    FILETIME ft_gmt;
+
+    li.QuadPart = tv->sec;
+    li.QuadPart += base_time.QuadPart;
+    li.QuadPart *= SECS_TO_FT_MULT;
+
+    ft_gmt.dwLowDateTime = li.LowPart;
+    ft_gmt.dwHighDateTime = li.HighPart;
+
+    if (FileTimeToLocalFileTime(&ft_gmt, &ft_local) == 0)
+	return PJ_EINVAL;
+
+    li.LowPart = ft_local.dwLowDateTime;
+    li.HighPart = ft_local.dwHighDateTime;
+    li.QuadPart /= SECS_TO_FT_MULT;
+    li.QuadPart -= base_time.QuadPart;
+
+    tv->sec = li.LowPart;
+
+    return PJ_SUCCESS;
+#endif
+}
 
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/pool_dbg.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/pool_dbg.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/pool_dbg.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/pool_dbg.c	2022-02-24 07:54:38.000000000 +0000
@@ -44,7 +44,7 @@
 
 
 
-int PJ_NO_MEMORY_EXCEPTION;
+PJ_DEF_DATA(int) PJ_NO_MEMORY_EXCEPTION;
 
 
 PJ_DEF(int) pj_NO_MEMORY_EXCEPTION()
@@ -95,6 +95,24 @@
     free(pool);
 }
 
+/* Safe release pool */
+PJ_DEF(void) pj_pool_safe_release_imp( pj_pool_t **ppool )
+{
+    pj_pool_t *pool = *ppool;
+    *ppool = NULL;
+    if (pool)
+	pj_pool_release(pool);
+}
+
+/* Secure release pool */
+PJ_DEF(void) pj_pool_secure_release_imp( pj_pool_t **ppool )
+{
+    /* Secure release is not implemented, so we just call
+     * safe release.
+     */
+    pj_pool_safe_release_imp(ppool);
+}
+
 /* Get pool name */
 PJ_DEF(const char*) pj_pool_getobjname_imp(pj_pool_t *pool)
 {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/sock_bsd.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/sock_bsd.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/sock_bsd.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/sock_bsd.c	2022-02-24 07:54:38.000000000 +0000
@@ -244,7 +244,7 @@
  * numbers-and-dots notation into binary data and stores it in the structure
  * that inp points to. 
  */
-PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp)
+PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp)
 {
     char tempaddr[PJ_INET_ADDRSTRLEN];
 
@@ -600,7 +600,7 @@
 
     PJ_SOCKADDR_SET_LEN(&addr, sizeof(pj_sockaddr_in));
     addr.sin_family = PJ_AF_INET;
-    pj_bzero(addr.sin_zero, sizeof(addr.sin_zero));
+    pj_bzero(addr.sin_zero_pad, sizeof(addr.sin_zero_pad));
     addr.sin_addr.s_addr = pj_htonl(addr32);
     addr.sin_port = pj_htons(port);
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/sock_common.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/sock_common.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/sock_common.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/sock_common.c	2022-02-24 07:54:38.000000000 +0000
@@ -129,7 +129,7 @@
 
     PJ_SOCKADDR_RESET_LEN(addr);
     addr->sin_family = PJ_AF_INET;
-    pj_bzero(addr->sin_zero, sizeof(addr->sin_zero));
+    pj_bzero(addr->sin_zero_pad, sizeof(addr->sin_zero_pad));
 
     if (str_addr && str_addr->slen) {
 	addr->sin_addr = pj_inet_addr(str_addr);
@@ -210,7 +210,7 @@
 
     PJ_SOCKADDR_RESET_LEN(addr);
     addr->sin_family = PJ_AF_INET;
-    pj_bzero(addr->sin_zero, sizeof(addr->sin_zero));
+    pj_bzero(addr->sin_zero_pad, sizeof(addr->sin_zero_pad));
     pj_sockaddr_in_set_port(addr, port);
     return pj_sockaddr_in_set_str_addr(addr, str_addr);
 }
@@ -916,8 +916,10 @@
 		}
 
 		if (j == cand_cnt) {
-		    pj_sockaddr_copy_addr(&cand_addr[cand_cnt], 
-					  &cand_addr[start_if+i]);
+		    if (cand_cnt != (start_if + i)) {
+			pj_sockaddr_copy_addr(&cand_addr[cand_cnt],
+					      &cand_addr[start_if + i]);
+		    }
 		    cand_weight[cand_cnt] += WEIGHT_INTERFACE;
 		    ++cand_cnt;
 		}
@@ -987,11 +989,11 @@
 	if (af==PJ_AF_INET) {
 	    addr->ipv4.sin_addr.s_addr = pj_htonl (0x7f000001);
 	} else {
-	    pj_in6_addr *s6_addr;
+	    pj_in6_addr *s6_addr_;
 
-	    s6_addr = (pj_in6_addr*) pj_sockaddr_get_addr(addr);
-	    pj_bzero(s6_addr, sizeof(pj_in6_addr));
-	    s6_addr->s6_addr[15] = 1;
+	    s6_addr_ = (pj_in6_addr*) pj_sockaddr_get_addr(addr);
+	    pj_bzero(s6_addr_, sizeof(pj_in6_addr));
+	    s6_addr_->s6_addr[15] = 1;
 	}
 	TRACE_((THIS_FILE, "Loopback IP %s returned",
 		pj_sockaddr_print(addr, strip, sizeof(strip), 3)));
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/sock_symbian.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/sock_symbian.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/sock_symbian.cpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/sock_symbian.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -299,7 +299,7 @@
  * numbers-and-dots notation into binary data and stores it in the structure
  * that inp points to. 
  */
-PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp)
+PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp)
 {
     enum { MAXIPLEN = PJ_INET_ADDRSTRLEN };
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/sock_uwp.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/sock_uwp.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/sock_uwp.cpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/sock_uwp.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -933,7 +933,7 @@
  * numbers-and-dots notation into binary data and stores it in the structure
  * that inp points to. 
  */
-PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, struct pj_in_addr *inp)
+PJ_DEF(int) pj_inet_aton(const pj_str_t *cp, pj_in_addr *inp)
 {
     char tempaddr[PJ_INET_ADDRSTRLEN];
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ssl_sock_apple.m asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ssl_sock_apple.m
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ssl_sock_apple.m	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ssl_sock_apple.m	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,2208 @@
+/*
+ * Copyright (C) 2019-2020 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <pj/ssl_sock.h>
+#include <pj/os.h>
+#include <pj/pool.h>
+#include <pj/rand.h>
+
+/* Only build when PJ_HAS_SSL_SOCK and the implementation is Apple SSL. */
+#if defined(PJ_HAS_SSL_SOCK) && PJ_HAS_SSL_SOCK != 0 && \
+    (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_APPLE)
+
+#define THIS_FILE               "ssl_sock_apple.m"
+
+/* Set to 1 to enable debugging messages. */
+#define SSL_DEBUG  0
+
+#define SSL_SOCK_IMP_USE_CIRC_BUF
+#define SSL_SOCK_IMP_USE_OWN_NETWORK
+
+#include "ssl_sock_imp_common.h"
+#include "ssl_sock_imp_common.c"
+
+#include "TargetConditionals.h"
+
+#include <err.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <CommonCrypto/CommonDigest.h> 
+#include <Foundation/NSLock.h>
+#include <Network/Network.h>
+#include <Security/Security.h>
+
+/* IMPORTANT note from Apple's Concurrency Programming Guide doc:
+ * "Because Grand Central Dispatch manages the relationship between the tasks
+ * you provide and the threads on which those tasks run, you should generally
+ * avoid calling POSIX thread routines from your task code"
+ *
+ * Since network events happen in a dispatch function block, we need to make
+ * sure not to call any PJLIB functions there (not even pj_pool_alloc() nor
+ * pj_log()). Instead, we will post those events to a singleton event manager
+ * to be polled by ioqueue polling thread(s).
+ */
+
+/* Secure socket structure definition. */
+typedef struct applessl_sock_t {
+    pj_ssl_sock_t  		base;
+
+    nw_listener_t 		listener;
+    nw_listener_state_t		lis_state;
+    nw_connection_t     	connection;
+    nw_connection_state_t	con_state;
+    dispatch_queue_t		queue;
+    dispatch_semaphore_t 	ev_semaphore;
+
+    SecTrustRef			trust;
+    tls_ciphersuite_t		cipher;
+    sec_identity_t		identity;
+} applessl_sock_t;
+
+
+/*
+ *******************************************************************
+ * Event manager
+ *******************************************************************
+ */
+ 
+ typedef enum event_id
+{
+    EVENT_ACCEPT,
+    EVENT_CONNECT,
+    EVENT_VERIFY_CERT,
+    EVENT_HANDSHAKE_COMPLETE,
+    EVENT_DATA_READ,
+    EVENT_DATA_SENT,
+    EVENT_DISCARD
+} event_id;
+
+typedef struct event_t
+{
+    PJ_DECL_LIST_MEMBER(struct event_t);
+
+    event_id 		 type;
+    pj_ssl_sock_t 	*ssock;
+    pj_bool_t		 async;
+
+    union
+    {
+        struct
+        {
+            nw_connection_t	 newconn;
+            pj_sockaddr		 src_addr;
+            int			 src_addr_len;
+            pj_status_t 	 status;
+        } accept_ev;
+
+        struct
+        {
+            pj_status_t 	 status;
+        } connect_ev;
+
+	struct
+        {
+            pj_status_t 	 status;
+        } handshake_ev;
+
+        struct
+        {
+            pj_ioqueue_op_key_t *send_key;
+	    pj_ssize_t 		 sent;
+        } data_sent_ev;
+
+        struct
+        {
+	    void 		*data;
+	    pj_size_t 		 size;
+	    pj_status_t 	 status;
+	    pj_size_t 		 remainder;
+        } data_read_ev;
+
+    } body;
+} event_t;
+
+typedef struct event_manager
+{
+    NSLock	*lock;
+    event_t	 event_list;
+    event_t	 free_event_list;
+} event_manager;
+
+static event_manager *event_mgr = NULL;
+
+#if SSL_DEBUG
+static pj_thread_desc queue_th_desc;
+static pj_thread_t *queue_th;
+#endif
+
+/*
+ *******************************************************************
+ * Event manager's functions
+ *******************************************************************
+ */
+
+static pj_status_t verify_cert(applessl_sock_t *assock, pj_ssl_cert_t *cert);
+
+static void event_manager_destroy()
+{
+    event_manager *mgr = event_mgr;
+    
+    event_mgr = NULL;
+
+    while (!pj_list_empty(&mgr->free_event_list)) {
+    	event_t *event = mgr->free_event_list.next;
+        pj_list_erase(event);
+        free(event);
+    }
+
+    while (!pj_list_empty(&mgr->event_list)) {
+    	event_t *event = mgr->event_list.next;
+        pj_list_erase(event);
+        free(event);
+    }
+    
+    [mgr->lock release];
+
+    free(mgr);
+}
+
+static pj_status_t event_manager_create()
+{
+    event_manager *mgr;
+    
+    if (event_mgr)
+    	return PJ_SUCCESS;
+    
+    mgr = malloc(sizeof(event_manager));
+    if (!mgr) return PJ_ENOMEM;
+
+    mgr->lock = [[NSLock alloc]init];
+    pj_list_init(&mgr->event_list);
+    pj_list_init(&mgr->free_event_list);
+
+    event_mgr = mgr;
+    pj_atexit(&event_manager_destroy);
+
+    return PJ_SUCCESS;
+}
+
+/* Post event to the event manager. If the event is posted
+ * synchronously, the function will wait until the event is processed.
+ */
+static pj_status_t event_manager_post_event(pj_ssl_sock_t *ssock,
+					    event_t *event_item,
+					    pj_bool_t async)
+{
+    event_manager *mgr = event_mgr;
+    event_t *event;
+
+#if SSL_DEBUG
+    if (!pj_thread_is_registered()) {
+    	pj_bzero(queue_th_desc, sizeof(pj_thread_desc));
+    	pj_thread_register("sslq", queue_th_desc, &queue_th);
+    }
+    PJ_LOG(3, (THIS_FILE, "Posting event %p %d", ssock, event_item->type));
+#endif
+
+    if (ssock->is_closing || !ssock->pool || !mgr)
+    	return PJ_EGONE;
+
+#if SSL_DEBUG
+    PJ_LOG(3,(THIS_FILE, "Post event success %p %d",ssock, event_item->type));
+#endif
+    
+    [mgr->lock lock];
+
+    if (pj_list_empty(&mgr->free_event_list)) {
+        event = malloc(sizeof(event_t));
+    } else {
+        event = mgr->free_event_list.next;
+        pj_list_erase(event);
+    }
+    
+    pj_memcpy(event, event_item, sizeof(event_t));
+    event->ssock = ssock;
+    event->async = async;
+    pj_list_push_back(&mgr->event_list, event);
+    
+    [mgr->lock unlock];
+    
+    if (!async) {
+	dispatch_semaphore_wait(((applessl_sock_t *)ssock)->ev_semaphore,
+			        DISPATCH_TIME_FOREVER);
+    }
+
+    return PJ_SUCCESS;
+}
+
+/* Remove all events associated with the socket. */
+static void event_manager_remove_events(pj_ssl_sock_t *ssock)
+{
+    event_t *event;
+    	
+    [event_mgr->lock lock];
+    event = event_mgr->event_list.next;
+    while (event != &event_mgr->event_list) {
+    	event_t *event_ = event;
+
+    	event = event->next;
+    	if (event_->ssock == ssock) {
+    	    pj_list_erase(event_);
+	    /* If not async, signal the waiting socket */
+	    if (!event_->async) {
+	        applessl_sock_t * assock;
+	        assock = (applessl_sock_t *)event_->ssock;
+	    	dispatch_semaphore_signal(assock->ev_semaphore);
+	    }
+    	}
+    }
+    [event_mgr->lock unlock];
+}
+
+pj_status_t ssl_network_event_poll()
+{
+    if (!event_mgr)
+    	return PJ_SUCCESS;
+
+    while (!pj_list_empty(&event_mgr->event_list)) {
+        pj_ssl_sock_t *ssock;
+    	applessl_sock_t * assock;
+    	event_t *event;
+    	pj_bool_t ret = PJ_TRUE, add_ref = PJ_FALSE;
+    	
+    	[event_mgr->lock lock];
+    	/* Check again, this time by holding the lock */
+    	if (pj_list_empty(&event_mgr->event_list)) {
+    	    [event_mgr->lock unlock];
+    	    break;
+    	}
+    	event = event_mgr->event_list.next;
+    	ssock = event->ssock;
+	assock = (applessl_sock_t *)ssock;
+    	pj_list_erase(event);
+
+	if (ssock->is_closing || !ssock->pool ||
+	    (!ssock->is_server && !assock->connection) ||
+	    (ssock->is_server && !assock->listener))
+	{
+            PJ_LOG(3, (THIS_FILE, "Warning: Discarding SSL event type %d of "
+            	       "a closing socket %p", event->type, ssock));
+            event->type = EVENT_DISCARD;
+	} else if (ssock->param.grp_lock) {
+            if (pj_grp_lock_get_ref(ssock->param.grp_lock) > 0) {
+                /* Prevent ssock from being destroyed while
+                 * we are calling the callback.
+                 */
+                add_ref = PJ_TRUE;
+                pj_grp_lock_add_ref(ssock->param.grp_lock);
+            } else {
+            	PJ_LOG(3, (THIS_FILE, "Warning: Discarding SSL event type %d "
+            		   " of a destroyed socket %p", event->type, ssock));
+                event->type = EVENT_DISCARD;
+            }
+        }
+
+    	[event_mgr->lock unlock];
+
+	switch (event->type) {
+	    case EVENT_ACCEPT:
+		ret = ssock_on_accept_complete(event->ssock,
+		    PJ_INVALID_SOCKET,
+		    event->body.accept_ev.newconn,
+	    	    &event->body.accept_ev.src_addr,
+	    	    event->body.accept_ev.src_addr_len,
+	    	    event->body.accept_ev.status);
+	    	break;
+	    case EVENT_CONNECT:
+	    	ret = ssock_on_connect_complete(event->ssock,
+	    	    event->body.connect_ev.status);
+	    	break;
+	    case EVENT_VERIFY_CERT:
+	    	verify_cert(assock, event->ssock->cert);
+	    	break;
+	    case EVENT_HANDSHAKE_COMPLETE:
+	        event->ssock->ssl_state = SSL_STATE_ESTABLISHED;
+	    	ret = on_handshake_complete(event->ssock,
+	    	    event->body.handshake_ev.status);
+	    	break;
+	    case EVENT_DATA_SENT:
+	    	ret = ssock_on_data_sent(event->ssock,
+	    	    event->body.data_sent_ev.send_key,
+	    	    event->body.data_sent_ev.sent);
+	    	break;
+	    case EVENT_DATA_READ:
+	    	ret = ssock_on_data_read(event->ssock,
+	    	    event->body.data_read_ev.data,
+	    	    event->body.data_read_ev.size,
+	    	    event->body.data_read_ev.status,
+	    	    &event->body.data_read_ev.remainder);
+	    	break;
+	    default:
+	    	break;
+	}
+
+	/* If not async and not destroyed, signal the waiting socket */
+	if (event->type != EVENT_DISCARD && ret && !event->async && ret) {
+	    dispatch_semaphore_signal(assock->ev_semaphore);
+	}
+	
+    	/* Put the event into the free list to be reused */
+    	[event_mgr->lock lock];
+        if (add_ref) {
+            pj_grp_lock_dec_ref(ssock->param.grp_lock);
+        }
+    	pj_list_push_back(&event_mgr->free_event_list, event);
+    	[event_mgr->lock unlock];	
+    }
+
+    return 0;
+}
+
+/*
+ *******************************************************************
+ * Static/internal functions.
+ *******************************************************************
+ */
+ 
+#define PJ_SSL_ERRNO_START		(PJ_ERRNO_START_USER + \
+					 PJ_ERRNO_SPACE_SIZE*6)
+
+#define PJ_SSL_ERRNO_SPACE_SIZE		PJ_ERRNO_SPACE_SIZE
+
+/* Convert from Apple SSL error to pj_status_t. */
+static pj_status_t pj_status_from_err(applessl_sock_t *assock,
+				      const char *msg,
+				      OSStatus err)
+{
+    pj_status_t status = (pj_status_t)-err;
+    CFStringRef errmsg;
+    
+    errmsg = SecCopyErrorMessageString(err, NULL);
+    PJ_LOG(3, (THIS_FILE, "Apple SSL error %s [%d]: %s",
+    	       (msg? msg: ""), err,
+    	       CFStringGetCStringPtr(errmsg, kCFStringEncodingUTF8)));
+    CFRelease(errmsg);
+
+    if (status > PJ_SSL_ERRNO_SPACE_SIZE)
+	status = PJ_SSL_ERRNO_SPACE_SIZE;
+    status += PJ_SSL_ERRNO_START;
+
+    if (assock)
+        assock->base.last_err = err;
+
+    return status;
+}
+
+/* Read cert or key file */
+static pj_status_t create_data_from_file(CFDataRef *data,
+					 pj_str_t *fname, pj_str_t *path)
+{
+    CFURLRef file;
+    CFReadStreamRef read_stream;
+    UInt8 data_buf[8192];
+    CFIndex nbytes = 0;
+    
+    if (path) {
+        CFURLRef filepath;
+        CFStringRef path_str;
+        
+        path_str = CFStringCreateWithBytes(NULL, (const UInt8 *)path->ptr,
+        				   path->slen,
+        				   kCFStringEncodingUTF8, false);
+        if (!path_str) return PJ_ENOMEM;
+    
+        filepath = CFURLCreateWithFileSystemPath(NULL, path_str,
+        					 kCFURLPOSIXPathStyle, true);
+        CFRelease(path_str);
+        if (!filepath) return PJ_ENOMEM;
+    
+        path_str = CFStringCreateWithBytes(NULL, (const UInt8 *)fname->ptr,
+        				   fname->slen,
+    		   			   kCFStringEncodingUTF8, false);
+        if (!path_str) {
+    	    CFRelease(filepath);
+    	    return PJ_ENOMEM;
+        }
+    
+        file = CFURLCreateCopyAppendingPathComponent(NULL, filepath,
+        					     path_str, false);
+        CFRelease(path_str);
+        CFRelease(filepath);
+    } else {
+        file = CFURLCreateFromFileSystemRepresentation(NULL,
+    	       (const UInt8 *)fname->ptr, fname->slen, false);
+    }
+    
+    if (!file)
+        return PJ_ENOMEM;
+    
+    read_stream = CFReadStreamCreateWithFile(NULL, file);
+    CFRelease(file);
+    
+    if (!read_stream)
+        return PJ_ENOTFOUND;
+    
+    if (!CFReadStreamOpen(read_stream)) {
+        PJ_LOG(2, (THIS_FILE, "Failed opening file"));
+        CFRelease(read_stream);
+        return PJ_EINVAL;
+    }
+    
+    nbytes = CFReadStreamRead(read_stream, data_buf,
+    			      sizeof(data_buf));
+    if (nbytes > 0)
+        *data = CFDataCreate(NULL, data_buf, nbytes);
+    else
+    	*data = NULL;
+    
+    CFReadStreamClose(read_stream);
+    CFRelease(read_stream);
+    
+    return (*data? PJ_SUCCESS: PJ_EINVAL);
+}
+
+static pj_status_t create_identity_from_cert(applessl_sock_t *assock,
+			    		     pj_ssl_cert_t *cert,
+			    		     sec_identity_t *p_identity)
+{
+    CFStringRef password = NULL;
+    CFDataRef cert_data = NULL;
+    void *keys[1] = {NULL};
+    void *values[1] = {NULL};
+    CFDictionaryRef options;
+    CFArrayRef items;
+    CFIndex i, count;
+    SecIdentityRef identity = NULL;
+    OSStatus err;
+    pj_status_t status;
+
+    /* Init */
+    *p_identity = NULL;
+
+    if (cert->privkey_file.slen || cert->privkey_buf.slen ||
+    	cert->privkey_pass.slen)
+    {
+    	PJ_LOG(5, (THIS_FILE, "Ignoring supplied private key. Private key "
+    			      "must be placed in the keychain instead."));
+    }
+
+    if (cert->cert_file.slen) {
+    	status = create_data_from_file(&cert_data, &cert->cert_file, NULL);
+    	if (status != PJ_SUCCESS) {
+    	    PJ_PERROR(2, (THIS_FILE, status, "Failed reading cert file"));
+    	    return status;
+    	}
+    } else if (cert->cert_buf.slen) {
+    	cert_data = CFDataCreate(NULL, (const UInt8 *)cert->cert_buf.ptr,
+    				 cert->cert_buf.slen);
+    	if (!cert_data)
+    	    return PJ_ENOMEM;
+    }
+
+    if (cert_data) {
+        if (cert->privkey_pass.slen) {
+	    password = CFStringCreateWithBytes(NULL,
+		           (const UInt8 *)cert->privkey_pass.ptr,
+		           cert->privkey_pass.slen,
+		           kCFStringEncodingUTF8,
+		           false);
+	    keys[0] = (void *)kSecImportExportPassphrase;
+	    values[0] = (void *)password;
+        }
+    
+        options = CFDictionaryCreate(NULL, (const void **)keys,
+    				     (const void **)values,
+    				     (password? 1: 0), NULL, NULL);
+        if (!options)
+    	    return PJ_ENOMEM;
+        
+#if TARGET_OS_IPHONE
+        err = SecPKCS12Import(cert_data, options, &items);
+#else
+        {
+    	    SecExternalFormat ext_format[3] = {kSecFormatPKCS12,
+    	    				       kSecFormatPEMSequence,
+    	    				       kSecFormatX509Cert/* DER */};
+    	    SecExternalItemType ext_type = kSecItemTypeCertificate;
+    	    SecItemImportExportKeyParameters key_params;
+    
+    	    pj_bzero(&key_params, sizeof(key_params));
+    	    key_params.version = SEC_KEY_IMPORT_EXPORT_PARAMS_VERSION;
+    	    key_params.passphrase = password;
+    
+    	    for (i = 0; i < PJ_ARRAY_SIZE(ext_format); i++) {
+    	    	items = NULL;
+    		err = SecItemImport(cert_data, NULL, &ext_format[i],
+    				    &ext_type, 0, &key_params, NULL, &items);
+    		if (err == noErr && items) {
+    		    break;
+    		}
+    	    }
+        }
+#endif
+    
+        CFRelease(options);
+        if (password)
+    	    CFRelease(password);
+        CFRelease(cert_data);
+        if (err != noErr || !items) {
+    	    return pj_status_from_err(assock, "SecItemImport", err);
+        }
+    
+        count = CFArrayGetCount(items);
+    
+        for (i = 0; i < count; i++) {
+    	    CFTypeRef item;
+    	    CFTypeID item_id;
+    	
+    	    item = (CFTypeRef) CFArrayGetValueAtIndex(items, i);
+    	    item_id = CFGetTypeID(item);
+    
+    	    if (item_id == CFDictionaryGetTypeID()) {
+    	    	identity = (SecIdentityRef)
+    		           CFDictionaryGetValue((CFDictionaryRef) item,
+    					        kSecImportItemIdentity);
+    	        break;
+    	    }
+#if !TARGET_OS_IPHONE
+    	    else if (item_id == SecCertificateGetTypeID()) {
+    	    	err = SecIdentityCreateWithCertificate(NULL,
+    		          (SecCertificateRef) item, &identity);
+    	    	if (err != noErr) {
+    		    pj_status_from_err(assock, "SecIdentityCreate", err);
+    	    	    if (err == errSecItemNotFound) {
+    	    	    	PJ_LOG(2, (THIS_FILE, "Private key must be placed in "
+    	    	    			      "the keychain"));
+    	    	    }
+    	    	} else {
+    	    	    break;
+    	    	}
+    	    }
+#endif
+        }
+    
+        CFRelease(items);
+    
+        if (!identity) {
+    	    PJ_LOG(2, (THIS_FILE, "Failed extracting identity from "
+    			      	  "the cert file"));
+    	    return PJ_EINVAL;
+        }
+
+	*p_identity = sec_identity_create(identity);
+    
+        CFRelease(identity);
+    }
+
+    return PJ_SUCCESS;
+}
+
+static pj_status_t verify_cert(applessl_sock_t *assock, pj_ssl_cert_t *cert)
+{
+    CFDataRef ca_data = NULL;
+    SecTrustRef trust = assock->trust;
+    bool result;
+    CFErrorRef error;
+    pj_status_t status = PJ_SUCCESS;
+    OSStatus err = noErr;
+    
+    if (trust && cert && cert->CA_file.slen) {
+    	status = create_data_from_file(&ca_data, &cert->CA_file,
+    				       (cert->CA_path.slen? &cert->CA_path:
+    				        NULL));
+    	if (status != PJ_SUCCESS)
+    	    PJ_LOG(2, (THIS_FILE, "Failed reading CA file"));
+    } else if (trust && cert && cert->CA_buf.slen) {
+    	ca_data = CFDataCreate(NULL, (const UInt8 *)cert->CA_buf.ptr,
+    			       cert->CA_buf.slen);
+    	if (!ca_data)
+    	    PJ_LOG(2, (THIS_FILE, "Not enough memory for CA buffer"));
+    }
+    
+    if (ca_data) {
+        SecCertificateRef ca_cert;
+        CFMutableArrayRef ca_array;
+
+    	ca_cert = SecCertificateCreateWithData(NULL, ca_data);
+    	CFRelease(ca_data);	
+    	if (!ca_cert) {
+    	    PJ_LOG(2, (THIS_FILE, "Failed creating certificate from "
+    	    		      	  "CA file/buffer. It has to be "
+    	    		      	  "in DER format."));
+    	    status = PJ_EINVAL;
+    	    goto on_return;
+    	}
+    
+    	ca_array = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks);
+   	if (!ca_array) {
+    	    PJ_LOG(2, (THIS_FILE, "Not enough memory for CA array"));
+    	    CFRelease(ca_cert);
+    	    status = PJ_ENOMEM;
+    	    goto on_return;
+    	}
+
+    	CFArrayAppendValue(ca_array, ca_cert);
+    	CFRelease(ca_cert);
+    	
+    	err = SecTrustSetAnchorCertificates(trust, ca_array);
+    	CFRelease(ca_array);
+    	if (err != noErr)
+  	    pj_status_from_err(assock, "SetAnchorCerts", err);
+
+    	err = SecTrustSetAnchorCertificatesOnly(trust, true);
+    	if (err != noErr)
+  	    pj_status_from_err(assock, "SetAnchorCertsOnly", err);
+    }
+
+    result = SecTrustEvaluateWithError(trust, &error);
+    if (!result) {
+        pj_ssl_sock_t *ssock = &assock->base;
+	SecTrustResultType trust_result;
+        
+        err = SecTrustGetTrustResult(trust, &trust_result);
+        if (err == noErr) {
+    	    switch (trust_result) {
+    		case kSecTrustResultInvalid:
+		    ssock->verify_status |= PJ_SSL_CERT_EINVALID_FORMAT;
+		    break;
+
+    		case kSecTrustResultDeny:
+    		case kSecTrustResultFatalTrustFailure:
+    		    ssock->verify_status |= PJ_SSL_CERT_EUNTRUSTED;
+    		    break;
+
+    		case kSecTrustResultRecoverableTrustFailure:
+    		    /* Doc: "If you receive this result, you can retry
+    		     * after changing settings. For example, if trust is
+    		     * denied because the certificate has expired, ..."
+    		     * But this error can also mean another (recoverable)
+    		     * failure, though.
+    		     */
+    		    ssock->verify_status |= PJ_SSL_CERT_EVALIDITY_PERIOD;
+    		    break;
+    	
+    		case kSecTrustResultOtherError:
+		    ssock->verify_status |= PJ_SSL_CERT_EUNKNOWN;
+		    break;
+
+		default:
+		    break;
+	    }
+	}
+
+        if (error) 
+            CFRelease(error);
+
+        /* Evaluation failed */
+        status = PJ_EEOF;
+    }
+
+on_return:
+    if (status != PJ_SUCCESS && assock->base.verify_status == 0)
+    	assock->base.verify_status |= PJ_SSL_CERT_EUNKNOWN;
+
+    return status;
+}
+
+
+/*
+ *******************************************************************
+ * Network functions.
+ *******************************************************************
+ */
+
+/* Send data. */
+static pj_status_t network_send(pj_ssl_sock_t *ssock,
+				pj_ioqueue_op_key_t *send_key,
+				const void *data,
+				pj_ssize_t *size,
+				unsigned flags)
+{
+    applessl_sock_t *assock = (applessl_sock_t *)ssock;
+    dispatch_data_t content;
+
+    if (!assock->connection)
+    	return PJ_EGONE;
+    
+    content = dispatch_data_create(data, *size, assock->queue,
+    				   DISPATCH_DATA_DESTRUCTOR_DEFAULT);
+    if (!content)
+    	return PJ_ENOMEM;
+
+    nw_connection_send(assock->connection, content,
+    		       NW_CONNECTION_DEFAULT_MESSAGE_CONTEXT, true,
+    		       ^(nw_error_t error)
+    {
+    	event_t event;
+
+	if (error != NULL) {
+    	    errno = nw_error_get_error_code(error);
+    	    if (errno == 89) {
+    	    	/* Error 89 is network cancelled, not a send error. */
+    	    	return;
+    	    } else {
+    	    	warn("Send error");
+    	    }
+        }
+
+	event.type = EVENT_DATA_SENT;
+	event.body.data_sent_ev.send_key = send_key;
+	if (error != NULL) {
+	    event.body.data_sent_ev.sent = (errno > 0)? -errno: errno;
+	} else {
+	    event.body.data_sent_ev.sent = dispatch_data_get_size(content);
+	}
+
+	event_manager_post_event(ssock, &event, PJ_TRUE);
+    });
+    dispatch_release(content);
+    
+    return PJ_EPENDING;
+}
+
+static pj_status_t network_start_read(pj_ssl_sock_t *ssock,
+				      unsigned async_count,
+				      unsigned buff_size,
+				      void *readbuf[],
+				      pj_uint32_t flags)
+{
+    applessl_sock_t *assock = (applessl_sock_t *)ssock;
+    unsigned i;
+
+    if (!assock->connection)
+    	return PJ_EGONE;
+
+    for (i = 0; i < async_count; i++) {
+	nw_connection_receive(assock->connection, 1, buff_size,
+	    ^(dispatch_data_t content, nw_content_context_t context,
+	      bool is_complete, nw_error_t error)
+	{
+	    pj_status_t status = PJ_SUCCESS;
+	    
+	    /* If the context is marked as complete, and is the final context,
+	     * we're read-closed.
+	     */
+	    if (is_complete &&
+	        (context == NULL || nw_content_context_get_is_final(context)))
+	    {
+		return;
+	    }
+
+	    if (error != NULL) {
+    	    	errno = nw_error_get_error_code(error);
+    	    	if (errno == 89) {
+    	    	    /* Since error 89 is network intentionally cancelled by
+    	    	     * us, we immediately return.
+    	    	     */
+    	    	    return;
+    	    	} else {
+    	    	    warn("Read error, stopping further receives");
+    	    	    status = PJ_EEOF;
+    	    	}
+            }
+
+	    dispatch_block_t schedule_next_receive = 
+	    ^{
+	    	/* If there was no error in receiving, request more data. */
+	    	if (!error && !is_complete && assock->connection) {
+		    network_start_read(ssock, async_count, buff_size,
+				       readbuf, flags);
+	    	}
+	    };
+
+            if (content) {
+            	dispatch_data_apply(content, 
+                    ^(dispatch_data_t region, size_t offset,
+                      const void *buffer, size_t inSize)
+            	{
+            	    /* This block can be invoked multiple times,
+            	     * each for every contiguous memory region in the content.
+            	     */
+            	    event_t event;
+
+		    memcpy(ssock->asock_rbuf[i], buffer, inSize);
+
+		    event.type = EVENT_DATA_READ;
+		    event.body.data_read_ev.data = ssock->asock_rbuf[i];
+		    event.body.data_read_ev.size = inSize;
+		    event.body.data_read_ev.status = status;
+		    event.body.data_read_ev.remainder = 0;
+
+		    event_manager_post_event(ssock, &event, PJ_FALSE);
+
+                    return (bool)true;
+                });
+                
+		schedule_next_receive();
+
+            } else {
+            	if (status != PJ_SUCCESS) {
+            	    event_t event;
+
+            	    /* Report read error to application */
+		    event.type = EVENT_DATA_READ;
+		    event.body.data_read_ev.data = NULL;
+		    event.body.data_read_ev.size = 0;
+		    event.body.data_read_ev.status = status;
+		    event.body.data_read_ev.remainder = 0;
+
+		    event_manager_post_event(ssock, &event, PJ_TRUE);
+            	}
+            
+	    	schedule_next_receive();
+	    }
+        });
+    }
+	
+    return PJ_SUCCESS;
+}
+
+/* Get address of local endpoint */
+static pj_status_t network_get_localaddr(pj_ssl_sock_t *ssock,
+					 pj_sockaddr_t *addr,
+					 int *namelen)
+{
+    applessl_sock_t *assock = (applessl_sock_t *)ssock;
+    nw_path_t path;
+    nw_endpoint_t endpoint;
+    const struct sockaddr *address;
+    
+    path = nw_connection_copy_current_path(assock->connection);
+    if (!path)
+    	return PJ_EINVALIDOP;
+    
+    endpoint = nw_path_copy_effective_local_endpoint(path);
+    nw_release(path);
+    if (!endpoint)
+    	return PJ_EINVALIDOP;
+
+    address = nw_endpoint_get_address(endpoint);
+    if (address) {
+    	pj_sockaddr_cp(addr, address);
+    	*namelen = pj_sockaddr_get_addr_len(addr);
+    }
+    nw_release(endpoint);
+    
+    return PJ_SUCCESS;
+}
+
+static pj_status_t network_create_params(pj_ssl_sock_t * ssock,
+				     	 const pj_sockaddr_t *localaddr,
+				     	 pj_uint16_t port_range,
+				     	 nw_parameters_t *p_params)
+{
+    applessl_sock_t *assock = (applessl_sock_t *)ssock;
+    char ip_addr[PJ_INET6_ADDRSTRLEN];
+    unsigned port;
+    char port_str[PJ_INET6_ADDRSTRLEN];
+    nw_endpoint_t local_endpoint;
+    nw_parameters_t parameters;
+    nw_parameters_configure_protocol_block_t configure_tls;
+    nw_protocol_stack_t protocol_stack;
+    nw_protocol_options_t ip_options;
+    tls_protocol_version_t min_proto = tls_protocol_version_TLSv10;
+    tls_protocol_version_t max_proto = tls_protocol_version_TLSv13;
+
+    /* Set min and max protocol version */
+    if (ssock->param.proto == PJ_SSL_SOCK_PROTO_DEFAULT) {
+	ssock->param.proto = PJ_SSL_SOCK_PROTO_TLS1 |
+	    		     PJ_SSL_SOCK_PROTO_TLS1_1 |
+	    		     PJ_SSL_SOCK_PROTO_TLS1_2 |
+	    		     PJ_SSL_SOCK_PROTO_TLS1_3;
+    }
+
+    if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_3) {
+	max_proto = tls_protocol_version_TLSv13;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_2) {
+	max_proto = tls_protocol_version_TLSv12;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_1) {
+	max_proto = tls_protocol_version_TLSv11;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1) {
+	max_proto = tls_protocol_version_TLSv10;
+    } else {
+	PJ_LOG(3, (THIS_FILE, "Unsupported TLS protocol"));
+	return PJ_EINVAL;
+    }
+
+    if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1) {
+	min_proto = tls_protocol_version_TLSv10;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_1) {
+	min_proto = tls_protocol_version_TLSv11;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_2) {
+	min_proto = tls_protocol_version_TLSv12;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_3) {
+	min_proto = tls_protocol_version_TLSv13;
+    }
+
+    /* Set certificate */
+    if (ssock->cert)  {
+	pj_status_t status = create_identity_from_cert(assock, ssock->cert,
+						       &assock->identity);
+	if (status != PJ_SUCCESS)
+    	    return status;
+    }
+
+    configure_tls = ^(nw_protocol_options_t tls_options)
+    {
+	sec_protocol_options_t sec_options;
+
+	sec_options = nw_tls_copy_sec_protocol_options(tls_options);
+
+    	/* Set identity */
+    	if (ssock->cert && assock->identity) {
+	    sec_protocol_options_set_local_identity(sec_options,
+	    					    assock->identity);
+	}
+
+	sec_protocol_options_set_min_tls_protocol_version(sec_options,
+	    						  min_proto);
+	sec_protocol_options_set_max_tls_protocol_version(sec_options,
+							  max_proto);
+
+    	/* Set cipher list */
+    	if (ssock->param.ciphers_num > 0) {
+    	    unsigned i;    	
+    	    for (i = 0; i < ssock->param.ciphers_num; i++) {
+    	    	sec_protocol_options_append_tls_ciphersuite(sec_options,
+	    	    (tls_ciphersuite_t)ssock->param.ciphers[i]);
+	    }
+	}
+    
+	if (!ssock->is_server && ssock->param.server_name.slen) {
+	    sec_protocol_options_set_tls_server_name(sec_options,
+	    	ssock->param.server_name.ptr);
+	}
+	
+	sec_protocol_options_set_tls_renegotiation_enabled(sec_options,
+							   true);
+	/* This must be disabled, otherwise server may think this is
+	 * a resumption of a previously closed connection, and our
+	 * verify block may never be invoked!
+	 */
+    	sec_protocol_options_set_tls_resumption_enabled(sec_options, false);
+	
+    	/* SSL verification options */
+    	sec_protocol_options_set_peer_authentication_required(sec_options,
+    	    true);
+
+	/* Handshake flow:
+	 * 1. Server's challenge block, provide server's trust
+	 * 2. Client's verify block, to verify server's trust
+	 * 3. Client's challenge block, provide client's trust
+	 * 4. Only if client's trust is not NULL, server's verify block,
+	 *    to verify client's trust.
+	 */
+        sec_protocol_options_set_challenge_block(sec_options,
+	    ^(sec_protocol_metadata_t metadata,
+	      sec_protocol_challenge_complete_t complete)
+	{
+	    complete(assock->identity);
+	}, assock->queue);
+	
+	sec_protocol_options_set_verify_block(sec_options,
+	    ^(sec_protocol_metadata_t metadata, sec_trust_t trust_ref,
+	      sec_protocol_verify_complete_t complete)
+	{
+	    event_t event;
+	    pj_status_t status;
+	    bool result = true;
+
+    	    assock->trust = trust_ref? sec_trust_copy_ref(trust_ref): nil;
+
+	    assock->cipher =
+	      sec_protocol_metadata_get_negotiated_tls_ciphersuite(metadata);
+
+	    /* For client, call on_connect_complete() callback first. */
+	    if (!ssock->is_server) {
+	    	if (!assock->connection)
+	    	    complete(false);
+
+	    	event.type = EVENT_CONNECT;
+	    	event.body.connect_ev.status = PJ_SUCCESS;
+	    	status = event_manager_post_event(ssock, &event, PJ_FALSE);
+	    	if (status == PJ_EGONE)
+	    	    complete(false);
+	    }
+
+	    event.type = EVENT_VERIFY_CERT;
+	    status = event_manager_post_event(ssock, &event, PJ_FALSE);
+	    if (status == PJ_EGONE)
+	    	complete(false);
+
+	    /* Check the result of cert verification. */
+	    if (ssock->verify_status != PJ_SSL_CERT_ESUCCESS) {
+		if (ssock->param.verify_peer) {
+        	    /* Verification failed. */
+        	    result = false;
+    		} else {
+    		    /* When verification is not requested just return ok here,
+    		     * however application can still get the verification status.
+     		     */
+    	    	    result = true;
+    	    	}
+    	    }
+
+	    complete(result);
+        }, assock->queue);
+
+	nw_release(sec_options);
+    };
+
+    parameters = nw_parameters_create_secure_tcp(configure_tls,
+    		     NW_PARAMETERS_DEFAULT_CONFIGURATION);
+
+    protocol_stack = nw_parameters_copy_default_protocol_stack(parameters);
+    ip_options = nw_protocol_stack_copy_internet_protocol(protocol_stack);
+    if (ssock->param.sock_af == pj_AF_INET()) {
+	nw_ip_options_set_version(ip_options, nw_ip_version_4);
+    } else if (ssock->param.sock_af == pj_AF_INET6()) {
+	nw_ip_options_set_version(ip_options, nw_ip_version_6);
+    }
+    nw_release(ip_options);
+    nw_release(protocol_stack);
+    
+    if (ssock->is_server && ssock->param.reuse_addr) {
+    	nw_parameters_set_reuse_local_address(parameters, true);
+    }
+
+    /* Create local endpoint.
+     * Currently we ignore QoS and socket options.
+     */
+    pj_sockaddr_print(localaddr, ip_addr,sizeof(ip_addr),0);
+
+    if (port_range) {
+	pj_uint16_t max_try = MAX_BIND_RETRY;
+
+	if (port_range && port_range < max_try) {
+	    max_try = port_range;
+	}
+	for (; max_try; --max_try) {
+	    pj_uint16_t base_port;
+
+	    base_port = pj_sockaddr_get_port(localaddr);
+	    port = (pj_uint16_t)(base_port + pj_rand() % (port_range + 1));
+	    pj_utoa(port, port_str);
+	    
+	    local_endpoint = nw_endpoint_create_host(ip_addr, port_str);
+	    if (local_endpoint)
+	    	break;
+	}
+    } else {
+    	port = pj_sockaddr_get_port(localaddr);
+    	pj_utoa(port, port_str);
+
+    	local_endpoint = nw_endpoint_create_host(ip_addr, port_str);
+    }
+    
+    if (!local_endpoint) {
+        PJ_LOG(2, (THIS_FILE, "Failed creating local endpoint"));
+    	return PJ_EINVALIDOP;
+    }
+
+    nw_parameters_set_local_endpoint(parameters, local_endpoint);
+    nw_release(local_endpoint);
+    
+    *p_params = parameters;
+    return PJ_SUCCESS;
+}
+
+/* Setup assock's connection state callback and start the connection */
+static pj_status_t network_setup_connection(pj_ssl_sock_t *ssock,
+					    void *connection)
+{
+    applessl_sock_t *assock = (applessl_sock_t *)ssock;
+    assock->connection = (nw_connection_t)connection;
+    pj_status_t status;
+
+    /* Initialize input circular buffer */
+    status = circ_init(ssock->pool->factory, &ssock->circ_buf_input, 8192);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    /* Initialize output circular buffer */
+    status = circ_init(ssock->pool->factory, &ssock->circ_buf_output, 8192);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    nw_connection_set_queue(assock->connection, assock->queue);
+
+    assock->con_state = nw_connection_state_invalid;
+    nw_connection_set_state_changed_handler(assock->connection,
+    	^(nw_connection_state_t state, nw_error_t error)
+    {
+    	pj_status_t status = PJ_SUCCESS;
+    	pj_bool_t call_cb = PJ_FALSE;
+#if SSL_DEBUG
+    	if (!pj_thread_is_registered()) {
+    	    pj_bzero(queue_th_desc, sizeof(pj_thread_desc));
+    	    pj_thread_register("sslq", queue_th_desc, &queue_th);
+        }
+        PJ_LOG(3, (THIS_FILE, "SSL state change %p %d", assock, state));
+#endif
+
+	if (error && state != nw_connection_state_cancelled) {
+    	    errno = nw_error_get_error_code(error);
+            warn("Connection failed %p", assock);
+            status = PJ_STATUS_FROM_OS(errno);
+#if SSL_DEBUG
+            PJ_LOG(3, (THIS_FILE, "SSL state and errno %d %d", state, errno));
+#endif
+            call_cb = PJ_TRUE;	
+	}
+
+	if (state == nw_connection_state_ready) {
+	    if (ssock->is_server) {
+    		nw_protocol_definition_t tls_def;
+    		nw_protocol_metadata_t prot_meta;
+    		sec_protocol_metadata_t meta;
+    		
+    		tls_def = nw_protocol_copy_tls_definition();
+    		prot_meta = nw_connection_copy_protocol_metadata(connection,
+    								 tls_def);
+		meta = nw_tls_copy_sec_protocol_metadata(prot_meta);
+		assock->cipher =
+	      	    sec_protocol_metadata_get_negotiated_tls_ciphersuite(meta);
+
+		if (ssock->param.require_client_cert &&
+		    !sec_protocol_metadata_access_peer_certificate_chain(
+		    	meta, ^(sec_certificate_t certificate) {} ))
+		{
+		    status = PJ_EEOF;
+		}
+		nw_release(tls_def);
+		nw_release(prot_meta);
+		nw_release(meta);
+	    }
+	    call_cb = PJ_TRUE;
+	} else if (state == nw_connection_state_cancelled) {
+	    /* We release the reference in ssl_destroy() */
+	    // nw_release(assock->connection);
+	    // assock->connection = nil;
+	}
+
+	if (call_cb) {
+	    event_t event;
+
+	    event.type = EVENT_HANDSHAKE_COMPLETE;
+	    event.body.handshake_ev.status = status;
+	    event_manager_post_event(ssock, &event, PJ_TRUE);
+
+	    if (ssock->is_server && status == PJ_SUCCESS) {
+    	        status = network_start_read(ssock, ssock->param.async_cnt,
+    		             (unsigned)ssock->param.read_buffer_size,
+			     ssock->asock_rbuf, 0);
+	    }
+	}
+
+	assock->con_state = state;
+    });
+
+    nw_connection_start(assock->connection);
+    
+    return PJ_SUCCESS;
+}
+
+static pj_status_t network_start_accept(pj_ssl_sock_t *ssock,
+			 		pj_pool_t *pool,
+			  		const pj_sockaddr_t *localaddr,
+			  		int addr_len,
+			  		const pj_ssl_sock_param *newsock_param)
+{
+    applessl_sock_t *assock = (applessl_sock_t *)ssock;
+    pj_status_t status;
+    nw_parameters_t parameters = NULL;
+
+    status = network_create_params(ssock, localaddr, 0, &parameters);
+    if (status != PJ_SUCCESS)
+    	return status;
+
+    /* Create listener */
+    assock->listener = nw_listener_create(parameters);
+    nw_release(parameters);
+    if (!assock->listener) {
+        PJ_LOG(2, (THIS_FILE, "Failed creating listener"));
+    	return PJ_EINVALIDOP;
+    }
+
+    nw_listener_set_queue(assock->listener, assock->queue);
+    /* Hold a reference until cancelled */
+    nw_retain(assock->listener);
+
+    assock->lis_state = nw_listener_state_invalid;
+    nw_listener_set_state_changed_handler(assock->listener, 
+        ^(nw_listener_state_t state, nw_error_t error)
+    {
+	errno = error ? nw_error_get_error_code(error) : 0;
+
+	if (state == nw_listener_state_failed) {
+	    warn("listener failed\n");
+	    pj_sockaddr_set_port(&ssock->local_addr, 0);
+	    dispatch_semaphore_signal(assock->ev_semaphore);
+	} else if (state == nw_listener_state_ready) {
+    	    /* Update local port */
+    	    pj_sockaddr_set_port(&ssock->local_addr,
+    			         nw_listener_get_port(assock->listener));
+	    dispatch_semaphore_signal(assock->ev_semaphore);
+	} else if (state == nw_listener_state_cancelled) {
+	    /* We release the reference in ssl_destroy() */
+	    // nw_release(assock->listener);
+	    // assock->listener = nil;
+	}
+    	assock->lis_state = state;
+    });
+
+    nw_listener_set_new_connection_handler(assock->listener,
+    	^(nw_connection_t connection)
+    {
+	nw_endpoint_t endpoint = nw_connection_copy_endpoint(connection);
+	const struct sockaddr *address;
+	event_t event;
+	
+	address = nw_endpoint_get_address(endpoint);
+
+	event.type = EVENT_ACCEPT;
+	event.body.accept_ev.newconn = connection;
+	pj_sockaddr_cp(&event.body.accept_ev.src_addr, address);
+	event.body.accept_ev.src_addr_len = pj_sockaddr_get_addr_len(address);
+	event.body.accept_ev.status = PJ_SUCCESS;
+	
+	nw_retain(connection);
+	event_manager_post_event(ssock, &event, PJ_TRUE);
+	
+	nw_release(endpoint);
+    });
+
+    /* Update local address */
+    ssock->addr_len = addr_len;
+    pj_sockaddr_cp(&ssock->local_addr, localaddr);
+
+    /* Start accepting */
+    pj_ssl_sock_param_copy(pool, &ssock->newsock_param, newsock_param);
+    ssock->newsock_param.grp_lock = NULL;
+
+    /* Start listening to the address */
+    nw_listener_start(assock->listener);
+    /* Wait until it's ready */
+    dispatch_semaphore_wait(assock->ev_semaphore, DISPATCH_TIME_FOREVER);
+    
+    if (pj_sockaddr_get_port(&ssock->local_addr) == 0) {
+    	/* Failed. */
+    	status = PJ_EEOF;
+    	goto on_error;
+    }
+
+    return PJ_SUCCESS;
+
+on_error:
+    ssl_reset_sock_state(ssock);
+    return status;
+}
+
+
+static pj_status_t network_start_connect(pj_ssl_sock_t *ssock,
+		       pj_ssl_start_connect_param *connect_param)
+{
+    char ip_addr[PJ_INET6_ADDRSTRLEN];
+    unsigned port;
+    char port_str[PJ_INET6_ADDRSTRLEN];
+    nw_endpoint_t endpoint;
+    nw_parameters_t parameters;
+    nw_connection_t connection;
+    pj_status_t status;
+
+    pj_pool_t *pool = connect_param->pool;
+    const pj_sockaddr_t *localaddr = connect_param->localaddr;
+    pj_uint16_t port_range = connect_param->local_port_range;
+    const pj_sockaddr_t *remaddr = connect_param->remaddr;
+    int addr_len = connect_param->addr_len;
+
+    PJ_ASSERT_RETURN(ssock && pool && localaddr && remaddr && addr_len,
+		     PJ_EINVAL);
+
+    status = network_create_params(ssock, localaddr, port_range,
+    				   &parameters);
+    if (status != PJ_SUCCESS)
+    	return status;
+
+    /* Create remote endpoint */
+    pj_sockaddr_print(remaddr, ip_addr,sizeof(ip_addr),0);
+    port = pj_sockaddr_get_port(remaddr);
+    pj_utoa(port, port_str);
+
+    endpoint = nw_endpoint_create_host(ip_addr, port_str);
+    if (!endpoint) {
+        PJ_LOG(2, (THIS_FILE, "Failed creating remote endpoint"));
+    	nw_release(parameters);
+    	return PJ_EINVALIDOP;
+    }
+
+    connection = nw_connection_create(endpoint, parameters);
+    nw_release(endpoint);
+    nw_release(parameters);
+    if (!connection) {
+        PJ_LOG(2, (THIS_FILE, "Failed creating connection"));
+    	return PJ_EINVALIDOP;
+    }
+
+    /* Hold a reference until cancelled */
+    nw_retain(connection);
+
+    status = network_setup_connection(ssock, connection);
+    if (status != PJ_SUCCESS)
+    	return status;
+    
+    /* Save remote address */
+    pj_sockaddr_cp(&ssock->rem_addr, remaddr);
+
+    /* Update local address */
+    ssock->addr_len = addr_len;
+    pj_sockaddr_cp(&ssock->local_addr, localaddr);
+    
+    return PJ_EPENDING;
+}
+
+
+/*
+ *******************************************************************
+ * SSL functions.
+ *******************************************************************
+ */
+
+static pj_ssl_sock_t *ssl_alloc(pj_pool_t *pool)
+{
+    applessl_sock_t *assock;
+    
+    /* Create event manager */
+    if (event_manager_create() != PJ_SUCCESS)
+    	return NULL;
+    
+    assock = PJ_POOL_ZALLOC_T(pool, applessl_sock_t);    
+
+    assock->queue = dispatch_queue_create("ssl_queue", DISPATCH_QUEUE_SERIAL);
+    assock->ev_semaphore = dispatch_semaphore_create(0);    
+    if (!assock->queue || !assock->ev_semaphore) {
+    	ssl_destroy(&assock->base);
+    	return NULL;
+    }
+        
+    return (pj_ssl_sock_t *)assock;
+}
+
+static pj_status_t ssl_create(pj_ssl_sock_t *ssock)
+{
+    /* Nothing to do here. SSL has been configured before connection
+     * is started.
+     */
+    return PJ_SUCCESS;
+}
+
+static void close_connection(applessl_sock_t *assock)
+{
+    if (assock->connection) {
+    	unsigned i;
+	nw_connection_t conn = assock->connection;
+	
+	assock->connection = nil;
+    	nw_connection_force_cancel(conn);
+    	nw_release(conn);
+
+    	/* We need to wait until the connection is at cancelled state,
+    	 * otherwise events will still be delivered even though we
+    	 * already force cancel and release the connection.
+    	 */
+    	for (i = 0; i < 40; i++) {
+    	    if (assock->con_state == nw_connection_state_cancelled) break;
+    	    pj_thread_sleep(50);
+    	}
+
+    	event_manager_remove_events(&assock->base);
+
+    	if (assock->con_state != nw_connection_state_cancelled) {
+    	    PJ_LOG(3, (THIS_FILE, "Warning: Failed to cancel SSL connection "
+    	    			  "%p %d", assock, assock->con_state));
+    	}
+
+#if SSL_DEBUG
+	PJ_LOG(3, (THIS_FILE, "SSL connection %p closed", assock));
+#endif
+
+    }
+}
+
+/* Close sockets */
+static void ssl_close_sockets(pj_ssl_sock_t *ssock)
+{
+    applessl_sock_t *assock = (applessl_sock_t *)ssock;
+
+    if (assock->identity) {
+   	nw_release(assock->identity);
+   	assock->identity = nil;
+    }
+
+    if (assock->trust) {
+	nw_release(assock->trust);
+	assock->trust = nil;
+    }
+
+    /* This can happen when pj_ssl_sock_create() fails. */
+    if (!ssock->write_mutex)
+    	return;
+
+    pj_lock_acquire(ssock->write_mutex);
+    close_connection(assock);
+    pj_lock_release(ssock->write_mutex);
+}
+
+/* Destroy Apple SSL. */
+static void ssl_destroy(pj_ssl_sock_t *ssock)
+{
+    applessl_sock_t *assock = (applessl_sock_t *)ssock;
+
+    close_connection(assock);
+
+    if (assock->listener) {
+    	unsigned i;
+	
+	nw_listener_set_new_connection_handler(assock->listener, nil);
+    	nw_listener_cancel(assock->listener);
+
+    	for (i = 0; i < 20; i++) {
+    	    if (assock->lis_state == nw_listener_state_cancelled) break;
+    	    pj_thread_sleep(50);
+    	}
+    	if (assock->lis_state != nw_listener_state_cancelled) {
+    	    PJ_LOG(3, (THIS_FILE, "Warning: Failed to cancel SSL listener "
+    	    			  "%p %d", assock, assock->lis_state));
+    	}
+	nw_release(assock->listener);
+  	assock->listener = nil;
+    }
+
+    event_manager_remove_events(ssock);
+
+    /* Important: if we are called from a blocking dispatch block,
+     * we need to signal it before destroying ourselves.
+     */
+    if (assock->ev_semaphore) {
+    	dispatch_semaphore_signal(assock->ev_semaphore);
+    }
+
+    if (assock->queue) {
+    	dispatch_release(assock->queue);
+    	assock->queue = NULL;
+    }
+
+    if (assock->ev_semaphore) {
+    	dispatch_release(assock->ev_semaphore);
+    	assock->ev_semaphore = nil;
+    }
+
+    /* Destroy circular buffers */
+    circ_deinit(&ssock->circ_buf_input);
+    circ_deinit(&ssock->circ_buf_output);
+    
+    PJ_LOG(4, (THIS_FILE, "SSL %p destroyed", ssock));
+}
+
+
+/* Reset socket state. */
+static void ssl_reset_sock_state(pj_ssl_sock_t *ssock)
+{
+    pj_lock_acquire(ssock->circ_buf_output_mutex);
+    ssock->ssl_state = SSL_STATE_NULL;
+    pj_lock_release(ssock->circ_buf_output_mutex);
+
+#if SSL_DEBUG
+    PJ_LOG(3, (THIS_FILE, "SSL reset sock state %p", ssock));
+#endif
+
+    ssl_close_sockets(ssock);
+}
+
+
+/* This function is taken from Apple's sslAppUtils.cpp (version 58286.41.2),
+ * with some modifications.
+ */
+const char *sslGetCipherSuiteString(SSLCipherSuite cs)
+{
+    switch (cs) {
+        /* TLS addenda using AES-CBC, RFC 3268 */
+        case TLS_RSA_WITH_AES_128_CBC_SHA:          
+            return "TLS_RSA_WITH_AES_128_CBC_SHA";
+        case TLS_DH_DSS_WITH_AES_128_CBC_SHA:       
+            return "TLS_DH_DSS_WITH_AES_128_CBC_SHA";
+        case TLS_DH_RSA_WITH_AES_128_CBC_SHA:       
+            return "TLS_DH_RSA_WITH_AES_128_CBC_SHA";
+        case TLS_DHE_DSS_WITH_AES_128_CBC_SHA:      
+            return "TLS_DHE_DSS_WITH_AES_128_CBC_SHA";
+        case TLS_DHE_RSA_WITH_AES_128_CBC_SHA:      
+            return "TLS_DHE_RSA_WITH_AES_128_CBC_SHA";
+        case TLS_DH_anon_WITH_AES_128_CBC_SHA:      
+            return "TLS_DH_anon_WITH_AES_128_CBC_SHA";
+        case TLS_RSA_WITH_AES_256_CBC_SHA:          
+            return "TLS_RSA_WITH_AES_256_CBC_SHA";
+        case TLS_DH_DSS_WITH_AES_256_CBC_SHA:       
+            return "TLS_DH_DSS_WITH_AES_256_CBC_SHA";
+        case TLS_DH_RSA_WITH_AES_256_CBC_SHA:       
+            return "TLS_DH_RSA_WITH_AES_256_CBC_SHA";
+        case TLS_DHE_DSS_WITH_AES_256_CBC_SHA:      
+            return "TLS_DHE_DSS_WITH_AES_256_CBC_SHA";
+        case TLS_DHE_RSA_WITH_AES_256_CBC_SHA:      
+            return "TLS_DHE_RSA_WITH_AES_256_CBC_SHA";
+        case TLS_DH_anon_WITH_AES_256_CBC_SHA:      
+            return "TLS_DH_anon_WITH_AES_256_CBC_SHA";
+
+        /* ECDSA addenda, RFC 4492 */
+        case TLS_ECDH_ECDSA_WITH_NULL_SHA:          
+            return "TLS_ECDH_ECDSA_WITH_NULL_SHA";
+        case TLS_ECDH_ECDSA_WITH_RC4_128_SHA:       
+            return "TLS_ECDH_ECDSA_WITH_RC4_128_SHA";
+        case TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA:  
+            return "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA";
+        case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:   
+            return "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA";
+        case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:   
+            return "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA";
+        case TLS_ECDHE_ECDSA_WITH_NULL_SHA:         
+            return "TLS_ECDHE_ECDSA_WITH_NULL_SHA";
+        case TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:      
+            return "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA";
+        case TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA: 
+            return "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA";
+        case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:  
+            return "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA";
+        case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:  
+            return "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA";
+        case TLS_ECDH_RSA_WITH_NULL_SHA:            
+            return "TLS_ECDH_RSA_WITH_NULL_SHA";
+        case TLS_ECDH_RSA_WITH_RC4_128_SHA:         
+            return "TLS_ECDH_RSA_WITH_RC4_128_SHA";
+        case TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA:    
+            return "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA";
+        case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA:     
+            return "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA";
+        case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:     
+            return "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA";
+        case TLS_ECDHE_RSA_WITH_NULL_SHA:           
+            return "TLS_ECDHE_RSA_WITH_NULL_SHA";
+        case TLS_ECDHE_RSA_WITH_RC4_128_SHA:        
+            return "TLS_ECDHE_RSA_WITH_RC4_128_SHA";
+        case TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:   
+            return "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA";
+        case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:    
+            return "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA";
+        case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:    
+            return "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA";
+        case TLS_ECDH_anon_WITH_NULL_SHA:           
+            return "TLS_ECDH_anon_WITH_NULL_SHA";
+        case TLS_ECDH_anon_WITH_RC4_128_SHA:        
+            return "TLS_ECDH_anon_WITH_RC4_128_SHA";
+        case TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA:   
+            return "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA";
+        case TLS_ECDH_anon_WITH_AES_128_CBC_SHA:    
+            return "TLS_ECDH_anon_WITH_AES_128_CBC_SHA";
+        case TLS_ECDH_anon_WITH_AES_256_CBC_SHA:    
+            return "TLS_ECDH_anon_WITH_AES_256_CBC_SHA";
+
+        /* TLS 1.2 addenda, RFC 5246 */
+        case TLS_RSA_WITH_AES_128_CBC_SHA256:       
+            return "TLS_RSA_WITH_AES_128_CBC_SHA256";
+        case TLS_RSA_WITH_AES_256_CBC_SHA256:       
+            return "TLS_RSA_WITH_AES_256_CBC_SHA256";
+        case TLS_DH_DSS_WITH_AES_128_CBC_SHA256:    
+            return "TLS_DH_DSS_WITH_AES_128_CBC_SHA256";
+        case TLS_DH_RSA_WITH_AES_128_CBC_SHA256:    
+            return "TLS_DH_RSA_WITH_AES_128_CBC_SHA256";
+        case TLS_DHE_DSS_WITH_AES_128_CBC_SHA256:   
+            return "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256";
+        case TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:   
+            return "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256";
+        case TLS_DH_DSS_WITH_AES_256_CBC_SHA256:    
+            return "TLS_DH_DSS_WITH_AES_256_CBC_SHA256";
+        case TLS_DH_RSA_WITH_AES_256_CBC_SHA256:    
+            return "TLS_DH_RSA_WITH_AES_256_CBC_SHA256";
+        case TLS_DHE_DSS_WITH_AES_256_CBC_SHA256:   
+            return "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256";
+        case TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:   
+            return "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256";
+        case TLS_DH_anon_WITH_AES_128_CBC_SHA256:   
+            return "TLS_DH_anon_WITH_AES_128_CBC_SHA256";
+        case TLS_DH_anon_WITH_AES_256_CBC_SHA256:   
+            return "TLS_DH_anon_WITH_AES_256_CBC_SHA256";
+
+        /* TLS addenda using AES-GCM, RFC 5288 */
+        case TLS_RSA_WITH_AES_128_GCM_SHA256:       
+            return "TLS_RSA_WITH_AES_128_GCM_SHA256";
+        case TLS_RSA_WITH_AES_256_GCM_SHA384:       
+            return "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256";
+        case TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:   
+            return "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256";
+        case TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:   
+            return "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384";
+        case TLS_DH_RSA_WITH_AES_128_GCM_SHA256:    
+            return "TLS_DH_RSA_WITH_AES_128_GCM_SHA256";
+        case TLS_DH_RSA_WITH_AES_256_GCM_SHA384:    
+            return "TLS_DH_RSA_WITH_AES_256_GCM_SHA384";
+        case TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:   
+            return "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256";
+        case TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:   
+            return "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384";
+        case TLS_DH_DSS_WITH_AES_128_GCM_SHA256:    
+            return "TLS_DH_DSS_WITH_AES_128_GCM_SHA256";
+        case TLS_DH_DSS_WITH_AES_256_GCM_SHA384:    
+            return "TLS_DH_DSS_WITH_AES_256_GCM_SHA384";
+        case TLS_DH_anon_WITH_AES_128_GCM_SHA256:   
+            return "TLS_DH_anon_WITH_AES_128_GCM_SHA256";
+        case TLS_DH_anon_WITH_AES_256_GCM_SHA384:   
+            return "TLS_DH_anon_WITH_AES_256_GCM_SHA384";
+
+        /* ECDSA addenda, RFC 5289 */
+        case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:   
+            return "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256";
+        case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:   
+            return "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384";
+        case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:    
+            return "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256";
+        case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:    
+            return "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384";
+        case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:     
+            return "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256";
+        case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:     
+            return "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384";
+        case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:      
+            return "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256";
+        case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:      
+            return "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384";
+        case TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:   
+            return "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256";
+        case TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:   
+            return "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384";
+        case TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:    
+            return "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256";
+        case TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:    
+            return "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384";
+        case TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:     
+            return "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256";
+        case TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:     
+            return "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384";
+        case TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:      
+            return "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256";
+        case TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:      
+            return "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384";
+
+	case TLS_AES_128_GCM_SHA256:
+	    return "TLS_AES_128_GCM_SHA256";	
+	case TLS_AES_256_GCM_SHA384:
+	    return "TLS_AES_256_GCM_SHA384";
+	case TLS_CHACHA20_POLY1305_SHA256:
+	    return "TLS_CHACHA20_POLY1305_SHA256";
+	case TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256:
+	    return "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256";
+	case TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
+	    return "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256";
+	case TLS_RSA_WITH_3DES_EDE_CBC_SHA:
+	    return "TLS_RSA_WITH_3DES_EDE_CBC_SHA";
+            
+        default:
+            return "TLS_CIPHER_STRING_UNKNOWN";
+    }
+}
+
+static void ssl_ciphers_populate(void)
+{
+    /* SSLGetSupportedCiphers() is deprecated and we can't find
+     * the replacement API, so we just list the valid ciphers here
+     * taken from the tls_ciphersuite_t doc.
+     */
+    tls_ciphersuite_t ciphers[] = {
+    	tls_ciphersuite_AES_128_GCM_SHA256,
+	tls_ciphersuite_AES_256_GCM_SHA384,
+	tls_ciphersuite_CHACHA20_POLY1305_SHA256,
+    	tls_ciphersuite_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
+	tls_ciphersuite_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+	tls_ciphersuite_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
+	tls_ciphersuite_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+	tls_ciphersuite_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+	tls_ciphersuite_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
+	tls_ciphersuite_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+	tls_ciphersuite_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+	tls_ciphersuite_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
+	tls_ciphersuite_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+	tls_ciphersuite_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
+	tls_ciphersuite_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+	tls_ciphersuite_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+	tls_ciphersuite_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
+	tls_ciphersuite_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+	tls_ciphersuite_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
+	tls_ciphersuite_RSA_WITH_3DES_EDE_CBC_SHA,
+	tls_ciphersuite_RSA_WITH_AES_128_CBC_SHA,
+	tls_ciphersuite_RSA_WITH_AES_128_CBC_SHA256,
+	tls_ciphersuite_RSA_WITH_AES_128_GCM_SHA256,
+	tls_ciphersuite_RSA_WITH_AES_256_CBC_SHA,
+	tls_ciphersuite_RSA_WITH_AES_256_CBC_SHA256,
+	tls_ciphersuite_RSA_WITH_AES_256_GCM_SHA384
+    };
+    if (!ssl_cipher_num) {
+    	unsigned i;
+    	
+    	ssl_cipher_num = sizeof(ciphers)/sizeof(ciphers[0]);
+	for (i = 0; i < ssl_cipher_num; i++) {
+	    ssl_ciphers[i].id = (pj_ssl_cipher)ciphers[i];
+	    ssl_ciphers[i].name = sslGetCipherSuiteString(ciphers[i]);
+	}
+    }
+}
+
+
+static pj_ssl_cipher ssl_get_cipher(pj_ssl_sock_t *ssock)
+{
+    applessl_sock_t *assock = (applessl_sock_t *)ssock;
+
+    return (pj_ssl_cipher) assock->cipher;
+}
+
+
+#if !TARGET_OS_IPHONE
+static void get_info_and_cn(CFArrayRef array, CFMutableStringRef info,
+			    CFStringRef *cn)
+{
+    const void *keys[] = {kSecOIDOrganizationalUnitName, kSecOIDCountryName,
+    			  kSecOIDStateProvinceName, kSecOIDLocalityName,
+    			  kSecOIDOrganizationName, kSecOIDCommonName};
+    const char *labels[] = { "OU=", "C=", "ST=", "L=", "O=", "CN="};
+    pj_bool_t add_separator = PJ_FALSE;
+    int i, n;
+
+    *cn = NULL;
+    for(i = 0; i < sizeof(keys)/sizeof(keys[0]);  i++) {
+        for (n = 0 ; n < CFArrayGetCount(array); n++) {
+            CFDictionaryRef dict;
+            CFTypeRef dictkey;
+            CFStringRef str;
+
+            dict = CFArrayGetValueAtIndex(array, n);
+            if (CFGetTypeID(dict) != CFDictionaryGetTypeID())
+                continue;
+            dictkey = CFDictionaryGetValue(dict, kSecPropertyKeyLabel);
+            if (!CFEqual(dictkey, keys[i]))
+                continue;
+            str = (CFStringRef) CFDictionaryGetValue(dict,
+            					     kSecPropertyKeyValue);
+            					     
+            if (CFStringGetLength(str) > 0) {
+            	if (add_separator) {
+                    CFStringAppendCString(info, "/", kCFStringEncodingUTF8);
+                }
+                CFStringAppendCString(info, labels[i], kCFStringEncodingUTF8);
+                CFStringAppend(info, str);
+		add_separator = PJ_TRUE;
+		
+		if (CFEqual(keys[i], kSecOIDCommonName))
+		    *cn = str;
+            }
+        }
+    }
+}
+
+static CFDictionaryRef get_cert_oid(SecCertificateRef cert, CFStringRef oid,
+				    CFTypeRef *value)
+{
+    void *key[1];
+    CFArrayRef key_arr;
+    CFDictionaryRef vals, dict;
+
+    key[0] = (void *)oid;
+    key_arr = CFArrayCreate(NULL, (const void **)key, 1,
+    			    &kCFTypeArrayCallBacks);
+
+    vals = SecCertificateCopyValues(cert, key_arr, NULL);
+    dict = CFDictionaryGetValue(vals, key[0]);
+    if (!dict) {
+    	CFRelease(key_arr);
+    	CFRelease(vals);
+    	return NULL;
+    }
+
+    *value = CFDictionaryGetValue(dict, kSecPropertyKeyValue);
+
+    CFRelease(key_arr);
+
+    return vals;
+}
+
+#endif
+
+/* Get certificate info; in case the certificate info is already populated,
+ * this function will check if the contents need updating by inspecting the
+ * issuer and the serial number.
+ */
+static void get_cert_info(pj_pool_t *pool, pj_ssl_cert_info *ci,
+			  SecCertificateRef cert)
+{
+    pj_bool_t update_needed;
+    char buf[512];
+    size_t bufsize = sizeof(buf);
+    const pj_uint8_t *serial_no = NULL;
+    size_t serialsize = 0;
+    CFMutableStringRef issuer_info;
+    CFStringRef str;
+    CFDataRef serial = NULL;
+#if !TARGET_OS_IPHONE
+    CFStringRef issuer_cn = NULL;
+    CFDictionaryRef dict;
+#endif
+
+    pj_assert(pool && ci && cert);
+
+    /* Get issuer */
+    issuer_info = CFStringCreateMutable(NULL, 0);
+#if !TARGET_OS_IPHONE
+{
+    /* Unfortunately, unlike on Mac, on iOS we don't have these APIs
+     * to query the certificate info such as the issuer, version,
+     * validity, and alt names.
+     */
+    CFArrayRef issuer_vals;
+    
+    dict = get_cert_oid(cert, kSecOIDX509V1IssuerName,
+    			(CFTypeRef *)&issuer_vals);
+    if (dict) {
+    	get_info_and_cn(issuer_vals, issuer_info, &issuer_cn);
+    	if (issuer_cn)
+    	    issuer_cn = CFStringCreateCopy(NULL, issuer_cn);
+    	CFRelease(dict);
+    }
+}
+#endif
+    CFStringGetCString(issuer_info, buf, bufsize, kCFStringEncodingUTF8);
+
+    /* Get serial no */
+    if (__builtin_available(macOS 10.13, iOS 11.0, *)) {
+	serial = SecCertificateCopySerialNumberData(cert, NULL);
+    	if (serial) {
+    	    serial_no = CFDataGetBytePtr(serial);
+    	    serialsize = CFDataGetLength(serial);
+    	}
+    }
+
+    /* Check if the contents need to be updated */
+    update_needed = pj_strcmp2(&ci->issuer.info, buf) ||
+                    pj_memcmp(ci->serial_no, serial_no, serialsize);
+    if (!update_needed) {
+        CFRelease(issuer_info);
+        return;
+    }
+
+    /* Update cert info */
+
+    pj_bzero(ci, sizeof(pj_ssl_cert_info));
+
+    /* Version */
+#if !TARGET_OS_IPHONE
+{
+    CFStringRef version;
+    
+    dict = get_cert_oid(cert, kSecOIDX509V1Version,
+    			(CFTypeRef *)&version);
+    if (dict) {
+    	ci->version = CFStringGetIntValue(version);
+    	CFRelease(dict);
+    }
+}
+#endif
+
+    /* Issuer */
+    pj_strdup2(pool, &ci->issuer.info, buf);
+#if !TARGET_OS_IPHONE
+    if (issuer_cn) {
+    	CFStringGetCString(issuer_cn, buf, bufsize, kCFStringEncodingUTF8);
+    	pj_strdup2(pool, &ci->issuer.cn, buf);
+    	CFRelease(issuer_cn);
+    }
+#endif
+    CFRelease(issuer_info);
+
+    /* Serial number */
+    if (serial) {
+    	if (serialsize > sizeof(ci->serial_no))
+    	    serialsize = sizeof(ci->serial_no);
+    	pj_memcpy(ci->serial_no, serial_no, serialsize);
+    	CFRelease(serial);
+    }
+
+    /* Subject */
+    str = SecCertificateCopySubjectSummary(cert);
+    CFStringGetCString(str, buf, bufsize, kCFStringEncodingUTF8);
+    pj_strdup2(pool, &ci->subject.cn, buf);
+    CFRelease(str);
+#if !TARGET_OS_IPHONE
+{
+    CFArrayRef subject;
+    CFMutableStringRef subject_info;
+    
+    dict = get_cert_oid(cert, kSecOIDX509V1SubjectName,
+    			(CFTypeRef *)&subject);
+    if (dict) {
+     	subject_info = CFStringCreateMutable(NULL, 0);
+
+    	get_info_and_cn(subject, subject_info, &str);
+    
+    	CFStringGetCString(subject_info, buf, bufsize, kCFStringEncodingUTF8);
+    	pj_strdup2(pool, &ci->subject.info, buf);
+    
+    	CFRelease(dict);
+    	CFRelease(subject_info);
+    }
+}
+#endif
+
+    /* Validity */
+#if !TARGET_OS_IPHONE
+{
+    CFNumberRef validity;
+    double interval;
+    
+    dict = get_cert_oid(cert, kSecOIDX509V1ValidityNotBefore,
+    			(CFTypeRef *)&validity);
+    if (dict) {
+        if (CFNumberGetValue(validity, CFNumberGetType(validity),
+        		     &interval))
+        {
+            /* Darwin's absolute reference date is 1 Jan 2001 00:00:00 GMT */
+    	    ci->validity.start.sec = (unsigned long)interval + 978278400L;
+    	}
+    	CFRelease(dict);
+    }
+
+    dict = get_cert_oid(cert, kSecOIDX509V1ValidityNotAfter,
+    			(CFTypeRef *)&validity);
+    if (dict) {
+    	if (CFNumberGetValue(validity, CFNumberGetType(validity),
+    			     &interval))
+    	{
+    	    ci->validity.end.sec = (unsigned long)interval + 978278400L;
+    	}
+    	CFRelease(dict);
+    }
+}
+#endif
+
+    /* Subject Alternative Name extension */
+#if !TARGET_OS_IPHONE
+{
+    CFArrayRef altname;
+    CFIndex i;
+
+    dict = get_cert_oid(cert, kSecOIDSubjectAltName, (CFTypeRef *)&altname);
+    if (!dict || !CFArrayGetCount(altname))
+    	return;
+
+    ci->subj_alt_name.entry = pj_pool_calloc(pool, CFArrayGetCount(altname),
+					     sizeof(*ci->subj_alt_name.entry));
+
+    for (i = 0; i < CFArrayGetCount(altname); ++i) {
+    	CFDictionaryRef item;
+    	CFStringRef label, value;
+	pj_ssl_cert_name_type type = PJ_SSL_CERT_NAME_UNKNOWN;
+        
+        item = CFArrayGetValueAtIndex(altname, i);
+        if (CFGetTypeID(item) != CFDictionaryGetTypeID())
+            continue;
+        
+        label = (CFStringRef)CFDictionaryGetValue(item, kSecPropertyKeyLabel);
+	if (CFGetTypeID(label) != CFStringGetTypeID())
+	    continue;
+
+        value = (CFStringRef)CFDictionaryGetValue(item, kSecPropertyKeyValue);
+
+	if (!CFStringCompare(label, CFSTR("DNS Name"),
+			     kCFCompareCaseInsensitive))
+	{
+	    if (CFGetTypeID(value) != CFStringGetTypeID())
+	    	continue;
+	    CFStringGetCString(value, buf, bufsize, kCFStringEncodingUTF8);
+	    type = PJ_SSL_CERT_NAME_DNS;
+	} else if (!CFStringCompare(label, CFSTR("IP Address"),
+			     	    kCFCompareCaseInsensitive))
+	{
+	    if (CFGetTypeID(value) != CFStringGetTypeID())
+	    	continue;
+	    CFStringGetCString(value, buf, bufsize, kCFStringEncodingUTF8);
+	    type = PJ_SSL_CERT_NAME_IP;
+	} else if (!CFStringCompare(label, CFSTR("Email Address"),
+			     	    kCFCompareCaseInsensitive))
+	{
+	    if (CFGetTypeID(value) != CFStringGetTypeID())
+	    	continue;
+	    CFStringGetCString(value, buf, bufsize, kCFStringEncodingUTF8);
+	    type = PJ_SSL_CERT_NAME_RFC822;
+	} else if (!CFStringCompare(label, CFSTR("URI"),
+			     	    kCFCompareCaseInsensitive))
+	{
+	    CFStringRef uri;
+
+	    if (CFGetTypeID(value) != CFURLGetTypeID())
+	    	continue;
+	    uri = CFURLGetString((CFURLRef)value);
+	    CFStringGetCString(uri, buf, bufsize, kCFStringEncodingUTF8);
+	    type = PJ_SSL_CERT_NAME_URI;
+	}
+
+	if (type != PJ_SSL_CERT_NAME_UNKNOWN) {
+	    ci->subj_alt_name.entry[ci->subj_alt_name.cnt].type = type;
+	    if (type == PJ_SSL_CERT_NAME_IP) {
+	    	char ip_buf[PJ_INET6_ADDRSTRLEN+10];
+	    	int len = CFStringGetLength(value);
+		int af = pj_AF_INET();
+
+		if (len == sizeof(pj_in6_addr)) af = pj_AF_INET6();
+		pj_inet_ntop2(af, buf, ip_buf, sizeof(ip_buf));
+		pj_strdup2(pool,
+		    &ci->subj_alt_name.entry[ci->subj_alt_name.cnt].name,
+		    ip_buf);
+	    } else {
+		pj_strdup2(pool,
+	 	    &ci->subj_alt_name.entry[ci->subj_alt_name.cnt].name,
+		    buf);
+	    }
+	    ci->subj_alt_name.cnt++;
+	}
+    }
+
+    CFRelease(dict);
+}
+#endif
+}
+
+/* Update local & remote certificates info. This function should be
+ * called after handshake successfully completed.
+ */
+static void ssl_update_certs_info(pj_ssl_sock_t *ssock)
+{
+    applessl_sock_t *assock = (applessl_sock_t *)ssock;
+    SecTrustRef trust = assock->trust;
+    CFIndex count;
+    SecCertificateRef cert;
+
+    pj_assert(ssock->ssl_state == SSL_STATE_ESTABLISHED);
+    
+    /* Get active local certificate */
+    if (assock->identity) {
+        CFArrayRef cert_arr;
+        
+    	cert_arr = sec_identity_copy_certificates_ref(assock->identity);
+    	if (cert_arr) {
+    	    count = CFArrayGetCount(cert_arr);
+    	    if (count > 0) {
+		CFTypeRef elmt;
+
+    	    	elmt = (CFTypeRef) CFArrayGetValueAtIndex(cert_arr, 0);
+    	    	if (CFGetTypeID(elmt) == SecCertificateGetTypeID()) {
+    	    	    cert = (SecCertificateRef)elmt;
+      	    	    get_cert_info(ssock->pool, &ssock->local_cert_info, cert);
+      	    	}
+    	    }    	    
+    	    CFRelease(cert_arr);
+    	}
+    }
+
+    /* Get active remote certificate */
+    if (trust) {
+    	count = SecTrustGetCertificateCount(trust);
+    	if (count > 0) {
+	    cert = SecTrustGetCertificateAtIndex(trust, 0);
+      	    get_cert_info(ssock->pool, &ssock->remote_cert_info, cert);
+    	}
+    }
+}
+
+static void ssl_set_state(pj_ssl_sock_t *ssock, pj_bool_t is_server)
+{
+    PJ_UNUSED_ARG(ssock);
+    PJ_UNUSED_ARG(is_server);
+}
+
+static void ssl_set_peer_name(pj_ssl_sock_t *ssock)
+{
+    /* Setting server name is done when configuring tls before connection
+     * is started.
+     */
+    PJ_UNUSED_ARG(ssock);
+}
+
+static pj_status_t ssl_do_handshake(pj_ssl_sock_t *ssock)
+{
+    /* Nothing to do here, just return EPENDING. Handshake has
+     * automatically been performed when starting a connection.
+     */
+
+    return PJ_EPENDING;
+}
+
+static pj_status_t ssl_read(pj_ssl_sock_t *ssock, void *data, int *size)
+{
+    pj_size_t circ_buf_size, read_size;
+
+    pj_lock_acquire(ssock->circ_buf_input_mutex);
+
+    if (circ_empty(&ssock->circ_buf_input)) {
+        pj_lock_release(ssock->circ_buf_input_mutex);
+        *size = 0;
+	return PJ_SUCCESS;
+    }
+
+    circ_buf_size = circ_size(&ssock->circ_buf_input);
+    read_size = PJ_MIN(circ_buf_size, *size);
+
+    circ_read(&ssock->circ_buf_input, data, read_size);
+
+    pj_lock_release(ssock->circ_buf_input_mutex);
+
+    *size = read_size;
+
+    return PJ_SUCCESS;
+}
+
+/*
+ * Write the plain data to buffer. It will be encrypted later during
+ * sending.
+ */
+static pj_status_t ssl_write(pj_ssl_sock_t *ssock, const void *data,
+			     pj_ssize_t size, int *nwritten)
+{
+    pj_status_t status;
+
+    status = circ_write(&ssock->circ_buf_output, data, size);
+    *nwritten = (status == PJ_SUCCESS)? (int)size: 0;
+    
+    return status;
+}
+
+static pj_status_t ssl_renegotiate(pj_ssl_sock_t *ssock)
+{
+    PJ_UNUSED_ARG(ssock);
+
+    /* According to the doc,
+     * sec_protocol_options_set_tls_renegotiation_enabled() should
+     * enable TLS session renegotiation for versions 1.2 and earlier.
+     * But we can't trigger renegotiation manually, or can we?
+     */
+    return PJ_ENOTSUP;
+}
+
+
+#endif /* PJ_SSL_SOCK_IMP_APPLE */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ssl_sock_darwin.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ssl_sock_darwin.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ssl_sock_darwin.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ssl_sock_darwin.c	2022-02-24 07:54:38.000000000 +0000
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  * Copyright (C) 2019-2019 Teluu Inc. (http://www.teluu.com)
  *
@@ -409,32 +408,42 @@
 			     ~PJ_SSL_SOCK_PROTO_SSL2;
     }
 
-    if (ssock->param.proto & PJ_SSL_SOCK_PROTO_SSL2) {
-    	if (!min_proto) min_proto = kSSLProtocol2;
-	max_proto = kSSLProtocol2;
-    }
-    if (ssock->param.proto & PJ_SSL_SOCK_PROTO_SSL3) {
-    	if (!min_proto) min_proto = kSSLProtocol3;
-	max_proto = kSSLProtocol3;
-    }
-    if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1) {
-    	if (!min_proto) min_proto = kTLSProtocol1;
-	max_proto = kTLSProtocol1;
-    }
-    if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_1) {
-    	if (!min_proto) min_proto = kTLSProtocol11;
+    if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_3) {
+	max_proto = kTLSProtocol13;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_2) {
+	max_proto = kTLSProtocol12;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_1) {
 	max_proto = kTLSProtocol11;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1) {
+	max_proto = kTLSProtocol1;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_SSL3) {
+	max_proto = kSSLProtocol3;
+    } else {
+	PJ_LOG(3, (THIS_FILE, "Unsupported TLS/SSL protocol"));
+	return PJ_EINVAL;
     }
-    if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_2) {
-    	if (!min_proto) min_proto = kTLSProtocol12;
-	max_proto = kTLSProtocol12;
+
+    if (ssock->param.proto & PJ_SSL_SOCK_PROTO_SSL3) {
+	min_proto = kSSLProtocol3;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1) {
+	min_proto = kTLSProtocol1;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_1) {
+	min_proto = kTLSProtocol11;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_2) {
+	min_proto = kTLSProtocol12;
+    } else if (ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_3) {
+	min_proto = kTLSProtocol13;
     }
-    if (min_proto != kSSLProtocolUnknown) {
+
+    /* According to the doc, we can't set min/max proto for TLS protocol
+     * higher than 1.0. The runtime error given is -9830 (Illegal parameter).
+     */
+    if (min_proto != kSSLProtocolUnknown && min_proto <= kTLSProtocol1) {
         err = SSLSetProtocolVersionMin(ssl_ctx, min_proto);
         if (err != noErr) pj_status_from_err(dssock, "SetVersionMin", err);
     }
 
-    if (max_proto != kSSLProtocolUnknown) {
+    if (max_proto != kSSLProtocolUnknown && max_proto <= kTLSProtocol1) {
         err = SSLSetProtocolVersionMax(ssl_ctx, max_proto);
         if (err != noErr) pj_status_from_err(dssock, "SetVersionMax", err);
     }
@@ -1160,7 +1169,9 @@
     darwinssl_sock_t *dssock = (darwinssl_sock_t *)ssock;
 
     /* Set server name to connect */
-    if (ssock->param.server_name.slen) {
+    if (ssock->param.server_name.slen &&
+        get_ip_addr_ver(&ssock->param.server_name) == 0)
+    {
         OSStatus err;
         
     	err = SSLSetPeerDomainName(dssock->ssl_ctx,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ssl_sock_gtls.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ssl_sock_gtls.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ssl_sock_gtls.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ssl_sock_gtls.c	2022-02-24 07:54:38.000000000 +0000
@@ -1101,7 +1101,9 @@
     gnutls_sock_t *gssock = (gnutls_sock_t *)ssock;
 
     /* Set server name to connect */
-    if (ssock->param.server_name.slen) {
+    if (ssock->param.server_name.slen &&
+        get_ip_addr_ver(&ssock->param.server_name) == 0)
+    {
         int ret;
         /* Server name is null terminated already */
         ret = gnutls_server_name_set(gssock->session, GNUTLS_NAME_DNS,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ssl_sock_imp_common.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ssl_sock_imp_common.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ssl_sock_imp_common.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ssl_sock_imp_common.c	2022-02-24 07:54:38.000000000 +0000
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* 
  * Copyright (C) 2019-2019 Teluu Inc. (http://www.teluu.com)
  *
@@ -33,6 +32,18 @@
 
 enum { MAX_BIND_RETRY = 100 };
 
+#ifndef SSL_SOCK_IMP_USE_OWN_NETWORK
+static pj_bool_t asock_on_data_read (pj_activesock_t *asock,
+				     void *data,
+				     pj_size_t size,
+				     pj_status_t status,
+				     pj_size_t *remainder);
+
+static pj_bool_t asock_on_data_sent (pj_activesock_t *asock,
+				     pj_ioqueue_op_key_t *send_key,
+				     pj_ssize_t sent);
+#endif
+
 #ifdef SSL_SOCK_IMP_USE_CIRC_BUF
 /*
  *******************************************************************
@@ -173,6 +184,26 @@
  *******************************************************************
  */
 
+#ifndef SSL_SOCK_IMP_USE_OWN_NETWORK
+
+/* Check IP address version. */
+static int get_ip_addr_ver(const pj_str_t *host)
+{
+    pj_in_addr dummy;
+    pj_in6_addr dummy6;
+
+    /* First check if this is an IPv4 address */
+    if (pj_inet_pton(pj_AF_INET(), host, &dummy) == PJ_SUCCESS)
+	return 4;
+
+    /* Then check if this is an IPv6 address */
+    if (pj_inet_pton(pj_AF_INET6(), host, &dummy6) == PJ_SUCCESS)
+	return 6;
+
+    /* Not an IP address */
+    return 0;
+}
+
 /* Close sockets */
 static void ssl_close_sockets(pj_ssl_sock_t *ssock)
 {
@@ -203,6 +234,7 @@
     if (sock != PJ_INVALID_SOCKET)
         pj_sock_close(sock);
 }
+#endif
 
 /* When handshake completed:
  * - notify application
@@ -224,15 +256,19 @@
 
     /* Accepting */
     if (ssock->is_server) {
+	pj_bool_t ret = PJ_TRUE;
+
 	if (status != PJ_SUCCESS) {
 	    /* Handshake failed in accepting, destroy our self silently. */
 
 	    char buf[PJ_INET6_ADDRSTRLEN+10];
 
-	    PJ_PERROR(3,(ssock->pool->obj_name, status,
-			 "Handshake failed in accepting %s",
-			 pj_sockaddr_print(&ssock->rem_addr, buf,
-					   sizeof(buf), 3)));
+            if (pj_sockaddr_has_addr(&ssock->rem_addr)) {
+                PJ_PERROR(3,(ssock->pool->obj_name, status,
+			  "Handshake failed in accepting %s",
+			  pj_sockaddr_print(&ssock->rem_addr, buf,
+					    sizeof(buf), 3)));
+            }
 
 	    if (ssock->param.cb.on_accept_complete2) {
 		(*ssock->param.cb.on_accept_complete2) 
@@ -241,6 +277,12 @@
 		      status);
 	    }
 
+	    /* Decrement ref count of parent */
+	    if (ssock->parent->param.grp_lock) {
+		pj_grp_lock_dec_ref(ssock->parent->param.grp_lock);
+		ssock->parent = NULL;
+	    }
+
 	    /* Originally, this is a workaround for ticket #985. However,
 	     * a race condition may occur in multiple worker threads
 	     * environment when we are destroying SSL objects while other
@@ -284,23 +326,29 @@
 
 	    return PJ_FALSE;
 	}
+
 	/* Notify application the newly accepted SSL socket */
 	if (ssock->param.cb.on_accept_complete2) {
-	    pj_bool_t ret;
 	    ret = (*ssock->param.cb.on_accept_complete2) 
 		    (ssock->parent, ssock, (pj_sockaddr_t*)&ssock->rem_addr, 
 		    pj_sockaddr_get_len((pj_sockaddr_t*)&ssock->rem_addr), 
 		    status);
-	    if (ret == PJ_FALSE)
-		return PJ_FALSE;	
 	} else if (ssock->param.cb.on_accept_complete) {
-	    pj_bool_t ret;
 	    ret = (*ssock->param.cb.on_accept_complete)
 		      (ssock->parent, ssock, (pj_sockaddr_t*)&ssock->rem_addr,
 		       pj_sockaddr_get_len((pj_sockaddr_t*)&ssock->rem_addr));
-	    if (ret == PJ_FALSE)
-		return PJ_FALSE;
 	}
+
+	/* Decrement ref count of parent and reset parent (we don't need it
+	 * anymore, right?).
+	 */
+	if (ssock->parent->param.grp_lock) {
+	    pj_grp_lock_dec_ref(ssock->parent->param.grp_lock);
+	    ssock->parent = NULL;
+	}
+
+	if (ret == PJ_FALSE)
+	    return PJ_FALSE;
     }
 
     /* Connecting */
@@ -494,6 +542,10 @@
     pj_lock_release(ssock->write_mutex);
 
     /* Send it */
+#ifdef SSL_SOCK_IMP_USE_OWN_NETWORK
+    status = network_send(ssock, &wdata->key, wdata->data.content, &len,
+			  flags);
+#else
     if (ssock->param.sock_type == pj_SOCK_STREAM()) {
 	status = pj_activesock_send(ssock->asock, &wdata->key, 
 				    wdata->data.content, &len,
@@ -505,6 +557,7 @@
 				      (pj_sockaddr_t*)&ssock->rem_addr,
 				      ssock->addr_len);
     }
+#endif
 
     if (status != PJ_EPENDING) {
 	/* When the sending is not pending, remove the wdata from send
@@ -626,7 +679,7 @@
 
 /*
  *******************************************************************
- * Active socket callbacks.
+ * Network callbacks.
  *******************************************************************
  */
 
@@ -644,16 +697,15 @@
 					((pj_int8_t*)(asock_rbuf) + \
 					ssock->param.read_buffer_size)
 
-static pj_bool_t asock_on_data_read (pj_activesock_t *asock,
+static pj_bool_t ssock_on_data_read (pj_ssl_sock_t *ssock,
 				     void *data,
 				     pj_size_t size,
 				     pj_status_t status,
 				     pj_size_t *remainder)
 {
-    pj_ssl_sock_t *ssock = (pj_ssl_sock_t*)
-			   pj_activesock_get_user_data(asock);
+    if (status != PJ_SUCCESS)
+    	goto on_error;
 
-    /* Socket error or closed */
     if (data && size > 0) {
     	pj_status_t status_;
 
@@ -789,12 +841,10 @@
     return PJ_FALSE;
 }
 
-static pj_bool_t asock_on_data_sent (pj_activesock_t *asock,
+static pj_bool_t ssock_on_data_sent (pj_ssl_sock_t *ssock,
 				     pj_ioqueue_op_key_t *send_key,
 				     pj_ssize_t sent)
 {
-    pj_ssl_sock_t *ssock = (pj_ssl_sock_t*)
-			   pj_activesock_get_user_data(asock);
     write_data_t *wdata = (write_data_t*)send_key->user_data;
     pj_ioqueue_op_key_t *app_key = wdata->app_key;
     pj_ssize_t sent_len;
@@ -845,28 +895,65 @@
     return PJ_TRUE;
 }
 
-static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock,
+static pj_status_t get_localaddr(pj_ssl_sock_t *ssock,
+				 pj_sockaddr_t *addr,
+				 int *namelen)
+{
+    PJ_UNUSED_ARG(addr);
+    PJ_UNUSED_ARG(namelen);
+
+#ifdef SSL_SOCK_IMP_USE_OWN_NETWORK
+    return network_get_localaddr(ssock, &ssock->local_addr, 
+				 &ssock->addr_len);
+#else
+    return pj_sock_getsockname(ssock->sock, &ssock->local_addr, 
+			       &ssock->addr_len);
+#endif
+}
+
+
+static pj_bool_t ssock_on_accept_complete (pj_ssl_sock_t *ssock_parent,
 					   pj_sock_t newsock,
+					   void *newconn,
 					   const pj_sockaddr_t *src_addr,
-					   int src_addr_len)
+					   int src_addr_len,
+					   pj_status_t accept_status)
 {
-    pj_ssl_sock_t *ssock_parent = (pj_ssl_sock_t*)
-				  pj_activesock_get_user_data(asock);
     pj_ssl_sock_t *ssock;
+#ifndef SSL_SOCK_IMP_USE_OWN_NETWORK
     pj_activesock_cb asock_cb;
     pj_activesock_cfg asock_cfg;
+#endif
     unsigned i;
     pj_status_t status;
 
+#ifndef SSL_SOCK_IMP_USE_OWN_NETWORK
+    PJ_UNUSED_ARG(newconn);
+#endif
+
+    if (accept_status != PJ_SUCCESS) {
+	if (ssock_parent->param.cb.on_accept_complete2) {
+	    (*ssock_parent->param.cb.on_accept_complete2)(ssock_parent, NULL,
+						    	  src_addr,
+						    	  src_addr_len,
+						    	  accept_status);
+	}
+	return PJ_TRUE;
+    }
+
     /* Create new SSL socket instance */
     status = pj_ssl_sock_create(ssock_parent->pool,
 				&ssock_parent->newsock_param, &ssock);
     if (status != PJ_SUCCESS)
 	goto on_return;
 
+    /* Set parent and add ref count (avoid parent destroy during handshake) */
+    ssock->parent = ssock_parent;
+    if (ssock->parent->param.grp_lock)
+	pj_grp_lock_add_ref(ssock->parent->param.grp_lock);
+
     /* Update new SSL socket attributes */
     ssock->sock = newsock;
-    ssock->parent = ssock_parent;
     ssock->is_server = PJ_TRUE;
     if (ssock_parent->cert) {
 	status = pj_ssl_sock_set_certificate(ssock, ssock->pool, 
@@ -875,31 +962,9 @@
 	    goto on_return;
     }
 
-    /* Apply QoS, if specified */
-    status = pj_sock_apply_qos2(ssock->sock, ssock->param.qos_type,
-				&ssock->param.qos_params, 1, 
-				ssock->pool->obj_name, NULL);
-    if (status != PJ_SUCCESS && !ssock->param.qos_ignore_error)
-	goto on_return;
-
-    /* Apply socket options, if specified */
-    if (ssock->param.sockopt_params.cnt) {
-	status = pj_sock_setsockopt_params(ssock->sock, 
-					   &ssock->param.sockopt_params);
-	if (status != PJ_SUCCESS && !ssock->param.sockopt_ignore_error)
-	    goto on_return;
-    }
-
-    /* Update local address */
+    /* Set local address */
     ssock->addr_len = src_addr_len;
-    status = pj_sock_getsockname(ssock->sock, &ssock->local_addr, 
-				 &ssock->addr_len);
-    if (status != PJ_SUCCESS) {
-	/* This fails on few envs, e.g: win IOCP, just tolerate this and
-	 * use parent local address instead.
-	 */
-	pj_sockaddr_cp(&ssock->local_addr, &ssock_parent->local_addr);
-    }
+    pj_sockaddr_cp(&ssock->local_addr, &ssock_parent->local_addr);
 
     /* Set remote address */
     pj_sockaddr_cp(&ssock->rem_addr, src_addr);
@@ -909,28 +974,29 @@
     if (status != PJ_SUCCESS)
 	goto on_return;
 
+    /* Set peer name */
+    ssl_set_peer_name(ssock);
+
     /* Prepare read buffer */
     ssock->asock_rbuf = (void**)pj_pool_calloc(ssock->pool, 
 					       ssock->param.async_cnt,
 					       sizeof(void*));
-    if (!ssock->asock_rbuf)
-        return PJ_ENOMEM;
+    if (!ssock->asock_rbuf) {
+	status = PJ_ENOMEM;
+	goto on_return;
+    }
 
     for (i = 0; i<ssock->param.async_cnt; ++i) {
 	ssock->asock_rbuf[i] = (void*) pj_pool_alloc(
 					    ssock->pool, 
 					    ssock->param.read_buffer_size + 
 					    sizeof(read_data_t*));
-        if (!ssock->asock_rbuf[i])
-            return PJ_ENOMEM;
+	if (!ssock->asock_rbuf[i]) {
+	    status = PJ_ENOMEM;
+	    goto on_return;
+	}
     }
 
-    /* Create active socket */
-    pj_activesock_cfg_default(&asock_cfg);
-    asock_cfg.async_cnt = ssock->param.async_cnt;
-    asock_cfg.concurrency = ssock->param.concurrency;
-    asock_cfg.whole_data = PJ_TRUE;
-    
     /* If listener socket has group lock, automatically create group lock
      * for the new socket.
      */
@@ -942,11 +1008,39 @@
 	    goto on_return;
 
 	pj_grp_lock_add_ref(glock);
-	asock_cfg.grp_lock = ssock->param.grp_lock = glock;
+	ssock->param.grp_lock = glock;
 	pj_grp_lock_add_handler(ssock->param.grp_lock, ssock->pool, ssock,
 				ssl_on_destroy);
     }
 
+#ifdef SSL_SOCK_IMP_USE_OWN_NETWORK
+    status = network_setup_connection(ssock, newconn);
+    if (status != PJ_SUCCESS)
+	goto on_return;
+
+#else
+    /* Apply QoS, if specified */
+    status = pj_sock_apply_qos2(ssock->sock, ssock->param.qos_type,
+				&ssock->param.qos_params, 1, 
+				ssock->pool->obj_name, NULL);
+    if (status != PJ_SUCCESS && !ssock->param.qos_ignore_error)
+	goto on_return;
+
+    /* Apply socket options, if specified */
+    if (ssock->param.sockopt_params.cnt) {
+	status = pj_sock_setsockopt_params(ssock->sock, 
+					   &ssock->param.sockopt_params);
+	if (status != PJ_SUCCESS && !ssock->param.sockopt_ignore_error)
+	    goto on_return;
+    }
+
+    /* Create active socket */
+    pj_activesock_cfg_default(&asock_cfg);
+    asock_cfg.grp_lock = ssock->param.grp_lock;
+    asock_cfg.async_cnt = ssock->param.async_cnt;
+    asock_cfg.concurrency = ssock->param.concurrency;
+    asock_cfg.whole_data = PJ_TRUE;
+
     pj_bzero(&asock_cb, sizeof(asock_cb));
     asock_cb.on_data_read = asock_on_data_read;
     asock_cb.on_data_sent = asock_on_data_sent;
@@ -970,6 +1064,16 @@
 				       PJ_IOQUEUE_ALWAYS_ASYNC);
     if (status != PJ_SUCCESS)
 	goto on_return;
+#endif
+
+    /* Update local address */
+    status = get_localaddr(ssock, &ssock->local_addr, &ssock->addr_len);
+    if (status != PJ_SUCCESS) {
+	/* This fails on few envs, e.g: win IOCP, just tolerate this and
+	 * use parent local address instead.
+	 */
+	pj_sockaddr_cp(&ssock->local_addr, &ssock_parent->local_addr);
+    }
 
     /* Prepare write/send state */
     pj_assert(ssock->send_buf.max_len == 0);
@@ -1009,39 +1113,13 @@
 	on_handshake_complete(ssock, status);
     }
 
-    /* Must return PJ_TRUE whatever happened, as active socket must 
-     * continue listening.
-     */
+    /* Must return PJ_TRUE whatever happened, as we must continue listening */
     return PJ_TRUE;
 }
 
-static pj_bool_t asock_on_accept_complete2(pj_activesock_t *asock,
-					   pj_sock_t newsock,
-					   const pj_sockaddr_t *src_addr,
-					   int src_addr_len,
-					   pj_status_t status)
-{
-    pj_bool_t ret = PJ_TRUE;
-    if (status != PJ_SUCCESS) {
-	pj_ssl_sock_t *ssock = (pj_ssl_sock_t*)
-			pj_activesock_get_user_data(asock);
-
-	if (ssock->param.cb.on_accept_complete2) {
-	    (*ssock->param.cb.on_accept_complete2) (ssock, NULL, 
-						    src_addr, src_addr_len, 
-						    status);
-	}
-    } else {
-	ret = asock_on_accept_complete(asock, newsock, src_addr, src_addr_len);
-    }
-    return ret;
-}
-
-static pj_bool_t asock_on_connect_complete (pj_activesock_t *asock,
+static pj_bool_t ssock_on_connect_complete (pj_ssl_sock_t *ssock,
 					    pj_status_t status)
 {
-    pj_ssl_sock_t *ssock = (pj_ssl_sock_t*)
-			   pj_activesock_get_user_data(asock);
     unsigned i;
 
     if (status != PJ_SUCCESS)
@@ -1049,8 +1127,7 @@
 
     /* Update local address */
     ssock->addr_len = sizeof(pj_sockaddr);
-    status = pj_sock_getsockname(ssock->sock, &ssock->local_addr, 
-				 &ssock->addr_len);
+    status = get_localaddr(ssock, &ssock->local_addr, &ssock->addr_len);
     if (status != PJ_SUCCESS)
 	goto on_return;
 
@@ -1076,10 +1153,16 @@
     }
 
     /* Start read */
+#ifdef SSL_SOCK_IMP_USE_OWN_NETWORK
+    status = network_start_read(ssock, ssock->param.async_cnt,
+    				(unsigned)ssock->param.read_buffer_size,
+				ssock->asock_rbuf, 0);
+#else
     status = pj_activesock_start_read2(ssock->asock, ssock->pool, 
 				       (unsigned)ssock->param.read_buffer_size,
 				       ssock->asock_rbuf,
 				       PJ_IOQUEUE_ALWAYS_ASYNC);
+#endif
     if (status != PJ_SUCCESS)
 	goto on_return;
 
@@ -1112,6 +1195,51 @@
     return on_handshake_complete(ssock, status);
 }
 
+#ifndef SSL_SOCK_IMP_USE_OWN_NETWORK
+static pj_bool_t asock_on_data_read (pj_activesock_t *asock,
+				     void *data,
+				     pj_size_t size,
+				     pj_status_t status,
+				     pj_size_t *remainder)
+{
+    pj_ssl_sock_t *ssock = (pj_ssl_sock_t*)
+			   pj_activesock_get_user_data(asock);
+
+    return ssock_on_data_read(ssock, data, size, status, remainder);
+}
+
+static pj_bool_t asock_on_data_sent (pj_activesock_t *asock,
+				     pj_ioqueue_op_key_t *send_key,
+				     pj_ssize_t sent)
+{
+    pj_ssl_sock_t *ssock = (pj_ssl_sock_t*)
+			   pj_activesock_get_user_data(asock);
+
+    return ssock_on_data_sent(ssock, send_key, sent);
+}
+
+static pj_bool_t asock_on_accept_complete2(pj_activesock_t *asock,
+					   pj_sock_t newsock,
+					   const pj_sockaddr_t *src_addr,
+					   int src_addr_len,
+					   pj_status_t status)
+{
+    pj_ssl_sock_t *ssock = (pj_ssl_sock_t*)
+			   pj_activesock_get_user_data(asock);
+
+    return ssock_on_accept_complete(ssock, newsock, NULL,
+    				    src_addr, src_addr_len, status);
+}
+
+static pj_bool_t asock_on_connect_complete (pj_activesock_t *asock,
+					    pj_status_t status)
+{
+    pj_ssl_sock_t *ssock = (pj_ssl_sock_t*)
+			   pj_activesock_get_user_data(asock);
+
+    return ssock_on_connect_complete(ssock, status);
+}
+#endif
 
 /*
  *******************************************************************
@@ -1277,6 +1405,8 @@
 
     /* Create secure socket */
     ssock = ssl_alloc(pool);
+    if (!ssock)
+    	return PJ_ENOMEM;
     ssock->pool = pool;
     ssock->info_pool = info_pool;
     ssock->sock = PJ_INVALID_SOCKET;
@@ -1337,9 +1467,11 @@
 {
     PJ_ASSERT_RETURN(ssock, PJ_EINVAL);
 
-    if (!ssock->pool)
+    if (!ssock->pool || ssock->is_closing)
 	return PJ_SUCCESS;
 
+    ssock->is_closing = PJ_TRUE;
+
     if (ssock->timer.id != TIMER_NONE) {
 	pj_timer_heap_cancel(ssock->param.timer_heap, &ssock->timer);
 	ssock->timer.id = TIMER_NONE;
@@ -1403,17 +1535,18 @@
 
     /* Local address */
     pj_sockaddr_cp(&info->local_addr, &ssock->local_addr);
+
+    /* Certificates info */
+    info->local_cert_info = &ssock->local_cert_info;
+    info->remote_cert_info = &ssock->remote_cert_info;
+
+    /* Remote address */
+    if (pj_sockaddr_has_addr(&ssock->rem_addr))
+	pj_sockaddr_cp(&info->remote_addr, &ssock->rem_addr);
     
     if (info->established) {
 	info->cipher = ssl_get_cipher(ssock);
 
-	/* Remote address */
-	pj_sockaddr_cp(&info->remote_addr, &ssock->rem_addr);
-
-	/* Certificates info */
-	info->local_cert_info = &ssock->local_cert_info;
-	info->remote_cert_info = &ssock->remote_cert_info;
-
 	/* Verification status */
 	info->verify_status = ssock->verify_status;
     }
@@ -1503,7 +1636,7 @@
     for (i=0; i<ssock->param.async_cnt; ++i) {
 	if (ssock->asock_rbuf[i]) {
 	    pj_size_t remainder = 0;
-	    asock_on_data_read(ssock->asock, ssock->asock_rbuf[i], 0,
+	    ssock_on_data_read(ssock, ssock->asock_rbuf[i], 0,
 			       PJ_SUCCESS, &remainder);
 	}
     }
@@ -1765,9 +1898,11 @@
 			  int addr_len,
 			  const pj_ssl_sock_param *newsock_param)
 {
+    pj_status_t status;
+#ifndef SSL_SOCK_IMP_USE_OWN_NETWORK
     pj_activesock_cb asock_cb;
     pj_activesock_cfg asock_cfg;
-    pj_status_t status;
+#endif
 
     PJ_ASSERT_RETURN(ssock && pool && localaddr && addr_len, PJ_EINVAL);
 
@@ -1779,6 +1914,14 @@
         return PJ_EINVAL;
     }
 
+    ssock->is_server = PJ_TRUE;
+
+#ifdef SSL_SOCK_IMP_USE_OWN_NETWORK
+    status = network_start_accept(ssock, pool, localaddr, addr_len,
+    				  newsock_param);
+    if (status != PJ_SUCCESS)
+	goto on_error;
+#else
     /* Create socket */
     status = pj_sock_socket(ssock->param.sock_af, ssock->param.sock_type, 0, 
 			    &ssock->sock);
@@ -1827,7 +1970,7 @@
     pj_activesock_cfg_default(&asock_cfg);
     asock_cfg.async_cnt = ssock->param.async_cnt;
     asock_cfg.concurrency = ssock->param.concurrency;
-    asock_cfg.whole_data = PJ_TRUE;
+    asock_cfg.whole_data = PJ_FALSE;
     asock_cfg.grp_lock = ssock->param.grp_lock;
 
     pj_bzero(&asock_cb, sizeof(asock_cb));
@@ -1859,8 +2002,7 @@
 				 &ssock->addr_len);
     if (status != PJ_SUCCESS)
 	pj_sockaddr_cp(&ssock->local_addr, localaddr);
-
-    ssock->is_server = PJ_TRUE;
+#endif
 
     return PJ_SUCCESS;
 
@@ -1893,9 +2035,14 @@
 			       pj_ssl_sock_t *ssock,
 			       pj_ssl_start_connect_param *connect_param)
 {
+    pj_status_t status;
+#ifdef SSL_SOCK_IMP_USE_OWN_NETWORK
+    status = network_start_connect(ssock, connect_param);
+    if (status != PJ_EPENDING)
+	goto on_error;
+#else
     pj_activesock_cb asock_cb;
     pj_activesock_cfg asock_cfg;
-    pj_status_t status;
     
     pj_pool_t *pool = connect_param->pool;
     const pj_sockaddr_t *localaddr = connect_param->localaddr;
@@ -1971,22 +2118,6 @@
     /* Save remote address */
     pj_sockaddr_cp(&ssock->rem_addr, remaddr);
 
-    /* Start timer */
-    if (ssock->param.timer_heap &&
-        (ssock->param.timeout.sec != 0 || ssock->param.timeout.msec != 0))
-    {
-	pj_assert(ssock->timer.id == TIMER_NONE);
-	status = pj_timer_heap_schedule_w_grp_lock(ssock->param.timer_heap,
-						   &ssock->timer,
-						   &ssock->param.timeout,
-						   TIMER_HANDSHAKE_TIMEOUT,
-						   ssock->param.grp_lock);
-	if (status != PJ_SUCCESS) {
-	    ssock->timer.id = TIMER_NONE;
-	    status = PJ_SUCCESS;
-	}
-    }
-
     status = pj_activesock_start_connect(ssock->asock, pool, remaddr,
 					 addr_len);
 
@@ -2007,6 +2138,24 @@
      * once the socket is established.
      */
 
+#endif
+
+    /* Start timer */
+    if (ssock->param.timer_heap &&
+        (ssock->param.timeout.sec != 0 || ssock->param.timeout.msec != 0))
+    {
+	pj_assert(ssock->timer.id == TIMER_NONE);
+	status = pj_timer_heap_schedule_w_grp_lock(ssock->param.timer_heap,
+						   &ssock->timer,
+						   &ssock->param.timeout,
+						   TIMER_HANDSHAKE_TIMEOUT,
+						   ssock->param.grp_lock);
+	if (status != PJ_SUCCESS) {
+	    ssock->timer.id = TIMER_NONE;
+	    status = PJ_SUCCESS;
+	}
+    }
+
     /* Update SSL state */
     ssock->is_server = PJ_FALSE;
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ssl_sock_imp_common.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ssl_sock_imp_common.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ssl_sock_imp_common.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ssl_sock_imp_common.h	2022-02-24 07:54:38.000000000 +0000
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* 
  * Copyright (C) 2019-2019 Teluu Inc. (http://www.teluu.com)
  *
@@ -114,6 +113,7 @@
     pj_timer_entry	  timer;
     pj_status_t		  verify_status;
 
+    pj_bool_t		  is_closing;
     unsigned long	  last_err;
 
     pj_sock_t		  sock;
@@ -263,5 +263,33 @@
 static pj_status_t ssl_write(pj_ssl_sock_t *ssock, const void *data,
 			     pj_ssize_t size, int *nwritten);
 
+#ifdef SSL_SOCK_IMP_USE_OWN_NETWORK
+
+static void ssl_close_sockets(pj_ssl_sock_t *ssock);
+
+static pj_status_t network_send(pj_ssl_sock_t *ssock,
+				pj_ioqueue_op_key_t *send_key,
+				const void *data,
+				pj_ssize_t *size,
+				unsigned flags);
+static pj_status_t network_start_read(pj_ssl_sock_t *ssock,
+				      unsigned async_count,
+				      unsigned buff_size,
+				      void *readbuf[],
+				      pj_uint32_t flags);
+static pj_status_t network_start_accept(pj_ssl_sock_t *ssock,
+			 		pj_pool_t *pool,
+			  		const pj_sockaddr_t *localaddr,
+			  		int addr_len,
+			  		const pj_ssl_sock_param *newsock_param);
+static pj_status_t network_start_connect(pj_ssl_sock_t *ssock,
+		       pj_ssl_start_connect_param *connect_param);
+static pj_status_t network_setup_connection(pj_ssl_sock_t *ssock,
+					    void *connection);
+static pj_status_t network_get_localaddr(pj_ssl_sock_t *ssock,
+					 pj_sockaddr_t *addr,
+					 int *namelen);
+
+#endif
+
 #endif /* __SSL_SOCK_IMP_COMMON_H__ */
-       
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ssl_sock_ossl.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ssl_sock_ossl.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/ssl_sock_ossl.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/ssl_sock_ossl.c	2022-02-24 07:54:38.000000000 +0000
@@ -57,12 +57,41 @@
 #include <openssl/opensslconf.h>
 #include <openssl/opensslv.h>
 
+/* Specify whether server supports session reuse using session ID. */
+#define SERVER_SUPPORT_SESSION_REUSE 1
+
+/* Specify whether server should disable session tickets. */
+#define SERVER_DISABLE_SESSION_TICKETS 1
+
+/* Each server application must set its own session id context,
+ * which is used to distinguish the contexts and is stored in
+ * exported sessions.
+ */
+#ifndef SERVER_SESSION_ID_CONTEXT
+#	define SERVER_SESSION_ID_CONTEXT 999
+#endif
+
+/* Server session timeout duration. Default is 300 sec. */
+#define SERVER_SESSION_TIMEOUT 300
+
 #if defined(LIBRESSL_VERSION_NUMBER)
 #	define USING_LIBRESSL 1
 #else
 #	define USING_LIBRESSL 0
 #endif
 
+#if defined(OPENSSL_IS_BORINGSSL)
+#      define USING_BORINGSSL 1
+
+#      define TLSEXT_nid_unknown 0x1000000
+
+#undef SSL_CTRL_SET_ECDH_AUTO
+#      define SSL_CTRL_SET_ECDH_AUTO 94
+
+#else
+#      define USING_BORINGSSL 0
+#endif
+
 #if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
 	&& OPENSSL_VERSION_NUMBER >= 0x1000200fL
 
@@ -121,6 +150,11 @@
 
 #endif
 
+static void update_certs_info(pj_ssl_sock_t* ssock,
+			      X509_STORE_CTX* ctx,
+			      pj_ssl_cert_info *local_cert_info,
+			      pj_ssl_cert_info *remote_cert_info,
+			      pj_bool_t is_verify);
 
 #if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x10100000L
 #  define OPENSSL_NO_SSL2	    /* seems to be removed in 1.1.0 */
@@ -130,9 +164,10 @@
 #     define X509_get_notBefore(x)  X509_get0_notBefore(x)
 #     define X509_get_notAfter(x)   X509_get0_notAfter(x)
 #  endif
-#else
+#elif !USING_LIBRESSL
 #  define SSL_CIPHER_get_id(c)	    (c)->id
 #  define SSL_set_session(ssl, s)   (ssl)->session = (s)
+#  define X509_STORE_CTX_get0_cert(ctx) ((ctx)->cert)
 #endif
 
 
@@ -175,6 +210,7 @@
     pj_ssl_sock_t  	  base;
 
     SSL_CTX		 *ossl_ctx;
+    pj_bool_t		  own_ctx;
     SSL			 *ossl_ssl;
     BIO			 *ossl_rbio;
     BIO			 *ossl_wbio;
@@ -327,7 +363,8 @@
 	ERROR_LOG("STATUS_FROM_SSL_ERR", err, ssock);
     }
 
-    ssock->last_err = err;
+    if (ssock)
+	ssock->last_err = err;
     return GET_STATUS_FROM_SSL_ERR(err);
 }
 
@@ -344,7 +381,8 @@
     /* Dig for more from OpenSSL error queue */
     SSLLogErrors(action, ret, err, len, ssock);
 
-    ssock->last_err = ssl_err;
+    if (ssock)
+	ssock->last_err = ssl_err;
     return GET_STATUS_FROM_SSL_ERR(ssl_err);
 }
 
@@ -368,7 +406,11 @@
 	ssl_err -= PJ_SSL_ERRNO_START;
 	l = ssl_err / MAX_OSSL_ERR_REASON;
 	r = ssl_err % MAX_OSSL_ERR_REASON;
+#if USING_BORINGSSL
+        ssl_err = ERR_PACK(l, r);
+#else
 	ssl_err = ERR_PACK(l, 0, r);
+#endif
     }
 
 #if defined(PJ_HAS_ERROR_STRING) && (PJ_HAS_ERROR_STRING != 0)
@@ -394,6 +436,22 @@
     return errstr;
 }
 
+/* Additional ciphers recognized by SSL_set_cipher_list()
+   but not returned from SSL_get_ciphers().
+   NOTE: ids are designed to not conflict with those from
+         SSL_get_cipher() which get masked to the lower 24
+         bits before use. 
+*/
+static const struct ssl_ciphers_t ADDITIONAL_CIPHERS[] = {
+        {0xFF000000, "DEFAULT"},
+        {0xFF000001, "@SECLEVEL=1"},
+        {0xFF000002, "@SECLEVEL=2"},
+        {0xFF000003, "@SECLEVEL=3"},
+        {0xFF000004, "@SECLEVEL=4"},
+        {0xFF000005, "@SECLEVEL=5"}
+};
+static const unsigned int ADDITIONAL_CIPHER_COUNT = 
+    sizeof (ADDITIONAL_CIPHERS) / sizeof (ADDITIONAL_CIPHERS[0]);
 
 /*
  *******************************************************************
@@ -455,6 +513,138 @@
 /* OpenSSL application data index */
 static int sslsock_idx;
 
+#if defined(PJ_SSL_SOCK_OSSL_USE_THREAD_CB) && \
+    PJ_SSL_SOCK_OSSL_USE_THREAD_CB != 0 && OPENSSL_VERSION_NUMBER < 0x10100000L
+
+/* Thread lock pool.*/
+static pj_caching_pool 	 cp;
+static pj_pool_t 	*lock_pool;
+
+/* OpenSSL locking list. */
+static pj_lock_t **ossl_locks;
+
+/* OpenSSL number locks. */
+static unsigned ossl_num_locks;
+
+#if     OPENSSL_VERSION_NUMBER >= 0x10000000
+static void ossl_set_thread_id(CRYPTO_THREADID *id)
+{
+    CRYPTO_THREADID_set_numeric(id,
+                     (unsigned long)pj_thread_get_os_handle(pj_thread_this()));
+}
+
+#else
+
+static unsigned long ossl_thread_id(void)
+{
+    return ((unsigned long)pj_thread_get_os_handle(pj_thread_this()));
+}
+#endif
+
+static void ossl_lock(int mode, int id, const char *file, int line)
+{
+    PJ_UNUSED_ARG(file);
+    PJ_UNUSED_ARG(line);
+
+    if (openssl_init_count == 0)
+        return;
+
+    if (mode & CRYPTO_LOCK) {
+        if (ossl_locks[id]) {
+            //PJ_LOG(6, (THIS_FILE, "Lock File (%s) Line(%d)", file, line));
+            pj_lock_acquire(ossl_locks[id]);
+        }
+    } else {
+        if (ossl_locks[id]) {
+            //PJ_LOG(6, (THIS_FILE, "Unlock File (%s) Line(%d)", file, line));
+            pj_lock_release(ossl_locks[id]);
+        }
+    }
+}
+
+static void release_thread_cb(void)
+{
+    unsigned i = 0;
+
+#if     OPENSSL_VERSION_NUMBER >= 0x10000000
+    CRYPTO_THREADID_set_callback(NULL);
+#else
+    CRYPTO_set_id_callback(NULL);
+#endif
+    CRYPTO_set_locking_callback(NULL);
+
+    for (; i < ossl_num_locks; ++i) {
+        if (ossl_locks[i]) {
+            pj_lock_destroy(ossl_locks[i]);
+            ossl_locks[i] = NULL;
+        }
+    }
+    if (lock_pool) {
+        pj_pool_release(lock_pool);
+        lock_pool = NULL;
+        pj_caching_pool_destroy(&cp);
+    }
+    ossl_locks = NULL;
+    ossl_num_locks = 0;
+}
+
+static pj_status_t init_ossl_lock()
+{
+    pj_status_t status = PJ_SUCCESS;
+
+    pj_caching_pool_init(&cp, NULL, 0);
+
+    lock_pool = pj_pool_create(&cp.factory,
+                               "ossl-lock",
+                               64,
+                               64,
+                               NULL);
+
+    if (!lock_pool) {
+        status = PJ_ENOMEM;
+        PJ_PERROR(1, (THIS_FILE, status,"Fail creating OpenSSL lock pool"));
+        pj_caching_pool_destroy(&cp);
+        return status;
+    }
+
+    ossl_num_locks = CRYPTO_num_locks();
+    ossl_locks = (pj_lock_t **)pj_pool_calloc(lock_pool,
+                                              ossl_num_locks,
+                                              sizeof(pj_lock_t*));
+
+    if (ossl_locks) {
+        unsigned i = 0;
+        for (; (i < ossl_num_locks) && (status == PJ_SUCCESS); ++i) {
+            status = pj_lock_create_simple_mutex(lock_pool, "ossl_lock%p",
+                                                 &ossl_locks[i]);
+        }
+        if (status != PJ_SUCCESS) {
+            PJ_PERROR(1, (THIS_FILE, status,
+                          "Fail creating mutex for OpenSSL lock"));
+            release_thread_cb();
+            return status;
+        }
+
+#if     OPENSSL_VERSION_NUMBER >= 0x10000000
+        CRYPTO_THREADID_set_callback(ossl_set_thread_id);
+#else
+        CRYPTO_set_id_callback(ossl_thread_id);
+#endif
+        CRYPTO_set_locking_callback(ossl_lock);
+        status = pj_atexit(&release_thread_cb);
+        if (status != PJ_SUCCESS) {
+            PJ_PERROR(1, (THIS_FILE, status, "Warning! Unable to set OpenSSL "
+                          "lock thread callback unrelease method."));
+        }
+    } else {
+        status = PJ_ENOMEM;
+        PJ_PERROR(1, (THIS_FILE, status,"Fail creating OpenSSL locks"));
+        release_thread_cb();
+    }
+    return status;
+}
+
+#endif
 
 /* Initialize OpenSSL */
 static pj_status_t init_openssl(void)
@@ -525,8 +715,8 @@
 	sk_cipher = SSL_get_ciphers(ssl);
 
 	n = sk_SSL_CIPHER_num(sk_cipher);
-	if (n > PJ_ARRAY_SIZE(ssl_ciphers))
-	    n = PJ_ARRAY_SIZE(ssl_ciphers);
+	if (n > PJ_ARRAY_SIZE(ssl_ciphers) - ADDITIONAL_CIPHER_COUNT)
+	    n = PJ_ARRAY_SIZE(ssl_ciphers) - ADDITIONAL_CIPHER_COUNT;
 
 	for (i = 0; i < n; ++i) {
 	    const SSL_CIPHER *c;
@@ -536,19 +726,80 @@
 				    0x00FFFFFF;
 	    ssl_ciphers[i].name = SSL_CIPHER_get_name(c);
 	}
+
+	/* Add cipher aliases not returned from SSL_get_ciphers() */
+	for (i = 0; i < ADDITIONAL_CIPHER_COUNT; ++i) {
+	    ssl_ciphers[n++] = ADDITIONAL_CIPHERS[i];
+	}
 	ssl_cipher_num = n;
 
+#if USING_BORINGSSL
+	ssl_sess = SSL_SESSION_new(ctx);
+#else
 	ssl_sess = SSL_SESSION_new();
+#endif
 	SSL_set_session(ssl, ssl_sess);
 
 #if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
     && OPENSSL_VERSION_NUMBER >= 0x1000200fL
+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
+	ssl_curves_num = EC_get_builtin_curves(NULL, 0);
+#else
+
+#if USING_BORINGSSL
+        ssl_curves_num = SSL_get_curve_id(ssl);
+#else
 	ssl_curves_num = SSL_get_shared_curve(ssl,-1);
+#endif
+
 	if (ssl_curves_num > PJ_ARRAY_SIZE(ssl_curves))
 	    ssl_curves_num = PJ_ARRAY_SIZE(ssl_curves);
+#endif
+
+	if( ssl_curves_num > 0 ) {
+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
+	    EC_builtin_curve * curves = NULL;
+
+	    curves = OPENSSL_malloc((int)sizeof(*curves) * ssl_curves_num);
+	    if (!EC_get_builtin_curves(curves, ssl_curves_num)) {
+		OPENSSL_free(curves);
+		curves = NULL;
+		ssl_curves_num = 0;
+	    }
+
+	    n = ssl_curves_num;
+	    ssl_curves_num = 0;
+
+	    for (i = 0; i < n; i++) {
+		nid = curves[i].nid;
+
+		if ( 0 != get_cid_from_nid(nid) ) {
+		    cname = OBJ_nid2sn(nid);
+
+		    if (!cname)
+			cname = OBJ_nid2sn(nid);
 
+		    if (cname) {
+			ssl_curves[ssl_curves_num].id = get_cid_from_nid(nid);
+			ssl_curves[ssl_curves_num].name = cname;
+
+			ssl_curves_num++;
+
+			if (ssl_curves_num >= PJ_SSL_SOCK_MAX_CURVES )
+			    break;
+		    }
+		}
+	    }
+
+	    if(curves)
+		OPENSSL_free(curves);
+#else
 	for (i = 0; i < ssl_curves_num; i++) {
+#if USING_BORINGSSL
+            nid = SSL_get_curve_id(ssl);
+#else
 	    nid = SSL_get_shared_curve(ssl, i);
+#endif
 
 	    if (nid & TLSEXT_nid_unknown) {
 		cname = "curve unknown";
@@ -562,6 +813,9 @@
 	    ssl_curves[i].id   = get_cid_from_nid(nid);
 	    ssl_curves[i].name = cname;
 	}
+#endif
+
+	}
 #else
 	PJ_UNUSED_ARG(nid);
 	PJ_UNUSED_ARG(cname);
@@ -587,18 +841,31 @@
 
     /* Create OpenSSL application data index for SSL socket */
     sslsock_idx = SSL_get_ex_new_index(0, "SSL socket", NULL, NULL, NULL);
+    if (sslsock_idx == -1) {
+	status = STATUS_FROM_SSL_ERR2("Init", NULL, -1, ERR_get_error(), 0);
+	PJ_LOG(1,(THIS_FILE,
+	       "Fatal error: failed to get application data index for "
+	       "SSL socket"));
+	return status;
+    }
+
+#if defined(PJ_SSL_SOCK_OSSL_USE_THREAD_CB) && \
+    PJ_SSL_SOCK_OSSL_USE_THREAD_CB != 0 && OPENSSL_VERSION_NUMBER < 0x10100000L
+
+    status = init_ossl_lock();
+    if (status != PJ_SUCCESS)
+        return status;
+#endif
 
     return status;
 }
 
-
 /* Shutdown OpenSSL */
 static void shutdown_openssl(void)
 {
     PJ_UNUSED_ARG(openssl_init_count);
 }
 
-
 /* SSL password callback. */
 static int password_cb(char *buf, int num, int rwflag, void *user_data)
 {
@@ -614,21 +881,45 @@
 }
 
 
-/* SSL password callback. */
+/* SSL certificate verification result callback.
+ * Note that this callback seems to be always called from library worker
+ * thread, e.g: active socket on_read_complete callback, which should have
+ * already been equipped with race condition avoidance mechanism (should not
+ * be destroyed while callback is being invoked).
+ */
 static int verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
 {
-    pj_ssl_sock_t *ssock;
-    SSL *ossl_ssl;
+    pj_ssl_sock_t *ssock = NULL;
+    SSL *ossl_ssl = NULL;
     int err;
 
     /* Get SSL instance */
     ossl_ssl = X509_STORE_CTX_get_ex_data(x509_ctx, 
 				    SSL_get_ex_data_X509_STORE_CTX_idx());
-    pj_assert(ossl_ssl);
+    if (!ossl_ssl) {
+	PJ_LOG(1,(THIS_FILE,
+		  "SSL verification callback failed to get SSL instance"));
+	goto on_return;
+    }
 
     /* Get SSL socket instance */
     ssock = SSL_get_ex_data(ossl_ssl, sslsock_idx);
-    pj_assert(ssock);
+    if (!ssock) {
+	/* SSL socket may have been destroyed */
+	PJ_LOG(1,(THIS_FILE,
+		  "SSL verification callback failed to get SSL socket "
+		  "instance (sslsock_idx=%d).", sslsock_idx));
+	goto on_return;
+    }
+
+    if (ssock->param.cb.on_verify_cb) {
+	update_certs_info(ssock, x509_ctx, &ssock->local_cert_info, 
+			  &ssock->remote_cert_info, PJ_TRUE);
+	preverify_ok = (*ssock->param.cb.on_verify_cb)(ssock, 
+						       ssock->is_server);
+
+	goto on_return;
+    }
 
     /* Store verification status */
     err = X509_STORE_CTX_get_error(x509_ctx);
@@ -706,6 +997,7 @@
     if (PJ_FALSE == ssock->param.verify_peer)
 	preverify_ok = 1;
 
+on_return:
     return preverify_ok;
 }
 
@@ -724,34 +1016,35 @@
     return (pj_ssl_sock_t *)PJ_POOL_ZALLOC_T(pool, ossl_sock_t);
 }
 
+#if !USING_BORINGSSL
+
 static int xname_cmp(const X509_NAME * const *a, const X509_NAME * const *b) {
   return X509_NAME_cmp(*a, *b);
 }
 
-/* Create and initialize new SSL context and instance */
-static pj_status_t ssl_create(pj_ssl_sock_t *ssock)
+#else
+
+static int xname_cmp(const X509_NAME **a, const X509_NAME **b) {
+  return X509_NAME_cmp(*a, *b);
+}
+
+#endif
+
+/* Initialize OpenSSL context for the ssock */
+static pj_status_t init_ossl_ctx(pj_ssl_sock_t *ssock)
 {
     ossl_sock_t *ossock = (ossl_sock_t *)ssock;
+    SSL_CTX *ctx = NULL;
 #if !defined(OPENSSL_NO_DH)
     BIO *bio;
     DH *dh;
     long options;
 #endif
     SSL_METHOD *ssl_method = NULL;
-    SSL_CTX *ctx;
     pj_uint32_t ssl_opt = 0;
-    pj_ssl_cert_t *cert;
-    int mode, rc;
+    pj_ssl_cert_t *cert = ssock->cert;
+    int rc;
     pj_status_t status;
-        
-    pj_assert(ssock);
-
-    cert = ssock->cert;
-
-    /* Make sure OpenSSL library has been initialized */
-    init_openssl();
-
-    set_entropy(ssock);
 
     if (ssock->param.proto == PJ_SSL_SOCK_PROTO_DEFAULT)
 	ssock->param.proto = PJ_SSL_SOCK_PROTO_SSL23;
@@ -813,19 +1106,51 @@
 	/** Check if TLSv1_2 is enabled */
 	ssl_opt |= ((ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_2)==0)?
 		    SSL_OP_NO_TLSv1_2:0;
+#endif
 
+#ifdef SSL_OP_NO_TLSv1_3
+	/** Check if TLSv1_3 is enabled */
+	ssl_opt |= ((ssock->param.proto & PJ_SSL_SOCK_PROTO_TLS1_3)==0)?
+		    SSL_OP_NO_TLSv1_3:0;
 #endif
 
     }
 
-    /* Create SSL context */
-    ctx = SSL_CTX_new(ssl_method);
+    ossock->ossl_ctx = ctx = SSL_CTX_new(ssl_method);
     if (ctx == NULL) {
 	return GET_SSL_STATUS(ssock);
     }
+
+    if (ssock->is_server) {
+	unsigned int sid_ctx = SERVER_SESSION_ID_CONTEXT;
+
+#if SERVER_DISABLE_SESSION_TICKETS
+    	/* Disable session tickets for TLSv1.2 and below. */
+    	ssl_opt |= SSL_OP_NO_TICKET;
+#ifdef SSL_CTX_set_num_tickets
+    	/* Set the number of TLSv1.3 session tickets issued to 0. */
+    	SSL_CTX_set_num_tickets(ctx, 0);
+#endif
+
+#endif
+
+	SSL_CTX_set_timeout(ctx, SERVER_SESSION_TIMEOUT);
+	if (!SSL_CTX_set_session_id_context(ctx,
+		 (const unsigned char *)&sid_ctx, sizeof(sid_ctx)))
+	{
+            PJ_LOG(1, (THIS_FILE, "Warning! Unable to set server session id "
+                 		  "context. Session reuse will not work."));
+	}
+    }
+
     if (ssl_opt)
 	SSL_CTX_set_options(ctx, ssl_opt);
 
+    /* Set cipher list */
+    status = set_cipher_list(ssock);
+    if (status != PJ_SUCCESS)
+        return status;
+
     /* Apply credentials */
     if (cert) {
 	/* Load CA list if one is specified. */
@@ -850,6 +1175,13 @@
 		}
 		SSL_CTX_free(ctx);
 		return status;
+	    } else {
+		PJ_LOG(4,(ssock->pool->obj_name,
+			  "CA certificates loaded from '%s%s%s'",
+			  cert->CA_file.ptr,
+			  ((cert->CA_file.slen && cert->CA_path.slen)?
+				" + ":""),
+			  cert->CA_path.ptr));
 	    }
 	}
     
@@ -873,6 +1205,10 @@
 			     cert->cert_file.ptr));
 		SSL_CTX_free(ctx);
 		return status;
+	    } else {
+		PJ_LOG(4,(ssock->pool->obj_name,
+			  "Certificate chain loaded from '%s'",
+			  cert->cert_file.ptr));
 	    }
 	}
 
@@ -890,6 +1226,10 @@
 			     cert->privkey_file.ptr));
 		SSL_CTX_free(ctx);
 		return status;
+	    } else {
+		PJ_LOG(4,(ssock->pool->obj_name,
+			  "Private key loaded from '%s'",
+			  cert->privkey_file.ptr));
 	    }
 
 #if !defined(OPENSSL_NO_DH)
@@ -935,6 +1275,9 @@
 			BIO_free(cbio);
 			SSL_CTX_free(ctx);
 			return status;
+		    } else {
+			PJ_LOG(4,(ssock->pool->obj_name,
+				  "Certificate chain loaded from buffer"));
 		    }
 		    X509_free(xcert);
 		}
@@ -952,13 +1295,29 @@
 								  NULL, NULL);
 
 		if (inf != NULL) {
-		    int i = 0;		    
+		    int i = 0, cnt = 0;
 		    for (; i < sk_X509_INFO_num(inf); i++) {
 			X509_INFO *itmp = sk_X509_INFO_value(inf, i);
-			if (itmp->x509) {
-			    X509_STORE_add_cert(cts, itmp->x509);
+			if (!itmp->x509)
+			    continue;
+
+			rc = X509_STORE_add_cert(cts, itmp->x509);
+			if (rc == 1) {
+			    ++cnt;
+			} else {
+#if PJ_LOG_MAX_LEVEL >= 4
+			    char buf[256];
+			    PJ_LOG(4,(ssock->pool->obj_name,
+				      "Error adding CA cert: %s",
+				      X509_NAME_oneline(
+					X509_get_subject_name(itmp->x509),
+					buf, sizeof(buf))));
+#endif
 			}
 		    }
+		    PJ_LOG(4,(ssock->pool->obj_name,
+			      "CA certificates loaded from buffer (cnt=%d)",
+			      cnt));
 		}
 		sk_X509_INFO_pop_free(inf, X509_INFO_free);
 		BIO_free(cbio);
@@ -972,7 +1331,8 @@
 	    kbio = BIO_new_mem_buf((void*)cert->privkey_buf.ptr,
 				   cert->privkey_buf.slen);
 	    if (kbio != NULL) {
-		pkey = PEM_read_bio_PrivateKey(kbio, NULL, 0, NULL);
+		pkey = PEM_read_bio_PrivateKey(kbio, NULL, &password_cb,
+					       cert);
 		if (pkey) {
 		    rc = SSL_CTX_use_PrivateKey(ctx, pkey);
 		    if (rc != 1) {
@@ -983,9 +1343,16 @@
 			BIO_free(kbio);
 			SSL_CTX_free(ctx);
 			return status;
+		    } else {
+			PJ_LOG(4,(ssock->pool->obj_name,
+				  "Private key loaded from buffer"));
 		    }
 		    EVP_PKEY_free(pkey);
+		} else {
+		    PJ_LOG(1,(ssock->pool->obj_name,
+			      "Error reading private key from buffer"));
 		}
+
 		if (ssock->is_server) {
 		    dh = PEM_read_bio_DHparams(kbio, NULL, NULL, NULL);
 		    if (dh != NULL) {
@@ -1051,12 +1418,16 @@
 	    pj_memcpy(p, "rsa", CERT_TYPE_LEN);
 	}
 
+#if USING_BORINGSSL
+        if (SSL_CTX_set_mode(ctx, SSL_CTRL_SET_ECDH_AUTO)) {
+#else
     #ifndef SSL_CTRL_SET_ECDH_AUTO
 	#define SSL_CTRL_SET_ECDH_AUTO 94
     #endif
 
 	/* SSL_CTX_set_ecdh_auto(ctx,on) requires OpenSSL 1.0.2 which wraps: */
 	if (SSL_CTX_ctrl(ctx, SSL_CTRL_SET_ECDH_AUTO, 1, NULL)) {
+#endif
 	    PJ_LOG(4,(ssock->pool->obj_name, "SSL ECDH initialized "
 		      "(automatic), faster PFS ciphers enabled"));
     #if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L && \
@@ -1115,7 +1486,11 @@
                     if ((xn = X509_NAME_dup(xn)) == NULL )
                         break;
 
+#if !USING_BORINGSSL
                     if (sk_X509_NAME_find(sk, xn) >= 0) {
+#else
+                    if (sk_X509_NAME_find(sk, NULL, xn) >= 0) {
+#endif
                         X509_NAME_free(xn);
                     } else {
                         sk_X509_NAME_push(sk, xn);
@@ -1130,8 +1505,16 @@
                 BIO_free(new_bio);
         }
 
-        if (ca_dn != NULL)
-            SSL_CTX_set_client_CA_list(ctx, ca_dn);
+	if (ca_dn != NULL) {
+	    SSL_CTX_set_client_CA_list(ctx, ca_dn);
+	    PJ_LOG(4,(ssock->pool->obj_name,
+		      "CA certificates loaded from %s",
+		      (cert->CA_file.slen?cert->CA_file.ptr:"buffer")));
+	} else {
+	    PJ_LOG(1,(ssock->pool->obj_name,
+		      "Error reading CA certificates from %s",
+		      (cert->CA_file.slen?cert->CA_file.ptr:"buffer")));
+	}
     }
 
     /* Early sensitive data cleanup after OpenSSL context setup. However,
@@ -1142,8 +1525,47 @@
 	pj_ssl_cert_wipe_keys(cert);	
     }
 
+    return PJ_SUCCESS;
+}
+
+
+/* Create and initialize new SSL context and instance */
+static pj_status_t ssl_create(pj_ssl_sock_t *ssock)
+{
+    ossl_sock_t *ossock = (ossl_sock_t *)ssock;
+    int mode;
+    pj_status_t status;
+
+    pj_assert(ssock);
+
+    /* Make sure OpenSSL library has been initialized */
+    init_openssl();
+
+    set_entropy(ssock);
+
+    if (ssock->param.proto == PJ_SSL_SOCK_PROTO_DEFAULT)
+	ssock->param.proto = PJ_SSL_SOCK_PROTO_SSL23;
+
+    /* Create SSL context */
+    if (SERVER_SUPPORT_SESSION_REUSE && ssock->is_server) {
+    	SSL_CTX *server_ctx = ((ossl_sock_t *)ssock->parent)->ossl_ctx;
+
+	if (!server_ctx) {
+	    status = init_ossl_ctx(ssock->parent);
+	    if (status != PJ_SUCCESS)
+	        return status;
+
+	    server_ctx = ((ossl_sock_t *)ssock->parent)->ossl_ctx;
+	    ((ossl_sock_t *)ssock->parent)->own_ctx = PJ_TRUE;
+	}
+	ossock->ossl_ctx = server_ctx;
+    } else {
+	status = init_ossl_ctx(ssock);
+	if (status != PJ_SUCCESS)
+	    return status;
+    }
+
     /* Create SSL instance */
-    ossock->ossl_ctx = ctx;
     ossock->ossl_ssl = SSL_new(ossock->ossl_ctx);
     if (ossock->ossl_ssl == NULL) {
 	return GET_SSL_STATUS(ssock);
@@ -1159,11 +1581,6 @@
 
     SSL_set_verify(ossock->ossl_ssl, mode, &verify_cb);
 
-    /* Set cipher list */
-    status = set_cipher_list(ssock);
-    if (status != PJ_SUCCESS)
-	return status;
-
     /* Set curve list */
     status = set_curves_list(ssock);
     if (status != PJ_SUCCESS)
@@ -1198,7 +1615,12 @@
 
     /* Destroy SSL context */
     if (ossock->ossl_ctx) {
-	SSL_CTX_free(ossock->ossl_ctx);
+    	if (ssock->is_server) {
+    	    if (!SERVER_SUPPORT_SESSION_REUSE || ossock->own_ctx)
+	    	SSL_CTX_free(ossock->ossl_ctx);
+	} else {
+	    SSL_CTX_free(ossock->ossl_ctx);
+	}
 	ossock->ossl_ctx = NULL;
     }
 
@@ -1213,6 +1635,12 @@
 static void ssl_reset_sock_state(pj_ssl_sock_t *ssock)
 {
     ossl_sock_t *ossock = (ossl_sock_t *)ssock;
+
+    /* Detach from SSL instance */
+    if (ossock->ossl_ssl) {
+	SSL_set_ex_data(ossock->ossl_ssl, sslsock_idx, NULL);
+    }
+
     /**
      * Avoid calling SSL_shutdown() if handshake wasn't completed.
      * OpenSSL 1.0.2f complains if SSL_shutdown() is called during an
@@ -1272,12 +1700,11 @@
     char *buf = NULL;
     enum { BUF_SIZE = 8192 };
     pj_str_t cipher_list;
-    STACK_OF(SSL_CIPHER) *sk_cipher;
-    unsigned i;
-    int j, ret;
+    unsigned i, j;
+    int ret;
 
     if (ssock->param.ciphers_num == 0) {
-	ret = SSL_set_cipher_list(ossock->ossl_ssl, PJ_SSL_SOCK_OSSL_CIPHERS);
+	ret = SSL_CTX_set_cipher_list(ossock->ossl_ctx, PJ_SSL_SOCK_OSSL_CIPHERS);
     	if (ret < 1) {
 	    return GET_SSL_STATUS(ssock);
     	}    
@@ -1295,22 +1722,12 @@
 
     pj_strset(&cipher_list, buf, 0);
 
-    /* Set SSL with ALL available ciphers */
-    SSL_set_cipher_list(ossock->ossl_ssl, "ALL:COMPLEMENTOFALL");
-
     /* Generate user specified cipher list in OpenSSL format */
-    sk_cipher = SSL_get_ciphers(ossock->ossl_ssl);
     for (i = 0; i < ssock->param.ciphers_num; ++i) {
-	for (j = 0; j < sk_SSL_CIPHER_num(sk_cipher); ++j) {
-	    const SSL_CIPHER *c;
-	    c = sk_SSL_CIPHER_value(sk_cipher, j);
-	    if (ssock->param.ciphers[i] == (pj_ssl_cipher)
-					   ((pj_uint32_t)SSL_CIPHER_get_id(c) &
-					   0x00FFFFFF))
+	for (j = 0; j < ssl_cipher_num; ++j) {
+	    if (ssock->param.ciphers[i] == ssl_ciphers[j].id)
 	    {
-		const char *c_name;
-
-		c_name = SSL_CIPHER_get_name(c);
+		const char *c_name = ssl_ciphers[j].name;
 
 		/* Check buffer size */
 		if (cipher_list.slen + pj_ansi_strlen(c_name) + 2 >
@@ -1335,7 +1752,7 @@
     cipher_list.ptr[cipher_list.slen] = '\0';
 
     /* Finally, set chosen cipher list */
-    ret = SSL_set_cipher_list(ossock->ossl_ssl, buf);
+    ret = SSL_CTX_set_cipher_list(ossock->ossl_ctx, buf);
     if (ret < 1) {
 	pj_pool_release(tmp_pool);
 	return GET_SSL_STATUS(ssock);
@@ -1385,6 +1802,7 @@
     int ret;
 
     if (ssock->param.sigalgs.ptr && ssock->param.sigalgs.slen) {
+#if !USING_BORINGSSL
 	if (ssock->is_server) {
 	    ret = SSL_set1_client_sigalgs_list(ossock->ossl_ssl,
 	    				       ssock->param.sigalgs.ptr);
@@ -1392,6 +1810,10 @@
 	    ret = SSL_set1_sigalgs_list(ossock->ossl_ssl,
 	    				ssock->param.sigalgs.ptr);
 	}
+#else
+	ret = SSL_set1_sigalgs_list(ossock->ossl_ssl,
+				    ssock->param.sigalgs.ptr);
+#endif
 
 	if (ret < 1)
 	    return GET_SSL_STATUS(ssock);
@@ -1699,39 +2121,60 @@
  */
 static void ssl_update_certs_info(pj_ssl_sock_t *ssock)
 {
-    ossl_sock_t *ossock = (ossl_sock_t *)ssock;
-    X509 *x;
-    STACK_OF(X509) *chain;
-
     pj_assert(ssock->ssl_state == SSL_STATE_ESTABLISHED);
 
+    update_certs_info(ssock, NULL, &ssock->local_cert_info, 
+		      &ssock->remote_cert_info, PJ_FALSE);
+}
+
+
+static void update_certs_info(pj_ssl_sock_t* ssock,
+			      X509_STORE_CTX* ctx,
+			      pj_ssl_cert_info *local_cert_info,
+			      pj_ssl_cert_info *remote_cert_info,
+			      pj_bool_t is_verify)
+{
+    ossl_sock_t* ossock = (ossl_sock_t*)ssock;
+    X509* x;
+    STACK_OF(X509)* chain;
+
     /* Active local certificate */
     x = SSL_get_certificate(ossock->ossl_ssl);
     if (x) {
-	get_cert_info(ssock->pool, &ssock->local_cert_info, x, PJ_FALSE);
+	get_cert_info(ssock->pool, local_cert_info, x, PJ_FALSE);
 	/* Don't free local's X509! */
     } else {
-	pj_bzero(&ssock->local_cert_info, sizeof(pj_ssl_cert_info));
+	pj_bzero(local_cert_info, sizeof(pj_ssl_cert_info));
     }
 
     /* Active remote certificate */
-    x = SSL_get_peer_certificate(ossock->ossl_ssl);
+    if (is_verify) {
+	x = X509_STORE_CTX_get0_cert(ctx);
+    } else {
+	x = SSL_get_peer_certificate(ossock->ossl_ssl);
+    }
     if (x) {
-	get_cert_info(ssock->pool, &ssock->remote_cert_info, x, PJ_TRUE);
-	/* Free peer's X509 */
-	X509_free(x);
+	get_cert_info(ssock->pool, remote_cert_info, x, PJ_TRUE);
+	if (!is_verify) {
+	    /* Free peer's X509 */
+	    X509_free(x);
+	}
     } else {
-	pj_bzero(&ssock->remote_cert_info, sizeof(pj_ssl_cert_info));
+	pj_bzero(remote_cert_info, sizeof(pj_ssl_cert_info));
     }
 
-    chain = SSL_get_peer_cert_chain(ossock->ossl_ssl);
+    if (is_verify) {
+	chain = X509_STORE_CTX_get1_chain(ctx);
+    } else {
+	chain = SSL_get_peer_cert_chain(ossock->ossl_ssl);
+    }
     if (chain) {
 	pj_pool_reset(ssock->info_pool);
 	ssl_update_remote_cert_chain_info(ssock->info_pool,
-       					  &ssock->remote_cert_info,
+       					  remote_cert_info,
        					  chain, PJ_TRUE);
     } else {
-	ssock->remote_cert_info.raw_chain.cnt = 0;
+	remote_cert_info->raw_chain.cnt = 0;
     }
 }
 
@@ -1758,25 +2201,54 @@
 }
 
 
+/* Server Name Indication server callback */
+static int sni_cb(SSL *ssl, int *al, void *arg)
+{
+    pj_ssl_sock_t *ssock = (pj_ssl_sock_t *)arg;
+    const char *sname;
+
+    PJ_UNUSED_ARG(al);
+
+    sname = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
+    if (!sname || pj_stricmp2(&ssock->param.server_name, sname)) {
+    	PJ_LOG(4, (THIS_FILE, "Client SNI rejected: %s", sname));
+    	return SSL_TLSEXT_ERR_ALERT_FATAL;
+    }
+
+    return SSL_TLSEXT_ERR_OK;
+}
+
 static void ssl_set_peer_name(pj_ssl_sock_t *ssock)
 {
-#ifdef SSL_set_tlsext_host_name
     ossl_sock_t *ossock = (ossl_sock_t *)ssock;
 
     /* Set server name to connect */
-    if (ssock->param.server_name.slen) {
-	/* Server name is null terminated already */
-	if (!SSL_set_tlsext_host_name(ossock->ossl_ssl, 
-				      ssock->param.server_name.ptr))
-	{
-	    char err_str[PJ_ERR_MSG_SIZE];
+    if (ssock->param.server_name.slen &&
+        get_ip_addr_ver(&ssock->param.server_name) == 0)
+    {
+    	if (ssock->is_server) {
+#if defined(SSL_CTX_set_tlsext_servername_callback) && \
+    defined(SSL_CTX_set_tlsext_servername_arg)
+
+	    SSL_CTX_set_tlsext_servername_callback(ossock->ossl_ctx, &sni_cb);
+	    SSL_CTX_set_tlsext_servername_arg(ossock->ossl_ctx, ssock);
+
+#endif
+    	} else {
+#ifdef SSL_set_tlsext_host_name
+	    /* Server name is null terminated already */
+	    if (!SSL_set_tlsext_host_name(ossock->ossl_ssl,
+				          ssock->param.server_name.ptr))
+	    {
+	        char err_str[PJ_ERR_MSG_SIZE];
 
-	    ERR_error_string_n(ERR_get_error(), err_str, sizeof(err_str));
-	    PJ_LOG(3,(ssock->pool->obj_name, "SSL_set_tlsext_host_name() "
-		"failed: %s", err_str));
+	        ERR_error_string_n(ERR_get_error(), err_str, sizeof(err_str));
+	        PJ_LOG(3,(ssock->pool->obj_name, "SSL_set_tlsext_host_name() "
+		          "failed: %s", err_str));
+	    }
+#endif
 	}
     }
-#endif
 }
 
 
@@ -1812,6 +2284,40 @@
 
     /* Check if handshake has been completed */
     if (SSL_is_init_finished(ossock->ossl_ssl)) {
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+    	if (ssock->is_server && ssock->ssl_state != SSL_STATE_ESTABLISHED) {
+    	    enum {BUF_SIZE = 64};
+	    unsigned int len = 0, i;
+	    const unsigned char *sctx, *sid;
+	    char buf[BUF_SIZE+1];
+	    SSL_SESSION *sess;
+	    
+	    sess = SSL_get_session(ossock->ossl_ssl);
+
+	    PJ_LOG(5, (THIS_FILE, "Session info: reused=%d, resumable=%d, "
+		       "timeout=%d",
+		       SSL_session_reused(ossock->ossl_ssl),
+		       SSL_SESSION_is_resumable(sess),
+		       SSL_SESSION_get_timeout(sess)));
+
+	    sid = SSL_SESSION_get_id(sess, &len);
+	    len *= 2;
+	    if (len >= BUF_SIZE) len = BUF_SIZE;
+	    for (i = 0; i < len; i+=2)
+	        pj_ansi_sprintf(buf+i, "%02X", sid[i/2]);
+	    buf[len] = '\0';
+	    PJ_LOG(5, (THIS_FILE, "Session id: %s", buf));
+
+	    sctx = SSL_SESSION_get0_id_context(sess, &len);
+	    if (len >= BUF_SIZE) len = BUF_SIZE;
+	    for (i = 0; i < len; i++)
+	        pj_ansi_sprintf(buf + i, "%d", sctx[i]);
+	    buf[len] = '\0';
+	    PJ_LOG(5, (THIS_FILE, "Session id context: %s", buf));
+    	}
+#endif
+
 	ssock->ssl_state = SSL_STATE_ESTABLISHED;
 	return PJ_SUCCESS;
     }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/string.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/string.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/string.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/string.c	2022-02-24 07:54:38.000000000 +0000
@@ -94,8 +94,11 @@
 {    
     pj_ssize_t str_idx;
 
+    pj_assert(str->slen >= 0);
+    pj_assert(delim->slen >= 0);
+
     tok->slen = 0;
-    if ((str->slen == 0) || ((pj_size_t)str->slen < start_idx)) {
+    if ((str->slen <= 0) || ((pj_size_t)str->slen < start_idx)) {
 	return str->slen;
     }
     
@@ -119,8 +122,10 @@
 {
     pj_ssize_t str_idx;
 
+    pj_assert(str->slen >= 0);
+
     tok->slen = 0;
-    if ((str->slen == 0) || ((pj_size_t)str->slen < start_idx)) {
+    if ((str->slen <= 0) || ((pj_size_t)str->slen < start_idx)) {
 	return str->slen;
     }
 
@@ -143,8 +148,14 @@
 {
     const char *s, *ends;
 
-    /* Special case when substr is zero */
-    if (substr->slen == 0) {
+    PJ_ASSERT_RETURN(str->slen >= 0 && substr->slen >= 0, NULL);
+
+    /* Check if the string is empty */
+    if (str->slen <= 0)
+    	return NULL;
+
+    /* Special case when substr is empty */
+    if (substr->slen <= 0) {
 	return (char*)str->ptr;
     }
 
@@ -162,7 +173,13 @@
 {
     const char *s, *ends;
 
-    /* Special case when substr is zero */
+    PJ_ASSERT_RETURN(str->slen >= 0 && substr->slen >= 0, NULL);
+
+    /* Check if the string is empty */
+    if (str->slen <= 0)
+    	return NULL;
+
+    /* Special case when substr is empty */
     if (substr->slen == 0) {
 	return (char*)str->ptr;
     }
@@ -181,6 +198,9 @@
 {
     char *end = str->ptr + str->slen;
     register char *p = str->ptr;
+ 
+    pj_assert(str->slen >= 0);
+ 
     while (p < end && pj_isspace(*p))
 	++p;
     str->slen -= (p - str->ptr);
@@ -192,6 +212,9 @@
 {
     char *end = str->ptr + str->slen;
     register char *p = end - 1;
+
+    pj_assert(str->slen >= 0);
+
     while (p >= str->ptr && pj_isspace(*p))
         --p;
     str->slen -= ((end - p) - 1);
@@ -243,6 +266,8 @@
 
     PJ_CHECK_STACK();
 
+    PJ_ASSERT_RETURN(str->slen >= 0, PJ_EINVAL);
+
     if (!str || !value) {
         return PJ_EINVAL;
     }
@@ -289,6 +314,8 @@
 
     PJ_CHECK_STACK();
 
+    pj_assert(str->slen >= 0);
+
     value = 0;
     for (i=0; i<(unsigned)str->slen; ++i) {
 	if (!pj_isdigit(str->ptr[i]))
@@ -306,6 +333,8 @@
 
     PJ_CHECK_STACK();
 
+    pj_assert(str->slen >= 0);
+
     value = 0;
     if (base <= 10) {
 	for (i=0; i<(unsigned)str->slen; ++i) {
@@ -328,7 +357,7 @@
 
     if (endptr) {
 	endptr->ptr = str->ptr + i;
-	endptr->slen = str->slen - i;
+	endptr->slen = (str->slen < 0)? 0: (str->slen - i);
     }
 
     return value;
@@ -342,6 +371,8 @@
 
     PJ_CHECK_STACK();
 
+    PJ_ASSERT_RETURN(str->slen >= 0, PJ_EINVAL);
+
     if (!str || !value) {
         return PJ_EINVAL;
     }
@@ -405,7 +436,9 @@
     char *pdot;
     float val;
 
-    if (str->slen == 0)
+    pj_assert(str->slen >= 0);
+
+    if (str->slen <= 0)
 	return 0;
 
     pdot = (char*)pj_memchr(str->ptr, '.', str->slen);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/timer.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/timer.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pj/timer.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pj/timer.c	2022-02-24 07:54:38.000000000 +0000
@@ -403,7 +403,7 @@
     memcpy(new_timer_dups, ht->timer_dups,
     	   ht->max_size * sizeof(pj_timer_entry_dup));
     for (i = 0; i < ht->cur_size; i++) {
-    	int idx = ht->heap[i] - ht->timer_dups;
+    	int idx = (int)(ht->heap[i] - ht->timer_dups);
         // Point to the address in the new array
         pj_assert(idx >= 0 && idx < (int)ht->max_size);
     	new_heap[i] = &new_timer_dups[idx];
@@ -535,7 +535,7 @@
     PJ_CHECK_STACK();
 
     // Check to see if the timer_id is out of range
-    if (entry->_timer_id < 0 || (pj_size_t)entry->_timer_id > ht->max_size) {
+    if (entry->_timer_id < 1 || (pj_size_t)entry->_timer_id >= ht->max_size) {
 	entry->_timer_id = -1;
     	return 0;
     }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pjlib-test/main.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pjlib-test/main.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pjlib-test/main.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pjlib-test/main.c	2022-02-24 07:54:38.000000000 +0000
@@ -40,7 +40,9 @@
 #define boost()
 #endif
 
+
 #if defined(PJ_SUNOS) && PJ_SUNOS!=0
+
 #include <signal.h>
 static void init_signals()
 {
@@ -52,6 +54,30 @@
     sigaction(SIGALRM, &act, NULL);
 }
 
+#elif PJ_LINUX || PJ_DARWINOS
+
+#include <execinfo.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+static void print_stack(int sig)
+{
+    void *array[16];
+    size_t size;
+
+    size = backtrace(array, 16);
+    fprintf(stderr, "Error: signal %d:\n", sig);
+    backtrace_symbols_fd(array, size, STDERR_FILENO);
+    exit(1);
+}
+
+static void init_signals(void)
+{
+    signal(SIGSEGV, &print_stack);
+    signal(SIGABRT, &print_stack);
+}
+
 #else
 #define init_signals()
 #endif
@@ -60,9 +86,9 @@
 {
     int rc;
     int interractive = 0;
+    int no_trap = 0;
 
     boost();
-    init_signals();
 
     while (argc > 1) {
         char *arg = argv[--argc];
@@ -70,6 +96,8 @@
 	if (*arg=='-' && *(arg+1)=='i') {
 	    interractive = 1;
 
+	} else if (*arg=='-' && *(arg+1)=='n') {
+	    no_trap = 1;
 	} else if (*arg=='-' && *(arg+1)=='p') {
             pj_str_t port = pj_str(argv[--argc]);
 
@@ -92,6 +120,10 @@
         }
     }
 
+    if (!no_trap) {
+	init_signals();
+    }
+
     rc = test_main();
 
     if (interractive) {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pjlib-test/sock.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pjlib-test/sock.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pjlib-test/sock.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pjlib-test/sock.c	2022-02-24 07:54:38.000000000 +0000
@@ -162,11 +162,11 @@
 #endif	/* PJ_HAS_IPV6 */
 
     /* Test that pj_sockaddr_in_init() initialize the whole structure, 
-     * including sin_zero.
+     * including sin_zero_pad.
      */
     pj_sockaddr_in_init(&addr2, 0, 1000);
     pj_bzero(zero, sizeof(zero));
-    if (pj_memcmp(addr2.sin_zero, zero, sizeof(addr2.sin_zero)) != 0)
+    if (pj_memcmp(addr2.sin_zero_pad, zero, sizeof(addr2.sin_zero_pad)) != 0)
 	return -35;
 
     /* pj_gethostname() */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pjlib-test/ssl_sock.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pjlib-test/ssl_sock.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pjlib-test/ssl_sock.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pjlib-test/ssl_sock.c	2022-02-24 07:54:38.000000000 +0000
@@ -22,7 +22,8 @@
 
 
 #define CERT_DIR		    "../build/"
-#if (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_DARWIN)
+#if (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_DARWIN) || \
+    (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_APPLE)
 /* If we use Darwin SSL, use the cert in DER format. */
 #   define CERT_CA_FILE		    CERT_DIR "cacert.der"
 #else
@@ -30,7 +31,7 @@
 #endif
 #define CERT_FILE		    CERT_DIR "cacert.pem"
 #define CERT_PRIVKEY_FILE	    CERT_DIR "privkey.pem"
-#define CERT_PRIVKEY_PASS	    ""
+#define CERT_PRIVKEY_PASS	    "privkeypass"
 
 #define TEST_LOAD_FROM_FILES 1
 
@@ -174,10 +175,13 @@
 	    goto on_return;
 	}
 
-	if (status == PJ_SUCCESS)
+	if (status == PJ_SUCCESS) {
 	    st->sent += size;
-	else
+	} else {
+	    if (status == PJ_EPENDING)
+	    	status = PJ_SUCCESS;
 	    break;
+	}
     }
 
 on_return:
@@ -196,7 +200,8 @@
 static pj_bool_t ssl_on_accept_complete(pj_ssl_sock_t *ssock,
 					pj_ssl_sock_t *newsock,
 					const pj_sockaddr_t *src_addr,
-					int src_addr_len)
+					int src_addr_len,
+					pj_status_t accept_status)
 {
     struct test_state *parent_st = (struct test_state*) 
 				   pj_ssl_sock_get_user_data(ssock);
@@ -207,6 +212,14 @@
     pj_status_t status;
 
     PJ_UNUSED_ARG(src_addr_len);
+    
+    if (accept_status != PJ_SUCCESS) {
+    	if (newsock) {
+    	    st = (struct test_state*) pj_ssl_sock_get_user_data(newsock);
+    	    st->err = accept_status;
+    	}
+    	return PJ_FALSE;
+    }
 
     /* Duplicate parent test state to newly accepted test state */
     st = (struct test_state*)pj_pool_zalloc(parent_st->pool, sizeof(struct test_state));
@@ -245,10 +258,13 @@
 	    goto on_return;
 	}
 
-	if (status == PJ_SUCCESS)
+	if (status == PJ_SUCCESS) {
 	    st->sent += size;
-	else
+	} else {
+	    if (status == PJ_EPENDING)
+	    	status = PJ_SUCCESS;
 	    break;
+	}
     }
 
 on_return:
@@ -304,8 +320,11 @@
 		goto on_return;
 	    }
 
-	    if (status == PJ_SUCCESS)
+	    if (status == PJ_SUCCESS) {
 		st->sent += size_;
+	    } else if (status == PJ_EPENDING) {
+	    	status = PJ_SUCCESS;
+	    }
 	}
 
 	/* Verify echoed data when specified to */
@@ -526,6 +545,7 @@
 {
     pj_pool_t *pool = NULL;
     pj_ioqueue_t *ioqueue = NULL;
+    pj_timer_heap_t *timer = NULL;
     pj_ssl_sock_t *ssock_serv = NULL;
     pj_ssl_sock_t *ssock_cli = NULL;
     pj_ssl_sock_param param;
@@ -543,12 +563,18 @@
 	goto on_return;
     }
 
+    status = pj_timer_heap_create(pool, 4, &timer);
+    if (status != PJ_SUCCESS) {
+	goto on_return;
+    }
+
     pj_ssl_sock_param_default(&param);
-    param.cb.on_accept_complete = &ssl_on_accept_complete;
+    param.cb.on_accept_complete2 = &ssl_on_accept_complete;
     param.cb.on_connect_complete = &ssl_on_connect_complete;
     param.cb.on_data_read = &ssl_on_data_read;
     param.cb.on_data_sent = &ssl_on_data_sent;
     param.ioqueue = ioqueue;
+    param.timer_heap = timer;
     param.ciphers = ciphers;
 
     /* Init default bind address */
@@ -733,12 +759,25 @@
     PJ_LOG(3, ("", ".....Sent/recv: %d/%d bytes", state_cli.sent, state_cli.recv));
 
 on_return:
+#if (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_DARWIN) || \
+    (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_APPLE)
+    if (status != PJ_SUCCESS) {
+	PJ_LOG(3, ("", "Apple SSL requires the private key to be "
+		       "inside the Keychain. So double click on "
+		       "the file pjlib/build/privkey.p12 to "
+		       "place it in the Keychain. "
+		       "The password is \"pjsip\"."));
+    }
+#endif
+
     if (ssock_serv)
 	pj_ssl_sock_close(ssock_serv);
     if (ssock_cli && !state_cli.err && !state_cli.done) 
 	pj_ssl_sock_close(ssock_cli);
     if (ioqueue)
 	pj_ioqueue_destroy(ioqueue);
+    if (timer)
+	pj_timer_heap_destroy(timer);
     if (pool)
 	pj_pool_release(pool);
 
@@ -892,14 +931,6 @@
 	pj_str_t privkey_file = pj_str(CERT_PRIVKEY_FILE);
 	pj_str_t privkey_pass = pj_str(CERT_PRIVKEY_PASS);
 
-#if (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_DARWIN)
-	PJ_LOG(3, ("", "Darwin SSL requires the private key to be "
-		       "inside the Keychain. So double click on "
-		       "the file pjlib/build/privkey.p12 to "
-		       "place it in the Keychain. "
-		       "The password is \"pjsip\"."));
-#endif
-
 #if (defined(TEST_LOAD_FROM_FILES) && TEST_LOAD_FROM_FILES==1)
 	status = pj_ssl_cert_load_from_files(pool, &ca_file, &cert_file, 
 					     &privkey_file, &privkey_pass,
@@ -932,7 +963,7 @@
     }
 
     pj_ssl_sock_param_default(&param);
-    param.cb.on_accept_complete = &ssl_on_accept_complete;
+    param.cb.on_accept_complete2 = &ssl_on_accept_complete;
     param.cb.on_data_read = &ssl_on_data_read;
     param.cb.on_data_sent = &ssl_on_data_sent;
     param.ioqueue = ioqueue;
@@ -1263,7 +1294,7 @@
     }
 
     pj_ssl_sock_param_default(&param);
-    param.cb.on_accept_complete = &ssl_on_accept_complete;
+    param.cb.on_accept_complete2 = &ssl_on_accept_complete;
     param.cb.on_connect_complete = &ssl_on_connect_complete;
     param.cb.on_data_read = &ssl_on_data_read;
     param.cb.on_data_sent = &ssl_on_data_sent;
@@ -1510,19 +1541,49 @@
     if (ret != 0)
 	return ret;
 
-    PJ_LOG(3,("", "..echo test w/ incompatible proto"));
+    PJ_LOG(3,("", "..echo test w/ compatible proto: server TLSv1.2 vs client TLSv1.2"));
+    ret = echo_test(PJ_SSL_SOCK_PROTO_TLS1_2, PJ_SSL_SOCK_PROTO_TLS1_2, 
+		    -1, -1,
+		    PJ_FALSE, PJ_FALSE);
+    if (ret != 0)
+	return ret;
+
+    PJ_LOG(3,("", "..echo test w/ compatible proto: server TLSv1.2+1.3 vs client TLSv1.3"));
+    ret = echo_test(PJ_SSL_SOCK_PROTO_TLS1_2 | PJ_SSL_SOCK_PROTO_TLS1_3, PJ_SSL_SOCK_PROTO_TLS1_3, 
+		    -1, -1,
+		    PJ_FALSE, PJ_FALSE);
+    if (ret != 0)
+	return ret;
+
+    PJ_LOG(3,("", "..echo test w/ incompatible proto: server TLSv1 vs client SSL3"));
     ret = echo_test(PJ_SSL_SOCK_PROTO_TLS1, PJ_SSL_SOCK_PROTO_SSL3, 
 		    PJ_TLS_RSA_WITH_DES_CBC_SHA, PJ_TLS_RSA_WITH_DES_CBC_SHA,
 		    PJ_FALSE, PJ_FALSE);
     if (ret == 0)
 	return PJ_EBUG;
 
+/* We can't set min/max proto for TLS protocol higher than 1.0. */
+#if (PJ_SSL_SOCK_IMP != PJ_SSL_SOCK_IMP_DARWIN)
+    PJ_LOG(3,("", "..echo test w/ incompatible proto: server TLSv1.2 vs client TLSv1.3"));
+    ret = echo_test(PJ_SSL_SOCK_PROTO_TLS1_2, PJ_SSL_SOCK_PROTO_TLS1_3, 
+		    -1, -1,
+		    PJ_FALSE, PJ_FALSE);
+    if (ret == 0)
+	return PJ_EBUG;
+#endif
+
+/* We can't seem to enable certain ciphers only. SSLSetEnabledCiphers() is
+ * deprecated and we only have sec_protocol_options_append_tls_ciphersuite(),
+ * but there's no API to remove certain or all ciphers.
+ */
+#if (PJ_SSL_SOCK_IMP != PJ_SSL_SOCK_IMP_APPLE)
     PJ_LOG(3,("", "..echo test w/ incompatible ciphers"));
     ret = echo_test(PJ_SSL_SOCK_PROTO_DEFAULT, PJ_SSL_SOCK_PROTO_DEFAULT, 
 		    PJ_TLS_RSA_WITH_DES_CBC_SHA, PJ_TLS_RSA_WITH_AES_256_CBC_SHA,
 		    PJ_FALSE, PJ_FALSE);
     if (ret == 0)
 	return PJ_EBUG;
+#endif
 
     PJ_LOG(3,("", "..echo test w/ client cert required but not provided"));
     ret = echo_test(PJ_SSL_SOCK_PROTO_DEFAULT, PJ_SSL_SOCK_PROTO_DEFAULT, 
@@ -1538,15 +1599,16 @@
     if (ret != 0)
 	return ret;
 
+#if WITH_BENCHMARK
     PJ_LOG(3,("", "..performance test"));
     ret = perf_test(PJ_IOQUEUE_MAX_HANDLES/2 - 1, 0);
     if (ret != 0)
 	return ret;
+#endif
 
     PJ_LOG(3,("", "..client non-SSL (handshake timeout 5 secs)"));
     ret = client_non_ssl(5000);
-    /* PJ_TIMEDOUT won't be returned as accepted socket is deleted silently */
-    if (ret != 0)
+    if (ret != PJ_ETIMEDOUT)
 	return ret;
 
 #endif
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pjlib-test/test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pjlib-test/test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pjlib-test/test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pjlib-test/test.c	2022-02-24 07:54:38.000000000 +0000
@@ -39,7 +39,7 @@
 const char *param_echo_server = ECHO_SERVER_ADDRESS;
 int param_echo_port = ECHO_SERVER_START_PORT;
 int param_log_decor = PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME |
-		      PJ_LOG_HAS_MICRO_SEC;
+		      PJ_LOG_HAS_MICRO_SEC | PJ_LOG_HAS_INDENT;
 
 int null_func()
 {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pjlib-test/test.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pjlib-test/test.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pjlib-test/test.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pjlib-test/test.h	2022-02-24 07:54:38.000000000 +0000
@@ -32,6 +32,12 @@
 #   define GROUP_FILE               1
 #endif
 
+#if defined(PJ_EXCLUDE_BENCHMARK_TESTS) && (PJ_EXCLUDE_BENCHMARK_TESTS==1)
+#   define WITH_BENCHMARK	    0
+#else
+#   define WITH_BENCHMARK	    1
+#endif
+
 #define INCLUDE_ERRNO_TEST          GROUP_LIBC
 #define INCLUDE_TIMESTAMP_TEST      GROUP_OS
 #define INCLUDE_EXCEPTION_TEST	    GROUP_LIBC
@@ -39,7 +45,7 @@
 #define INCLUDE_LIST_TEST	    GROUP_DATA_STRUCTURE
 #define INCLUDE_HASH_TEST	    GROUP_DATA_STRUCTURE
 #define INCLUDE_POOL_TEST	    GROUP_LIBC
-#define INCLUDE_POOL_PERF_TEST	    GROUP_LIBC
+#define INCLUDE_POOL_PERF_TEST	    (GROUP_LIBC && WITH_BENCHMARK)
 #define INCLUDE_STRING_TEST	    GROUP_DATA_STRUCTURE
 #define INCLUDE_FIFOBUF_TEST	    0	// GROUP_DATA_STRUCTURE
 #define INCLUDE_RBTREE_TEST	    GROUP_DATA_STRUCTURE
@@ -50,13 +56,13 @@
 #define INCLUDE_OS_TEST             GROUP_OS
 #define INCLUDE_THREAD_TEST         (PJ_HAS_THREADS && GROUP_OS)
 #define INCLUDE_SOCK_TEST	    GROUP_NETWORK
-#define INCLUDE_SOCK_PERF_TEST	    GROUP_NETWORK
+#define INCLUDE_SOCK_PERF_TEST	    (GROUP_NETWORK && WITH_BENCHMARK)
 #define INCLUDE_SELECT_TEST	    GROUP_NETWORK
 #define INCLUDE_UDP_IOQUEUE_TEST    GROUP_NETWORK
 #define INCLUDE_TCP_IOQUEUE_TEST    GROUP_NETWORK
 #define INCLUDE_ACTIVESOCK_TEST	    GROUP_NETWORK
 #define INCLUDE_SSLSOCK_TEST	    (PJ_HAS_SSL_SOCK && GROUP_NETWORK)
-#define INCLUDE_IOQUEUE_PERF_TEST   (PJ_HAS_THREADS && GROUP_NETWORK)
+#define INCLUDE_IOQUEUE_PERF_TEST   (PJ_HAS_THREADS && GROUP_NETWORK && WITH_BENCHMARK)
 #define INCLUDE_IOQUEUE_UNREG_TEST  (PJ_HAS_THREADS && GROUP_NETWORK)
 #define INCLUDE_FILE_TEST           GROUP_FILE
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pjlib-test/timer.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pjlib-test/timer.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib/src/pjlib-test/timer.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib/src/pjlib-test/timer.c	2022-02-24 07:54:38.000000000 +0000
@@ -963,9 +963,11 @@
     if (rc != 0)
 	return rc;
 
+#if WITH_BENCHMARK
     rc = timer_bench_test();
     if (rc != 0)
 	return rc;
+#endif
 
     return 0;
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/build/pjlib_util_test.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/build/pjlib_util_test.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/build/pjlib_util_test.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/build/pjlib_util_test.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -51,10 +75,10 @@
     </ProjectConfiguration>
   </ItemGroup>
   <!-- Import common config -->
-  <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />  
+  <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{ED02BE13-8297-4770-8097-27DC2CCABF9A}</ProjectGuid>
-    <RootNamespace>pjlib_util_test</RootNamespace>    
+    <RootNamespace>pjlib_util_test</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -101,40 +125,77 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
     <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType>
     <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType>
   </PropertyGroup>
@@ -176,35 +237,65 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
-    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>    
+    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -235,21 +326,39 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">
     <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">
     <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">
     <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
     <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <TargetName>pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -276,6 +385,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -303,6 +425,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -330,6 +466,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -356,6 +506,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -383,6 +546,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -409,6 +586,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjlib-util-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\pjlib-util-test\encryption.c" />
     <ClCompile Include="..\src\pjlib-util-test\http_client.c" />
@@ -417,16 +607,22 @@
     <ClCompile Include="..\src\pjlib-util-test\main_win32.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pjlib-util-test\resolver_test.c" />
     <ClCompile Include="..\src\pjlib-util-test\stun.c" />
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/build/pjlib_util.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/build/pjlib_util.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/build/pjlib_util.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/build/pjlib_util.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -78,7 +102,7 @@
   <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}</ProjectGuid>
-    <RootNamespace>pjlib_util</RootNamespace>    
+    <RootNamespace>pjlib_util</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -161,40 +185,77 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -264,34 +325,64 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>    
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
     <TargetName>pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
   </PropertyGroup>
   <!-- Compile and link option definition -->
@@ -334,6 +425,18 @@
       <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -369,6 +472,19 @@
       <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -404,6 +520,19 @@
       <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -438,6 +567,18 @@
       <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -473,6 +614,19 @@
       <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -507,6 +661,18 @@
       <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjlib-util-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\pjlib-util\base64.c" />
     <ClCompile Include="..\src\pjlib-util\cli.c" />
@@ -530,41 +696,53 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pjlib-util\scanner_cis_uint.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pjlib-util\sha1.c" />
     <ClCompile Include="..\src\pjlib-util\srv_resolver.c" />
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/include/pjlib-util/cli.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/include/pjlib-util/cli.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/include/pjlib-util/cli.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/include/pjlib-util/cli.h	2022-02-24 07:54:38.000000000 +0000
@@ -289,7 +289,7 @@
  * This specifies the callback type for command handlers, which will be
  * executed when the specified command is invoked.
  *
- * @param cmd_val   The command that is specified by the user.
+ * @param cval   The command that is specified by the user.
  *
  * @return          Return the status of the command execution.
  */
@@ -390,7 +390,7 @@
 /**
  * Register a front end to the CLI application.
  *
- * @param CLI		The CLI application.
+ * @param cli		The CLI application.
  * @param fe		The CLI front end to be registered.
  */
 PJ_DECL(void) pj_cli_register_front_end(pj_cli_t *cli,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/include/pjlib-util/cli_telnet.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/include/pjlib-util/cli_telnet.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/include/pjlib-util/cli_telnet.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/include/pjlib-util/cli_telnet.h	2022-02-24 07:54:38.000000000 +0000
@@ -151,7 +151,7 @@
 /**
  * Retrieve cli telnet info.
  *
- * @param telnet_info   The telnet runtime information.
+ * @param info   The telnet runtime information.
  *
  * @return		PJ_SUCCESS on success.
  */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/include/pjlib-util/config.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/include/pjlib-util/config.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/include/pjlib-util/config.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/include/pjlib-util/config.h	2022-02-24 07:54:38.000000000 +0000
@@ -352,10 +352,10 @@
 
 /**
  * Maximum number of argument values of choice type.
- * Default: 16
+ * Default: 64
  */
 #ifndef PJ_CLI_MAX_CHOICE_VAL
-#   define PJ_CLI_MAX_CHOICE_VAL  16
+#   define PJ_CLI_MAX_CHOICE_VAL   64
 #endif
 
 /**
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/include/pjlib-util/http_client.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/include/pjlib-util/http_client.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/include/pjlib-util/http_client.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/include/pjlib-util/http_client.h	2022-02-24 07:54:38.000000000 +0000
@@ -357,7 +357,7 @@
  *
  * @param headers	The headers.
  * @param name	        The header field name.
- * @param value	        The header field value.
+ * @param val	        The header field value.
  *
  * @return	        PJ_SUCCESS if the operation has been successful,
  *		        or the appropriate error code on failure.
@@ -373,7 +373,7 @@
  *
  * @param headers	The headers.
  * @param name	        The header field name.
- * @param value	        The header field value.
+ * @param val	        The header field value.
  *
  * @return	        PJ_SUCCESS if the operation has been successful,
  *		        or the appropriate error code on failure.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/src/pjlib-util/cli_telnet.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/src/pjlib-util/cli_telnet.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/src/pjlib-util/cli_telnet.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/src/pjlib-util/cli_telnet.c	2022-02-24 07:54:38.000000000 +0000
@@ -385,14 +385,14 @@
 {
     cmd_history *in_history;
     pj_str_t cmd;
-    cmd.ptr = cmd_val;
-    cmd.slen = pj_ansi_strlen(cmd_val)-1;
 
+    PJ_ASSERT_RETURN(sess, PJ_EINVAL);
+
+    cmd = pj_str(cmd_val);
+    pj_strtrim(&cmd);
     if (cmd.slen == 0)
 	return PJ_SUCCESS;
 
-    PJ_ASSERT_RETURN(sess, PJ_EINVAL);
-
     /* Find matching history */
     in_history = pj_list_search(sess->history, (void*)&cmd, compare_str);
     if (!in_history) {
@@ -407,11 +407,12 @@
 	} else {
 	    /* Get the oldest history */
 	    in_history = sess->history->prev;
+	    pj_list_erase(in_history);
 	}
+	pj_strncpy(&in_history->command, &cmd, PJ_CLI_MAX_CMDBUF);
     } else {
-	pj_list_insert_nodes_after(in_history->prev, in_history->next);
+	pj_list_erase(in_history);
     }
-    pj_strcpy(&in_history->command, pj_strtrim(&cmd));
     pj_list_push_front(sess->history, in_history);
     sess->active_history = sess->history;
 
@@ -1408,9 +1409,15 @@
 
     pj_mutex_unlock(tfe->mutex);
 
-    pj_activesock_close(tfe->asock);
-    if (tfe->own_ioqueue)
+    if (tfe->asock) {
+	pj_activesock_close(tfe->asock);
+	tfe->asock = NULL;
+    }
+
+    if (tfe->own_ioqueue && tfe->cfg.ioqueue) {
         pj_ioqueue_destroy(tfe->cfg.ioqueue);
+	tfe->cfg.ioqueue = NULL;
+    }
 
     if (tfe->worker_thread) {
 	pj_thread_destroy(tfe->worker_thread);
@@ -1418,6 +1425,7 @@
     }
 
     pj_mutex_destroy(tfe->mutex);
+
     pj_pool_release(tfe->pool);
 }
 
@@ -1486,6 +1494,7 @@
 
     if (status != PJ_SUCCESS && status != PJ_EPENDING) {
 	TRACE_((THIS_FILE, "Error on data read %d", status));
+	pj_cli_sess_end_session(&sess->base);
         return PJ_FALSE;
     }
 
@@ -1497,8 +1506,15 @@
 	    if (*cdata == 0 || *cdata == '\n') {		
 		pj_mutex_unlock(sess->smutex);
 		is_valid = handle_return(sess);
-		if (!is_valid)
+		if (!is_valid) {
+		    // handle_return() can only return PJ_FALSE if
+		    // pj_cli_sess_exec() returns PJ_CLI_EEXIT,
+		    // in which case CLI session has been ended by
+		    // cmd_handler() of CLI_CMD_EXIT.
+		    //
+		    // pj_cli_sess_end_session(&sess->base);
 		    return PJ_FALSE;
+		}
 		pj_mutex_lock(sess->smutex);
 	    }
 	    break;
@@ -1602,9 +1618,18 @@
         return PJ_FALSE;
 
     if (status != PJ_SUCCESS && status != PJ_EPENDING) {
-	TRACE_((THIS_FILE, "Error on data accept %d", status));
-	if (status == PJ_ESOCKETSTOP)
-	    telnet_restart(fe);
+	TRACE_((THIS_FILE, "Error on data accept (status=%d)", status));
+	if (status == PJ_ESOCKETSTOP) {
+	    sstatus = telnet_restart(fe);
+	    if (sstatus != PJ_SUCCESS) {
+		if (fe->own_ioqueue && fe->cfg.ioqueue) {
+		    pj_ioqueue_destroy(fe->cfg.ioqueue);
+		    fe->cfg.ioqueue = NULL;
+		}
+		TRACE_((THIS_FILE, "Error restarting telnet (status=%d)",
+			status));
+	    }
+	}
 
         return PJ_FALSE;
     }
@@ -1749,14 +1774,20 @@
     if (p_fe)
         *p_fe = &fe->base;
 
+    TRACE_((THIS_FILE, "Telnet started"));
+
     return PJ_SUCCESS;
 
 on_exit:
-    if (fe->own_ioqueue)
+    if (fe->own_ioqueue && fe->cfg.ioqueue) {
         pj_ioqueue_destroy(fe->cfg.ioqueue);
+	fe->cfg.ioqueue = NULL;
+    }
 
-    if (fe->mutex)
+    if (fe->mutex) {
         pj_mutex_destroy(fe->mutex);
+	fe->mutex = NULL;
+    }
 
     pj_pool_release(pool);
     return status;
@@ -1856,18 +1887,14 @@
 	(*fe->cfg.on_started)(status);
     }
 
-    if (fe->asock)
+    if (fe->asock) {
         pj_activesock_close(fe->asock);
-    else if (sock != PJ_INVALID_SOCKET)
+	fe->asock = NULL;
+    } else if (sock != PJ_INVALID_SOCKET) {
         pj_sock_close(sock);
+	sock = PJ_INVALID_SOCKET;
+    }
 
-    if (fe->own_ioqueue)
-        pj_ioqueue_destroy(fe->cfg.ioqueue);
-
-    if (fe->mutex)
-        pj_mutex_destroy(fe->mutex);
-
-    pj_pool_release(fe->pool);
     return status;
 }
 
@@ -1879,6 +1906,8 @@
     fe->is_quitting = PJ_TRUE;
     if (fe->worker_thread) {
 	pj_thread_join(fe->worker_thread);
+	pj_thread_destroy(fe->worker_thread);
+	fe->worker_thread = NULL;
     }
 
     pj_mutex_lock(fe->mutex);
@@ -1897,21 +1926,20 @@
     if (status != PJ_SUCCESS)
 	goto on_exit;
 
-    if (fe->worker_thread) {
-	pj_thread_destroy(fe->worker_thread);
-	fe->worker_thread = NULL;
-    }
-
+    fe->asock = NULL;
     fe->is_quitting = PJ_FALSE;
 
     /** Start Telnet **/
     status = telnet_start(fe);
-    if (status == PJ_SUCCESS) {
-	if (fe->cfg.on_started) {
-	    (*fe->cfg.on_started)(status);
-	}
-	TRACE_((THIS_FILE, "Telnet Restarted"));
+    if (status != PJ_SUCCESS)
+	goto on_exit;
+
+    if (fe->cfg.on_started) {
+	(*fe->cfg.on_started)(PJ_SUCCESS);
     }
+
+    TRACE_((THIS_FILE, "Telnet restarted"));
+
 on_exit:
     return status;
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/src/pjlib-util/scanner.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/src/pjlib-util/scanner.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/src/pjlib-util/scanner.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/src/pjlib-util/scanner.c	2022-02-24 07:54:38.000000000 +0000
@@ -195,7 +195,7 @@
 
 PJ_DEF(void) pj_scan_skip_line( pj_scanner *scanner )
 {
-    char *s = pj_ansi_strchr(scanner->curptr, '\n');
+    char *s = pj_memchr(scanner->curptr, '\n', scanner->end - scanner->curptr);
     if (!s) {
 	scanner->curptr = scanner->end;
     } else {
@@ -444,16 +444,21 @@
 
 PJ_DEF(int) pj_scan_get_char( pj_scanner *scanner )
 {
-    int chr = *scanner->curptr;
+    register char *s = scanner->curptr;
+    int chr;
 
-    if (!chr) {
+    if (s >= scanner->end || !*s) {
 	pj_scan_syntax_err(scanner);
 	return 0;
     }
 
-    ++scanner->curptr;
+    chr = *s;
 
-    if (PJ_SCAN_IS_PROBABLY_SPACE(*scanner->curptr) && scanner->skip_ws) {
+    ++s;
+    scanner->curptr = s;
+    if (PJ_SCAN_CHECK_EOF(s) && PJ_SCAN_IS_PROBABLY_SPACE(*s) &&
+    	scanner->skip_ws)
+    {
 	pj_scan_skip_whitespace(scanner);
     }
     return chr;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/main.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/main.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/main.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/main.c	2022-02-24 07:54:38.000000000 +0000
@@ -21,6 +21,7 @@
 #include <pj/string.h>
 
 #if defined(PJ_SUNOS) && PJ_SUNOS!=0
+
 #include <signal.h>
 static void init_signals()
 {
@@ -32,8 +33,34 @@
     sigaction(SIGALRM, &act, NULL);
 }
 
+#elif PJ_LINUX || PJ_DARWINOS
+
+#include <execinfo.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+static void print_stack(int sig)
+{
+    void *array[16];
+    size_t size;
+
+    size = backtrace(array, 16);
+    fprintf(stderr, "Error: signal %d:\n", sig);
+    backtrace_symbols_fd(array, size, STDERR_FILENO);
+    exit(1);
+}
+
+static void init_signals(void)
+{
+    signal(SIGSEGV, &print_stack);
+    signal(SIGABRT, &print_stack);
+}
+
 #else
+
 #define init_signals()
+
 #endif
 
 #define boost()
@@ -41,23 +68,35 @@
 int main(int argc, char *argv[])
 {
     int rc;
-
-    PJ_UNUSED_ARG(argc);
-    PJ_UNUSED_ARG(argv);
+    int interractive = 0;
+    int no_trap = 0;
 
     boost();
-    init_signals();
+
+    while (argc > 1) {
+        char *arg = argv[--argc];
+
+	if (*arg=='-' && *(arg+1)=='i') {
+	    interractive = 1;
+
+	} else if (*arg=='-' && *(arg+1)=='n') {
+	    no_trap = 1;
+	}
+    }
+
+    if (!no_trap) {
+	init_signals();
+    }
 
     rc = test_main();
 
-    if (argc==2 && pj_ansi_strcmp(argv[1], "-i")==0) {
+    if (interractive) {
 	char s[10];
-
-	puts("Press ENTER to quit");
-	if (fgets(s, sizeof(s), stdin) == NULL)
+	puts("");
+	puts("Press <ENTER> to exit");
+	if (!fgets(s, sizeof(s), stdin))
 	    return rc;
     }
 
     return rc;
 }
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/resolver_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/resolver_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/resolver_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/resolver_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -37,6 +37,9 @@
 #define ACTION_IGNORE	-1
 #define ACTION_CB	-2
 
+#undef s6_addr32
+#define s6_addr32(addr, idx) *((pj_uint32_t *)(addr.s6_addr + idx*4))
+
 static struct server_t
 {
     pj_sock_t	     sock;
@@ -376,8 +379,15 @@
 	}
 
 	/* Verify packet */
-	pj_assert(req->hdr.qdcount == 1);
-	pj_assert(req->q[0].dnsclass == 1);
+	if (req->hdr.qdcount != 1) {
+	    PJ_LOG(5,(THIS_FILE, "server receive multiple queries in a packet"));
+	    continue;
+	}
+
+	if (req->q[0].dnsclass != 1) {
+	    PJ_LOG(5,(THIS_FILE, "server receive query with invalid DNS class"));
+	    continue;
+	}
 
 	/* Simulate network RTT */
 	pj_thread_sleep(50);
@@ -767,7 +777,7 @@
     pkt.ans[3].type = PJ_DNS_TYPE_AAAA;
     pkt.ans[3].dnsclass = 1;
     pkt.ans[3].ttl = 1;
-    pkt.ans[3].rdata.aaaa.ip_addr.u6_addr32[0] = 0x01020304;
+    s6_addr32(pkt.ans[3].rdata.aaaa.ip_addr, 0) = 0x01020304;
 
 
     rc = pj_dns_parse_addr_response(&pkt, &rec);
@@ -776,7 +786,7 @@
     pj_assert(rec.alias.slen == 0);
     pj_assert(rec.addr_count == 2);
     pj_assert(rec.addr[0].af==pj_AF_INET() && rec.addr[0].ip.v4.s_addr == 0x01020304);
-    pj_assert(rec.addr[1].af==pj_AF_INET6() && rec.addr[1].ip.v6.u6_addr32[0] == 0x01020304);
+    pj_assert(rec.addr[1].af==pj_AF_INET6() && s6_addr32(rec.addr[1].ip.v6, 0) == 0x01020304);
 
     /* Answer with the target corresponds to a CNAME entry, but not
      * as the first record, and with additions of some CNAME and A
@@ -1044,13 +1054,12 @@
     pj_sem_wait(sem);
     pj_thread_sleep(1000);
 
-    /* Now only server 0 should get packet, since both servers are
+    /* Now only one of the servers should get packet, since both servers are
      * in STATE_ACTIVE state
      */
-    pj_assert((g_server[0].pkt_count == 1 && g_server[1].pkt_count == 0) ||
-	      (g_server[1].pkt_count == 1 && g_server[0].pkt_count == 0));
+    pj_assert(g_server[0].pkt_count + g_server[1].pkt_count == 1);
 
-    /* Wait to allow probing period to complete */
+    /* Wait to allow active period to complete and get into probing state */
     PJ_LOG(3,(THIS_FILE, "  waiting for active NS to expire (%d sec)",
 			 set.good_ns_ttl));
     pj_thread_sleep(set.good_ns_ttl * 1000);
@@ -1073,9 +1082,12 @@
 
     pj_sem_wait(sem);
 
+    /* Both servers must get packet as both are in probing state */
+    pj_assert(g_server[0].pkt_count >= 1 && g_server[1].pkt_count == 1);
+
     /*
      * Check that both servers still receive requests, since they are
-     * in probing state.
+     * in probing & active state.
      */
     PJ_LOG(3,(THIS_FILE, "  checking both NS during probing period"));
     g_server[0].action = ACTION_IGNORE;
@@ -1091,13 +1103,12 @@
 	return -1000;
 
     pj_sem_wait(sem);
-    pj_thread_sleep(set.qretr_delay *  set.qretr_count);
+    pj_thread_sleep(1000);
 
-    /* Both servers must get requests */
-    pj_assert(g_server[0].pkt_count >= 1);
-    pj_assert(g_server[1].pkt_count == 1);
+    /* Both servers must get packet as both are in probing & active state */
+    pj_assert(g_server[0].pkt_count >= 1 && g_server[1].pkt_count == 1);
 
-    /* Wait to allow probing period to complete */
+    /* Wait to allow probing period to complete, server 0 will be in bad state */
     PJ_LOG(3,(THIS_FILE, "  waiting for probing state to end (%d sec)",
 			 set.qretr_delay * 
 			 (set.qretr_count+2) / 1000));
@@ -1123,11 +1134,11 @@
     pj_sem_wait(sem);
     pj_thread_sleep(1000);
 
-    /* Both servers must get requests */
+    /* Only server 1 get the request */
     pj_assert(g_server[0].pkt_count == 0);
     pj_assert(g_server[1].pkt_count == 1);
 
-    /* Wait to allow probing period to complete */
+    /* Wait to allow active & bad period to complete, both will be in probing state */
     PJ_LOG(3,(THIS_FILE, "  waiting for active NS to expire (%d sec)",
 			 set.good_ns_ttl));
     pj_thread_sleep(set.good_ns_ttl * 1000);
@@ -1149,10 +1160,10 @@
 
     pj_sem_wait(sem);
 
-    /* Wait to allow probing period to complete */
+    /* Wait to allow probing period to complete, server 0 remains active, server 1 will be bad */
     PJ_LOG(3,(THIS_FILE, "  waiting for probing state (%d sec)",
 			 set.qretr_delay * (set.qretr_count+2) / 1000));
-    pj_thread_sleep(set.qretr_delay * (set.qretr_count + 2));
+    pj_thread_sleep(1000 + set.qretr_delay * (set.qretr_count + 2));
 
     /*
      * Now only server 0 should get requests.
@@ -1256,10 +1267,10 @@
 	res->ans[1].dnsclass = 1;
 	res->ans[1].ttl = 1;
 	res->ans[1].name = pj_str(alias);
-	res->ans[1].rdata.aaaa.ip_addr.u6_addr32[0] = IP_ADDR1;
-	res->ans[1].rdata.aaaa.ip_addr.u6_addr32[1] = IP_ADDR1;
-	res->ans[1].rdata.aaaa.ip_addr.u6_addr32[2] = IP_ADDR1;
-	res->ans[1].rdata.aaaa.ip_addr.u6_addr32[3] = IP_ADDR1;
+	s6_addr32(res->ans[1].rdata.aaaa.ip_addr, 0) = IP_ADDR1;
+	s6_addr32(res->ans[1].rdata.aaaa.ip_addr, 1) = IP_ADDR1;
+	s6_addr32(res->ans[1].rdata.aaaa.ip_addr, 2) = IP_ADDR1;
+	s6_addr32(res->ans[1].rdata.aaaa.ip_addr, 3) = IP_ADDR1;
     }
 
     *p_res = res;
@@ -1329,7 +1340,7 @@
     PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr[0].af == pj_AF_INET() &&
 		      rec->entry[0].server.addr[0].ip.v4.s_addr == IP_ADDR1, return);
     PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr[1].af == pj_AF_INET6() &&
-		      rec->entry[0].server.addr[1].ip.v6.u6_addr32[0] == IP_ADDR1, return);
+		      s6_addr32(rec->entry[0].server.addr[1].ip.v6, 0) == IP_ADDR1, return);
 }
 
 
@@ -1355,7 +1366,7 @@
     /* IPv6 only */
     PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr_count == 1, return);
     PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr[0].af == pj_AF_INET6() &&
-		      rec->entry[0].server.addr[0].ip.v6.u6_addr32[0] == IP_ADDR1, return);
+		      s6_addr32(rec->entry[0].server.addr[0].ip.v6, 0) == IP_ADDR1, return);
 }
 
 
@@ -1365,6 +1376,8 @@
     pj_str_t domain = pj_str("somedomain.com");
     pj_str_t res_name = pj_str("_sip._udp.");
 
+    /* Last servers state: server 0=active, server 1=bad*/
+
     /* Successful scenario */
     PJ_LOG(3,(THIS_FILE, "  srv_resolve(): success scenario"));
 
@@ -1387,10 +1400,9 @@
     pj_assert(g_server[1].pkt_count == 0);
 
 
-    /* Wait until cache expires and nameserver state moves out from STATE_PROBING */
-    PJ_LOG(3,(THIS_FILE, "  waiting for cache to expire (~15 secs).."));
-    pj_thread_sleep(1000 + 
-		    ((set.qretr_count + 2) * set.qretr_delay));
+    /* Wait until cache expires */
+    PJ_LOG(3,(THIS_FILE, "  waiting for cache to expire (~1 secs).."));
+    pj_thread_sleep(1000 + 100);
 
 
     /* DNS SRV option PJ_DNS_SRV_RESOLVE_AAAA */
@@ -1410,7 +1422,6 @@
     pj_assert(status == PJ_SUCCESS);
 
     pj_sem_wait(sem);
-
     pj_thread_sleep(1000);
 
     /* DNS SRV option PJ_DNS_SRV_RESOLVE_AAAA_ONLY */
@@ -1430,7 +1441,6 @@
     pj_assert(status == PJ_SUCCESS);
 
     pj_sem_wait(sem);
-
     pj_thread_sleep(1000);
 
 
@@ -1458,7 +1468,7 @@
     /* Since TTL is one, subsequent queries should fail */
     PJ_LOG(3,(THIS_FILE, "  srv_resolve(): cache expires scenario"));
 
-    pj_thread_sleep(1000);
+    pj_thread_sleep(1000 + 100);
 
     g_server[0].action = PJ_DNS_RCODE_NXDOMAIN;
     g_server[1].action = PJ_DNS_RCODE_NXDOMAIN;
@@ -1468,7 +1478,7 @@
     pj_assert(status == PJ_SUCCESS);
 
     pj_sem_wait(sem);
-
+    pj_thread_sleep(1000);
 
     return status;
 }
@@ -1544,87 +1554,91 @@
 	res->ans[1].dnsclass = 1;
 	res->ans[1].ttl = 1;
 	res->ans[1].name = pj_str(alias);
-	res->ans[1].rdata.aaaa.ip_addr.u6_addr32[0] = IP_ADDR2;
-	res->ans[1].rdata.aaaa.ip_addr.u6_addr32[1] = IP_ADDR2;
-	res->ans[1].rdata.aaaa.ip_addr.u6_addr32[2] = IP_ADDR2;
-	res->ans[1].rdata.aaaa.ip_addr.u6_addr32[3] = IP_ADDR2;
+	s6_addr32(res->ans[1].rdata.aaaa.ip_addr, 0) = IP_ADDR2;
+	s6_addr32(res->ans[1].rdata.aaaa.ip_addr, 1) = IP_ADDR2;
+	s6_addr32(res->ans[1].rdata.aaaa.ip_addr, 2) = IP_ADDR2;
+	s6_addr32(res->ans[1].rdata.aaaa.ip_addr, 3) = IP_ADDR2;
     }
 
     *p_res = res;
 }
 
+#define SRV_CB_CHECK(cond, err) if(!(cond)) { *cb_err=err; goto on_return; }
+
 static void srv_cb_2(void *user_data,
 		     pj_status_t status,
 		     const pj_dns_srv_record *rec)
 {
-    PJ_UNUSED_ARG(user_data);
+    int *cb_err = (int*)user_data;
 
-    pj_sem_post(sem);
-
-    PJ_ASSERT_ON_FAIL(status == PJ_SUCCESS, return);
-    PJ_ASSERT_ON_FAIL(rec->count == 1, return);
-    PJ_ASSERT_ON_FAIL(rec->entry[0].priority == 0, return);
-    PJ_ASSERT_ON_FAIL(rec->entry[0].weight == 0, return);
-    PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.name, TARGET)==0,
-		      return);
-    PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.alias, "sipalias01." TARGET)==0,
-		      return);
-    PJ_ASSERT_ON_FAIL(rec->entry[0].port == PORT2, return);
+    SRV_CB_CHECK(status == PJ_SUCCESS, -10);
+    SRV_CB_CHECK(rec->count == 1, -20);
+    SRV_CB_CHECK(rec->entry[0].priority == 0, -30);
+    SRV_CB_CHECK(rec->entry[0].weight == 0, -40);
+    SRV_CB_CHECK(pj_strcmp2(&rec->entry[0].server.name, TARGET)==0, -50);
+    SRV_CB_CHECK(pj_strcmp2(&rec->entry[0].server.alias,
+			    "sipalias01." TARGET)==0, -60);
+    SRV_CB_CHECK(rec->entry[0].port == PORT2, -70);
 
     /* IPv4 only */
-    PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr_count == 1, return);
-    PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr[0].af == pj_AF_INET() &&
-		      rec->entry[0].server.addr[0].ip.v4.s_addr == IP_ADDR2, return);
+    SRV_CB_CHECK(rec->entry[0].server.addr_count == 1, -80);
+    SRV_CB_CHECK(rec->entry[0].server.addr[0].af == pj_AF_INET() &&
+		 rec->entry[0].server.addr[0].ip.v4.s_addr == IP_ADDR2, -90);
+
+on_return:
+    pj_sem_post(sem);
 }
 
 static void srv_cb_2a(void *user_data,
 		      pj_status_t status,
 		      const pj_dns_srv_record *rec)
 {
-    PJ_UNUSED_ARG(user_data);
+    int *cb_err = (int*)user_data;
 
-    pj_sem_post(sem);
-
-    PJ_ASSERT_ON_FAIL(status == PJ_SUCCESS, return);
-    PJ_ASSERT_ON_FAIL(rec->count == 1, return);
-    PJ_ASSERT_ON_FAIL(rec->entry[0].priority == 0, return);
-    PJ_ASSERT_ON_FAIL(rec->entry[0].weight == 0, return);
-    PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.name, TARGET)==0,
-		      return);
-    PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.alias, "sipalias01." TARGET)==0,
-		      return);
-    PJ_ASSERT_ON_FAIL(rec->entry[0].port == PORT2, return);
+    SRV_CB_CHECK(status == PJ_SUCCESS, -10);
+    SRV_CB_CHECK(rec->count == 1, -20);
+    SRV_CB_CHECK(rec->entry[0].priority == 0, -30);
+    SRV_CB_CHECK(rec->entry[0].weight == 0, -40);
+    SRV_CB_CHECK(pj_strcmp2(&rec->entry[0].server.name, TARGET)==0, -50);
+    SRV_CB_CHECK(pj_strcmp2(&rec->entry[0].server.alias,
+			    "sipalias01." TARGET)==0, -60);
+    SRV_CB_CHECK(rec->entry[0].port == PORT2, -70);
 
     /* IPv4 and IPv6 */
-    PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr_count == 2, return);
-    PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr[0].af == pj_AF_INET() &&
-		      rec->entry[0].server.addr[0].ip.v4.s_addr == IP_ADDR2, return);
-    PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr[1].af == pj_AF_INET6() &&
-		      rec->entry[0].server.addr[1].ip.v6.u6_addr32[0] == IP_ADDR2, return);
+    SRV_CB_CHECK(rec->entry[0].server.addr_count == 2, -80);
+    SRV_CB_CHECK(rec->entry[0].server.addr[0].af == pj_AF_INET() &&
+		 rec->entry[0].server.addr[0].ip.v4.s_addr == IP_ADDR2, -90);
+    SRV_CB_CHECK(rec->entry[0].server.addr[1].af == pj_AF_INET6() &&
+		 s6_addr32(rec->entry[0].server.addr[1].ip.v6, 0) == IP_ADDR2,
+		 -100);
+
+on_return:
+    pj_sem_post(sem);
 }
 
 static void srv_cb_2b(void *user_data,
 		      pj_status_t status,
 		      const pj_dns_srv_record *rec)
 {
-    PJ_UNUSED_ARG(user_data);
+    int *cb_err = (int*)user_data;
 
-    pj_sem_post(sem);
-
-    PJ_ASSERT_ON_FAIL(status == PJ_SUCCESS, return);
-    PJ_ASSERT_ON_FAIL(rec->count == 1, return);
-    PJ_ASSERT_ON_FAIL(rec->entry[0].priority == 0, return);
-    PJ_ASSERT_ON_FAIL(rec->entry[0].weight == 0, return);
-    PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.name, TARGET)==0,
-		      return);
-    PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.alias, "sipalias01." TARGET)==0,
-		      return);
-    PJ_ASSERT_ON_FAIL(rec->entry[0].port == PORT2, return);
+    SRV_CB_CHECK(status == PJ_SUCCESS, -10);
+    SRV_CB_CHECK(rec->count == 1, -20);
+    SRV_CB_CHECK(rec->entry[0].priority == 0, -30);
+    SRV_CB_CHECK(rec->entry[0].weight == 0, -40);
+    SRV_CB_CHECK(pj_strcmp2(&rec->entry[0].server.name, TARGET)==0, -50);
+    SRV_CB_CHECK(pj_strcmp2(&rec->entry[0].server.alias,
+			    "sipalias01." TARGET)==0, -60);
+    SRV_CB_CHECK(rec->entry[0].port == PORT2, -70);
 
     /* IPv6 only */
-    PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr_count == 1, return);
-    PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr[0].af == pj_AF_INET6() &&
-		      rec->entry[0].server.addr[0].ip.v6.u6_addr32[0] == IP_ADDR2, return);
+    SRV_CB_CHECK(rec->entry[0].server.addr_count == 1, -80);
+    SRV_CB_CHECK(rec->entry[0].server.addr[0].af == pj_AF_INET6() &&
+		 s6_addr32(rec->entry[0].server.addr[0].ip.v6, 0) == IP_ADDR2,
+		 -90);
+
+on_return:
+    pj_sem_post(sem);
 }
 
 static int srv_resolver_fallback_test(void)
@@ -1632,6 +1646,7 @@
     pj_status_t status;
     pj_str_t domain = pj_str(TARGET);
     pj_str_t res_name = pj_str("_sip._udp.");
+    int cb_err = 0;
 
     /* Fallback test */
     PJ_LOG(3,(THIS_FILE, "  srv_resolve(): fallback test"));
@@ -1642,30 +1657,42 @@
     g_server[1].action_cb = &action2_1;
 
     status = pj_dns_srv_resolve(&domain, &res_name, PORT2, pool, resolver, PJ_TRUE,
-				NULL, &srv_cb_2, NULL);
+				&cb_err, &srv_cb_2, NULL);
     if (status != PJ_SUCCESS) {
 	app_perror("   srv_resolve error", status);
-	pj_assert(status == PJ_SUCCESS);
+	return -10;
     }
 
     pj_sem_wait(sem);
 
+    if (cb_err != 0) {
+	PJ_LOG(3,("test", "   srv_resolve cb error, code=%d", cb_err));
+	return -20;
+    }
+
     /* Subsequent query should just get the response from the cache */
     PJ_LOG(3,(THIS_FILE, "  srv_resolve(): cache test"));
     g_server[0].pkt_count = 0;
     g_server[1].pkt_count = 0;
 
     status = pj_dns_srv_resolve(&domain, &res_name, PORT2, pool, resolver, PJ_TRUE,
-				NULL, &srv_cb_2, NULL);
+				&cb_err, &srv_cb_2, NULL);
     if (status != PJ_SUCCESS) {
 	app_perror("   srv_resolve error", status);
-	pj_assert(status == PJ_SUCCESS);
+	return -30;
     }
 
     pj_sem_wait(sem);
 
-    pj_assert(g_server[0].pkt_count == 0);
-    pj_assert(g_server[1].pkt_count == 0);
+    if (cb_err != 0) {
+	PJ_LOG(3,("test", "   srv_resolve cb error, code=%d", cb_err));
+	return -40;
+    }
+
+    if (g_server[0].pkt_count != 0 || g_server[1].pkt_count != 0) {
+	PJ_LOG(3,("test", "   srv_resolve() not from cache"));
+	return -50;
+    }
 
     /* Clear cache */
     pj_thread_sleep(1000);
@@ -1680,14 +1707,19 @@
 
     status = pj_dns_srv_resolve(&domain, &res_name, PORT2, pool, resolver,
 				PJ_DNS_SRV_FALLBACK_A | PJ_DNS_SRV_FALLBACK_AAAA,
-				NULL, &srv_cb_2a, NULL);
+				&cb_err, &srv_cb_2a, NULL);
     if (status != PJ_SUCCESS) {
 	app_perror("   srv_resolve error", status);
-	pj_assert(status == PJ_SUCCESS);
+	return -60;
     }
 
     pj_sem_wait(sem);
 
+    if (cb_err != 0) {
+	PJ_LOG(3,("test", "   srv_resolve cb error, code=%d", cb_err));
+	return -70;
+    }
+
     /* Clear cache */
     pj_thread_sleep(1000);
 
@@ -1701,14 +1733,19 @@
 
     status = pj_dns_srv_resolve(&domain, &res_name, PORT2, pool, resolver,
 				PJ_DNS_SRV_FALLBACK_AAAA,
-				NULL, &srv_cb_2b, NULL);
+				&cb_err, &srv_cb_2b, NULL);
     if (status != PJ_SUCCESS) {
 	app_perror("   srv_resolve error", status);
-	pj_assert(status == PJ_SUCCESS);
+	return -80;
     }
 
     pj_sem_wait(sem);
 
+    if (cb_err != 0) {
+	PJ_LOG(3,("test", "   srv_resolve cb error, code=%d", cb_err));
+	return -90;
+    }
+
     /* Clear cache */
     pj_thread_sleep(1000);
 
@@ -1790,30 +1827,31 @@
 		     const pj_dns_srv_record *rec)
 {
     unsigned i;
+    int *cb_err = (int*)user_data;
 
-    PJ_UNUSED_ARG(user_data);
     PJ_UNUSED_ARG(status);
     PJ_UNUSED_ARG(rec);
 
-    pj_assert(status == PJ_SUCCESS);
-    pj_assert(rec->count == PJ_DNS_SRV_MAX_ADDR);
+    SRV_CB_CHECK(status == PJ_SUCCESS, -10);
+    SRV_CB_CHECK(rec->count == PJ_DNS_SRV_MAX_ADDR, -20);
 
     for (i=0; i<PJ_DNS_SRV_MAX_ADDR; ++i) {
 	unsigned j;
 
-	pj_assert(rec->entry[i].priority == i);
-	pj_assert(rec->entry[i].weight == 2);
+	SRV_CB_CHECK(rec->entry[i].priority == i, -30);
+	SRV_CB_CHECK(rec->entry[i].weight == 2, -40);
 	//pj_assert(pj_strcmp2(&rec->entry[i].server.name, "sip." DOMAIN3)==0);
-	pj_assert(rec->entry[i].server.alias.slen == 0);
-	pj_assert(rec->entry[i].port == PORT3+i);
+	SRV_CB_CHECK(rec->entry[i].server.alias.slen == 0, -50);
+	SRV_CB_CHECK(rec->entry[i].port == PORT3+i, -60);
 
-	pj_assert(rec->entry[i].server.addr_count == PJ_DNS_MAX_IP_IN_A_REC);
+	SRV_CB_CHECK(rec->entry[i].server.addr_count == PJ_DNS_MAX_IP_IN_A_REC, -70);
 
 	for (j=0; j<PJ_DNS_MAX_IP_IN_A_REC; ++j) {
-	    pj_assert(rec->entry[i].server.addr[j].ip.v4.s_addr == IP_ADDR3+j);
+	    SRV_CB_CHECK(rec->entry[i].server.addr[j].ip.v4.s_addr == IP_ADDR3+j, -80);
 	}
     }
 
+on_return:
     pj_sem_post(sem);
 }
 
@@ -1822,6 +1860,7 @@
     pj_status_t status;
     pj_str_t domain = pj_str(DOMAIN3);
     pj_str_t res_name = pj_str("_sip._udp.");
+    int cb_err = 0;
 
     /* Successful scenario */
     PJ_LOG(3,(THIS_FILE, "  srv_resolve(): too many entries test"));
@@ -1835,12 +1874,20 @@
     g_server[1].pkt_count = 0;
 
     status = pj_dns_srv_resolve(&domain, &res_name, 1, pool, resolver, PJ_TRUE,
-				NULL, &srv_cb_3, NULL);
-    pj_assert(status == PJ_SUCCESS);
+				&cb_err, &srv_cb_3, NULL);
+    if (status != PJ_SUCCESS) {
+	app_perror("   srv_resolve error", status);
+	return -10;
+    }
 
     pj_sem_wait(sem);
 
-    return status;
+    if (cb_err != 0) {
+	PJ_LOG(3,("test", "   srv_resolve cb error, code=%d", cb_err));
+	return -20;
+    }
+
+    return 0;
 }
 
 
@@ -1871,9 +1918,17 @@
     if (rc != 0)
 	goto on_error;
 
-    srv_resolver_test();
-    srv_resolver_fallback_test();
-    srv_resolver_many_test();
+    rc = srv_resolver_test();
+    if (rc != 0)
+	goto on_error;
+
+    rc = srv_resolver_fallback_test();
+    if (rc != 0)
+	goto on_error;
+
+    rc = srv_resolver_many_test();
+    if (rc != 0)
+	goto on_error;
 
     destroy();
 
@@ -1894,9 +1949,17 @@
     if (rc != 0)
 	goto on_error;
 
-    srv_resolver_test();
-    srv_resolver_fallback_test();
-    srv_resolver_many_test();
+    rc = srv_resolver_test();
+    if (rc != 0)
+	goto on_error;
+
+    rc = srv_resolver_fallback_test();
+    if (rc != 0)
+	goto on_error;
+
+    rc = srv_resolver_many_test();
+    if (rc != 0)
+	goto on_error;
 
     destroy();
 #endif
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/test.c	2022-02-24 07:54:38.000000000 +0000
@@ -43,8 +43,8 @@
 
 pj_pool_factory *mem;
 
-int param_log_decor = PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME | 
-		      PJ_LOG_HAS_MICRO_SEC;
+int param_log_decor = PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME |
+		      PJ_LOG_HAS_MICRO_SEC | PJ_LOG_HAS_INDENT;
 
 static int test_inner(void)
 {
@@ -78,7 +78,9 @@
 
 #if INCLUDE_ENCRYPTION_TEST
     DO_TEST(encryption_test());
+#   if WITH_BENCHMARK
     DO_TEST(encryption_benchmark());
+#   endif
 #endif
 
 #if INCLUDE_STUN_TEST
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/test.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/test.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/test.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjlib-util/src/pjlib-util-test/test.h	2022-02-24 07:54:38.000000000 +0000
@@ -19,6 +19,12 @@
  */
 #include <pj/types.h>
 
+#if defined(PJ_EXCLUDE_BENCHMARK_TESTS) && (PJ_EXCLUDE_BENCHMARK_TESTS==1)
+#   define WITH_BENCHMARK	    0
+#else
+#   define WITH_BENCHMARK	    1
+#endif
+
 #define INCLUDE_XML_TEST	    1
 #define INCLUDE_JSON_TEST	    1
 #define INCLUDE_ENCRYPTION_TEST	    1
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/Makefile asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/Makefile
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/Makefile	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/Makefile	2022-02-24 07:54:38.000000000 +0000
@@ -62,8 +62,8 @@
 			bidirectional.o clock_thread.o codec.o conference.o \
 			conf_switch.o converter.o  converter_libswscale.o converter_libyuv.o \
 			delaybuf.o echo_common.o \
-			echo_port.o echo_suppress.o echo_webrtc.o endpoint.o errno.o \
-			event.o format.o ffmpeg_util.o \
+			echo_port.o echo_suppress.o echo_webrtc.o echo_webrtc_aec3.o \
+			endpoint.o errno.o event.o format.o ffmpeg_util.o \
 			g711.o jbuf.o master_port.o mem_capture.o mem_player.o \
 			null_port.o plc_common.o port.o splitcomb.o \
 			resample_resample.o resample_libsamplerate.o resample_speex.o \
@@ -92,7 +92,7 @@
 export PJMEDIA_AUDIODEV_OBJS +=  audiodev.o audiotest.o errno.o \
 				 legacy_dev.o null_dev.o pa_dev.o wmme_dev.o \
 				 alsa_dev.o bb10_dev.o bdimad_dev.o \
-				 android_jni_dev.o opensl_dev.o
+				 android_jni_dev.o opensl_dev.o oboe_dev.o
 export PJMEDIA_AUDIODEV_CFLAGS += $(_CFLAGS)
 export PJMEDIA_AUDIODEV_CXXFLAGS += $(_CXXFLAGS)
 export PJMEDIA_AUDIODEV_LDFLAGS += $(PJMEDIA_LDLIB) \
@@ -136,7 +136,7 @@
 #
 export PJMEDIA_CODEC_SRCDIR = ../src/pjmedia-codec
 export PJMEDIA_CODEC_OBJS += audio_codecs.o ffmpeg_vid_codecs.o openh264.o \
-			h263_packetizer.o h264_packetizer.o \
+			h263_packetizer.o h264_packetizer.o vpx_packetizer.o \
 			$(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
 			ipp_codecs.o silk.o opus.o $(CODEC_OBJS) \
                         g7221_sdp_match.o amr_sdp_match.o passthrough.o \
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/os-auto.mak.in asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/os-auto.mak.in
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/os-auto.mak.in	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/os-auto.mak.in	2022-02-24 07:54:38.000000000 +0000
@@ -18,6 +18,10 @@
 V4L2_CFLAGS = @ac_v4l2_cflags@
 V4L2_LDFLAGS = @ac_v4l2_ldflags@
 
+# Directshow
+DSHOW_CFLAGS = @ac_dshow_cflags@
+DSHOW_LDFLAGS = @ac_dshow_ldflags@
+
 # QT
 AC_PJMEDIA_VIDEO_HAS_QT = @ac_pjmedia_video_has_qt@
 # QT_CFLAGS = @ac_qt_cflags@
@@ -27,6 +31,8 @@
 
 # Android
 ANDROID_CFLAGS = @ac_android_cflags@
+OBOE_CFLAGS = @ac_oboe_cflags@
+OBOE_LDFLAGS = @ac_oboe_ldflags@
 
 # openh264
 OPENH264_CFLAGS = @ac_openh264_cflags@
@@ -39,11 +45,11 @@
 
 # PJMEDIA features exclusion
 export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@ \
-		 $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \
+		 $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(DSHOW_CFLAGS) $(QT_CFLAGS) \
 		 $(DARWIN_CFLAGS) $(ANDROID_CFLAGS) \
-		 $(OPENH264_CFLAGS) $(VPX_CFLAGS)
-export LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) \
-		  $(OPENH264_LDFLAGS) $(VPX_LDFLAGS)
+		 $(OPENH264_CFLAGS) $(VPX_CFLAGS) $(OBOE_CFLAGS)
+export LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) $(DSHOW_LDFLAGS) \
+		  $(OPENH264_LDFLAGS) $(VPX_LDFLAGS) $(OBOE_LDFLAGS)
 
 # Define the desired sound device backend
 # Valid values are:
@@ -67,6 +73,7 @@
 AC_NO_OPENCORE_AMRNB=@ac_no_opencore_amrnb@
 AC_NO_OPENCORE_AMRWB=@ac_no_opencore_amrwb@
 AC_NO_BCG729=@ac_no_bcg729@
+AC_NO_ANDROID_MEDIACODEC=@ac_no_mediacodec@
 
 export CODEC_OBJS=
 
@@ -139,6 +146,11 @@
 export CODEC_OBJS += bcg729.o
 endif
 
+ifeq ($(AC_NO_ANDROID_MEDIACODEC),1)
+export CFLAGS += -DPJMEDIA_HAS_ANDROID_MEDIACODEC=0
+else
+export CODEC_OBJS += and_aud_mediacodec.o and_vid_mediacodec.o
+endif
 
 #
 # SRTP
@@ -216,6 +228,19 @@
 endif
 endif
 
+#
+# libwebrtc-aec3
+#
+ifeq (@ac_no_webrtc_aec3@,1)
+export CFLAGS += -DPJMEDIA_HAS_WEBRTC_AEC3=0
+else
+export CFLAGS += -DPJMEDIA_HAS_WEBRTC_AEC3=1 @ac_webrtc_aec3_cflags@
+
+ifeq (@ac_external_webrtc@,0)
+export CFLAGS += -I$(THIRD_PARTY)/webrtc_aec3/src
+endif
+endif
+
 
 #
 # MacOSX specific
@@ -290,6 +315,14 @@
 endif
 
 #
+# Directshow video device
+#
+ifeq ($(AC_PJMEDIA_VIDEO_DEV_HAS_DSHOW),yes)
+export PJMEDIA_VIDEODEV_OBJS += dshow_dev.o dshowclasses.o
+export CFLAGS += -I$(THIRD_PARTY)/BaseClasses
+endif
+
+#
 # Android video device
 #
 ifeq ($(AC_PJMEDIA_VIDEO),android_os)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_audiodev.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_audiodev.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_audiodev.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_audiodev.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -78,7 +102,7 @@
   <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{4281CA5E-1D48-45D4-A991-2718A454B4BA}</ProjectGuid>
-    <RootNamespace>pjmedia_audiodev</RootNamespace>    
+    <RootNamespace>pjmedia_audiodev</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -161,40 +185,77 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -264,31 +325,61 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -335,6 +426,19 @@
       <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -369,6 +473,18 @@
       <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -404,6 +520,19 @@
       <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -438,6 +567,18 @@
       <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -473,6 +614,19 @@
       <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -507,6 +661,18 @@
       <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-audiodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\pjmedia-audiodev\audiodev.c" />
     <ClCompile Include="..\src\pjmedia-audiodev\audiotest.c" />
@@ -519,61 +685,79 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pjmedia-audiodev\symb_mda_dev.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pjmedia-audiodev\symb_vas_dev.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Condition="'$(API_Family)'!='WinDesktop'" Include="..\src\pjmedia-audiodev\wasapi_dev.cpp">
       <CompileAsWinRT>true</CompileAsWinRT>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_audiodev.vcxproj.filters asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_audiodev.vcxproj.filters
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_audiodev.vcxproj.filters	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_audiodev.vcxproj.filters	2022-02-24 07:54:38.000000000 +0000
@@ -44,9 +44,6 @@
     <ClCompile Include="..\src\pjmedia-audiodev\wmme_dev.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\pjmedia-audiodev\wasapi_dev.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\pjmedia-audiodev\audiodev.h">
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_codec.vcproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_codec.vcproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_codec.vcproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_codec.vcproj	2022-02-24 07:54:38.000000000 +0000
@@ -3631,8 +3631,12 @@
       <File
 				RelativePath="..\src\pjmedia-codec\vpx.c"
 				>
-      </File>        
-			<Filter
+      </File>
+      <File
+				RelativePath="..\src\pjmedia-codec\vpx_packetizer.c"
+				>
+      </File>
+      <Filter
 				Name="g722 Files"
 				>
 				<File
@@ -3744,8 +3748,12 @@
       <File
 				RelativePath="..\include\pjmedia-codec\vpx.h"
 				>
-      </File>      
-		</Filter>
+      </File>
+      <File
+				RelativePath="..\include\pjmedia-codec\vpx_packetizer.h"
+				>
+      </File>
+    </Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_codec.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_codec.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_codec.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_codec.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -161,36 +185,72 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
@@ -265,31 +325,61 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -336,6 +426,19 @@
       <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -370,6 +473,18 @@
       <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -405,6 +520,19 @@
       <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -439,6 +567,18 @@
       <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -474,6 +614,19 @@
       <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -508,6 +661,18 @@
       <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../third_party/speex/include;../../third_party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-codec-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\pjmedia-codec\amr_sdp_match.c" />
     <ClCompile Include="..\src\pjmedia-codec\audio_codecs.c" />
@@ -531,6 +696,7 @@
     <ClCompile Include="..\src\pjmedia-codec\silk.c" />
     <ClCompile Include="..\src\pjmedia-codec\speex_codec.c" />
     <ClCompile Include="..\src\pjmedia-codec\vpx.c" />
+    <ClCompile Include="..\src\pjmedia-codec\vpx_packetizer.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\pjmedia-codec.h" />
@@ -556,6 +722,7 @@
     <ClInclude Include="..\include\pjmedia-codec\speex.h" />
     <ClInclude Include="..\include\pjmedia-codec\types.h" />
     <ClInclude Include="..\include\pjmedia-codec\vpx.h" />
+    <ClInclude Include="..\include\pjmedia-codec\vpx_packetizer.h" />
     <ClInclude Include="..\src\pjmedia-codec\g722\g722_dec.h" />
     <ClInclude Include="..\src\pjmedia-codec\g722\g722_enc.h" />
   </ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_codec.vcxproj.filters asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_codec.vcxproj.filters
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_codec.vcxproj.filters	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_codec.vcxproj.filters	2022-02-24 07:54:38.000000000 +0000
@@ -80,6 +80,9 @@
     <ClCompile Include="..\src\pjmedia-codec\vpx.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\pjmedia-codec\vpx_packetizer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\pjmedia-codec\g722\g722_dec.h">
@@ -157,5 +160,8 @@
     <ClInclude Include="..\include\pjmedia-codec\vpx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\pjmedia-codec\vpx_packetizer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_test.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_test.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_test.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_test.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -54,7 +78,7 @@
   <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}</ProjectGuid>
-    <RootNamespace>pjmedia_test</RootNamespace>    
+    <RootNamespace>pjmedia_test</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -101,110 +125,177 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
     <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType>
     <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType>
-  </PropertyGroup>  
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
-	  <TargetName>pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+    <TargetName>pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
   </PropertyGroup>
   <!-- Compile and link option definition -->
   <ItemDefinitionGroup>
@@ -244,6 +335,21 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -270,6 +376,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -299,6 +418,21 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -325,6 +459,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -354,6 +501,21 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -382,6 +544,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjlib/include;../include;../../pjnath/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjmedia-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\test\codec_vectors.c" />
     <ClCompile Include="..\src\test\jbuf_test.c" />
@@ -391,31 +567,43 @@
     <ClCompile Include="..\src\test\sdptest.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\test\sdp_neg_test.c" />
     <ClCompile Include="..\src\test\session_test.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\test\test.c" />
     <ClCompile Include="..\src\test\vid_codec_test.c" />
@@ -424,16 +612,22 @@
     <ClCompile Include="..\src\test\wince_main.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -166,36 +190,72 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
@@ -270,31 +330,61 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -307,15 +397,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
     </ClCompile>
@@ -325,22 +415,31 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
     </ClCompile>
@@ -350,23 +449,33 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
     </ClCompile>
@@ -376,23 +485,33 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
     </ClCompile>
@@ -402,22 +521,31 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
     </ClCompile>
@@ -427,23 +555,33 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;__ARMEL__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
     </ClCompile>
@@ -453,11 +591,20 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../../third_party/yuv/include;../../third_party/webrtc/src;../../third_party/webrtc_aec3/src;../..;$(DXSDK_DIR)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\pjmedia\alaw_ulaw.c" />
     <ClCompile Include="..\src\pjmedia\alaw_ulaw_table.c" />
@@ -477,6 +624,9 @@
     <ClCompile Include="..\src\pjmedia\echo_speex.c" />
     <ClCompile Include="..\src\pjmedia\echo_suppress.c" />
     <ClCompile Include="..\src\pjmedia\echo_webrtc.c" />
+    <ClCompile Include="..\src\pjmedia\echo_webrtc_aec3.cpp">
+      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdcpp17</LanguageStandard>
+    </ClCompile>
     <ClCompile Include="..\src\pjmedia\endpoint.c" />
     <ClCompile Include="..\src\pjmedia\errno.c" />
     <ClCompile Include="..\src\pjmedia\event.c" />
@@ -528,11 +678,17 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pjmedia\transport_srtp_sdes.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
@@ -548,11 +704,17 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pjmedia\transport_udp.c" />
     <ClCompile Include="..\src\pjmedia\types.c" />
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia.vcxproj.filters asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia.vcxproj.filters
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia.vcxproj.filters	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia.vcxproj.filters	2022-02-24 07:54:38.000000000 +0000
@@ -227,6 +227,9 @@
     <ClCompile Include="..\src\pjmedia\vid_conf.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\pjmedia\echo_webrtc_aec3.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\pjmedia\alaw_ulaw.h">
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_videodev.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_videodev.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/build/pjmedia_videodev.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/build/pjmedia_videodev.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -161,40 +185,77 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -264,31 +325,61 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -335,6 +426,19 @@
       <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -369,6 +473,18 @@
       <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -404,6 +520,19 @@
       <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -438,6 +567,18 @@
       <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -473,6 +614,19 @@
       <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -505,6 +659,18 @@
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/crypto/include;../../third_party/srtp/include;../..;../../third_party/BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjmedia-videodev-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/conference.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/conference.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/conference.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/conference.h	2022-02-24 07:54:38.000000000 +0000
@@ -361,6 +361,32 @@
 
 
 /**
+ * Disconnect unidirectional audio from all sources to the specified sink slot.
+ *
+ * @param conf		The conference bridge.
+ * @param sink_slot	Sink slot.
+ *
+ * @return		PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t)
+pjmedia_conf_disconnect_port_from_sources( pjmedia_conf *conf,
+					   unsigned sink_slot);
+
+
+/**
+ * Disconnect unidirectional audio from the specified source to all sink slots.
+ *
+ * @param conf		The conference bridge.
+ * @param src_slot	Source slot.
+ *
+ * @return		PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t)
+pjmedia_conf_disconnect_port_from_sinks( pjmedia_conf *conf,
+					 unsigned src_slot);
+
+
+/**
  * Get number of ports currently registered to the conference bridge.
  *
  * @param conf		The conference bridge.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/config.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/config.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/config.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/config.h	2022-02-24 07:54:38.000000000 +0000
@@ -45,6 +45,34 @@
 #endif
 
 /**
+ * Initial memory block for media endpoint.
+ */
+#ifndef PJMEDIA_POOL_LEN_ENDPT
+#   define PJMEDIA_POOL_LEN_ENDPT		512
+#endif
+
+/**
+ * Memory increment for media endpoint.
+ */
+#ifndef PJMEDIA_POOL_INC_ENDPT
+#   define PJMEDIA_POOL_INC_ENDPT		512
+#endif
+
+/**
+ * Initial memory block for event manager.
+ */
+#ifndef PJMEDIA_POOL_LEN_EVTMGR
+#   define PJMEDIA_POOL_LEN_EVTMGR		500
+#endif
+
+/**
+ * Memory increment for evnt manager.
+ */
+#ifndef PJMEDIA_POOL_INC_EVTMGR
+#   define PJMEDIA_POOL_INC_EVTMGR		500
+#endif
+
+/**
  * Specify whether we prefer to use audio switch board rather than 
  * conference bridge.
  *
@@ -603,7 +631,7 @@
 #endif
 
 /**
- * Perform RTP payload type checking in the stream. Normally the peer
+ * Perform RTP payload type checking in the audio stream. Normally the peer
  * MUST send RTP with payload type as we specified in our SDP. Certain
  * agents may not be able to follow this hence the only way to have
  * communication is to disable this check.
@@ -864,6 +892,20 @@
 
 
 /**
+ * This macro declares whether PJMEDIA should generate multiple
+ * telephone-event formats in SDP offer, i.e: one for each audio codec
+ * clock rate (see also ticket #2088). If this macro is set to zero, only
+ * one telephone event format will be generated and it uses clock rate 8kHz
+ * (old behavior before ticket #2088).
+ *
+ * Default: 1 (yes)
+ */
+#ifndef PJMEDIA_TELEPHONE_EVENT_ALL_CLOCKRATES
+#   define PJMEDIA_TELEPHONE_EVENT_ALL_CLOCKRATES   1
+#endif
+
+
+/**
  * Maximum tones/digits that can be enqueued in the tone generator.
  */
 #ifndef PJMEDIA_TONEGEN_MAX_DIGITS
@@ -1095,6 +1137,28 @@
 
 
 /**
+ * Specify whether SRTP needs to handle condition that old packets with
+ * incorect RTP seq are still coming when SRTP is restarted.
+ *
+ * Default: enabled.
+ */
+#ifndef PJMEDIA_SRTP_CHECK_RTP_SEQ_ON_RESTART
+#   define PJMEDIA_SRTP_CHECK_RTP_SEQ_ON_RESTART    1
+#endif
+
+
+/**
+ * Specify whether SRTP needs to handle condition that remote may reset
+ * or maintain ROC when SRTP is restarted.
+ *
+ * Default: enabled.
+ */
+#ifndef PJMEDIA_SRTP_CHECK_ROC_ON_RESTART
+#   define PJMEDIA_SRTP_CHECK_ROC_ON_RESTART        1
+#endif
+
+
+/**
  * Let the library handle libsrtp initialization and deinitialization.
  * Application may want to disable this and manually perform libsrtp
  * initialization and deinitialization when it needs to use libsrtp
@@ -1152,7 +1216,7 @@
  * Maximum size in bytes of storage buffer of a transport specific info.
  */
 #ifndef PJMEDIA_TRANSPORT_SPECIFIC_INFO_MAXSIZE
-#   define PJMEDIA_TRANSPORT_SPECIFIC_INFO_MAXSIZE  (36*sizeof(long))
+#   define PJMEDIA_TRANSPORT_SPECIFIC_INFO_MAXSIZE  (50*sizeof(long))
 #endif
 
 
@@ -1220,6 +1284,30 @@
 
 
 /**
+ * Specify the number of keep-alive needed to be sent after the stream is
+ * created.
+ *
+ * Setting this to 0 will disable it.
+ *
+ * Default : 2
+ */
+#ifndef PJMEDIA_STREAM_START_KA_CNT
+#   define PJMEDIA_STREAM_START_KA_CNT	2
+#endif
+
+
+/**
+ * Specify the interval to send keep-alive after the stream is created,
+ * in msec.
+ *
+ * Default : 1000
+ */
+#ifndef PJMEDIA_STREAM_START_KA_INTERVAL_MSEC
+#   define PJMEDIA_STREAM_START_KA_INTERVAL_MSEC  1000
+#endif
+
+
+/**
  * Specify the number of identical consecutive error that will be ignored when 
  * receiving RTP/RTCP data before the library tries to restart the transport.
  *
@@ -1428,6 +1516,24 @@
 
 
 /**
+ * Reset jitter buffer and return silent audio on stream playback start
+ * (first get_frame()). This is useful to avoid possible noise that may be
+ * introduced by discard algorithm and neutralize latency when audio device
+ * is started later than the stream.
+ *
+ * Set this to N>0 to allow N silent audio frames returned on stream playback
+ * start, this will allow about N frames to be buffered in the jitter buffer
+ * before the playback is started (prefetching effect).
+ * Set this to zero to disable this feature.
+ *
+ * Default: 1
+ */
+#ifndef PJMEDIA_STREAM_SOFT_START
+#   define PJMEDIA_STREAM_SOFT_START		    1
+#endif
+
+
+/**
  * Video stream will discard old picture from the jitter buffer as soon as
  * new picture is received, to reduce latency.
  *
@@ -1559,6 +1665,17 @@
 #endif
 
 
+/**
+ * Perform RTP payload type checking in the video stream. Normally the peer
+ * MUST send RTP with payload type as we specified in our SDP. Certain
+ * agents may not be able to follow this hence the only way to have
+ * communication is to disable this check.
+ *
+ * Default: PJMEDIA_STREAM_CHECK_RTP_PT (follow audio stream's setting)
+ */
+#ifndef PJMEDIA_VID_STREAM_CHECK_RTP_PT
+#   define PJMEDIA_VID_STREAM_CHECK_RTP_PT	PJMEDIA_STREAM_CHECK_RTP_PT
+#endif
 
 /**
  * @}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/converter.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/converter.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/converter.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/converter.h	2022-02-24 07:54:38.000000000 +0000
@@ -347,10 +347,10 @@
  * @param cv		    The converter instance.
  * @param src_frame	    The source frame.
  * @param src_frame_size    The source frame size.
- * @param src_reg_pos	    The source region position.
+ * @param src_pos	    The source region position.
  * @param dst_frame	    The destination frame.
  * @param dst_frame_size    The destination frame size.
- * @param dst_reg_pos	    The destination region position.
+ * @param dst_pos	    The destination region position.
  * @param param		    This is unused for now and must be NULL.
  *
  * @return		    PJ_SUCCESS if conversion has been performed
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/echo.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/echo.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/echo.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/echo.h	2022-02-24 07:54:38.000000000 +0000
@@ -59,34 +59,36 @@
 {
     /**
      * Use any available backend echo canceller algorithm. This is
-     * the default settings. This setting is mutually exclusive with
-     * PJMEDIA_ECHO_SIMPLE and PJMEDIA_ECHO_SPEEX.
+     * the default settings. You can only choose one backend.
      */
     PJMEDIA_ECHO_DEFAULT= 0,
 
     /**
      * Force to use Speex AEC as the backend echo canceller algorithm.
-     * This setting is mutually exclusive with PJMEDIA_ECHO_SIMPLE and
-     * PJMEDIA_ECHO_WEBRTC.
+     * You can only choose one backend.
      */
     PJMEDIA_ECHO_SPEEX	= 1,
 
     /**
      * If PJMEDIA_ECHO_SIMPLE flag is specified during echo canceller
      * creation, then a simple echo suppressor will be used instead of
-     * an accoustic echo cancellation. This setting is mutually exclusive
-     * with PJMEDIA_ECHO_SPEEX and PJMEDIA_ECHO_WEBRTC.
+     * an accoustic echo cancellation. You can only choose one backend.
      */
     PJMEDIA_ECHO_SIMPLE	= 2,
 
     /**
      * Force to use WebRTC AEC as the backend echo canceller algorithm.
-     * This setting is mutually exclusive with PJMEDIA_ECHO_SIMPLE and
-     * PJMEDIA_ECHO_SPEEX.
+     * You can only choose one backend.
      */
     PJMEDIA_ECHO_WEBRTC = 3,
 
     /**
+     * Force to use WebRTC AEC3 as the backend echo canceller algorithm.
+     * You can only choose one backend.
+     */
+    PJMEDIA_ECHO_WEBRTC_AEC3 = 4,
+
+    /**
      * For internal use.
      */
     PJMEDIA_ECHO_ALGO_MASK = 15,
@@ -116,6 +118,12 @@
      * canceller will also apply noise suppressor method to reduce noise.
      */
     PJMEDIA_ECHO_USE_NOISE_SUPPRESSOR = 128,
+
+    /**
+     * If PJMEDIA_ECHO_USE_GAIN_CONTROLLER flag is specified, the echo
+     * canceller will also apply automatic gain control.
+     */
+    PJMEDIA_ECHO_USE_GAIN_CONTROLLER = 256,
     
     /**
      * Use default aggressiveness setting for the echo canceller algorithm. 
@@ -129,26 +137,26 @@
      * algorithm. This setting is mutually exclusive with the other
      * aggressiveness settings.
      */
-    PJMEDIA_ECHO_AGGRESSIVENESS_CONSERVATIVE = 0x100,
+    PJMEDIA_ECHO_AGGRESSIVENESS_CONSERVATIVE = 0x1000,
     
     /**
      * Use moderate aggressiveness setting for the echo canceller algorithm. 
      * This setting is mutually exclusive with the other aggressiveness
      * settings.
      */
-    PJMEDIA_ECHO_AGGRESSIVENESS_MODERATE = 0x200,
+    PJMEDIA_ECHO_AGGRESSIVENESS_MODERATE = 0x2000,
     
     /**
      * Use aggressive aggressiveness setting for the echo canceller
      * algorithm. This setting is mutually exclusive with the other
      * aggressiveness settings.
      */
-    PJMEDIA_ECHO_AGGRESSIVENESS_AGGRESSIVE = 0x300,
+    PJMEDIA_ECHO_AGGRESSIVENESS_AGGRESSIVE = 0x3000,
     
     /**
      * For internal use.
      */
-    PJMEDIA_ECHO_AGGRESSIVENESS_MASK = 0xF00
+    PJMEDIA_ECHO_AGGRESSIVENESS_MASK = 0xF000
 
 } pjmedia_echo_flag;
 
@@ -168,10 +176,22 @@
     const char *name;
 
     /**
-     * Echo delay median value (in ms).
+     * Echo delay value (in ms).
+     * PJMEDIA_ECHO_STAT_NOT_SPECIFIED if unavailable.
+     */
+    int 	delay;
+
+    /**
+     * Echo return loss.
+     * PJMEDIA_ECHO_STAT_NOT_SPECIFIED if unavailable.
+     */
+    double 	return_loss;
+
+    /**
+     * Echo return loss enhancement.
      * PJMEDIA_ECHO_STAT_NOT_SPECIFIED if unavailable.
      */
-    int 	median;
+    double 	return_loss_enh;
 
     /**
      * Echo delay standard deviation (in ms).
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/endpoint.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/endpoint.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/endpoint.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/endpoint.h	2022-02-24 07:54:38.000000000 +0000
@@ -60,6 +60,20 @@
 
 } pjmedia_endpt_flag;
 
+/**
+ * This structure specifies various settings that can be passed when creating
+ * audio/video sdp.
+ */
+typedef struct pjmedia_endpt_create_sdp_param
+{
+    /**
+     * Direction of the media.
+     *
+     * Default: PJMEDIA_DIR_ENCODING_DECODING
+     */
+    pjmedia_dir dir;
+
+} pjmedia_endpt_create_sdp_param;
 
 /**
  * Type of callback to register to pjmedia_endpt_atexit().
@@ -68,6 +82,15 @@
 
 
 /**
+ * Call this function to initialize \a pjmedia_endpt_create_sdp_param with default 
+ * values.
+ *
+ * @param param	    The param to be initialized.
+ */
+PJ_DECL(void)
+pjmedia_endpt_create_sdp_param_default(pjmedia_endpt_create_sdp_param *param);
+
+/**
  * Create an instance of media endpoint.
  *
  * @param pf		Pool factory, which will be used by the media endpoint
@@ -296,16 +319,18 @@
  * @param endpt		The media endpoint.
  * @param pool		Pool to allocate memory from.
  * @param si		Socket information.
- * @param options	Option flags, must be zero for now.
+ * @param options	Options parameter, can be NULL. If set to NULL,
+ *			default values will be used.
  * @param p_m		Pointer to receive the created SDP media.
  *
  * @return		PJ_SUCCESS on success, or the appropriate error code.
  */
-PJ_DECL(pj_status_t) pjmedia_endpt_create_audio_sdp(pjmedia_endpt *endpt,
-                                                    pj_pool_t *pool,
-                                                    const pjmedia_sock_info*si,
-                                                    unsigned options,
-                                                    pjmedia_sdp_media **p_m);
+PJ_DECL(pj_status_t)
+pjmedia_endpt_create_audio_sdp(pjmedia_endpt *endpt,
+                               pj_pool_t *pool,
+                               const pjmedia_sock_info *si,
+                               const pjmedia_endpt_create_sdp_param *options,
+                               pjmedia_sdp_media **p_m);
 
 /**
  * Create SDP media line for video media.
@@ -313,16 +338,18 @@
  * @param endpt		The media endpoint.
  * @param pool		Pool to allocate memory from.
  * @param si		Socket information.
- * @param options	Option flags, must be zero for now.
+ * @param options	Options parameter, can be NULL. If set to NULL,
+ *			default values will be used.
  * @param p_m		Pointer to receive the created SDP media.
  *
  * @return		PJ_SUCCESS on success, or the appropriate error code.
  */
-PJ_DECL(pj_status_t) pjmedia_endpt_create_video_sdp(pjmedia_endpt *endpt,
-                                                    pj_pool_t *pool,
-                                                    const pjmedia_sock_info*si,
-                                                    unsigned options,
-                                                    pjmedia_sdp_media **p_m);
+PJ_DECL(pj_status_t)
+pjmedia_endpt_create_video_sdp(pjmedia_endpt *endpt,
+                               pj_pool_t *pool,
+                               const pjmedia_sock_info *si,
+                               const pjmedia_endpt_create_sdp_param *options,
+                               pjmedia_sdp_media **p_m);
 
 /**
  * Dump media endpoint capabilities.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/format.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/format.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/format.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/format.h	2022-02-24 07:54:38.000000000 +0000
@@ -227,6 +227,8 @@
     PJMEDIA_FORMAT_MPEG2VIDEO = PJMEDIA_FORMAT_PACK('M', 'P', '2', 'V'),
     PJMEDIA_FORMAT_MPEG4    = PJMEDIA_FORMAT_PACK('M', 'P', 'G', '4'),
 
+    PJMEDIA_FORMAT_INVALID  = 0xFFFFFFFF
+
 } pjmedia_format_id;
 
 /**
@@ -639,8 +641,6 @@
  * @param height	Image heigth.
  * @param fps_num	FPS numerator.
  * @param fps_denum	FPS denumerator.
- * @param avg_bps	Average bitrate.
- * @param max_bps	Maximum bitrate.
  */
 PJ_DECL(void) pjmedia_format_init_video(pjmedia_format *fmt,
 					pj_uint32_t fmt_id,
@@ -793,6 +793,25 @@
  */
 PJ_DECL(void) pjmedia_video_format_mgr_destroy(pjmedia_video_format_mgr *mgr);
 
+
+/*****************************************************************************
+ * FORMAT FUNCTION HELPER:
+ */
+
+/**
+ * Fill video frame buffer with black color.
+ *
+ * @param fmt		The video format.
+ * @param buf		The frame buffer.
+ * @param buf_size	The frame buffer size.
+ *
+ * @return		PJ_SUCCESS if successfull.
+ */
+PJ_DECL(pj_status_t) pjmedia_video_format_fill_black(const pjmedia_format *fmt,
+						     void *buf,
+						     pj_size_t buf_size);
+
+
 PJ_END_DECL
 
 /**
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/rtcp_fb.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/rtcp_fb.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/rtcp_fb.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/rtcp_fb.h	2022-02-24 07:54:38.000000000 +0000
@@ -227,7 +227,6 @@
  * @param dst		Destination configuration.
  * @param src		Source configuration.
  *
- * @return		PJ_SUCCESS on success.
  */
 PJ_DECL(void) pjmedia_rtcp_fb_setting_dup(pj_pool_t *pool,
 					  pjmedia_rtcp_fb_setting *dst,
@@ -241,7 +240,6 @@
  * @param dst		Destination info.
  * @param src		Source info.
  *
- * @return		PJ_SUCCESS on success.
  */
 PJ_DECL(void) pjmedia_rtcp_fb_info_dup(pj_pool_t *pool,
 				       pjmedia_rtcp_fb_info *dst,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/rtp.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/rtp.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/rtp.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/rtp.h	2022-02-24 07:54:38.000000000 +0000
@@ -155,6 +155,20 @@
 };
 
 /**
+ * Mask for the E ("End") bit of telephony-events payload.
+ *
+ * @see pjmedia_rtp_dtmf_event
+ */
+#define PJMEDIA_RTP_DTMF_EVENT_END_MASK     0x80
+
+/**
+ * Mask for the Volume field of telephony-events payload.
+ *
+ * @see pjmedia_rtp_dtmf_event
+ */
+#define PJMEDIA_RTP_DTMF_EVENT_VOLUME_MASK  0x3F
+
+/**
  * @see pjmedia_rtp_dtmf_event
  */
 typedef struct pjmedia_rtp_dtmf_event pjmedia_rtp_dtmf_event;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/sdp.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/sdp.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/sdp.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/sdp.h	2022-02-24 07:54:38.000000000 +0000
@@ -348,7 +348,7 @@
  *
  * @param attr		Generic attribute to be converted to ssrc, which
  *			name must be "ssrc".
- * @param ssrc		SDP ssrc attribute to be initialized.
+ * @param rtcp		SDP ssrc attribute to be initialized.
  *
  * @return		PJ_SUCCESS on success.
  */
@@ -408,7 +408,7 @@
  * Compare connection info. 
  * 
  * @param conn1	    The first connection info to compare.
- * @param conn1	    The second connection info to compare.
+ * @param conn2	    The second connection info to compare.
  * @param option    Comparison option, which should be zero for now.
  *
  * @return	    PJ_SUCCESS when both connection info are equal, otherwise
@@ -484,6 +484,17 @@
  */
 typedef struct pjmedia_sdp_media pjmedia_sdp_media;
 
+/**
+ * Print media description to a buffer.
+ *
+ * @param media	    The media description.
+ * @param buf	    The buffer.
+ * @param size	    The buffer length.
+ *
+ * @return	    the length printed, or -1 if the buffer is too
+ *		    short.
+ */
+PJ_DECL(int) pjmedia_sdp_media_print(const pjmedia_sdp_media *media, char *buf, pj_size_t size);
 
 /** 
  * Clone SDP media description. 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/signatures.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/signatures.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/signatures.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/signatures.h	2022-02-24 07:54:38.000000000 +0000
@@ -112,7 +112,7 @@
 /**
  * Macro to generate signature from four ASCII letters.
  */
-#define PJMEDIA_SIGNATURE(a,b,c,d)	PJMEDIA_FOURCC(a,b,c,d)
+#define PJMEDIA_SIGNATURE(a,b,c,d)	PJMEDIA_FOURCC(d,c,b,a)
 
 /*************************************************************************
  * Codec signature ('Cxxx'). Please keep the constant names sorted.
@@ -124,13 +124,13 @@
  * Audio codec signatures ('CAxx'). Please keep the constant names sorted.
  */
 #define PJMEDIA_SIG_CLASS_AUD_CODEC(c,d) PJMEDIA_SIG_CLASS_CODEC('A',c,d)
-#define PJMEDIA_SIG_IS_CLASS_AUD_CODEC(s) ((s)>>24=='C' && (s)>>16=='A')
+#define PJMEDIA_SIG_IS_CLASS_AUD_CODEC(s) ((s)>>24=='C' && (((s)>>16)&0xff)=='A')
 
 /*************************************************************************
  * Video codec signatures ('CVxx'). Please keep the constant names sorted.
  */
 #define PJMEDIA_SIG_CLASS_VID_CODEC(c,d) PJMEDIA_SIG_CLASS_CODEC('V',c,d)
-#define PJMEDIA_SIG_IS_CLASS_VID_CODEC(sig) ((s)>>24=='C' && (s)>>16=='V')
+#define PJMEDIA_SIG_IS_CLASS_VID_CODEC(sig) ((s)>>24=='C' && (((s)>>16)&0xff)=='V')
 
 #define PJMEDIA_SIG_VID_CODEC_FFMPEG	PJMEDIA_SIG_CLASS_VID_CODEC('F','F')
 
@@ -144,7 +144,7 @@
  * Audio ports signatures ('PAxx'). Please keep the constant names sorted.
  */
 #define PJMEDIA_SIG_CLASS_PORT_AUD(c,d)	PJMEDIA_SIG_CLASS_PORT('A',c,d)
-#define PJMEDIA_SIG_IS_CLASS_PORT_AUD(s) ((s)>>24=='P' && (s)>>16=='A')
+#define PJMEDIA_SIG_IS_CLASS_PORT_AUD(s) ((s)>>24=='P' && (((s)>>16)&0xff)=='A')
 
 #define PJMEDIA_SIG_PORT_BIDIR		PJMEDIA_SIG_CLASS_PORT_AUD('B','D')
 #define PJMEDIA_SIG_PORT_CONF		PJMEDIA_SIG_CLASS_PORT_AUD('C','F')
@@ -169,7 +169,7 @@
  * Video ports signatures ('PVxx'). Please keep the constant names sorted.
  */
 #define PJMEDIA_SIG_CLASS_PORT_VID(c,d)	PJMEDIA_SIG_CLASS_PORT('V',c,d)
-#define PJMEDIA_SIG_IS_CLASS_PORT_VID(s) ((s)>>24=='P' && (s)>>16=='V')
+#define PJMEDIA_SIG_IS_CLASS_PORT_VID(s) ((s)>>24=='P' && (((s)>>16)&0xff)=='V')
 
 /** AVI player signature. */
 #define PJMEDIA_SIG_PORT_VID_AVI_PLAYER	PJMEDIA_SIG_CLASS_PORT_VID('A','V')
@@ -181,7 +181,7 @@
  * Video device signatures ('VDxx'). Please keep the constant names sorted.
  */
 #define PJMEDIA_SIG_CLASS_VID_DEV(c,d)	PJMEDIA_SIGNATURE('V','D',c,d)
-#define PJMEDIA_SIG_IS_CLASS_VID_DEV(s) ((s)>>24=='V' && (s)>>16=='D')
+#define PJMEDIA_SIG_IS_CLASS_VID_DEV(s) ((s)>>24=='V' && (((s)>>16)&0xff)=='D')
 
 #define PJMEDIA_SIG_VID_DEV_COLORBAR	PJMEDIA_SIG_CLASS_VID_DEV('C','B')
 #define PJMEDIA_SIG_VID_DEV_SDL		PJMEDIA_SIG_CLASS_VID_DEV('S','D')
@@ -195,7 +195,7 @@
  * Other video objects ('VOxx'). Please keep the constant names sorted.
  */
 #define PJMEDIA_SIG_CLASS_VID_OTHER(c,d) PJMEDIA_SIGNATURE('V','O',c,d)
-#define PJMEDIA_SIG_IS_CLASS_VID_OTHER(s) ((s)>>24=='V' && (s)>>16=='O')
+#define PJMEDIA_SIG_IS_CLASS_VID_OTHER(s) ((s)>>24=='V' && (((s)>>16)&0xff)=='O')
 
 #define PJMEDIA_SIG_VID_CONF		PJMEDIA_SIG_CLASS_VID_OTHER('C','F')
 #define PJMEDIA_SIG_VID_PORT		PJMEDIA_SIG_CLASS_VID_OTHER('P','O')
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/sound.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/sound.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/sound.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/sound.h	2022-02-24 07:54:38.000000000 +0000
@@ -123,7 +123,7 @@
  *
  * @param user_data	User data associated with the stream.
  * @param timestamp	Timestamp, in samples.
- * @param output	Buffer containing the captured audio samples.
+ * @param input	Buffer containing the captured audio samples.
  * @param size		The size of the data in the buffer, in bytes.
  *
  * @return		Non-zero to stop the stream.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/splitcomb.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/splitcomb.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/splitcomb.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/splitcomb.h	2022-02-24 07:54:38.000000000 +0000
@@ -113,7 +113,10 @@
  * @param options	    Normally is zero, but the lower 8-bit of the 
  *			    options can be used to specify the number of 
  *			    buffers in the circular buffer. If zero, then
- *			    default number will be used (default: 8).
+ *			    default number will be used (default: 8). The second
+ *			    lowest 8 bits can be used to specify the options for
+ *			    the underlying delay buffer (see
+ *			    #pjmedia_delay_buf_flag for the possible options).
  * @param p_chport	    The media port created with reverse phase for
  *			    the specified audio channel.
  *
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/stream_common.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/stream_common.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/stream_common.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/stream_common.h	2022-02-24 07:54:38.000000000 +0000
@@ -55,7 +55,48 @@
 
 } pjmedia_stream_rtp_sess_info;
 
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
 
+/**
+ * Structure of configuration settings for stream keepalive.
+ */
+typedef struct pjmedia_stream_ka_config
+{
+    /**
+     * The number of keepalive to be sent after the stream is created.
+     * When this is set to 0, keepalive will be sent once for NAT hole
+     * punching if stream's #use_ka is enabled.
+     *
+     * Default: PJMEDIA_STREAM_START_KA_CNT
+     */
+    unsigned			    start_count;
+
+    /**
+     * The keepalive sending interval after the stream is created.
+     *
+     * Default: PJMEDIA_STREAM_START_KA_INTERVAL_MSEC
+     */
+    unsigned			    start_interval;
+
+    /**
+     * The keepalive sending interval, after #start_count number keepalive 
+     * was sent.
+     * 
+     * Default: PJMEDIA_STREAM_KA_INTERVAL (seconds)
+     */
+    unsigned			    ka_interval;
+
+} pjmedia_stream_ka_config;
+
+/**
+ * Initialize the stream send keep-alive with default settings.
+ *
+ * @param cfg		Stream send keep-alive structure to be initialized.
+ */
+PJ_DECL(void)
+pjmedia_stream_ka_config_default(pjmedia_stream_ka_config *cfg);
+
+#endif
 
 /**
  * This is internal function for parsing SDP format parameter of specific
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/stream.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/stream.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/stream.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/stream.h	2022-02-24 07:54:38.000000000 +0000
@@ -85,7 +85,7 @@
  */
 typedef struct pjmedia_channel pjmedia_channel;
 
-/** 
+/**
  * This structure describes media stream information. Each media stream
  * corresponds to one "m=" line in SDP session descriptor, and it has
  * its own RTP/RTCP socket pair.
@@ -95,6 +95,7 @@
     pjmedia_type	type;	    /**< Media type (audio, video)	    */
     pjmedia_tp_proto	proto;	    /**< Transport protocol (RTP/AVP, etc.) */
     pjmedia_dir		dir;	    /**< Media direction.		    */
+    pj_sockaddr		local_addr; /**< Local RTP address		    */
     pj_sockaddr		rem_addr;   /**< Remote RTP address		    */
     pj_sockaddr		rem_rtcp;   /**< Optional remote RTCP address. If
 					 sin_family is zero, the RTP address
@@ -138,17 +139,52 @@
     int			jb_max_pre; /**< Jitter buffer maximum prefetch
 					 delay in msec (-1 for default).    */
     int			jb_max;	    /**< Jitter buffer max delay in msec.   */
+    pjmedia_jb_discard_algo jb_discard_algo;
+                                    /**< Jitter buffer discard algorithm.   */
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
     pj_bool_t		use_ka;	    /**< Stream keep-alive and NAT hole punch
 					 (see #PJMEDIA_STREAM_ENABLE_KA)
 					 is enabled?			    */
+    pjmedia_stream_ka_config ka_cfg;
+                                    /**< Stream send kep-alive settings.    */
 #endif
     pj_bool_t           rtcp_sdes_bye_disabled; 
                                     /**< Disable automatic sending of RTCP
                                          SDES and BYE.                      */
 } pjmedia_stream_info;
 
+/**
+ * This enumeration defines flags used by #pjmedia_stream_dtmf_event.
+ */
+typedef enum pjmedia_stream_dtmf_event_flags {
+    /**
+     * The event was already indicated earlier. The new indication contains an
+     * updated event duration.
+     */
+    PJMEDIA_STREAM_DTMF_IS_UPDATE = (1 << 0),
+
+    /**
+     * The event has ended and the indication contains the final event
+     * duration.
+     * Note that end indications might get lost. Hence it is not guaranteed
+     * to receive an event with PJMEDIA_STREAM_DTMF_IS_END for every event.
+     */
+    PJMEDIA_STREAM_DTMF_IS_END = (1 << 1),
+} pjmedia_stream_dtmf_event_flags;
+
+/**
+ * This structure describes DTMF telephony-events indicated through
+ * #pjmedia_stream_set_dtmf_event_callback().
+ */
+typedef struct pjmedia_stream_dtmf_event {
+    int                 digit;      /**< DTMF digit as ASCII character.     */
+    pj_uint32_t         timestamp;  /**< RTP timestamp of the event.        */
+    pj_uint16_t         duration;   /**< Event duration, in milliseconds.   */
+    pj_uint16_t         flags;      /**< Event flags (see
+                                         #pjmedia_stream_dtmf_event_flags). */
+} pjmedia_stream_dtmf_event;
+
 
 /**
  * This function will initialize the stream info based on information
@@ -401,6 +437,8 @@
  * Set callback to be called upon receiving DTMF digits. If callback is
  * registered, the stream will not buffer incoming DTMF but rather call
  * the callback as soon as DTMF digit is received completely.
+ * This callback will not be called if another callback is set via
+ * #pjmedia_stream_set_dtmf_event_callback() as well.
  *
  * @param stream	The media stream.
  * @param cb		Callback to be called upon receiving DTMF digits.
@@ -418,6 +456,26 @@
 					    int digit), 
 				 void *user_data);
 
+/**
+ * Set callback to be called upon receiving DTMF digits. If callback is
+ * registered, the stream will not buffer incoming DTMF but rather call
+ * the callback as soon as DTMF digit is received.
+ *
+ * @param stream	The media stream.
+ * @param cb		Callback to be called upon receiving DTMF digits.
+ *			See #pjmedia_stream_dtmf_event.
+ * @param user_data	User data to be returned back when the callback
+ *			is called.
+ *
+ * @return		PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t)
+pjmedia_stream_set_dtmf_event_callback(pjmedia_stream *stream,
+                                       void (*cb)(pjmedia_stream*,
+                                                  void *user_data,
+                                                  const pjmedia_stream_dtmf_event *event),
+                                       void *user_data);
+
 
 /**
  * Send RTCP SDES for the media stream.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/tonegen.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/tonegen.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/tonegen.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/tonegen.h	2022-02-24 07:54:38.000000000 +0000
@@ -200,6 +200,16 @@
 
 
 /**
+ * Instruct the tone generator to stop looping of the current tone set.
+ *
+ * @param tonegen	    The tone generator instance.
+ *
+ * @return		    PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_tonegen_stop_loop(pjmedia_port *tonegen);
+
+
+/**
  * Rewind the playback. This will start the playback to the first
  * tone in the playback list.
  *
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/transport_ice.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/transport_ice.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/transport_ice.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/transport_ice.h	2022-02-24 07:54:38.000000000 +0000
@@ -74,6 +74,25 @@
 			        pj_status_t status,
 				void *user_data);
 
+    /**
+     * Callback to report a new ICE local candidate, e.g: after successful
+     * STUN Binding, after a successful TURN allocation. Only new candidates
+     * whose type is server reflexive or relayed will be notified via this
+     * callback. This callback also indicates end-of-candidate via parameter
+     * 'last'.
+     *
+     * Trickle ICE can use this callback to convey the new candidate
+     * to remote agent and monitor end-of-candidate indication.
+     *
+     * @param tp	PJMEDIA ICE transport.
+     * @param cand	The new local candidate, can be NULL when the last
+     *			local candidate initialization failed/timeout.
+     * @param last	PJ_TRUE if this is the last of local candidate.
+     */
+    void    (*on_new_candidate)(pjmedia_transport *tp,
+				const pj_ice_sess_cand *cand,
+				pj_bool_t last);
+
 } pjmedia_ice_cb;
 
 
@@ -99,6 +118,9 @@
      */
     pj_ice_sess_role role;
 
+    pj_str_t	loc_ufrag;
+    pj_str_t	rem_ufrag;
+
     /**
      * Number of components in the component array. Before ICE negotiation
      * is complete, the number represents the number of components of the
@@ -152,7 +174,18 @@
      * are different after several packets are received.
      * Specifying this option will disable this feature.
      */
-    PJMEDIA_ICE_NO_SRC_ADDR_CHECKING = 1
+    PJMEDIA_ICE_NO_SRC_ADDR_CHECKING = 1,
+
+    /**
+     * The standard (rfc5245) specify that ice-mismatch attribute is used
+     * due to a mismatch of candidates with the default destination for media
+     * signaled in the SDP. The purpose is to identify some poorly ALGs that
+     * alter signaling information in ways that break ICE
+     * (e.g., by rewriting IP addresses in SDP). Specifying this option is
+     * to disable the ice mismatch check and allow ICE to continue
+     * if such scenario occur.
+     */
+    PJMEDIA_ICE_DISABLE_ICE_MISMATCH = 2
 };
 
 
@@ -278,6 +311,141 @@
 					       void *user_data);
 
 
+/**
+ * Check if trickle support is signalled in the specified SDP. This function
+ * will check trickle indication in the media level first, if not found, it
+ * will check in the session level.
+ *
+ * @param sdp		The SDP.
+ * @param med_idx	The media index to be checked.
+ *
+ * @return		PJ_TRUE if trickle ICE indication is found.
+ */
+PJ_DECL(pj_bool_t) pjmedia_ice_sdp_has_trickle(const pjmedia_sdp_session *sdp,
+					       unsigned med_idx);
+
+
+/**
+ * Update check list after remote ICE candidates list are received or after
+ * or local ICE candidates are conveyed. This function may also be called
+ * after end-of-candidates indication is received or conveyed. ICE
+ * connectivity checks will automatically be started if both sides have
+ * conveyed ICE info (ICE user fragment and/or candidate list).
+ *
+ * To update the check list after conveying any new local candidates,
+ * application can set the remote ICE parameters to NULL or zero. Note that
+ * the checklist should only be updated after any newly found local candidates
+ * are conveyed to remote, instead of immediately after the finding.
+ *
+ * This function is only applicable when trickle ICE is not disabled.
+ *
+ * @param tp		The ICE media transport.
+ * @param rem_ufrag	Remote ufrag, as seen in the SDP received from
+ *			the remote agent.
+ * @param rem_passwd	Remote password, as seen in the SDP received from
+ *			the remote agent.
+ * @param rcand_cnt	Number of new remote candidates in the array.
+ * @param rcand		New remote candidates array.
+ * @param rcand_end	Set to PJ_TRUE if remote has signalled
+ *			end-of-candidate.
+ *
+ * @return		PJ_SUCCESS, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjmedia_ice_trickle_update(
+					    pjmedia_transport *tp,
+					    const pj_str_t *rem_ufrag,
+					    const pj_str_t *rem_passwd,
+					    unsigned rcand_cnt,
+					    const pj_ice_sess_cand rcand[],
+					    pj_bool_t rcand_end);
+
+
+/**
+ * Decode trickle ICE info from the specified SDP.
+ *
+ * @param sdp		The SDP containing trickle ICE info.
+ * @param media_index	The media index.
+ * @param mid		Output, media ID.
+ * @param ufrag		Output, ufrag.
+ * @param passwd	Output, password.
+ * @param cand_cnt	On input, maximum number of candidate array.
+ *			On output, the number of candidates.
+ * @param cand		Output, the candidates.
+ * @param end_of_cand	Output, end of candidate indication.
+ *
+ * @return		PJ_SUCCESS, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjmedia_ice_trickle_decode_sdp(
+					    const pjmedia_sdp_session *sdp,
+					    unsigned media_index,
+					    pj_str_t *mid,
+					    pj_str_t *ufrag,
+					    pj_str_t *passwd,
+					    unsigned *cand_cnt,
+					    pj_ice_sess_cand cand[],
+					    pj_bool_t *end_of_cand);
+
+
+/**
+ * Encode trickle ICE info into the specified SDP. This function may generate
+ * the following SDP attributes:
+ * - Media ID, "a=mid".
+ * - ICE ufrag & password, "a=ice-ufrag" & "a=ice-pwd".
+ * - Trickle ICE support indication, "a=ice-options:trickle".
+ * - ICE candidates, "a=candidate".
+ * - End of candidate indication, "a=end-of-candidates".
+ *
+ * @param sdp_pool	The memory pool for generating SDP attributes.
+ * @param sdp		The SDP to be updated.
+ * @param mid		The media ID.
+ * @param ufrag		The ufrag, optional.
+ * @param passwd	The password, optional.
+ * @param cand_cnt	The number of local candidates, can be zero.
+ * @param cand		The local candidates.
+ * @param end_of_cand	End of candidate indication.
+ *
+ * @return		PJ_SUCCESS, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjmedia_ice_trickle_encode_sdp(
+					    pj_pool_t *sdp_pool,
+					    pjmedia_sdp_session *sdp,
+					    const pj_str_t *mid,
+					    const pj_str_t *ufrag,
+					    const pj_str_t *passwd,
+					    unsigned cand_cnt,
+					    const pj_ice_sess_cand cand[],
+					    pj_bool_t end_of_cand);
+
+
+/**
+ * Check if trickling ICE has found any new local candidates since the last
+ * conveyance (via pjmedia_ice_trickle_send_local_cand()).
+ *
+ * @param tp		The ICE media transport.
+ *
+ * @return		PJ_TRUE if new local canditates are available.
+ */
+PJ_DECL(pj_bool_t) pjmedia_ice_trickle_has_new_cand(pjmedia_transport *tp);
+
+
+/**
+ * Convey all local candidates via the specified SDP.
+ *
+ * @param tp		The ICE media transport.
+ * @param sdp_pool	The memory pool for generating SDP attributes.
+ * @param sdp		The SDP.
+ * @param p_end_of_cand Optional, pointer to receive the indication that
+ *			candidate gathering has been completed.
+ *
+ * @return		PJ_SUCCESS, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjmedia_ice_trickle_send_local_cand(
+					    pjmedia_transport *tp,
+					    pj_pool_t *sdp_pool,
+					    pjmedia_sdp_session *sdp,
+					    pj_bool_t *p_end_of_cand);
+
+
 PJ_END_DECL
 
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/transport_srtp.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/transport_srtp.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/transport_srtp.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/transport_srtp.h	2022-02-24 07:54:38.000000000 +0000
@@ -115,6 +115,13 @@
     PJMEDIA_SRTP_DISABLED,
 
     /**
+     * When this flag is specified, SRTP setting is unknown. This is to set
+     * the initial remote's SRTP usage. It will be set later after remote's
+     * policy in the SDP is received.
+     */
+    PJMEDIA_SRTP_UNKNOWN = PJMEDIA_SRTP_DISABLED,
+
+    /**
      * When this flag is specified, SRTP will be advertised as optional and
      * incoming SRTP offer will be accepted.
      */
@@ -172,6 +179,23 @@
 
 
 /**
+ * RTP sequence rollover counter settings.
+ */
+typedef struct pjmedia_srtp_roc
+{
+    /**
+     * The synchronization source.
+     */
+    pj_uint32_t	    ssrc;
+
+    /**
+     * The rollover counter.
+     */
+    pj_uint32_t	    roc;
+
+} pjmedia_srtp_roc;
+
+/**
  * Settings to be given when creating SRTP transport. Application should call
  * #pjmedia_srtp_setting_default() to initialize this structure with its 
  * default values.
@@ -223,6 +247,30 @@
     pjmedia_srtp_keying_method	 keying[PJMEDIA_SRTP_KEYINGS_COUNT];
 
     /**
+     * RTP sequence rollover counter initialization value for incoming
+     * direction. This is useful to maintain ROC after media transport
+     * recreation such as in IP change scenario.
+     */
+    pjmedia_srtp_roc		 rx_roc;
+
+    /**
+     * The previous value of RTP sequence rollover counter. This is
+     * useful in situations when we expect the remote to reset/maintain
+     * ROC but for some reason, they don't. Thus, when we encounter
+     * SRTP packet unprotect failure during probation, we will retry to
+     * unprotect with this ROC value as well.
+     * Set prev_rx_roc.ssrc to 0 to disable this feature.
+     */
+    pjmedia_srtp_roc		 prev_rx_roc;
+
+    /**
+     * RTP sequence rollover counter initialization value for outgoing
+     * direction. This is useful to maintain ROC after media transport
+     * recreation such as in IP change scenario.
+     */
+    pjmedia_srtp_roc		 tx_roc;
+
+    /**
      * Specify SRTP callback.
      */
     pjmedia_srtp_cb		 cb;
@@ -266,6 +314,16 @@
      */
     pjmedia_srtp_use		peer_use;
 
+    /**
+     * RTP sequence rollover counter info for incoming direction.
+     */
+    pjmedia_srtp_roc		rx_roc;
+
+    /**
+     * RTP sequence rollover counter info for outgoing direction.
+     */
+    pjmedia_srtp_roc		tx_roc;
+
 } pjmedia_srtp_info;
 
 
@@ -344,7 +402,7 @@
  * @param count	    On input, specifies the maximum length of keying method
  *		    array. On output, the number of available keying method
  *		    initialized by this function.
- * @param crypto    The SRTP keying method array output.
+ * @param keying    The SRTP keying method array output.
  *
  * @return	    PJ_SUCCESS on success.
  */
@@ -372,6 +430,31 @@
 				       pjmedia_transport **p_tp);
 
 /**
+ * Get current SRTP media transport setting.
+ *
+ * @param srtp	    The SRTP transport.
+ * @param opt	    Structure to receive the SRTP setting
+ *
+ * @return	    PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_transport_srtp_get_setting(
+				       pjmedia_transport *srtp,
+				       pjmedia_srtp_setting *opt);
+
+
+/**
+ * Modify SRTP media transport setting.
+ *
+ * @param srtp	    The SRTP transport.
+ * @param opt	    New setting
+ *
+ * @return	    PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_transport_srtp_modify_setting(
+				       pjmedia_transport *srtp,
+				       const pjmedia_srtp_setting *opt);
+
+/**
  * Get fingerprint of local DTLS-SRTP certificate.
  *
  * @param srtp	    The SRTP transport.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/vid_codec.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/vid_codec.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/vid_codec.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/vid_codec.h	2022-02-24 07:54:38.000000000 +0000
@@ -610,7 +610,6 @@
  *
  * @param mgr	    The codec manager instance. If NULL, the default codec
  *		    manager instance will be used.
- * @param pool	    The pool instance.
  * @param info	    The codec info, which default parameter's is being
  *		    updated.
  * @param param	    The new default codec parameter. Set to NULL to reset
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/vid_conf.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/vid_conf.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/vid_conf.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/vid_conf.h	2022-02-24 07:54:38.000000000 +0000
@@ -222,7 +222,7 @@
 /**
  * Enumerate occupied slots in the video conference bridge.
  *
- * @param conf		The video conference bridge.
+ * @param vid_conf		The video conference bridge.
  * @param slots		Array of slot to be filled in.
  * @param count		On input, specifies the maximum number of slot
  *			in the array. On return, it will be filled with
@@ -254,7 +254,7 @@
  * Enable unidirectional video flow from the specified source slot to
  * the specified sink slot.
  *
- * @param conf		The video conference bridge.
+ * @param vid_conf		The video conference bridge.
  * @param src_slot	Source slot.
  * @param sink_slot	Sink slot.
  * @param opt		The option, for future use, currently this must
@@ -273,7 +273,7 @@
  * Disconnect unidirectional video flow from the specified source to
  * the specified sink slot.
  *
- * @param conf		The video conference bridge.
+ * @param vid_conf		The video conference bridge.
  * @param src_slot	Source slot.
  * @param sink_slot	Sink slot.
  *
@@ -285,6 +285,23 @@
 					    unsigned sink_slot);
 
 
+/**
+ * Update or refresh port states from video port info. Some port may
+ * change its port info in the middle of a session, for example when
+ * a video stream decoder learns that incoming video size or frame rate
+ * has changed, video conference needs to be informed to update its
+ * internal states.
+ *
+ * @param vid_conf	The video conference bridge.
+ * @param slot		The media port's slot index to be updated.
+ *
+ * @return		PJ_SUCCESS on success, or the appropriate error
+ *			code.
+ */
+PJ_DECL(pj_status_t) pjmedia_vid_conf_update_port(pjmedia_vid_conf *vid_conf,
+						  unsigned slot);
+
+
 PJ_END_DECL
 
 /**
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/videodev.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/videodev.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/videodev.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/videodev.h	2022-02-24 07:54:38.000000000 +0000
@@ -163,6 +163,30 @@
 
 
 /**
+ * Enumeration of window fullscreen flags.
+ */
+typedef enum pjmedia_vid_dev_fullscreen_flag
+{
+    /**
+     * Windowed or disable fullscreen.
+     */
+    PJMEDIA_VID_DEV_WINDOWED = 0,
+
+    /**
+     * Fullscreen enabled, video mode may be changed.
+     */
+    PJMEDIA_VID_DEV_FULLSCREEN = 1,
+
+    /**
+     * Fullscreen enabled by resizing video frame to match to the desktop,
+     * video mode will not be changed.
+     */
+    PJMEDIA_VID_DEV_FULLSCREEN_DESKTOP = 2
+
+} pjmedia_vid_dev_fullscreen_flag;
+
+
+/**
  * This enumeration identifies various video device capabilities. These video
  * capabilities indicates what features are supported by the underlying
  * video device implementation.
@@ -469,10 +493,11 @@
     unsigned window_flags;
 
     /**
-     * Video window's full screen status. This setting is optional, and will only be
-     * used if PJMEDIA_VID_DEV_CAP_OUTPUT_FULLSCREEN is set in the flags.
+     * Video window's fullscreen status. This setting is optional, and will
+     * only be used if PJMEDIA_VID_DEV_CAP_OUTPUT_FULLSCREEN is set in the
+     * flags.
      */
-    pj_bool_t window_fullscreen;
+    pjmedia_vid_dev_fullscreen_flag window_fullscreen;
 
 } pjmedia_vid_dev_param;
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/vid_port.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/vid_port.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/vid_port.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/vid_port.h	2022-02-24 07:54:38.000000000 +0000
@@ -168,6 +168,18 @@
 						pjmedia_port *port);
 
 /**
+ * Unsubscribe media event notifications from the specified media port.
+ *
+ * @param vid_port	The video port.
+ * @param port		The media port whose events to be unsubscribed.
+ *
+ * @return		PJ_SUCCESS on success or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjmedia_vid_port_unsubscribe_event(
+						pjmedia_vid_port *vid_port,
+						pjmedia_port *port);
+
+/**
  * Connect the video port to a downstream (slave) media port. This operation
  * is only valid for video ports created with active interface selected.
  * Connecting a passive video port may raise an assertion.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/vid_stream.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/vid_stream.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/vid_stream.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/vid_stream.h	2022-02-24 07:54:38.000000000 +0000
@@ -152,6 +152,7 @@
     pjmedia_type	type;	    /**< Media type (audio, video)	    */
     pjmedia_tp_proto	proto;	    /**< Transport protocol (RTP/AVP, etc.) */
     pjmedia_dir		dir;	    /**< Media direction.		    */
+    pj_sockaddr		local_addr; /**< Local RTP address		    */
     pj_sockaddr		rem_addr;   /**< Remote RTP address		    */
     pj_sockaddr		rem_rtcp;   /**< Optional remote RTCP address. If
 					 sin_family is zero, the RTP address
@@ -185,6 +186,8 @@
     pj_bool_t		use_ka;	    /**< Stream keep-alive and NAT hole punch
 					 (see #PJMEDIA_STREAM_ENABLE_KA)
 					 is enabled?			    */
+    pjmedia_stream_ka_config ka_cfg;
+                                    /**< Stream send kep-alive settings.    */
 #endif
 
     pjmedia_vid_codec_info   codec_info;  /**< Incoming codec format info.  */
@@ -434,9 +437,9 @@
 
 
 /**
- * Send RTCP SDES for the media stream.
+ * Send RTCP SDES for the video stream.
  *
- * @param stream	The media stream.
+ * @param stream	The video stream.
  *
  * @return		PJ_SUCCESS on success.
  */
@@ -445,15 +448,27 @@
 
 
 /**
- * Send RTCP BYE for the media stream.
+ * Send RTCP BYE for the video stream.
  *
- * @param stream	The media stream.
+ * @param stream	The video stream.
  *
  * @return		PJ_SUCCESS on success.
  */
 PJ_DECL(pj_status_t) pjmedia_vid_stream_send_rtcp_bye(
 						pjmedia_vid_stream *stream);
 
+
+/**
+ * Send RTCP PLI for the video stream.
+ *
+ * @param stream	The video stream.
+ *
+ * @return		PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_vid_stream_send_rtcp_pli(
+						pjmedia_vid_stream *stream);
+
+
 /**
  * Get the RTP session information of the video media stream. This function 
  * can be useful for app with custom media transport to inject/filter some 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/wav_playlist.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/wav_playlist.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia/wav_playlist.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia/wav_playlist.h	2022-02-24 07:54:38.000000000 +0000
@@ -49,6 +49,8 @@
  * @param pool		Pool to create memory buffers for this port.
  * @param port_label	Optional label to set as the port name.
  * @param file_list	Array of WAV file names.
+ *			Each filename's length must be smaller than
+ * 			PJ_MAXPATH.
  * @param file_count	Number of files in the array.
  * @param ptime		The duration (in miliseconds) of each frame read
  *			from this port. If the value is zero, the default
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-audiodev/config.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-audiodev/config.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-audiodev/config.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-audiodev/config.h	2022-02-24 07:54:38.000000000 +0000
@@ -82,6 +82,14 @@
 #endif
 
 /**
+ * This setting controls whether Android Oboe audio support should be
+ * included.
+ */
+#ifndef PJMEDIA_AUDIO_DEV_HAS_OBOE
+#   define PJMEDIA_AUDIO_DEV_HAS_OBOE		0
+#endif
+
+/**
  * This setting controls whether BlackBerry 10 (BB10) audio support
  * should be included.
  */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/amr_helper.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/amr_helper.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/amr_helper.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/amr_helper.h	2022-02-24 07:54:38.000000000 +0000
@@ -887,7 +887,7 @@
 
     unsigned i, max_pkt_size;
 
-    max_pkt_size = *pkt_size;
+    max_pkt_size = (unsigned)*pkt_size;
 
     if (setting->amr_nb) {
 	SID_FT		= 8;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/and_aud_mediacodec.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/and_aud_mediacodec.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/and_aud_mediacodec.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/and_aud_mediacodec.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C)2020 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __PJMEDIA_CODEC_AND_AUD_MEDIACODEC_H__
+#define __PJMEDIA_CODEC_AND_AUD_MEDIACODEC_H__
+
+/**
+ * @file and_aud_mediacodec.h
+ * @brief Android audio MediaCodec codecs.
+ */
+
+#include <pjmedia-codec/types.h>
+
+/**
+ * @defgroup PJMEDIA_CODEC_AUD_MEDIACODEC Audio MediaCodec Codec
+ * @ingroup PJMEDIA_CODEC_CODECS
+ * @{
+ *
+ * Audio MediaCodec codec wrapper for Android.
+ *
+ * This codec wrapper contains varius codecs: i.e: AMR and AMR-WB.
+ *
+ * \section pjmedia_codec_mediacodec_AMR MediaCodec AMRNB/AMR-WB
+ *
+ * MediaCodec AMR supports 16-bit PCM audio signal with sampling rate 8000Hz,
+ * 20ms frame length and producing various bitrates that ranges from 4.75kbps
+ * to 12.2kbps.
+ * \subsection codec_setting Codec Settings
+ *
+ * General codec settings for this codec such as VAD and PLC can be
+ * manipulated through the <tt>setting</tt> field in #pjmedia_codec_param.
+ * Please see the documentation of #pjmedia_codec_param for more info.
+ * Note that MediaCodec doesn't provide internal VAD/PLC feature, they will be
+ * provided by PJMEDIA instead.
+ *
+ * \subsubsection bitrate Bitrate
+ *
+ * By default, encoding bitrate is 7400bps. This default setting can be
+ * modified using #pjmedia_codec_mgr_set_default_param() by specifying
+ * prefered AMR bitrate in field <tt>info::avg_bps</tt> of
+ * #pjmedia_codec_param. Valid bitrates could be seen in
+ * #pjmedia_codec_amrnb_bitrates.
+ *
+ * \subsubsection payload_format Payload Format
+ *
+ * There are two AMR payload format types, bandwidth-efficient and
+ * octet-aligned. Default setting is using octet-aligned. This default payload
+ * format can be modified using #pjmedia_codec_mgr_set_default_param().
+ *
+ * In #pjmedia_codec_param, payload format can be set by specifying SDP
+ * format parameters "octet-align" in the SDP "a=fmtp" attribute for
+ * decoding direction. Valid values are "0" (for bandwidth efficient mode)
+ * and "1" (for octet-aligned mode).
+ *
+ * \subsubsection mode_set Mode-Set
+ *
+ * Mode-set is used for restricting AMR modes in decoding direction.
+ *
+ * By default, no mode-set restriction applied. This default setting can be
+ * be modified using #pjmedia_codec_mgr_set_default_param().
+ *
+ * In #pjmedia_codec_param, mode-set could be specified via format parameters
+ * "mode-set" in the SDP "a=fmtp" attribute for decoding direction. Valid
+ * value is a comma separated list of modes from the set 0 - 7, e.g:
+ * "4,5,6,7". When this parameter is omitted, no mode-set restrictions applied.
+ *
+ * Here is an example of modifying AMR default codec param:
+ \code
+    pjmedia_codec_param param;
+
+    pjmedia_codec_mgr_get_default_param(.., &param);
+    ...
+    // set default encoding bitrate to the highest 12.2kbps
+    param.info.avg_bps = 12200;
+
+    // restrict decoding bitrate to 10.2kbps and 12.2kbps only
+    param.setting.dec_fmtp.param[0].name = pj_str("mode-set");
+    param.setting.dec_fmtp.param[0].val  = pj_str("6,7");
+
+    // also set to use bandwidth-efficient payload format
+    param.setting.dec_fmtp.param[1].name = pj_str("octet-align");
+    param.setting.dec_fmtp.param[1].val  = pj_str("0");
+
+    param.setting.dec_fmtp.cnt = 2;
+    ...
+    pjmedia_codec_mgr_set_default_param(.., &param);
+ \endcode
+ */
+
+PJ_BEGIN_DECL
+
+/**
+ * Initialize and register Android audio MediaCodec factory to pjmedia
+ * endpoint.
+ *
+ * @param endpt		The pjmedia endpoint.
+ *
+ * @return		PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_codec_and_media_aud_init( pjmedia_endpt *endpt );
+
+/**
+ * Unregister Android audio MediaCodec factory from pjmedia endpoint 
+ * and deinitialize the codec library.
+ *
+ * @return	    PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_codec_and_media_aud_deinit( void );
+
+PJ_END_DECL
+
+/**
+ * @}
+ */
+
+#endif	/* __PJMEDIA_CODEC_AND_AUD_MEDIACODEC_H__ */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/and_vid_mediacodec.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/and_vid_mediacodec.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/and_vid_mediacodec.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/and_vid_mediacodec.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C)2020 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __PJMEDIA_CODEC_AND_VID_MEDIACODEC_H__
+#define __PJMEDIA_CODEC_AND_VID_MEDIACODEC_H__
+
+#include <pjmedia-codec/types.h>
+#include <pjmedia/vid_codec.h>
+
+/**
+ * @file pjmedia-codec/and_vid_mediacodec.h
+ * @brief Android video Mediacodec codecs.
+ */
+
+PJ_BEGIN_DECL
+
+/**
+ * @defgroup PJMEDIA_HAS_ANDROID_MEDIACODEC Android Mediacodec Codec
+ * @ingroup PJMEDIA_CODEC_VID_CODECS
+ * @{
+ *
+ *
+ * Video MediaCodec codec wrapper for Android.
+ *
+ * This codec wrapper contains varius codecs: i.e: H.264/AVC, VP8 and VP9.
+ * The H.264 codec wrapper only supports non-interleaved packetization
+ * mode. If remote uses a different mode (e.g: single-nal), this will cause
+ * unpacketization issue and affect decoding process.
+ */
+
+/**
+ * Initialize and register Android Mediacodec video codec factory.
+ *
+ * @param mgr	    The video codec manager instance where this codec will
+ * 		    be registered to. Specify NULL to use default instance
+ * 		    (in that case, an instance of video codec manager must
+ * 		    have been created beforehand).
+ * @param pf	    Pool factory.
+ *
+ * @return	    PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_codec_and_media_vid_init(
+				    pjmedia_vid_codec_mgr *mgr,
+                                    pj_pool_factory *pf);
+
+/**
+ * Unregister Android Mediacodec video codecs factory from the video codec
+ * manager and deinitialize the codec library.
+ *
+ * @return	    PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_codec_and_media_vid_deinit(void);
+
+
+/**
+ * @}
+ */
+
+
+PJ_END_DECL
+
+#endif	/* __PJMEDIA_CODEC_AND_VID_MEDIACODEC_H__ */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/config_auto.h.in asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/config_auto.h.in
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/config_auto.h.in	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/config_auto.h.in	2022-02-24 07:54:38.000000000 +0000
@@ -94,6 +94,11 @@
 #undef PJMEDIA_HAS_BCG729
 #endif
 
+/* Android MediCodec codecs */
+#ifndef PJMEDIA_HAS_ANDROID_MEDIACODEC
+#undef PJMEDIA_HAS_ANDROID_MEDIACODEC
+#endif
+
 #endif	/* __PJMEDIA_CODEC_CONFIG_AUTO_H_ */
 
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/config.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/config.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/config.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/config.h	2022-02-24 07:54:38.000000000 +0000
@@ -144,6 +144,19 @@
 #   define PJMEDIA_HAS_G722_CODEC    1
 #endif
 
+/**
+ * Initial memory block for G.722 codec implementation.
+ */
+#ifndef PJMEDIA_POOL_LEN_G722_CODEC
+#   define PJMEDIA_POOL_LEN_G722_CODEC  1000
+#endif
+
+/**
+ * Memory increment for G.722 codec implementation.
+ */
+#ifndef PJMEDIA_POOL_INC_G722_CODEC
+#   define PJMEDIA_POOL_INC_G722_CODEC  1000
+#endif
 
 /**
  * Default G.722 codec encoder and decoder level adjustment. The G.722
@@ -571,6 +584,26 @@
 #endif
 
 /**
+ * Enable FFMPEG VPX codec (requires libvpx)
+ */
+#ifndef PJMEDIA_HAS_FFMPEG_CODEC_VP8
+#   if defined(PJMEDIA_HAS_VPX_CODEC) && PJMEDIA_HAS_VPX_CODEC != 0
+#	define PJMEDIA_HAS_FFMPEG_CODEC_VP8		0
+#   else
+#	define PJMEDIA_HAS_FFMPEG_CODEC_VP8		1
+#   endif
+#endif
+
+#ifndef PJMEDIA_HAS_FFMPEG_CODEC_VP9
+#   if defined(PJMEDIA_HAS_VPX_CODEC) && PJMEDIA_HAS_VPX_CODEC != 0
+#	define PJMEDIA_HAS_FFMPEG_CODEC_VP9		0
+#   else
+#	define PJMEDIA_HAS_FFMPEG_CODEC_VP9		1
+#   endif
+#endif
+
+
+/**
  * Determine the log level of the native openH264 log which will be forwarded
  * to the library's log.
  * Set to WELS_LOG_QUIET to disable logging, or WELS_LOG_DETAIL for debugging.
@@ -600,6 +633,86 @@
 #endif
 
 /**
+ * Enable Android MediaCodec AMRNB codec.
+ *
+ * Default: 1
+ */
+#ifndef PJMEDIA_HAS_AND_MEDIA_AMRNB
+#   define PJMEDIA_HAS_AND_MEDIA_AMRNB		1
+#endif
+
+/**
+ * Enable Android MediaCodec AMRWB codec.
+ *
+ * Default: 1
+ */
+#ifndef PJMEDIA_HAS_AND_MEDIA_AMRWB
+#   define PJMEDIA_HAS_AND_MEDIA_AMRWB		1
+#endif
+
+/**
+ * Enable Android MediaCodec AVC/H264 codec.
+ *
+ * Default: 1
+ */
+#ifndef PJMEDIA_HAS_AND_MEDIA_H264
+#   define PJMEDIA_HAS_AND_MEDIA_H264		1
+#endif
+
+/**
+ * Enable Android MediaCodec VP8 codec.
+ *
+ * Default: 1
+ */
+#ifndef PJMEDIA_HAS_AND_MEDIA_VP8
+#   define PJMEDIA_HAS_AND_MEDIA_VP8		1
+#endif
+
+/**
+ * Enable Android MediaCodec VP9 codec.
+ *
+ * Default: 1
+ */
+#ifndef PJMEDIA_HAS_AND_MEDIA_VP9
+#   define PJMEDIA_HAS_AND_MEDIA_VP9		1
+#endif
+
+/**
+ * Prioritize to use software video encoder on Android MediaCodec.
+ * Set to 0 to prioritize Hardware encoder.
+ * Note: based on test, software encoder configuration provided the most stable
+ * configuration.
+ *
+ * Default: 1
+ */
+#ifndef PJMEDIA_AND_MEDIA_PRIO_SW_VID_ENC
+#    define PJMEDIA_AND_MEDIA_PRIO_SW_VID_ENC 	1
+#endif
+
+/**
+ * Prioritize to use software video encoder on Android MediaCodec.
+ * Set to 0 to prioritize Hardware encoder.
+ * Note: based on test, software decoder configuration provided the most stable
+ * configuration.
+ *
+ * Default: 1
+ */
+#ifndef PJMEDIA_AND_MEDIA_PRIO_SW_VID_DEC
+#    define PJMEDIA_AND_MEDIA_PRIO_SW_VID_DEC 	1
+#endif
+
+
+/**
+ * Maximum interval between keyframes for Apple VideoToolbox codecs,
+ * in second.
+ *
+ * Default: 5 (seconds)
+ */
+#ifndef PJMEDIA_CODEC_VID_TOOLBOX_MAX_KEYFRAME_INTERVAL
+#   define PJMEDIA_CODEC_VID_TOOLBOX_MAX_KEYFRAME_INTERVAL	5
+#endif
+
+/**
  * @}
  */
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/types.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/types.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/types.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/types.h	2022-02-24 07:54:38.000000000 +0000
@@ -118,15 +118,19 @@
 {
      /* Video payload types */
      PJMEDIA_RTP_PT_VID_START = (PJMEDIA_RTP_PT_DYNAMIC-1),
-     PJMEDIA_RTP_PT_H263P,
-     PJMEDIA_RTP_PT_H264,
-     PJMEDIA_RTP_PT_H264_RSV1,
-     PJMEDIA_RTP_PT_H264_RSV2,
-     PJMEDIA_RTP_PT_H264_RSV3,
+     PJMEDIA_RTP_PT_H263P,      /* used by ffmpeg avcodec     */
+     PJMEDIA_RTP_PT_H264,       /* used by OpenH264           */
+     PJMEDIA_RTP_PT_H264_RSV1,  /* used by video toolbox      */
+     PJMEDIA_RTP_PT_H264_RSV2,  /* used by MediaCodec         */
+     PJMEDIA_RTP_PT_H264_RSV3,  /* used by ffmpeg avcodec     */
      PJMEDIA_RTP_PT_H264_RSV4,
 
-     PJMEDIA_RTP_PT_VP8,
-     PJMEDIA_RTP_PT_VP9,
+     PJMEDIA_RTP_PT_VP8,        /* used by VPX                */
+     PJMEDIA_RTP_PT_VP8_RSV1,   /* used by MediaCodec         */
+     PJMEDIA_RTP_PT_VP8_RSV2,
+     PJMEDIA_RTP_PT_VP9,        /* used by VPX                */
+     PJMEDIA_RTP_PT_VP9_RSV1,   /* used by MediaCodec         */
+     PJMEDIA_RTP_PT_VP9_RSV2,
 
      /* Caution!
       * Ensure the value of the last pt above is <= 127.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/vpx_packetizer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/vpx_packetizer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec/vpx_packetizer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec/vpx_packetizer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,123 @@
+/* 
+ * Copyright (C) 2020 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+#ifndef __PJMEDIA_VPX_PACKETIZER_H__
+#define __PJMEDIA_VPX_PACKETIZER_H__
+
+/**
+ * @file vpx_packetizer.h
+ * @brief Packetizes VPX bitstream into RTP payload and vice versa.
+ */
+
+#include <pj/types.h>
+
+PJ_BEGIN_DECL
+
+/**
+ * Opaque declaration for VPX packetizer.
+ */
+typedef struct pjmedia_vpx_packetizer pjmedia_vpx_packetizer;
+
+
+/**
+ * VPX packetizer setting.
+ */
+typedef struct pjmedia_vpx_packetizer_cfg
+{
+    /**
+     * VPX format id.
+     * Default: PJMEDIA_FORMAT_VP8
+     */
+    pj_uint32_t	fmt_id;
+
+    /**
+     * MTU size.
+     * Default: PJMEDIA_MAX_VID_PAYLOAD_SIZE
+     */
+    unsigned mtu;
+}
+pjmedia_vpx_packetizer_cfg;
+
+/**
+ * Use this function to initialize VPX packetizer config.
+ *
+ * @param cfg	The VPX packetizer config to be initialized.
+ */
+PJ_DECL(void) pjmedia_vpx_packetizer_cfg_default(
+					    pjmedia_vpx_packetizer_cfg *cfg);
+
+
+/**
+ * Create VPX packetizer.
+ *
+ * @param pool		The memory pool.
+ * @param cfg		Packetizer settings, if NULL, default setting
+ *			will be used.
+ * @param p_pktz	Pointer to receive the packetizer.
+ *
+ * @return		PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_vpx_packetizer_create(
+				    pj_pool_t *pool,
+				    const pjmedia_vpx_packetizer_cfg *cfg,
+				    pjmedia_vpx_packetizer **p_pktz);
+
+
+/**
+ * Generate an RTP payload from a VPX picture bitstream. Note that this
+ * function will apply in-place processing, so the bitstream may be modified
+ * during the packetization.
+ *
+ * @param pktz		The packetizer.
+ * @param bits_len	The length of the bitstream.
+ * @param bits_pos	The bitstream offset to be packetized.
+ * @param is_keyframe	The frame is keyframe.
+ * @param payload	The output payload.
+ * @param payload_len	The output payload length, on input it represents max
+ *                      payload length.
+ *
+ * @return		PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_vpx_packetize(const pjmedia_vpx_packetizer *pktz,
+					   pj_size_t bits_len,
+                                           unsigned *bits_pos,
+                                           pj_bool_t is_keyframe,
+                                           pj_uint8_t **payload,
+                                           pj_size_t *payload_len);
+
+
+/**
+ * Append an RTP payload to an VPX picture bitstream. Note that in case of
+ * noticing packet lost, application should keep calling this function with
+ * payload pointer set to NULL, as the packetizer need to update its internal
+ * state.
+ *
+ * @param pktz		    The packetizer.
+ * @param payload	    The payload to be unpacketized.
+ * @param payload_len	    The payload length.
+ * @param payload_desc_len  The payload description length.
+ *
+ * @return		    PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_vpx_unpacketize(pjmedia_vpx_packetizer *pktz,
+					     const pj_uint8_t *payload,
+                                             pj_size_t payload_len,
+					     unsigned  *payload_desc_len);
+
+PJ_END_DECL
+
+#endif	/* __PJMEDIA_VPX_PACKETIZER_H__ */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-codec.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-codec.h	2022-02-24 07:54:38.000000000 +0000
@@ -24,7 +24,8 @@
  * @file pjmedia-codec.h
  * @brief Include all codecs API in PJMEDIA-CODEC
  */
-
+#include <pjmedia-codec/and_aud_mediacodec.h>
+#include <pjmedia-codec/and_vid_mediacodec.h>
 #include <pjmedia-codec/audio_codecs.h>
 #include <pjmedia-codec/bcg729.h>
 #include <pjmedia-codec/ffmpeg_vid_codecs.h>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-videodev/avi_dev.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-videodev/avi_dev.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/include/pjmedia-videodev/avi_dev.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/include/pjmedia-videodev/avi_dev.h	2022-02-24 07:54:38.000000000 +0000
@@ -113,7 +113,7 @@
  * Retrieve the parameters set for the virtual device.
  *
  * @param id		Device ID.
- * @param prm		Structure to receive the settings.
+ * @param param		Structure to receive the settings.
  *
  * @return		PJ_SUCCESS or the appropriate error code.
  */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/avi_player.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/avi_player.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/avi_player.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/avi_player.c	2022-02-24 07:54:38.000000000 +0000
@@ -21,6 +21,7 @@
  * Default file player/writer buffer size.
  */
 #include <pjmedia/avi_stream.h>
+#include <pjmedia/alaw_ulaw.h>
 #include <pjmedia/avi.h>
 #include <pjmedia/errno.h>
 #include <pjmedia/wave.h>
@@ -397,19 +398,26 @@
             }
         } else {
             /* Check supported audio formats here */
-            if ((avi_hdr.strl_hdr[i].codec != PJMEDIA_FORMAT_PCM &&
-                 avi_hdr.strl_hdr[i].codec != PJMEDIA_FORMAT_ALAW &&
-                 avi_hdr.strl_hdr[i].codec != PJMEDIA_FORMAT_ULAW &&
-                 avi_hdr.strl_hdr[i].codec != PJMEDIA_WAVE_FMT_TAG_PCM) ||
-                avi_hdr.strf_hdr[i].strf_audio_hdr.bits_per_sample != 16)
+	    strf_audio_hdr_t *hdr = (strf_audio_hdr_t*)
+				    &avi_hdr.strf_hdr[i].strf_audio_hdr;
+            if (hdr->fmt_tag == PJMEDIA_WAVE_FMT_TAG_PCM &&
+		hdr->bits_per_sample == 16)
+	    {
+		fmt_id = PJMEDIA_FORMAT_PCM;
+	    }
+	    else if (hdr->fmt_tag == PJMEDIA_WAVE_FMT_TAG_ALAW)
+	    {
+		fmt_id = PJMEDIA_FORMAT_PCMA;
+	    }
+	    else if (hdr->fmt_tag == PJMEDIA_WAVE_FMT_TAG_ULAW)
+	    {
+		fmt_id = PJMEDIA_FORMAT_PCMU;
+	    }
+	    else
             {
                 PJ_LOG(4, (THIS_FILE, "Unsupported audio stream"));
                 continue;
             }
-            /* Normalize format ID */
-            fmt_id = avi_hdr.strl_hdr[i].codec;
-            if (avi_hdr.strl_hdr[i].codec == PJMEDIA_WAVE_FMT_TAG_PCM)
-        	fmt_id = PJMEDIA_FORMAT_PCM;
         }
 
         if (nstr > 0) {
@@ -500,7 +508,15 @@
                                       20000 /* fport[i]->usec_per_frame */,
                                       strf_hdr->bytes_per_sec * 8,
                                       strf_hdr->bytes_per_sec * 8);
-        }
+
+	    /* Set format to PCM (we will decode PCMA/U) */
+	    if (fport[i]->fmt_id == PJMEDIA_FORMAT_PCMA ||
+		fport[i]->fmt_id == PJMEDIA_FORMAT_PCMU)
+	    {
+		fport[i]->base.info.fmt.id = PJMEDIA_FORMAT_PCM;
+		fport[i]->base.info.fmt.det.aud.bits_per_sample = 16;
+	    }
+	}
 
         pj_strdup2(pool, &fport[i]->base.info.name, filename);
     }
@@ -731,6 +747,14 @@
         pj_file_setpos(fport->fd, fport->start_data, PJ_SEEK_SET);
     }
 
+    /* For PCMU/A audio stream, reduce frame size to half (temporarily). */
+    if (fport->base.info.fmt.type == PJMEDIA_TYPE_AUDIO &&
+	(fport->fmt_id == PJMEDIA_FORMAT_PCMA ||
+	 fport->fmt_id == PJMEDIA_FORMAT_PCMU))
+    {
+	frame->size >>= 1;
+    }
+
     /* Fill frame buffer. */
     size_to_read = frame->size;
     do {
@@ -822,9 +846,34 @@
         break;
 
     } while(1);
-
     frame->timestamp.u64 = fport->next_ts.u64;
     if (frame->type == PJMEDIA_FRAME_TYPE_AUDIO) {
+
+	/* Decode PCMU/A frame */
+	if (fport->fmt_id == PJMEDIA_FORMAT_PCMA ||
+	    fport->fmt_id == PJMEDIA_FORMAT_PCMU)
+	{
+	    unsigned i;
+	    pj_uint16_t *dst;
+	    pj_uint8_t *src;
+
+	    dst = (pj_uint16_t*)frame->buf + frame->size - 1;
+	    src = (pj_uint8_t*)frame->buf + frame->size - 1;
+
+	    if (fport->fmt_id == PJMEDIA_FORMAT_PCMU) {
+		for (i = 0; i < frame->size; ++i) {
+		    *dst-- = (pj_uint16_t) pjmedia_ulaw2linear(*src--);
+		}
+	    } else {
+		for (i = 0; i < frame->size; ++i) {
+		    *dst-- = (pj_uint16_t) pjmedia_alaw2linear(*src--);
+		}
+	    }
+
+	    /* Return back the frame size */
+	    frame->size <<= 1;
+	}
+
 	if (fport->usec_per_frame) {
 	    fport->next_ts.u64 += (fport->usec_per_frame *
 				   fport->base.info.fmt.det.aud.clock_rate /
@@ -848,10 +897,17 @@
 
 on_error2:
     if (status == AVI_EOF) {
+        fport->eof = PJ_TRUE;
+
         size_to_read -= size_read;
+        if (size_to_read == (pj_ssize_t)frame->size) {
+            /* Frame is empty */
+ 	    frame->type = PJMEDIA_FRAME_TYPE_NONE;
+	    frame->size = 0;
+	    return PJ_EEOF;           
+        }
         pj_bzero((char *)frame->buf + frame->size - size_to_read,
                  size_to_read);
-        fport->eof = PJ_TRUE;
 
         return PJ_SUCCESS;
     }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/clock_thread.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/clock_thread.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/clock_thread.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/clock_thread.c	2022-02-24 07:54:38.000000000 +0000
@@ -179,7 +179,7 @@
     clock->max_jump = MAX_JUMP_MSEC * clock->freq.u64 / 1000;
     clock->timestamp_inc = (unsigned)(param->usec_interval *
                                       param->clock_rate /
-				      USEC_IN_SEC);
+				      (unsigned)USEC_IN_SEC);
     clock->options = options;
     clock->cb = cb;
     clock->user_data = user_data;
@@ -266,7 +266,7 @@
                           USEC_IN_SEC;
     clock->timestamp_inc = (unsigned)(param->usec_interval *
                                       param->clock_rate /
-				      USEC_IN_SEC);
+				      (unsigned)USEC_IN_SEC);
 
     return PJ_SUCCESS;
 }
@@ -378,8 +378,10 @@
 	    (*clock->cb)(&clock->timestamp, clock->user_data);
 
 	/* Best effort way to detect if we've been destroyed in the callback */
-	if (clock->quitting)
+	if (clock->quitting) {
+	    pj_lock_release(clock->lock);
 	    break;
+	}
 
 	/* Increment timestamp */
 	clock->timestamp.u64 += clock->timestamp_inc;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/conference.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/conference.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/conference.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/conference.c	2022-02-24 07:54:38.000000000 +0000
@@ -1078,6 +1078,8 @@
 		  dst_port->transmitter_cnt < conf->max_ports);
 	pj_array_erase(src_port->listener_slots, sizeof(SLOT_TYPE), 
 		       src_port->listener_cnt, i);
+        pj_array_erase(src_port->listener_adj_level, sizeof(unsigned),
+                       src_port->listener_cnt, i);
 	--conf->connect_cnt;
 	--src_port->listener_cnt;
 	--dst_port->transmitter_cnt;
@@ -1105,6 +1107,102 @@
     return PJ_SUCCESS;
 }
 
+
+/*
+ * Disconnect port from all sources
+ */
+PJ_DEF(pj_status_t)
+pjmedia_conf_disconnect_port_from_sources( pjmedia_conf *conf,
+					   unsigned sink_slot)
+{
+    unsigned i;
+
+    /* Check arguments */
+    PJ_ASSERT_RETURN(conf && sink_slot<conf->max_ports, PJ_EINVAL);
+
+    pj_mutex_lock(conf->mutex);
+
+    /* Remove this port from transmit array of other ports. */
+    for (i=0; i<conf->max_ports; ++i) {
+	unsigned j;
+	struct conf_port *src_port;
+
+	src_port = conf->ports[i];
+
+	if (!src_port)
+	    continue;
+
+	if (src_port->listener_cnt == 0)
+	    continue;
+
+	for (j=0; j<src_port->listener_cnt; ++j) {
+	    if (src_port->listener_slots[j] == sink_slot) {
+		pj_array_erase(src_port->listener_slots, sizeof(SLOT_TYPE),
+			       src_port->listener_cnt, j);
+		pj_array_erase(src_port->listener_adj_level, sizeof(unsigned),
+			       src_port->listener_cnt, j);
+		pj_assert(conf->connect_cnt > 0);
+		--conf->connect_cnt;
+		--src_port->listener_cnt;
+		break;
+	    }
+	}
+    }
+
+    if (conf->connect_cnt == 0) {
+	pause_sound(conf);
+    }
+
+    pj_mutex_unlock(conf->mutex);
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Disconnect port from all sinks
+ */
+PJ_DEF(pj_status_t)
+pjmedia_conf_disconnect_port_from_sinks( pjmedia_conf *conf,
+					 unsigned src_slot)
+{
+    struct conf_port *src_port;
+
+    /* Check arguments */
+    PJ_ASSERT_RETURN(conf && src_slot<conf->max_ports, PJ_EINVAL);
+
+    pj_mutex_lock(conf->mutex);
+
+    /* Port must be valid. */
+    src_port = conf->ports[src_slot];
+    if (!src_port) {
+	pj_mutex_unlock(conf->mutex);
+	return PJ_EINVAL;
+    }
+
+    /* Update transmitter_cnt of ports we're transmitting to */
+    while (src_port->listener_cnt) {
+	unsigned dst_slot;
+	struct conf_port *dst_port;
+
+	dst_slot = src_port->listener_slots[src_port->listener_cnt-1];
+	dst_port = conf->ports[dst_slot];
+	--dst_port->transmitter_cnt;
+	--src_port->listener_cnt;
+	pj_assert(conf->connect_cnt > 0);
+	--conf->connect_cnt;
+    }
+
+    if (conf->connect_cnt == 0) {
+	pause_sound(conf);
+    }
+
+    pj_mutex_unlock(conf->mutex);
+
+    return PJ_SUCCESS;
+}
+
+
 /*
  * Get number of ports currently registered to the conference bridge.
  */
@@ -1129,7 +1227,6 @@
 					      unsigned port )
 {
     struct conf_port *conf_port;
-    unsigned i;
 
     /* Check arguments */
     PJ_ASSERT_RETURN(conf && port < conf->max_ports, PJ_EINVAL);
@@ -1151,43 +1248,11 @@
     conf_port->tx_setting = PJMEDIA_PORT_DISABLE;
     conf_port->rx_setting = PJMEDIA_PORT_DISABLE;
 
-    /* Remove this port from transmit array of other ports. */
-    for (i=0; i<conf->max_ports; ++i) {
-	unsigned j;
-	struct conf_port *src_port;
-
-	src_port = conf->ports[i];
-
-	if (!src_port)
-	    continue;
-
-	if (src_port->listener_cnt == 0)
-	    continue;
-
-	for (j=0; j<src_port->listener_cnt; ++j) {
-	    if (src_port->listener_slots[j] == port) {
-		pj_array_erase(src_port->listener_slots, sizeof(SLOT_TYPE),
-			       src_port->listener_cnt, j);
-		pj_assert(conf->connect_cnt > 0);
-		--conf->connect_cnt;
-		--src_port->listener_cnt;
-		break;
-	    }
-	}
-    }
-
-    /* Update transmitter_cnt of ports we're transmitting to */
-    while (conf_port->listener_cnt) {
-	unsigned dst_slot;
-	struct conf_port *dst_port;
+    /* disconnect port from all sources which are transmitting to it */
+    pjmedia_conf_disconnect_port_from_sources(conf, port);
 
-	dst_slot = conf_port->listener_slots[conf_port->listener_cnt-1];
-	dst_port = conf->ports[dst_slot];
-	--dst_port->transmitter_cnt;
-	--conf_port->listener_cnt;
-	pj_assert(conf->connect_cnt > 0);
-	--conf->connect_cnt;
-    }
+    /* disconnect port from all sinks to which it is transmitting to */
+    pjmedia_conf_disconnect_port_from_sinks(conf, port);
 
     /* Destroy resample if this conf port has it. */
     if (conf_port->rx_resample) {
@@ -1216,12 +1281,6 @@
 
     pj_mutex_unlock(conf->mutex);
 
-
-    /* Stop sound if there's no connection. */
-    if (conf->connect_cnt == 0) {
-	pause_sound(conf);
-    }
-
     return PJ_SUCCESS;
 }
 
@@ -1278,6 +1337,12 @@
 
     info->slot = slot;
     info->name = conf_port->name;
+    if (conf_port->port) {
+        pjmedia_format_copy(&info->format, &conf_port->port->info.fmt);
+    } else {
+        pj_bzero(&info->format, sizeof(info->format));
+        info->format.id = (pj_uint32_t)PJMEDIA_FORMAT_INVALID;
+    }
     info->tx_setting = conf_port->tx_setting;
     info->rx_setting = conf_port->rx_setting;
     info->listener_cnt = conf_port->listener_cnt;
@@ -1653,11 +1718,17 @@
 
     *frm_type = PJMEDIA_FRAME_TYPE_AUDIO;
 
+    /* Skip port if it is disabled */
+    if (cport->tx_setting != PJMEDIA_PORT_ENABLE) {
+	cport->tx_level = 0;
+	*frm_type = PJMEDIA_FRAME_TYPE_NONE;
+	return PJ_SUCCESS;
+    }
     /* If port is muted or nobody is transmitting to this port, 
      * transmit NULL frame. 
      */
-    if (cport->tx_setting == PJMEDIA_PORT_MUTE || cport->transmitter_cnt==0) {
-
+    else if ((cport->tx_setting == PJMEDIA_PORT_MUTE) ||
+	     (cport->transmitter_cnt == 0)) {
 	pjmedia_frame frame;
 
 	/* Clear left-over samples in tx_buffer, if any, so that it won't
@@ -1693,11 +1764,6 @@
 	cport->tx_level = 0;
 	*frm_type = PJMEDIA_FRAME_TYPE_NONE;
 	return PJ_SUCCESS;
-
-    } else if (cport->tx_setting != PJMEDIA_PORT_ENABLE) {
-	cport->tx_level = 0;
-	*frm_type = PJMEDIA_FRAME_TYPE_NONE;
-	return PJ_SUCCESS;
     }
 
     /* Reset heart-beat sample count */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/converter_libyuv.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/converter_libyuv.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/converter_libyuv.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/converter_libyuv.c	2022-02-24 07:54:38.000000000 +0000
@@ -689,7 +689,7 @@
 	    pjmedia_video_apply_fmt_param *ap = &src_fmt_info->apply_param;
 	    unsigned j;
 	    for (j = 0; j < src_fmt_info->vid_fmt_info->plane_cnt; ++j) {
-		int y = src_pos->y * ap->plane_bytes[j] / ap->strides[j] /
+		int y = src_pos->y * (int)ap->plane_bytes[j] / ap->strides[j] /
 			ap->size.h;
 		ap->planes[j] += y * ap->strides[j] + src_pos->x *
 				 ap->strides[j] / ap->size.w;
@@ -701,7 +701,7 @@
 	    unsigned j;
 	    for (j = 0; j < dst_fmt_info->vid_fmt_info->plane_cnt; ++j)
 	    {
-		int y = dst_pos->y * ap->plane_bytes[j] / ap->strides[j] /
+		int y = dst_pos->y * (int)ap->plane_bytes[j] / ap->strides[j] /
 			ap->size.h;
 		ap->planes[j] += y * ap->strides[j] + dst_pos->x *
 				 ap->strides[j] / ap->size.w;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/echo_common.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/echo_common.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/echo_common.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/echo_common.c	2022-02-24 07:54:38.000000000 +0000
@@ -146,10 +146,29 @@
 };
 #endif
 
+/*
+ * WebRTC AEC3 prototypes
+ */
+#if defined(PJMEDIA_HAS_WEBRTC_AEC3) && PJMEDIA_HAS_WEBRTC_AEC3!=0
+static struct ec_operations webrtc_aec3_op =
+{
+    "WebRTC AEC3",
+    &webrtc_aec3_create,
+    &webrtc_aec3_destroy,
+    &webrtc_aec3_reset,
+    &webrtc_aec3_cancel_echo,
+    NULL,
+    NULL,
+    &webrtc_aec3_get_stat
+};
+#endif
+
 PJ_DEF(void) pjmedia_echo_stat_default(pjmedia_echo_stat *stat)
 {
     pj_bzero(stat, sizeof(pjmedia_echo_stat));
-    stat->median = PJMEDIA_ECHO_STAT_NOT_SPECIFIED;
+    stat->delay = PJMEDIA_ECHO_STAT_NOT_SPECIFIED;
+    stat->return_loss = (double)PJMEDIA_ECHO_STAT_NOT_SPECIFIED;
+    stat->return_loss_enh = (double)PJMEDIA_ECHO_STAT_NOT_SPECIFIED;
     stat->std = PJMEDIA_ECHO_STAT_NOT_SPECIFIED;
     stat->frac_delay = (float)PJMEDIA_ECHO_STAT_NOT_SPECIFIED;
     stat->duration = PJMEDIA_ECHO_STAT_NOT_SPECIFIED;
@@ -226,6 +245,13 @@
         ec->op = &webrtc_aec_op;
 #endif
         
+#if defined(PJMEDIA_HAS_WEBRTC_AEC3) && PJMEDIA_HAS_WEBRTC_AEC3!=0
+    } else if ((options & PJMEDIA_ECHO_ALGO_MASK)==PJMEDIA_ECHO_WEBRTC_AEC3 ||
+               (options & PJMEDIA_ECHO_ALGO_MASK) == PJMEDIA_ECHO_DEFAULT)
+    {
+        ec->op = &webrtc_aec3_op;
+#endif
+
     } else {
 	ec->op = &echo_supp_op;
     }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/echo_internal.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/echo_internal.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/echo_internal.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/echo_internal.h	2022-02-24 07:54:38.000000000 +0000
@@ -97,6 +97,22 @@
                                             unsigned options,
                                             void *reserved );
 
+PJ_DECL(pj_status_t) webrtc_aec3_create(pj_pool_t *pool,
+                                        unsigned clock_rate,
+                                        unsigned channel_count,
+                                        unsigned samples_per_frame,
+                                        unsigned tail_ms,
+                                        unsigned options,
+                                        void **p_echo );
+PJ_DECL(pj_status_t) webrtc_aec3_destroy(void *state );
+PJ_DECL(pj_status_t) webrtc_aec3_get_stat(void *state,
+					  pjmedia_echo_stat *p_stat);
+PJ_DECL(void) webrtc_aec3_reset(void *state );
+PJ_DECL(pj_status_t) webrtc_aec3_cancel_echo(void *state,
+                                             pj_int16_t *rec_frm,
+                                             const pj_int16_t *play_frm,
+                                             unsigned options,
+                                             void *reserved );
 
 PJ_END_DECL
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/echo_webrtc_aec3.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/echo_webrtc_aec3.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/echo_webrtc_aec3.cpp	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/echo_webrtc_aec3.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,272 @@
+/* 
+ * Copyright (C) 2011-2021 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+
+#include <pjmedia/echo.h>
+#include <pjmedia/errno.h>
+#include <pj/assert.h>
+#include <pj/log.h>
+#include <pj/pool.h>
+#include <pj/string.h>
+
+#if defined(PJMEDIA_HAS_WEBRTC_AEC3) && PJMEDIA_HAS_WEBRTC_AEC3 != 0
+
+#ifdef _MSC_VER
+#    pragma warning(disable: 4100)    // Unreferenced parameter
+#    pragma warning(disable: 4244)    // Possible loss of data
+#endif
+
+#include "modules/audio_processing/aec3/echo_canceller3.h"
+#include "modules/audio_processing/ns/noise_suppressor.h"
+#include "modules/audio_processing/gain_controller2.h"
+#include "modules/audio_processing/audio_buffer.h"
+
+using namespace webrtc;
+
+#include "echo_internal.h"
+
+#define THIS_FILE		"echo_webrtc_aec3.cpp"
+
+typedef struct webrtc_ec
+{
+    unsigned    options;
+    unsigned	samples_per_frame;
+    unsigned    clock_rate;
+    unsigned	channel_count;
+    unsigned	frame_length;
+    unsigned	num_bands;
+
+    pj_bool_t 	get_metrics;
+    EchoControl::Metrics metrics;
+
+    EchoControl     *aec;
+    NoiseSuppressor *ns;
+    GainController2 *agc;
+    AudioBuffer     *cap_buf;
+    AudioBuffer     *rend_buf;
+} webrtc_ec;
+
+
+/*
+ * Create the AEC.
+ */
+PJ_DEF(pj_status_t) webrtc_aec3_create(pj_pool_t *pool,
+                                       unsigned clock_rate,
+                                       unsigned channel_count,
+                                       unsigned samples_per_frame,
+                                       unsigned tail_ms,
+                                       unsigned options,
+                                       void **p_echo )
+{
+    webrtc_ec *echo;
+   
+    *p_echo = NULL;
+    
+    echo = PJ_POOL_ZALLOC_T(pool, webrtc_ec);
+    PJ_ASSERT_RETURN(echo != NULL, PJ_ENOMEM);
+    
+    if (clock_rate != 16000 && clock_rate != 32000 && clock_rate != 48000) {
+    	PJ_LOG(3, (THIS_FILE, "Unsupported clock rate for WebRTC AEC3"));
+    	return PJ_ENOTSUP;
+    }
+    
+    echo->options = options;    
+    echo->channel_count = channel_count;
+    echo->samples_per_frame = samples_per_frame;
+    echo->clock_rate = clock_rate;
+    echo->frame_length = clock_rate/100;
+    echo->num_bands = clock_rate/16000;
+    
+    echo->aec = new EchoCanceller3(EchoCanceller3Config(), clock_rate,
+    				   channel_count, channel_count);
+    
+    echo->cap_buf = new AudioBuffer(clock_rate, channel_count, clock_rate,
+                        	    channel_count, clock_rate, channel_count);
+    echo->rend_buf = new AudioBuffer(clock_rate, channel_count, clock_rate,
+                       		     channel_count, clock_rate, channel_count);
+
+    if (options & PJMEDIA_ECHO_USE_NOISE_SUPPRESSOR) {
+	NsConfig cfg;
+	/* Valid values are 6, 12, 18, 21 dB */
+	cfg.target_level = NsConfig::SuppressionLevel::k12dB;
+	echo->ns = new NoiseSuppressor(cfg, clock_rate, channel_count);
+    }
+
+    if (options & PJMEDIA_ECHO_USE_GAIN_CONTROLLER) {
+	echo->agc = new GainController2();
+	echo->agc->Initialize(clock_rate);
+	
+	AudioProcessing::Config::GainController2 cfg;
+	cfg.adaptive_digital.enabled = true;
+	if (GainController2::Validate(cfg))
+	    echo->agc->ApplyConfig(cfg);
+    }
+
+    /* Done */
+    *p_echo = echo;
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Destroy AEC
+ */
+PJ_DEF(pj_status_t) webrtc_aec3_destroy(void *state )
+{
+    webrtc_ec *echo = (webrtc_ec*) state;
+    PJ_ASSERT_RETURN(echo, PJ_EINVAL);
+    
+    if (echo->aec) {
+    	delete echo->aec;
+    	echo->aec = NULL;
+    }
+    if (echo->ns) {
+    	delete echo->ns;
+    	echo->ns = NULL;
+    }
+    if (echo->agc) {
+    	delete echo->agc;
+    	echo->agc = NULL;
+    }
+    
+    if (echo->cap_buf) {
+    	delete echo->cap_buf;
+    	echo->cap_buf = NULL;
+    }    
+    if (echo->rend_buf) {
+    	delete echo->rend_buf;
+    	echo->rend_buf = NULL;
+    }
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Reset AEC
+ */
+PJ_DEF(void) webrtc_aec3_reset(void *state )
+{
+    webrtc_ec *echo = (webrtc_ec*) state;
+    
+    pj_assert(echo != NULL);
+    
+    PJ_LOG(4, (THIS_FILE, "WebRTC AEC3 reset no-op"));
+}
+
+
+/*
+ * Perform echo cancellation.
+ */
+PJ_DEF(pj_status_t) webrtc_aec3_cancel_echo(void *state,
+					    pj_int16_t *rec_frm,
+					    const pj_int16_t *play_frm,
+					    unsigned options,
+					    void *reserved )
+{
+    webrtc_ec *echo = (webrtc_ec*) state;
+    unsigned i;
+
+    PJ_UNUSED_ARG(options);
+    PJ_UNUSED_ARG(reserved);
+
+    /* Sanity checks */
+    PJ_ASSERT_RETURN(echo && rec_frm && play_frm, PJ_EINVAL);
+
+    for (i = 0; i < echo->samples_per_frame;
+    	 i += echo->frame_length)
+    {
+	StreamConfig scfg(echo->clock_rate, echo->channel_count);
+
+    	echo->cap_buf->CopyFrom(rec_frm + i, scfg);
+    	echo->rend_buf->CopyFrom(play_frm + i, scfg);
+
+    	if (echo->clock_rate > 16000) {
+      	    echo->cap_buf->SplitIntoFrequencyBands();
+      	    echo->rend_buf->SplitIntoFrequencyBands();
+    	}
+
+    	echo->aec->AnalyzeCapture(echo->cap_buf);
+      	echo->aec->AnalyzeRender(echo->rend_buf);
+      	
+      	if (echo->ns) {
+      	    echo->ns->Analyze(*echo->cap_buf);
+      	    echo->ns->Process(echo->cap_buf);
+      	}
+      	
+      	echo->aec->ProcessCapture(echo->cap_buf, false);
+
+      	if (echo->agc) {
+      	    echo->agc->Process(echo->cap_buf);
+      	}
+
+    	if (echo->clock_rate > 16000) {
+      	    echo->cap_buf->MergeFrequencyBands();
+	}
+
+     	echo->cap_buf->CopyTo(scfg, rec_frm + i);
+    }
+
+    if (echo->get_metrics) {
+    	echo->metrics = echo->aec->GetMetrics();
+    	echo->get_metrics = PJ_FALSE;
+    }
+
+    return PJ_SUCCESS;
+}
+
+
+PJ_DEF(pj_status_t) webrtc_aec3_get_stat(void *state,
+					 pjmedia_echo_stat *p_stat)
+{
+    webrtc_ec *echo = (webrtc_ec*) state;
+    unsigned i = 0;
+
+    if (!echo || !echo->aec)
+    	return PJ_EINVAL;    
+
+    /* We cannot perform get metrics here since it may cause a race
+     * condition with echo cancellation process and crash with:
+     * "Check failed: !race_checker.RaceDetected()".
+     * (The doc of EchoCanceller3 specifies that "The class is supposed
+     * to be used in a non-concurrent manner").
+     *
+     * So we just do a simple dispatch. Using mutex seems like
+     * an overkill here.
+     */
+    // echo->metrics = echo->aec->GetMetrics();
+    echo->get_metrics = PJ_TRUE;
+    while (echo->get_metrics && i < 100000) i++;
+
+    p_stat->delay = echo->metrics.delay_ms;
+    p_stat->return_loss = echo->metrics.echo_return_loss;
+    p_stat->return_loss_enh = echo->metrics.echo_return_loss_enhancement;
+
+    p_stat->name = "WebRTC AEC3";
+    p_stat->stat_info.ptr = p_stat->buf_;
+    p_stat->stat_info.slen =
+        pj_ansi_snprintf(p_stat->buf_, sizeof(p_stat->buf_),
+		     	 "WebRTC AEC3 metrics: delay=%d ms, "
+            	     	 "return loss=%.02f, return loss enh=%.02f",
+            	     	 p_stat->delay, p_stat->return_loss,
+            	     	 p_stat->return_loss_enh);
+
+    return PJ_SUCCESS;
+}
+
+
+#endif
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/echo_webrtc.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/echo_webrtc.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/echo_webrtc.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/echo_webrtc.c	2022-02-24 07:54:38.000000000 +0000
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* 
  * Copyright (C) 2011-2015 Teluu Inc. (http://www.teluu.com)
  *
@@ -357,7 +356,7 @@
 {
     webrtc_ec *echo = (webrtc_ec*) state;
 
-    if (WebRtcAec_GetDelayMetrics(echo->AEC_inst, &p_stat->median,
+    if (WebRtcAec_GetDelayMetrics(echo->AEC_inst, &p_stat->delay,
     				  &p_stat->std, &p_stat->frac_delay) != 0)
     {
         return PJ_EUNKNOWN;
@@ -369,7 +368,7 @@
         pj_ansi_snprintf(p_stat->buf_, sizeof(p_stat->buf_),
 		     	 "WebRTC delay metric: median=%d, std=%d, "
             	     	 "frac of poor delay=%.02f",
-            	     	 p_stat->median, p_stat->std, p_stat->frac_delay);
+            	     	 p_stat->delay, p_stat->std, p_stat->frac_delay);
 
     return PJ_SUCCESS;
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/endpoint.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/endpoint.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/endpoint.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/endpoint.c	2022-02-24 07:54:38.000000000 +0000
@@ -40,7 +40,9 @@
 static const pj_str_t STR_RTP_AVP = { "RTP/AVP", 7 };
 static const pj_str_t STR_SDP_NAME = { "pjmedia", 7 };
 static const pj_str_t STR_SENDRECV = { "sendrecv", 8 };
-
+static const pj_str_t STR_SENDONLY = { "sendonly", 8 };
+static const pj_str_t STR_RECVONLY = { "recvonly", 8 };
+static const pj_str_t STR_INACTIVE = { "inactive", 8 };
 
 
 /* Config to control rtpmap inclusion for static payload types */
@@ -102,6 +104,13 @@
     exit_cb		  exit_cb_list;
 };
 
+
+PJ_DEF(void)
+pjmedia_endpt_create_sdp_param_default(pjmedia_endpt_create_sdp_param *param)
+{
+    param->dir = PJMEDIA_DIR_ENCODING_DECODING;
+}
+
 /**
  * Initialize and get the instance of media endpoint.
  */
@@ -122,7 +131,8 @@
     PJ_ASSERT_RETURN(pf && p_endpt, PJ_EINVAL);
     PJ_ASSERT_RETURN(worker_cnt <= MAX_THREADS, PJ_EINVAL);
 
-    pool = pj_pool_create(pf, "med-ept", 512, 512, NULL);
+    pool = pj_pool_create(pf, "med-ept", PJMEDIA_POOL_LEN_ENDPT,
+						PJMEDIA_POOL_INC_ENDPT, NULL);
     if (!pool)
 	return PJ_ENOMEM;
 
@@ -359,7 +369,8 @@
 static pj_status_t init_sdp_media(pjmedia_sdp_media *m,
                                   pj_pool_t *pool,
                                   const pj_str_t *media_type,
-				  const pjmedia_sock_info *sock_info)
+				  const pjmedia_sock_info *sock_info,
+				  pjmedia_dir dir)
 {
     char tmp_addr[PJ_INET6_ADDRSTRLEN];
     pjmedia_sdp_attr *attr;
@@ -395,20 +406,31 @@
     }
 #endif
 
-    /* Add sendrecv attribute. */
-    attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
-    attr->name = STR_SENDRECV;
-    m->attr[m->attr_count++] = attr;
+    /* Add direction attribute. */
+    if (m->desc.port != 0) {
+	attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
+	if (dir == PJMEDIA_DIR_ENCODING) {
+	    attr->name = STR_SENDONLY;
+	} else if (dir == PJMEDIA_DIR_DECODING) {
+	    attr->name = STR_RECVONLY;
+	} else if (dir == PJMEDIA_DIR_NONE) {
+	    attr->name = STR_INACTIVE;
+	} else {
+	    attr->name = STR_SENDRECV;
+	}
+	m->attr[m->attr_count++] = attr;
+    }
 
     return PJ_SUCCESS;
 }
 
 /* Create m=audio SDP media line */
-PJ_DEF(pj_status_t) pjmedia_endpt_create_audio_sdp(pjmedia_endpt *endpt,
-                                                   pj_pool_t *pool,
-                                                   const pjmedia_sock_info *si,
-                                                   unsigned options,
-                                                   pjmedia_sdp_media **p_m)
+PJ_DEF(pj_status_t)
+pjmedia_endpt_create_audio_sdp(pjmedia_endpt *endpt,
+                               pj_pool_t *pool,
+                               const pjmedia_sock_info *si,
+                               const pjmedia_endpt_create_sdp_param *options,
+                               pjmedia_sdp_media **p_m)
 {
     const pj_str_t STR_AUDIO = { "audio", 5 };
     pjmedia_sdp_media *m;
@@ -423,8 +445,7 @@
 #endif
     unsigned used_pt_num = 0;
     unsigned used_pt[PJMEDIA_MAX_SDP_FMT];
-
-    PJ_UNUSED_ARG(options);
+    pjmedia_endpt_create_sdp_param param;
 
     /* Check that there are not too many codecs */
     PJ_ASSERT_RETURN(endpt->codec_mgr.codec_cnt <= PJMEDIA_MAX_SDP_FMT,
@@ -435,12 +456,20 @@
 	    PJMEDIA_RTP_PT_TELEPHONE_EVENTS != 0
     if (endpt->has_telephone_event) {
 	used_pt[used_pt_num++] = PJMEDIA_RTP_PT_TELEPHONE_EVENTS;
+
+#  if PJMEDIA_TELEPHONE_EVENT_ALL_CLOCKRATES==0
+	televent_num = 1;
+	televent_clockrates[0] = 8000;
+#  endif
+
     }
 #endif
 
     /* Create and init basic SDP media */
     m = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_media);
-    status = init_sdp_media(m, pool, &STR_AUDIO, si);
+    pjmedia_endpt_create_sdp_param_default(&param);
+    status = init_sdp_media(m, pool, &STR_AUDIO, si, options? options->dir:
+    			    param.dir);
     if (status != PJ_SUCCESS)
 	return status;
 
@@ -533,14 +562,13 @@
 	if (codec_param.setting.dec_fmtp.cnt > 0) {
 	    enum { MAX_FMTP_STR_LEN = 160 };
 	    char buf[MAX_FMTP_STR_LEN];
-	    unsigned buf_len = 0, ii;
+	    unsigned buf_len = 0, n, ii;
 	    pjmedia_codec_fmtp *dec_fmtp = &codec_param.setting.dec_fmtp;
 
 	    /* Print codec PT */
-	    buf_len += pj_ansi_snprintf(buf,
-					MAX_FMTP_STR_LEN - buf_len,
-					"%d",
-					pt);
+	    n = pj_ansi_snprintf(buf, MAX_FMTP_STR_LEN - buf_len,
+				 "%d", pt);
+	    buf_len = PJ_MIN(buf_len + n, MAX_FMTP_STR_LEN);
 
 	    for (ii = 0; ii < dec_fmtp->cnt; ++ii) {
 		pj_size_t test_len = 2;
@@ -552,26 +580,28 @@
 		    return PJ_ETOOBIG;
 
 		/* Print delimiter */
-		buf_len += pj_ansi_snprintf(&buf[buf_len], 
-					    MAX_FMTP_STR_LEN - buf_len,
-					    (ii == 0?" ":";"));
+		n = pj_ansi_snprintf(&buf[buf_len], 
+				     MAX_FMTP_STR_LEN - buf_len,
+				     (ii == 0?" ":";"));
+		buf_len = PJ_MIN(buf_len + n, MAX_FMTP_STR_LEN);
 
 		/* Print an fmtp param */
 		if (dec_fmtp->param[ii].name.slen)
-		    buf_len += pj_ansi_snprintf(
-					    &buf[buf_len],
-					    MAX_FMTP_STR_LEN - buf_len,
-					    "%.*s=%.*s",
-					    (int)dec_fmtp->param[ii].name.slen,
-					    dec_fmtp->param[ii].name.ptr,
-					    (int)dec_fmtp->param[ii].val.slen,
-					    dec_fmtp->param[ii].val.ptr);
+		    n = pj_ansi_snprintf(&buf[buf_len],
+					 MAX_FMTP_STR_LEN - buf_len,
+					 "%.*s=%.*s",
+					 (int)dec_fmtp->param[ii].name.slen,
+					 dec_fmtp->param[ii].name.ptr,
+					 (int)dec_fmtp->param[ii].val.slen,
+					  dec_fmtp->param[ii].val.ptr);
 		else
-		    buf_len += pj_ansi_snprintf(&buf[buf_len], 
-					    MAX_FMTP_STR_LEN - buf_len,
-					    "%.*s", 
-					    (int)dec_fmtp->param[ii].val.slen,
-					    dec_fmtp->param[ii].val.ptr);
+		    n = pj_ansi_snprintf(&buf[buf_len], 
+					 MAX_FMTP_STR_LEN - buf_len,
+					 "%.*s", 
+					 (int)dec_fmtp->param[ii].val.slen,
+					 dec_fmtp->param[ii].val.ptr);
+		
+		buf_len = PJ_MIN(buf_len + n, MAX_FMTP_STR_LEN);
 	    }
 
 	    attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
@@ -587,7 +617,8 @@
 
 	/* List clock rate of audio codecs for generating telephone-event */
 #if defined(PJMEDIA_RTP_PT_TELEPHONE_EVENTS) && \
-	    PJMEDIA_RTP_PT_TELEPHONE_EVENTS != 0
+	    PJMEDIA_RTP_PT_TELEPHONE_EVENTS != 0 && \
+	    PJMEDIA_TELEPHONE_EVENT_ALL_CLOCKRATES != 0
 	if (endpt->has_telephone_event) {
 	    unsigned j;
 
@@ -706,11 +737,12 @@
 #if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
 
 /* Create m=video SDP media line */
-PJ_DEF(pj_status_t) pjmedia_endpt_create_video_sdp(pjmedia_endpt *endpt,
-                                                   pj_pool_t *pool,
-                                                   const pjmedia_sock_info *si,
-                                                   unsigned options,
-                                                   pjmedia_sdp_media **p_m)
+PJ_DEF(pj_status_t)
+pjmedia_endpt_create_video_sdp(pjmedia_endpt *endpt,
+                               pj_pool_t *pool,
+                               const pjmedia_sock_info *si,
+                               const pjmedia_endpt_create_sdp_param *options,
+                               pjmedia_sdp_media **p_m)
 {
 
 
@@ -721,17 +753,18 @@
     pjmedia_sdp_attr *attr;
     unsigned cnt, i;
     unsigned max_bitrate = 0;
+    pjmedia_endpt_create_sdp_param param;
     pj_status_t status;
 
-    PJ_UNUSED_ARG(options);
-
     /* Make sure video codec manager is instantiated */
     if (!pjmedia_vid_codec_mgr_instance())
 	pjmedia_vid_codec_mgr_create(endpt->pool, NULL);
 
     /* Create and init basic SDP media */
+    pjmedia_endpt_create_sdp_param_default(&param);
     m = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_media);
-    status = init_sdp_media(m, pool, &STR_VIDEO, si);
+    status = init_sdp_media(m, pool, &STR_VIDEO, si, options? options->dir:
+    			    param.dir);
     if (status != PJ_SUCCESS)
 	return status;
 
@@ -764,9 +797,8 @@
 	    break;
 	}
 
-	/* Must support RTP packetization and bidirectional */
-	if ((codec_info[i].packings & PJMEDIA_VID_PACKING_PACKETS) == 0 ||
-	    codec_info[i].dir != PJMEDIA_DIR_ENCODING_DECODING)
+        /* Must support RTP packetization */
+        if ((codec_info[i].packings & PJMEDIA_VID_PACKING_PACKETS) == 0)
 	{
 	    continue;
 	}
@@ -794,14 +826,14 @@
 	if (codec_param.dec_fmtp.cnt > 0) {
 	    enum { MAX_FMTP_STR_LEN = 160 };
 	    char buf[MAX_FMTP_STR_LEN];
-	    unsigned buf_len = 0, j;
+	    unsigned buf_len = 0, n, j;
 	    pjmedia_codec_fmtp *dec_fmtp = &codec_param.dec_fmtp;
 
 	    /* Print codec PT */
-	    buf_len += pj_ansi_snprintf(buf, 
-					MAX_FMTP_STR_LEN - buf_len, 
-					"%d", 
-					codec_info[i].pt);
+	    n = pj_ansi_snprintf(buf, MAX_FMTP_STR_LEN - buf_len, 
+				 "%d", 
+				 codec_info[i].pt);
+	    buf_len = PJ_MIN(buf_len + n, MAX_FMTP_STR_LEN);
 
 	    for (j = 0; j < dec_fmtp->cnt; ++j) {
 		pj_size_t test_len = 2;
@@ -813,26 +845,28 @@
 		    return PJ_ETOOBIG;
 
 		/* Print delimiter */
-		buf_len += pj_ansi_snprintf(&buf[buf_len], 
-					    MAX_FMTP_STR_LEN - buf_len,
-					    (j == 0?" ":";"));
+		n = pj_ansi_snprintf(&buf[buf_len], 
+				     MAX_FMTP_STR_LEN - buf_len,
+				     (j == 0?" ":";"));
+	    	buf_len = PJ_MIN(buf_len + n, MAX_FMTP_STR_LEN);
 
 		/* Print an fmtp param */
 		if (dec_fmtp->param[j].name.slen)
-		    buf_len += pj_ansi_snprintf(
-					    &buf[buf_len],
-					    MAX_FMTP_STR_LEN - buf_len,
-					    "%.*s=%.*s",
-					    (int)dec_fmtp->param[j].name.slen,
-					    dec_fmtp->param[j].name.ptr,
-					    (int)dec_fmtp->param[j].val.slen,
-					    dec_fmtp->param[j].val.ptr);
+		    n = pj_ansi_snprintf(&buf[buf_len],
+					 MAX_FMTP_STR_LEN - buf_len,
+					 "%.*s=%.*s",
+					 (int)dec_fmtp->param[j].name.slen,
+					 dec_fmtp->param[j].name.ptr,
+					 (int)dec_fmtp->param[j].val.slen,
+					 dec_fmtp->param[j].val.ptr);
 		else
-		    buf_len += pj_ansi_snprintf(&buf[buf_len], 
-					    MAX_FMTP_STR_LEN - buf_len,
-					    "%.*s", 
-					    (int)dec_fmtp->param[j].val.slen,
-					    dec_fmtp->param[j].val.ptr);
+		    n = pj_ansi_snprintf(&buf[buf_len], 
+					 MAX_FMTP_STR_LEN - buf_len,
+					 "%.*s", 
+					 (int)dec_fmtp->param[j].val.slen,
+					 dec_fmtp->param[j].val.ptr);
+		
+		buf_len = PJ_MIN(buf_len + n, MAX_FMTP_STR_LEN);
 	    }
 
 	    attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/event.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/event.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/event.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/event.c	2022-02-24 07:54:38.000000000 +0000
@@ -29,6 +29,15 @@
 
 #define MAX_EVENTS 16
 
+/* Enable some tracing */
+// #define EVENT_TRACE
+
+#ifdef EVENT_TRACE
+    #define TRACE_(arg)	PJ_LOG(4, arg)
+#else
+    #define TRACE_(arg)
+#endif
+
 typedef struct esub esub;
 
 struct esub
@@ -54,6 +63,7 @@
     pj_bool_t       is_quitting;
     pj_sem_t       *sem;
     pj_mutex_t     *mutex;
+    pj_mutex_t     *cb_mutex;
     event_queue     ev_queue;
     event_queue    *pub_ev_queue;       /**< publish() event queue.     */
     esub            esub_list;          /**< list of subscribers.       */
@@ -95,6 +105,7 @@
     pj_status_t err = PJ_SUCCESS;
     esub * sub = mgr->esub_list.next;
     pjmedia_event *ev = &ev_queue->events[ev_queue->head];
+    unsigned i = 0;
 
     while (sub != &mgr->esub_list) {
         *next_sub = sub->next;
@@ -107,17 +118,28 @@
             void *user_data = sub->user_data;
             pj_status_t status;
             
-            if (rls_lock)
+            if (rls_lock) {
+                /* To make sure that event unsubscription waits
+                 * until the callback completes.
+                 */
+                pj_mutex_lock(mgr->cb_mutex);
                 pj_mutex_unlock(mgr->mutex);
+            }
+
+	    TRACE_((THIS_FILE, "Distributing event %d sub->epub %p ev->epub %p "
+	    	   "user data %p", i, sub->epub, ev->epub, sub->user_data));
 
             status = (*cb)(ev, user_data);
             if (status != PJ_SUCCESS && err == PJ_SUCCESS)
 	        err = status;
 
-            if (rls_lock)
+            if (rls_lock) {
+                pj_mutex_unlock(mgr->cb_mutex);
                 pj_mutex_lock(mgr->mutex);
+            }
         }
 	sub = *next_sub;
+	i++;
     }
     *next_sub = NULL;
 
@@ -156,7 +178,9 @@
     pj_status_t status;
 
     mgr = PJ_POOL_ZALLOC_T(pool, pjmedia_event_mgr);
-    mgr->pool = pj_pool_create(pool->factory, "evt mgr", 500, 500, NULL);
+    mgr->pool = pj_pool_create(pool->factory, "evt mgr",
+                            PJMEDIA_POOL_LEN_EVTMGR,
+                            PJMEDIA_POOL_INC_EVTMGR, NULL);
     pj_list_init(&mgr->esub_list);
     pj_list_init(&mgr->free_esub_list);
 
@@ -181,6 +205,13 @@
         return status;
     }
 
+    status = pj_mutex_create_recursive(mgr->pool, "ev_cb_mutex",
+    				       &mgr->cb_mutex);
+    if (status != PJ_SUCCESS) {
+        pjmedia_event_mgr_destroy(mgr);
+        return status;
+    }
+
     if (!event_manager_instance)
 	event_manager_instance = mgr;
 
@@ -221,6 +252,11 @@
         mgr->mutex = NULL;
     }
 
+    if (mgr->cb_mutex) {
+        pj_mutex_destroy(mgr->cb_mutex);
+        mgr->cb_mutex = NULL;
+    }
+
     if (mgr->pool)
         pj_pool_release(mgr->pool);
 
@@ -246,6 +282,7 @@
                                              void *epub)
 {
     esub *sub;
+    unsigned i = 0;
 
     PJ_ASSERT_RETURN(cb, PJ_EINVAL);
 
@@ -267,6 +304,7 @@
             return PJ_SUCCESS;
         }
 	sub = next;
+	i++;
     }
 
     if (mgr->free_esub_list.next != &mgr->free_esub_list) {
@@ -278,6 +316,10 @@
     sub->user_data = user_data;
     sub->epub = epub;
     pj_list_push_back(&mgr->esub_list, sub);
+
+    TRACE_((THIS_FILE, "Media event: subscribing event %d epub %p "
+    		       "user data %p", i, epub, user_data));
+
     pj_mutex_unlock(mgr->mutex);
 
     return PJ_SUCCESS;
@@ -290,19 +332,31 @@
                           void *epub)
 {
     esub *sub;
+    unsigned i = 0, j = 0;
 
+    PJ_UNUSED_ARG(j);
     PJ_ASSERT_RETURN(cb, PJ_EINVAL);
 
     if (!mgr) mgr = pjmedia_event_mgr_instance();
     PJ_ASSERT_RETURN(mgr, PJ_EINVAL);
 
-    pj_mutex_lock(mgr->mutex);
+    while(1) {
+    	pj_mutex_lock(mgr->mutex);
+    	if (pj_mutex_trylock(mgr->cb_mutex) == PJ_SUCCESS)
+    	    break;
+    	
+    	/* The callback is currently being called, wait for a while. */
+    	pj_mutex_unlock(mgr->mutex);
+    	pj_thread_sleep(10);
+    }
+
     sub = mgr->esub_list.next;
     while (sub != &mgr->esub_list) {
 	esub *next = sub->next;
         if (sub->cb == cb && (sub->user_data == user_data || !user_data) &&
             (sub->epub == epub || !epub))
         {
+            j = i;
             /* If the worker thread or pjmedia_event_publish() API is
              * in the process of distributing events, make sure that
              * its pointer to the next subscriber stays valid.
@@ -317,7 +371,13 @@
                 break;
         }
 	sub = next;
+	i++;
     }
+
+    TRACE_((THIS_FILE, "Media event: unsubscribing event %d/%d epub %p "
+    		       "user data %p", j, i, epub, user_data));
+
+    pj_mutex_unlock(mgr->cb_mutex);
     pj_mutex_unlock(mgr->mutex);
 
     return PJ_SUCCESS;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/ffmpeg_util.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/ffmpeg_util.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/ffmpeg_util.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/ffmpeg_util.c	2022-02-24 07:54:38.000000000 +0000
@@ -62,6 +62,8 @@
     {PJMEDIA_FORMAT_H263,	AV(CODEC_ID_H263)},
     {PJMEDIA_FORMAT_H263P,	AV(CODEC_ID_H263P)},
     {PJMEDIA_FORMAT_H264,	AV(CODEC_ID_H264)},
+    {PJMEDIA_FORMAT_VP8,	AV(CODEC_ID_VP8)},
+    {PJMEDIA_FORMAT_VP9,	AV(CODEC_ID_VP9)},
     {PJMEDIA_FORMAT_MPEG1VIDEO,	AV(CODEC_ID_MPEG1VIDEO)},
     {PJMEDIA_FORMAT_MPEG2VIDEO, AV(CODEC_ID_MPEG2VIDEO)},
     {PJMEDIA_FORMAT_MPEG4,	AV(CODEC_ID_MPEG4)},
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/format.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/format.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/format.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/format.c	2022-02-24 07:54:38.000000000 +0000
@@ -427,4 +427,64 @@
 	video_format_mgr_instance = NULL;
 }
 
+
+/*****************************************************************************
+ * FORMAT FUNCTION HELPER:
+ */
+
+/*
+ * Fill video frame buffer with black color.
+ */
+PJ_DEF(pj_status_t) pjmedia_video_format_fill_black(const pjmedia_format *fmt,
+						    void *buf,
+						    pj_size_t buf_size)
+{
+    const pjmedia_video_format_info *vfi;
+    pjmedia_video_apply_fmt_param vafp;
+    pjmedia_format_id fmt_id;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(fmt && buf && buf_size, PJ_EINVAL);
+
+    fmt_id = fmt->id;
+    vfi = pjmedia_get_video_format_info(NULL, fmt_id);
+    pj_bzero(&vafp, sizeof(vafp));
+    vafp.size = fmt->det.vid.size;
+    status = (*vfi->apply_fmt)(vfi, &vafp);
+    if (status != PJ_SUCCESS)
+	return status;
+
+    if (buf_size < vafp.framebytes)
+	return PJ_ETOOSMALL;
+
+    if (vfi->color_model == PJMEDIA_COLOR_MODEL_RGB) {
+	pj_memset(buf, 0, vafp.framebytes);
+    } else if (fmt_id == PJMEDIA_FORMAT_I420 ||
+	       fmt_id == PJMEDIA_FORMAT_YV12 ||
+	       fmt_id == PJMEDIA_FORMAT_I422)
+    {
+	pj_memset(buf, 16, vafp.plane_bytes[0]);
+	pj_memset((pj_uint8_t*)buf + vafp.plane_bytes[0], 0x80,
+		  vafp.plane_bytes[1] * 2);
+    } else if (fmt_id == PJMEDIA_FORMAT_NV12 ||
+	       fmt_id == PJMEDIA_FORMAT_NV21)
+    {
+	pj_memset(buf, 16, vafp.plane_bytes[0]);
+	pj_memset((pj_uint8_t*)buf + vafp.plane_bytes[0], 0x80,
+		  vafp.plane_bytes[1]);
+    } else if (fmt_id == PJMEDIA_FORMAT_YUY2) {
+	pj_uint8_t *ptr = (pj_uint8_t *)buf;
+	pj_size_t i;
+
+	for (i = vafp.framebytes / 2; i > 0; i--) {
+	    *(ptr++) = 0x10; *(ptr++) = 0x80;
+	}
+    } else {
+	/* Don't know how to fill it black (for now) */
+	return PJ_ENOTSUP;
+    }
+
+    return PJ_SUCCESS;
+}
+
 #endif /* PJMEDIA_HAS_VIDEO */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/jbuf.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/jbuf.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/jbuf.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/jbuf.c	2022-02-24 07:54:38.000000000 +0000
@@ -198,7 +198,7 @@
     framelist->max_count    = max_count;
     framelist->content	    = (char*)
 			      pj_pool_alloc(pool,
-					    framelist->frame_size*
+					    (pj_size_t)framelist->frame_size*
 					    framelist->max_count);
     framelist->frame_type   = (int*)
 			      pj_pool_alloc(pool,
@@ -634,7 +634,7 @@
 
     jb->jb_frame_ptime    = ptime;
     jb->jb_min_shrink_gap = PJMEDIA_JBUF_DISC_MIN_GAP / ptime;
-    jb->jb_max_burst	  = PJ_MAX(MAX_BURST_MSEC / ptime,
+    jb->jb_max_burst	  = (int)PJ_MAX(MAX_BURST_MSEC / ptime,
     				   jb->jb_max_count*3/4);
 
     return PJ_SUCCESS;
@@ -719,6 +719,8 @@
 
     jb_framelist_reset(&jb->jb_framelist);
 
+    PJ_LOG(5, (jb->jb_name.ptr, "Jitter buffer reset"));
+
     return PJ_SUCCESS;
 }
 
@@ -1191,7 +1193,7 @@
     state->frame_size = (unsigned)jb->jb_frame_size;
     state->min_prefetch = jb->jb_min_prefetch;
     state->max_prefetch = jb->jb_max_prefetch;
-    state->max_count = jb->jb_max_count;
+    state->max_count = (unsigned)jb->jb_max_count;
 
     state->burst = jb->jb_eff_level;
     state->prefetch = jb->jb_prefetch;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/mem_player.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/mem_player.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/mem_player.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/mem_player.c	2022-02-24 07:54:38.000000000 +0000
@@ -182,6 +182,7 @@
     struct mem_player *player;
     char *endpos;
     pj_size_t size_needed, size_written;
+    pj_bool_t delayed_cb = PJ_FALSE;
 
     PJ_ASSERT_RETURN(this_port->info.signature == SIGNATURE,
 		     PJ_EINVALIDOP);
@@ -190,41 +191,42 @@
 
     if (player->eof) {
 	pj_status_t status = PJ_SUCCESS;
+	pj_bool_t no_loop = (player->options & PJMEDIA_MEM_NO_LOOP);
 
 	/* Call callback, if any */
 	if (player->cb2) {
-	    pj_bool_t no_loop = (player->options & PJMEDIA_MEM_NO_LOOP);
-
 	    if (!player->subscribed) {
-	    	status = pjmedia_event_subscribe(NULL, &player_on_event,
+		pj_status_t status2;
+	    	status2 = pjmedia_event_subscribe(NULL, &player_on_event,
 	    				         player, player);
-	    	player->subscribed = (status == PJ_SUCCESS)? PJ_TRUE:
-	    			    PJ_FALSE;
+	    	player->subscribed = (status2 == PJ_SUCCESS)? PJ_TRUE:
+	    			     PJ_FALSE;
 	    }
 
 	    if (player->subscribed && player->eof != 2) {
-	    	pjmedia_event event;
-
 	    	if (no_loop) {
+	    	    pjmedia_event event;
+
 	    	    /* To prevent the callback from being called repeatedly */
 	    	    player->eof = 2;
-	    	} else {
-	    	    player->eof = PJ_FALSE;
-	    	}
-
-	    	pjmedia_event_init(&event, PJMEDIA_EVENT_CALLBACK,
-	                      	   NULL, player);
-	    	pjmedia_event_publish(NULL, player, &event,
-	                              PJMEDIA_EVENT_PUBLISH_POST_EVENT);
+
+	    	    pjmedia_event_init(&event, PJMEDIA_EVENT_CALLBACK,
+	                      	       NULL, player);
+	    	    pjmedia_event_publish(NULL, player, &event,
+					  PJMEDIA_EVENT_PUBLISH_POST_EVENT);
+		    /* Should not access player port after this since
+		     * it might have been destroyed by the callback.
+		     */
+		} else {
+		    delayed_cb = PJ_TRUE;
+		}
 	    }
 
-	    /* Should not access player port after this since
-	     * it might have been destroyed by the callback.
-	     */
-	    frame->type = PJMEDIA_FRAME_TYPE_NONE;
-	    frame->size = 0;
-	    
-	    return (no_loop? PJ_EEOF: PJ_SUCCESS);
+	    if (no_loop) {
+		frame->type = PJMEDIA_FRAME_TYPE_NONE;
+		frame->size = 0;
+		return PJ_EEOF;
+	    }
 
 	} else if (player->cb) {
 	    status = (*player->cb)(this_port, player->user_data);
@@ -234,7 +236,7 @@
 	 * return immediately (and don't try to access player port since
 	 * it might have been destroyed by the callback).
 	 */
-	if ((status != PJ_SUCCESS) || (player->options & PJMEDIA_MEM_NO_LOOP))
+	if ((status != PJ_SUCCESS) || no_loop)
 	{
 	    frame->type = PJMEDIA_FRAME_TYPE_NONE;
 	    frame->size = 0;
@@ -285,6 +287,17 @@
 
     player->timestamp.u64 += PJMEDIA_PIA_SPF(&this_port->info);
 
+    if (delayed_cb) {
+	pjmedia_event event;
+	pjmedia_event_init(&event, PJMEDIA_EVENT_CALLBACK,
+          		   NULL, player);
+	pjmedia_event_publish(NULL, player, &event,
+			      PJMEDIA_EVENT_PUBLISH_POST_EVENT);
+	/* Should not access player port after this since
+	* it might have been destroyed by the callback.
+	*/
+    }
+
     return PJ_SUCCESS;
 }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/resample_libsamplerate.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/resample_libsamplerate.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/resample_libsamplerate.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/resample_libsamplerate.c	2022-02-24 07:54:38.000000000 +0000
@@ -67,7 +67,8 @@
 					     pjmedia_resample **p_resample)
 {
     pjmedia_resample *resample;
-    int type, err;
+    int type, err, i=0;
+    enum { MAX_KICKOFF = 10 };
 
     PJ_ASSERT_RETURN(pool && p_resample && rate_in &&
 		     rate_out && samples_per_frame, PJ_EINVAL);
@@ -115,6 +116,30 @@
 	return PJMEDIA_ERROR;
     }
 
+    /* Kick off. Some initial processes may return samples less than
+     * samples_per_frame for unknown reason (lookahead buffering?), which
+     * will cause false 'extra' mechanism and introduce click noise in
+     * the whole session. So now, let's feed the engine with silent
+     * audio frames, until full frame is returned, to avoid that.
+     */
+    while (++i <= MAX_KICKOFF) {
+	SRC_DATA src_data;
+	pj_bzero(&src_data, sizeof(src_data));
+	src_data.data_in = resample->frame_in;
+	src_data.data_out = resample->frame_out;
+	src_data.input_frames = resample->in_samples;
+	src_data.output_frames = resample->out_samples;
+	src_data.src_ratio = resample->ratio;
+	src_process(resample->state, &src_data);
+	if (src_data.output_frames_gen == (int)resample->out_samples)
+	    break;
+
+	PJ_LOG(5,(THIS_FILE,
+	       "Resample kickoff #%d: output_frames_gen=%d (expected=%d)%s",
+	       i, src_data.output_frames_gen, resample->out_samples,
+	       (i==MAX_KICKOFF?", warning: kickoff failed!":"")));
+    }
+
     /* Done */
 
     PJ_LOG(5,(THIS_FILE, 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/rtcp.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/rtcp.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/rtcp.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/rtcp.c	2022-02-24 07:54:38.000000000 +0000
@@ -502,12 +502,22 @@
 
     /* Parse RTCP */
     if (common->pt == RTCP_SR) {
+        if (sizeof (pjmedia_rtcp_common) + sizeof (pjmedia_rtcp_sr) > size) {
+	    TRACE_((sess->name, "Discarding RTCP SR due to truncated size "
+	    			"%d bytes", size));
+            return;
+        }
 	sr = (pjmedia_rtcp_sr*) (((char*)pkt) + sizeof(pjmedia_rtcp_common));
 	if (common->count > 0 && size >= (sizeof(pjmedia_rtcp_sr_pkt))) {
 	    rr = (pjmedia_rtcp_rr*)(((char*)pkt) + (sizeof(pjmedia_rtcp_common)
 				    + sizeof(pjmedia_rtcp_sr)));
 	}
     } else if (common->pt == RTCP_RR && common->count > 0) {
+	if (sizeof (pjmedia_rtcp_common) + sizeof (pjmedia_rtcp_rr) > size) {
+	    TRACE_((sess->name, "Discarding RTCP RR due to truncated size "
+	    			"%d bytes", size));
+	    return;
+	}
 	rr = (pjmedia_rtcp_rr*)(((char*)pkt) + sizeof(pjmedia_rtcp_common));
 #if defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0)
     } else if (common->pt == RTCP_XR) {
@@ -757,8 +767,15 @@
 
     /* Check and get BYE reason */
     if (size > 8) {
+    	/* Make sure the BYE reason does not exceed:
+    	 * - the size of the available buffer
+    	 * - the declared reason's length
+    	 * - the actual packet size
+    	 */
 	reason.slen = PJ_MIN(sizeof(sess->stat.peer_sdes_buf_),
                              *((pj_uint8_t*)pkt+8));
+        reason.slen = PJ_MIN(reason.slen, (pj_ssize_t)(size-9));
+
 	pj_memcpy(sess->stat.peer_sdes_buf_, ((pj_uint8_t*)pkt+9),
 		  reason.slen);
 	reason.ptr = sess->stat.peer_sdes_buf_;
@@ -819,12 +836,20 @@
     p = (pj_uint8_t*)pkt;
     p_end = p + size;
     while (p < p_end) {
-	pjmedia_rtcp_common *common = (pjmedia_rtcp_common*)p;
+	pjmedia_rtcp_common *common;
 	unsigned len;
 
+	if (p + sizeof(pjmedia_rtcp_common) > p_end) {
+	    TRACE_((sess->name, "Receiving truncated RTCP packet (1)"));
+	    break;
+	}
+	common = (pjmedia_rtcp_common*)p;
+
 	len = (pj_ntohs((pj_uint16_t)common->length)+1) * 4;
-	if (p + len > p_end)
+	if (p + len > p_end) {
+	    TRACE_((sess->name, "Receiving truncated RTCP packet (2)"));
 	    break;
+	}
 
 	switch(common->pt) {
 	case RTCP_SR:
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/rtcp_fb.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/rtcp_fb.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/rtcp_fb.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/rtcp_fb.c	2022-02-24 07:54:38.000000000 +0000
@@ -172,7 +172,7 @@
 
     PJ_ASSERT_RETURN(session && buf && length && rpsi, PJ_EINVAL);
 
-    bitlen = rpsi->rpsi_bit_len + 16;
+    bitlen = (unsigned)rpsi->rpsi_bit_len + 16;
     padlen = (32 - (bitlen % 32)) % 32;
     len = (3 + (bitlen+padlen)/32) * 4;
     if (len > *length)
@@ -631,7 +631,8 @@
     if (hdr->pt != RTCP_RTPFB || hdr->count != 1)
 	return PJ_ENOTFOUND;
 
-    cnt = pj_ntohs((pj_uint16_t)hdr->length) - 2;
+    cnt = pj_ntohs((pj_uint16_t)hdr->length);
+    if (cnt > 2) cnt -= 2; else cnt = 0;
     if (length < (cnt+3)*4)
 	return PJ_ETOOSMALL;
 
@@ -663,7 +664,9 @@
     pjmedia_rtcp_common *hdr = (pjmedia_rtcp_common*) buf;
 
     PJ_ASSERT_RETURN(buf, PJ_EINVAL);
-    PJ_ASSERT_RETURN(length >= 12, PJ_ETOOSMALL);
+
+    if (length < 12)
+    	return PJ_ETOOSMALL;
 
     /* PLI uses pt==RTCP_PSFB and FMT==1 */
     if (hdr->pt != RTCP_PSFB || hdr->count != 1)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/rtcp_xr.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/rtcp_xr.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/rtcp_xr.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/rtcp_xr.c	2022-02-24 07:54:38.000000000 +0000
@@ -436,16 +436,32 @@
 	if (rb_len) {
 	    switch (rb_hdr->bt) {
 		case BT_RR_TIME:
-		    rb_rr_time = (pjmedia_rtcp_xr_rb_rr_time*) rb_hdr;
+		    if ((char*)rb_hdr + sizeof(*rb_rr_time) <=
+			(char*)pkt + size) 
+		    {
+			rb_rr_time = (pjmedia_rtcp_xr_rb_rr_time*)rb_hdr;
+		    }
 		    break;
 		case BT_DLRR:
-		    rb_dlrr = (pjmedia_rtcp_xr_rb_dlrr*) rb_hdr;
+		    if ((char*)rb_hdr + sizeof(*rb_dlrr) <=
+			(char*)pkt + size)
+		    {
+			rb_dlrr = (pjmedia_rtcp_xr_rb_dlrr*)rb_hdr;
+		    }
 		    break;
 		case BT_STATS:
-		    rb_stats = (pjmedia_rtcp_xr_rb_stats*) rb_hdr;
+		    if ((char*)rb_hdr + sizeof(*rb_stats) <=
+			(char*)pkt + size)
+		    {
+			rb_stats = (pjmedia_rtcp_xr_rb_stats*)rb_hdr;
+		    }
 		    break;
 		case BT_VOIP_METRICS:
-		    rb_voip_mtc = (pjmedia_rtcp_xr_rb_voip_mtc*) rb_hdr;
+		    if ((char*)rb_hdr + sizeof(*rb_voip_mtc) <=
+			(char*)pkt + size)
+		    {
+			rb_voip_mtc = (pjmedia_rtcp_xr_rb_voip_mtc*)rb_hdr;
+		    }
 		    break;
 		default:
 		    break;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/rtp.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/rtp.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/rtp.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/rtp.c	2022-02-24 07:54:38.000000000 +0000
@@ -113,6 +113,11 @@
 	ses->peer_ssrc = settings.peer_ssrc;
     }
 
+    PJ_LOG(5, (THIS_FILE,
+	       "pjmedia_rtp_session_init2: ses=%p, seq=%d, ts=%d, peer_ssrc=%d",
+	       ses, pj_ntohs(ses->out_hdr.seq), pj_ntohl(ses->out_hdr.ts),
+	       ses->has_peer_ssrc? ses->peer_ssrc : 0));
+
     return PJ_SUCCESS;
 }
 
@@ -185,6 +190,8 @@
 
     /* Decode RTP extension. */
     if ((*hdr)->x) {
+        if (offset + sizeof (pjmedia_rtp_ext_hdr) > (unsigned)pkt_len)
+            return PJMEDIA_RTP_EINLEN;
         dec_hdr->ext_hdr = (pjmedia_rtp_ext_hdr*)(((pj_uint8_t*)pkt) + offset);
         dec_hdr->ext = (pj_uint32_t*)(dec_hdr->ext_hdr + 1);
         dec_hdr->ext_len = pj_ntohs((dec_hdr->ext_hdr)->length);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/sdp.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/sdp.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/sdp.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/sdp.c	2022-02-24 07:54:38.000000000 +0000
@@ -50,21 +50,21 @@
 /*
  * Prototypes for line parser.
  */
-static void parse_version(pj_scanner *scanner, parse_context *ctx);
+static void parse_version(pj_scanner *scanner, volatile parse_context *ctx);
 static void parse_origin(pj_scanner *scanner, pjmedia_sdp_session *ses,
-			 parse_context *ctx);
+			 volatile parse_context *ctx);
 static void parse_time(pj_scanner *scanner, pjmedia_sdp_session *ses,
-		       parse_context *ctx);
+		       volatile parse_context *ctx);
 static void parse_generic_line(pj_scanner *scanner, pj_str_t *str,
-			       parse_context *ctx);
+			       volatile parse_context *ctx);
 static void parse_connection_info(pj_scanner *scanner, pjmedia_sdp_conn *conn,
-				  parse_context *ctx);
+				  volatile parse_context *ctx);
 static void parse_bandwidth_info(pj_scanner *scanner, pjmedia_sdp_bandw *bandw,
-				  parse_context *ctx);
+				 volatile parse_context *ctx);
 static pjmedia_sdp_attr *parse_attr(pj_pool_t *pool, pj_scanner *scanner,
-				    parse_context *ctx);
+				    volatile parse_context *ctx);
 static void parse_media(pj_scanner *scanner, pjmedia_sdp_media *med,
-			parse_context *ctx);
+			volatile parse_context *ctx);
 static void on_scanner_error(pj_scanner *scanner);
 
 /*
@@ -313,9 +313,9 @@
 
 	/* Expecting either '/' or EOF */
 	if (*scanner.curptr == '/') {
+	    /* Skip the '/' */
 	    pj_scan_get_char(&scanner);
-	    rtpmap->param.ptr = scanner.curptr;
-	    rtpmap->param.slen = scanner.end - scanner.curptr;
+	    pj_scan_get(&scanner, &cs_token, &rtpmap->param);
 	} else {
 	    rtpmap->param.slen = 0;
 	}
@@ -551,7 +551,7 @@
     						  + 10 /* 32-bit integer */
     						  + 1 /* NULL */);
     attr->value.slen = pj_ansi_snprintf(attr->value.ptr, cname->slen+18,
-    					"%d cname:%.*s", ssrc,
+    					"%u cname:%.*s", ssrc,
 			   	   	(int)cname->slen, cname->ptr);
 
     return attr;
@@ -706,7 +706,7 @@
     return p-buf;
 }
 
-static int print_media_desc( pjmedia_sdp_media *m, char *buf, int len)
+static int print_media_desc(const pjmedia_sdp_media *m, char *buf, pj_size_t len)
 {
     char *p = buf;
     char *end = buf+len;
@@ -714,7 +714,7 @@
     int printed;
 
     /* check length for the "m=" line. */
-    if (len < m->desc.media.slen+m->desc.transport.slen+12+24) {
+    if (len < (pj_size_t)m->desc.media.slen+m->desc.transport.slen+12+24) {
 	return -1;
     }
     *p++ = 'm';	    /* m= */
@@ -770,6 +770,12 @@
     return (int)(p-buf);
 }
 
+PJ_DEF(int) pjmedia_sdp_media_print(const pjmedia_sdp_media *media,
+			       char *buf, pj_size_t size)
+{
+	return print_media_desc(media, buf, size);
+}
+
 PJ_DEF(pjmedia_sdp_media*) pjmedia_sdp_media_clone(
 						 pj_pool_t *pool, 
 						 const pjmedia_sdp_media *rhs)
@@ -962,7 +968,8 @@
  * PARSERS
  */
 
-static void parse_version(pj_scanner *scanner, parse_context *ctx)
+static void parse_version(pj_scanner *scanner, 
+                          volatile parse_context *ctx)
 {
     ctx->last_error = PJMEDIA_SDP_EINVER;
 
@@ -983,7 +990,7 @@
 }
 
 static void parse_origin(pj_scanner *scanner, pjmedia_sdp_session *ses,
-			 parse_context *ctx)
+			 volatile parse_context *ctx)
 {
     pj_str_t str;
 
@@ -1029,7 +1036,7 @@
 }
 
 static void parse_time(pj_scanner *scanner, pjmedia_sdp_session *ses,
-		       parse_context *ctx)
+		       volatile parse_context *ctx)
 {
     pj_str_t str;
 
@@ -1059,7 +1066,7 @@
 }
 
 static void parse_generic_line(pj_scanner *scanner, pj_str_t *str,
-			       parse_context *ctx)
+			       volatile parse_context *ctx)
 {
     ctx->last_error = PJMEDIA_SDP_EINSDP;
 
@@ -1080,7 +1087,7 @@
 }
 
 static void parse_connection_info(pj_scanner *scanner, pjmedia_sdp_conn *conn,
-				  parse_context *ctx)
+				  volatile parse_context *ctx)
 {
     ctx->last_error = PJMEDIA_SDP_EINCONN;
 
@@ -1104,7 +1111,7 @@
 }
 
 static void parse_bandwidth_info(pj_scanner *scanner, pjmedia_sdp_bandw *bandw,
-				  parse_context *ctx)
+				 volatile parse_context *ctx)
 {
     pj_str_t str;
 
@@ -1126,7 +1133,7 @@
 }
 
 static void parse_media(pj_scanner *scanner, pjmedia_sdp_media *med,
-			parse_context *ctx)
+			volatile parse_context *ctx)
 {
     pj_str_t str;
 
@@ -1198,7 +1205,7 @@
 }
 
 static pjmedia_sdp_attr *parse_attr( pj_pool_t *pool, pj_scanner *scanner,
-				    parse_context *ctx)
+				    volatile parse_context *ctx)
 {
     pjmedia_sdp_attr *attr;
 
@@ -1317,7 +1324,7 @@
     pjmedia_sdp_bandw *bandw;
     pj_str_t dummy;
     int cur_name = 254;
-    parse_context ctx;
+    volatile parse_context ctx;
     PJ_USE_EXCEPTION;
 
     ctx.last_error = PJ_SUCCESS;
@@ -1431,8 +1438,7 @@
 	ctx.last_error = PJ_SUCCESS;
 
     }
-    PJ_CATCH_ANY {
-	
+    PJ_CATCH_ANY {		
 	PJ_PERROR(4, (THIS_FILE, ctx.last_error,
 		      "Error parsing SDP in line %d col %d",
 		      scanner.line, pj_scan_get_col(&scanner)));
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/sdp_neg.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/sdp_neg.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/sdp_neg.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/sdp_neg.c	2022-02-24 07:54:38.000000000 +0000
@@ -304,7 +304,6 @@
 {
     pjmedia_sdp_session *new_offer;
     pjmedia_sdp_session *old_offer;
-    char media_used[PJMEDIA_MAX_SDP_MEDIA];
     unsigned oi; /* old offer media index */
     pj_status_t status;
 
@@ -323,8 +322,19 @@
     /* Change state to STATE_LOCAL_OFFER */
     neg->state = PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER;
 
+    /* When there is no active local SDP in state PJMEDIA_SDP_NEG_STATE_DONE,
+     * it means that the previous initial SDP nego must have been failed,
+     * so we'll just set the local SDP offer here.
+     */
+    if (!neg->active_local_sdp) {
+	neg->initial_sdp_tmp = NULL;
+	neg->initial_sdp = pjmedia_sdp_session_clone(pool, local);
+	neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local);
+
+	return PJ_SUCCESS;
+    }
+
     /* Init vars */
-    pj_bzero(media_used, sizeof(media_used));
     old_offer = neg->active_local_sdp;
     new_offer = pjmedia_sdp_session_clone(pool, local);
 
@@ -447,7 +457,18 @@
 	neg->state = PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER;
 	neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, 
 						       neg->active_local_sdp);
-	*offer = neg->active_local_sdp;
+
+#if PJMEDIA_SDP_NEG_COMPARE_BEFORE_INC_VERSION
+    	if (pjmedia_sdp_session_cmp(neg->neg_local_sdp, 
+    				    neg->initial_sdp, 0) != PJ_SUCCESS)
+    	{
+	    neg->neg_local_sdp->origin.version++;
+    	}    
+#else
+    	neg->neg_local_sdp->origin.version++;
+#endif
+
+	*offer = neg->neg_local_sdp;
 
     } else {
 	/* We assume that we're in STATE_LOCAL_OFFER.
@@ -680,6 +701,17 @@
 	return PJMEDIA_SDPNEG_EINVANSMEDIA;
     }
 
+    /* Check if remote has rejected our offer */
+    if (answer->desc.port == 0) {
+	
+	/* Remote has rejected our offer. 
+	 * Deactivate our media too.
+	 */
+	pjmedia_sdp_media_deactivate(pool, offer);
+
+	/* Don't need to proceed */
+	return PJ_SUCCESS;
+    }
 
     /* Check that transport in the answer match our offer. */
 
@@ -694,18 +726,6 @@
     }
 
 
-    /* Check if remote has rejected our offer */
-    if (answer->desc.port == 0) {
-	
-	/* Remote has rejected our offer. 
-	 * Deactivate our media too.
-	 */
-	pjmedia_sdp_media_deactivate(pool, offer);
-
-	/* Don't need to proceed */
-	return PJ_SUCCESS;
-    }
-
     /* Ticket #1148: check if remote answer does not set port to zero when
      * offered with port zero. Let's just tolerate it.
      */
@@ -906,7 +926,7 @@
  * after receiving remote answer.
  */
 static pj_status_t process_answer(pj_pool_t *pool,
-				  pjmedia_sdp_session *offer,
+				  pjmedia_sdp_session *local_offer,
 				  pjmedia_sdp_session *answer,
 				  pj_bool_t allow_asym,
 				  pjmedia_sdp_session **p_active)
@@ -914,10 +934,14 @@
     unsigned omi = 0; /* Offer media index */
     unsigned ami = 0; /* Answer media index */
     pj_bool_t has_active = PJ_FALSE;
+    pjmedia_sdp_session *offer;
     pj_status_t status;
 
     /* Check arguments. */
-    PJ_ASSERT_RETURN(pool && offer && answer && p_active, PJ_EINVAL);
+    PJ_ASSERT_RETURN(pool && local_offer && answer && p_active, PJ_EINVAL);
+
+    /* Duplicate local offer SDP. */
+    offer = pjmedia_sdp_session_clone(pool, local_offer);
 
     /* Check that media count match between offer and answer */
     // Ticket #527, different media count is allowed for more interoperability,
@@ -1071,6 +1095,7 @@
     pjmedia_sdp_media *answer;
     const pjmedia_sdp_media *master, *slave;
     unsigned nclockrate = 0, clockrate[PJMEDIA_MAX_SDP_FMT];
+    unsigned ntel_clockrate = 0, tel_clockrate[PJMEDIA_MAX_SDP_FMT];
 
     /* If offer has zero port, just clone the offer */
     if (offer->desc.port == 0) {
@@ -1224,6 +1249,18 @@
 				if (k == nclockrate)
 				    clockrate[nclockrate++] = or_.clock_rate;
 			    } else {
+			    	unsigned k;
+
+				/* Keep track of tel-event clock rate,
+				 * to prevent duplicate.
+				 */
+				for (k=0; k<ntel_clockrate; ++k)
+				    if (tel_clockrate[k] == or_.clock_rate)
+					break;
+				if (k < ntel_clockrate)
+				    continue;
+				
+				tel_clockrate[ntel_clockrate++] = or_.clock_rate;
 				found_matching_telephone_event = 1;
 			    }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/sound_port.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/sound_port.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/sound_port.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/sound_port.c	2022-02-24 07:54:38.000000000 +0000
@@ -240,17 +240,20 @@
 		     PJ_EBUG);
 
     /* Get device caps */
-    if (snd_port->aud_param.dir & PJMEDIA_DIR_CAPTURE) {
+    if ((snd_port->aud_param.dir & PJMEDIA_DIR_CAPTURE) ||
+        (snd_port->aud_param.dir & PJMEDIA_DIR_PLAYBACK))
+    {
 	pjmedia_aud_dev_info dev_info;
+        pjmedia_aud_dev_index dev_id =
+            (snd_port->aud_param.dir & PJMEDIA_DIR_CAPTURE) ?
+            snd_port->aud_param.rec_id :
+            snd_port->aud_param.play_id;
 
-	status = pjmedia_aud_dev_get_info(snd_port->aud_param.rec_id, 
-					  &dev_info);
+	status = pjmedia_aud_dev_get_info(dev_id, &dev_info);
 	if (status != PJ_SUCCESS)
 	    return status;
 
 	snd_port->aud_caps = dev_info.caps;
-    } else {
-	snd_port->aud_caps = 0;
     }
 
     /* Process EC settings */
@@ -561,10 +564,9 @@
     pjmedia_aud_param prm;
     pj_status_t status;
 
-    /* Sound must be opened in full-duplex mode */
-    PJ_ASSERT_RETURN(snd_port && 
-		     snd_port->dir == PJMEDIA_DIR_CAPTURE_PLAYBACK,
-		     PJ_EINVALIDOP);
+    PJ_ASSERT_RETURN(snd_port &&
+                     ((snd_port->dir & PJMEDIA_DIR_CAPTURE)||
+                      (snd_port->dir & PJMEDIA_DIR_PLAYBACK)), PJ_EINVALIDOP);
 
     /* Determine whether we use device or software EC */
     if ((snd_port->prm_ec_options & PJMEDIA_ECHO_USE_SW_ECHO) == 0 &&
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/splitcomb.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/splitcomb.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/splitcomb.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/splitcomb.c	2022-02-24 07:54:38.000000000 +0000
@@ -309,6 +309,7 @@
     struct splitcomb *sc = (struct splitcomb*) splitcomb;
     struct reverse_port *rport;
     unsigned buf_cnt;
+    unsigned buf_options;
     const pjmedia_audio_format_detail *sc_afd, *p_afd;
     pjmedia_port *port;
     pj_status_t status;
@@ -352,6 +353,9 @@
     if (buf_cnt == 0)
 	buf_cnt = MAX_BUF_CNT;
 
+    /* Buffer options */
+    buf_options = (options >> 8U) & 0xFF;
+
     rport->max_burst = MAX_BURST;
     rport->max_null_frames = MAX_NULL_FRAMES;
 
@@ -361,7 +365,8 @@
 				      PJMEDIA_PIA_SPF(&port->info),
 				      p_afd->channel_count,
 				      buf_cnt * p_afd->frame_time_usec / 1000,
-				      0, &rport->buf[DIR_DOWNSTREAM].dbuf);
+				      buf_options,
+				      &rport->buf[DIR_DOWNSTREAM].dbuf);
     if (status != PJ_SUCCESS) {
 	return status;
     }
@@ -372,7 +377,8 @@
 				      PJMEDIA_PIA_SPF(&port->info),
 				      p_afd->channel_count,
 				      buf_cnt * p_afd->frame_time_usec / 1000,
-				      0, &rport->buf[DIR_UPSTREAM].dbuf);
+				      buf_options,
+				      &rport->buf[DIR_UPSTREAM].dbuf);
     if (status != PJ_SUCCESS) {
 	pjmedia_delay_buf_destroy(rport->buf[DIR_DOWNSTREAM].dbuf);
 	return status;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/stream.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/stream.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/stream.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/stream.c	2022-02-24 07:54:38.000000000 +0000
@@ -164,6 +164,7 @@
     pjmedia_jbuf	    *jb;	    /**< Jitter buffer.		    */
     char		     jb_last_frm;   /**< Last frame type from jb    */
     unsigned		     jb_last_frm_cnt;/**< Last JB frame type counter*/
+    unsigned		     soft_start_cnt;/**< Stream soft start counter */
 
     pjmedia_rtcp_session     rtcp;	    /**< RTCP for incoming RTP.	    */
 
@@ -185,6 +186,7 @@
     int			     rx_event_pt;   /**< Incoming pt for dtmf.	    */
     int			     last_dtmf;	    /**< Current digit, or -1.	    */
     pj_uint32_t		     last_dtmf_dur; /**< Start ts for cur digit.    */
+    pj_bool_t                last_dtmf_ended;
     unsigned		     rx_dtmf_count; /**< # of digits in dtmf rx buf.*/
     char		     rx_dtmf_buf[32];/**< Incoming DTMF buffer.	    */
 
@@ -192,6 +194,10 @@
     void		    (*dtmf_cb)(pjmedia_stream*, void*, int);
     void		     *dtmf_cb_user_data;
 
+    void                    (*dtmf_event_cb)(pjmedia_stream*, void*,
+                                             const pjmedia_stream_dtmf_event*);
+    void                     *dtmf_event_cb_user_data;
+
 #if defined(PJMEDIA_HANDLE_G722_MPEG_BUG) && (PJMEDIA_HANDLE_G722_MPEG_BUG!=0)
     /* Enable support to handle codecs with inconsistent clock rate
      * between clock rate in SDP/RTP & the clock rate that is actually used.
@@ -230,8 +236,16 @@
     pj_bool_t		     use_ka;	       /**< Stream keep-alive with non-
 						    codec-VAD mechanism is
 						    enabled?		    */
-    pj_timestamp	     last_frm_ts_sent; /**< Timestamp of last sending
+    unsigned	             ka_interval;      /**< The keepalive sending 
+					            interval                */
+    pj_time_val	             last_frm_ts_sent; /**< Time of last sending
 					            packet		    */
+    unsigned	             start_ka_count;   /**< The number of keep-alive
+                                                    to be sent after it is
+                                                    created                 */
+    unsigned	             start_ka_interval;/**< The keepalive sending
+                                                    interval after the stream
+                                                    is created              */
 #endif
 
     pj_sockaddr		     rem_rtp_addr;     /**< Remote RTP address	    */
@@ -518,6 +532,19 @@
 	return PJ_SUCCESS;
     }
 
+    if (stream->soft_start_cnt) {
+	if (stream->soft_start_cnt == PJMEDIA_STREAM_SOFT_START) {
+	    PJ_LOG(4,(stream->port.info.name.ptr,
+		      "Resetting jitter buffer in stream playback start"));
+	    pj_mutex_lock( stream->jb_mutex );
+	    pjmedia_jbuf_reset(stream->jb);
+	    pj_mutex_unlock( stream->jb_mutex );
+	}
+	--stream->soft_start_cnt;
+	frame->type = PJMEDIA_FRAME_TYPE_NONE;
+	return PJ_SUCCESS;
+    }
+
     /* Repeat get frame from the jitter buffer and decode the frame
      * until we have enough frames according to codec's ptime.
      */
@@ -753,7 +780,8 @@
 				     	 stream->dec_buf_count);
 		}
 	    } else if (use_dec_buf) {
-	    	stream->dec_buf_count = frame_out.size / sizeof(pj_int16_t);
+	    	stream->dec_buf_count = (unsigned)frame_out.size /
+									sizeof(pj_int16_t);
 	    }
 
 	    if (stream->jb_last_frm != frame_type) {
@@ -1305,24 +1333,27 @@
      */
     if (stream->use_ka)
     {
-	pj_uint32_t dtx_duration;
+        pj_uint32_t dtx_duration, ka_interval;
+	pj_time_val now, tmp;
 
-	dtx_duration = pj_timestamp_diff32(&stream->last_frm_ts_sent,
-					   &frame->timestamp);
-	if (dtx_duration >
-	    PJMEDIA_STREAM_KA_INTERVAL * PJMEDIA_PIA_SRATE(&stream->port.info))
-	{
-	    send_keep_alive_packet(stream);
-	    stream->last_frm_ts_sent = frame->timestamp;
-	}
-    }
-#endif
+	pj_gettimeofday(&now);
+	tmp = now;
+	PJ_TIME_VAL_SUB(tmp, stream->last_frm_ts_sent);
+	dtx_duration = PJ_TIME_VAL_MSEC(tmp);
+        if (stream->start_ka_count) {
+            ka_interval = stream->start_ka_interval;
+        }  else {
+            ka_interval = stream->ka_interval * 1000;
+        }
+        if (dtx_duration > ka_interval) {
+            send_keep_alive_packet(stream);
+            stream->last_frm_ts_sent = now;
 
-    /* Don't do anything if stream is paused */
-    if (channel->paused) {
-	stream->enc_buf_pos = stream->enc_buf_count = 0;
-	return PJ_SUCCESS;
+            if (stream->start_ka_count)
+                stream->start_ka_count--;
+        }
     }
+#endif
 
     /* Number of samples in the frame */
     if (frame->type == PJMEDIA_FRAME_TYPE_AUDIO)
@@ -1334,9 +1365,6 @@
     else
 	ts_len = 0;
 
-    /* Increment transmit duration */
-    stream->tx_duration += ts_len;
-
 #if defined(PJMEDIA_HANDLE_G722_MPEG_BUG) && (PJMEDIA_HANDLE_G722_MPEG_BUG!=0)
     /* Handle special case for audio codec with RTP timestamp inconsistence
      * e.g: G722, MPEG audio.
@@ -1349,6 +1377,23 @@
     rtp_ts_len = ts_len;
 #endif
 
+    /* Don't do anything if stream is paused, except updating RTP timestamp */
+    if (channel->paused) {
+	stream->enc_buf_pos = stream->enc_buf_count = 0;
+
+	/* Update RTP session's timestamp. */
+	status = pjmedia_rtp_encode_rtp( &channel->rtp, 0, 0, 0, rtp_ts_len,
+					 NULL, NULL);
+
+	/* Update RTCP stats with last RTP timestamp. */
+	stream->rtcp.stat.rtp_tx_last_ts = pj_ntohl(channel->rtp.out_hdr.ts);
+
+	return PJ_SUCCESS;
+    }
+
+    /* Increment transmit duration */
+    stream->tx_duration += ts_len;
+
     /* Init frame_out buffer. */
     frame_out.buf = ((char*)channel->out_pkt) + sizeof(pjmedia_rtp_hdr);
     frame_out.size = 0;
@@ -1426,7 +1471,6 @@
 					 (const void**)&rtphdr,
 					 &rtphdrlen);
 
-
     /* Encode audio frame */
     } else if ((frame->type == PJMEDIA_FRAME_TYPE_AUDIO &&
 	        frame->buf != NULL) ||
@@ -1529,8 +1573,8 @@
     stream->rtcp.stat.rtp_tx_last_seq = pj_ntohs(stream->enc->rtp.out_hdr.seq);
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
-    /* Update timestamp of last sending packet. */
-    stream->last_frm_ts_sent = frame->timestamp;
+    /* Update time of last sending packet. */
+    pj_gettimeofday(&stream->last_frm_ts_sent);
 #endif
 
     return PJ_SUCCESS;
@@ -1677,9 +1721,14 @@
  * Handle incoming DTMF digits.
  */
 static void handle_incoming_dtmf( pjmedia_stream *stream,
+                                  const pj_timestamp *timestamp,
 				  const void *payload, unsigned payloadlen)
 {
     pjmedia_rtp_dtmf_event *event = (pjmedia_rtp_dtmf_event*) payload;
+    pj_uint16_t event_duration;
+    pjmedia_stream_dtmf_event dtmf_event;
+    pj_bool_t is_event_end;
+    pj_bool_t emit_event;
 
     /* Check compiler packing. */
     pj_assert(sizeof(pjmedia_rtp_dtmf_event)==4);
@@ -1690,16 +1739,6 @@
 
     //dump_bin(payload, payloadlen);
 
-    /* Check if this is the same/current digit of the last packet. */
-    if (stream->last_dtmf != -1 &&
-	event->event == stream->last_dtmf &&
-	pj_ntohs(event->duration) >= stream->last_dtmf_dur)
-    {
-	/* Yes, this is the same event. */
-	stream->last_dtmf_dur = pj_ntohs(event->duration);
-	return;
-    }
-
     /* Ignore unknown event. */
 #if defined(PJMEDIA_HAS_DTMF_FLASH) && PJMEDIA_HAS_DTMF_FLASH!= 0
     if (event->event > 16) {
@@ -1712,22 +1751,68 @@
 	return;
     }
 
+    /* Extract event data. */
+    event_duration = pj_ntohs(event->duration);
+    is_event_end = (event->e_vol & PJMEDIA_RTP_DTMF_EVENT_END_MASK) != 0;
+
+    /* Check if this is the same/current digit of the last packet. */
+    if (stream->last_dtmf != -1 &&
+	event->event == stream->last_dtmf &&
+	event_duration >= stream->last_dtmf_dur)
+    {
+        /* Emit all updates but hide duplicate end frames. */
+        emit_event = !is_event_end || stream->last_dtmf_ended != is_event_end;
+
+	/* Yes, this is the same event. */
+	stream->last_dtmf_dur = event_duration;
+        stream->last_dtmf_ended = is_event_end;
+
+        /* If DTMF callback is installed and end of event hasn't been reported
+         * already, call it.
+         */
+        if (stream->dtmf_event_cb && emit_event) {
+            dtmf_event.digit = digitmap[event->event];
+            dtmf_event.timestamp = (pj_uint32_t)(timestamp->u64 /
+                (stream->codec_param.info.clock_rate / 1000));
+            dtmf_event.duration = (pj_uint16_t)(event_duration /
+                (stream->codec_param.info.clock_rate / 1000));
+            dtmf_event.flags = PJMEDIA_STREAM_DTMF_IS_UPDATE;
+            if (is_event_end) {
+                dtmf_event.flags |= PJMEDIA_STREAM_DTMF_IS_END;
+            }
+            stream->dtmf_event_cb(stream, stream->dtmf_event_cb_user_data,
+                                  &dtmf_event);
+        }
+	return;
+    }
+
     /* New event! */
     PJ_LOG(5,(stream->port.info.name.ptr, "Received DTMF digit %c, vol=%d",
     	      digitmap[event->event],
-    	      (event->e_vol & 0x3F)));
+    	      (event->e_vol & PJMEDIA_RTP_DTMF_EVENT_VOLUME_MASK)));
 
     stream->last_dtmf = event->event;
-    stream->last_dtmf_dur = pj_ntohs(event->duration);
+    stream->last_dtmf_dur = event_duration;
+    stream->last_dtmf_ended = is_event_end;
 
     /* If DTMF callback is installed, call the callback, otherwise keep
      * the DTMF digits in the buffer.
      */
-    if (stream->dtmf_cb) {
-
+    if (stream->dtmf_event_cb) {
+        dtmf_event.digit = digitmap[event->event];
+        dtmf_event.timestamp = (pj_uint32_t)(timestamp->u64 /
+            (stream->codec_param.info.clock_rate / 1000));
+        dtmf_event.duration = (pj_uint16_t)(event_duration /
+            (stream->codec_param.info.clock_rate / 1000));
+        dtmf_event.flags = 0;
+        if (is_event_end) {
+            dtmf_event.flags |= PJMEDIA_STREAM_DTMF_IS_END;
+        }
+        stream->dtmf_event_cb(stream, stream->dtmf_event_cb_user_data,
+                              &dtmf_event);
+    } else if (stream->dtmf_cb) {
 	stream->dtmf_cb(stream, stream->dtmf_cb_user_data,
 			digitmap[event->event]);
-
     } else {
 	/* By convention, we use jitter buffer's mutex to access shared
 	 * DTMF variables.
@@ -1782,7 +1867,7 @@
 	return;
     }
 
-    /* Ignore keep-alive packets */
+    /* Ignore non-RTP keep-alive packets */
     if (bytes_read < (pj_ssize_t) sizeof(pjmedia_rtp_hdr))
 	return;
 
@@ -1799,25 +1884,88 @@
     if (stream->si.rtcp_mux && hdr->pt >= 64 && hdr->pt <= 95) {
     	on_rx_rtcp(stream, pkt, bytes_read);
     	return;
+    }    
+
+    /* See if source address of RTP packet is different than the
+     * configured address, and check if we need to tell the
+     * media transport to switch RTP remote address.
+     */
+    if (param->src_addr) {
+	pj_uint32_t peer_ssrc = channel->rtp.peer_ssrc;
+	pj_bool_t badssrc = PJ_FALSE;
+
+	/* Check SSRC. */
+	if (!channel->rtp.has_peer_ssrc && peer_ssrc == 0)
+	    peer_ssrc = pj_ntohl(hdr->ssrc);
+
+	if ((stream->si.has_rem_ssrc) && (pj_ntohl(hdr->ssrc) != peer_ssrc)) {
+	    badssrc = PJ_TRUE;
+	}
+
+	if (pj_sockaddr_cmp(&stream->rem_rtp_addr, param->src_addr) == 0) {
+	    /* We're still receiving from rem_rtp_addr. */
+	    stream->rtp_src_cnt = 0;
+	    stream->rem_rtp_flag = badssrc? 2: 1;
+	} else {
+	    stream->rtp_src_cnt++;
+
+	    if (stream->rtp_src_cnt < PJMEDIA_RTP_NAT_PROBATION_CNT) {
+	    	if (stream->rem_rtp_flag == 1 ||
+	    	    (stream->rem_rtp_flag == 2 && badssrc))
+	    	{
+		    /* Only discard if:
+		     * - we have ever received packet with good ssrc from
+		     *   remote address (rem_rtp_addr), or
+		     * - we have ever received packet with bad ssrc from
+		     *   remote address and this packet also has bad ssrc.
+		     */
+	    	    return;	    	    
+	    	}
+	    	if (!badssrc && stream->rem_rtp_flag != 1)
+	    	{
+	    	    /* Immediately switch if we receive packet with the
+	    	     * correct ssrc AND we never receive packets with
+	    	     * good ssrc from rem_rtp_addr.
+	    	     */
+	    	    param->rem_switch = PJ_TRUE;
+	    	}
+	    } else {
+	        /* Switch. We no longer receive packets from rem_rtp_addr. */
+	        param->rem_switch = PJ_TRUE;
+	    }
+
+	    if (param->rem_switch) {
+		/* Set remote RTP address to source address */
+		pj_sockaddr_cp(&stream->rem_rtp_addr, param->src_addr);
+
+		/* Reset counter and flag */
+		stream->rtp_src_cnt = 0;
+		stream->rem_rtp_flag = badssrc? 2: 1;
+
+		/* Update RTCP peer ssrc */
+	    	stream->rtcp.peer_ssrc = pj_ntohl(hdr->ssrc);
+	    }
+	}
     }
 
-    /* Ignore the packet if decoder is paused */
     pj_bzero(&seq_st, sizeof(seq_st));
-    if (channel->paused)
+    /* Ignore the packet if decoder is paused */
+    if (channel->paused) {
 	goto on_return;
+    }
 
     /* Update RTP session (also checks if RTP session can accept
      * the incoming packet.
      */
     check_pt = (hdr->pt != stream->rx_event_pt) && PJMEDIA_STREAM_CHECK_RTP_PT;
     pjmedia_rtp_session_update2(&channel->rtp, hdr, &seq_st, check_pt);
-#if !PJMEDIA_STREAM_CHECK_RTP_PT 
+#if !PJMEDIA_STREAM_CHECK_RTP_PT
     if (!check_pt && hdr->pt != channel->rtp.out_pt &&
-	hdr->pt != stream->rx_event_pt) 
-    { 
-	seq_st.status.flag.badpt = 1; 
-    } 
-#endif 
+	hdr->pt != stream->rx_event_pt)
+    {
+	seq_st.status.flag.badpt = 1;
+    }
+#endif
     if (seq_st.status.value) {
 	TRC_  ((stream->port.info.name.ptr,
 		"RTP status: badpt=%d, badssrc=%d, dup=%d, "
@@ -1859,6 +2007,8 @@
 
     /* Handle incoming DTMF. */
     if (hdr->pt == stream->rx_event_pt) {
+        pj_timestamp ts;
+
 	/* Ignore out-of-order packet as it will be detected as new
 	 * digit. Also ignore duplicate packet as it serves no use.
 	 */
@@ -1866,64 +2016,11 @@
 	    goto on_return;
 	}
 
-	handle_incoming_dtmf(stream, payload, payloadlen);
-	goto on_return;
-    }
-
-    /* See if source address of RTP packet is different than the
-     * configured address, and check if we need to tell the
-     * media transport to switch RTP remote address.
-     */
-    if (param->src_addr) {
-        pj_bool_t badssrc = (stream->si.has_rem_ssrc &&
-        		     seq_st.status.flag.badssrc);
-
-	if (pj_sockaddr_cmp(&stream->rem_rtp_addr, param->src_addr) == 0) {
-	    /* We're still receiving from rem_rtp_addr. */
-	    stream->rtp_src_cnt = 0;
-	    stream->rem_rtp_flag = badssrc? 2: 1;
-	} else {
-	    stream->rtp_src_cnt++;
-
-	    if (stream->rtp_src_cnt < PJMEDIA_RTP_NAT_PROBATION_CNT) {
-	    	if (stream->rem_rtp_flag == 1 ||
-	    	    (stream->rem_rtp_flag == 2 && badssrc))
-	    	{
-		    /* Only discard if:
-		     * - we have ever received packet with good ssrc from
-		     *   remote address (rem_rtp_addr), or
-		     * - we have ever received packet with bad ssrc from
-		     *   remote address and this packet also has bad ssrc.
-		     */
-	    	    pkt_discarded = PJ_TRUE;
-	    	    goto on_return;
-	    	}
-	    	if (stream->si.has_rem_ssrc && !seq_st.status.flag.badssrc &&
-	    	    stream->rem_rtp_flag != 1)
-	    	{
-	    	    /* Immediately switch if we receive packet with the
-	    	     * correct ssrc AND we never receive packets with
-	    	     * good ssrc from rem_rtp_addr.
-	    	     */
-	    	    param->rem_switch = PJ_TRUE;
-	    	}
-	    } else {
-	        /* Switch. We no longer receive packets from rem_rtp_addr. */
-	        param->rem_switch = PJ_TRUE;
-	    }
-
-	    if (param->rem_switch) {
-		/* Set remote RTP address to source address */
-		pj_sockaddr_cp(&stream->rem_rtp_addr, param->src_addr);
-
-		/* Reset counter and flag */
-		stream->rtp_src_cnt = 0;
-		stream->rem_rtp_flag = badssrc? 2: 1;
+        /* Get the timestamp of the event */
+	ts.u64 = pj_ntohl(hdr->ts);
 
-		/* Update RTCP peer ssrc */
-	    	stream->rtcp.peer_ssrc = pj_ntohl(hdr->ssrc);
-	    }
-	}
+	handle_incoming_dtmf(stream, &ts, payload, payloadlen);
+	goto on_return;
     }
 
     /* Put "good" packet to jitter buffer, or reset the jitter buffer
@@ -1944,6 +2041,7 @@
 	unsigned i, count = MAX;
 	unsigned ts_span;
 	pjmedia_frame frames[MAX];
+	pj_bzero(frames, sizeof(frames[0]) * MAX);
 
 	/* Get the timestamp of the first sample */
 	ts.u64 = pj_ntohl(hdr->ts);
@@ -1955,13 +2053,15 @@
 	    LOGERR_((stream->port.info.name.ptr, status,
 		     "Codec parse() error"));
 	    count = 0;
+	} else if (count == 0) {
+		PJ_LOG(2, (stream->port.info.name.ptr, "codec parsed 0 frames"));
 	} else if (stream->detect_ptime_change &&
 		   frames[0].bit_info > 0xFFFF)
 	{
-	    unsigned dec_ptime;
+	    unsigned dec_ptime, old_ptime;
+
+	    old_ptime = stream->dec_ptime;
 
-	    PJ_LOG(4, (stream->port.info.name.ptr, "codec decode "
-	               "ptime change detected"));
 	    frames[0].bit_info &= 0xFFFF;
 	    dec_ptime = frames[0].bit_info * 1000 /
 	    		stream->codec_param.info.clock_rate;
@@ -1970,6 +2070,10 @@
 	    stream->dec_ptime = (pj_uint16_t)dec_ptime;
 	    pjmedia_jbuf_set_ptime(stream->jb, stream->dec_ptime);
 
+	    PJ_LOG(4, (stream->port.info.name.ptr, "codec decode "
+		       "ptime change detected: %d -> %d",
+		       old_ptime, dec_ptime));
+
 	    /* Reset jitter buffer after ptime changed */
 	    pjmedia_jbuf_reset(stream->jb);
 	}
@@ -2038,7 +2142,7 @@
 
 	    /* Adjust the timestamp of the parsed frames */
 	    for (i=0; i<count; ++i) {
-		frames[i].timestamp.u64 = ts.u64 + ts_span * i;
+		frames[i].timestamp.u64 = ts.u64 + (pj_uint64_t)ts_span * i;
 	    }
 
 	} else {
@@ -2356,9 +2460,13 @@
     stream->last_dtmf = -1;
     stream->jb_last_frm = PJMEDIA_JB_NORMAL_FRAME;
     stream->rtcp_fb_nack.pid = -1;
+    stream->soft_start_cnt = PJMEDIA_STREAM_SOFT_START;
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
     stream->use_ka = info->use_ka;
+    stream->ka_interval = info->ka_cfg.ka_interval;
+    stream->start_ka_count = info->ka_cfg.start_count;
+    stream->start_ka_interval = info->ka_cfg.start_interval;
 #endif
 
     stream->cname = info->cname;
@@ -2608,6 +2716,7 @@
 
     /* Set up jitter buffer */
     pjmedia_jbuf_set_adaptive( stream->jb, jb_init, jb_min_pre, jb_max_pre);
+    pjmedia_jbuf_set_discard(stream->jb, info->jb_discard_algo);
 
     /* Create decoder channel: */
 
@@ -3113,6 +3222,7 @@
 
     if ((dir & PJMEDIA_DIR_DECODING) && stream->dec) {
 	stream->dec->paused = 0;
+	stream->soft_start_cnt = PJMEDIA_STREAM_SOFT_START;
 	PJ_LOG(4,(stream->port.info.name.ptr, "Decoder stream resumed"));
     }
 
@@ -3263,6 +3373,27 @@
 
     pj_mutex_unlock(stream->jb_mutex);
 
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pjmedia_stream_set_dtmf_event_callback(pjmedia_stream *stream,
+                                                           void (*cb)(pjmedia_stream*,
+                                                                      void *user_data,
+                                                                      const pjmedia_stream_dtmf_event *event),
+                                                           void *user_data)
+{
+    PJ_ASSERT_RETURN(stream, PJ_EINVAL);
+
+    /* By convention, we use jitter buffer's mutex to access DTMF
+     * digits resources.
+     */
+    pj_mutex_lock(stream->jb_mutex);
+
+    stream->dtmf_event_cb = cb;
+    stream->dtmf_event_cb_user_data = user_data;
+
+    pj_mutex_unlock(stream->jb_mutex);
+
     return PJ_SUCCESS;
 }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/stream_common.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/stream_common.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/stream_common.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/stream_common.c	2022-02-24 07:54:38.000000000 +0000
@@ -21,6 +21,19 @@
 
 #define THIS_FILE	"stream_common.c"
 
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
+
+PJ_DEF(void)
+pjmedia_stream_ka_config_default(pjmedia_stream_ka_config *cfg)
+{
+    pj_bzero(cfg, sizeof(*cfg));
+    cfg->start_count = PJMEDIA_STREAM_START_KA_CNT;
+    cfg->start_interval = PJMEDIA_STREAM_START_KA_INTERVAL_MSEC;
+    cfg->ka_interval = PJMEDIA_STREAM_KA_INTERVAL;
+}
+
+#endif
+
 /*
  * Parse fmtp for specified format/payload type.
  */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/stream_info.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/stream_info.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/stream_info.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/stream_info.c	2022-02-24 07:54:38.000000000 +0000
@@ -83,6 +83,7 @@
     const pjmedia_sdp_attr *attr;
     pjmedia_sdp_rtpmap *rtpmap;
     unsigned i, fmti, pt = 0;
+    unsigned rx_ev_clock_rate = 0;
     pj_status_t status;
 
     /* Find the first codec which is not telephone-event */
@@ -315,6 +316,7 @@
 	    continue;
 	if (pj_strcmp(&r.enc_name, &ID_TELEPHONE_EVENT) == 0) {
 	    si->rx_event_pt = pj_strtoul(&r.pt);
+	    rx_ev_clock_rate = r.clock_rate;
 	    break;
 	}
     }
@@ -330,8 +332,13 @@
 	if (pjmedia_sdp_attr_get_rtpmap(attr, &r) != PJ_SUCCESS)
 	    continue;
 	if (pj_strcmp(&r.enc_name, &ID_TELEPHONE_EVENT) == 0) {
-	    si->tx_event_pt = pj_strtoul(&r.pt);
-	    break;
+	    /* Check if the clock rate matches local event's clock rate. */
+	    if (r.clock_rate == rx_ev_clock_rate) {
+	    	si->tx_event_pt = pj_strtoul(&r.pt);
+	    	break;
+	    } else if (si->tx_event_pt == -1) {
+	    	si->tx_event_pt = pj_strtoul(&r.pt);
+	    }
 	}
     }
 
@@ -362,7 +369,6 @@
     const pjmedia_sdp_conn *local_conn;
     const pjmedia_sdp_conn *rem_conn;
     int rem_af, local_af;
-    pj_sockaddr local_addr;
     unsigned i;
     pj_status_t status;
 
@@ -438,6 +444,14 @@
     /* Set remote address: */
     status = pj_sockaddr_init(rem_af, &si->rem_addr, &rem_conn->addr,
 			      rem_m->desc.port);
+    if (status == PJ_ERESOLVE && rem_af == pj_AF_INET()) {
+	/* Handle special case in NAT64 scenario where for some reason, server
+	 * puts IPv6 (literal or FQDN) in SDP answer while indicating "IP4"
+	 * in its address type, let's retry resolving using AF_INET6.
+	 */
+	status = pj_sockaddr_init(pj_AF_INET6(), &si->rem_addr,
+				  &rem_conn->addr, rem_m->desc.port);
+    }
     if (status != PJ_SUCCESS) {
 	/* Invalid IP address. */
 	return PJMEDIA_EINVALIDIP;
@@ -459,7 +473,7 @@
     }
 
     /* Set remote address: */
-    status = pj_sockaddr_init(local_af, &local_addr, &local_conn->addr,
+    status = pj_sockaddr_init(local_af, &si->local_addr, &local_conn->addr,
 			      local_m->desc.port);
     if (status != PJ_SUCCESS) {
 	/* Invalid IP address. */
@@ -481,7 +495,7 @@
     /* Media direction: */
 
     if (local_m->desc.port == 0 ||
-	pj_sockaddr_has_addr(&local_addr)==PJ_FALSE ||
+	pj_sockaddr_has_addr(&si->local_addr)==PJ_FALSE ||
 	pj_sockaddr_has_addr(&si->rem_addr)==PJ_FALSE ||
 	pjmedia_sdp_media_find_attr(local_m, &STR_INACTIVE, NULL)!=NULL)
     {
@@ -598,6 +612,7 @@
 
     /* Set default jitter buffer parameter. */
     si->jb_init = si->jb_max = si->jb_min_pre = si->jb_max_pre = -1;
+    si->jb_discard_algo = PJMEDIA_JB_DISCARD_PROGRESSIVE;
 
     /* Get local RTCP-FB info */
     status = pjmedia_rtcp_fb_decode_sdp2(pool, endpt, NULL, local, stream_idx,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/tonegen.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/tonegen.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/tonegen.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/tonegen.c	2022-02-24 07:54:38.000000000 +0000
@@ -511,6 +511,22 @@
     return PJ_SUCCESS;
 }
 
+/*
+ * Instruct the tone generator to stop looping of the current tone set.
+ */
+PJ_DEF(pj_status_t) pjmedia_tonegen_stop_loop(pjmedia_port *port)
+{
+    struct tonegen *tonegen = (struct tonegen*) port;
+    PJ_ASSERT_RETURN(port->info.signature == SIGNATURE, PJ_EINVAL);
+
+    TRACE_((THIS_FILE, "tonegen_stop_loop()"));
+
+    pj_lock_acquire(tonegen->lock);
+    tonegen->playback_options &= ~PJMEDIA_TONEGEN_LOOP;
+    pj_lock_release(tonegen->lock);
+
+    return PJ_SUCCESS;
+}
 
 /*
  * Instruct the tone generator to stop current processing.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/transport_ice.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/transport_ice.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/transport_ice.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/transport_ice.c	2022-02-24 07:54:38.000000000 +0000
@@ -44,6 +44,7 @@
     pj_bool_t		ice_mismatch;	/* Address doesn't match candidates */
     pj_bool_t		ice_restart;	/* Offer to restart ICE		    */
     pj_ice_sess_role	local_role;	/* Our role			    */
+    pj_bool_t		has_trickle;	/* Has trickle ICE attribute	    */
 };
 
 /* ICE listener */
@@ -88,6 +89,12 @@
     unsigned		 tx_drop_pct;	/**< Percent of tx pkts to drop.    */
     unsigned		 rx_drop_pct;	/**< Percent of rx pkts to drop.    */
 
+    pj_ice_sess_trickle	 trickle_ice;	/**< Trickle ICE mode.		    */
+    unsigned		 last_send_cand_cnt[PJ_ICE_MAX_COMP];
+					/**< Last local candidate count.    */
+    pj_bool_t		 end_of_cand;	/**< Local cand gathering done?	    */
+    pj_str_t		 sdp_mid;	/**< SDP "a=mid" attribute.	    */
+
     void	       (*rtp_cb)(void*,
 			         void*,
 				 pj_ssize_t);
@@ -162,6 +169,9 @@
 static void ice_on_ice_complete(pj_ice_strans *ice_st, 
 				pj_ice_strans_op op,
 			        pj_status_t status);
+static void ice_on_new_candidate(pj_ice_strans *ice_st,
+				 const pj_ice_sess_cand *cand,
+			         pj_bool_t last);
 
 /*
  * Clean up ICE resources.
@@ -198,12 +208,30 @@
 static const pj_str_t STR_RTCP_MUX	= { "rtcp-mux", 8 };
 static const pj_str_t STR_BANDW_RR	= { "RR", 2 };
 static const pj_str_t STR_BANDW_RS	= { "RS", 2 };
+static const pj_str_t STR_ICE_OPTIONS	= { "ice-options", 11 };
+static const pj_str_t STR_TRICKLE	= { "trickle", 7 };
+static const pj_str_t STR_END_OF_CAND	= { "end-of-candidates", 17 };
 
 enum {
     COMP_RTP = 1,
     COMP_RTCP = 2
 };
 
+
+/* Forward declaration of internal functions */
+
+static int print_sdp_cand_attr(char *buffer, int max_len,
+			       const pj_ice_sess_cand *cand);
+static void get_ice_attr(const pjmedia_sdp_session *rem_sdp,
+			 const pjmedia_sdp_media *rem_m,
+			 const pjmedia_sdp_attr **p_ice_ufrag,
+			 const pjmedia_sdp_attr **p_ice_pwd);
+static pj_status_t parse_cand(const char *obj_name,
+			      pj_pool_t *pool,
+			      const pj_str_t *orig_input,
+			      pj_ice_sess_cand *cand);
+
+
 /*
  * Create ICE media transport.
  */
@@ -265,6 +293,7 @@
     tp_ice->initial_sdp = PJ_TRUE;
     tp_ice->oa_role = ROLE_NONE;
     tp_ice->use_ice = PJ_FALSE;
+    tp_ice->trickle_ice = cfg->opt.trickle;
     pj_list_init(&tp_ice->listener);
     pj_list_init(&tp_ice->listener_empty);
 
@@ -281,6 +310,7 @@
     pj_bzero(&ice_st_cb, sizeof(ice_st_cb));
     ice_st_cb.on_ice_complete = &ice_on_ice_complete;
     ice_st_cb.on_rx_data = &ice_on_rx_data;
+    ice_st_cb.on_new_candidate = &ice_on_new_candidate;
 
     /* Configure RTP socket buffer settings, if not set */
     if (ice_st_cfg.comp[COMP_RTP-1].so_rcvbuf_size == 0) {
@@ -391,6 +421,359 @@
     return (il != &tp_ice->listener? PJ_SUCCESS : PJ_ENOTFOUND);
 }
 
+
+/* Check if trickle support is signalled in the specified SDP. */
+PJ_DEF(pj_bool_t) pjmedia_ice_sdp_has_trickle( const pjmedia_sdp_session *sdp,
+					       unsigned med_idx)
+{
+    const pjmedia_sdp_media *m;
+    const pjmedia_sdp_attr *a;
+
+    PJ_ASSERT_RETURN(sdp && med_idx < sdp->media_count, PJ_EINVAL);
+
+    /* Find in media level */
+    m = sdp->media[med_idx];
+    a = pjmedia_sdp_attr_find(m->attr_count, m->attr, &STR_ICE_OPTIONS, NULL);
+    if (a && pj_strstr(&a->value, &STR_TRICKLE))
+	return PJ_TRUE;
+
+    /* Find in session level */
+    a = pjmedia_sdp_attr_find(sdp->attr_count, sdp->attr, &STR_ICE_OPTIONS,
+			      NULL);
+    if (a && pj_strstr(&a->value, &STR_TRICKLE))
+	return PJ_TRUE;
+
+    return PJ_FALSE;
+}
+
+
+/* Update check list after discovering and conveying new local ICE candidate,
+ * or receiving update of remote ICE candidates in trickle ICE.
+ */
+PJ_DEF(pj_status_t) pjmedia_ice_trickle_update(
+					     pjmedia_transport *tp,
+					     const pj_str_t *rem_ufrag,
+					     const pj_str_t *rem_passwd,
+					     unsigned rcand_cnt,
+					     const pj_ice_sess_cand rcand[],
+					     pj_bool_t rcand_end)
+{
+    struct transport_ice *tp_ice = (struct transport_ice*)tp;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(tp_ice && tp_ice->ice_st, PJ_EINVAL);
+    PJ_ASSERT_RETURN(tp_ice->trickle_ice != PJ_ICE_SESS_TRICKLE_DISABLED,
+		     PJ_EINVALIDOP);
+
+
+    /* Update the checklist */
+    status = pj_ice_strans_update_check_list(tp_ice->ice_st,
+					     rem_ufrag, rem_passwd,
+					     rcand_cnt, rcand, rcand_end);
+    if (status != PJ_SUCCESS)
+	return status;
+
+    /* Start ICE if both sides have sent their (initial) SDPs */
+    if (!pj_ice_strans_sess_is_running(tp_ice->ice_st)) {
+	unsigned i, comp_cnt;
+
+	comp_cnt = pj_ice_strans_get_running_comp_cnt(tp_ice->ice_st);
+	for (i = 0; i < comp_cnt; ++i) {
+	    if (tp_ice->last_send_cand_cnt[i] > 0)
+		break;
+	}
+	if (i != comp_cnt) {
+	    pj_str_t rufrag;
+	    pj_ice_strans_get_ufrag_pwd(tp_ice->ice_st, NULL, NULL,
+					&rufrag, NULL);
+	    if (rufrag.slen > 0) {
+		PJ_LOG(3,(THIS_FILE,"Trickle ICE starts connectivity check"));
+		status = pj_ice_strans_start_ice(tp_ice->ice_st, NULL, NULL,
+						 0, NULL);
+	    }
+	}
+    }
+
+    return status;
+}
+
+
+/* Fetch trickle ICE info from the specified SDP. */
+PJ_DEF(pj_status_t) pjmedia_ice_trickle_decode_sdp(
+					    const pjmedia_sdp_session *sdp,
+					    unsigned media_index,
+					    pj_str_t *mid,
+					    pj_str_t *ufrag,
+					    pj_str_t *passwd,
+					    unsigned *cand_cnt,
+					    pj_ice_sess_cand cand[],
+					    pj_bool_t *end_of_cand)
+{
+    const pjmedia_sdp_media *m;
+    const pjmedia_sdp_attr *a;
+
+    PJ_ASSERT_RETURN(sdp && media_index < sdp->media_count, PJ_EINVAL);
+
+    m = sdp->media[media_index];
+
+    if (mid) {
+	a = pjmedia_sdp_attr_find2(m->attr_count, m->attr, "mid", NULL);
+	if (a) {
+	    *mid = a->value;
+	} else {
+	    pj_bzero(mid, sizeof(*mid));
+	}
+    }
+
+    if (ufrag && passwd) {
+	const pjmedia_sdp_attr *a_ufrag, *a_pwd;
+	get_ice_attr(sdp, m, &a_ufrag, &a_pwd);
+	if (a_ufrag && a_pwd) {
+	    *ufrag = a_ufrag->value;
+	    *passwd = a_pwd->value;
+	} else {
+	    pj_bzero(ufrag, sizeof(*ufrag));
+	    pj_bzero(passwd, sizeof(*passwd));
+	}
+    }
+
+    if (cand_cnt && cand && *cand_cnt > 0) {
+	pj_status_t status;
+	unsigned i, cnt = 0;
+
+	for (i=0; i<m->attr_count && cnt<*cand_cnt; ++i) {
+	    a = m->attr[i];
+	    if (pj_strcmp(&a->name, &STR_CANDIDATE)!=0)
+		continue;
+
+	    /* Parse candidate */
+	    status = parse_cand("trickle-ice", NULL, &a->value, &cand[cnt]);
+	    if (status != PJ_SUCCESS) {
+		PJ_PERROR(4,("trickle-ice", status,
+			     "Error in parsing SDP candidate attribute '%.*s', "
+			     "candidate is ignored",
+			     (int)a->value.slen, a->value.ptr));
+		continue;
+	    }
+	    ++cnt;
+	}
+	*cand_cnt = cnt;
+    }
+
+    if (end_of_cand) {
+	a = pjmedia_sdp_attr_find(m->attr_count, m->attr, &STR_END_OF_CAND,
+				  NULL);
+	if (!a) {
+	    a = pjmedia_sdp_attr_find(sdp->attr_count, sdp->attr,
+				      &STR_END_OF_CAND, NULL);
+	}
+	*end_of_cand = (a != NULL);
+    }
+    return PJ_SUCCESS;
+}
+
+
+/* Generate SDP attributes for trickle ICE in the specified SDP. */
+PJ_DEF(pj_status_t) pjmedia_ice_trickle_encode_sdp(
+					    pj_pool_t *sdp_pool,
+					    pjmedia_sdp_session *sdp,
+					    const pj_str_t *mid,
+					    const pj_str_t *ufrag,
+					    const pj_str_t *passwd,
+					    unsigned cand_cnt,
+					    const pj_ice_sess_cand cand[],
+					    pj_bool_t end_of_cand)
+{
+    pjmedia_sdp_media *m = NULL;
+    pjmedia_sdp_attr *a;
+    unsigned i;
+
+    PJ_ASSERT_RETURN(sdp_pool && sdp, PJ_EINVAL);
+
+    /* Find media by checking "a=mid"*/
+    for (i = 0; i < sdp->media_count; ++i) {
+	m = sdp->media[i];
+	a = pjmedia_sdp_media_find_attr2(m, "mid", NULL);
+	if (a && pj_strcmp(&a->value, mid)==0)
+	    break;
+    }
+
+    /* Media not exist, try to add it */
+    if (i == sdp->media_count) {
+	if (sdp->media_count >= PJMEDIA_MAX_SDP_MEDIA) {
+	    PJ_LOG(3,(THIS_FILE,"Trickle ICE failed to encode candidates, "
+				"the specified SDP has too many media"));
+	    return PJ_ETOOMANY;
+	}
+
+	/* Add a new media to the SDP */
+	m = PJ_POOL_ZALLOC_T(sdp_pool, pjmedia_sdp_media);
+	m->desc.media = pj_str("audio");
+	m->desc.fmt_count = 1;
+	m->desc.fmt[0] = pj_str("0");
+	m->desc.transport = pj_str("RTP/AVP");
+	sdp->media[sdp->media_count++] = m;
+
+	/* Add media ID attribute "a=mid" */
+	a = pjmedia_sdp_attr_create(sdp_pool, "mid", mid);
+	pjmedia_sdp_attr_add(&m->attr_count, m->attr, a);
+    }
+
+    /* Add "a=ice-options:trickle" in session level */
+    a = pjmedia_sdp_attr_find(sdp->attr_count, sdp->attr, &STR_ICE_OPTIONS,
+			      NULL);
+    if (!a || !pj_strstr(&a->value, &STR_TRICKLE)) {
+	a = pjmedia_sdp_attr_create(sdp_pool, STR_ICE_OPTIONS.ptr,
+				    &STR_TRICKLE);
+	pjmedia_sdp_attr_add(&sdp->attr_count, sdp->attr, a);
+    }
+
+    /* Add "a=ice-options:trickle" in media level */
+    /*
+    a = pjmedia_sdp_attr_find(m->attr_count, m->attr, &STR_ICE_OPTIONS,
+			      NULL);
+    if (!a || !pj_strstr(&a->value, &STR_TRICKLE)) {
+	a = pjmedia_sdp_attr_create(sdp_pool, STR_ICE_OPTIONS.ptr,
+				    &STR_TRICKLE);
+	pjmedia_sdp_attr_add(&m->attr_count, m->attr, a);
+    }
+    */
+
+    /* Add ice-ufrag & ice-pwd attributes */
+    if (ufrag && passwd &&
+	!pjmedia_sdp_attr_find(m->attr_count, m->attr, &STR_ICE_UFRAG, NULL))
+    {
+	a = pjmedia_sdp_attr_create(sdp_pool, STR_ICE_UFRAG.ptr, ufrag);
+	pjmedia_sdp_attr_add(&m->attr_count, m->attr, a);
+
+	a = pjmedia_sdp_attr_create(sdp_pool, STR_ICE_PWD.ptr, passwd);
+	pjmedia_sdp_attr_add(&m->attr_count, m->attr, a);
+    }
+
+    /* Add candidates */
+    for (i=0; i<cand_cnt; ++i) {
+	enum {
+	    ATTR_BUF_LEN = 160,	/* Max len of a=candidate attr */
+	    RATTR_BUF_LEN= 160	/* Max len of a=remote-candidates attr */
+	};
+	char attr_buf[ATTR_BUF_LEN];
+	pj_str_t value;
+
+	value.slen = print_sdp_cand_attr(attr_buf, ATTR_BUF_LEN, &cand[i]);
+	if (value.slen < 0) {
+	    pj_assert(!"Not enough attr_buf to print candidate");
+	    return PJ_EBUG;
+	}
+
+	value.ptr = attr_buf;
+	a = pjmedia_sdp_attr_create(sdp_pool, STR_CANDIDATE.ptr, &value);
+	pjmedia_sdp_attr_add(&m->attr_count, m->attr, a);
+    }
+
+    /* Add "a=end-of-candidates" */
+    if (end_of_cand) {
+	a = pjmedia_sdp_attr_find(m->attr_count, m->attr, &STR_END_OF_CAND,
+				  NULL);
+	if (!a) {
+	    a = pjmedia_sdp_attr_create(sdp_pool, STR_END_OF_CAND.ptr, NULL);
+	    pjmedia_sdp_attr_add(&m->attr_count, m->attr, a);
+	}
+    }
+
+    return PJ_SUCCESS;
+}
+
+
+PJ_DEF(pj_bool_t) pjmedia_ice_trickle_has_new_cand(pjmedia_transport *tp)
+{
+    struct transport_ice *tp_ice = (struct transport_ice*)tp;
+    unsigned i, comp_cnt;
+
+    /* Make sure ICE transport has session already */
+    if (!tp_ice->ice_st || !pj_ice_strans_has_sess(tp_ice->ice_st))
+	return PJ_FALSE;
+
+    /* Count all local candidates */
+    comp_cnt = pj_ice_strans_get_running_comp_cnt(tp_ice->ice_st);
+    for (i = 0; i < comp_cnt; ++i) {
+	if (tp_ice->last_send_cand_cnt[i] <
+	    pj_ice_strans_get_cands_count(tp_ice->ice_st, i+1))
+	{
+	    return PJ_TRUE;
+	}
+    }
+    return PJ_FALSE;
+}
+
+
+/* Add any new local candidates to the specified SDP to be conveyed to
+ * remote (e.g: via SIP INFO).
+ */
+PJ_DEF(pj_status_t) pjmedia_ice_trickle_send_local_cand(
+					    pjmedia_transport *tp,
+					    pj_pool_t *sdp_pool,
+					    pjmedia_sdp_session *sdp,
+					    pj_bool_t *p_end_of_cand)
+{
+    struct transport_ice *tp_ice = (struct transport_ice*)tp;
+    pj_str_t ufrag, pwd;
+    pj_ice_sess_cand cand[PJ_ICE_MAX_CAND];
+    unsigned cand_cnt, i, comp_cnt;
+    pj_bool_t end_of_cand;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(tp && sdp_pool && sdp, PJ_EINVAL);
+
+    /* Make sure ICE transport has session already */
+    if (!tp_ice->ice_st || !pj_ice_strans_has_sess(tp_ice->ice_st))
+	return PJ_EINVALIDOP;
+
+    end_of_cand = tp_ice->end_of_cand;
+
+    /* Get ufrag and pwd from current session */
+    pj_ice_strans_get_ufrag_pwd(tp_ice->ice_st, &ufrag, &pwd, NULL, NULL);
+
+    cand_cnt = 0;
+    comp_cnt = pj_ice_strans_get_running_comp_cnt(tp_ice->ice_st);
+    for (i = 0; i < comp_cnt; ++i) {
+	unsigned cnt = PJ_ICE_MAX_CAND - cand_cnt;
+
+	/* Get all local candidates for this comp */
+	status = pj_ice_strans_enum_cands(tp_ice->ice_st, i+1,
+					  &cnt, &cand[cand_cnt]);
+	if (status != PJ_SUCCESS) {
+	    PJ_PERROR(3,(tp_ice->base.name, status,
+			 "Failed enumerating local candidates for comp-id=%d",
+			 i+1));
+	    continue;
+	}
+	cand_cnt += cnt;
+
+	tp_ice->last_send_cand_cnt[i] = cnt;
+    }
+
+    /* Update the SDP with all local candidates (not just the new ones).
+     * https://tools.ietf.org/html/draft-ietf-mmusic-trickle-ice-sip-18:
+     * 4.4. Delivering Candidates in INFO Requests: the agent MUST
+     * repeat in the INFO request body all candidates that were previously
+     * sent under the same combination of "a=ice-pwd:" and "a=ice-ufrag:"
+     * in the same order as they were sent before.
+     */
+    status = pjmedia_ice_trickle_encode_sdp(sdp_pool, sdp, &tp_ice->sdp_mid,
+					    &ufrag, &pwd, cand_cnt, cand,
+					    end_of_cand);
+    if (status != PJ_SUCCESS) {
+	PJ_PERROR(3,(tp_ice->base.name, status,
+		     "Failed encoding local candidates to SDP"));
+    }
+
+    if (p_end_of_cand)
+	*p_end_of_cand = end_of_cand;
+
+    return PJ_SUCCESS;
+}
+
+
 /* Disable ICE when SDP from remote doesn't contain a=candidate line */
 static void set_no_ice(struct transport_ice *tp_ice, const char *reason,
 		       pj_status_t err)
@@ -508,7 +891,8 @@
 					 unsigned media_index,
 					 unsigned comp_cnt,
 					 pj_bool_t restart_session,
-					 pj_bool_t rtcp_mux)
+					 pj_bool_t rtcp_mux,
+					 pj_bool_t trickle)
 {
     enum { 
 	ATTR_BUF_LEN = 160,	/* Max len of a=candidate attr */
@@ -773,6 +1157,28 @@
     	m->attr[m->attr_count++] = add_attr;
     }
 
+    /* Add trickle ICE attributes */
+    if (trickle) {
+	pj_bool_t end_of_cand;
+
+	/* Add media ID attribute "a=mid" */
+	attr = pjmedia_sdp_attr_find2(m->attr_count, m->attr, "mid", NULL);
+	if (!attr) {
+	    attr = pjmedia_sdp_attr_create(sdp_pool, "mid", &tp_ice->sdp_mid);
+	    pjmedia_sdp_attr_add(&m->attr_count, m->attr, attr);
+	}
+
+	end_of_cand = tp_ice->end_of_cand;
+	status = pjmedia_ice_trickle_encode_sdp(sdp_pool, sdp_local,
+						&tp_ice->sdp_mid, NULL, NULL,
+						0, NULL, end_of_cand);
+	if (status != PJ_SUCCESS) {
+	    PJ_PERROR(3,(tp_ice->base.name, status,
+			 "Failed in adding trickle ICE attributes"));
+	    return status;
+	}
+    }
+
     return PJ_SUCCESS;
 }
 
@@ -799,7 +1205,11 @@
 	TRACE__((obj_name, "Expecting ICE foundation in candidate"));
 	goto on_return;
     }
-    pj_strdup(pool, &cand->foundation, &token);
+    if (pool) {
+	pj_strdup(pool, &cand->foundation, &token);
+    } else {
+	cand->foundation = token;
+    }
 
     /* Component ID */
     found_idx = pj_strtok(orig_input, &delim, &token, found_idx + token.slen);
@@ -908,7 +1318,9 @@
     /* Encode ICE in SDP */
     status = encode_session_in_sdp(tp_ice, sdp_pool, loc_sdp, media_index, 
 				   tp_ice->comp_cnt, PJ_FALSE,
-				   tp_ice->enable_rtcp_mux);
+				   tp_ice->enable_rtcp_mux,
+				   tp_ice->trickle_ice !=
+					PJ_ICE_SESS_TRICKLE_DISABLED);
     if (status != PJ_SUCCESS) {
 	set_no_ice(tp_ice, "Error encoding SDP answer", status);
 	return status;
@@ -1053,6 +1465,8 @@
      */
     for (i=0; i<rem_m->attr_count; ++i) {
 	pj_ice_sess_cand cand;
+        unsigned disable_ice_mismatch = tp_ice->options &
+                                        PJMEDIA_ICE_DISABLE_ICE_MISMATCH;
 
 	if (pj_strcmp(&rem_m->attr[i]->name, &STR_CANDIDATE)!=0)
 	    continue;
@@ -1068,14 +1482,20 @@
 	    continue;
 	}
 
-	if (!comp1_found && cand.comp_id==COMP_RTP &&
-	    pj_sockaddr_cmp(&rem_conn_addr, &cand.addr)==0) 
+	if (!comp1_found && cand.comp_id==COMP_RTP)
 	{
-	    comp1_found = PJ_TRUE;
-	} else if (!comp2_found && cand.comp_id==COMP_RTCP &&
-		    pj_sockaddr_cmp(&rtcp_addr, &cand.addr)==0) 
+            if ((disable_ice_mismatch) ||
+                (pj_sockaddr_cmp(&rem_conn_addr, &cand.addr) == 0))
+            {
+                comp1_found = PJ_TRUE;
+            }
+	} else if (!comp2_found && cand.comp_id==COMP_RTCP)
 	{
-	    comp2_found = PJ_TRUE;
+            if ((disable_ice_mismatch) ||
+                (pj_sockaddr_cmp(&rtcp_addr, &cand.addr) == 0))
+            {
+                comp2_found = PJ_TRUE;
+            }
 	}
 
 	if (cand.comp_id == COMP_RTCP)
@@ -1134,14 +1554,31 @@
 	}
     }
 
+    /* Check trickle ICE indication */
+    if (tp_ice->trickle_ice != PJ_ICE_SESS_TRICKLE_DISABLED) {
+	sdp_state->has_trickle = pjmedia_ice_sdp_has_trickle(rem_sdp,
+							     media_index);
+
+	/* Reset ICE mismatch flag if conn addr is default address */
+	if (sdp_state->ice_mismatch && sdp_state->has_trickle) {
+	    pj_sockaddr def_addr;
+	    pj_sockaddr_init(rem_af, &def_addr, NULL, 9);
+	    if (pj_sockaddr_cmp(&rem_conn_addr, &def_addr)==0)
+		sdp_state->ice_mismatch = PJ_FALSE;
+	}
+    } else {
+	sdp_state->has_trickle = PJ_FALSE;
+    }
+
     PJ_LOG(4,(tp_ice->base.name, 
 	      "Processing SDP: support ICE=%u, common comp_cnt=%u, "
-	      "ice_mismatch=%u, ice_restart=%u, local_role=%s",
+	      "ice_mismatch=%u, ice_restart=%u, local_role=%s, trickle=%u",
 	      (sdp_state->match_comp_cnt != 0), 
 	      sdp_state->match_comp_cnt, 
 	      sdp_state->ice_mismatch, 
 	      sdp_state->ice_restart,
-	      pj_ice_sess_role_name(sdp_state->local_role)));
+	      pj_ice_sess_role_name(sdp_state->local_role),
+	      sdp_state->has_trickle));
 
     return PJ_SUCCESS;
 
@@ -1210,6 +1647,7 @@
 					 unsigned media_index)
 {
     const pjmedia_sdp_media *rem_m = rem_sdp->media[media_index];
+    pj_bool_t with_trickle;
     pj_status_t status;
 
     /* Check if media is removed (just in case) */
@@ -1242,9 +1680,12 @@
     }
 
     /* Encode ICE in SDP */
+    with_trickle = tp_ice->rem_offer_state.has_trickle &&
+		   tp_ice->trickle_ice != PJ_ICE_SESS_TRICKLE_DISABLED;
     status = encode_session_in_sdp(tp_ice, sdp_pool, loc_sdp, media_index, 
 				   tp_ice->rem_offer_state.match_comp_cnt,
-				   PJ_FALSE, tp_ice->use_rtcp_mux);
+				   PJ_FALSE, tp_ice->use_rtcp_mux,
+				   with_trickle);
     if (status != PJ_SUCCESS) {
 	set_no_ice(tp_ice, "Error encoding SDP answer", status);
 	return status;
@@ -1270,7 +1711,8 @@
 
     comp_cnt = pj_ice_strans_get_running_comp_cnt(tp_ice->ice_st);
     return encode_session_in_sdp(tp_ice, sdp_pool, loc_sdp, media_index,
-				 comp_cnt, PJ_FALSE, tp_ice->enable_rtcp_mux);
+				 comp_cnt, PJ_FALSE, tp_ice->enable_rtcp_mux,
+				 PJ_FALSE);
 }
 
 
@@ -1312,13 +1754,15 @@
 	status = encode_session_in_sdp(tp_ice, sdp_pool, loc_sdp, media_index,
 				       tp_ice->rem_offer_state.match_comp_cnt,
 				       tp_ice->rem_offer_state.ice_restart,
-				       tp_ice->use_rtcp_mux);
+				       tp_ice->use_rtcp_mux, PJ_FALSE);
 	if (status != PJ_SUCCESS)
 	    return status;
 
 	/* Done */
 
     } else {
+	pj_bool_t with_trickle;
+
 	/*
 	 * Received subsequent offer while we DON'T have ICE active.
 	 */
@@ -1346,10 +1790,13 @@
 	    return status;
 	}
 
+	with_trickle = tp_ice->rem_offer_state.has_trickle &&
+		       tp_ice->trickle_ice != PJ_ICE_SESS_TRICKLE_DISABLED;
 	status = encode_session_in_sdp(tp_ice, sdp_pool, loc_sdp, media_index,
 				       tp_ice->rem_offer_state.match_comp_cnt,
 				       tp_ice->rem_offer_state.ice_restart,
-				       tp_ice->use_rtcp_mux);
+				       tp_ice->use_rtcp_mux,
+				       with_trickle);
 	if (status != PJ_SUCCESS)
 	    return status;
 
@@ -1382,6 +1829,38 @@
     tp_ice->oa_role = ROLE_NONE;
     tp_ice->initial_sdp = PJ_TRUE;
 
+    /* Init SDP "a=mid" attribute. Get from remote SDP for answerer or
+     * generate one for offerer (or if remote doesn't specify).
+     */
+    tp_ice->sdp_mid.slen = 0;
+    if (rem_sdp) {
+	pjmedia_sdp_media *m = rem_sdp->media[media_index];
+	pjmedia_sdp_attr *a;
+	a = pjmedia_sdp_attr_find2(m->attr_count, m->attr, "mid", NULL);
+	if (a) {
+	    pj_strdup(tp_ice->pool, &tp_ice->sdp_mid, &a->value);
+	}
+    }
+    if (tp_ice->sdp_mid.slen == 0) {
+	char tmp_buf[8];
+	pj_ansi_snprintf(tmp_buf, sizeof(tmp_buf), "%d", media_index+1);
+	tp_ice->sdp_mid = pj_strdup3(tp_ice->pool, tmp_buf);
+    }
+
+    /* If RTCP mux is being used, set component count to 1 */
+    if (rem_sdp && tp_ice->enable_rtcp_mux) {
+	pjmedia_sdp_media *rem_m = rem_sdp->media[media_index];
+        pjmedia_sdp_attr *attr;
+	attr = pjmedia_sdp_attr_find(rem_m->attr_count, rem_m->attr,
+				     &STR_RTCP_MUX, NULL);
+	tp_ice->use_rtcp_mux = (attr? PJ_TRUE: PJ_FALSE);
+    }
+    if (tp_ice->use_rtcp_mux &&
+	pj_ice_strans_get_running_comp_cnt(tp_ice->ice_st)>1)
+    {
+	pj_ice_strans_update_comp_cnt(tp_ice->ice_st, 1);
+    }
+
     /* Init ICE, the initial role is set now based on availability of
      * rem_sdp, but it will be checked again later.
      */
@@ -1389,6 +1868,34 @@
 				PJ_ICE_SESS_ROLE_CONTROLLED);
     status = pj_ice_strans_init_ice(tp_ice->ice_st, ice_role, NULL, NULL);
 
+    /* For trickle ICE, if remote SDP has been received, process any remote
+     * ICE info now (ICE user fragment and/or initial ICE candidate list).
+     */
+    if (rem_sdp && status == PJ_SUCCESS) {
+	if (tp_ice->trickle_ice != PJ_ICE_SESS_TRICKLE_DISABLED &&
+	    pjmedia_ice_sdp_has_trickle(rem_sdp, media_index))
+	{
+	    pj_str_t ufrag, pwd;
+	    unsigned cand_cnt = PJ_ICE_ST_MAX_CAND;
+	    pj_ice_sess_cand cand[PJ_ICE_ST_MAX_CAND];
+	    pj_bool_t end_of_cand;
+
+	    status = pjmedia_ice_trickle_decode_sdp(rem_sdp, media_index,
+						    NULL, &ufrag, &pwd,
+						    &cand_cnt, cand,
+						    &end_of_cand);
+	    if (status == PJ_SUCCESS)
+		status = pj_ice_strans_update_check_list(
+					    tp_ice->ice_st, &ufrag, &pwd,
+					    cand_cnt, cand, end_of_cand);
+	    if (status != PJ_SUCCESS) {
+		PJ_PERROR(1,(tp_ice->base.name, status,
+			     "Failed create checklist for trickling ICE"));
+		return status;
+	    }
+	}
+    }
+
     /* Done */
     return status;
 }
@@ -1451,6 +1958,18 @@
 	    tp_ice->oa_role = ROLE_ANSWERER;
 	else
 	    tp_ice->oa_role = ROLE_OFFERER;
+
+	if (tp_ice->use_ice) {
+	    /* Update last local candidate count, so trickle ICE can identify
+	     * if there is any new local candidate.
+	     */
+	    unsigned i, comp_cnt;
+	    comp_cnt = pj_ice_strans_get_running_comp_cnt(tp_ice->ice_st);
+	    for (i = 0; i < comp_cnt; ++i) {
+		tp_ice->last_send_cand_cnt[i] =
+			pj_ice_strans_get_cands_count(tp_ice->ice_st, i+1);
+	    }
+	}
     }
 
     return status;
@@ -1706,11 +2225,15 @@
 	}
     }
 
-    /* Now start ICE */
-    status = start_ice(tp_ice, tmp_pool, rem_sdp, media_index);
-    if (status != PJ_SUCCESS) {
-	PJ_PERROR(1,(tp_ice->base.name, status, "ICE restart failed!"));
-	return status;
+    /* Now start ICE, if not yet (trickle ICE may have started it earlier) */
+    if (!pj_ice_strans_sess_is_running(tp_ice->ice_st) &&
+	!pj_ice_strans_sess_is_complete(tp_ice->ice_st))
+    {
+	status = start_ice(tp_ice, tmp_pool, rem_sdp, media_index);
+	if (status != PJ_SUCCESS) {
+	    PJ_PERROR(1,(tp_ice->base.name, status, "ICE restart failed!"));
+	    return status;
+	}
     }
 
     /* Done */
@@ -1735,6 +2258,7 @@
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
     pj_ice_sess_cand cand;
+    pj_sockaddr_t *addr;
     pj_status_t status;
 
     pj_bzero(&info->sock_info, sizeof(info->sock_info));
@@ -1745,17 +2269,57 @@
     if (status != PJ_SUCCESS)
 	return status;
 
-    pj_sockaddr_cp(&info->sock_info.rtp_addr_name, &cand.addr);
+    /* Address of the default candidate may not be available (e.g:
+     * STUN/TURN address is still being resolved), so let's find address
+     * of any other candidate, if still not available, the draft RFC
+     * seems to allow us using "0.0.0.0:9" in SDP.
+     */
+    addr = NULL;
+    if (pj_sockaddr_has_addr(&cand.addr)) {
+	addr = &cand.addr;
+    } else if (pj_ice_strans_has_sess(tp_ice->ice_st)) {
+	unsigned i, cnt = PJ_ICE_ST_MAX_CAND;
+	pj_ice_sess_cand cands[PJ_ICE_ST_MAX_CAND];
+	pj_ice_strans_enum_cands(tp_ice->ice_st, 1, &cnt, cands);
+	for (i = 0; i < cnt && !addr; ++i) {
+	    if (pj_sockaddr_has_addr(&cands[i].addr))
+		addr = &cands[i].addr;
+	}
+    }
+    if (addr) {
+	pj_sockaddr_cp(&info->sock_info.rtp_addr_name, addr);
+    } else {
+	pj_sockaddr_init(PJ_AF_INET, &info->sock_info.rtp_addr_name, NULL, 9);
+    }
 
     /* Get RTCP default address */
     if (tp_ice->use_rtcp_mux) {
-	pj_sockaddr_cp(&info->sock_info.rtcp_addr_name, &cand.addr);
+	pj_sockaddr_cp(&info->sock_info.rtcp_addr_name, addr);
     } else if (tp_ice->comp_cnt > 1) {
 	status = pj_ice_strans_get_def_cand(tp_ice->ice_st, 2, &cand);
 	if (status != PJ_SUCCESS)
 	    return status;
 
-	pj_sockaddr_cp(&info->sock_info.rtcp_addr_name, &cand.addr);
+	/* Address of the default candidate may not be available (e.g:
+	 * STUN/TURN address is still being resolved), so let's find address
+	 * of any other candidate. If none is available, SDP must not include
+	 * "a=rtcp" attribute.
+	 */
+	addr = NULL;
+	if (pj_sockaddr_has_addr(&cand.addr)) {
+	    addr = &cand.addr;
+	} else if (pj_ice_strans_has_sess(tp_ice->ice_st)) {
+	    unsigned i, cnt = PJ_ICE_ST_MAX_CAND;
+	    pj_ice_sess_cand cands[PJ_ICE_ST_MAX_CAND];
+	    pj_ice_strans_enum_cands(tp_ice->ice_st, 2, &cnt, cands);
+	    for (i = 0; i < cnt && !addr; ++i) {
+		if (pj_sockaddr_has_addr(&cands[i].addr))
+		    addr = &cands[i].addr;
+	    }
+	}
+	if (addr) {
+	    pj_sockaddr_cp(&info->sock_info.rtcp_addr_name, addr);
+	}
     }
 
     /* Set remote address originating RTP & RTCP if this transport has 
@@ -1788,10 +2352,13 @@
 
 	ii->active = tp_ice->use_ice;
 
-	if (pj_ice_strans_has_sess(tp_ice->ice_st))
+	if (pj_ice_strans_has_sess(tp_ice->ice_st)) {
 	    ii->role = pj_ice_strans_get_role(tp_ice->ice_st);
-	else
+	    pj_ice_strans_get_ufrag_pwd(tp_ice->ice_st, &ii->loc_ufrag, NULL,
+				    	&ii->rem_ufrag, NULL);
+	} else {
 	    ii->role = PJ_ICE_SESS_ROLE_UNKNOWN;
+	}
 	ii->sess_state = pj_ice_strans_get_state(tp_ice->ice_st);
 	ii->comp_cnt = pj_ice_strans_get_running_comp_cnt(tp_ice->ice_st);
 	
@@ -2096,6 +2663,10 @@
 	return;
     }
 
+    /* Set the flag indicating that local candidate gathering is completed */
+    if (op == PJ_ICE_STRANS_OP_INIT && result == PJ_SUCCESS)
+	tp_ice->end_of_cand = PJ_TRUE;
+
     pj_perror(5, tp_ice->base.name, result, "ICE operation complete"
 	      " (op=%d%s)", op,
 	      (op==PJ_ICE_STRANS_OP_INIT? "/initialization" :
@@ -2114,6 +2685,31 @@
 	}
     }
 }
+
+
+static void ice_on_new_candidate(pj_ice_strans *ice_st,
+				 const pj_ice_sess_cand *cand,
+			         pj_bool_t last)
+{
+    struct transport_ice *tp_ice;
+    ice_listener *il;
+
+    tp_ice = (struct transport_ice*) pj_ice_strans_get_user_data(ice_st);
+    if (!tp_ice) {
+	/* Destroy on progress */
+	return;
+    }
+
+    /* Notify application */
+    if (tp_ice->cb.on_new_candidate)
+	(*tp_ice->cb.on_new_candidate)(&tp_ice->base, cand, last);
+
+    for (il=tp_ice->listener.next; il!=&tp_ice->listener; il=il->next) {
+	if (il->cb.on_new_candidate) {
+	    (*il->cb.on_new_candidate)(&tp_ice->base, cand, last);
+	}
+    }
+}
 
 
 /* Simulate lost */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/transport_loop.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/transport_loop.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/transport_loop.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/transport_loop.c	2022-02-24 07:54:38.000000000 +0000
@@ -28,7 +28,7 @@
 #include <pj/string.h>
 
 
-struct user
+struct tp_user
 {
     pj_bool_t		rx_disabled;	/**< Doesn't want to receive pkt?   */
     void	       *user_data;	/**< Only valid when attached	    */
@@ -47,7 +47,7 @@
 
     pj_pool_t	       *pool;		/**< Memory pool		    */
     unsigned		user_cnt;	/**< Number of attachments	    */
-    struct user		users[4];	/**< Array of users.		    */
+    struct tp_user	users[4];	/**< Array of users.		    */
     pj_bool_t		disable_rx;	/**< Disable RX.		    */
 
     pjmedia_loop_tp_setting setting;	/**< Setting.			    */
@@ -175,7 +175,7 @@
 
     tp = PJ_POOL_ZALLOC_T(pool, struct transport_loop);
     tp->pool = pool;
-    pj_ansi_strncpy(tp->base.name, tp->pool->obj_name, PJ_MAX_OBJ_NAME-1);
+    pj_memcpy(tp->base.name, tp->pool->obj_name, PJ_MAX_OBJ_NAME);
     tp->base.op = &transport_udp_op;
     tp->base.type = PJMEDIA_TRANSPORT_TYPE_UDP;
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/transport_srtp.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/transport_srtp.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/transport_srtp.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/transport_srtp.c	2022-02-24 07:54:38.000000000 +0000
@@ -32,6 +32,12 @@
 
 #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
 
+/* Enable this to test ROC initialization setting. For offerer,
+ * it will send packets with ROC 1 and expect to receive ROC 2.
+ * For answerer it will be the other way around.
+ */
+#define TEST_ROC 0
+
 #if defined(PJ_HAS_SSL_SOCK) && PJ_HAS_SSL_SOCK != 0 && \
     (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_OPENSSL)
 #  include <openssl/rand.h>
@@ -302,6 +308,13 @@
      */
     unsigned		 keying_pending_cnt;
 
+    /* RTP SSRC in receiving direction, used in getting and setting SRTP
+     * roll over counter (ROC) on SRTP restart.
+     */
+    pj_uint32_t		 rx_ssrc;
+
+    pj_uint32_t		 tx_ssrc;
+
 } transport_srtp;
 
 
@@ -807,6 +820,31 @@
 
 
 /*
+ * Get SRTP media transport setting.
+ */
+PJ_DEF(pj_status_t) pjmedia_transport_srtp_get_setting(
+				       pjmedia_transport *tp,
+				       pjmedia_srtp_setting *opt)
+{
+    transport_srtp  *srtp = (transport_srtp*) tp;
+    *opt = srtp->setting;
+    return PJ_SUCCESS;
+}
+
+/*
+ * Modify SRTP media transport setting.
+ */
+PJ_DEF(pj_status_t) pjmedia_transport_srtp_modify_setting(
+				       pjmedia_transport *tp,
+				       const pjmedia_srtp_setting *opt)
+{
+    transport_srtp  *srtp = (transport_srtp*) tp;
+    srtp->setting = *opt;
+    return PJ_SUCCESS;
+}
+
+
+/*
  * Initialize and start SRTP session with the given parameters.
  */
 PJ_DEF(pj_status_t) pjmedia_transport_srtp_start(
@@ -879,8 +917,15 @@
     else
 	tx_.rtp.sec_serv    = sec_serv_none;
     tx_.key		    = (uint8_t*)srtp->tx_key;
-    tx_.ssrc.type	    = ssrc_any_outbound;
-    tx_.ssrc.value	    = 0;
+    if (srtp->setting.tx_roc.roc != 0 &&
+        srtp->setting.tx_roc.ssrc != 0)
+    {
+	tx_.ssrc.type	    = ssrc_specific;
+	tx_.ssrc.value	    = srtp->setting.tx_roc.ssrc;
+    } else {
+	tx_.ssrc.type	    = ssrc_any_outbound;
+	tx_.ssrc.value	    = 0;
+    }
     tx_.rtp.cipher_type	    = crypto_suites[cr_tx_idx].cipher_type;
     tx_.rtp.cipher_key_len  = crypto_suites[cr_tx_idx].cipher_key_len;
     tx_.rtp.auth_type	    = crypto_suites[au_tx_idx].auth_type;
@@ -894,6 +939,18 @@
 	status = PJMEDIA_ERRNO_FROM_LIBSRTP(err);
 	goto on_return;
     }
+    if (srtp->setting.tx_roc.roc != 0 &&
+        srtp->setting.tx_roc.ssrc != 0)
+    {
+	srtp_err_status_t status;
+	status = srtp_set_stream_roc(srtp->srtp_tx_ctx,
+				     srtp->setting.tx_roc.ssrc,
+			    	     srtp->setting.tx_roc.roc);
+    	PJ_LOG(4, (THIS_FILE, "Initializing SRTP TX ROC to SSRC %d with "
+    		   "ROC %d %s\n", srtp->setting.tx_roc.ssrc,
+    		   srtp->setting.tx_roc.roc,
+    	           (status == srtp_err_status_ok)? "succeeded": "failed"));
+    }
     srtp->tx_policy = *tx;
     pj_strset(&srtp->tx_policy.key,  srtp->tx_key, tx->key.slen);
     srtp->tx_policy.name=pj_str(crypto_suites[get_crypto_idx(&tx->name)].name);
@@ -911,8 +968,15 @@
     else
 	rx_.rtp.sec_serv    = sec_serv_none;
     rx_.key		    = (uint8_t*)srtp->rx_key;
-    rx_.ssrc.type	    = ssrc_any_inbound;
-    rx_.ssrc.value	    = 0;
+    if (srtp->setting.rx_roc.roc != 0 &&
+        srtp->setting.rx_roc.ssrc != 0)
+    {
+	rx_.ssrc.type	    = ssrc_specific;
+	rx_.ssrc.value	    = srtp->setting.rx_roc.ssrc;
+    } else {
+	rx_.ssrc.type	    = ssrc_any_inbound;
+	rx_.ssrc.value	    = 0;
+    }
     rx_.rtp.sec_serv	    = crypto_suites[cr_rx_idx].service;
     rx_.rtp.cipher_type	    = crypto_suites[cr_rx_idx].cipher_type;
     rx_.rtp.cipher_key_len  = crypto_suites[cr_rx_idx].cipher_key_len;
@@ -928,6 +992,18 @@
 	status = PJMEDIA_ERRNO_FROM_LIBSRTP(err);
 	goto on_return;
     }
+    if (srtp->setting.rx_roc.roc != 0 &&
+        srtp->setting.rx_roc.ssrc != 0)
+    {
+	srtp_err_status_t status;
+	status = srtp_set_stream_roc(srtp->srtp_rx_ctx,
+				     srtp->setting.rx_roc.ssrc,
+			    	     srtp->setting.rx_roc.roc);
+    	PJ_LOG(4, (THIS_FILE, "Initializing SRTP RX ROC from SSRC %d with "
+    		   "ROC %d %s\n",
+    	           srtp->setting.rx_roc.ssrc, srtp->setting.rx_roc.roc,
+    	       	   (status == srtp_err_status_ok)? "succeeded": "failed"));
+    }
     srtp->rx_policy = *rx;
     pj_strset(&srtp->rx_policy.key,  srtp->rx_key, rx->key.slen);
     srtp->rx_policy.name=pj_str(crypto_suites[get_crypto_idx(&rx->name)].name);
@@ -1038,9 +1114,6 @@
 	return PJ_SUCCESS;
     }
 
-    /* Reset probation counts */
-    srtp->probation_cnt = PROBATION_CNT_INIT;
-
     /* Got policy_local & policy_remote, let's initalize the SRTP */
 
     /* Ticket #1075: media_start() is called whenever media description
@@ -1057,6 +1130,9 @@
 	if (status != PJ_SUCCESS)
 	    return status;
 
+	/* Reset probation counts */
+	srtp->probation_cnt = PROBATION_CNT_INIT;
+
 	PJ_LOG(4, (srtp->pool->obj_name,
 		   "SRTP started, keying=%s, crypto=%s",
 		   ((int)srtp->keying[0]->type==PJMEDIA_SRTP_KEYING_SDES?
@@ -1101,6 +1177,26 @@
     srtp_info.use = srtp->setting.use;
     srtp_info.peer_use = srtp->peer_use;
 
+    pj_bzero(&srtp_info.tx_roc, sizeof(srtp_info.tx_roc));
+    pj_bzero(&srtp_info.rx_roc, sizeof(srtp_info.rx_roc));
+
+    if (srtp->srtp_rx_ctx && srtp->rx_ssrc != 0) {
+    	srtp_info.rx_roc.ssrc = srtp->rx_ssrc;
+    	srtp_get_stream_roc(srtp->srtp_rx_ctx, srtp->rx_ssrc,
+    			    &srtp_info.rx_roc.roc);
+    } else if (srtp->setting.rx_roc.ssrc != 0) {
+    	srtp_info.rx_roc.ssrc = srtp->setting.rx_roc.ssrc;
+    	srtp_info.rx_roc.roc = srtp->setting.rx_roc.roc;
+    }
+    if (srtp->srtp_tx_ctx && srtp->tx_ssrc != 0) {
+    	srtp_info.tx_roc.ssrc = srtp->tx_ssrc;
+    	srtp_get_stream_roc(srtp->srtp_tx_ctx, srtp->tx_ssrc,
+    			    &srtp_info.tx_roc.roc);
+    } else if (srtp->setting.tx_roc.ssrc != 0) {
+    	srtp_info.tx_roc.ssrc = srtp->setting.tx_roc.ssrc;
+    	srtp_info.tx_roc.roc = srtp->setting.tx_roc.roc;
+    }
+
     spc_info_idx = info->specific_info_cnt++;
     info->spc_info[spc_info_idx].type = PJMEDIA_TRANSPORT_TYPE_SRTP;
     info->spc_info[spc_info_idx].cbsize = sizeof(srtp_info);
@@ -1203,6 +1299,24 @@
 	pj_lock_release(srtp->mutex);
 	return PJMEDIA_SRTP_EKEYNOTREADY;
     }
+
+    /* Save outgoing SSRC */
+    srtp->tx_ssrc = ntohl(((pjmedia_rtp_hdr*)pkt)->ssrc);
+
+#if TEST_ROC
+    if (srtp->setting.tx_roc.ssrc == 0) {
+	srtp_err_status_t status;
+    	status = srtp_set_stream_roc(srtp->srtp_tx_ctx, srtp->tx_ssrc,
+    			    	     (srtp->offerer_side? 1: 2));
+    	if (status == srtp_err_status_ok) {
+    	    srtp->setting.tx_roc.ssrc = srtp->tx_ssrc;
+    	    srtp->setting.tx_roc.roc = (srtp->offerer_side? 1: 2);
+	    PJ_LOG(4, (THIS_FILE, "Setting TX ROC to SSRC %d to %d",
+		   srtp->tx_ssrc, srtp->setting.tx_roc.roc));
+	}
+    }
+#endif
+
     err = srtp_protect(srtp->srtp_tx_ctx, srtp->rtp_tx_buffer, &len);
     pj_lock_release(srtp->mutex);
 
@@ -1379,9 +1493,30 @@
     	    return;
     	}
     }
+
+#if TEST_ROC
+    if (srtp->setting.rx_roc.ssrc == 0) {
+	srtp_err_status_t status;
+	
+	srtp->rx_ssrc = ntohl(((pjmedia_rtp_hdr*)pkt)->ssrc);
+    	status = srtp_set_stream_roc(srtp->srtp_rx_ctx, srtp->rx_ssrc, 
+    			    	     (srtp->offerer_side? 2: 1));
+	if (status == srtp_err_status_ok) {    	
+    	    srtp->setting.rx_roc.ssrc = srtp->rx_ssrc;
+	    srtp->setting.rx_roc.roc = (srtp->offerer_side? 2: 1);
+
+	    PJ_LOG(4, (THIS_FILE, "Setting RX ROC from SSRC %d to %d",
+		   		  srtp->rx_ssrc, srtp->setting.rx_roc.roc));
+	} else {
+	    PJ_LOG(4, (THIS_FILE, "Setting RX ROC %s",
+	    	       get_libsrtp_errstr(status)));
+	}
+    }
+#endif
     
     err = srtp_unprotect(srtp->srtp_rx_ctx, (pj_uint8_t*)pkt, &len);
-    
+
+#if PJMEDIA_SRTP_CHECK_RTP_SEQ_ON_RESTART
     if (srtp->probation_cnt > 0 &&
 	(err == srtp_err_status_replay_old ||
 	 err == srtp_err_status_replay_fail))
@@ -1395,6 +1530,11 @@
 	pjmedia_srtp_crypto tx, rx;
 	pj_status_t status;
 
+	/* Stop SRTP first, otherwise srtp_start() will maintain current
+	 * roll-over counter.
+	 */
+	pjmedia_transport_srtp_stop((pjmedia_transport*)srtp);
+
 	tx = srtp->tx_policy;
 	rx = srtp->rx_policy;
 	status = pjmedia_transport_srtp_start((pjmedia_transport*)srtp,
@@ -1406,6 +1546,34 @@
 	    err = srtp_unprotect(srtp->srtp_rx_ctx, (pj_uint8_t*)pkt, &len);
 	}
     }
+#if PJMEDIA_SRTP_CHECK_ROC_ON_RESTART
+    else
+#endif
+#endif
+
+#if PJMEDIA_SRTP_CHECK_ROC_ON_RESTART
+    if (srtp->probation_cnt > 0 && err == srtp_err_status_auth_fail &&
+	srtp->setting.prev_rx_roc.ssrc != 0 &&
+	srtp->setting.prev_rx_roc.ssrc == srtp->setting.rx_roc.ssrc &&
+	srtp->setting.prev_rx_roc.roc != srtp->setting.rx_roc.roc)
+    {
+        unsigned roc, new_roc;
+	srtp_err_status_t status;
+
+    	srtp_get_stream_roc(srtp->srtp_rx_ctx, srtp->setting.rx_roc.ssrc,
+    			    &roc);
+    	new_roc = (roc == srtp->setting.rx_roc.roc?
+    		   srtp->setting.prev_rx_roc.roc: srtp->setting.rx_roc.roc);
+    	status = srtp_set_stream_roc(srtp->srtp_rx_ctx,
+    				     srtp->setting.rx_roc.ssrc, new_roc);
+	if (status == srtp_err_status_ok) {
+	    PJ_LOG(4, (srtp->pool->obj_name,
+		       "Retrying to unprotect SRTP from ROC %d to new ROC %d",
+		       roc, new_roc));
+    	    err = srtp_unprotect(srtp->srtp_rx_ctx, (pj_uint8_t*)pkt, &len);
+    	}
+    }
+#endif
 
     if (err != srtp_err_status_ok) {
 	PJ_LOG(5,(srtp->pool->obj_name,
@@ -1415,6 +1583,9 @@
 	cb = srtp->rtp_cb;
 	cb2 = srtp->rtp_cb2;
 	cb_data = srtp->user_data;
+
+	/* Save SSRC after successful SRTP unprotect */
+	srtp->rx_ssrc = ntohl(((pjmedia_rtp_hdr*)pkt)->ssrc);
     }
 
     pj_lock_release(srtp->mutex);
@@ -1495,6 +1666,7 @@
     pj_bzero(&srtp->rx_policy_neg, sizeof(srtp->rx_policy_neg));
     pj_bzero(&srtp->tx_policy_neg, sizeof(srtp->tx_policy_neg));
 
+    srtp->tx_ssrc = srtp->rx_ssrc = 0;
     srtp->media_option = member_tp_option = options;
     srtp->offerer_side = (sdp_remote == NULL);
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/transport_srtp_dtls.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/transport_srtp_dtls.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/transport_srtp_dtls.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/transport_srtp_dtls.c	2022-02-24 07:54:38.000000000 +0000
@@ -528,6 +528,9 @@
 	}
 	SSL_free(ds->ossl_ssl); /* this will also close BIOs */
 	ds->ossl_ssl = NULL;
+	/* thus reset the BIOs as well */
+	ds->ossl_rbio = NULL;
+	ds->ossl_wbio = NULL;
     }
 
     /* Destroy SSL context */
@@ -690,6 +693,8 @@
     pj_size_t len;
     pj_status_t status = PJ_SUCCESS;
 
+	if (ds->ossl_wbio == NULL) return PJ_EGONE;
+
     /* Check whether there is data to send */
     if (BIO_ctrl_pending(ds->ossl_wbio) > 0) {
 	/* Yes, get and send it */
@@ -898,60 +903,97 @@
     return PJ_SUCCESS;
 }
 
-
 static pj_status_t get_rem_addrs(dtls_srtp *ds,
 				 const pjmedia_sdp_session *sdp_remote,
-				 unsigned media_index)
+				 unsigned media_index,
+                                 pj_sockaddr *rem_rtp,
+                                 pj_sockaddr *rem_rtcp,
+                                 pj_bool_t *rtcp_mux)
 {
     pjmedia_sdp_media *m_rem = sdp_remote->media[media_index];
     pjmedia_sdp_conn *conn;
     pjmedia_sdp_attr *a;
     int af = pj_AF_UNSPEC();
+    pj_bool_t use_ice_info = PJ_FALSE;
+
+    /* Init RTP & RTCP address */
+    pj_bzero(rem_rtp, sizeof(*rem_rtp));
+    pj_bzero(rem_rtcp, sizeof(*rem_rtcp));
+
+    /* If underlying transport is ICE, get remote addresses from ICE */
+    if (ds->use_ice) {
+	pjmedia_transport_info info;
+	pjmedia_ice_transport_info *ice_info;
+
+	pjmedia_transport_info_init(&info);
+	pjmedia_transport_get_info(ds->srtp->member_tp, &info);
+	ice_info = (pjmedia_ice_transport_info*)
+		   pjmedia_transport_info_get_spc_info(
+				    &info, PJMEDIA_TRANSPORT_TYPE_ICE);
+	if (ice_info) {
+	    *rem_rtp = ice_info->comp[0].rcand_addr;
+	    if (ice_info->comp_cnt > 1)
+		*rem_rtcp = ice_info->comp[1].rcand_addr;
 
-    /* Get RTP address */
-    conn = m_rem->conn ? m_rem->conn : sdp_remote->conn;
-    if (pj_stricmp2(&conn->net_type, "IN")==0) {
-	if (pj_stricmp2(&conn->addr_type, "IP4")==0) {
-	    af = pj_AF_INET();
-	} else if (pj_stricmp2(&conn->addr_type, "IP6")==0) {
-	    af = pj_AF_INET6();
+	    use_ice_info = PJ_TRUE;
 	}
     }
-    if (af != pj_AF_UNSPEC()) {
-	pj_sockaddr_init(af, &ds->rem_addr, &conn->addr,
-			 m_rem->desc.port);
-    } else {
-	return PJ_EAFNOTSUP;
-    }
 
-    /* Get RTCP address. If "rtcp" attribute is present in the SDP,
-     * set the RTCP address from that attribute. Otherwise, calculate
-     * from RTP address.
-     */
-    a = pjmedia_sdp_attr_find2(m_rem->attr_count, m_rem->attr,
-			       "rtcp", NULL);
-    if (a) {
-	pjmedia_sdp_rtcp_attr rtcp;
-	pj_status_t status;
-	status = pjmedia_sdp_attr_get_rtcp(a, &rtcp);
-	if (status == PJ_SUCCESS) {
-	    if (rtcp.addr.slen) {
-		pj_sockaddr_init(af, &ds->rem_rtcp, &rtcp.addr,
-				 (pj_uint16_t)rtcp.port);
-	    } else {
-		pj_sockaddr_init(af, &ds->rem_rtcp, NULL,
-				 (pj_uint16_t)rtcp.port);
-		pj_memcpy(pj_sockaddr_get_addr(&ds->rem_rtcp),
-			  pj_sockaddr_get_addr(&ds->rem_addr),
-			  pj_sockaddr_get_addr_len(&ds->rem_addr));
+    /* Get remote addresses from SDP */
+    if (!use_ice_info) {
+
+	/* Get RTP address */
+	conn = m_rem->conn ? m_rem->conn : sdp_remote->conn;
+	if (pj_stricmp2(&conn->net_type, "IN")==0) {
+	    if (pj_stricmp2(&conn->addr_type, "IP4")==0) {
+		af = pj_AF_INET();
+	    } else if (pj_stricmp2(&conn->addr_type, "IP6")==0) {
+		af = pj_AF_INET6();
 	    }
 	}
+	if (af != pj_AF_UNSPEC()) {
+	    pj_sockaddr_init(af, rem_rtp, &conn->addr,
+			     m_rem->desc.port);
+	} else {
+	    return PJ_EAFNOTSUP;
+	}
+
+	/* Get RTCP address. If "rtcp" attribute is present in the SDP,
+	 * set the RTCP address from that attribute. Otherwise, calculate
+	 * from RTP address.
+	 */
+	a = pjmedia_sdp_attr_find2(m_rem->attr_count, m_rem->attr,
+				   "rtcp", NULL);
+	if (a) {
+	    pjmedia_sdp_rtcp_attr rtcp;
+	    pj_status_t status;
+	    status = pjmedia_sdp_attr_get_rtcp(a, &rtcp);
+	    if (status == PJ_SUCCESS) {
+		if (rtcp.addr.slen) {
+		    pj_sockaddr_init(af, rem_rtcp, &rtcp.addr,
+				     (pj_uint16_t)rtcp.port);
+		} else {
+		    pj_sockaddr_init(af, rem_rtcp, NULL,
+				     (pj_uint16_t)rtcp.port);
+		    pj_memcpy(pj_sockaddr_get_addr(rem_rtcp),
+			      pj_sockaddr_get_addr(rem_rtp),
+			      pj_sockaddr_get_addr_len(rem_rtp));
+		}
+	    }
+	}
+	if (!pj_sockaddr_has_addr(rem_rtcp)) {
+	    int rtcp_port;
+	    pj_memcpy(rem_rtcp, rem_rtp, sizeof(pj_sockaddr));
+	    rtcp_port = pj_sockaddr_get_port(rem_rtp) + 1;
+	    pj_sockaddr_set_port(rem_rtcp, (pj_uint16_t)rtcp_port);
+	}
     }
-    if (!pj_sockaddr_has_addr(&ds->rem_rtcp)) {
-	int rtcp_port;
-	pj_memcpy(&ds->rem_rtcp, &ds->rem_addr, sizeof(pj_sockaddr));
-	rtcp_port = pj_sockaddr_get_port(&ds->rem_addr) + 1;
-	pj_sockaddr_set_port(&ds->rem_rtcp, (pj_uint16_t)rtcp_port);
+
+    /* Check if remote indicates the desire to use rtcp-mux in its SDP. */
+    if (rtcp_mux) {
+    	a = pjmedia_sdp_attr_find2(m_rem->attr_count, m_rem->attr,
+			       	   "rtcp-mux", NULL);
+	*rtcp_mux = (a? PJ_TRUE: PJ_FALSE);
     }
 
     return PJ_SUCCESS;
@@ -968,6 +1010,8 @@
     char tmp[128];
     pj_size_t nwritten;
 
+	if (ds->ossl_rbio == NULL) return PJ_EGONE;
+
     nwritten = BIO_write(ds->ossl_rbio, data, (int)len);
     if (nwritten < len) {
 	/* Error? */
@@ -1235,6 +1279,7 @@
 	/* As answerer */
 	dtls_setup last_setup = ds->setup;
 	pj_str_t last_rem_fp = ds->rem_fingerprint;
+        pj_bool_t rem_addr_changed = PJ_FALSE;
 
 	/* Parse a=setup and a=fingerprint */
 	status = parse_setup_finger_attr(ds, PJ_TRUE, sdp_remote,
@@ -1247,12 +1292,47 @@
 		    (ds->setup==DTLS_SETUP_ACTIVE? &ID_ACTIVE:&ID_PASSIVE));
 	pjmedia_sdp_media_add_attr(m_loc, a);
 
+        if (last_setup != DTLS_SETUP_UNKNOWN && sdp_remote) {
+            pj_sockaddr rem_rtp;
+            pj_sockaddr rem_rtcp;
+            pj_bool_t use_rtcp_mux;
+
+            status = get_rem_addrs(ds, sdp_remote, media_index, &rem_rtp,
+                                   &rem_rtcp, &use_rtcp_mux);
+            if (status == PJ_SUCCESS) {
+            	if (use_rtcp_mux) {
+            	    /* Remote indicates it wants to use rtcp-mux */
+		    pjmedia_transport_info info;
+
+		    pjmedia_transport_info_init(&info);
+		    pjmedia_transport_get_info(ds->srtp->member_tp, &info);
+		    if (pj_sockaddr_cmp(&info.sock_info.rtp_addr_name,
+	    		&info.sock_info.rtcp_addr_name))
+		    {
+		    	/* But we do not wish to use rtcp mux */
+	    		use_rtcp_mux = PJ_FALSE;
+		    }
+            	}
+                if (pj_sockaddr_has_addr(&ds->rem_addr) &&
+		    pj_sockaddr_has_addr(&rem_rtp) &&
+		    (pj_sockaddr_cmp(&ds->rem_addr, &rem_rtp) ||
+                     (!use_rtcp_mux &&
+		      pj_sockaddr_has_addr(&ds->rem_rtcp) &&
+		      pj_sockaddr_has_addr(&rem_rtcp) &&
+                      pj_sockaddr_cmp(&ds->rem_rtcp, &rem_rtcp))))
+                {
+                    rem_addr_changed = PJ_TRUE;
+                }
+            }
+        }
+
 	/* Check if remote signals DTLS re-nego by changing its
-	 * setup/fingerprint in SDP.
+	 * setup/fingerprint in SDP or media transport address in SDP.
 	 */
 	if ((last_setup != DTLS_SETUP_UNKNOWN && last_setup != ds->setup) ||
 	    (last_rem_fp.slen &&
-	     pj_memcmp(&last_rem_fp, &ds->rem_fingerprint, sizeof(pj_str_t))))
+	     pj_memcmp(&last_rem_fp, &ds->rem_fingerprint, sizeof(pj_str_t)))||
+            (rem_addr_changed))
 	{
 	    ssl_destroy(ds);
 	    ds->nego_started = PJ_FALSE;
@@ -1306,8 +1386,10 @@
 	ap.user_data = ds->srtp;
 	pjmedia_transport_get_info(ds->srtp->member_tp, &info);
 
-	if (sdp_remote)
-	    get_rem_addrs(ds, sdp_remote, media_index);
+        if (sdp_remote) {
+            get_rem_addrs(ds, sdp_remote, media_index, &ds->rem_addr,
+                          &ds->rem_rtcp, NULL);
+        }
 
 	if (pj_sockaddr_has_addr(&ds->rem_addr)) {
 	    pj_sockaddr_cp(&ap.rem_addr, &ds->rem_addr);
@@ -1391,6 +1473,7 @@
     pj_ice_strans_state ice_state;
     pj_bool_t use_rtcp_mux = PJ_FALSE;
     pj_status_t status = PJ_SUCCESS;
+    struct transport_srtp *srtp = (struct transport_srtp*)tp->user_data;
 
 #if DTLS_DEBUG
     PJ_LOG(2,(ds->base.name, "dtls_media_start()"));
@@ -1446,6 +1529,10 @@
 				    &info, PJMEDIA_TRANSPORT_TYPE_ICE);
 	ds->use_ice = ice_info && ice_info->active;
 	ice_state = ds->use_ice? ice_info->sess_state : 0;
+
+	/* Update remote RTP & RTCP addresses */
+	get_rem_addrs(ds, sdp_remote, media_index, &ds->rem_addr,
+                      &ds->rem_rtcp, NULL);
     }
 
     /* Check if the background DTLS nego has completed */
@@ -1472,6 +1559,8 @@
     ds->srtp->keying_pending_cnt++;
     ds->pending_start = PJ_TRUE;
 
+    srtp->peer_use = PJMEDIA_SRTP_MANDATORY;
+
     /* If our DTLS setup is ACTIVE:
      * - start DTLS nego after ICE nego, or
      * - start it now if there is no ICE.
@@ -1492,9 +1581,6 @@
 	    ap.user_data = ds->srtp;
 
 	    /* Attach ourselves to member transport for DTLS nego. */
-	    if (!pj_sockaddr_has_addr(&ds->rem_addr))
-		get_rem_addrs(ds, sdp_remote, media_index);
-
 	    if (pj_sockaddr_has_addr(&ds->rem_addr))
 		pj_sockaddr_cp(&ap.rem_addr, &ds->rem_addr);
 	    else
@@ -1553,6 +1639,16 @@
 
     if (ds->clock)
 	pjmedia_clock_stop(ds->clock);
+    
+    /* Reset DTLS state */
+    ssl_destroy(ds);
+    ds->setup = DTLS_SETUP_UNKNOWN;
+	ds->use_ice = PJ_FALSE;
+    ds->nego_started = PJ_FALSE;
+    ds->nego_completed = PJ_FALSE;
+    ds->got_keys = PJ_FALSE;
+    ds->rem_fingerprint.slen = 0;
+    ds->rem_fprint_status = PJ_EPENDING;
 
     return PJ_SUCCESS;
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/transport_srtp_sdes.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/transport_srtp_sdes.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/transport_srtp_sdes.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/transport_srtp_sdes.c	2022-02-24 07:54:38.000000000 +0000
@@ -22,8 +22,11 @@
 /* Include OpenSSL libraries for MSVC */
 #  ifdef _MSC_VER 
 #    if (PJ_SSL_SOCK_IMP == PJ_SSL_SOCK_IMP_OPENSSL)
+#      include <openssl/opensslv.h>
 #      if OPENSSL_VERSION_NUMBER >= 0x10100000L
 #        pragma comment(lib, "libcrypto")
+#        pragma comment(lib, "libssl")
+#        pragma comment(lib, "crypt32")
 #      else
 #        pragma comment(lib, "libeay32")
 #        pragma comment(lib, "ssleay32")
@@ -647,11 +650,39 @@
 	    srtp->peer_use = PJMEDIA_SRTP_OPTIONAL;
     }
 
-    /* For answerer side, this function will just have to start SRTP as
-     * SRTP crypto policies have been populated in media_encode_sdp().
+    /* For answerer side, SRTP crypto policies have been populated in
+     * media_encode_sdp(). Check if the key changes on the local SDP.
      */
-    if (!srtp->offerer_side)
-	return PJ_SUCCESS;
+    if (!srtp->offerer_side) {
+        if (srtp->tx_policy_neg.name.slen == 0)
+            return PJ_SUCCESS;
+
+        /* Get the local crypto. */
+        fill_local_crypto(srtp->pool, m_loc, loc_crypto, &loc_cryto_cnt);
+
+        if (loc_cryto_cnt == 0)
+            return PJ_SUCCESS;
+
+        if ((pj_stricmp(&srtp->tx_policy_neg.name,
+                        &loc_crypto[0].name) == 0) &&
+            (pj_stricmp(&srtp->tx_policy_neg.key,
+                        &loc_crypto[0].key) != 0))
+        {
+	    srtp->tx_policy_neg = loc_crypto[0];
+            for (i = 0; i<srtp->setting.crypto_count ;++i) {
+                if ((pj_stricmp(&srtp->setting.crypto[i].name,
+                                &loc_crypto[0].name) == 0) &&
+                    (pj_stricmp(&srtp->setting.crypto[i].key,
+                                 &loc_crypto[0].key) != 0))
+                {
+                    pj_strdup(pool, &srtp->setting.crypto[i].key,
+                              &loc_crypto[0].key);
+                }
+            }
+	}
+
+        return PJ_SUCCESS;
+    }
 
     /* Check remote media transport & set local media transport
      * based on SRTP usage option.
@@ -717,14 +748,14 @@
 	    return PJMEDIA_SRTP_ECRYPTONOTMATCH;
 	}
 
-	/* Find the crypto from the setting. */
-	for (j = 0; j < (int)srtp->setting.crypto_count; ++j) {
-	    if (pj_stricmp(&tmp_tx_crypto.name, 
-			   &srtp->setting.crypto[j].name) == 0) 
+	/* Find the crypto from the local crypto. */
+	for (j = 0; j < (int)loc_cryto_cnt; ++j) {
+	    if (pj_stricmp(&tmp_tx_crypto.name,
+			   &loc_crypto[j].name) == 0)
 	    {
-		srtp->tx_policy_neg = srtp->setting.crypto[j];
+		srtp->tx_policy_neg = loc_crypto[j];
 		break;
-	    }		
+	    }
 	}
 
 	srtp->rx_policy_neg = tmp_tx_crypto;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/transport_udp.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/transport_udp.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/transport_udp.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/transport_udp.c	2022-02-24 07:54:38.000000000 +0000
@@ -37,6 +37,13 @@
 /* Maximum pending write operations */
 #define MAX_PENDING 4
 
+#if 1
+#  define TRACE_(expr)
+#else
+#  define TRACE_(expr) PJ_LOG(3,expr)
+#endif
+
+
 /* Pending write buffer */
 typedef struct pending_write
 {
@@ -288,7 +295,6 @@
     pj_pool_t *pool;
     pj_ioqueue_t *ioqueue;
     pj_ioqueue_callback rtp_cb, rtcp_cb;
-    unsigned i;
     pj_status_t status;
 
 
@@ -356,6 +362,7 @@
     if (status != PJ_SUCCESS)
 	goto on_error;
 
+#if 0 // See #2097: move read op kick-off to media_start()
     pj_ioqueue_op_key_init(&tp->rtp_read_op, sizeof(tp->rtp_read_op));
     for (i=0; i<PJ_ARRAY_SIZE(tp->rtp_pending_write); ++i) {
         tp->rtp_pending_write[i].is_pending = PJ_FALSE;
@@ -363,7 +370,6 @@
 			       sizeof(tp->rtp_pending_write[i].op_key));
     }
 
-#if 0 // See #2097: move read op kick-off to media_start()
     /* Kick of pending RTP read from the ioqueue */
     tp->rtp_addrlen = sizeof(tp->rtp_src_addr);
     size = sizeof(tp->rtp_pkt);
@@ -388,11 +394,10 @@
     if (status != PJ_SUCCESS)
 	goto on_error;
 
+#if 0 // See #2097: move read op kick-off to media_start()
     pj_ioqueue_op_key_init(&tp->rtcp_read_op, sizeof(tp->rtcp_read_op));
     pj_ioqueue_op_key_init(&tp->rtcp_write_op, sizeof(tp->rtcp_write_op));
 
-
-#if 0 // See #2097: move read op kick-off to media_start()
     /* Kick of pending RTCP read from the ioqueue */
     size = sizeof(tp->rtcp_pkt);
     tp->rtcp_addr_len = sizeof(tp->rtcp_src_addr);
@@ -451,6 +456,7 @@
 	udp->rtcp_sock = PJ_INVALID_SOCKET;
     }
 
+    PJ_LOG(4,(udp->base.name, "UDP media transport destroyed"));
     pj_pool_release(udp->pool);
 
     return PJ_SUCCESS;
@@ -511,11 +517,16 @@
 
     PJ_UNUSED_ARG(op_key);
 
-    if (-bytes_read == PJ_ECANCELLED) return;
-
     udp = (struct transport_udp*) pj_ioqueue_get_user_data(key);
 
+    if (-bytes_read == PJ_ECANCELLED) {
+	TRACE_((udp->base.name, "on_rx_rtp(): got PJ_ECANCELLED"));
+	return;
+    }
+
     if (-bytes_read == PJ_ESOCKETSTOP) {
+	TRACE_((udp->base.name, "on_rx_rtp(): got PJ_ESOCKETSTOP"));
+
 	/* Try to recover by restarting the transport. */
 	status = transport_restart(PJ_TRUE, udp);
 	if (status != PJ_SUCCESS) {
@@ -620,6 +631,7 @@
 		}
 	    }
 	    bytes_read = -status;
+	    TRACE_((udp->base.name, "on_rx_rtp(): recvfrom error=%d", status));
 	}
     } while (status != PJ_EPENDING && status != PJ_ECANCELLED &&
 	     udp->started);
@@ -657,11 +669,16 @@
 
     PJ_UNUSED_ARG(op_key);
 
-    if (-bytes_read == PJ_ECANCELLED) return;
-
     udp = (struct transport_udp*) pj_ioqueue_get_user_data(key);
 
+    if (-bytes_read == PJ_ECANCELLED) {
+	TRACE_((udp->base.name, "on_rx_rtcp(): got PJ_ECANCELLED"));
+	return;
+    }
+
     if (-bytes_read == PJ_ESOCKETSTOP) {
+	TRACE_((udp->base.name, "on_rx_rtcp(): got PJ_ESOCKETSTOP"));
+
 	/* Try to recover by restarting the transport. */
 	status = transport_restart(PJ_FALSE, udp);
 	if (status != PJ_SUCCESS) {
@@ -740,6 +757,7 @@
 		}
 	    }
 	    bytes_read = -status;
+	    TRACE_((udp->base.name, "on_rx_rtcp(): recvfrom error=%d", status));
 	}	
     } while (status != PJ_EPENDING && status != PJ_ECANCELLED &&
 	     udp->started);
@@ -806,12 +824,16 @@
     udp->use_rtcp_mux = (pj_sockaddr_has_addr(rem_addr) &&
 			 pj_sockaddr_cmp(rem_addr, rem_rtcp) == 0);
 
+    TRACE_((udp->base.name, "attach(): before locking keys"));
+
     /* Lock the ioqueue keys to make sure that callbacks are
      * not executed. See ticket #844 for details.
      */
     pj_ioqueue_lock_key(udp->rtp_key);
     pj_ioqueue_lock_key(udp->rtcp_key);
 
+    TRACE_((udp->base.name, "attach(): inside locked keys"));
+
     /* "Attach" the application: */
 
     rem_addr_len = sizeof(pj_sockaddr);
@@ -912,6 +934,8 @@
     pj_ioqueue_unlock_key(udp->rtcp_key);
     pj_ioqueue_unlock_key(udp->rtp_key);
 
+    PJ_LOG(4,(udp->base.name, "UDP media transport attached"));
+
     return PJ_SUCCESS;
 }
 
@@ -956,14 +980,17 @@
 
     //if (udp->attached) {
     if (1) {
-	int i;
-
 	/* Lock the ioqueue keys to make sure that callbacks are
 	 * not executed. See ticket #460 for details.
 	 */
+
+	TRACE_((udp->base.name, "detach(): before locking keys"));
+
 	pj_ioqueue_lock_key(udp->rtp_key);
 	pj_ioqueue_lock_key(udp->rtcp_key);
 
+	TRACE_((udp->base.name, "detach(): inside locked keys"));
+
 	/* User data is unreferenced on Release build */
 	PJ_UNUSED_ARG(user_data);
 
@@ -979,17 +1006,18 @@
 	udp->rtcp_cb = NULL;
 	udp->user_data = NULL;
 
-	/* Cancel any outstanding send */
-	for (i=0; i<PJ_ARRAY_SIZE(udp->rtp_pending_write); ++i) {
-	    pj_ioqueue_post_completion(udp->rtp_key,
-				       &udp->rtp_pending_write[i].op_key, 0);
-	    udp->rtp_pending_write[i].is_pending = PJ_FALSE;
-	}
-	pj_ioqueue_post_completion(udp->rtcp_key, &udp->rtcp_write_op, 0);
+	/* Cancel any outstanding operations */
+	pj_ioqueue_clear_key(udp->rtp_key);
+	pj_ioqueue_clear_key(udp->rtcp_key);
+
+	/* Set key status to 'stopped' as keys have been cleared */
+	udp->started = PJ_FALSE;
 
 	/* Unlock keys */
 	pj_ioqueue_unlock_key(udp->rtcp_key);
 	pj_ioqueue_unlock_key(udp->rtp_key);
+
+	PJ_LOG(4,(udp->base.name, "UDP media transport detached"));
     }
 }
 
@@ -1120,6 +1148,8 @@
     PJ_UNUSED_ARG(sdp_remote);
     PJ_UNUSED_ARG(media_index);
 
+    PJ_LOG(4,(udp->base.name, "UDP media transport created"));
+
     return PJ_SUCCESS;
 }
 
@@ -1200,6 +1230,7 @@
     return PJ_SUCCESS;
 }
 
+
 static pj_status_t transport_media_start(pjmedia_transport *tp,
 				  pj_pool_t *pool,
 				  const pjmedia_sdp_session *sdp_local,
@@ -1209,6 +1240,7 @@
     struct transport_udp *udp = (struct transport_udp*)tp;
     pj_ssize_t size;
     pj_status_t status;
+    unsigned i;
 
     PJ_ASSERT_RETURN(tp, PJ_EINVAL);
 
@@ -1218,8 +1250,21 @@
     PJ_UNUSED_ARG(media_index);
 
     /* Just return success if there is already pending read */
-    if (udp->started)
+    if (udp->started) {
+	PJ_LOG(5,(udp->base.name, "UDP media transport already started"));
 	return PJ_SUCCESS;
+    }
+
+    pj_ioqueue_op_key_init(&udp->rtp_read_op, sizeof(udp->rtp_read_op));
+    for (i=0; i<PJ_ARRAY_SIZE(udp->rtp_pending_write); ++i) {
+	pj_ioqueue_op_key_init(&udp->rtp_pending_write[i].op_key, 
+			       sizeof(udp->rtp_pending_write[i].op_key));
+    }
+
+    pj_ioqueue_op_key_init(&udp->rtcp_read_op, sizeof(udp->rtcp_read_op));
+    pj_ioqueue_op_key_init(&udp->rtcp_write_op, sizeof(udp->rtcp_write_op));
+
+    TRACE_((udp->base.name, "media_start(): before recvfrom RTP"));
 
     /* Kick off pending RTP read from the ioqueue */
     udp->rtp_addrlen = sizeof(udp->rtp_src_addr);
@@ -1227,8 +1272,13 @@
     status = pj_ioqueue_recvfrom(udp->rtp_key, &udp->rtp_read_op,
 			         udp->rtp_pkt, &size, PJ_IOQUEUE_ALWAYS_ASYNC,
 				 &udp->rtp_src_addr, &udp->rtp_addrlen);
-    if (status != PJ_EPENDING)
+    if (status != PJ_EPENDING) {
+	PJ_PERROR(3, (udp->base.name, status,
+		      "media_start(): recvfrom RTP failed"));
 	return status;
+    }
+
+    TRACE_((udp->base.name, "media_start(): before recvfrom RTCP"));
 
     /* Kick off pending RTCP read from the ioqueue */
     udp->rtcp_addr_len = sizeof(udp->rtcp_src_addr);
@@ -1237,11 +1287,17 @@
 				 udp->rtcp_pkt, &size,
 				 PJ_IOQUEUE_ALWAYS_ASYNC,
 				 &udp->rtcp_src_addr, &udp->rtcp_addr_len);
-    if (status != PJ_EPENDING)
+    if (status != PJ_EPENDING) {
+	PJ_PERROR(3, (udp->base.name, status,
+		      "media_start(): recvfrom RTCP failed"));
+	pj_ioqueue_clear_key(udp->rtp_key);
 	return status;
+    }
 
     udp->started = PJ_TRUE;
 
+    PJ_LOG(4,(udp->base.name, "UDP media transport started"));
+
     return PJ_SUCCESS;
 }
 
@@ -1252,17 +1308,18 @@
     PJ_ASSERT_RETURN(tp, PJ_EINVAL);
 
     /* Just return success if there is no pending read */
-    if (!udp->started)
+    if (!udp->started) {
+	PJ_LOG(5, (udp->base.name, "UDP media transport already stopped"));
 	return PJ_SUCCESS;
+    }
 
-    pj_ioqueue_post_completion(udp->rtp_key, &udp->rtp_read_op,
-			       -PJ_ECANCELLED);
-
-    pj_ioqueue_post_completion(udp->rtcp_key, &udp->rtcp_read_op,
-			       -PJ_ECANCELLED);
+    pj_ioqueue_clear_key(udp->rtp_key);
+    pj_ioqueue_clear_key(udp->rtcp_key);
 
     udp->started = PJ_FALSE;
 
+    PJ_LOG(4, (udp->base.name, "UDP media transport stopped"));
+
     return PJ_SUCCESS;
 }
 
@@ -1286,6 +1343,24 @@
 static pj_status_t transport_restart(pj_bool_t is_rtp, 
 				     struct transport_udp *udp)
 {
+    PJ_UNUSED_ARG(udp);
+    PJ_UNUSED_ARG(is_rtp);
+
+    return PJ_ENOTSUP;
+
+/* This code is disabled for the following reason (see also #2881):
+ * The following code will set ioqueue key to NULL or replace with a new one,
+ * and that may introduces issues, e.g:
+ * - this code is invoked from on_rx_rtp/rtcp(), which is invoked by
+ *   ioqueue_dispatch_read_event(), which may need to unlock ioqueue key
+ *   after returning from the callback (when allow_concurrent is false),
+ *   if the ioqueue key has been unregistered by this code, a crash may occur
+ *   when unlocking the invalid ioqueue key.
+ * - this code may set ioqueue key to NULL, while other code may assume
+ *   it may never be changed to NULL, and cause crash, e.g: transport_detach().
+ */
+#if 0
+
     pj_ioqueue_key_t *key = (is_rtp ? udp->rtp_key : udp->rtcp_key);
     pj_sock_t *sock = (is_rtp ? &udp->rtp_sock : &udp->rtcp_sock);
     pj_status_t status;
@@ -1390,4 +1465,6 @@
     PJ_PERROR(1, (udp->base.name, status, 
 		 "Error restarting %s transport", (is_rtp)?"RTP":"RTCP"));
     return status;
+
+#endif
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/vid_conf.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/vid_conf.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/vid_conf.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/vid_conf.c	2022-02-24 07:54:38.000000000 +0000
@@ -36,6 +36,9 @@
  */
 #define AUTO_STOP_CLOCK 0
 
+/* Maximum number of consecutive errors that will only be printed once. */
+#define MAX_ERR_COUNT 150
+
 /* Clockrate for video timestamp unit */
 #define TS_CLOCK_RATE	90000
 
@@ -84,10 +87,12 @@
     unsigned		 idx;		/**< Port index.		    */
     pj_str_t		 name;		/**< Port name.			    */
     pjmedia_port	*port;		/**< Video port.		    */
+    pjmedia_format	 format;	/**< Copy of port format info.	    */
     pj_uint32_t		 ts_interval;	/**< Port put/get interval.	    */
     pj_timestamp	 ts_next;	/**< Time for next put/get_frame(). */
     void		*get_buf;	/**< Buffer for get_frame().	    */
     pj_size_t		 get_buf_size;	/**< Buffer size for get_frame().   */
+    pj_bool_t		 got_frame;	/**< Last get_frame() got frame?    */
     void		*put_buf;	/**< Buffer for put_frame().	    */
     pj_size_t		 put_buf_size;	/**< Buffer size for put_frame().   */
 
@@ -99,6 +104,9 @@
     pj_pool_t	       **render_pool;	/**< Array of pool for render state */
     render_state       **render_states;	/**< Array of render_state (one for
 					     each transmitter).		    */
+
+    pj_status_t		  last_err;	/**< Last error status.		    */
+    unsigned		  last_err_cnt;	/**< Last error count.		    */
 } vconf_port;
 
 
@@ -263,6 +271,7 @@
     /* Set pool, port, index, and name */
     cport->pool = pool;
     cport->port = port;
+    cport->format = port->info.fmt;
     cport->idx  = index;
     pj_strdup_with_null(pool, &cport->name, name);
 
@@ -296,6 +305,7 @@
 	    PJ_LOG(4,(THIS_FILE, "pjmedia_vid_conf_add_port(): "
 				 "unrecognized format %04X",
 				 port->info.fmt.id));
+	    pj_mutex_unlock(vid_conf->mutex);
 	    return PJMEDIA_EBADFMT;
 	}
 
@@ -306,6 +316,7 @@
 	    PJ_LOG(4,(THIS_FILE, "pjmedia_vid_conf_add_port(): "
 				 "Failed to apply format %04X",
 				 port->info.fmt.id));
+	    pj_mutex_unlock(vid_conf->mutex);
 	    return status;
 	}
 	if (port->put_frame) {
@@ -323,28 +334,41 @@
 			    pj_pool_zalloc(pool,
 					   vid_conf->opt.max_slot_cnt *
 					   sizeof(unsigned));
-    PJ_ASSERT_RETURN(cport->listener_slots, PJ_ENOMEM);
+    if (!cport->listener_slots) {	
+	pj_mutex_unlock(vid_conf->mutex);
+	return PJ_ENOMEM;
+    }
 
     /* Create transmitter array */
     cport->transmitter_slots = (unsigned*)
 			       pj_pool_zalloc(pool,
 					      vid_conf->opt.max_slot_cnt *
-					      sizeof(unsigned));
-    PJ_ASSERT_RETURN(cport->transmitter_slots, PJ_ENOMEM);
+					      sizeof(unsigned));    
+    if (!cport->transmitter_slots) {
+	pj_mutex_unlock(vid_conf->mutex);
+	return PJ_ENOMEM;
+    }
 
     /* Create pointer-to-render_state array */
     cport->render_states = (render_state**)
 			   pj_pool_zalloc(pool,
 					  vid_conf->opt.max_slot_cnt *
 					  sizeof(render_state*));
-    PJ_ASSERT_RETURN(cport->render_states, PJ_ENOMEM);
+
+    if (!cport->render_states) {
+	pj_mutex_unlock(vid_conf->mutex);
+	return PJ_ENOMEM;
+    }
 
     /* Create pointer-to-render-pool array */
     cport->render_pool = (pj_pool_t**)
 			 pj_pool_zalloc(pool,
 					vid_conf->opt.max_slot_cnt *
-					sizeof(pj_pool_t*));
-    PJ_ASSERT_RETURN(cport->render_pool, PJ_ENOMEM);
+					sizeof(pj_pool_t*));    
+    if (!cport->render_pool) {
+	pj_mutex_unlock(vid_conf->mutex);
+	return PJ_ENOMEM;
+    }
 
     /* Register the conf port. */
     vid_conf->ports[index] = cport;
@@ -412,6 +436,7 @@
 	status = pjmedia_clock_stop(vid_conf->clock);
 	if (status != PJ_SUCCESS) {
 	    PJ_PERROR(4, (THIS_FILE, status, "Failed to stop clock"));
+	    pj_mutex_unlock(vid_conf->mutex);
 	    return status;
 	}
     }
@@ -552,6 +577,7 @@
 	    status = pjmedia_clock_start(vid_conf->clock);
 	    if (status != PJ_SUCCESS) {
 		PJ_PERROR(4, (THIS_FILE, status, "Failed to start clock"));
+		pj_mutex_unlock(vid_conf->mutex);
 		return status;
 	    }
 	}
@@ -608,10 +634,9 @@
 	    break;
     }
 
-    if (i != src_port->listener_cnt) {
+    if (i != src_port->listener_cnt && j != dst_port->transmitter_cnt) {
 	unsigned k;
 
-	pj_assert(j != dst_port->transmitter_cnt);
 	pj_assert(src_port->listener_cnt > 0 && 
 		  src_port->listener_cnt < vid_conf->opt.max_slot_cnt);
 	pj_assert(dst_port->transmitter_cnt > 0 && 
@@ -642,6 +667,7 @@
 	    status = pjmedia_clock_stop(vid_conf->clock);
 	    if (status != PJ_SUCCESS) {
 		PJ_PERROR(4, (THIS_FILE, status, "Failed to stop clock"));
+		pj_mutex_unlock(vid_conf->mutex);
 		return status;
 	    }
 	}
@@ -681,7 +707,7 @@
 		    ci<vid_conf->port_cnt; ++i)
     {
 	unsigned j;
-	pj_bool_t got_frame = PJ_FALSE;
+	pj_bool_t frame_rendered = PJ_FALSE;
 	pj_bool_t ts_incremented = PJ_FALSE;
 	vconf_port *sink = vid_conf->ports[i];
 
@@ -707,8 +733,14 @@
 	if (ts_diff < 0 || ts_diff > TS_CLOCK_RATE)
 	    continue;
 
-	/* Clean up sink put buffer (should we draw black instead?) */
-	//pj_bzero(sink->put_buf, sink->put_buf_size);
+    	/* There is a possibility that the sink port's format has
+    	 * changed, but we haven't received the event yet.
+    	 */
+    	if (pj_memcmp(&sink->format, &sink->port->info.fmt,
+    		      sizeof(pjmedia_format)))
+    	{
+    	    pjmedia_vid_conf_update_port(vid_conf, i);
+    	}
 
 	/* Iterate transmitters of this sink port */
 	for (j=0; j < sink->transmitter_cnt; ++j) {
@@ -735,8 +767,11 @@
 		status = pjmedia_port_get_frame(src->port, &frame);
 		if (status != PJ_SUCCESS) {
 		    PJ_PERROR(5, (THIS_FILE, status,
-				  "Failed to get frame from port [%s]!",
-				  src->port->info.name.ptr));
+				  "Failed to get frame from port %d [%s]!",
+				  src->idx, src->port->info.name.ptr));
+		    src->got_frame = PJ_FALSE;
+		} else {
+		    src->got_frame = (frame.size == src->get_buf_size);
 		}
 
 		/* Update next src put/get */
@@ -744,18 +779,21 @@
 		ts_incremented = src==sink;
 	    }
 
-	    /* Render src get buffer to sink put buffer (based on sink layout
-	     * settings, if any)
-	     */
-	    status = render_src_frame(src, sink, j);
-	    if (status != PJ_SUCCESS) {
-		PJ_PERROR(5, (THIS_FILE, status,
-			      "Failed to render frame from port [%s] to [%s]",
-			      src->port->info.name.ptr,
-			      sink->port->info.name.ptr));
+	    if (src->got_frame) {
+		/* Render src get buffer to sink put buffer (based on
+		 * sink layout settings, if any)
+		 */
+		status = render_src_frame(src, sink, j);
+		if (status == PJ_SUCCESS) {
+		    frame_rendered = PJ_TRUE;
+		} else {
+		    PJ_PERROR(5, (THIS_FILE, status,
+				  "Failed to render frame from port %d [%s] "
+				  "to port %d [%s]",
+				  src->idx, src->port->info.name.ptr,
+				  sink->idx, sink->port->info.name.ptr));
+		}
 	    }
-
-	    got_frame = PJ_TRUE;
 	}
 
 	/* Call sink->put_frame()
@@ -766,15 +804,27 @@
 	pj_bzero(&frame, sizeof(frame));
 	frame.type = PJMEDIA_FRAME_TYPE_VIDEO;
 	frame.timestamp = *now;
-	if (got_frame) {
+	if (frame_rendered) {
 	    frame.buf = sink->put_buf;
 	    frame.size = sink->put_buf_size;
 	}
 	status = pjmedia_port_put_frame(sink->port, &frame);
-	if (status != PJ_SUCCESS) {
-	    PJ_PERROR(5, (THIS_FILE, status,
-			  "Failed to put frame to port [%s]!",
-			  sink->port->info.name.ptr));
+	if (frame_rendered && status != PJ_SUCCESS) {
+	    sink->last_err_cnt++;
+	    if (sink->last_err != status ||
+	        sink->last_err_cnt % MAX_ERR_COUNT == 0)
+	    {
+		if (sink->last_err != status)
+		    sink->last_err_cnt = 1;
+		sink->last_err = status;
+	    	PJ_PERROR(5, (THIS_FILE, status,
+			      "Failed (%d time(s)) to put frame to port %d"
+			      " [%s]!", sink->last_err_cnt,
+			      sink->idx, sink->port->info.name.ptr));
+	    }
+	} else {
+	    sink->last_err = status;
+	    sink->last_err_cnt = 0;
 	}
 
 	/* Update next put/get, careful that it may have been updated
@@ -838,6 +888,7 @@
     }
 }
 
+
 /* This function will do:
  * - Recalculate layout setting, i.e: get video pos and size
  *   for each transmitter
@@ -852,6 +903,31 @@
     unsigned i;
     pj_status_t status;
 
+    fmt_id = cp->port->info.fmt.id;
+    size   = cp->port->info.fmt.det.vid.size;
+
+    /* Initialize sink buffer with black color. */
+    if (cp->port->put_frame) {
+	status = pjmedia_video_format_fill_black(&cp->port->info.fmt,
+						 cp->put_buf,
+						 cp->put_buf_size);
+	if (status != PJ_SUCCESS) {
+	    PJ_PERROR(4,(THIS_FILE, status,
+			 "Warning: failed to init sink buffer with black"));
+	}
+    }
+
+    /* Initialize source buffer with black color. */
+    if (cp->port->get_frame) {
+	status = pjmedia_video_format_fill_black(&cp->port->info.fmt,
+						 cp->get_buf,
+						 cp->get_buf_size);
+	if (status != PJ_SUCCESS) {
+	    PJ_PERROR(4,(THIS_FILE, status,
+			 "Warning: failed to init source buffer with black"));
+	}
+    }
+
     /* Nothing to render, just return */
     if (cp->transmitter_cnt == 0)
 	return;
@@ -859,8 +935,6 @@
     TRACE_((THIS_FILE, "Updating render state for port id %d (%d sources)..",
 	    cp->idx, cp->transmitter_cnt));
 
-    fmt_id = cp->port->info.fmt.id;
-    size   = cp->port->info.fmt.det.vid.size;
     for (i = 0; i < cp->transmitter_cnt; ++i) {
 	vconf_port *tr = vid_conf->ports[cp->transmitter_slots[i]];
 
@@ -1031,9 +1105,19 @@
     pj_status_t status;
     render_state *rs = sink->render_states[transmitter_idx];
 
+    /* There is a possibility that the sink port's format has
+     * changed, but we haven't received the event yet.
+     */
+    if (pj_memcmp(&sink->format, &sink->port->info.fmt,
+    		  sizeof(pjmedia_format)))
+    {
+    	return PJMEDIA_EVID_BADFORMAT;
+    }
+
     if (sink->transmitter_cnt == 1 && (!rs || !rs->converter)) {
 	/* The only transmitter and no conversion needed */
-	pj_assert(src->get_buf_size <= sink->put_buf_size);
+	if (src->get_buf_size != sink->put_buf_size)
+	    return PJMEDIA_EVID_BADFORMAT;
 	pj_memcpy(sink->put_buf, src->get_buf, src->get_buf_size);
     } else if (rs && rs->converter) {
 	pjmedia_frame src_frame, dst_frame;
@@ -1065,6 +1149,122 @@
 
     return PJ_SUCCESS;
 }
+
+
+/* Update or refresh port states from video port info. */
+PJ_DEF(pj_status_t) pjmedia_vid_conf_update_port( pjmedia_vid_conf *vid_conf,
+						  unsigned slot)
+{
+    vconf_port *cport;
+    pjmedia_format old_fmt;
+    pjmedia_format new_fmt;
+
+    PJ_ASSERT_RETURN(vid_conf && slot<vid_conf->opt.max_slot_cnt, PJ_EINVAL);
+
+    pj_mutex_lock(vid_conf->mutex);
+
+    /* Port must be valid. */
+    cport = vid_conf->ports[slot];
+    if (cport == NULL) {
+	pj_mutex_unlock(vid_conf->mutex);
+	return PJ_EINVAL;
+    }
+
+    /* Get the old & new formats */
+    old_fmt = cport->format;
+    new_fmt = cport->port->info.fmt;
+
+    /* Update put/get_frame() intervals */
+    if (pj_memcmp(&new_fmt.det.vid.fps, &old_fmt.det.vid.fps,
+		  sizeof(pjmedia_ratio)))
+    {
+	pjmedia_ratio *fps = &new_fmt.det.vid.fps;
+	pj_uint32_t vconf_interval = (pj_uint32_t)
+				     (TS_CLOCK_RATE * 1.0 /
+				     vid_conf->opt.frame_rate);
+	cport->ts_interval = (pj_uint32_t)(TS_CLOCK_RATE * 1.0 /
+					   fps->num * fps->denum);
+
+	/* Normalize the interval */
+	if (cport->ts_interval < vconf_interval) {
+	    cport->ts_interval = vconf_interval;
+	    PJ_LOG(3,(THIS_FILE, "Warning: frame rate of port %s is higher "
+				 "than video conference bridge (%d > %d)",
+				 cport->name.ptr, (int)(fps->num/fps->denum),
+				 vid_conf->opt.frame_rate));
+	}
+
+	PJ_LOG(4,(THIS_FILE,
+		  "Port %d (%s): updated frame rate %d -> %d",
+		  slot, cport->name.ptr,
+		  (int)(old_fmt.det.vid.fps.num/old_fmt.det.vid.fps.denum),
+		  (int)(fps->num/fps->denum)));
+    }
+
+    /* Update buffer for put/get_frame() */
+    if (new_fmt.id != old_fmt.id ||
+	pj_memcmp(&new_fmt.det.vid.size, &old_fmt.det.vid.size,
+		  sizeof(pjmedia_rect_size)))
+    {
+	const pjmedia_video_format_info *vfi;
+	pjmedia_video_apply_fmt_param vafp;
+	pj_status_t status;
+	unsigned i;
+
+	vfi = pjmedia_get_video_format_info(NULL, new_fmt.id);
+	if (!vfi) {
+	    PJ_LOG(1,(THIS_FILE, "pjmedia_vid_conf_update_port(): "
+				 "unrecognized format %04X",
+				 new_fmt.id));
+	    pj_mutex_unlock(vid_conf->mutex);
+	    return PJMEDIA_EBADFMT;
+	}
+
+	pj_bzero(&vafp, sizeof(vafp));
+	vafp.size = new_fmt.det.vid.size;
+	status = (*vfi->apply_fmt)(vfi, &vafp);
+	if (status != PJ_SUCCESS) {
+	    PJ_LOG(1,(THIS_FILE, "pjmedia_vid_conf_update_port(): "
+				 "Failed to apply format %04X",
+				 new_fmt.id));
+	    pj_mutex_unlock(vid_conf->mutex);
+	    return status;
+	}
+	if (cport->port->put_frame) {
+	    if (cport->put_buf_size < vafp.framebytes)
+		cport->put_buf = pj_pool_zalloc(cport->pool, vafp.framebytes);
+	    cport->put_buf_size = vafp.framebytes;
+	}
+	if (cport->port->get_frame) {
+	    if (cport->get_buf_size < vafp.framebytes)
+		cport->get_buf = pj_pool_zalloc(cport->pool, vafp.framebytes);
+	    cport->get_buf_size = vafp.framebytes;
+	    cport->got_frame = PJ_FALSE;
+	}
+
+	/* Update render state */
+	update_render_state(vid_conf, cport);
+
+	/* Update render state of listeners */
+	for (i=0; i < cport->listener_cnt; ++i) {
+	    vconf_port *sink = vid_conf->ports[cport->listener_slots[i]];
+	    update_render_state(vid_conf, sink);
+	}
+
+	PJ_LOG(4,(THIS_FILE,
+		  "Port %d (%s): updated frame size %dx%d -> %dx%d",
+		  slot, cport->name.ptr,
+		  old_fmt.det.vid.size.w, old_fmt.det.vid.size.h,
+		  new_fmt.det.vid.size.w, new_fmt.det.vid.size.h));
+    }
+
+
+    /* Update cport format info */
+    cport->format = new_fmt;
+    pj_mutex_unlock(vid_conf->mutex);
+
+    return PJ_SUCCESS;
+}
 
 
 #endif /* PJMEDIA_HAS_VIDEO */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/vid_port.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/vid_port.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/vid_port.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/vid_port.c	2022-02-24 07:54:38.000000000 +0000
@@ -111,6 +111,7 @@
     pjmedia_frame           *frm_buf;
     pj_size_t                frm_buf_size;
     pj_mutex_t              *frm_mutex;
+    pj_size_t		     src_size;
 };
 
 struct vid_pasv_port
@@ -184,6 +185,12 @@
 
 static pj_status_t create_converter(pjmedia_vid_port *vp)
 {
+    pj_status_t status;
+    pjmedia_video_apply_fmt_param vafp;
+
+    status = get_vfi(&vp->conv.conv_param.src, NULL, &vafp);
+    vp->src_size = vafp.framebytes;
+
     if (vp->conv.conv) {
         pjmedia_converter_destroy(vp->conv.conv);
 	vp->conv.conv = NULL;
@@ -196,8 +203,6 @@
 	(vp->conv.conv_param.src.det.vid.size.h !=
          vp->conv.conv_param.dst.det.vid.size.h))
     {
-	pj_status_t status;
-
 	/* Yes, we need converter */
 	status = pjmedia_converter_create(NULL, vp->pool, &vp->conv.conv_param,
 					  &vp->conv.conv);
@@ -210,9 +215,6 @@
     if (vp->conv.conv ||
         (vp->role==ROLE_ACTIVE && (vp->dir & PJMEDIA_DIR_ENCODING)))
     {
-	pj_status_t status;
-	pjmedia_video_apply_fmt_param vafp;
-
 	/* Allocate buffer for conversion */
 	status = get_vfi(&vp->conv.conv_param.dst, NULL, &vafp);
 	if (status != PJ_SUCCESS)
@@ -670,6 +672,15 @@
         vp->frm_buf->size = vp->frm_buf_size;
         vp->frm_buf->type = PJMEDIA_FRAME_TYPE_NONE;
 
+	/* Initialize buffer with black color */
+	status = pjmedia_video_format_fill_black(&vp->conv.conv_param.src,
+						 vp->frm_buf->buf,
+						 vp->frm_buf_size);
+	if (status != PJ_SUCCESS) {
+	    PJ_PERROR(4,(THIS_FILE, status,
+			 "Warning: failed to init buffer with black"));
+	}
+
         status = pj_mutex_create_simple(pool, vp->dev_name.ptr,
                                         &vp->frm_mutex);
         if (status != PJ_SUCCESS)
@@ -742,6 +753,18 @@
     return pjmedia_event_subscribe(NULL, &client_port_event_cb, vp, port);
 }
 
+
+PJ_DEF(pj_status_t) pjmedia_vid_port_unsubscribe_event(
+						pjmedia_vid_port *vp,
+						pjmedia_port *port)
+{
+    PJ_ASSERT_RETURN(vp && port, PJ_EINVAL);
+
+    /* Unsubscribe to port's events */
+    return pjmedia_event_unsubscribe(NULL, &client_port_event_cb, vp, port);
+}
+
+
 PJ_DEF(pj_status_t) pjmedia_vid_port_connect(pjmedia_vid_port *vp,
 					      pjmedia_port *port,
 					      pj_bool_t destroy)
@@ -783,40 +806,19 @@
 
     PJ_ASSERT_RETURN(vp, PJ_EINVAL);
 
+    /* Initialize buffer with black color */
+    status = pjmedia_video_format_fill_black(&vp->conv.conv_param.src,
+					     vp->frm_buf->buf,
+					     vp->frm_buf_size);
+    if (status != PJ_SUCCESS) {
+        PJ_PERROR(4,(THIS_FILE, status,
+		     "Warning: failed to init buffer with black"));
+    }
+
     status = pjmedia_vid_dev_stream_start(vp->strm);
     if (status != PJ_SUCCESS)
 	goto on_error;
 
-    /* Initialize buffer with black color */
-    {
-        const pjmedia_video_format_info *vfi;
-        const pjmedia_format *fmt;
-	pjmedia_video_apply_fmt_param vafp;
-	pjmedia_frame frame;
-
-	pj_bzero(&frame, sizeof(pjmedia_frame));
-	frame.buf = vp->frm_buf->buf;
-	frame.size = vp->frm_buf_size;
-
-	fmt = &vp->conv.conv_param.src;
-	status = get_vfi(fmt, &vfi, &vafp);
-	if (status == PJ_SUCCESS && frame.buf) {
-	    frame.type = PJMEDIA_FRAME_TYPE_VIDEO;
-	    pj_assert(frame.size >= vafp.framebytes);
-	    frame.size = vafp.framebytes;
-	    
-	    if (vfi->color_model == PJMEDIA_COLOR_MODEL_RGB) {
-	    	pj_memset(frame.buf, 0, vafp.framebytes);
-	    } else if (fmt->id == PJMEDIA_FORMAT_I420 ||
-	  	       fmt->id == PJMEDIA_FORMAT_YV12)
-	    {	    	
-	    	pj_memset(frame.buf, 16, vafp.plane_bytes[0]);
-	    	pj_memset((pj_uint8_t*)frame.buf + vafp.plane_bytes[0],
-		      	  0x80, vafp.plane_bytes[1] * 2);
-	    }
-        }
-    }
-
     if (vp->clock) {
 	status = pjmedia_clock_start(vp->clock);
 	if (status != PJ_SUCCESS)
@@ -856,18 +858,26 @@
 
     PJ_LOG(4,(THIS_FILE, "Closing %s..", vp->dev_name.ptr));
 
+    /* Unsubscribe events first, otherwise the event callbacks can be called
+     * and try to access already destroyed objects.
+     */
+    if (vp->strm) {
+        pjmedia_event_unsubscribe(NULL, &vidstream_event_cb, vp, vp->strm);
+    }
+    if (vp->client_port) {
+        pjmedia_event_unsubscribe(NULL, &client_port_event_cb, vp,
+                                  vp->client_port);
+    }
+
     if (vp->clock) {
 	pjmedia_clock_destroy(vp->clock);
 	vp->clock = NULL;
     }
     if (vp->strm) {
-        pjmedia_event_unsubscribe(NULL, &vidstream_event_cb, vp, vp->strm);
 	pjmedia_vid_dev_stream_destroy(vp->strm);
 	vp->strm = NULL;
     }
     if (vp->client_port) {
-        pjmedia_event_unsubscribe(NULL, &client_port_event_cb, vp,
-                                  vp->client_port);
 	if (vp->destroy_client_port)
 	    pjmedia_port_destroy(vp->client_port);
 	vp->client_port = NULL;
@@ -1332,6 +1342,20 @@
          */
         pj_status_t status;
         pjmedia_frame frame_;
+
+	if (frame->size != vp->src_size) {
+    	    if (frame->size > 0) {
+    	    	PJ_LOG(4, (THIS_FILE, "Unexpected frame size %d, expected %d",
+    			      	      frame->size, vp->src_size));
+    	    }
+
+    	    pj_memcpy(&frame_, frame, sizeof(pjmedia_frame));
+    	    frame_.buf = NULL;
+    	    frame_.size = 0;
+
+    	    /* Send heart beat for updating timestamp or keep-alive. */
+	    return pjmedia_vid_dev_stream_put_frame(vp->strm, &frame_);
+	}
         
         pj_bzero(&frame_, sizeof(frame_));
         status = convert_frame(vp, frame, &frame_);
@@ -1345,7 +1369,8 @@
          * frame in the buffer.
          * The encoding counterpart is located in vidstream_cap_cb()
          */
-        copy_frame_to_buffer(vp, frame);
+    	if (frame->size == vp->src_size)
+            copy_frame_to_buffer(vp, frame);
     }
 
     return PJ_SUCCESS;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/vid_stream.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/vid_stream.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/vid_stream.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/vid_stream.c	2022-02-24 07:54:38.000000000 +0000
@@ -137,6 +137,7 @@
     pjmedia_ratio	     dec_max_fps;   /**< Max fps of decoding dir.   */
     pjmedia_frame            dec_frame;	    /**< Current decoded frame.     */
     unsigned		     dec_delay_cnt; /**< Decoding delay (in frames).*/
+    unsigned		     dec_max_delay; /**< Decoding max delay (in ts).*/
     pjmedia_event            fmt_event;	    /**< Buffered fmt_changed event
                                                  to avoid deadlock	    */
     pjmedia_event            miss_keyframe_event;
@@ -162,8 +163,18 @@
     pj_bool_t		     use_ka;	       /**< Stream keep-alive with non-
 						    codec-VAD mechanism is
 						    enabled?		    */
-    pj_timestamp	     last_frm_ts_sent; /**< Timestamp of last sending
+    unsigned	             ka_interval;      /**< The keepalive sending 
+					            interval                */
+    pj_time_val	             last_frm_ts_sent; /**< Time of last sending
 					            packet		    */
+    unsigned	             start_ka_count;   /**< The number of keep-alive
+                                                    to be sent after it is
+                                                    created                 */
+    unsigned	             start_ka_interval;/**< The keepalive sending
+                                                    interval after the stream
+                                                    is created              */
+    pj_timestamp	     last_start_ka_tx; /**< Timestamp of the last
+                                                    keepalive sent          */
 #endif
 
 #if TRACE_JB
@@ -380,7 +391,7 @@
     const pjmedia_port_info *pi = &chan->port.info;
     char fourcc_name[5];
 
-    PJ_LOG(5, (pi->name.ptr,
+    PJ_LOG(4, (pi->name.ptr,
 	       " %s format %s: %dx%d %s%s %d/%d(~%d)fps",
 	       (chan->dir==PJMEDIA_DIR_DECODING? "Decoding":"Encoding"),
 	       event_name,
@@ -523,7 +534,7 @@
 			       pkt_len);
 
     /* Send RTCP */
-    send_rtcp(stream, PJ_TRUE, PJ_FALSE);
+    send_rtcp(stream, PJ_TRUE, PJ_FALSE, PJ_FALSE, PJ_FALSE);
 
     /* Update stats in case the stream is paused */
     stream->rtcp.stat.rtp_tx_last_seq = pj_ntohs(stream->enc->rtp.out_hdr.seq);
@@ -567,7 +578,6 @@
     pj_uint8_t *pkt;
     int len, max_len;
     pj_status_t status;
-    pjmedia_vid_channel *channel = stream->enc;
 
     /* Build RTCP RR/SR packet */
     pjmedia_rtcp_build_rtcp(&stream->rtcp, &sr_rr_pkt, &len);
@@ -643,8 +653,7 @@
     status = pjmedia_transport_send_rtcp(stream->transport, pkt, len);
     if (status != PJ_SUCCESS) {
 	if (stream->rtcp_tx_err_cnt++ == 0) {
-	    LOGERR_((channel->port.info.name.ptr, status,
-		     "Error sending RTCP"));
+	    LOGERR_((stream->name.ptr, status, "Error sending RTCP"));
 	}
 	if (stream->rtcp_tx_err_cnt > SEND_ERR_COUNT_TO_REPORT) {
 	    stream->rtcp_tx_err_cnt = 0;
@@ -751,6 +760,7 @@
     unsigned payloadlen;
     pjmedia_rtp_status seq_st;
     pj_status_t status;
+    long ts_diff;
     pj_bool_t pkt_discarded = PJ_FALSE;
 
     /* Check for errors */
@@ -797,7 +807,13 @@
     /* Update RTP session (also checks if RTP session can accept
      * the incoming packet.
      */
-    pjmedia_rtp_session_update2(&channel->rtp, hdr, &seq_st, PJ_TRUE);
+    pjmedia_rtp_session_update2(&channel->rtp, hdr, &seq_st,
+				PJMEDIA_VID_STREAM_CHECK_RTP_PT);
+#if !PJMEDIA_VID_STREAM_CHECK_RTP_PT
+    if (hdr->pt != channel->rtp.out_pt) {
+	seq_st.status.flag.badpt = 1;
+    }
+#endif
     if (seq_st.status.value) {
 	TRC_  ((channel->port.info.name.ptr,
 		"RTP status: badpt=%d, badssrc=%d, dup=%d, "
@@ -898,7 +914,8 @@
     /* Quickly see if there may be a full picture in the jitter buffer, and
      * decode them if so. More thorough check will be done in decode_frame().
      */
-    if ((pj_ntohl(hdr->ts) != stream->dec_frame.timestamp.u32.lo) || hdr->m) {
+    ts_diff = pj_ntohl(hdr->ts) - stream->dec_frame.timestamp.u32.lo;
+    if (ts_diff != 0 || hdr->m) {
 	if (PJMEDIA_VID_STREAM_SKIP_PACKETS_TO_REDUCE_LATENCY) {
 	    /* Always decode whenever we have picture in jb and
 	     * overwrite already decoded picture if necessary
@@ -921,6 +938,17 @@
 	    else if (stream->dec_frame.size == 0) {
 		can_decode = PJ_TRUE;
 	    }
+	    /* For video, checking for a full jbuf above is not very useful
+	     * since video jbuf has a rather large capacity (to accommodate
+	     * many chunks per frame) and thus can typically store frames
+	     * that are much longer than max latency/delay specified in jb_max
+	     * setting.
+	     * So we need to compare the last decoded frame's timestamp with
+	     * the current timestamp.
+	     */
+	    else if (ts_diff > (long)stream->dec_max_delay) {
+	    	can_decode = PJ_TRUE;
+	    }
 
 	    if (can_decode) {
 		stream->dec_frame.size = stream->dec_max_size;
@@ -1054,28 +1082,44 @@
      */
     if (stream->use_ka)
     {
-	pj_uint32_t dtx_duration;
+        pj_uint32_t dtx_duration, ka_interval;
+	pj_time_val tm_now, tmp;
 
-	dtx_duration = pj_timestamp_diff32(&stream->last_frm_ts_sent,
-					   &frame->timestamp);
+	pj_gettimeofday(&tm_now);
 
-        if (dtx_duration >
-	    PJMEDIA_STREAM_KA_INTERVAL * stream->info.codec_info.clock_rate)
-	{
-	    send_keep_alive_packet(stream);
-	    stream->last_frm_ts_sent = frame->timestamp;
-	}
+	tmp = tm_now;
+	PJ_TIME_VAL_SUB(tmp, stream->last_frm_ts_sent);
+	dtx_duration = PJ_TIME_VAL_MSEC(tmp);
+
+        if (stream->start_ka_count) {
+	    ka_interval = stream->start_ka_interval;
+        }  else {
+            ka_interval = stream->ka_interval * 1000;
+        }
+        if (dtx_duration > ka_interval) {
+            send_keep_alive_packet(stream);
+            stream->last_frm_ts_sent = tm_now;
+
+            if (stream->start_ka_count)
+                stream->start_ka_count--;
+        }
     }
 #endif
+    /* Get frame length in timestamp unit */
+    rtp_ts_len = stream->frame_ts_len;
 
-    /* Don't do anything if stream is paused */
+    /* Don't do anything if stream is paused, except updating RTP timestamp */
     if (channel->paused) {
+	/* Update RTP session's timestamp. */
+	status = pjmedia_rtp_encode_rtp( &channel->rtp, 0, 0, 0, rtp_ts_len,
+					 NULL, NULL);
+
+        /* Update RTCP stats with last RTP timestamp. */
+	stream->rtcp.stat.rtp_tx_last_ts =
+                                        pj_ntohl(channel->rtp.out_hdr.ts);
 	return PJ_SUCCESS;
     }
 
-    /* Get frame length in timestamp unit */
-    rtp_ts_len = stream->frame_ts_len;
-
     /* Empty video frame? Just update RTP timestamp for now */
     if (frame->type==PJMEDIA_FRAME_TYPE_VIDEO && frame->size==0) {
 	pjmedia_rtp_encode_rtp(&channel->rtp, channel->pt, 1, 0,
@@ -1269,8 +1313,8 @@
     }
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
-    /* Update timestamp of last sending packet. */
-    stream->last_frm_ts_sent = frame->timestamp;
+    /* Update time of last sending packet. */
+    pj_gettimeofday(&stream->last_frm_ts_sent);
 #endif
 
     return PJ_SUCCESS;
@@ -1282,6 +1326,7 @@
 {
     pjmedia_vid_channel *channel = stream->dec;
     pj_uint32_t last_ts = 0, frm_ts = 0;
+    pj_bool_t last_ts_inited = PJ_FALSE;
     int frm_first_seq = 0, frm_last_seq = 0;
     pj_bool_t got_frame = PJ_FALSE;
     unsigned cnt, frm_pkt_cnt = 0, frm_cnt = 0;
@@ -1301,18 +1346,19 @@
 	pjmedia_jbuf_peek_frame(stream->jb, cnt, NULL, NULL,
 				&ptype, NULL, &ts, &seq);
 	if (ptype == PJMEDIA_JB_NORMAL_FRAME) {
-	    if (stream->last_dec_ts ==  ts) {
+	    if (stream->last_dec_ts == ts) {
 		/* Remove any late packet (the frame has been decoded) */
 		pjmedia_jbuf_remove_frame(stream->jb, 1);
 		continue;
 	    }
 
-	    if (last_ts == 0) {
+	    if (!last_ts_inited) {
 		last_ts = ts;
 
 		/* Init timestamp and first seq of the first frame */
 		frm_ts = ts;
 		frm_first_seq = seq;
+		last_ts_inited = PJ_TRUE;
 	    }
 	    if (ts != last_ts) {
 		last_ts = ts;
@@ -1529,7 +1575,8 @@
 			stream->dec : stream->enc,
 		       "changed");
 
-	pjmedia_event_publish(NULL, port, &stream->fmt_event, 0);
+	pjmedia_event_publish(NULL, port, &stream->fmt_event,
+			      PJMEDIA_EVENT_PUBLISH_POST_EVENT);
 
 	stream->fmt_event.type = PJMEDIA_EVENT_NONE;
     }
@@ -1766,6 +1813,9 @@
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
     stream->use_ka = info->use_ka;
+    stream->ka_interval = info->ka_cfg.ka_interval;
+    stream->start_ka_count = info->ka_cfg.start_count;
+    stream->start_ka_interval = info->ka_cfg.start_interval;    
 #endif
     stream->num_keyframe = info->sk_cfg.count;
 
@@ -1866,16 +1916,20 @@
     stream->dec_frame.buf = pj_pool_alloc(pool, stream->dec_max_size);
 
     /* Init jitter buffer parameters: */
-    frm_ptime	    = 1000 * vfd_enc->fps.denum / vfd_enc->fps.num;
+    frm_ptime	    = 1000 * vfd_dec->fps.denum / vfd_dec->fps.num;
     chunks_per_frm  = stream->frame_size / PJMEDIA_MAX_MRU;
     if (chunks_per_frm < MIN_CHUNKS_PER_FRM)
 	chunks_per_frm = MIN_CHUNKS_PER_FRM;
 
     /* JB max count, default 500ms */
-    if (info->jb_max >= frm_ptime)
+    if (info->jb_max >= frm_ptime) {
 	jb_max	    = info->jb_max * chunks_per_frm / frm_ptime;
-    else
+	stream->dec_max_delay = info->codec_info.clock_rate * info->jb_max /
+				1000;
+    } else {
 	jb_max	    = 500 * chunks_per_frm / frm_ptime;
+	stream->dec_max_delay = info->codec_info.clock_rate * 500 / 1000;
+    }
 
     /* JB min prefetch, default 1 frame */
     if (info->jb_min_pre >= frm_ptime)
@@ -2133,6 +2187,7 @@
     /* Free mutex */
 
     if (stream->jb_mutex) {
+	pj_mutex_unlock(stream->jb_mutex);
 	pj_mutex_destroy(stream->jb_mutex);
 	stream->jb_mutex = NULL;
     }
@@ -2389,6 +2444,22 @@
     }
 
     return PJ_SUCCESS;
+}
+
+
+/*
+ * Send RTCP PLI.
+ */
+PJ_DEF(pj_status_t) pjmedia_vid_stream_send_rtcp_pli(
+						pjmedia_vid_stream *stream)
+{
+    PJ_ASSERT_RETURN(stream, PJ_EINVAL);
+
+    if (stream->transport) {
+	return send_rtcp(stream, PJ_FALSE, PJ_FALSE, PJ_FALSE, PJ_TRUE);
+    }
+
+    return PJ_SUCCESS;
 }
 
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/vid_stream_info.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/vid_stream_info.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/vid_stream_info.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/vid_stream_info.c	2022-02-24 07:54:38.000000000 +0000
@@ -191,7 +191,6 @@
     const pjmedia_sdp_conn *local_conn;
     const pjmedia_sdp_conn *rem_conn;
     int rem_af, local_af;
-    pj_sockaddr local_addr;
     unsigned i;
     pj_status_t status;
 
@@ -283,7 +282,7 @@
     }
 
     /* Set remote address: */
-    status = pj_sockaddr_init(local_af, &local_addr, &local_conn->addr,
+    status = pj_sockaddr_init(local_af, &si->local_addr, &local_conn->addr,
 			      local_m->desc.port);
     if (status != PJ_SUCCESS) {
 	/* Invalid IP address. */
@@ -305,7 +304,7 @@
     /* Media direction: */
 
     if (local_m->desc.port == 0 ||
-	pj_sockaddr_has_addr(&local_addr)==PJ_FALSE ||
+	pj_sockaddr_has_addr(&si->local_addr)==PJ_FALSE ||
 	pj_sockaddr_has_addr(&si->rem_addr)==PJ_FALSE ||
 	pjmedia_sdp_media_find_attr(local_m, &STR_INACTIVE, NULL)!=NULL)
     {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/wav_player.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/wav_player.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/wav_player.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/wav_player.c	2022-02-24 07:54:38.000000000 +0000
@@ -342,8 +342,13 @@
 
     /* Validate length. */
     if (wave_hdr.data_hdr.len > fport->fsize - fport->start_data) {
-	pj_file_close(fport->fd);
-	return PJMEDIA_EWAVEUNSUPP;
+    	/* Actual data length may be shorter than declared. We should still
+    	 * try to play whatever data is there instead of immediately returning
+    	 * error.
+    	 */
+    	wave_hdr.data_hdr.len = (pj_uint32_t)fport->fsize - fport->start_data;
+	// pj_file_close(fport->fd);
+	// return PJMEDIA_EWAVEUNSUPP;
     }
     if (wave_hdr.data_hdr.len < ptime * wave_hdr.fmt_hdr.sample_rate *
 				wave_hdr.fmt_hdr.nchan / 1000)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/wav_playlist.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/wav_playlist.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/wav_playlist.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/wav_playlist.c	2022-02-24 07:54:38.000000000 +0000
@@ -324,7 +324,9 @@
     /* Be sure all files exist	*/
     for (index=0; index<file_count; index++) {
 
-	PJ_ASSERT_RETURN(file_list[index].slen < PJ_MAXPATH, PJ_ENAMETOOLONG);
+	PJ_ASSERT_RETURN(file_list[index].slen >= 0, PJ_ETOOSMALL);
+	if (file_list[index].slen >= PJ_MAXPATH)
+	    return PJ_ENAMETOOLONG;
 
 	pj_memcpy(filename, file_list[index].ptr, file_list[index].slen);
 	filename[file_list[index].slen] = '\0';
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/wsola.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/wsola.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia/wsola.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia/wsola.c	2022-02-24 07:54:38.000000000 +0000
@@ -248,7 +248,7 @@
 
 	/* Process remaining samples. */
 	for (; i<template_cnt; ++i) {
-	    corr += ((float)frm[i]) * ((float)sr[i]);
+	    corr += ((double)frm[i]) * ((float)sr[i]);
 	}
 
 	if (first) {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/alsa_dev.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/alsa_dev.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/alsa_dev.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/alsa_dev.c	2022-02-24 07:54:38.000000000 +0000
@@ -101,6 +101,7 @@
     unsigned			 dev_cnt;
     pjmedia_aud_dev_info	 devs[MAX_DEVICES];
     char                         pb_mixer_name[MAX_MIX_NAME_LEN];
+    char			 cap_mixer_name[MAX_MIX_NAME_LEN];
 };
 
 struct alsa_stream
@@ -305,14 +306,27 @@
     for (elem = snd_mixer_first_elem(handle); elem;
 	 elem = snd_mixer_elem_next(elem))
     {
-	if (snd_mixer_selem_is_active(elem) &&
-	    snd_mixer_selem_has_playback_volume(elem))
-	{
-	    pj_ansi_strncpy(af->pb_mixer_name, snd_mixer_selem_get_name(elem),
-	    		    sizeof(af->pb_mixer_name));
-	    TRACE_((THIS_FILE, "Playback mixer name: %s", af->pb_mixer_name));
-	    break;
-	}
+        const char* elemname;
+        elemname = snd_mixer_selem_get_name(elem);
+        if (snd_mixer_selem_is_active(elem))
+        {
+            if (snd_mixer_selem_has_playback_volume(elem))
+            {
+                pj_ansi_strncpy(af->pb_mixer_name, elemname,
+				sizeof(af->pb_mixer_name));
+                af->pb_mixer_name[sizeof(af->pb_mixer_name)-1] = 0;
+                TRACE_((THIS_FILE, "Playback mixer name: %s",
+			af->pb_mixer_name));
+            }
+            if (snd_mixer_selem_has_capture_volume(elem))
+            {
+                pj_ansi_strncpy(af->cap_mixer_name, elemname,
+                                sizeof(af->cap_mixer_name));
+                af->cap_mixer_name[sizeof(af->cap_mixer_name)-1] = 0;
+                TRACE_((THIS_FILE, "Capture mixer name: %s",
+			af->cap_mixer_name));
+            }
+         }
     }
     snd_mixer_close(handle);
 }
@@ -442,7 +456,10 @@
 
     pj_memcpy(info, &af->devs[index], sizeof(*info));
     info->caps = PJMEDIA_AUD_DEV_CAP_INPUT_LATENCY |
-		 PJMEDIA_AUD_DEV_CAP_OUTPUT_LATENCY;
+		 PJMEDIA_AUD_DEV_CAP_OUTPUT_LATENCY |
+		 PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING |
+		 PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING;
+
     return PJ_SUCCESS;
 }
 
@@ -672,8 +689,15 @@
     /* Set number of channels */
     TRACE_((THIS_FILE, "open_playback: set channels: %d",
 		       param->channel_count));
-    snd_pcm_hw_params_set_channels (stream->pb_pcm, params,
-				    param->channel_count);
+    result = snd_pcm_hw_params_set_channels (stream->pb_pcm, params,
+					     param->channel_count);
+    if (result < 0) {
+	PJ_LOG (3,(THIS_FILE, "Unable to set a channel count of %d for "
+		   "playback device '%s'", param->channel_count,
+		   stream->af->devs[param->play_id].name));
+	snd_pcm_close (stream->pb_pcm);
+	return PJMEDIA_EAUD_SYSERR;
+    }
 
     /* Set clock rate */
     rate = param->clock_rate;
@@ -689,8 +713,11 @@
     tmp_period_size = stream->pb_frames;
     snd_pcm_hw_params_set_period_size_near (stream->pb_pcm, params,
 					    &tmp_period_size, NULL);
-    stream->pb_frames = tmp_period_size > stream->pb_frames ? tmp_period_size : 
-                                                              stream->pb_frames;					    					    
+    /* Commenting this as it may cause the number of samples per frame
+     * to be incorrest.
+     */  
+    // stream->pb_frames = tmp_period_size > stream->pb_frames ?
+    //			tmp_period_size : stream->pb_frames;					    					    
     TRACE_((THIS_FILE, "open_playback: period size set to: %d",
 	    tmp_period_size));
 
@@ -699,6 +726,8 @@
 	tmp_buf_size = (rate / 1000) * param->output_latency_ms;
     else
 	tmp_buf_size = (rate / 1000) * PJMEDIA_SND_DEFAULT_PLAY_LATENCY;
+    if (tmp_buf_size < tmp_period_size * 2)
+        tmp_buf_size = tmp_period_size * 2;
     snd_pcm_hw_params_set_buffer_size_near (stream->pb_pcm, params,
 					    &tmp_buf_size);
     stream->param.output_latency_ms = tmp_buf_size / (rate / 1000);
@@ -720,6 +749,12 @@
 	return PJMEDIA_EAUD_SYSERR;
     }
 
+    if (param->flags & PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING) {
+	alsa_stream_set_cap(&stream->base,
+			    PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING,
+			    &param->output_vol);
+    }
+
     PJ_LOG (5,(THIS_FILE, "Opened device alsa(%s) for playing, sample rate=%d"
 	       ", ch=%d, bits=%d, period size=%d frames, latency=%d ms",
 	       stream->af->devs[param->play_id].name,
@@ -792,8 +827,15 @@
     /* Set number of channels */
     TRACE_((THIS_FILE, "open_capture: set channels: %d",
 	    param->channel_count));
-    snd_pcm_hw_params_set_channels (stream->ca_pcm, params,
-				    param->channel_count);
+    result = snd_pcm_hw_params_set_channels (stream->ca_pcm, params,
+					     param->channel_count);
+    if (result < 0) {
+	PJ_LOG (3,(THIS_FILE, "Unable to set a channel count of %d for "
+		   "capture device '%s'", param->channel_count,
+		   stream->af->devs[param->rec_id].name));
+	snd_pcm_close (stream->ca_pcm);
+	return PJMEDIA_EAUD_SYSERR;
+    }
 
     /* Set clock rate */
     rate = param->clock_rate;
@@ -809,8 +851,11 @@
     tmp_period_size = stream->ca_frames;
     snd_pcm_hw_params_set_period_size_near (stream->ca_pcm, params,
 					    &tmp_period_size, NULL);
-    stream->ca_frames = tmp_period_size > stream->ca_frames ? tmp_period_size : 
-                                                              stream->ca_frames;
+    /* Commenting this as it may cause the number of samples per frame
+     * to be incorrest.
+     */
+    // stream->ca_frames = tmp_period_size > stream->ca_frames ?
+    //			tmp_period_size : stream->ca_frames;
     TRACE_((THIS_FILE, "open_capture: period size set to: %d",
 	    tmp_period_size));
 
@@ -819,6 +864,8 @@
 	tmp_buf_size = (rate / 1000) * param->input_latency_ms;
     else
 	tmp_buf_size = (rate / 1000) * PJMEDIA_SND_DEFAULT_REC_LATENCY;
+    if (tmp_buf_size < tmp_period_size * 2)
+        tmp_buf_size = tmp_period_size * 2;
     snd_pcm_hw_params_set_buffer_size_near (stream->ca_pcm, params,
 					    &tmp_buf_size);
     stream->param.input_latency_ms = tmp_buf_size / (rate / 1000);
@@ -840,6 +887,12 @@
 	return PJMEDIA_EAUD_SYSERR;
     }
 
+    if (param->flags & PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING) {
+	alsa_stream_set_cap(&stream->base,
+			    PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING,
+			    &param->input_vol);
+    }
+
     PJ_LOG (5,(THIS_FILE, "Opened device alsa(%s) for capture, sample rate=%d"
 	       ", ch=%d, bits=%d, period size=%d frames, latency=%d ms",
 	       stream->af->devs[param->rec_id].name,
@@ -952,8 +1005,10 @@
 {
     struct alsa_factory *af = ((struct alsa_stream*)strm)->af;
 
-    if (cap==PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING && 
-	pj_ansi_strlen(af->pb_mixer_name)) 
+    if ((cap==PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING &&
+	pj_ansi_strlen(af->pb_mixer_name)) ||
+	(cap==PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING &&
+	pj_ansi_strlen(af->cap_mixer_name)))
     {
 	pj_ssize_t min, max;
 	snd_mixer_t *handle;
@@ -975,14 +1030,30 @@
 
 	snd_mixer_selem_id_alloca(&sid);
 	snd_mixer_selem_id_set_index(sid, 0);
-	snd_mixer_selem_id_set_name(sid, af->pb_mixer_name);
+	if (cap==PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING)
+	    snd_mixer_selem_id_set_name(sid, af->pb_mixer_name);
+	else if (cap==PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING)
+	    snd_mixer_selem_id_set_name(sid, af->cap_mixer_name);
+
 	elem = snd_mixer_find_selem(handle, sid);
 	if (!elem)
 	    return PJMEDIA_EAUD_SYSERR;
 
-	snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
-	if (snd_mixer_selem_set_playback_volume_all(elem, vol * max / 100) < 0)
-	    return PJMEDIA_EAUD_SYSERR;
+	if (cap == PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING) {
+	    snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
+	    if (snd_mixer_selem_set_playback_volume_all(elem,
+							vol * max / 100) < 0)
+	    {
+		return PJMEDIA_EAUD_SYSERR;
+	    }
+	} else if (cap == PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING) {
+             snd_mixer_selem_get_capture_volume_range(elem, &min, &max);
+	     if (snd_mixer_selem_set_capture_volume_all(elem,
+							vol * max / 100) < 0)
+	     {
+		 return PJMEDIA_EAUD_SYSERR;
+	     }
+	}
 
 	snd_mixer_close(handle);
 	return PJ_SUCCESS;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/android/PjAudioDevInfo.java asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/android/PjAudioDevInfo.java
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/android/PjAudioDevInfo.java	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/android/PjAudioDevInfo.java	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2021 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.pjsip;
+
+import android.content.Context;
+import android.media.AudioDeviceInfo;
+import android.media.AudioManager;
+import android.os.Build;
+import android.util.Log;
+import android.util.SparseArray;
+import java.util.Arrays;
+
+public class PjAudioDevInfo {
+
+    /* API */
+
+    public int id;
+    public String name;
+    public int direction;
+    public int[] supportedClockRates;
+    public int[] supportedChannelCounts;
+
+    public static int GetCount()
+    {
+	return devices.size();
+    }
+
+    public static PjAudioDevInfo GetInfo(int idx)
+    {
+	return devices.valueAt(idx);
+    }
+
+    public static void RefreshDevices(Context context)
+    {
+	devices = new SparseArray<>();
+
+        /* Default device */
+	PjAudioDevInfo pj_adi = new PjAudioDevInfo();
+	pj_adi.id = 0;
+	pj_adi.name = "Default";
+	pj_adi.direction = 3;
+	devices.put(0, pj_adi);
+
+	/* Enumerate devices (for API level 23 or later) */
+	if (android.os.Build.VERSION.SDK_INT < 23)
+	    return;
+
+	AudioManager am = (AudioManager)context.getSystemService(Context.AUDIO_SERVICE);
+	AudioDeviceInfo[] devs = am.getDevices(AudioManager.GET_DEVICES_ALL);
+	Log.i("Oboe", "Enumerating AudioManager devices..");
+	for (AudioDeviceInfo adi: devs) {
+	    LogDevInfo(adi);
+
+	    pj_adi = new PjAudioDevInfo();
+	    pj_adi.id = adi.getId();
+	    pj_adi.name = DevTypeStr(adi.getType()) + " - " + adi.getProductName().toString();
+	    pj_adi.direction = 0;
+	    if (adi.isSource())	pj_adi.direction |= 1;
+	    if (adi.isSink())	pj_adi.direction |= 2;
+	    pj_adi.supportedChannelCounts = adi.getChannelCounts();
+	    pj_adi.supportedClockRates = adi.getSampleRates();
+	    devices.put(adi.getId(), pj_adi);
+	}
+    }
+
+    /* Private members */
+    
+    private static SparseArray<PjAudioDevInfo> devices;
+
+    private static String DevTypeStr(int type) {
+	if (android.os.Build.VERSION.SDK_INT < 23)
+	    return "Unknown";
+
+	/*
+	if (android.os.Build.VERSION.SDK_INT > 30) {
+	    if (type == AudioDeviceInfo.TYPE_BLE_HEADSET)
+		return "BLE Headset";
+	    if (type == AudioDeviceInfo.TYPE_BLE_SPEAKER)
+		return "BLE Speaker";
+	}
+	*/
+
+	switch (type) {
+	    case AudioDeviceInfo.TYPE_BUILTIN_EARPIECE:
+		return "Builtin Earpiece";
+	    case AudioDeviceInfo.TYPE_BUILTIN_SPEAKER:
+		return "Builtin Speaker";
+	    case AudioDeviceInfo.TYPE_WIRED_HEADSET:
+		return "Wired Headset";
+	    case AudioDeviceInfo.TYPE_WIRED_HEADPHONES:
+		return "Wired Headphones";
+	    case AudioDeviceInfo.TYPE_LINE_ANALOG:
+		return "Line Analog";
+	    case AudioDeviceInfo.TYPE_LINE_DIGITAL:
+		return "Line Digital";
+	    case AudioDeviceInfo.TYPE_BLUETOOTH_SCO:
+		return "Bluetooth SCO";
+	    case AudioDeviceInfo.TYPE_BLUETOOTH_A2DP:
+		return "Bluetooth A2DP";
+	    case AudioDeviceInfo.TYPE_HDMI:
+		return "HDMI";
+	    case AudioDeviceInfo.TYPE_HDMI_ARC:
+		return "HDMI ARC";
+	    case AudioDeviceInfo.TYPE_USB_DEVICE:
+		return "USB Device";
+	    case AudioDeviceInfo.TYPE_USB_ACCESSORY:
+		return "USB Accessory";
+	    case AudioDeviceInfo.TYPE_DOCK:
+		return "Dock";
+	    case AudioDeviceInfo.TYPE_FM:
+		return "FM";
+	    case AudioDeviceInfo.TYPE_BUILTIN_MIC:
+		return "Builtin Mic";
+	    case AudioDeviceInfo.TYPE_FM_TUNER:
+		return "FM Tuner";
+	    case AudioDeviceInfo.TYPE_TV_TUNER:
+		return "TV Tuner";
+	    case AudioDeviceInfo.TYPE_TELEPHONY:
+		return "Telephony";
+	    case AudioDeviceInfo.TYPE_AUX_LINE:
+		return "AUX Line";
+	    case AudioDeviceInfo.TYPE_IP:
+		return "IP";
+	    case AudioDeviceInfo.TYPE_BUS:
+		return "Bus";
+	    case AudioDeviceInfo.TYPE_USB_HEADSET:
+		return "USB Headset";
+	    default:
+		return "Unknown ("+ type +")";
+	}
+    }
+
+    private static void LogDevInfo(AudioDeviceInfo adi) {
+	if (Build.VERSION.SDK_INT < 23)
+	    return;
+
+	StringBuilder info = new StringBuilder();
+	info.append("id=").append(adi.getId());
+	info.append(",");
+	if (adi.isSource()) info.append(" in");
+	if (adi.isSink()) info.append(" out");
+	info.append(", ").append(DevTypeStr(adi.getType()));
+	if (adi.getChannelCounts().length > 0) {
+	    info.append(", channels=").append(Arrays.toString(adi.getChannelCounts()));
+	}
+	if (adi.getSampleRates().length > 0) {
+	    info.append(", clock rates=").append(Arrays.toString(adi.getSampleRates()));
+	}
+	Log.i("Oboe", info.toString());
+    }
+}
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/android_jni_dev.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/android_jni_dev.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/android_jni_dev.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/android_jni_dev.c	2022-02-24 07:54:38.000000000 +0000
@@ -141,81 +141,12 @@
     &strm_destroy
 };
 
-extern JavaVM *pj_jni_jvm;
-
-static pj_bool_t attach_jvm(JNIEnv **jni_env)
-{
-    if ((*pj_jni_jvm)->GetEnv(pj_jni_jvm, (void **)jni_env,
-                               JNI_VERSION_1_4) < 0)
-    {
-        if ((*pj_jni_jvm)->AttachCurrentThread(pj_jni_jvm, jni_env, NULL) < 0)
-        {
-            jni_env = NULL;
-            return PJ_FALSE;
-        }
-        return PJ_TRUE;
-    }
-    
-    return PJ_FALSE;
-}
-
-#define detach_jvm(attached) \
-    if (attached) \
-        (*pj_jni_jvm)->DetachCurrentThread(pj_jni_jvm);
-
-/* Thread priority utils */
-/* TODO : port it to pj_thread functions */
-#define THREAD_PRIORITY_AUDIO -16
-#define THREAD_PRIORITY_URGENT_AUDIO -19
-
-pj_status_t set_android_thread_priority(int priority)
-{
-    jclass process_class;
-    jmethodID set_prio_method;
-    jthrowable exc;
-    pj_status_t result = PJ_SUCCESS;
-    JNIEnv *jni_env = 0;
-    pj_bool_t attached = attach_jvm(&jni_env);
-    
-    PJ_ASSERT_RETURN(jni_env, PJ_FALSE);
-
-    /* Get pointer to the java class */
-    process_class = (jclass)(*jni_env)->NewGlobalRef(jni_env, 
-                        (*jni_env)->FindClass(jni_env, "android/os/Process"));
-    if (process_class == 0) {
-        PJ_LOG(4, (THIS_FILE, "Unable to find os process class"));
-        result = PJ_EIGNORED;
-        goto on_return;
-    }
-    
-    /* Get the id of set thread priority function */
-    set_prio_method = (*jni_env)->GetStaticMethodID(jni_env, process_class,
-                                                    "setThreadPriority",
-                                                    "(I)V");
-    if (set_prio_method == 0) {
-        PJ_LOG(4, (THIS_FILE, "Unable to find setThreadPriority() method"));
-        result = PJ_EIGNORED;
-        goto on_return;
-    }
-    
-    /* Set the thread priority */
-    (*jni_env)->CallStaticVoidMethod(jni_env, process_class, set_prio_method,
-                                     priority);    
-    exc = (*jni_env)->ExceptionOccurred(jni_env);
-    if (exc) {
-        (*jni_env)->ExceptionDescribe(jni_env);
-        (*jni_env)->ExceptionClear(jni_env);
-        PJ_LOG(4, (THIS_FILE, "Failure in setting thread priority using "
-                              "Java API, fallback to setpriority()"));
-        setpriority(PRIO_PROCESS, 0, priority);
-    } else {
-        PJ_LOG(4, (THIS_FILE, "Setting thread priority successful"));        
-    }
-
-on_return:
-    detach_jvm(attached);
-    return result;
-}
+PJ_DECL(pj_bool_t) pj_jni_attach_jvm(JNIEnv **jni_env);
+PJ_DECL(void) pj_jni_dettach_jvm(pj_bool_t attached);
+#define attach_jvm(jni_env)	pj_jni_attach_jvm(jni_env)
+#define detach_jvm(attached)	pj_jni_dettach_jvm(attached)
+#define THREAD_PRIORITY_AUDIO		-16
+#define THREAD_PRIORITY_URGENT_AUDIO	-19
 
 
 static int AndroidRecorderCallback(void *userData)
@@ -255,15 +186,8 @@
         goto on_return;
     }
     
-    /* Start recording
-     * setpriority(PRIO_PROCESS, 0, -19); //ANDROID_PRIORITY_AUDIO
-     * set priority is probably not enough because it does not change the thread
-     * group in scheduler
-     * Temporary solution is to call the java api to set the thread priority.
-     * A cool solution would be to port (if possible) the code from the
-     * android os regarding set_sched groups
-     */
-    set_android_thread_priority(THREAD_PRIORITY_URGENT_AUDIO);
+    /* Start recording */
+    pj_thread_set_prio(NULL, THREAD_PRIORITY_URGENT_AUDIO);
     (*jni_env)->CallVoidMethod(jni_env, stream->record, record_method);
     
     while (!stream->quit_flag) {
@@ -356,7 +280,7 @@
     buf = (*jni_env)->GetByteArrayElements(jni_env, outputBuffer, 0);
 
     /* Start playing */
-    set_android_thread_priority(THREAD_PRIORITY_URGENT_AUDIO);
+    pj_thread_set_prio(NULL, THREAD_PRIORITY_URGENT_AUDIO);
     (*jni_env)->CallVoidMethod(jni_env, stream->track, play_method);
 
     while (!stream->quit_flag) {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/audiodev.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/audiodev.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/audiodev.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/audiodev.c	2022-02-24 07:54:38.000000000 +0000
@@ -44,6 +44,10 @@
 pjmedia_aud_dev_factory* pjmedia_android_factory(pj_pool_factory *pf);
 #endif
 
+#if PJMEDIA_AUDIO_DEV_HAS_OBOE
+pjmedia_aud_dev_factory* pjmedia_android_oboe_factory(pj_pool_factory *pf);
+#endif
+
 #if PJMEDIA_AUDIO_DEV_HAS_BB10
 pjmedia_aud_dev_factory* pjmedia_bb10_factory(pj_pool_factory *pf);
 #endif
@@ -103,6 +107,9 @@
     aud_subsys->dev_cnt = 0;
 
     /* Register creation functions */
+#if PJMEDIA_AUDIO_DEV_HAS_OBOE
+    aud_subsys->drv[aud_subsys->drv_cnt++].create = &pjmedia_android_oboe_factory;
+#endif
 #if PJMEDIA_AUDIO_DEV_HAS_OPENSL
     aud_subsys->drv[aud_subsys->drv_cnt++].create = &pjmedia_opensl_factory;
 #endif
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m	2022-02-24 07:54:38.000000000 +0000
@@ -1475,10 +1475,25 @@
     if (dir & PJMEDIA_DIR_PLAYBACK) {
 	AURenderCallbackStruct output_cb;
 	AudioStreamBasicDescription streamFormat = strm->streamFormat;
+	BOOL isMacCatalystApp = false;
+
+#ifdef __IPHONE_13_0
+	if (@available(iOS 13.0, *)) {
+            /* According to Apple's doc, the property isMacCatalystApp is true
+	     * when the process is:
+             * - A Mac app built with Mac Catalyst, or an iOS app running on Apple silicon.
+             * - Running on a Mac.
+             */
+            isMacCatalystApp = [NSProcessInfo processInfo].isMacCatalystApp;
+	}
+#endif
 
 	/* Set the stream format */
-#if COREAUDIO_MAC
-   	if (strm->param.ec_enabled) {
+   	if (strm->param.ec_enabled
+#if !COREAUDIO_MAC
+	    && isMacCatalystApp
+#endif   	
+   	) {
    	    /* When using VPIO on Mac, we need to use float data. Using
    	     * signed integer will generate no errors, but strangely,
    	     * no sound will be played.
@@ -1491,7 +1506,7 @@
     	    streamFormat.mBytesPerPacket   = streamFormat.mBytesPerFrame *
 					     streamFormat.mFramesPerPacket;
 	}
-#endif
+
 	ostatus = AudioUnitSetProperty(*io_unit,
 	                               kAudioUnitProperty_StreamFormat,
 	                               kAudioUnitScope_Input,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/oboe_dev.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/oboe_dev.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/oboe_dev.cpp	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-audiodev/oboe_dev.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,1128 @@
+/*
+ * Copyright (C) 2021 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+/* This file is the implementation of Android Oboe audio device. */
+
+#include <pjmedia-audiodev/audiodev_imp.h>
+#include <pj/assert.h>
+#include <pj/lock.h>
+#include <pj/log.h>
+#include <pj/os.h>
+#include <pjmedia/circbuf.h>
+#include <pjmedia/errno.h>
+
+#if defined(PJMEDIA_AUDIO_DEV_HAS_OBOE) &&  PJMEDIA_AUDIO_DEV_HAS_OBOE != 0
+
+#define THIS_FILE	"oboe_dev.cpp"
+#define DRIVER_NAME	"Oboe"
+
+#include <jni.h>
+#include <semaphore.h>
+#include <android/log.h>
+#include <oboe/Oboe.h>
+
+#include <atomic>
+
+
+/* Device info */
+typedef struct aud_dev_info
+{
+    pjmedia_aud_dev_info	 info;		/**< Base info		*/
+    int				 id;		/**< Original dev ID	*/
+} aud_dev_info;
+
+
+/* Oboe factory */
+struct oboe_aud_factory
+{
+    pjmedia_aud_dev_factory	 base;
+    pj_pool_factory		*pf;
+    pj_pool_t			*pool;
+
+    pj_pool_t			*dev_pool;	/**< Device list pool  */
+    unsigned			 dev_count;	/**< Device count      */
+    aud_dev_info		*dev_info;	/**< Device info list  */
+};
+
+class MyOboeEngine;
+
+
+/*
+ * Sound stream descriptor.
+ * This struct may be used for both unidirectional or bidirectional sound
+ * streams.
+ */
+struct oboe_aud_stream
+{
+    pjmedia_aud_stream  base;
+    pj_pool_t          *pool;
+    pj_str_t            name;
+    pjmedia_dir         dir;
+    pjmedia_aud_param   param;
+    struct oboe_aud_factory *f;
+
+    int                 bytes_per_sample;
+    pj_uint32_t         samples_per_sec;
+    unsigned            samples_per_frame;
+    int                 channel_count;
+    void               *user_data;
+    pj_bool_t           running;
+
+    /* Capture/record */
+    MyOboeEngine       *rec_engine;
+    pjmedia_aud_rec_cb  rec_cb;
+
+    /* Playback */
+    MyOboeEngine       *play_engine;
+    pjmedia_aud_play_cb play_cb;
+};
+
+/* Factory prototypes */
+static pj_status_t oboe_init(pjmedia_aud_dev_factory *f);
+static pj_status_t oboe_destroy(pjmedia_aud_dev_factory *f);
+static pj_status_t oboe_refresh(pjmedia_aud_dev_factory *f);
+static unsigned oboe_get_dev_count(pjmedia_aud_dev_factory *f);
+static pj_status_t oboe_get_dev_info(pjmedia_aud_dev_factory *f,
+                                        unsigned index,
+                                        pjmedia_aud_dev_info *info);
+static pj_status_t oboe_default_param(pjmedia_aud_dev_factory *f,
+                                         unsigned index,
+                                         pjmedia_aud_param *param);
+static pj_status_t oboe_create_stream(pjmedia_aud_dev_factory *f,
+                                         const pjmedia_aud_param *param,
+                                         pjmedia_aud_rec_cb rec_cb,
+                                         pjmedia_aud_play_cb play_cb,
+                                         void *user_data,
+                                         pjmedia_aud_stream **p_aud_strm);
+
+/* Stream prototypes */
+static pj_status_t strm_get_param(pjmedia_aud_stream *strm,
+                                  pjmedia_aud_param *param);
+static pj_status_t strm_get_cap(pjmedia_aud_stream *strm,
+                                pjmedia_aud_dev_cap cap,
+                                void *value);
+static pj_status_t strm_set_cap(pjmedia_aud_stream *strm,
+                                pjmedia_aud_dev_cap cap,
+                                const void *value);
+static pj_status_t strm_start(pjmedia_aud_stream *strm);
+static pj_status_t strm_stop(pjmedia_aud_stream *strm);
+static pj_status_t strm_destroy(pjmedia_aud_stream *strm);
+
+static pjmedia_aud_dev_factory_op oboe_op =
+{
+    &oboe_init,
+    &oboe_destroy,
+    &oboe_get_dev_count,
+    &oboe_get_dev_info,
+    &oboe_default_param,
+    &oboe_create_stream,
+    &oboe_refresh
+};
+
+static pjmedia_aud_stream_op oboe_strm_op =
+{
+    &strm_get_param,
+    &strm_get_cap,
+    &strm_set_cap,
+    &strm_start,
+    &strm_stop,
+    &strm_destroy
+};
+
+
+/*
+ * Init Android Oboe audio driver.
+ */
+#ifdef __cplusplus
+extern "C"{
+#endif
+pjmedia_aud_dev_factory* pjmedia_android_oboe_factory(pj_pool_factory *pf)
+{
+    struct oboe_aud_factory *f;
+    pj_pool_t *pool;
+
+    pool = pj_pool_create(pf, "oboe", 256, 256, NULL);
+    f = PJ_POOL_ZALLOC_T(pool, struct oboe_aud_factory);
+    f->pf = pf;
+    f->pool = pool;
+    f->base.op = &oboe_op;
+    f->dev_pool = pj_pool_create(pf, "oboe_dev", 256, 256, NULL);
+
+    return &f->base;
+}
+#ifdef __cplusplus
+}
+#endif
+
+
+/* JNI stuff for enumerating audio devices. This will invoke Java code
+ * in pjmedia/src/pjmedia-audiodev/android/PjAudioDevInfo.java.
+ */
+#define PJ_AUDDEV_INFO_CLASS_PATH	"org/pjsip/PjAudioDevInfo"
+
+static struct jni_objs_t
+{
+    struct {
+	jclass		 cls;
+	jmethodID	 m_get_cnt;
+	jmethodID	 m_get_info;
+	jmethodID	 m_refresh;
+	jfieldID	 f_id;
+	jfieldID	 f_name;
+	jfieldID	 f_direction;
+	jfieldID	 f_sup_clockrates;
+	jfieldID	 f_sup_channels;
+    } dev_info;
+
+    struct {
+	jclass		 cls;
+	jmethodID	 m_current;
+	jmethodID	 m_get_app;
+    } activity_thread;
+
+} jobjs;
+
+
+/* Declare JNI JVM helper from PJLIB OS */
+extern "C" {
+    pj_bool_t pj_jni_attach_jvm(JNIEnv **jni_env);
+    void pj_jni_dettach_jvm(pj_bool_t attached);
+}
+
+#define GET_CLASS(class_path, class_name, cls) \
+    cls = jni_env->FindClass(class_path); \
+    if (cls == NULL || jni_env->ExceptionCheck()) { \
+	jni_env->ExceptionClear(); \
+        PJ_LOG(3, (THIS_FILE, "[JNI] Unable to find class '" \
+			      class_name "'")); \
+        status = PJMEDIA_EAUD_SYSERR; \
+        goto on_return; \
+    } else { \
+        jclass tmp = cls; \
+	cls = (jclass)jni_env->NewGlobalRef(tmp); \
+	jni_env->DeleteLocalRef(tmp); \
+	if (cls == NULL) { \
+	    PJ_LOG(3, (THIS_FILE, "[JNI] Unable to get global ref for " \
+				  "class '" class_name "'")); \
+	    status = PJMEDIA_EAUD_SYSERR; \
+	    goto on_return; \
+	} \
+    }
+#define GET_METHOD_ID(cls, class_name, method_name, signature, id) \
+    id = jni_env->GetMethodID(cls, method_name, signature); \
+    if (id == 0) { \
+        PJ_LOG(3, (THIS_FILE, "[JNI] Unable to find method '" method_name \
+			      "' in class '" class_name "'")); \
+        status = PJMEDIA_EAUD_SYSERR; \
+        goto on_return; \
+    }
+#define GET_SMETHOD_ID(cls, class_name, method_name, signature, id) \
+    id = jni_env->GetStaticMethodID(cls, method_name, signature); \
+    if (id == 0) { \
+        PJ_LOG(3, (THIS_FILE, "[JNI] Unable to find static method '" \
+			      method_name "' in class '" class_name "'")); \
+        status = PJMEDIA_EAUD_SYSERR; \
+        goto on_return; \
+    }
+#define GET_FIELD_ID(cls, class_name, field_name, signature, id) \
+    id = jni_env->GetFieldID(cls, field_name, signature); \
+    if (id == 0) { \
+        PJ_LOG(3, (THIS_FILE, "[JNI] Unable to find field '" field_name \
+			      "' in class '" class_name "'")); \
+        status = PJMEDIA_EAUD_SYSERR; \
+        goto on_return; \
+    }
+
+/* Get Java object IDs (via FindClass, GetMethodID, GetFieldID, etc).
+ * Note that this function should be called from library-loader thread,
+ * otherwise FindClass, etc, may fail, see:
+ * http://developer.android.com/training/articles/perf-jni.html#faq_FindClass
+ */
+static pj_status_t jni_init_ids()
+{
+    JNIEnv *jni_env;
+    pj_status_t status = PJ_SUCCESS;
+    pj_bool_t with_attach = pj_jni_attach_jvm(&jni_env);
+
+    /* PjAudioDevInfo class info */
+    GET_CLASS(PJ_AUDDEV_INFO_CLASS_PATH, "PjAudioDevInfo", jobjs.dev_info.cls);
+    GET_SMETHOD_ID(jobjs.dev_info.cls, "PjAudioDevInfo", "GetCount", "()I",
+		   jobjs.dev_info.m_get_cnt);
+    GET_SMETHOD_ID(jobjs.dev_info.cls, "PjAudioDevInfo", "GetInfo",
+		   "(I)L" PJ_AUDDEV_INFO_CLASS_PATH ";",
+		   jobjs.dev_info.m_get_info);
+    GET_SMETHOD_ID(jobjs.dev_info.cls, "PjAudioDevInfo", "RefreshDevices",
+		   "(Landroid/content/Context;)V",
+		   jobjs.dev_info.m_refresh);
+    GET_FIELD_ID(jobjs.dev_info.cls, "PjAudioDevInfo", "id", "I",
+		 jobjs.dev_info.f_id);
+    GET_FIELD_ID(jobjs.dev_info.cls, "PjAudioDevInfo", "name", "Ljava/lang/String;",
+		 jobjs.dev_info.f_name);
+    GET_FIELD_ID(jobjs.dev_info.cls, "PjAudioDevInfo", "direction", "I",
+		 jobjs.dev_info.f_direction);
+    GET_FIELD_ID(jobjs.dev_info.cls, "PjAudioDevInfo", "supportedClockRates", "[I",
+		 jobjs.dev_info.f_sup_clockrates);
+    GET_FIELD_ID(jobjs.dev_info.cls, "PjAudioDevInfo", "supportedChannelCounts", "[I",
+		 jobjs.dev_info.f_sup_channels);
+
+    /* ActivityThread class info */
+    GET_CLASS("android/app/ActivityThread", "ActivityThread",
+	      jobjs.activity_thread.cls);
+    GET_SMETHOD_ID(jobjs.activity_thread.cls, "ActivityThread",
+		   "currentActivityThread", "()Landroid/app/ActivityThread;",
+		   jobjs.activity_thread.m_current);
+    GET_METHOD_ID(jobjs.activity_thread.cls, "ActivityThread",
+		   "getApplication", "()Landroid/app/Application;",
+		   jobjs.activity_thread.m_get_app);
+
+on_return:
+    pj_jni_dettach_jvm(with_attach);
+    return status;
+}
+
+#undef GET_CLASS_ID
+#undef GET_METHOD_ID
+#undef GET_SMETHOD_ID
+#undef GET_FIELD_ID
+
+static void jni_deinit_ids()
+{
+    JNIEnv *jni_env;
+    pj_bool_t with_attach = pj_jni_attach_jvm(&jni_env);
+
+    if (jobjs.dev_info.cls) {
+	jni_env->DeleteGlobalRef(jobjs.dev_info.cls);
+	jobjs.dev_info.cls = NULL;
+    }
+
+    if (jobjs.activity_thread.cls) {
+	jni_env->DeleteGlobalRef(jobjs.activity_thread.cls);
+	jobjs.activity_thread.cls = NULL;
+    }
+
+    pj_jni_dettach_jvm(with_attach);
+}
+
+static jobject get_global_context(JNIEnv *jni_env)
+{
+    jobject context = NULL;
+    jobject cur_at = jni_env->CallStaticObjectMethod(
+					jobjs.activity_thread.cls,
+					jobjs.activity_thread.m_current);
+    if (cur_at==NULL)
+	return NULL;
+
+    context = jni_env->CallObjectMethod(cur_at,
+					jobjs.activity_thread.m_get_app);
+    return context;
+}
+
+
+/* API: Init factory */
+static pj_status_t oboe_init(pjmedia_aud_dev_factory *f)
+{
+    pj_status_t status;
+
+    status = jni_init_ids();
+    if (status != PJ_SUCCESS)
+	return status;
+
+    status = oboe_refresh(f);
+    if (status != PJ_SUCCESS)
+	return status;
+
+    return PJ_SUCCESS;
+}
+
+
+/* API: refresh the list of devices */
+static pj_status_t oboe_refresh(pjmedia_aud_dev_factory *ff)
+{
+    struct oboe_aud_factory *f = (struct oboe_aud_factory*)ff;
+    JNIEnv *jni_env;
+    pj_bool_t with_attach;
+    int i, dev_count = 0;
+    pj_status_t status = PJ_SUCCESS;
+
+    /* Clean up device info and pool */
+    f->dev_count = 0;
+    pj_pool_reset(f->dev_pool);
+
+    with_attach = pj_jni_attach_jvm(&jni_env);
+
+    jobject context = get_global_context(jni_env);
+    if (context == NULL) {
+	PJ_LOG(3, (THIS_FILE, "Failed to get context"));
+	status = PJMEDIA_EAUD_SYSERR;
+	goto on_return;
+    }
+
+    /* PjAudioDevInfo::RefreshDevices(Context) */
+    jni_env->CallStaticVoidMethod(jobjs.dev_info.cls,
+				  jobjs.dev_info.m_refresh, context);
+
+    /* dev_count = PjAudioDevInfo::GetCount() */
+    dev_count = jni_env->CallStaticIntMethod(jobjs.dev_info.cls,
+					     jobjs.dev_info.m_get_cnt);
+    if (dev_count < 0) {
+        PJ_LOG(3, (THIS_FILE, "Failed to get camera count"));
+        status = PJMEDIA_EAUD_SYSERR;
+        goto on_return;
+    }
+
+    /* Start querying device info */
+    f->dev_info = (aud_dev_info*)
+		  pj_pool_calloc(f->dev_pool, dev_count,
+				 sizeof(aud_dev_info));
+
+    for (i = 0; i < dev_count; i++) {
+	aud_dev_info *adi = &f->dev_info[f->dev_count];
+	pjmedia_aud_dev_info *base_adi = &adi->info;
+        jobject jdev_info;
+	jint jinttmp;
+
+	/* jdev_info = PjAudioDevInfo::GetInfo(i) */
+	jdev_info = jni_env->CallStaticObjectMethod(
+					    jobjs.dev_info.cls,
+					    jobjs.dev_info.m_get_info,
+					    i);
+	if (jdev_info == NULL)
+	    continue;
+
+	/* Get device ID, direction, etc */
+	adi->id = jni_env->GetIntField(jdev_info, jobjs.dev_info.f_id);
+	jinttmp = jni_env->GetIntField(jdev_info, jobjs.dev_info.f_direction);
+	base_adi->input_count = (jinttmp & PJMEDIA_DIR_CAPTURE);
+	base_adi->output_count = (jinttmp & PJMEDIA_DIR_PLAYBACK);
+	base_adi->caps = 0;
+
+	/* Get name info */
+	jstring jstrtmp = (jstring)jni_env->GetObjectField(jdev_info, jobjs.dev_info.f_name);
+	const char *strtmp = jni_env->GetStringUTFChars(jstrtmp, NULL);
+	pj_ansi_strncpy(base_adi->name, strtmp, sizeof(base_adi->name));
+
+	f->dev_count++;
+
+    on_skip_dev:
+	jni_env->DeleteLocalRef(jdev_info);
+    }
+
+    PJ_LOG(4, (THIS_FILE,
+	       "Oboe audio device initialized with %d device(s):",
+	       f->dev_count));
+
+    for (i = 0; i < f->dev_count; i++) {
+	aud_dev_info *adi = &f->dev_info[i];
+	PJ_LOG(4, (THIS_FILE, "%2d (native id=%d): %s (%s%s%s)",
+		   i, adi->id, adi->info.name,
+		   adi->info.input_count?"in":"",
+		   adi->info.input_count && adi->info.output_count?"+":"",
+		   adi->info.output_count?"out":""
+		));
+    }
+
+on_return:
+    if (context)
+	jni_env->DeleteLocalRef(context);
+
+    pj_jni_dettach_jvm(with_attach);
+    return status;
+}
+
+
+/* API: Destroy factory */
+static pj_status_t oboe_destroy(pjmedia_aud_dev_factory *f)
+{
+    struct oboe_aud_factory *pa = (struct oboe_aud_factory*)f;
+    pj_pool_t *pool;
+
+    PJ_LOG(4, (THIS_FILE, "Oboe sound library shutting down.."));
+
+    jni_deinit_ids();
+
+    pool = pa->pool;
+    pa->pool = NULL;
+    pj_pool_release(pool);
+
+    return PJ_SUCCESS;
+}
+
+/* API: Get device count. */
+static unsigned oboe_get_dev_count(pjmedia_aud_dev_factory *ff)
+{
+    struct oboe_aud_factory *f = (struct oboe_aud_factory*)ff;
+    return f->dev_count;
+}
+
+/* API: Get device info. */
+static pj_status_t oboe_get_dev_info(pjmedia_aud_dev_factory *ff,
+                                        unsigned index,
+                                        pjmedia_aud_dev_info *info)
+{
+    struct oboe_aud_factory *f = (struct oboe_aud_factory*)ff;
+
+    PJ_ASSERT_RETURN(index < f->dev_count, PJMEDIA_EAUD_INVDEV);
+
+    pj_memcpy(info, &f->dev_info[index].info, sizeof(*info));
+
+    return PJ_SUCCESS;
+}
+
+/* API: fill in with default parameter. */
+static pj_status_t oboe_default_param(pjmedia_aud_dev_factory *ff,
+                                         unsigned index,
+                                         pjmedia_aud_param *param)
+{
+    struct oboe_aud_factory *f = (struct oboe_aud_factory*)ff;
+    pjmedia_aud_dev_info adi;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(index < f->dev_count, PJMEDIA_EAUD_INVDEV);
+
+    status = oboe_get_dev_info(ff, index, &adi);
+    if (status != PJ_SUCCESS)
+	return status;
+
+    pj_bzero(param, sizeof(*param));
+    if (adi.input_count && adi.output_count) {
+        param->dir = PJMEDIA_DIR_CAPTURE_PLAYBACK;
+        param->rec_id = index;
+        param->play_id = index;
+    } else if (adi.input_count) {
+        param->dir = PJMEDIA_DIR_CAPTURE;
+        param->rec_id = index;
+        param->play_id = PJMEDIA_AUD_INVALID_DEV;
+    } else if (adi.output_count) {
+        param->dir = PJMEDIA_DIR_PLAYBACK;
+        param->play_id = index;
+        param->rec_id = PJMEDIA_AUD_INVALID_DEV;
+    } else {
+        return PJMEDIA_EAUD_INVDEV;
+    }
+
+    param->clock_rate = adi.default_samples_per_sec;
+    param->channel_count = 1;
+    param->samples_per_frame = adi.default_samples_per_sec * 20 / 1000;
+    param->bits_per_sample = 16;
+    param->input_latency_ms = PJMEDIA_SND_DEFAULT_REC_LATENCY;
+    param->output_latency_ms = PJMEDIA_SND_DEFAULT_PLAY_LATENCY;
+
+    return PJ_SUCCESS;
+}
+
+
+/* Atomic queue (ring buffer) for single consumer & single producer.
+ *
+ * Producer invokes 'put(frame)' to put a frame to the back of the queue and
+ * consumer invokes 'get(frame)' to get a frame from the head of the queue.
+ *
+ * For producer, there is write pointer 'ptrWrite' that will be incremented
+ * every time a frame is queued to the back of the queue. If the queue is
+ * almost full (the write pointer is right before the read pointer) the
+ * producer will forcefully discard the oldest frame in the head of the
+ * queue by incrementing read pointer.
+ *
+ * For consumer, there is read pointer 'ptrRead' that will be incremented
+ * every time a frame is fetched from the head of the queue, only if the
+ * pointer is not modified by producer (in case of queue full).
+ */
+class AtomicQueue {
+public:
+
+    AtomicQueue(unsigned max_frame_cnt, unsigned frame_size,
+		const char* name_= "") :
+	maxFrameCnt(max_frame_cnt), frameSize(frame_size),
+	ptrWrite(0), ptrRead(0),
+	buffer(NULL), name(name_)
+    {
+	buffer = new char[maxFrameCnt * frameSize];
+
+	/* Surpress warning when debugging log is disabled */
+	PJ_UNUSED_ARG(name);
+    }
+
+    ~AtomicQueue() {
+	delete [] buffer;
+    }
+
+    /* Get a frame from the head of the queue */
+    bool get(void* frame) {
+        if (ptrRead == ptrWrite)
+            return false;
+
+	unsigned cur_ptr = ptrRead;
+	void *p = &buffer[cur_ptr * frameSize];
+	pj_memcpy(frame, p, frameSize);
+	inc_ptr_read_if_not_yet(cur_ptr);
+
+	//__android_log_print(ANDROID_LOG_INFO, name,
+	//		      "GET: ptrRead=%d ptrWrite=%d\n",
+	//		      ptrRead.load(), ptrWrite.load());
+	return true;
+    }
+
+    /* Put a frame to the back of the queue */
+    void put(void* frame) {
+	unsigned cur_ptr = ptrWrite;
+	void *p = &buffer[cur_ptr * frameSize];
+	pj_memcpy(p, frame, frameSize);
+	unsigned next_ptr = inc_ptr_write(cur_ptr);
+
+	/* Increment read pointer if next write is overlapping (next_ptr == read ptr) */
+	unsigned next_read_ptr = (next_ptr == maxFrameCnt-1)? 0 : (next_ptr+1);
+	ptrRead.compare_exchange_strong(next_ptr, next_read_ptr);
+
+	//__android_log_print(ANDROID_LOG_INFO, name,
+	//		      "PUT: ptrRead=%d ptrWrite=%d\n",
+	//		      ptrRead.load(), ptrWrite.load());
+    }
+
+private:
+
+    unsigned maxFrameCnt;
+    unsigned frameSize;
+    std::atomic<unsigned> ptrWrite;
+    std::atomic<unsigned> ptrRead;
+    char *buffer;
+    const char *name;
+
+    /* Increment read pointer, only if producer not incemented it already.
+     * Producer may increment the read pointer if the write pointer is
+     * right before the read pointer (buffer almost full).
+     */
+    bool inc_ptr_read_if_not_yet(unsigned old_ptr) {
+	unsigned new_ptr = (old_ptr == maxFrameCnt-1)? 0 : (old_ptr+1);
+	return ptrRead.compare_exchange_strong(old_ptr, new_ptr);
+    }
+
+    /* Increment write pointer */
+    unsigned inc_ptr_write(unsigned old_ptr) {
+	unsigned new_ptr = (old_ptr == maxFrameCnt-1)? 0 : (old_ptr+1);
+	if (ptrWrite.compare_exchange_strong(old_ptr, new_ptr))
+	    return new_ptr;
+
+        /* Should never happen */
+	pj_assert(!"There is more than one producer!");
+	return old_ptr;
+    }
+
+    AtomicQueue() {}
+};
+
+
+/* Interface to Oboe */
+class MyOboeEngine : oboe::AudioStreamDataCallback,
+		     oboe::AudioStreamErrorCallback
+{
+public:
+    MyOboeEngine(struct oboe_aud_stream *stream_, pjmedia_dir dir_)
+    : stream(stream_), dir(dir_), oboe_stream(NULL), dir_st(NULL),
+      thread(NULL), thread_quit(PJ_FALSE), queue(NULL),
+      err_thread_registered(false)
+    {
+	pj_assert(dir == PJMEDIA_DIR_CAPTURE || dir == PJMEDIA_DIR_PLAYBACK);
+	dir_st = (dir == PJMEDIA_DIR_CAPTURE? "capture":"playback");
+	pj_set_timestamp32(&ts, 0, 0);
+    }
+
+    pj_status_t Start() {
+	if (oboe_stream)
+	    return PJ_SUCCESS;
+
+	int dev_id = 0;
+	oboe::AudioStreamBuilder sb;
+	pj_status_t status;
+
+	if (dir == PJMEDIA_DIR_CAPTURE) {
+	    sb.setDirection(oboe::Direction::Input);
+	    if (stream->param.rec_id >= 0 &&
+		stream->param.rec_id < stream->f->dev_count)
+	    {
+		dev_id = stream->f->dev_info[stream->param.rec_id].id;
+	    }
+	} else {
+	    sb.setDirection(oboe::Direction::Output);
+	    if (stream->param.play_id >= 0 &&
+		stream->param.play_id < stream->f->dev_count)
+	    {
+		dev_id = stream->f->dev_info[stream->param.play_id].id;
+	    }
+	}
+	sb.setDeviceId(dev_id);
+	sb.setSampleRate(stream->param.clock_rate);
+	sb.setChannelCount(stream->param.channel_count);
+	sb.setPerformanceMode(oboe::PerformanceMode::LowLatency);
+	sb.setFormat(oboe::AudioFormat::I16);
+	sb.setDataCallback(this);
+	sb.setErrorCallback(this);
+	sb.setFramesPerDataCallback(stream->param.samples_per_frame /
+				    stream->param.channel_count);
+
+	/* Somehow mic does not work on Samsung S10 (get no error and
+	 * low latency, but callback is never invoked) if sample rate
+	 * conversion is specified. If it is not specified (default is None),
+	 * mic does not get low latency on, but it works.
+	 */
+	if (dir == PJMEDIA_DIR_PLAYBACK) {
+	    sb.setSampleRateConversionQuality(
+				oboe::SampleRateConversionQuality::High);
+
+	    /* Also if mic is Exclusive, it won't reopen after
+	     * plug/unplug headset (on Samsung S10).
+	     */
+	    sb.setSharingMode(oboe::SharingMode::Exclusive);
+	}
+
+	/* Create queue */
+	unsigned latency = (dir == PJMEDIA_DIR_CAPTURE?
+			    stream->param.input_latency_ms :
+			    stream->param.output_latency_ms);
+	unsigned queue_size = latency * stream->param.clock_rate *
+			      stream->param.channel_count / 1000 /
+			      stream->param.samples_per_frame;
+
+	/* Normalize queue size to be in range of 3-10 frames */
+	if (queue_size < 3) queue_size = 3;
+	if (queue_size > 10) queue_size = 10;
+
+	PJ_LOG(3,(THIS_FILE,
+		  "Oboe stream %s queue size=%d frames (latency=%d ms)",
+		  dir_st, queue_size, latency));
+
+	queue = new AtomicQueue(queue_size, stream->param.samples_per_frame*2,
+				dir_st);
+
+	/* Create semaphore */
+        if (sem_init(&sem, 0, 0) != 0) {
+	    return PJ_RETURN_OS_ERROR(pj_get_native_os_error());
+	}
+
+	/* Create thread */
+	thread_quit = PJ_FALSE;
+        status = pj_thread_create(stream->pool, "android_oboe",
+                                  AudioThread, this, 0, 0, &thread);
+        if (status != PJ_SUCCESS)
+            return status;
+
+	/* Open & start oboe stream */
+	oboe::Result result = sb.openStream(&oboe_stream);
+	if (result != oboe::Result::OK) {
+	    PJ_LOG(3,(THIS_FILE,
+		      "Oboe stream %s open failed (err=%d/%s)",
+		      dir_st, result, oboe::convertToText(result)));
+	    return PJMEDIA_EAUD_SYSERR;
+	}
+
+	result = oboe_stream->requestStart();
+	if (result != oboe::Result::OK) {
+	    PJ_LOG(3,(THIS_FILE,
+		      "Oboe stream %s start failed (err=%d/%s)",
+		      dir_st, result, oboe::convertToText(result)));
+	    return PJMEDIA_EAUD_SYSERR;
+	}
+
+	PJ_LOG(4, (THIS_FILE,
+		"Oboe stream %s started, "
+		"id=%d, clock_rate=%d, channel_count=%d, "
+		"samples_per_frame=%d (%dms), "
+		"API=%d/%s, exclusive=%s, low latency=%s, "
+		"size per callback=%d, buffer capacity=%d, burst size=%d",
+		dir_st,
+		stream->param.play_id,
+		stream->param.clock_rate,
+		stream->param.channel_count,
+		stream->param.samples_per_frame,
+		stream->param.samples_per_frame * 1000 /
+		       stream->param.clock_rate,
+		oboe_stream->getAudioApi(),
+		(oboe_stream->usesAAudio()? "AAudio":"other"),
+		(oboe_stream->getSharingMode()==
+			oboe::SharingMode::Exclusive? "yes":"no"),
+		(oboe_stream->getPerformanceMode()==
+			oboe::PerformanceMode::LowLatency? "yes":"no"),
+		oboe_stream->getFramesPerDataCallback()*
+			stream->param.channel_count,
+		oboe_stream->getBufferCapacityInFrames(),
+		oboe_stream->getFramesPerBurst()
+		));
+
+	return PJ_SUCCESS;
+    }
+
+    void Stop() {
+	if (oboe_stream) {
+	    oboe_stream->close();
+	    delete oboe_stream;
+	    oboe_stream = NULL;
+	}
+
+	if (thread) {
+	    thread_quit = PJ_TRUE;
+            sem_post(&sem);
+            pj_thread_join(thread);
+            pj_thread_destroy(thread);
+            thread = NULL;
+            sem_destroy(&sem);
+	}
+
+	if (queue) {
+	    delete queue;
+	    queue = NULL;
+	}
+
+	PJ_LOG(4, (THIS_FILE, "Oboe stream %s stopped.", dir_st));
+    }
+
+    /* Oboe callback, here let's just use Android native mutex & semaphore
+     * so we don't need to register the thread to PJLIB.
+     */
+    oboe::DataCallbackResult onAudioReady(oboe::AudioStream *oboeStream,
+					  void *audioData,
+					  int32_t numFrames)
+    {
+	if (dir == PJMEDIA_DIR_CAPTURE) {
+	    /* Put the audio frame to queue */
+	    queue->put(audioData);
+	} else {
+	    /* Get audio frame from queue */
+	    if (!queue->get(audioData)) {
+		pj_bzero(audioData, stream->param.samples_per_frame*2);
+		__android_log_write(ANDROID_LOG_WARN, THIS_FILE,
+			"Oboe playback got an empty queue");
+	    }
+	}
+
+	sem_post(&sem);
+
+	return oboe::DataCallbackResult::Continue;
+    }
+
+    void onErrorAfterClose(oboe::AudioStream *oboeStream, oboe::Result result)
+    {
+	/* Register callback thread */
+	if (!err_thread_registered || !pj_thread_is_registered())
+	{
+	    pj_thread_t* tmp_thread;
+	    pj_bzero(err_thread_desc, sizeof(pj_thread_desc));
+	    pj_thread_register("oboe_err_thread", err_thread_desc,
+			       &tmp_thread);
+	    err_thread_registered = true;
+	}
+
+	PJ_LOG(3,(THIS_FILE,
+		  "Oboe stream %s error (%d/%s), trying to restart stream..",
+		  dir_st, result, oboe::convertToText(result)));
+
+	/* Just try to restart */
+	Stop();
+	Start();
+    }
+
+    ~MyOboeEngine() {
+	Stop();
+    }
+
+private:
+
+    static int AudioThread(void *arg) {
+	MyOboeEngine *this_ = (MyOboeEngine*)arg;
+	struct oboe_aud_stream *stream = this_->stream;
+	pj_int16_t *tmp_buf;
+	unsigned ts_inc;
+	pj_status_t status;
+
+	/* Try to bump up the thread priority */
+	enum {
+	    THREAD_PRIORITY_AUDIO = -16,
+	    THREAD_PRIORITY_URGENT_AUDIO = -19
+	};
+	status = pj_thread_set_prio(NULL, THREAD_PRIORITY_URGENT_AUDIO);
+	if (status != PJ_SUCCESS) {
+	    PJ_PERROR(3,(THIS_FILE, status,
+			 "Warning: Oboe %s failed increasing thread priority",
+			 this_->dir_st));
+	}
+
+	tmp_buf = new pj_int16_t[this_->stream->param.samples_per_frame]();
+	ts_inc = stream->param.samples_per_frame/stream->param.channel_count;
+
+	/* Queue a silent frame to playback buffer */
+	if (this_->dir == PJMEDIA_DIR_PLAYBACK) {
+	    this_->queue->put(tmp_buf);
+	}
+
+	while (1) {
+	    sem_wait(&this_->sem);
+	    if (this_->thread_quit)
+		break;
+
+	    if (this_->dir == PJMEDIA_DIR_CAPTURE) {
+		unsigned cnt = 0;
+		bool stop_stream = false;
+
+		/* Read audio frames from Oboe */
+		while (this_->queue->get(tmp_buf)) {
+		    /* Send audio frame to app via callback rec_cb() */
+		    pjmedia_frame frame;
+		    frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
+		    frame.size =  stream->param.samples_per_frame * 2;
+		    frame.bit_info = 0;
+		    frame.buf = (void *)tmp_buf;
+		    frame.timestamp = this_->ts;
+		    status = (*stream->rec_cb)(stream->user_data, &frame);
+		    if (status != PJ_SUCCESS) {
+		        /* App wants to stop audio dev stream */
+			stop_stream = true;
+		        break;
+		    }
+
+		    /* Increment timestamp */
+		    pj_add_timestamp32(&this_->ts, ts_inc);
+		    ++cnt;
+		}
+
+		if (stop_stream)
+		    break;
+
+		/* Print log for debugging purpose */
+		if (cnt == 0) {
+		    PJ_LOG(5,(THIS_FILE, "Oboe %s got an empty queue",
+			      this_->dir_st));
+		} else if (cnt > 1) {
+		    PJ_LOG(5,(THIS_FILE, "Oboe %s got a burst of %d frames",
+			      this_->dir_st, cnt));
+		}
+	    } else {
+		/* Get audio frame from app via callback play_cb() */
+		pjmedia_frame frame;
+		frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
+		frame.size =  stream->param.samples_per_frame * 2;
+		frame.bit_info = 0;
+		frame.buf = (void *)tmp_buf;
+		frame.timestamp = this_->ts;
+		status = (*stream->play_cb)(stream->user_data, &frame);
+
+		/* Send audio frame to Oboe */
+		if (status == PJ_SUCCESS) {
+		    this_->queue->put(tmp_buf);
+		} else {
+		    /* App wants to stop audio dev stream */
+		    break;
+		}
+
+		/* Increment timestamp */
+		pj_add_timestamp32(&this_->ts, ts_inc);
+	    }
+	}
+
+	delete [] tmp_buf;
+	return 0;
+    }
+
+private:
+    struct oboe_aud_stream	*stream;
+    pjmedia_dir			 dir;
+    oboe::AudioStream		*oboe_stream;
+    const char			*dir_st;
+    pj_thread_t			*thread;
+    pj_bool_t			 thread_quit;
+    sem_t			 sem;
+    AtomicQueue			*queue;
+    pj_timestamp		 ts;
+    bool			 err_thread_registered;
+    pj_thread_desc		 err_thread_desc;
+
+};
+
+
+/* API: create stream */
+static pj_status_t oboe_create_stream(pjmedia_aud_dev_factory *f,
+				      const pjmedia_aud_param *param,
+				      pjmedia_aud_rec_cb rec_cb,
+				      pjmedia_aud_play_cb play_cb,
+				      void *user_data,
+				      pjmedia_aud_stream **p_aud_strm)
+{
+    struct oboe_aud_factory *pa = (struct oboe_aud_factory*)f;
+    pj_pool_t *pool;
+    struct oboe_aud_stream *stream;
+    pj_status_t status = PJ_SUCCESS;
+
+    PJ_ASSERT_RETURN(param->channel_count >= 1 && param->channel_count <= 2,
+                     PJ_EINVAL);
+    PJ_ASSERT_RETURN(param->bits_per_sample==8 || param->bits_per_sample==16,
+                     PJ_EINVAL);
+    PJ_ASSERT_RETURN(play_cb && rec_cb && p_aud_strm, PJ_EINVAL);
+
+    pool = pj_pool_create(pa->pf, "oboestrm", 1024, 1024, NULL);
+    if (!pool)
+        return PJ_ENOMEM;
+
+    PJ_LOG(4, (THIS_FILE, "Creating Oboe stream"));
+
+    stream = PJ_POOL_ZALLOC_T(pool, struct oboe_aud_stream);
+    stream->pool = pool;
+    stream->f = pa;
+    pj_strdup2_with_null(pool, &stream->name, "Oboe stream");
+    stream->dir = param->dir;
+    pj_memcpy(&stream->param, param, sizeof(*param));
+    stream->user_data = user_data;
+    stream->rec_cb = rec_cb;
+    stream->play_cb = play_cb;
+
+    if (param->dir & PJMEDIA_DIR_CAPTURE) {
+	stream->rec_engine = new MyOboeEngine(stream, PJMEDIA_DIR_CAPTURE);
+	if (!stream->rec_engine) {
+	    status = PJ_ENOMEM;
+	    goto on_error;
+	}
+    }
+
+    if (stream->dir & PJMEDIA_DIR_PLAYBACK) {
+	stream->play_engine = new MyOboeEngine(stream, PJMEDIA_DIR_PLAYBACK);
+	if (!stream->play_engine) {
+	    status = PJ_ENOMEM;
+	    goto on_error;
+	}
+    }
+
+    /* Done */
+    stream->base.op = &oboe_strm_op;
+    *p_aud_strm = &stream->base;
+
+    return PJ_SUCCESS;
+
+on_error:
+    strm_destroy(&stream->base);
+    return status;
+}
+
+/* API: Get stream parameters */
+static pj_status_t strm_get_param(pjmedia_aud_stream *s,
+                                  pjmedia_aud_param *pi)
+{
+    struct oboe_aud_stream *strm = (struct oboe_aud_stream*)s;
+    PJ_ASSERT_RETURN(strm && pi, PJ_EINVAL);
+    pj_memcpy(pi, &strm->param, sizeof(*pi));
+
+    return PJ_SUCCESS;
+}
+
+/* API: get capability */
+static pj_status_t strm_get_cap(pjmedia_aud_stream *s,
+                                pjmedia_aud_dev_cap cap,
+                                void *pval)
+{
+    struct oboe_aud_stream *strm = (struct oboe_aud_stream*)s;
+    pj_status_t status = PJMEDIA_EAUD_INVCAP;
+
+    PJ_UNUSED_ARG(strm);
+
+    PJ_ASSERT_RETURN(s && pval, PJ_EINVAL);
+
+    return status;
+}
+
+/* API: set capability */
+static pj_status_t strm_set_cap(pjmedia_aud_stream *s,
+                                pjmedia_aud_dev_cap cap,
+                                const void *value)
+{
+    struct oboe_aud_stream *strm = (struct oboe_aud_stream*)s;
+
+    PJ_UNUSED_ARG(strm);
+
+    PJ_ASSERT_RETURN(s && value, PJ_EINVAL);
+
+    return PJMEDIA_EAUD_INVCAP;
+}
+
+/* API: start stream. */
+static pj_status_t strm_start(pjmedia_aud_stream *s)
+{
+    struct oboe_aud_stream *stream = (struct oboe_aud_stream*)s;
+    pj_status_t status;
+
+    if (stream->running)
+	return PJ_SUCCESS;
+
+    if (stream->rec_engine) {
+	status = stream->rec_engine->Start();
+	if (status != PJ_SUCCESS)
+	    goto on_error;
+    }
+    if (stream->play_engine) {
+	status = stream->play_engine->Start();
+	if (status != PJ_SUCCESS)
+	    goto on_error;
+    }
+
+    stream->running = PJ_TRUE;
+    PJ_LOG(4, (THIS_FILE, "Oboe stream started"));
+
+    return PJ_SUCCESS;
+
+on_error:
+    if (stream->rec_engine)
+	stream->rec_engine->Stop();
+    if (stream->play_engine)
+	stream->play_engine->Stop();
+
+    PJ_LOG(4, (THIS_FILE, "Failed starting Oboe stream"));
+
+    return status;
+}
+
+/* API: stop stream. */
+static pj_status_t strm_stop(pjmedia_aud_stream *s)
+{
+    struct oboe_aud_stream *stream = (struct oboe_aud_stream*)s;
+
+    if (!stream->running)
+        return PJ_SUCCESS;
+
+    stream->running = PJ_FALSE;
+
+    if (stream->rec_engine)
+	stream->rec_engine->Stop();
+    if (stream->play_engine)
+	stream->play_engine->Stop();
+
+    PJ_LOG(4,(THIS_FILE, "Oboe stream stopped"));
+
+    return PJ_SUCCESS;
+}
+
+/* API: destroy stream. */
+static pj_status_t strm_destroy(pjmedia_aud_stream *s)
+{
+    struct oboe_aud_stream *stream = (struct oboe_aud_stream*)s;
+
+    PJ_LOG(4,(THIS_FILE, "Destroying Oboe stream..."));
+
+    /* Stop the stream */
+    strm_stop(s);
+
+    pj_pool_release(stream->pool);
+    PJ_LOG(4, (THIS_FILE, "Oboe stream destroyed"));
+
+    return PJ_SUCCESS;
+}
+
+#endif	/* PJMEDIA_AUDIO_DEV_HAS_OBOE */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/and_aud_mediacodec.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/and_aud_mediacodec.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/and_aud_mediacodec.cpp	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/and_aud_mediacodec.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,1373 @@
+/*
+ * Copyright (C)2020 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <pjmedia-codec/and_aud_mediacodec.h>
+#include <pjmedia-codec/amr_sdp_match.h>
+#include <pjmedia/codec.h>
+#include <pjmedia/errno.h>
+#include <pjmedia/endpoint.h>
+#include <pjmedia/plc.h>
+#include <pjmedia/port.h>
+#include <pjmedia/silencedet.h>
+#include <pj/assert.h>
+#include <pj/log.h>
+#include <pj/math.h>
+#include <pj/pool.h>
+#include <pj/string.h>
+#include <pj/os.h>
+
+/*
+ * Only build this file if PJMEDIA_HAS_ANDROID_MEDIACODEC != 0
+ */
+#if defined(PJMEDIA_HAS_ANDROID_MEDIACODEC) && \
+            PJMEDIA_HAS_ANDROID_MEDIACODEC != 0
+
+/* Android AMediaCodec: */
+#include "media/NdkMediaCodec.h"
+
+#define THIS_FILE  "and_aud_mediacodec.cpp"
+
+#define AND_MEDIA_KEY_PCM_ENCODING       "pcm-encoding"
+#define AND_MEDIA_KEY_CHANNEL_COUNT      "channel-count"
+#define AND_MEDIA_KEY_SAMPLE_RATE        "sample-rate"
+#define AND_MEDIA_KEY_BITRATE            "bitrate"
+#define AND_MEDIA_KEY_MIME               "mime"
+
+#define CODEC_WAIT_RETRY 	10
+#define CODEC_THREAD_WAIT 	10
+/* Timeout until the buffer is ready in ms. */
+#define CODEC_DEQUEUE_TIMEOUT 	10
+
+/* Prototypes for Android MediaCodec codecs factory */
+static pj_status_t and_media_test_alloc(pjmedia_codec_factory *factory,
+					const pjmedia_codec_info *id );
+static pj_status_t and_media_default_attr(pjmedia_codec_factory *factory,
+					  const pjmedia_codec_info *id,
+					  pjmedia_codec_param *attr );
+static pj_status_t and_media_enum_codecs(pjmedia_codec_factory *factory,
+					 unsigned *count,
+					 pjmedia_codec_info codecs[]);
+static pj_status_t and_media_alloc_codec(pjmedia_codec_factory *factory,
+					 const pjmedia_codec_info *id,
+					 pjmedia_codec **p_codec);
+static pj_status_t and_media_dealloc_codec(pjmedia_codec_factory *factory,
+					   pjmedia_codec *codec );
+
+/* Prototypes for Android MediaCodec codecs implementation. */
+static pj_status_t  and_media_codec_init(pjmedia_codec *codec,
+					 pj_pool_t *pool );
+static pj_status_t  and_media_codec_open(pjmedia_codec *codec,
+					 pjmedia_codec_param *attr );
+static pj_status_t  and_media_codec_close(pjmedia_codec *codec );
+static pj_status_t  and_media_codec_modify(pjmedia_codec *codec,
+					   const pjmedia_codec_param *attr );
+static pj_status_t  and_media_codec_parse(pjmedia_codec *codec,
+					  void *pkt,
+					  pj_size_t pkt_size,
+					  const pj_timestamp *ts,
+					  unsigned *frame_cnt,
+					  pjmedia_frame frames[]);
+static pj_status_t  and_media_codec_encode(pjmedia_codec *codec,
+					   const struct pjmedia_frame *input,
+					   unsigned output_buf_len,
+					   struct pjmedia_frame *output);
+static pj_status_t  and_media_codec_decode(pjmedia_codec *codec,
+					   const struct pjmedia_frame *input,
+					   unsigned output_buf_len,
+					   struct pjmedia_frame *output);
+static pj_status_t  and_media_codec_recover(pjmedia_codec *codec,
+					    unsigned output_buf_len,
+					    struct pjmedia_frame *output);
+
+/* Definition for Android MediaCodec codecs operations. */
+static pjmedia_codec_op and_media_op =
+{
+    &and_media_codec_init,
+    &and_media_codec_open,
+    &and_media_codec_close,
+    &and_media_codec_modify,
+    &and_media_codec_parse,
+    &and_media_codec_encode,
+    &and_media_codec_decode,
+    &and_media_codec_recover
+};
+
+/* Definition for Android MediaCodec codecs factory operations. */
+static pjmedia_codec_factory_op and_media_factory_op =
+{
+    &and_media_test_alloc,
+    &and_media_default_attr,
+    &and_media_enum_codecs,
+    &and_media_alloc_codec,
+    &and_media_dealloc_codec,
+    &pjmedia_codec_and_media_aud_deinit
+};
+
+/* Android MediaCodec codecs factory */
+static struct and_media_factory {
+    pjmedia_codec_factory    base;
+    pjmedia_endpt	    *endpt;
+    pj_pool_t		    *pool;
+    pj_mutex_t        	    *mutex;
+} and_media_factory;
+
+typedef enum and_aud_codec_id {
+    /* AMRNB codec. */
+    AND_AUD_CODEC_AMRNB,
+
+    /* AMRWB codec. */
+    AND_AUD_CODEC_AMRWB
+} and_aud_codec_id;
+
+/* Android MediaCodec codecs private data. */
+typedef struct and_media_private {
+    int			 codec_idx;	    /**< Codec index.		    */
+    void		*codec_setting;	    /**< Specific codec setting.    */
+    pj_pool_t		*pool;		    /**< Pool for each instance.    */
+    AMediaCodec         *enc;               /**< Encoder state.		    */
+    AMediaCodec         *dec;               /**< Decoder state.		    */
+
+    pj_uint16_t		 frame_size;	    /**< Bitstream frame size.	    */
+
+    pj_bool_t		 plc_enabled;	    /**< PLC enabled flag.	    */
+    pjmedia_plc		*plc;		    /**< PJMEDIA PLC engine, NULL if 
+						 codec has internal PLC.    */
+
+    pj_bool_t		 vad_enabled;	    /**< VAD enabled flag.	    */
+    pjmedia_silence_det	*vad;		    /**< PJMEDIA VAD engine, NULL if 
+						 codec has internal VAD.    */
+    pj_timestamp	 last_tx;	    /**< Timestamp of last transmit.*/
+} and_media_private_t;
+
+/* CUSTOM CALLBACKS */
+
+/* Parse frames from a packet. Default behaviour of frame parsing is 
+ * just separating frames based on calculating frame length derived 
+ * from bitrate. Implement this callback when the default behaviour is 
+ * unapplicable.
+ */
+typedef pj_status_t (*parse_cb)(and_media_private_t *codec_data, void *pkt,
+				pj_size_t pkt_size, const pj_timestamp *ts,
+				unsigned *frame_cnt, pjmedia_frame frames[]);
+
+/* Pack frames into a packet. Default behaviour of packing frames is 
+ * just stacking the frames with octet aligned without adding any 
+ * payload header. Implement this callback when the default behaviour is
+ * unapplicable.
+ */
+typedef pj_status_t (*pack_cb)(and_media_private_t *codec_data,
+			       unsigned nframes, void *pkt, pj_size_t *pkt_size,
+			       pj_size_t max_pkt_size);
+
+/* This callback is useful for preparing a frame before pass it to decoder.
+ */
+typedef void (*predecode_cb)(and_media_private_t  *codec_data,
+			     const pjmedia_frame *rtp_frame,
+			     pjmedia_frame *out);
+
+#if PJMEDIA_HAS_AND_MEDIA_AMRNB || PJMEDIA_HAS_AND_MEDIA_AMRWB
+/* Custom callback implementations. */
+static pj_status_t parse_amr(and_media_private_t *codec_data, void *pkt,
+			     pj_size_t pkt_size, const pj_timestamp *ts,
+			     unsigned *frame_cnt, pjmedia_frame frames[]);
+static  pj_status_t pack_amr(and_media_private_t *codec_data, unsigned nframes,
+			     void *pkt, pj_size_t *pkt_size,
+			     pj_size_t max_pkt_size);
+static void predecode_amr(and_media_private_t  *codec_data,
+			  const pjmedia_frame *input,
+			  pjmedia_frame *out);
+#endif
+
+#if PJMEDIA_HAS_AND_MEDIA_AMRNB
+
+static pj_str_t AMRNB_encoder[] = {{(char *)"OMX.google.amrnb.encoder\0", 24},
+				   {(char *)"c2.android.amrnb.encoder\0", 24}};
+
+static pj_str_t AMRNB_decoder[] = {{(char *)"OMX.google.amrnb.decoder\0", 24},
+			           {(char *)"c2.android.amrnb.decoder\0", 24}};
+#endif
+
+#if PJMEDIA_HAS_AND_MEDIA_AMRWB
+
+static pj_str_t AMRWB_encoder[] = {{(char *)"OMX.google.amrwb.encoder\0", 24},
+				   {(char *)"c2.android.amrwb.encoder\0", 24}};
+
+static pj_str_t AMRWB_decoder[] = {{(char *)"OMX.google.amrwb.decoder\0", 24},
+				   {(char *)"c2.android.amrwb.decoder\0", 24}};
+#endif
+
+/* Android MediaCodec codec implementation descriptions. */
+static struct and_media_codec {
+    int		     enabled;		/* Is this codec enabled?	    */
+    const char	    *name;		/* Codec name.			    */
+    const char      *mime_type;         /* Mime type.                       */
+    pj_str_t        *encoder_name;      /* Encoder name.                    */
+    pj_str_t        *decoder_name;      /* Decoder name.                    */
+
+    pj_uint8_t	     pt;		/* Payload type.		    */
+    and_aud_codec_id codec_id;		/* Codec id.                        */
+    unsigned	     clock_rate;	/* Codec's clock rate.		    */
+    unsigned	     channel_count;	/* Codec's channel count.	    */
+    unsigned	     samples_per_frame;	/* Codec's samples count.	    */
+    unsigned	     def_bitrate;	/* Default bitrate of this codec.   */
+    unsigned	     max_bitrate;	/* Maximum bitrate of this codec.   */
+    pj_uint8_t	     frm_per_pkt;	/* Default num of frames per packet.*/
+    int		     has_native_vad;	/* Codec has internal VAD?	    */
+    int		     has_native_plc;	/* Codec has internal PLC?	    */
+
+    parse_cb	     parse;		/* Callback to parse bitstream.	    */
+    pack_cb	     pack;		/* Callback to pack bitstream.	    */
+    predecode_cb     predecode;         /* Callback to prepare bitstream
+                                           before passing it to decoder.    */
+
+    pjmedia_codec_fmtp dec_fmtp;	/* Decoder's fmtp params.	    */
+}
+
+and_media_codec[] =
+{
+#   if PJMEDIA_HAS_AND_MEDIA_AMRNB
+    {0, "AMR", "audio/3gpp", NULL, NULL,
+        PJMEDIA_RTP_PT_AMR, AND_AUD_CODEC_AMRNB, 8000, 1, 160, 7400, 12200,
+        2, 0, 0, &parse_amr, &pack_amr, &predecode_amr,
+        {1, {{{(char *)"octet-align", 11}, {(char *)"1", 1}}}}
+    },
+#   endif
+
+#   if PJMEDIA_HAS_AND_MEDIA_AMRWB
+    {0, "AMR-WB", "audio/amr-wb", NULL, NULL,
+        PJMEDIA_RTP_PT_AMRWB, AND_AUD_CODEC_AMRWB, 16000, 1, 320, 15850, 23850,
+        2, 0, 0, &parse_amr, &pack_amr, &predecode_amr,
+	{1, {{{(char *)"octet-align", 11}, {(char *)"1", 1}}}}
+    },
+#   endif
+};
+
+#if PJMEDIA_HAS_AND_MEDIA_AMRNB || PJMEDIA_HAS_AND_MEDIA_AMRWB
+
+#include <pjmedia-codec/amr_helper.h>
+
+typedef struct amr_settings_t {
+    pjmedia_codec_amr_pack_setting enc_setting;
+    pjmedia_codec_amr_pack_setting dec_setting;
+    pj_int8_t enc_mode;
+} amr_settings_t;
+
+/* Pack AMR payload */
+static pj_status_t pack_amr(and_media_private_t *codec_data, unsigned nframes,
+			    void *pkt, pj_size_t *pkt_size,
+			    pj_size_t max_pkt_size)
+{
+    enum {MAX_FRAMES_PER_PACKET = PJMEDIA_MAX_FRAME_DURATION_MS / 20};
+
+    pjmedia_frame frames[MAX_FRAMES_PER_PACKET];
+    pj_uint8_t *p; /* Read cursor */
+    pjmedia_codec_amr_pack_setting *setting;
+    unsigned i;
+    pj_status_t status;
+
+    setting = &((amr_settings_t*)codec_data->codec_setting)->enc_setting;
+
+    /* Align pkt buf right */
+    p = (pj_uint8_t*)pkt + max_pkt_size - *pkt_size;
+    pj_memmove(p, pkt, *pkt_size);
+
+    /* Get frames */
+    for (i = 0; i < nframes; ++i) {
+	pjmedia_codec_amr_bit_info *info = (pjmedia_codec_amr_bit_info*)
+					    &frames[i].bit_info;
+	pj_bzero(info, sizeof(*info));
+	info->frame_type = (pj_uint8_t)((*p >> 3) & 0x0F);
+	info->good_quality = (pj_uint8_t)((*p >> 2) & 0x01);
+	info->mode = ((amr_settings_t*)codec_data->codec_setting)->enc_mode;
+	info->start_bit = 0;
+	frames[i].buf = p + 1;
+        if (setting->amr_nb) {
+            frames[i].size = (info->frame_type <= 8)?
+                             pjmedia_codec_amrnb_framelen[info->frame_type] : 0;
+        } else {
+            frames[i].size = (info->frame_type <= 9)?
+                             pjmedia_codec_amrwb_framelen[info->frame_type] : 0;
+        }
+	p += frames[i].size + 1;
+    }
+    /* Pack */
+    *pkt_size = max_pkt_size;
+    status = pjmedia_codec_amr_pack(frames, nframes, setting, pkt, pkt_size);
+
+    return status;
+}
+
+/* Parse AMR payload into frames. */
+static pj_status_t parse_amr(and_media_private_t *codec_data, void *pkt,
+			     pj_size_t pkt_size, const pj_timestamp *ts,
+			     unsigned *frame_cnt, pjmedia_frame frames[])
+{
+    amr_settings_t* s = (amr_settings_t*)codec_data->codec_setting;
+    pjmedia_codec_amr_pack_setting *setting;
+    pj_status_t status;
+    pj_uint8_t cmr;
+
+    setting = &s->dec_setting;
+    status = pjmedia_codec_amr_parse(pkt, pkt_size, ts, setting, frames, 
+				     frame_cnt, &cmr);
+    if (status != PJ_SUCCESS)
+	return status;
+
+    /* Check Change Mode Request. */
+    if (((setting->amr_nb && cmr <= 7) || (!setting->amr_nb && cmr <= 8)) &&
+	s->enc_mode != cmr)
+    {
+	s->enc_mode = cmr;
+    }
+    return PJ_SUCCESS;
+}
+
+static void predecode_amr(and_media_private_t *codec_data,
+			  const pjmedia_frame *input,
+			  pjmedia_frame *out)
+{
+    pjmedia_codec_amr_bit_info *info;
+    pj_uint8_t *bitstream = (pj_uint8_t *)out->buf;
+    pjmedia_codec_amr_pack_setting *setting;
+
+    out->buf = &bitstream[1];
+    setting = &((amr_settings_t*)codec_data->codec_setting)->dec_setting;
+    pjmedia_codec_amr_predecode(input, setting, out);
+    info = (pjmedia_codec_amr_bit_info*)&out->bit_info;
+    bitstream[0] = (info->frame_type << 3) | (info->good_quality << 2);
+    out->buf = &bitstream[0];
+    ++out->size;
+}
+
+#endif /* PJMEDIA_HAS_AND_MEDIA_AMRNB || PJMEDIA_HAS_AND_MEDIA_AMRWB */
+
+static pj_status_t configure_codec(and_media_private_t *and_media_data,
+				   pj_bool_t is_encoder)
+{
+    media_status_t am_status;
+    AMediaFormat *aud_fmt;
+    int idx = and_media_data->codec_idx;
+    AMediaCodec *codec = (is_encoder?and_media_data->enc:and_media_data->dec);
+
+    aud_fmt = AMediaFormat_new();
+    if (!aud_fmt) {
+        return PJ_ENOMEM;
+    }
+    AMediaFormat_setString(aud_fmt, AND_MEDIA_KEY_MIME,
+                           and_media_codec[idx].mime_type);
+    AMediaFormat_setInt32(aud_fmt, AND_MEDIA_KEY_PCM_ENCODING, 2);
+    AMediaFormat_setInt32(aud_fmt, AND_MEDIA_KEY_CHANNEL_COUNT,
+                          and_media_codec[idx].channel_count);
+    AMediaFormat_setInt32(aud_fmt, AND_MEDIA_KEY_SAMPLE_RATE,
+			  and_media_codec[idx].clock_rate);
+    AMediaFormat_setInt32(aud_fmt, AND_MEDIA_KEY_BITRATE,
+			  and_media_codec[idx].def_bitrate);
+
+    /* Configure and start encoder. */
+    am_status = AMediaCodec_configure(codec, aud_fmt, NULL, NULL, is_encoder);
+    AMediaFormat_delete(aud_fmt);
+    if (am_status != AMEDIA_OK) {
+        PJ_LOG(4, (THIS_FILE, "%s [0x%x] configure failed, status=%d",
+               is_encoder?"Encoder":"Decoder", codec, am_status));
+        return PJMEDIA_CODEC_EFAILED;
+    }
+    am_status = AMediaCodec_start(codec);
+    if (am_status != AMEDIA_OK) {
+	PJ_LOG(4, (THIS_FILE, "%s [0x%x] start failed, status=%d",
+	       is_encoder?"Encoder":"Decoder", codec, am_status));
+	return PJMEDIA_CODEC_EFAILED;
+    }
+    PJ_LOG(4, (THIS_FILE, "%s [0x%x] started", is_encoder?"Encoder":"Decoder",
+	   codec));
+    return PJ_SUCCESS;
+}
+
+/*
+ * Initialize and register Android MediaCodec codec factory to pjmedia endpoint.
+ */
+PJ_DEF(pj_status_t) pjmedia_codec_and_media_aud_init( pjmedia_endpt *endpt )
+{
+    pjmedia_codec_mgr *codec_mgr;
+    pj_str_t codec_name;
+    pj_status_t status;
+
+    if (and_media_factory.pool != NULL) {
+	/* Already initialized. */
+	return PJ_SUCCESS;
+    }
+
+    PJ_LOG(4, (THIS_FILE, "Initing codec"));
+
+    /* Create Android MediaCodec codec factory. */
+    and_media_factory.base.op = &and_media_factory_op;
+    and_media_factory.base.factory_data = NULL;
+    and_media_factory.endpt = endpt;
+
+    and_media_factory.pool = pjmedia_endpt_create_pool(endpt,
+                                                   "Android MediaCodec codecs",
+                                                   4000, 4000);
+    if (!and_media_factory.pool)
+	return PJ_ENOMEM;
+
+    /* Create mutex. */
+    status = pj_mutex_create_simple(and_media_factory.pool,
+                                    "Android MediaCodec codecs",
+				    &and_media_factory.mutex);
+    if (status != PJ_SUCCESS)
+	goto on_error;
+
+    /* Get the codec manager. */
+    codec_mgr = pjmedia_endpt_get_codec_mgr(endpt);
+    if (!codec_mgr) {
+	status = PJ_EINVALIDOP;
+	goto on_error;
+    }
+
+#if PJMEDIA_HAS_AND_MEDIA_AMRNB
+    PJ_LOG(4, (THIS_FILE, "Registering AMRNB codec"));
+
+    pj_cstr(&codec_name, "AMR");
+    status = pjmedia_sdp_neg_register_fmt_match_cb(
+						&codec_name,
+						&pjmedia_codec_amr_match_sdp);
+    if (status != PJ_SUCCESS)
+	goto on_error;
+#endif
+
+#if PJMEDIA_HAS_AND_MEDIA_AMRWB
+    PJ_LOG(4, (THIS_FILE, "Registering AMRWB codec"));
+
+    pj_cstr(&codec_name, "AMR-WB");
+    status = pjmedia_sdp_neg_register_fmt_match_cb(
+						&codec_name,
+						&pjmedia_codec_amr_match_sdp);
+    if (status != PJ_SUCCESS)
+	goto on_error;
+#endif
+
+    /* Suppress compile warning */
+    PJ_UNUSED_ARG(codec_name);
+
+    /* Register codec factory to endpoint. */
+    status = pjmedia_codec_mgr_register_factory(codec_mgr, 
+						&and_media_factory.base);
+    if (status != PJ_SUCCESS)
+	goto on_error;
+
+    /* Done. */
+    return PJ_SUCCESS;
+
+on_error:
+    pj_pool_release(and_media_factory.pool);
+    and_media_factory.pool = NULL;
+    return status;
+}
+
+/*
+ * Unregister Android MediaCodec codecs factory from pjmedia endpoint.
+ */
+PJ_DEF(pj_status_t) pjmedia_codec_and_media_aud_deinit(void)
+{
+    pjmedia_codec_mgr *codec_mgr;
+    pj_status_t status;
+
+    if (and_media_factory.pool == NULL) {
+	/* Already deinitialized */
+	return PJ_SUCCESS;
+    }
+
+    pj_mutex_lock(and_media_factory.mutex);
+
+    /* Get the codec manager. */
+    codec_mgr = pjmedia_endpt_get_codec_mgr(and_media_factory.endpt);
+    if (!codec_mgr) {
+	pj_pool_release(and_media_factory.pool);
+	and_media_factory.pool = NULL;
+	pj_mutex_unlock(and_media_factory.mutex);
+	return PJ_EINVALIDOP;
+    }
+
+    /* Unregister Android MediaCodec codecs factory. */
+    status = pjmedia_codec_mgr_unregister_factory(codec_mgr,
+						  &and_media_factory.base);
+
+    /* Destroy mutex. */
+    pj_mutex_unlock(and_media_factory.mutex);
+    pj_mutex_destroy(and_media_factory.mutex);
+    and_media_factory.mutex = NULL;
+
+    /* Destroy pool. */
+    pj_pool_release(and_media_factory.pool);
+    and_media_factory.pool = NULL;
+
+    return status;
+}
+
+/*
+ * Check if factory can allocate the specified codec. 
+ */
+static pj_status_t and_media_test_alloc(pjmedia_codec_factory *factory,
+					const pjmedia_codec_info *info )
+{
+    unsigned i;
+
+    PJ_UNUSED_ARG(factory);
+
+    /* Type MUST be audio. */
+    if (info->type != PJMEDIA_TYPE_AUDIO)
+	return PJMEDIA_CODEC_EUNSUP;
+
+    for (i = 0; i < PJ_ARRAY_SIZE(and_media_codec); ++i) {
+	pj_str_t name = pj_str((char*)and_media_codec[i].name);
+	if ((pj_stricmp(&info->encoding_name, &name) == 0) &&
+	    (info->clock_rate == (unsigned)and_media_codec[i].clock_rate) &&
+	    (info->channel_cnt == (unsigned)and_media_codec[i].channel_count) &&
+	    (and_media_codec[i].enabled))
+	{
+	    return PJ_SUCCESS;
+	}
+    }
+
+    /* Unsupported, or mode is disabled. */
+    return PJMEDIA_CODEC_EUNSUP;
+}
+
+/*
+ * Generate default attribute.
+ */
+static pj_status_t and_media_default_attr (pjmedia_codec_factory *factory,
+					   const pjmedia_codec_info *id,
+					   pjmedia_codec_param *attr)
+{
+    unsigned i;
+
+    PJ_ASSERT_RETURN(factory==&and_media_factory.base, PJ_EINVAL);
+
+    pj_bzero(attr, sizeof(pjmedia_codec_param));
+
+    for (i = 0; i < PJ_ARRAY_SIZE(and_media_codec); ++i) {
+	pj_str_t name = pj_str((char*)and_media_codec[i].name);
+	if ((and_media_codec[i].enabled) &&
+	    (pj_stricmp(&id->encoding_name, &name) == 0) &&
+	    (id->clock_rate == (unsigned)and_media_codec[i].clock_rate) &&
+	    (id->channel_cnt == (unsigned)and_media_codec[i].channel_count) &&
+	    (id->pt == (unsigned)and_media_codec[i].pt))
+	{
+	    attr->info.pt = (pj_uint8_t)id->pt;
+	    attr->info.channel_cnt = and_media_codec[i].channel_count;
+	    attr->info.clock_rate = and_media_codec[i].clock_rate;
+	    attr->info.avg_bps = and_media_codec[i].def_bitrate;
+	    attr->info.max_bps = and_media_codec[i].max_bitrate;
+	    attr->info.pcm_bits_per_sample = 16;
+	    attr->info.frm_ptime =  (pj_uint16_t)
+				(and_media_codec[i].samples_per_frame * 1000 /
+				and_media_codec[i].channel_count /
+				and_media_codec[i].clock_rate);
+	    attr->setting.frm_per_pkt = and_media_codec[i].frm_per_pkt;
+
+	    /* Default flags. */
+	    attr->setting.plc = 1;
+	    attr->setting.penh= 0;
+	    attr->setting.vad = 1;
+	    attr->setting.cng = attr->setting.vad;
+	    attr->setting.dec_fmtp = and_media_codec[i].dec_fmtp;
+
+	    return PJ_SUCCESS;
+	}
+    }
+
+    return PJMEDIA_CODEC_EUNSUP;
+}
+
+static pj_bool_t codec_exists(const pj_str_t *codec_name)
+{
+    AMediaCodec *codec;
+    char *codec_txt;
+
+    codec_txt = codec_name->ptr;
+
+    codec = AMediaCodec_createCodecByName(codec_txt);
+    if (!codec) {
+	PJ_LOG(4, (THIS_FILE, "Failed creating codec : %.*s", codec_name->slen,
+		   codec_name->ptr));
+	return PJ_FALSE;
+    }
+    AMediaCodec_delete(codec);
+
+    return PJ_TRUE;
+}
+
+/*
+ * Enum codecs supported by this factory.
+ */
+static pj_status_t and_media_enum_codecs(pjmedia_codec_factory *factory,
+					 unsigned *count,
+					 pjmedia_codec_info codecs[])
+{
+    unsigned max;
+    unsigned i;
+
+    PJ_UNUSED_ARG(factory);
+    PJ_ASSERT_RETURN(codecs && *count > 0, PJ_EINVAL);
+
+    max = *count;
+
+    for (i = 0, *count = 0; i < PJ_ARRAY_SIZE(and_media_codec) &&
+         *count < max; ++i)
+    {
+	unsigned enc_idx, dec_idx;
+	pj_str_t *enc_name = NULL;
+	unsigned num_enc = 0;
+	pj_str_t *dec_name = NULL;
+	unsigned num_dec = 0;
+
+	switch (and_media_codec[i].codec_id) {
+
+	case AND_AUD_CODEC_AMRNB:
+#if PJMEDIA_HAS_AND_MEDIA_AMRNB
+	    enc_name = &AMRNB_encoder[0];
+	    dec_name = &AMRNB_decoder[0];
+	    num_enc = PJ_ARRAY_SIZE(AMRNB_encoder);
+	    num_dec = PJ_ARRAY_SIZE(AMRNB_decoder);
+#endif
+	    break;
+	case AND_AUD_CODEC_AMRWB:
+#if PJMEDIA_HAS_AND_MEDIA_AMRWB
+	    enc_name = &AMRWB_encoder[0];
+	    dec_name = &AMRWB_decoder[0];
+	    num_enc = PJ_ARRAY_SIZE(AMRWB_encoder);
+	    num_dec = PJ_ARRAY_SIZE(AMRWB_decoder);
+#endif
+
+	    break;
+	default:
+	    continue;
+	};
+	if (!enc_name || !dec_name) {
+	    continue;
+	}
+
+	for (enc_idx = 0; enc_idx < num_enc ;++enc_idx, ++enc_name) {
+	    if (codec_exists(enc_name)) {
+		break;
+	    }
+	}
+	if (enc_idx == num_enc)
+	    continue;
+
+	for (dec_idx = 0; dec_idx < num_dec ;++dec_idx, ++dec_name) {
+	    if (codec_exists(dec_name)) {
+		break;
+	    }
+	}
+	if (dec_idx == num_dec)
+	    continue;
+
+	and_media_codec[i].encoder_name = enc_name;
+	and_media_codec[i].decoder_name = dec_name;
+	pj_bzero(&codecs[*count], sizeof(pjmedia_codec_info));
+	codecs[*count].encoding_name = pj_str((char*)and_media_codec[i].name);
+	codecs[*count].pt = and_media_codec[i].pt;
+	codecs[*count].type = PJMEDIA_TYPE_AUDIO;
+	codecs[*count].clock_rate = and_media_codec[i].clock_rate;
+	codecs[*count].channel_cnt = and_media_codec[i].channel_count;
+	and_media_codec[i].enabled = PJ_TRUE;
+	PJ_LOG(4, (THIS_FILE, "Found encoder [%d]: %.*s and decoder: %.*s ",
+		   *count, enc_name->slen, enc_name->ptr, dec_name->slen,
+		   dec_name->ptr));
+	++*count;
+    }
+
+    return PJ_SUCCESS;
+}
+
+static void create_codec(and_media_private_t *and_media_data)
+{
+    char const *enc_name =
+		   and_media_codec[and_media_data->codec_idx].encoder_name->ptr;
+    char const *dec_name =
+		   and_media_codec[and_media_data->codec_idx].decoder_name->ptr;
+
+    if (!and_media_data->enc) {
+	and_media_data->enc = AMediaCodec_createCodecByName(enc_name);
+	if (!and_media_data->enc) {
+	    PJ_LOG(4, (THIS_FILE, "Failed creating encoder: %s", enc_name));
+	}
+	PJ_LOG(4, (THIS_FILE, "Done creating encoder: %s [0x%x]", enc_name,
+	       and_media_data->enc));
+    }
+
+    if (!and_media_data->dec) {
+	and_media_data->dec = AMediaCodec_createCodecByName(dec_name);
+	if (!and_media_data->dec) {
+	    PJ_LOG(4, (THIS_FILE, "Failed creating decoder: %s", dec_name));
+	}
+	PJ_LOG(4, (THIS_FILE, "Done creating decoder: %s [0x%x]", dec_name,
+	       and_media_data->dec));
+    }
+}
+
+/*
+ * Allocate a new codec instance.
+ */
+static pj_status_t and_media_alloc_codec(pjmedia_codec_factory *factory,
+					 const pjmedia_codec_info *id,
+					 pjmedia_codec **p_codec)
+{
+    and_media_private_t *codec_data;
+    pjmedia_codec *codec;
+    int idx;
+    pj_pool_t *pool;
+    unsigned i;
+
+    PJ_ASSERT_RETURN(factory && id && p_codec, PJ_EINVAL);
+    PJ_ASSERT_RETURN(factory == &and_media_factory.base, PJ_EINVAL);
+
+    pj_mutex_lock(and_media_factory.mutex);
+
+    /* Find codec's index */
+    idx = -1;
+    for (i = 0; i < PJ_ARRAY_SIZE(and_media_codec); ++i) {
+	pj_str_t name = pj_str((char*)and_media_codec[i].name);
+	if ((pj_stricmp(&id->encoding_name, &name) == 0) &&
+	    (id->clock_rate == (unsigned)and_media_codec[i].clock_rate) &&
+	    (id->channel_cnt == (unsigned)and_media_codec[i].channel_count) &&
+	    (and_media_codec[i].enabled))
+	{
+	    idx = i;
+	    break;
+	}
+    }
+    if (idx == -1) {
+	*p_codec = NULL;
+	pj_mutex_unlock(and_media_factory.mutex);
+	return PJMEDIA_CODEC_EFAILED;
+    }
+
+    /* Create pool for codec instance */
+    pool = pjmedia_endpt_create_pool(and_media_factory.endpt, "andmedaud%p",
+                                     512, 512);
+    codec = PJ_POOL_ZALLOC_T(pool, pjmedia_codec);
+    PJ_ASSERT_RETURN(codec != NULL, PJ_ENOMEM);
+    codec->op = &and_media_op;
+    codec->factory = factory;
+    codec->codec_data = PJ_POOL_ZALLOC_T(pool, and_media_private_t);
+    codec_data = (and_media_private_t*) codec->codec_data;
+
+    /* Create PLC if codec has no internal PLC */
+    if (!and_media_codec[idx].has_native_plc) {
+	pj_status_t status;
+	status = pjmedia_plc_create(pool, and_media_codec[idx].clock_rate,
+				    and_media_codec[idx].samples_per_frame, 0,
+				    &codec_data->plc);
+	if (status != PJ_SUCCESS) {
+	    goto on_error;
+	}
+    }
+
+    /* Create silence detector if codec has no internal VAD */
+    if (!and_media_codec[idx].has_native_vad) {
+	pj_status_t status;
+	status = pjmedia_silence_det_create(pool,
+					and_media_codec[idx].clock_rate,
+					and_media_codec[idx].samples_per_frame,
+					&codec_data->vad);
+	if (status != PJ_SUCCESS) {
+	    goto on_error;
+	}
+    }
+
+    codec_data->pool = pool;
+    codec_data->codec_idx = idx;
+
+    create_codec(codec_data);
+    if (!codec_data->enc || !codec_data->dec) {
+	goto on_error;
+    }
+    pj_mutex_unlock(and_media_factory.mutex);
+
+    *p_codec = codec;
+    return PJ_SUCCESS;
+
+on_error:
+    pj_mutex_unlock(and_media_factory.mutex);
+    and_media_dealloc_codec(factory, codec);
+    return PJMEDIA_CODEC_EFAILED;
+}
+
+/*
+ * Free codec.
+ */
+static pj_status_t and_media_dealloc_codec(pjmedia_codec_factory *factory,
+					   pjmedia_codec *codec )
+{
+    and_media_private_t *codec_data;
+
+    PJ_ASSERT_RETURN(factory && codec, PJ_EINVAL);
+    PJ_ASSERT_RETURN(factory == &and_media_factory.base, PJ_EINVAL);
+
+    /* Close codec, if it's not closed. */
+    codec_data = (and_media_private_t*) codec->codec_data;
+    if (codec_data->enc) {
+        AMediaCodec_stop(codec_data->enc);
+        AMediaCodec_delete(codec_data->enc);
+        codec_data->enc = NULL;
+    }
+
+    if (codec_data->dec) {
+        AMediaCodec_stop(codec_data->dec);
+        AMediaCodec_delete(codec_data->dec);
+        codec_data->dec = NULL;
+    }
+    pj_pool_release(codec_data->pool);
+
+    return PJ_SUCCESS;
+}
+
+/*
+ * Init codec.
+ */
+static pj_status_t and_media_codec_init(pjmedia_codec *codec,
+				        pj_pool_t *pool )
+{
+    PJ_UNUSED_ARG(codec);
+    PJ_UNUSED_ARG(pool);
+    return PJ_SUCCESS;
+}
+
+/*
+ * Open codec.
+ */
+static pj_status_t and_media_codec_open(pjmedia_codec *codec,
+					pjmedia_codec_param *attr)
+{
+    and_media_private_t *codec_data = (and_media_private_t*) codec->codec_data;
+    struct and_media_codec *and_media_data =
+					&and_media_codec[codec_data->codec_idx];
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(codec && attr, PJ_EINVAL);
+    PJ_ASSERT_RETURN(codec_data != NULL, PJ_EINVALIDOP);
+
+    PJ_LOG(5,(THIS_FILE, "Opening codec.."));
+
+    codec_data->vad_enabled = (attr->setting.vad != 0);
+    codec_data->plc_enabled = (attr->setting.plc != 0);
+    and_media_data->clock_rate = attr->info.clock_rate;
+
+#if PJMEDIA_HAS_AND_MEDIA_AMRNB
+    if (and_media_data->codec_id == AND_AUD_CODEC_AMRNB ||
+	and_media_data->codec_id == AND_AUD_CODEC_AMRWB)
+    {
+	amr_settings_t *s;
+	pj_uint8_t octet_align = 0;
+	pj_int8_t enc_mode;
+	unsigned i;
+
+	enc_mode = pjmedia_codec_amr_get_mode(attr->info.avg_bps);
+
+	pj_assert(enc_mode >= 0 && enc_mode <= 8);
+
+	/* Check AMR specific attributes */
+	for (i = 0; i < attr->setting.dec_fmtp.cnt; ++i) {
+	    /* octet-align, one of the parameters that must have same value
+	     * in offer & answer (RFC 4867 Section 8.3.1). Just check fmtp
+	     * in the decoder side, since it's value is guaranteed to fulfil
+	     * above requirement (by SDP negotiator).
+	     */
+	    const pj_str_t STR_FMTP_OCTET_ALIGN = {(char *)"octet-align", 11};
+
+	    if (pj_stricmp(&attr->setting.dec_fmtp.param[i].name,
+			   &STR_FMTP_OCTET_ALIGN) == 0)
+	    {
+		octet_align=(pj_uint8_t)
+			    pj_strtoul(&attr->setting.dec_fmtp.param[i].val);
+		break;
+	    }
+	}
+	for (i = 0; i < attr->setting.enc_fmtp.cnt; ++i) {
+	    /* mode-set, encoding mode is chosen based on local default mode
+	     * setting:
+	     * - if local default mode is included in the mode-set, use it
+	     * - otherwise, find the closest mode to local default mode;
+	     *   if there are two closest modes, prefer to use the higher
+	     *   one, e.g: local default mode is 4, the mode-set param
+	     *   contains '2,3,5,6', then 5 will be chosen.
+	     */
+	    const pj_str_t STR_FMTP_MODE_SET = {(char *)"mode-set", 8};
+
+	    if (pj_stricmp(&attr->setting.enc_fmtp.param[i].name,
+			   &STR_FMTP_MODE_SET) == 0)
+	    {
+		const char *p;
+		pj_size_t l;
+		pj_int8_t diff = 99;
+
+		p = pj_strbuf(&attr->setting.enc_fmtp.param[i].val);
+		l = pj_strlen(&attr->setting.enc_fmtp.param[i].val);
+
+		while (l--) {
+		    if ((and_media_data->codec_id == AND_AUD_CODEC_AMRNB &&
+			 *p>='0' && *p<='7') ||
+		        (and_media_data->codec_id == AND_AUD_CODEC_AMRWB &&
+		         *p>='0' && *p<='8'))
+		    {
+			pj_int8_t tmp = (pj_int8_t)(*p - '0' - enc_mode);
+
+			if (PJ_ABS(diff) > PJ_ABS(tmp) ||
+			    (PJ_ABS(diff) == PJ_ABS(tmp) && tmp > diff))
+			{
+			    diff = tmp;
+			    if (diff == 0) break;
+			}
+		    }
+		    ++p;
+		}
+		if (diff == 99)
+		    goto on_error;
+
+		enc_mode = (pj_int8_t)(enc_mode + diff);
+
+		break;
+	    }
+	}
+	/* Initialize AMR specific settings */
+	s = PJ_POOL_ZALLOC_T(codec_data->pool, amr_settings_t);
+	codec_data->codec_setting = s;
+
+	s->enc_setting.amr_nb = (pj_uint8_t)
+			      (and_media_data->codec_id == AND_AUD_CODEC_AMRNB);
+	s->enc_setting.octet_aligned = octet_align;
+	s->enc_setting.reorder = 0;
+	s->enc_setting.cmr = 15;
+	s->dec_setting.amr_nb = (pj_uint8_t)
+			      (and_media_data->codec_id == AND_AUD_CODEC_AMRNB);
+	s->dec_setting.octet_aligned = octet_align;
+	s->dec_setting.reorder = 0;
+	/* Apply encoder mode/bitrate */
+	s->enc_mode = enc_mode;
+
+	PJ_LOG(4, (THIS_FILE, "Encoder setting octet_aligned=%d reorder=%d"
+		   " cmr=%d enc_mode=%d",
+		   s->enc_setting.octet_aligned, s->enc_setting.reorder,
+		   s->enc_setting.cmr, enc_mode));
+	PJ_LOG(4, (THIS_FILE, "Decoder setting octet_aligned=%d reorder=%d",
+		   s->dec_setting.octet_aligned, s->dec_setting.reorder));
+    }
+#endif
+    status = configure_codec(codec_data, PJ_TRUE);
+    if (status != PJ_SUCCESS) {
+        goto on_error;
+    }
+    status = configure_codec(codec_data, PJ_FALSE);
+    if (status != PJ_SUCCESS) {
+	goto on_error;
+    }
+
+    return PJ_SUCCESS;
+
+on_error:
+    return PJMEDIA_CODEC_EFAILED;
+}
+
+/*
+ * Close codec.
+ */
+static pj_status_t and_media_codec_close(pjmedia_codec *codec)
+{
+    PJ_UNUSED_ARG(codec);
+
+    return PJ_SUCCESS;
+}
+
+/*
+ * Modify codec settings.
+ */
+static pj_status_t  and_media_codec_modify(pjmedia_codec *codec,
+					   const pjmedia_codec_param *attr)
+{
+    and_media_private_t *codec_data = (and_media_private_t*) codec->codec_data;
+
+    codec_data->vad_enabled = (attr->setting.vad != 0);
+    codec_data->plc_enabled = (attr->setting.plc != 0);
+
+    return PJ_SUCCESS;
+}
+
+/*
+ * Get frames in the packet.
+ */
+static pj_status_t and_media_codec_parse(pjmedia_codec *codec,
+					 void *pkt,
+					 pj_size_t pkt_size,
+					 const pj_timestamp *ts,
+					 unsigned *frame_cnt,
+					 pjmedia_frame frames[])
+{
+    and_media_private_t *codec_data = (and_media_private_t*) codec->codec_data;
+    struct and_media_codec *and_media_data =
+					&and_media_codec[codec_data->codec_idx];
+    unsigned count = 0;
+
+    PJ_ASSERT_RETURN(frame_cnt, PJ_EINVAL);
+
+    if (and_media_data->parse != NULL) {
+	return and_media_data->parse(codec_data, pkt,  pkt_size, ts, frame_cnt,
+				     frames);
+    }
+
+    while (pkt_size >= codec_data->frame_size && count < *frame_cnt) {
+	frames[count].type = PJMEDIA_FRAME_TYPE_AUDIO;
+	frames[count].buf = pkt;
+	frames[count].size = codec_data->frame_size;
+	frames[count].timestamp.u64 = ts->u64 +
+				      count*and_media_data->samples_per_frame;
+	pkt = ((char*)pkt) + codec_data->frame_size;
+	pkt_size -= codec_data->frame_size;
+	++count;
+    }
+
+    if (pkt_size && count < *frame_cnt) {
+	frames[count].type = PJMEDIA_FRAME_TYPE_AUDIO;
+	frames[count].buf = pkt;
+	frames[count].size = pkt_size;
+	frames[count].timestamp.u64 = ts->u64 +
+				      count*and_media_data->samples_per_frame;
+	++count;
+    }
+
+    *frame_cnt = count;
+    return PJ_SUCCESS;
+}
+
+/*
+ * Encode frames.
+ */
+static pj_status_t and_media_codec_encode(pjmedia_codec *codec,
+					  const struct pjmedia_frame *input,
+					  unsigned output_buf_len,
+					  struct pjmedia_frame *output)
+{
+    and_media_private_t *codec_data = (and_media_private_t*) codec->codec_data;
+    struct and_media_codec *and_media_data =
+					&and_media_codec[codec_data->codec_idx];
+    unsigned samples_per_frame;
+    unsigned nsamples;
+    unsigned nframes;
+    pj_size_t tx = 0;
+    pj_int16_t *pcm_in = (pj_int16_t*)input->buf;
+    pj_uint8_t  *bits_out = (pj_uint8_t*) output->buf;
+
+    /* Invoke external VAD if codec has no internal VAD */
+    if (codec_data->vad && codec_data->vad_enabled) {
+	pj_bool_t is_silence;
+	pj_int32_t silence_duration;
+
+	silence_duration = pj_timestamp_diff32(&codec_data->last_tx, 
+					       &input->timestamp);
+
+	is_silence = pjmedia_silence_det_detect(codec_data->vad, 
+					        (const pj_int16_t*) input->buf,
+						(input->size >> 1),
+						NULL);
+	if (is_silence &&
+	    (PJMEDIA_CODEC_MAX_SILENCE_PERIOD == -1 ||
+	     silence_duration < (PJMEDIA_CODEC_MAX_SILENCE_PERIOD *
+	 			 (int)and_media_data->clock_rate / 1000)))
+	{
+	    output->type = PJMEDIA_FRAME_TYPE_NONE;
+	    output->buf = NULL;
+	    output->size = 0;
+	    output->timestamp = input->timestamp;
+	    return PJ_SUCCESS;
+	} else {
+	    codec_data->last_tx = input->timestamp;
+	}
+    }
+    nsamples = input->size >> 1;
+    samples_per_frame = and_media_data->samples_per_frame;
+    nframes = nsamples / samples_per_frame;
+
+    PJ_ASSERT_RETURN(nsamples % samples_per_frame == 0, 
+		     PJMEDIA_CODEC_EPCMFRMINLEN);
+
+    /* Encode the frames */
+    while (nsamples >= samples_per_frame) {
+        pj_ssize_t buf_idx;
+        unsigned i;
+        pj_size_t output_size;
+        pj_uint8_t *output_buf;
+        AMediaCodecBufferInfo buf_info;
+
+        buf_idx = AMediaCodec_dequeueInputBuffer(codec_data->enc,
+					         CODEC_DEQUEUE_TIMEOUT);
+
+        if (buf_idx >= 0) {
+	    media_status_t am_status;
+	    pj_size_t output_size;
+            unsigned input_size = samples_per_frame << 1;
+
+	    pj_uint8_t *input_buf = AMediaCodec_getInputBuffer(codec_data->enc,
+						        buf_idx, &output_size);
+
+	    if (input_buf && output_size >= input_size) {
+	        pj_memcpy(input_buf, pcm_in, input_size);
+
+	        am_status = AMediaCodec_queueInputBuffer(codec_data->enc,
+				                  buf_idx, 0, input_size, 0, 0);
+	        if (am_status != AMEDIA_OK) {
+		    PJ_LOG(4, (THIS_FILE, "Encoder queueInputBuffer return %d",
+		               am_status));
+		    goto on_return;
+	        }
+	    } else {
+	        if (!input_buf) {
+		    PJ_LOG(4,(THIS_FILE, "Encoder getInputBuffer "
+				         "returns no input buff"));
+	        } else {
+		    PJ_LOG(4,(THIS_FILE, "Encoder getInputBuffer "
+				         "size: %d, expecting %d.",
+				         input_buf, output_size, input_size));
+	        }
+	        goto on_return;
+	    }
+        } else {
+	    PJ_LOG(4,(THIS_FILE, "Encoder dequeueInputBuffer failed[%d]",
+                      buf_idx));
+	    goto on_return;
+        }
+
+        for (i = 0; i < CODEC_WAIT_RETRY; ++i) {
+	    buf_idx = AMediaCodec_dequeueOutputBuffer(codec_data->enc,
+						      &buf_info,
+						      CODEC_DEQUEUE_TIMEOUT);
+	    if (buf_idx == -1) {
+	        /* Timeout, wait until output buffer is availble. */
+	        pj_thread_sleep(CODEC_THREAD_WAIT);
+	    } else {
+	        break;
+	    }
+        }
+
+        if (buf_idx < 0) {
+	    PJ_LOG(4, (THIS_FILE, "Encoder dequeueOutputBuffer failed %d",
+		   buf_idx));
+            goto on_return;
+        }
+
+        output_buf = AMediaCodec_getOutputBuffer(codec_data->enc,
+                                                 buf_idx,
+                                                 &output_size);
+        if (!output_buf) {
+            PJ_LOG(4, (THIS_FILE, "Encoder failed getting output buffer, "
+                       "buffer size=%d, flags %d",
+                       buf_info.size, buf_info.flags));
+            goto on_return;
+        }
+
+        pj_memcpy(bits_out, output_buf, buf_info.size);
+        AMediaCodec_releaseOutputBuffer(codec_data->enc,
+                                        buf_idx,
+                                        0);
+        bits_out += buf_info.size;
+        tx += buf_info.size;
+	pcm_in += samples_per_frame;
+	nsamples -= samples_per_frame;
+    }
+    if (and_media_data->pack != NULL) {
+	and_media_data->pack(codec_data, nframes, output->buf, &tx,
+			     output_buf_len);
+    }
+    /* Check if we don't need to transmit the frame (DTX) */
+    if (tx == 0) {
+	output->buf = NULL;
+	output->size = 0;
+	output->timestamp.u64 = input->timestamp.u64;
+	output->type = PJMEDIA_FRAME_TYPE_NONE;
+	return PJ_SUCCESS;
+    }
+    output->size = tx;
+    output->type = PJMEDIA_FRAME_TYPE_AUDIO;
+    output->timestamp = input->timestamp;
+
+    return PJ_SUCCESS;
+
+on_return:
+    output->size = 0;
+    output->buf = NULL;
+    output->type = PJMEDIA_FRAME_TYPE_NONE;
+    output->timestamp.u64 = input->timestamp.u64;
+    return PJ_SUCCESS;
+}
+
+/*
+ * Decode frame.
+ */
+static pj_status_t and_media_codec_decode(pjmedia_codec *codec,
+					  const struct pjmedia_frame *input,
+					  unsigned output_buf_len,
+					  struct pjmedia_frame *output)
+{
+    and_media_private_t *codec_data = (and_media_private_t*) codec->codec_data;
+    struct and_media_codec *and_media_data =
+					&and_media_codec[codec_data->codec_idx];
+    unsigned samples_per_frame;
+    unsigned i;
+
+    pj_ssize_t buf_idx = -1;
+    pj_uint8_t *input_buf;
+    pj_size_t input_size;
+    pj_size_t output_size;
+    media_status_t am_status;
+    AMediaCodecBufferInfo buf_info;
+    pj_uint8_t *output_buf;
+    pjmedia_frame input_;
+
+    pj_bzero(&input_, sizeof(pjmedia_frame));
+    samples_per_frame = and_media_data->samples_per_frame;
+
+    PJ_ASSERT_RETURN(output_buf_len >= samples_per_frame << 1,
+		     PJMEDIA_CODEC_EPCMTOOSHORT);
+
+    if (input->type != PJMEDIA_FRAME_TYPE_AUDIO)
+    {
+	goto on_return;
+    }
+
+    buf_idx = AMediaCodec_dequeueInputBuffer(codec_data->dec,
+					     CODEC_DEQUEUE_TIMEOUT);
+
+    if (buf_idx < 0) {
+	PJ_LOG(4,(THIS_FILE, "Decoder dequeueInputBuffer failed return %d",
+		  buf_idx));
+	goto on_return;
+    }
+
+    input_buf = AMediaCodec_getInputBuffer(codec_data->dec,
+					   buf_idx,
+					   &input_size);
+    if (input_buf == 0) {
+	PJ_LOG(4,(THIS_FILE, "Decoder getInputBuffer failed "
+		  "return input_buf=%d, size=%d", input_buf, input_size));
+	goto on_return;
+    }
+
+    if (and_media_data->predecode) {
+	input_.buf = input_buf;
+	and_media_data->predecode(codec_data, input, &input_);
+    } else {
+	input_.size = input->size;
+	pj_memcpy(input_buf, input->buf, input->size);
+    }
+
+    am_status = AMediaCodec_queueInputBuffer(codec_data->dec,
+					     buf_idx,
+					     0,
+					     input_.size,
+					     input->timestamp.u32.lo,
+					     0);
+    if (am_status != AMEDIA_OK) {
+	PJ_LOG(4,(THIS_FILE, "Decoder queueInputBuffer failed return %d",
+		  am_status));
+	goto on_return;
+    }
+
+    for (i = 0; i < CODEC_WAIT_RETRY; ++i) {
+	buf_idx = AMediaCodec_dequeueOutputBuffer(codec_data->dec,
+						  &buf_info,
+						  CODEC_DEQUEUE_TIMEOUT);
+	if (buf_idx == -1) {
+	    /* Timeout, wait until output buffer is availble. */
+	    PJ_LOG(5, (THIS_FILE, "Decoder dequeueOutputBuffer timeout[%d]",
+		       i+1));
+	    pj_thread_sleep(CODEC_THREAD_WAIT);
+	} else {
+	    break;
+	}
+    }
+    if (buf_idx < 0) {
+	PJ_LOG(5, (THIS_FILE, "Decoder dequeueOutputBuffer failed [%d]",
+		   buf_idx));
+	goto on_return;
+    }
+
+    output_buf = AMediaCodec_getOutputBuffer(codec_data->dec,
+					     buf_idx,
+					     &output_size);
+    if (output_buf == NULL) {
+	am_status = AMediaCodec_releaseOutputBuffer(codec_data->dec,
+					buf_idx,
+					0);
+	if (am_status != AMEDIA_OK) {
+	    PJ_LOG(4,(THIS_FILE, "Decoder releaseOutputBuffer failed %d",
+		      am_status));
+	}
+	PJ_LOG(4,(THIS_FILE, "Decoder getOutputBuffer failed"));
+	goto on_return;
+    }
+    pj_memcpy(output->buf, output_buf, buf_info.size);
+    output->type = PJMEDIA_FRAME_TYPE_AUDIO;
+    output->size = buf_info.size;
+    output->timestamp.u64 = input->timestamp.u64;
+    am_status = AMediaCodec_releaseOutputBuffer(codec_data->dec,
+						buf_idx,
+						0);
+
+    /* Invoke external PLC if codec has no internal PLC */
+    if (codec_data->plc && codec_data->plc_enabled)
+	pjmedia_plc_save(codec_data->plc, (pj_int16_t*)output->buf);
+
+    return PJ_SUCCESS;
+
+on_return:
+    pjmedia_zero_samples((pj_int16_t*)output->buf, samples_per_frame);
+    output->size = samples_per_frame << 1;
+    output->timestamp.u64 = input->timestamp.u64;
+    output->type = PJMEDIA_FRAME_TYPE_AUDIO;
+    return PJ_SUCCESS;
+}
+
+/* 
+ * Recover lost frame.
+ */
+static pj_status_t  and_media_codec_recover(pjmedia_codec *codec,
+					    unsigned output_buf_len,
+					    struct pjmedia_frame *output)
+{
+    and_media_private_t *codec_data = (and_media_private_t*) codec->codec_data;
+    struct and_media_codec *and_media_data =
+					&and_media_codec[codec_data->codec_idx];
+    unsigned samples_per_frame;
+    pj_bool_t generate_plc = (codec_data->plc_enabled && codec_data->plc);
+
+    PJ_UNUSED_ARG(output_buf_len);
+
+    samples_per_frame = and_media_data->samples_per_frame;
+    output->type = PJMEDIA_FRAME_TYPE_AUDIO;
+    output->size = samples_per_frame << 1;
+
+    if (generate_plc)
+	pjmedia_plc_generate(codec_data->plc, (pj_int16_t*)output->buf);
+    else
+	pjmedia_zero_samples((pj_int16_t*)output->buf, samples_per_frame);
+
+    return PJ_SUCCESS;
+}
+
+
+#endif	/* PJMEDIA_HAS_ANDROID_MEDIACODEC */
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/and_vid_mediacodec.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/and_vid_mediacodec.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/and_vid_mediacodec.cpp	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/and_vid_mediacodec.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,1923 @@
+/*
+ * Copyright (C)2020 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <pjmedia-codec/and_vid_mediacodec.h>
+#include <pjmedia-codec/h264_packetizer.h>
+#include <pjmedia-codec/vpx_packetizer.h>
+#include <pjmedia/vid_codec_util.h>
+#include <pjmedia/errno.h>
+#include <pj/log.h>
+
+#if defined(PJMEDIA_HAS_ANDROID_MEDIACODEC) && \
+            PJMEDIA_HAS_ANDROID_MEDIACODEC != 0 && \
+    defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+/* Android AMediaCodec: */
+#include "media/NdkMediaCodec.h"
+
+/*
+ * Constants
+ */
+#define THIS_FILE		    "and_vid_mediacodec.cpp"
+#define AND_MEDIA_KEY_COLOR_FMT     "color-format"
+#define AND_MEDIA_KEY_WIDTH         "width"
+#define AND_MEDIA_KEY_HEIGHT        "height"
+#define AND_MEDIA_KEY_BIT_RATE      "bitrate"
+#define AND_MEDIA_KEY_PROFILE       "profile"
+#define AND_MEDIA_KEY_FRAME_RATE    "frame-rate"
+#define AND_MEDIA_KEY_IFR_INTTERVAL "i-frame-interval"
+#define AND_MEDIA_KEY_MIME          "mime"
+#define AND_MEDIA_KEY_REQUEST_SYNCF "request-sync"
+#define AND_MEDIA_KEY_CSD0	    "csd-0"
+#define AND_MEDIA_KEY_CSD1	    "csd-1"
+#define AND_MEDIA_KEY_MAX_INPUT_SZ  "max-input-size"
+#define AND_MEDIA_KEY_ENCODER	    "encoder"
+#define AND_MEDIA_KEY_PRIORITY	    "priority"
+#define AND_MEDIA_KEY_STRIDE	    "stride"
+#define AND_MEDIA_I420_PLANAR_FMT   0x13
+#define AND_MEDIA_QUEUE_TIMEOUT     2000*100
+
+#define DEFAULT_WIDTH		352
+#define DEFAULT_HEIGHT		288
+
+#define DEFAULT_FPS		15
+#define DEFAULT_AVG_BITRATE	256000
+#define DEFAULT_MAX_BITRATE	256000
+
+#define SPS_PPS_BUF_SIZE	64
+
+#define MAX_RX_WIDTH		1200
+#define MAX_RX_HEIGHT		800
+
+/* Maximum duration from one key frame to the next (in seconds). */
+#define KEYFRAME_INTERVAL	1
+
+#define CODEC_WAIT_RETRY 	10
+#define CODEC_THREAD_WAIT 	10
+/* Timeout until the buffer is ready in ms. */
+#define CODEC_DEQUEUE_TIMEOUT 	20
+
+#define AND_MED_H264_PT 	PJMEDIA_RTP_PT_H264_RSV2
+#define AND_MED_VP8_PT 		PJMEDIA_RTP_PT_VP8_RSV1
+#define AND_MED_VP9_PT 		PJMEDIA_RTP_PT_VP9_RSV1
+
+/*
+ * Factory operations.
+ */
+static pj_status_t and_media_test_alloc(pjmedia_vid_codec_factory *factory,
+                                    const pjmedia_vid_codec_info *info );
+static pj_status_t and_media_default_attr(pjmedia_vid_codec_factory *factory,
+                                      const pjmedia_vid_codec_info *info,
+                                      pjmedia_vid_codec_param *attr );
+static pj_status_t and_media_enum_info(pjmedia_vid_codec_factory *factory,
+                                   unsigned *count,
+                                   pjmedia_vid_codec_info codecs[]);
+static pj_status_t and_media_alloc_codec(pjmedia_vid_codec_factory *factory,
+                                     const pjmedia_vid_codec_info *info,
+                                     pjmedia_vid_codec **p_codec);
+static pj_status_t and_media_dealloc_codec(pjmedia_vid_codec_factory *factory,
+                                       pjmedia_vid_codec *codec );
+
+
+/*
+ * Codec operations
+ */
+static pj_status_t and_media_codec_init(pjmedia_vid_codec *codec,
+                                    pj_pool_t *pool );
+static pj_status_t and_media_codec_open(pjmedia_vid_codec *codec,
+                                    pjmedia_vid_codec_param *param );
+static pj_status_t and_media_codec_close(pjmedia_vid_codec *codec);
+static pj_status_t and_media_codec_modify(pjmedia_vid_codec *codec,
+                                      const pjmedia_vid_codec_param *param);
+static pj_status_t and_media_codec_get_param(pjmedia_vid_codec *codec,
+                                         pjmedia_vid_codec_param *param);
+static pj_status_t and_media_codec_encode_begin(pjmedia_vid_codec *codec,
+                                            const pjmedia_vid_encode_opt *opt,
+                                            const pjmedia_frame *input,
+                                            unsigned out_size,
+                                            pjmedia_frame *output,
+                                            pj_bool_t *has_more);
+static pj_status_t and_media_codec_encode_more(pjmedia_vid_codec *codec,
+                                           unsigned out_size,
+                                           pjmedia_frame *output,
+                                           pj_bool_t *has_more);
+static pj_status_t and_media_codec_decode(pjmedia_vid_codec *codec,
+                                      pj_size_t count,
+                                      pjmedia_frame packets[],
+                                      unsigned out_size,
+                                      pjmedia_frame *output);
+
+/* Definition for Android AMediaCodec operations. */
+static pjmedia_vid_codec_op and_media_codec_op =
+{
+    &and_media_codec_init,
+    &and_media_codec_open,
+    &and_media_codec_close,
+    &and_media_codec_modify,
+    &and_media_codec_get_param,
+    &and_media_codec_encode_begin,
+    &and_media_codec_encode_more,
+    &and_media_codec_decode,
+    NULL
+};
+
+/* Definition for Android AMediaCodec factory operations. */
+static pjmedia_vid_codec_factory_op and_media_factory_op =
+{
+    &and_media_test_alloc,
+    &and_media_default_attr,
+    &and_media_enum_info,
+    &and_media_alloc_codec,
+    &and_media_dealloc_codec
+};
+
+static struct and_media_factory
+{
+    pjmedia_vid_codec_factory    base;
+    pjmedia_vid_codec_mgr	*mgr;
+    pj_pool_factory             *pf;
+    pj_pool_t		        *pool;
+} and_media_factory;
+
+enum and_media_frm_type {
+    AND_MEDIA_FRM_TYPE_DEFAULT = 0,
+    AND_MEDIA_FRM_TYPE_KEYFRAME = 1,
+    AND_MEDIA_FRM_TYPE_CONFIG = 2
+};
+
+typedef struct h264_codec_data {
+    pjmedia_h264_packetizer	*pktz;
+
+    pj_uint8_t			 enc_sps_pps_buf[SPS_PPS_BUF_SIZE];
+    unsigned			 enc_sps_pps_len;
+    pj_bool_t			 enc_sps_pps_ex;
+
+    pj_uint8_t			*dec_sps_buf;
+    unsigned			 dec_sps_len;
+    pj_uint8_t			*dec_pps_buf;
+    unsigned			 dec_pps_len;
+} h264_codec_data;
+
+typedef struct vpx_codec_data {
+    pjmedia_vpx_packetizer	*pktz;
+} vpx_codec_data;
+
+typedef struct and_media_codec_data
+{
+    pj_pool_t			*pool;
+    pj_uint8_t                   codec_idx;
+    pjmedia_vid_codec_param	*prm;
+    pj_bool_t			 whole;
+    void                        *ex_data;
+
+    /* Encoder state */
+    AMediaCodec                 *enc;
+    unsigned		 	 enc_input_size;
+    pj_uint8_t			*enc_frame_whole;
+    unsigned			 enc_frame_size;
+    unsigned			 enc_processed;
+    AMediaCodecBufferInfo        enc_buf_info;
+    int				 enc_output_buf_idx;
+
+    /* Decoder state */
+    AMediaCodec                 *dec;
+    pj_uint8_t			*dec_buf;
+    pj_uint8_t			*dec_input_buf;
+    unsigned			 dec_input_buf_len;
+    pj_size_t			 dec_input_buf_max_size;
+    pj_ssize_t			 dec_input_buf_idx;
+    unsigned			 dec_has_output_frame;
+    unsigned			 dec_stride_len;
+    unsigned			 dec_buf_size;
+    AMediaCodecBufferInfo        dec_buf_info;
+} and_media_codec_data;
+
+/* Custom callbacks. */
+
+/* This callback is useful when specific method is needed when opening
+ * the codec (e.g: applying fmtp or setting up the packetizer)
+ */
+typedef pj_status_t (*open_cb)(and_media_codec_data *and_media_data);
+
+/* This callback is useful for handling configure frame produced by encoder.
+ * Output frame might want to be stored the configuration frame and append it
+ * to a keyframe for sending later (e.g: on H264 codec). The default behavior
+ * is to send the configuration frame regardless.
+ */
+typedef pj_status_t (*process_encode_cb)(and_media_codec_data *and_media_data);
+
+/* This callback is to process more encoded packets/payloads from the codec.*/
+typedef pj_status_t(*encode_more_cb)(and_media_codec_data *and_media_data,
+                                     unsigned out_size,
+                                     pjmedia_frame *output,
+                                     pj_bool_t *has_more);
+
+/* This callback is to decode packets. */
+typedef pj_status_t(*decode_cb)(pjmedia_vid_codec *codec,
+                                pj_size_t count,
+                                pjmedia_frame packets[],
+                                unsigned out_size,
+                                pjmedia_frame *output);
+
+
+/* Custom callback implementation. */
+#if PJMEDIA_HAS_AND_MEDIA_H264
+static pj_status_t open_h264(and_media_codec_data *and_media_data);
+static pj_status_t process_encode_h264(and_media_codec_data *and_media_data);
+static pj_status_t encode_more_h264(and_media_codec_data *and_media_data,
+                                    unsigned out_size,
+                                    pjmedia_frame *output,
+                                    pj_bool_t *has_more);
+static pj_status_t decode_h264(pjmedia_vid_codec *codec,
+                               pj_size_t count,
+                               pjmedia_frame packets[],
+                               unsigned out_size,
+                               pjmedia_frame *output);
+#endif
+
+#if PJMEDIA_HAS_AND_MEDIA_VP8 || PJMEDIA_HAS_AND_MEDIA_VP9
+static pj_status_t open_vpx(and_media_codec_data *and_media_data);
+static pj_status_t encode_more_vpx(and_media_codec_data *and_media_data,
+                                   unsigned out_size,
+                                   pjmedia_frame *output,
+                                   pj_bool_t *has_more);
+static pj_status_t decode_vpx(pjmedia_vid_codec *codec,
+                              pj_size_t count,
+                              pjmedia_frame packets[],
+                              unsigned out_size,
+                              pjmedia_frame *output);
+#endif
+
+
+#if PJMEDIA_HAS_AND_MEDIA_H264
+static pj_str_t H264_sw_encoder[] = {{(char *)"OMX.google.h264.encoder\0",
+				      23}};
+static pj_str_t H264_hw_encoder[] =
+				  {{(char *)"OMX.qcom.video.encoder.avc\0", 26},
+			          {(char *)"OMX.Exynos.avc.Encoder\0", 22}};
+static pj_str_t H264_sw_decoder[] = {{(char *)"OMX.google.h264.decoder\0",
+				      23}};
+static pj_str_t H264_hw_decoder[] =
+				  {{(char *)"OMX.qcom.video.decoder.avc\0", 26},
+			          {(char *)"OMX.Exynos.avc.dec\0", 18}};
+#endif
+
+#if PJMEDIA_HAS_AND_MEDIA_VP8
+static pj_str_t VP8_sw_encoder[] = {{(char *)"OMX.google.vp8.encoder\0", 23}};
+static pj_str_t VP8_hw_encoder[] =
+				 {{(char *)"OMX.qcom.video.encoder.vp8\0", 26},
+			         {(char *)"OMX.Exynos.vp8.Encoder\0", 22}};
+static pj_str_t VP8_sw_decoder[] = {{(char *)"OMX.google.vp8.decoder\0", 23}};
+static pj_str_t VP8_hw_decoder[] =
+				 {{(char *)"OMX.qcom.video.decoder.vp8\0", 26},
+			         {(char *)"OMX.Exynos.vp8.dec\0", 18}};
+#endif
+
+#if PJMEDIA_HAS_AND_MEDIA_VP9
+static pj_str_t VP9_sw_encoder[] = {{(char *)"OMX.google.vp9.encoder\0", 23}};
+static pj_str_t VP9_hw_encoder[] =
+				 {{(char *)"OMX.qcom.video.encoder.vp9\0", 26},
+			         {(char *)"OMX.Exynos.vp9.Encoder\0", 22}};
+static pj_str_t VP9_sw_decoder[] = {{(char *)"OMX.google.vp9.decoder\0", 23}};
+static pj_str_t VP9_hw_decoder[] =
+				 {{(char *)"OMX.qcom.video.decoder.vp9\0", 26},
+			         {(char *)"OMX.Exynos.vp9.dec\0", 18}};
+#endif
+
+static struct and_media_codec {
+    int		       enabled;		  /* Is this codec enabled?	     */
+    const char	      *name;		  /* Codec name.		     */
+    const char        *description;       /* Codec description.              */
+    const char        *mime_type;         /* Mime type.                      */
+    pj_str_t          *encoder_name;      /* Encoder name.                   */
+    pj_str_t          *decoder_name;      /* Decoder name.                   */
+    pj_uint8_t	       pt;		  /* Payload type.		     */
+    pjmedia_format_id  fmt_id;		  /* Format id.   		     */
+    pj_uint8_t         keyframe_interval; /* Keyframe interval.              */
+
+    open_cb            open_codec;
+    process_encode_cb  process_encode;
+    encode_more_cb     encode_more;
+    decode_cb          decode;
+
+    pjmedia_codec_fmtp dec_fmtp;	  /* Decoder's fmtp params.	     */
+}
+and_media_codec[] = {
+#if PJMEDIA_HAS_AND_MEDIA_H264
+    {0, "H264",	"Android MediaCodec H264 codec", "video/avc",
+        NULL, NULL,
+        AND_MED_H264_PT, PJMEDIA_FORMAT_H264, KEYFRAME_INTERVAL,
+        &open_h264, &process_encode_h264, &encode_more_h264, &decode_h264,
+        {2, {{{(char *)"profile-level-id", 16}, {(char *)"42e01e", 6}},
+             {{(char *)" packetization-mode", 19}, {(char *)"1", 1}}}
+        }
+    },
+#endif
+#if PJMEDIA_HAS_AND_MEDIA_VP8
+    {0, "VP8",	"Android MediaCodec VP8 codec", "video/x-vnd.on2.vp8",
+        NULL, NULL,
+        AND_MED_VP8_PT, PJMEDIA_FORMAT_VP8, KEYFRAME_INTERVAL,
+        &open_vpx, NULL, &encode_more_vpx, &decode_vpx,
+        {2, {{{(char *)"max-fr", 6}, {(char *)"30", 2}},
+             {{(char *)" max-fs", 7}, {(char *)"580", 3}}}
+        }
+    },
+#endif
+#if PJMEDIA_HAS_AND_MEDIA_VP9
+    {0, "VP9",	"Android MediaCodec VP9 codec", "video/x-vnd.on2.vp9",
+	NULL, NULL,
+	AND_MED_VP9_PT, PJMEDIA_FORMAT_VP9, KEYFRAME_INTERVAL,
+        &open_vpx, NULL, &encode_more_vpx, &decode_vpx,
+        {2, {{{(char *)"max-fr", 6}, {(char *)"30", 2}},
+             {{(char *)" max-fs", 7}, {(char *)"580", 3}}}
+        }
+    }
+#endif
+};
+
+static pj_status_t configure_encoder(and_media_codec_data *and_media_data)
+{
+    media_status_t am_status;
+    AMediaFormat *vid_fmt;
+    pjmedia_vid_codec_param *param = and_media_data->prm;
+
+    vid_fmt = AMediaFormat_new();
+    if (!vid_fmt) {
+	PJ_LOG(4, (THIS_FILE, "Encoder failed creating media format"));
+        return PJ_ENOMEM;
+    }
+
+    AMediaFormat_setString(vid_fmt, AND_MEDIA_KEY_MIME,
+                          and_media_codec[and_media_data->codec_idx].mime_type);
+    AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_COLOR_FMT,
+			  AND_MEDIA_I420_PLANAR_FMT);
+    AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_HEIGHT,
+			  param->enc_fmt.det.vid.size.h);
+    AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_WIDTH,
+                          param->enc_fmt.det.vid.size.w);
+    AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_BIT_RATE,
+                          param->enc_fmt.det.vid.avg_bps);
+    //AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_PROFILE, 1);
+    AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_IFR_INTTERVAL,
+			  KEYFRAME_INTERVAL);
+    AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_FRAME_RATE,
+                          (param->enc_fmt.det.vid.fps.num /
+                           param->enc_fmt.det.vid.fps.denum));
+    AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_PRIORITY, 0);
+
+    /* Configure and start encoder. */
+    am_status = AMediaCodec_configure(and_media_data->enc, vid_fmt, NULL, NULL,
+                                      AMEDIACODEC_CONFIGURE_FLAG_ENCODE);
+    AMediaFormat_delete(vid_fmt);
+    if (am_status != AMEDIA_OK) {
+        PJ_LOG(4, (THIS_FILE, "Encoder configure failed, status=%d",
+        	   am_status));
+        return PJMEDIA_CODEC_EFAILED;
+    }
+    am_status = AMediaCodec_start(and_media_data->enc);
+    if (am_status != AMEDIA_OK) {
+	PJ_LOG(4, (THIS_FILE, "Encoder start failed, status=%d",
+		am_status));
+	return PJMEDIA_CODEC_EFAILED;
+    }
+    return PJ_SUCCESS;
+}
+
+static pj_status_t configure_decoder(and_media_codec_data *and_media_data) {
+    media_status_t am_status;
+    AMediaFormat *vid_fmt;
+
+    vid_fmt = AMediaFormat_new();
+    if (!vid_fmt) {
+	PJ_LOG(4, (THIS_FILE, "Decoder failed creating media format"));
+        return PJ_ENOMEM;
+    }
+    AMediaFormat_setString(vid_fmt, AND_MEDIA_KEY_MIME,
+                          and_media_codec[and_media_data->codec_idx].mime_type);
+    AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_COLOR_FMT,
+			  AND_MEDIA_I420_PLANAR_FMT);
+    AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_HEIGHT,
+	                  and_media_data->prm->dec_fmt.det.vid.size.h);
+    AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_WIDTH,
+	                  and_media_data->prm->dec_fmt.det.vid.size.w);
+    AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_MAX_INPUT_SZ, 0);
+    AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_ENCODER, 0);
+    AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_PRIORITY, 0);
+
+    if (and_media_data->prm->dec_fmt.id == PJMEDIA_FORMAT_H264) {
+	h264_codec_data *h264_data = (h264_codec_data *)and_media_data->ex_data;
+
+	if (h264_data->dec_sps_len) {
+	    AMediaFormat_setBuffer(vid_fmt, AND_MEDIA_KEY_CSD0,
+				   h264_data->dec_sps_buf,
+				   h264_data->dec_sps_len);
+	}
+	if (h264_data->dec_pps_len) {
+	    AMediaFormat_setBuffer(vid_fmt, AND_MEDIA_KEY_CSD1,
+				   h264_data->dec_pps_buf,
+				   h264_data->dec_pps_len);
+	}
+    }
+    am_status = AMediaCodec_configure(and_media_data->dec, vid_fmt, NULL,
+				      NULL, 0);
+
+    AMediaFormat_delete(vid_fmt);
+    if (am_status != AMEDIA_OK) {
+        PJ_LOG(4, (THIS_FILE, "Decoder configure failed, status=%d, fmt_id=%d",
+        	   am_status, and_media_data->prm->dec_fmt.id));
+        return PJMEDIA_CODEC_EFAILED;
+    }
+
+    am_status = AMediaCodec_start(and_media_data->dec);
+    if (am_status != AMEDIA_OK) {
+	PJ_LOG(4, (THIS_FILE, "Decoder start failed, status=%d",
+		   am_status));
+	return PJMEDIA_CODEC_EFAILED;
+    }
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pjmedia_codec_and_media_vid_init(
+						pjmedia_vid_codec_mgr *mgr,
+                                                pj_pool_factory *pf)
+{
+    const pj_str_t h264_name = { (char*)"H264", 4};
+    pj_status_t status;
+
+    if (and_media_factory.pool != NULL) {
+	/* Already initialized. */
+	return PJ_SUCCESS;
+    }
+
+    if (!mgr) mgr = pjmedia_vid_codec_mgr_instance();
+    PJ_ASSERT_RETURN(mgr, PJ_EINVAL);
+
+    /* Create Android AMediaCodec codec factory. */
+    and_media_factory.base.op = &and_media_factory_op;
+    and_media_factory.base.factory_data = NULL;
+    and_media_factory.mgr = mgr;
+    and_media_factory.pf = pf;
+    and_media_factory.pool = pj_pool_create(pf, "and_media_vid_factory",
+					    256, 256, NULL);
+    if (!and_media_factory.pool)
+	return PJ_ENOMEM;
+
+#if PJMEDIA_HAS_AND_MEDIA_H264
+    /* Registering format match for SDP negotiation */
+    status = pjmedia_sdp_neg_register_fmt_match_cb(
+					&h264_name,
+					&pjmedia_vid_codec_h264_match_sdp);
+    if (status != PJ_SUCCESS)
+	goto on_error;
+#endif
+
+    /* Register codec factory to codec manager. */
+    status = pjmedia_vid_codec_mgr_register_factory(mgr,
+						    &and_media_factory.base);
+    if (status != PJ_SUCCESS)
+	goto on_error;
+
+    PJ_LOG(4,(THIS_FILE, "Android AMediaCodec initialized"));
+
+    /* Done. */
+    return PJ_SUCCESS;
+
+on_error:
+    pj_pool_release(and_media_factory.pool);
+    and_media_factory.pool = NULL;
+    return status;
+}
+
+/*
+ * Unregister Android AMediaCodec factory from pjmedia endpoint.
+ */
+PJ_DEF(pj_status_t) pjmedia_codec_and_media_vid_deinit(void)
+{
+    pj_status_t status = PJ_SUCCESS;
+
+    if (and_media_factory.pool == NULL) {
+	/* Already deinitialized */
+	return PJ_SUCCESS;
+    }
+
+    /* Unregister Android AMediaCodec factory. */
+    status = pjmedia_vid_codec_mgr_unregister_factory(and_media_factory.mgr,
+						      &and_media_factory.base);
+
+    /* Destroy pool. */
+    pj_pool_release(and_media_factory.pool);
+    and_media_factory.pool = NULL;
+
+    return status;
+}
+
+static pj_status_t and_media_test_alloc(pjmedia_vid_codec_factory *factory,
+                                    const pjmedia_vid_codec_info *info )
+{
+    unsigned i;
+
+    PJ_ASSERT_RETURN(factory == &and_media_factory.base, PJ_EINVAL);
+
+    for (i = 0; i < PJ_ARRAY_SIZE(and_media_codec); ++i) {
+        if (and_media_codec[i].enabled && info->pt == and_media_codec[i].pt &&
+            (info->fmt_id == and_media_codec[i].fmt_id))
+        {
+            return PJ_SUCCESS;
+        }
+    }
+
+    return PJMEDIA_CODEC_EUNSUP;
+}
+
+static pj_status_t and_media_default_attr(pjmedia_vid_codec_factory *factory,
+                                      const pjmedia_vid_codec_info *info,
+                                      pjmedia_vid_codec_param *attr )
+{
+    unsigned i;
+
+    PJ_ASSERT_RETURN(factory == &and_media_factory.base, PJ_EINVAL);
+    PJ_ASSERT_RETURN(info && attr, PJ_EINVAL);
+
+    for (i = 0; i < PJ_ARRAY_SIZE(and_media_codec); ++i) {
+        if (and_media_codec[i].enabled && info->pt != 0 &&
+            (info->fmt_id == and_media_codec[i].fmt_id))
+        {
+            break;
+        }
+    }
+
+    if (i == PJ_ARRAY_SIZE(and_media_codec))
+        return PJ_EINVAL;
+
+    pj_bzero(attr, sizeof(pjmedia_vid_codec_param));
+
+    attr->dir = PJMEDIA_DIR_ENCODING_DECODING;
+    attr->packing = PJMEDIA_VID_PACKING_PACKETS;
+
+    /* Encoded format */
+    pjmedia_format_init_video(&attr->enc_fmt, info->fmt_id,
+                              DEFAULT_WIDTH, DEFAULT_HEIGHT, DEFAULT_FPS, 1);
+
+    /* Decoded format */
+    pjmedia_format_init_video(&attr->dec_fmt, PJMEDIA_FORMAT_I420,
+                              DEFAULT_WIDTH, DEFAULT_HEIGHT, DEFAULT_FPS, 1);
+
+    attr->dec_fmtp = and_media_codec[i].dec_fmtp;
+
+    /* Bitrate */
+    attr->enc_fmt.det.vid.avg_bps = DEFAULT_AVG_BITRATE;
+    attr->enc_fmt.det.vid.max_bps = DEFAULT_MAX_BITRATE;
+
+    /* Encoding MTU */
+    attr->enc_mtu = PJMEDIA_MAX_VID_PAYLOAD_SIZE;
+
+    return PJ_SUCCESS;
+}
+
+static pj_bool_t codec_exists(const pj_str_t *codec_name)
+{
+    AMediaCodec *codec;
+    char *codec_txt;
+
+    codec_txt = codec_name->ptr;
+
+    codec = AMediaCodec_createCodecByName(codec_txt);
+    if (!codec) {
+	PJ_LOG(4, (THIS_FILE, "Failed creating codec : %.*s", codec_name->slen,
+		   codec_name->ptr));
+	return PJ_FALSE;
+    }
+    AMediaCodec_delete(codec);
+
+    return PJ_TRUE;
+}
+
+void add_codec(struct and_media_codec *codec,
+	       unsigned *count, pjmedia_vid_codec_info *info)
+{
+    info[*count].fmt_id = codec->fmt_id;
+    info[*count].pt = codec->pt;
+    info[*count].encoding_name = pj_str((char *)codec->name);
+    info[*count].encoding_desc = pj_str((char *)codec->description);
+
+    info[*count].clock_rate = 90000;
+    info[*count].dir = PJMEDIA_DIR_ENCODING_DECODING;
+    info[*count].dec_fmt_id_cnt = 1;
+    info[*count].dec_fmt_id[0] = PJMEDIA_FORMAT_I420;
+    info[*count].packings = PJMEDIA_VID_PACKING_PACKETS;
+    info[*count].fps_cnt = 3;
+    info[*count].fps[0].num = 15;
+    info[*count].fps[0].denum = 1;
+    info[*count].fps[1].num = 25;
+    info[*count].fps[1].denum = 1;
+    info[*count].fps[2].num = 30;
+    info[*count].fps[2].denum = 1;
+    ++*count;
+}
+
+static void get_codec_name(pj_bool_t is_enc,
+	                   pj_bool_t prio,
+			   pjmedia_format_id fmt_id,
+			   pj_str_t **codec_name,
+			   unsigned *codec_num)
+{
+    pj_bool_t use_sw_enc = PJMEDIA_AND_MEDIA_PRIO_SW_VID_ENC;
+    pj_bool_t use_sw_dec = PJMEDIA_AND_MEDIA_PRIO_SW_VID_DEC;
+
+    *codec_num = 0;
+
+    switch (fmt_id) {
+
+#if PJMEDIA_HAS_AND_MEDIA_H264
+    case PJMEDIA_FORMAT_H264:
+	if (is_enc) {
+	    if ((prio && use_sw_enc) || (!prio && !use_sw_enc)) {
+		*codec_name = &H264_sw_encoder[0];
+		*codec_num = PJ_ARRAY_SIZE(H264_sw_encoder);
+	    } else {
+		*codec_name = &H264_hw_encoder[0];
+		*codec_num = PJ_ARRAY_SIZE(H264_hw_encoder);
+	    }
+	} else {
+	    if ((prio && use_sw_dec) || (!prio && !use_sw_dec)) {
+		*codec_name = &H264_sw_decoder[0];
+		*codec_num = PJ_ARRAY_SIZE(H264_sw_decoder);
+	    } else {
+		*codec_name = &H264_hw_decoder[0];
+		*codec_num = PJ_ARRAY_SIZE(H264_hw_decoder);
+	    }
+	}
+	break;
+#endif
+#if PJMEDIA_HAS_AND_MEDIA_VP8
+    case PJMEDIA_FORMAT_VP8:
+	if (is_enc) {
+	    if ((prio && use_sw_enc) || (!prio && !use_sw_enc)) {
+		*codec_name = &VP8_sw_encoder[0];
+		*codec_num = PJ_ARRAY_SIZE(VP8_sw_encoder);
+	    } else {
+		*codec_name = &VP8_hw_encoder[0];
+		*codec_num = PJ_ARRAY_SIZE(VP8_hw_encoder);
+	    }
+	} else {
+	    if ((prio && use_sw_dec) || (!prio && !use_sw_dec)) {
+		*codec_name = &VP8_sw_decoder[0];
+		*codec_num = PJ_ARRAY_SIZE(VP8_sw_decoder);
+	    } else {
+		*codec_name = &VP8_hw_decoder[0];
+		*codec_num = PJ_ARRAY_SIZE(VP8_hw_decoder);
+	    }
+	}
+	break;
+#endif
+#if PJMEDIA_HAS_AND_MEDIA_VP9
+    case PJMEDIA_FORMAT_VP9:
+	if (is_enc) {
+	    if ((prio && use_sw_enc) || (!prio && !use_sw_enc)) {
+		*codec_name = &VP9_sw_encoder[0];
+		*codec_num = PJ_ARRAY_SIZE(VP9_sw_encoder);
+	    } else {
+		*codec_name = &VP9_hw_encoder[0];
+		*codec_num = PJ_ARRAY_SIZE(VP9_hw_encoder);
+	    }
+	} else {
+	    if ((prio && use_sw_dec) || (!prio && !use_sw_dec)) {
+		*codec_name = &VP9_sw_decoder[0];
+		*codec_num = PJ_ARRAY_SIZE(VP9_sw_decoder);
+	    } else {
+		*codec_name = &VP9_hw_decoder[0];
+		*codec_num = PJ_ARRAY_SIZE(VP9_hw_decoder);
+	    }
+	}
+	break;
+#endif
+    default:
+	break;
+    }
+}
+
+static pj_status_t and_media_enum_info(pjmedia_vid_codec_factory *factory,
+                                   unsigned *count,
+                                   pjmedia_vid_codec_info info[])
+{
+    unsigned i, max;
+
+    PJ_ASSERT_RETURN(info && *count > 0, PJ_EINVAL);
+    PJ_ASSERT_RETURN(factory == &and_media_factory.base, PJ_EINVAL);
+
+    max = *count;
+
+    for (i = 0, *count = 0; i < PJ_ARRAY_SIZE(and_media_codec) && *count < max;
+	 ++i)
+    {
+	unsigned enc_idx = 0;
+	unsigned dec_idx = 0;
+	pj_str_t *enc_name = NULL;
+	unsigned num_enc;
+	pj_str_t *dec_name = NULL;
+	unsigned num_dec;
+
+	get_codec_name(PJ_TRUE, PJ_TRUE, and_media_codec[i].fmt_id,
+		       &enc_name, &num_enc);
+
+	for (enc_idx = 0; enc_idx < num_enc ;++enc_idx, ++enc_name) {
+	    if (codec_exists(enc_name)) {
+		break;
+	    }
+	}
+	if (enc_idx == num_enc) {
+	    get_codec_name(PJ_TRUE, PJ_FALSE, and_media_codec[i].fmt_id,
+			   &enc_name, &num_enc);
+
+	    for (enc_idx = 0; enc_idx < num_enc ;++enc_idx, ++enc_name) {
+		if (codec_exists(enc_name)) {
+		    break;
+		}
+	    }
+	    if (enc_idx == num_enc)
+		continue;
+	}
+
+	get_codec_name(PJ_FALSE, PJ_TRUE, and_media_codec[i].fmt_id,
+		       &dec_name, &num_dec);
+	for (dec_idx = 0; dec_idx < num_dec ;++dec_idx, ++dec_name) {
+	    if (codec_exists(dec_name)) {
+		break;
+	    }
+	}
+	if (dec_idx == num_dec) {
+	    get_codec_name(PJ_FALSE, PJ_FALSE, and_media_codec[i].fmt_id,
+			   &dec_name, &num_dec);
+	    for (enc_idx = 0; enc_idx < num_enc ;++enc_idx, ++enc_name) {
+		if (codec_exists(enc_name)) {
+		    break;
+		}
+	    }
+	    if (dec_idx == num_dec)
+		continue;
+	}
+
+	and_media_codec[i].encoder_name = enc_name;
+	and_media_codec[i].decoder_name = dec_name;
+	PJ_LOG(4, (THIS_FILE, "Found encoder [%d]: %.*s and decoder: %.*s ",
+		   *count, enc_name->slen, enc_name->ptr, dec_name->slen,
+		   dec_name->ptr));
+	add_codec(&and_media_codec[*count], count, info);
+	and_media_codec[i].enabled = PJ_TRUE;
+    }
+
+    return PJ_SUCCESS;
+}
+
+static void create_codec(struct and_media_codec_data *and_media_data)
+{
+    char *enc_name;
+    char *dec_name;
+
+    if (!and_media_codec[and_media_data->codec_idx].encoder_name ||
+	!and_media_codec[and_media_data->codec_idx].decoder_name)
+    {
+	return;
+    }
+
+    enc_name = and_media_codec[and_media_data->codec_idx].encoder_name->ptr;
+    dec_name = and_media_codec[and_media_data->codec_idx].decoder_name->ptr;
+
+    if (!and_media_data->enc) {
+	and_media_data->enc = AMediaCodec_createCodecByName(enc_name);
+	if (!and_media_data->enc) {
+	    PJ_LOG(4, (THIS_FILE, "Failed creating encoder: %s", enc_name));
+	}
+    }
+
+    if (!and_media_data->dec) {
+	and_media_data->dec = AMediaCodec_createCodecByName(dec_name);
+	if (!and_media_data->dec) {
+	    PJ_LOG(4, (THIS_FILE, "Failed creating decoder: %s", dec_name));
+	}
+    }
+    PJ_LOG(4, (THIS_FILE, "Created encoder: %s, decoder: %s", enc_name,
+	       dec_name));
+}
+
+static pj_status_t and_media_alloc_codec(pjmedia_vid_codec_factory *factory,
+                                     const pjmedia_vid_codec_info *info,
+                                     pjmedia_vid_codec **p_codec)
+{
+    pj_pool_t *pool;
+    pjmedia_vid_codec *codec;
+    and_media_codec_data *and_media_data;
+    int i, idx;
+
+    PJ_ASSERT_RETURN(factory == &and_media_factory.base && info && p_codec,
+                     PJ_EINVAL);
+
+    idx = -1;
+    for (i = 0; i < PJ_ARRAY_SIZE(and_media_codec); ++i) {
+	if ((info->fmt_id == and_media_codec[i].fmt_id) &&
+            (and_media_codec[i].enabled))
+	{
+	    idx = i;
+	    break;
+	}
+    }
+    if (idx == -1) {
+	*p_codec = NULL;
+	return PJMEDIA_CODEC_EFAILED;
+    }
+
+    *p_codec = NULL;
+    pool = pj_pool_create(and_media_factory.pf, "anmedvid%p", 512, 512, NULL);
+    if (!pool)
+	return PJ_ENOMEM;
+
+    /* codec instance */
+    codec = PJ_POOL_ZALLOC_T(pool, pjmedia_vid_codec);
+    codec->factory = factory;
+    codec->op = &and_media_codec_op;
+
+    /* codec data */
+    and_media_data = PJ_POOL_ZALLOC_T(pool, and_media_codec_data);
+    and_media_data->pool = pool;
+    and_media_data->codec_idx = idx;
+    codec->codec_data = and_media_data;
+
+    create_codec(and_media_data);
+    if (!and_media_data->enc || !and_media_data->dec) {
+	goto on_error;
+    }
+
+    *p_codec = codec;
+    return PJ_SUCCESS;
+
+on_error:
+    and_media_dealloc_codec(factory, codec);
+    return PJMEDIA_CODEC_EFAILED;
+}
+
+static pj_status_t and_media_dealloc_codec(pjmedia_vid_codec_factory *factory,
+                                       pjmedia_vid_codec *codec )
+{
+    and_media_codec_data *and_media_data;
+
+    PJ_ASSERT_RETURN(codec, PJ_EINVAL);
+
+    PJ_UNUSED_ARG(factory);
+
+    and_media_data = (and_media_codec_data*) codec->codec_data;
+    if (and_media_data->enc) {
+        AMediaCodec_stop(and_media_data->enc);
+        AMediaCodec_delete(and_media_data->enc);
+        and_media_data->enc = NULL;
+    }
+
+    if (and_media_data->dec) {
+        AMediaCodec_stop(and_media_data->dec);
+        AMediaCodec_delete(and_media_data->dec);
+        and_media_data->dec = NULL;
+    }
+    pj_pool_release(and_media_data->pool);
+    return PJ_SUCCESS;
+}
+
+static pj_status_t and_media_codec_init(pjmedia_vid_codec *codec,
+                                    pj_pool_t *pool )
+{
+    PJ_ASSERT_RETURN(codec && pool, PJ_EINVAL);
+    PJ_UNUSED_ARG(codec);
+    PJ_UNUSED_ARG(pool);
+    return PJ_SUCCESS;
+}
+
+static pj_status_t and_media_codec_open(pjmedia_vid_codec *codec,
+                                    pjmedia_vid_codec_param *codec_param)
+{
+    and_media_codec_data *and_media_data;
+    pjmedia_vid_codec_param *param;
+    pj_status_t status = PJ_SUCCESS;
+
+    and_media_data = (and_media_codec_data*) codec->codec_data;
+    and_media_data->prm = pjmedia_vid_codec_param_clone( and_media_data->pool,
+                                                     codec_param);
+    param = and_media_data->prm;
+    if (and_media_codec[and_media_data->codec_idx].open_codec) {
+        status = and_media_codec[and_media_data->codec_idx].open_codec(
+        							and_media_data);
+        if (status != PJ_SUCCESS)
+            return status;
+    }
+    and_media_data->whole = (param->packing == PJMEDIA_VID_PACKING_WHOLE);
+    status = configure_encoder(and_media_data);
+    if (status != PJ_SUCCESS) {
+        return PJMEDIA_CODEC_EFAILED;
+    }
+    status = configure_decoder(and_media_data);
+    if (status != PJ_SUCCESS) {
+        return PJMEDIA_CODEC_EFAILED;
+    }
+    if (and_media_data->dec_buf_size == 0) {
+	and_media_data->dec_buf_size = (MAX_RX_WIDTH * MAX_RX_HEIGHT * 3 >> 1) +
+				       (MAX_RX_WIDTH);
+    }
+    and_media_data->dec_buf = (pj_uint8_t*)pj_pool_alloc(and_media_data->pool,
+                                                  and_media_data->dec_buf_size);
+    /* Need to update param back after values are negotiated */
+    pj_memcpy(codec_param, param, sizeof(*codec_param));
+
+    return PJ_SUCCESS;
+}
+
+static pj_status_t and_media_codec_close(pjmedia_vid_codec *codec)
+{
+    PJ_ASSERT_RETURN(codec, PJ_EINVAL);
+    PJ_UNUSED_ARG(codec);
+    return PJ_SUCCESS;
+}
+
+static pj_status_t and_media_codec_modify(pjmedia_vid_codec *codec,
+                                      const pjmedia_vid_codec_param *param)
+{
+    PJ_ASSERT_RETURN(codec && param, PJ_EINVAL);
+    PJ_UNUSED_ARG(codec);
+    PJ_UNUSED_ARG(param);
+    return PJ_EINVALIDOP;
+}
+
+static pj_status_t and_media_codec_get_param(pjmedia_vid_codec *codec,
+                                         pjmedia_vid_codec_param *param)
+{
+    struct and_media_codec_data *and_media_data;
+
+    PJ_ASSERT_RETURN(codec && param, PJ_EINVAL);
+
+    and_media_data = (and_media_codec_data*) codec->codec_data;
+    pj_memcpy(param, and_media_data->prm, sizeof(*param));
+
+    return PJ_SUCCESS;
+}
+
+static pj_status_t and_media_codec_encode_begin(pjmedia_vid_codec *codec,
+                                            const pjmedia_vid_encode_opt *opt,
+                                            const pjmedia_frame *input,
+                                            unsigned out_size,
+                                            pjmedia_frame *output,
+                                            pj_bool_t *has_more)
+{
+    struct and_media_codec_data *and_media_data;
+    unsigned i;
+    pj_ssize_t buf_idx;
+
+    PJ_ASSERT_RETURN(codec && input && out_size && output && has_more,
+                     PJ_EINVAL);
+
+    and_media_data = (and_media_codec_data*) codec->codec_data;
+
+    if (opt && opt->force_keyframe) {
+#if __ANDROID_API__ >=26
+	AMediaFormat *vid_fmt = NULL;
+	media_status_t am_status;
+
+	vid_fmt = AMediaFormat_new();
+	if (!vid_fmt) {
+	    return PJMEDIA_CODEC_EFAILED;
+	}
+	AMediaFormat_setInt32(vid_fmt, AND_MEDIA_KEY_REQUEST_SYNCF, 0);
+	am_status = AMediaCodec_setParameters(and_media_data->enc, vid_fmt);
+
+	if (am_status != AMEDIA_OK)
+	    PJ_LOG(4,(THIS_FILE, "Encoder setParameters failed %d", am_status));
+
+	AMediaFormat_delete(vid_fmt);
+#else
+	PJ_LOG(5, (THIS_FILE, "Encoder cannot be forced to send keyframe"));
+#endif
+    }
+
+    buf_idx = AMediaCodec_dequeueInputBuffer(and_media_data->enc,
+					     CODEC_DEQUEUE_TIMEOUT);
+    if (buf_idx >= 0) {
+	media_status_t am_status;
+	pj_size_t output_size;
+	pj_uint8_t *input_buf = AMediaCodec_getInputBuffer(and_media_data->enc,
+						    buf_idx, &output_size);
+	if (input_buf && output_size >= input->size) {
+	    pj_memcpy(input_buf, input->buf, input->size);
+	    am_status = AMediaCodec_queueInputBuffer(and_media_data->enc,
+				                buf_idx, 0, input->size, 0, 0);
+	    if (am_status != AMEDIA_OK) {
+		PJ_LOG(4, (THIS_FILE, "Encoder queueInputBuffer return %d",
+		           am_status));
+		goto on_return;
+	    }
+	} else {
+	    if (!input_buf) {
+		PJ_LOG(4,(THIS_FILE, "Encoder getInputBuffer "
+				     "returns no input buff"));
+	    } else {
+		PJ_LOG(4,(THIS_FILE, "Encoder getInputBuffer "
+				     "size: %d, expecting %d.",
+				     input_buf, output_size, input->size));
+	    }
+	    goto on_return;
+	}
+    } else {
+	PJ_LOG(4,(THIS_FILE, "Encoder dequeueInputBuffer failed[%d]", buf_idx));
+	goto on_return;
+    }
+
+    for (i = 0; i < CODEC_WAIT_RETRY; ++i) {
+	buf_idx = AMediaCodec_dequeueOutputBuffer(and_media_data->enc,
+						  &and_media_data->enc_buf_info,
+						  CODEC_DEQUEUE_TIMEOUT);
+	if (buf_idx == -1) {
+	    /* Timeout, wait until output buffer is availble. */
+	    PJ_LOG(5, (THIS_FILE, "Encoder dequeueOutputBuffer timeout[%d]",
+		       i+1));
+	    pj_thread_sleep(CODEC_THREAD_WAIT);
+	} else {
+	    break;
+	}
+    }
+
+    if (buf_idx >= 0) {
+        pj_size_t output_size;
+        pj_uint8_t *output_buf = AMediaCodec_getOutputBuffer(
+        						and_media_data->enc,
+                                                        buf_idx,
+                                                        &output_size);
+        if (!output_buf) {
+            PJ_LOG(4, (THIS_FILE, "Encoder failed getting output buffer, "
+		       "buffer size %d, offset %d, flags %d",
+		       and_media_data->enc_buf_info.size,
+		       and_media_data->enc_buf_info.offset,
+		       and_media_data->enc_buf_info.flags));
+            goto on_return;
+        }
+        and_media_data->enc_processed = 0;
+        and_media_data->enc_frame_whole = output_buf;
+        and_media_data->enc_output_buf_idx = buf_idx;
+        and_media_data->enc_frame_size = and_media_data->enc_buf_info.size;
+
+        if (and_media_codec[and_media_data->codec_idx].process_encode) {
+            pj_status_t status;
+
+            status = and_media_codec[and_media_data->codec_idx].process_encode(
+                                                                and_media_data);
+
+            if (status != PJ_SUCCESS)
+                goto on_return;
+        }
+
+        if(and_media_data->enc_buf_info.flags & AND_MEDIA_FRM_TYPE_KEYFRAME) {
+            output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
+        }
+
+        if (and_media_data->whole) {
+            unsigned payload_size = 0;
+            unsigned start_data = 0;
+
+            *has_more = PJ_FALSE;
+
+            if ((and_media_data->prm->enc_fmt.id == PJMEDIA_FORMAT_H264) &&
+                (and_media_data->enc_buf_info.flags &
+                				   AND_MEDIA_FRM_TYPE_KEYFRAME))
+            {
+        	h264_codec_data *h264_data =
+        			     (h264_codec_data *)and_media_data->ex_data;
+        	start_data = h264_data->enc_sps_pps_len;
+                pj_memcpy(output->buf, h264_data->enc_sps_pps_buf,
+                	  h264_data->enc_sps_pps_len);
+            }
+
+            payload_size = and_media_data->enc_buf_info.size + start_data;
+
+            if (payload_size > out_size)
+                return PJMEDIA_CODEC_EFRMTOOSHORT;
+
+            output->type = PJMEDIA_FRAME_TYPE_VIDEO;
+            output->size = payload_size;
+            output->timestamp = input->timestamp;
+            pj_memcpy((pj_uint8_t*)output->buf+start_data,
+        	      and_media_data->enc_frame_whole,
+        	      and_media_data->enc_buf_info.size);
+
+	    AMediaCodec_releaseOutputBuffer(and_media_data->enc,
+					    buf_idx,
+					    0);
+
+            return PJ_SUCCESS;
+        }
+    } else {
+        if (buf_idx == -2) {
+	    int width, height, color_fmt, stride;
+
+	    /* Format change. */
+	    AMediaFormat *vid_fmt = AMediaCodec_getOutputFormat(
+							   and_media_data->enc);
+
+	    AMediaFormat_getInt32(vid_fmt, AND_MEDIA_KEY_WIDTH, &width);
+	    AMediaFormat_getInt32(vid_fmt, AND_MEDIA_KEY_HEIGHT, &height);
+	    AMediaFormat_getInt32(vid_fmt, AND_MEDIA_KEY_COLOR_FMT, &color_fmt);
+	    AMediaFormat_getInt32(vid_fmt, AND_MEDIA_KEY_STRIDE, &stride);
+	    PJ_LOG(5, (THIS_FILE, "Encoder detect new width %d, height %d, "
+		       "color_fmt 0x%X, stride %d buf_size %d",
+		       width, height, color_fmt, stride,
+		       and_media_data->enc_buf_info.size));
+
+	    AMediaFormat_delete(vid_fmt);
+        } else {
+	    PJ_LOG(4, (THIS_FILE, "Encoder dequeueOutputBuffer failed[%d]",
+		       buf_idx));
+        }
+        goto on_return;
+    }
+
+    return and_media_codec_encode_more(codec, out_size, output, has_more);
+
+on_return:
+    output->size = 0;
+    output->type = PJMEDIA_FRAME_TYPE_NONE;
+    *has_more = PJ_FALSE;
+    return PJ_SUCCESS;
+}
+
+static pj_status_t and_media_codec_encode_more(pjmedia_vid_codec *codec,
+                                           unsigned out_size,
+                                           pjmedia_frame *output,
+                                           pj_bool_t *has_more)
+{
+    struct and_media_codec_data *and_media_data;
+    pj_status_t status = PJ_SUCCESS;
+
+    PJ_ASSERT_RETURN(codec && out_size && output && has_more, PJ_EINVAL);
+
+    and_media_data = (and_media_codec_data*) codec->codec_data;
+
+    status = and_media_codec[and_media_data->codec_idx].encode_more(
+							    and_media_data,
+							    out_size, output,
+							    has_more);
+    if (!(*has_more)) {
+	AMediaCodec_releaseOutputBuffer(and_media_data->enc,
+					and_media_data->enc_output_buf_idx,
+					0);
+    }
+
+    return status;
+}
+
+static int write_yuv(pj_uint8_t *buf,
+                     unsigned dst_len,
+                     unsigned char* input,
+                     int stride_len,
+                     int iWidth,
+                     int iHeight)
+{
+    unsigned req_size;
+    pj_uint8_t *dst = buf;
+    pj_uint8_t *max = dst + dst_len;
+    int   i;
+    unsigned char*  pPtr = NULL;
+
+    req_size = (iWidth * iHeight) + (iWidth / 2 * iHeight / 2) +
+	       (iWidth / 2 * iHeight / 2);
+    if (dst_len < req_size)
+	return -1;
+
+    pPtr = input;
+    for (i = 0; i < iHeight && (dst + iWidth < max); i++) {
+	pj_memcpy(dst, pPtr, iWidth);
+	pPtr += stride_len;
+	dst += iWidth;
+    }
+
+    if (i < iHeight)
+	return -1;
+
+    iHeight = iHeight / 2;
+    iWidth = iWidth / 2;
+    for (i = 0; i < iHeight && (dst + iWidth <= max); i++) {
+	pj_memcpy(dst, pPtr, iWidth);
+	pPtr += stride_len/2;
+	dst += iWidth;
+    }
+
+    if (i < iHeight)
+	return -1;
+
+    for (i = 0; i < iHeight && (dst + iWidth <= max); i++) {
+	pj_memcpy(dst, pPtr, iWidth);
+	pPtr += stride_len/2;
+	dst += iWidth;
+    }
+
+    if (i < iHeight)
+	return -1;
+
+    return dst - buf;
+}
+
+static void and_media_get_input_buffer(
+				    struct and_media_codec_data *and_media_data)
+{
+    pj_ssize_t buf_idx = -1;
+
+    buf_idx = AMediaCodec_dequeueInputBuffer(and_media_data->dec,
+					     CODEC_DEQUEUE_TIMEOUT);
+
+    if (buf_idx < 0) {
+	PJ_LOG(4,(THIS_FILE, "Decoder dequeueInputBuffer failed return %d",
+		  buf_idx));
+
+	and_media_data->dec_input_buf = NULL;
+
+	if (buf_idx == -10000) {
+	    PJ_LOG(5, (THIS_FILE, "Resetting decoder"));
+	    AMediaCodec_stop(and_media_data->dec);
+	    AMediaCodec_delete(and_media_data->dec);
+	    and_media_data->dec = NULL;
+
+	    create_codec(and_media_data);
+	    if (and_media_data->dec)
+		configure_decoder(and_media_data);
+	}
+	return;
+    }
+
+    and_media_data->dec_input_buf_len = 0;
+    and_media_data->dec_input_buf_idx = buf_idx;
+    and_media_data->dec_input_buf = AMediaCodec_getInputBuffer(
+				       and_media_data->dec,
+				       buf_idx,
+				       &and_media_data->dec_input_buf_max_size);
+}
+
+static pj_status_t and_media_decode(pjmedia_vid_codec *codec,
+			        struct and_media_codec_data *and_media_data,
+			        pj_uint8_t *input_buf, unsigned buf_size,
+			        int buf_flag, pj_timestamp *input_ts,
+			        pj_bool_t write_output, pjmedia_frame *output)
+{
+    pj_ssize_t buf_idx = 0;
+    pj_status_t status = PJ_SUCCESS;
+    media_status_t am_status;
+
+    if ((and_media_data->dec_input_buf_max_size > 0) &&
+	(and_media_data->dec_input_buf_len + buf_size >
+         and_media_data->dec_input_buf_max_size))
+    {
+	am_status = AMediaCodec_queueInputBuffer(and_media_data->dec,
+					    and_media_data->dec_input_buf_idx,
+					    0,
+					    and_media_data->dec_input_buf_len,
+					    input_ts->u32.lo,
+					    buf_flag);
+	if (am_status != AMEDIA_OK) {
+	    PJ_LOG(4,(THIS_FILE, "Decoder queueInputBuffer idx[%d] return %d",
+		    and_media_data->dec_input_buf_idx, am_status));
+	    return status;
+	}
+	and_media_data->dec_input_buf = NULL;
+    }
+
+    if (and_media_data->dec_input_buf == NULL)
+    {
+	and_media_get_input_buffer(and_media_data);
+
+	if (and_media_data->dec_input_buf == NULL) {
+	    PJ_LOG(4,(THIS_FILE, "Decoder failed getting input buffer"));
+	    return status;
+	}
+    }
+    pj_memcpy(and_media_data->dec_input_buf + and_media_data->dec_input_buf_len,
+	      input_buf, buf_size);
+
+    and_media_data->dec_input_buf_len += buf_size;
+
+    if (!write_output)
+	return status;
+
+    am_status = AMediaCodec_queueInputBuffer(and_media_data->dec,
+					     and_media_data->dec_input_buf_idx,
+					     0,
+					     and_media_data->dec_input_buf_len,
+					     input_ts->u32.lo,
+					     buf_flag);
+    if (am_status != AMEDIA_OK) {
+	PJ_LOG(4,(THIS_FILE, "Decoder queueInputBuffer failed return %d",
+		  am_status));
+	and_media_data->dec_input_buf = NULL;
+	return status;
+    }
+    and_media_data->dec_input_buf_len += buf_size;
+
+    buf_idx = AMediaCodec_dequeueOutputBuffer(and_media_data->dec,
+					      &and_media_data->dec_buf_info,
+					      CODEC_DEQUEUE_TIMEOUT);
+
+    if (buf_idx >= 0) {
+	pj_size_t output_size;
+	int len;
+
+	pj_uint8_t *output_buf = AMediaCodec_getOutputBuffer(
+							and_media_data->dec,
+							buf_idx,
+							&output_size);
+	if (output_buf == NULL) {
+	    am_status = AMediaCodec_releaseOutputBuffer(and_media_data->dec,
+					    buf_idx,
+					    0);
+	    PJ_LOG(4,(THIS_FILE, "Decoder getOutputBuffer failed"));
+	    return status;
+	}
+	len = write_yuv((pj_uint8_t *)output->buf,
+			and_media_data->dec_buf_info.size,
+			output_buf,
+			and_media_data->dec_stride_len,
+			and_media_data->prm->dec_fmt.det.vid.size.w,
+			and_media_data->prm->dec_fmt.det.vid.size.h);
+
+	am_status = AMediaCodec_releaseOutputBuffer(and_media_data->dec,
+						    buf_idx,
+						    0);
+
+	if (len > 0) {
+	    if (!and_media_data->dec_has_output_frame) {
+		output->type = PJMEDIA_FRAME_TYPE_VIDEO;
+		output->size = len;
+		output->timestamp = *input_ts;
+
+		and_media_data->dec_has_output_frame = PJ_TRUE;
+	    }
+	} else {
+	    status = PJMEDIA_CODEC_EFRMTOOSHORT;
+	}
+    } else if (buf_idx == -2) {
+	int width, height, stride;
+	AMediaFormat *vid_fmt;
+	/* Get output format */
+	vid_fmt = AMediaCodec_getOutputFormat(and_media_data->dec);
+
+	AMediaFormat_getInt32(vid_fmt, AND_MEDIA_KEY_WIDTH, &width);
+	AMediaFormat_getInt32(vid_fmt, AND_MEDIA_KEY_HEIGHT, &height);
+	AMediaFormat_getInt32(vid_fmt, AND_MEDIA_KEY_STRIDE, &stride);
+
+	AMediaFormat_delete(vid_fmt);
+	and_media_data->dec_stride_len = stride;
+	if (width != and_media_data->prm->dec_fmt.det.vid.size.w ||
+	    height != and_media_data->prm->dec_fmt.det.vid.size.h)
+	{
+	    pjmedia_event event;
+
+	    and_media_data->prm->dec_fmt.det.vid.size.w = width;
+	    and_media_data->prm->dec_fmt.det.vid.size.h = height;
+
+	    PJ_LOG(4,(THIS_FILE, "Frame size changed to %dx%d",
+		      and_media_data->prm->dec_fmt.det.vid.size.w,
+		      and_media_data->prm->dec_fmt.det.vid.size.h));
+
+	    /* Broadcast format changed event */
+	    pjmedia_event_init(&event, PJMEDIA_EVENT_FMT_CHANGED,
+			       &output->timestamp, codec);
+	    event.data.fmt_changed.dir = PJMEDIA_DIR_DECODING;
+	    pjmedia_format_copy(&event.data.fmt_changed.new_fmt,
+				&and_media_data->prm->dec_fmt);
+	    pjmedia_event_publish(NULL, codec, &event,
+				  PJMEDIA_EVENT_PUBLISH_DEFAULT);
+	}
+    } else {
+	PJ_LOG(4,(THIS_FILE, "Decoder dequeueOutputBuffer failed [%d]",
+		  buf_idx));
+    }
+    return status;
+}
+
+static pj_status_t and_media_codec_decode(pjmedia_vid_codec *codec,
+                                      pj_size_t count,
+                                      pjmedia_frame packets[],
+                                      unsigned out_size,
+                                      pjmedia_frame *output)
+{
+    struct and_media_codec_data *and_media_data;
+    pj_status_t status = PJ_EINVAL;
+
+    PJ_ASSERT_RETURN(codec && count && packets && out_size && output,
+                     PJ_EINVAL);
+    PJ_ASSERT_RETURN(output->buf, PJ_EINVAL);
+
+    and_media_data = (and_media_codec_data*) codec->codec_data;
+    and_media_data->dec_has_output_frame = PJ_FALSE;
+    and_media_data->dec_input_buf = NULL;
+    and_media_data->dec_input_buf_len = 0;
+
+    if (and_media_codec[and_media_data->codec_idx].decode) {
+        status = and_media_codec[and_media_data->codec_idx].decode(codec, count,
+                                                           packets, out_size,
+                                                           output);
+    }
+    if (status != PJ_SUCCESS) {
+	return status;
+    }
+    if (!and_media_data->dec_has_output_frame) {
+	pjmedia_event event;
+
+	/* Broadcast missing keyframe event */
+	pjmedia_event_init(&event, PJMEDIA_EVENT_KEYFRAME_MISSING,
+			   &packets[0].timestamp, codec);
+	pjmedia_event_publish(NULL, codec, &event,
+			      PJMEDIA_EVENT_PUBLISH_DEFAULT);
+
+	PJ_LOG(4,(THIS_FILE, "Decoder couldn't produce output frame"));
+
+	output->type = PJMEDIA_FRAME_TYPE_NONE;
+	output->size = 0;
+	output->timestamp = packets[0].timestamp;
+    }
+    return PJ_SUCCESS;
+}
+
+#if PJMEDIA_HAS_AND_MEDIA_H264
+
+static pj_status_t open_h264(and_media_codec_data *and_media_data)
+{
+    pj_status_t status;
+    pjmedia_vid_codec_param *param = and_media_data->prm;
+    pjmedia_h264_packetizer_cfg  pktz_cfg;
+    pjmedia_vid_codec_h264_fmtp  h264_fmtp;
+    h264_codec_data *h264_data;
+
+    /* Parse remote fmtp */
+    pj_bzero(&h264_fmtp, sizeof(h264_fmtp));
+    status = pjmedia_vid_codec_h264_parse_fmtp(&param->enc_fmtp,
+                                               &h264_fmtp);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    /* Apply SDP fmtp to format in codec param */
+    if (!param->ignore_fmtp) {
+        status = pjmedia_vid_codec_h264_apply_fmtp(param);
+        if (status != PJ_SUCCESS)
+            return status;
+    }
+    h264_data = PJ_POOL_ZALLOC_T(and_media_data->pool, h264_codec_data);
+    if (!h264_data)
+        return PJ_ENOMEM;
+
+    pj_bzero(&pktz_cfg, sizeof(pktz_cfg));
+    pktz_cfg.mtu = param->enc_mtu;
+    pktz_cfg.unpack_nal_start = 4;
+    /* Packetization mode */
+    if (h264_fmtp.packetization_mode == 0)
+        pktz_cfg.mode = PJMEDIA_H264_PACKETIZER_MODE_SINGLE_NAL;
+    else if (h264_fmtp.packetization_mode == 1)
+        pktz_cfg.mode = PJMEDIA_H264_PACKETIZER_MODE_NON_INTERLEAVED;
+    else
+        return PJ_ENOTSUP;
+
+    /* Android H264 only supports Non Interleaved mode. */
+    pktz_cfg.mode = PJMEDIA_H264_PACKETIZER_MODE_NON_INTERLEAVED;
+    status = pjmedia_h264_packetizer_create(and_media_data->pool, &pktz_cfg,
+                                            &h264_data->pktz);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    and_media_data->ex_data = h264_data;
+    and_media_data->dec_buf_size = (MAX_RX_WIDTH * MAX_RX_HEIGHT * 3 >> 1) +
+				   (MAX_RX_WIDTH);
+
+    /* If available, use the "sprop-parameter-sets" fmtp from remote SDP
+     * to create the decoder.
+     */
+    if (h264_fmtp.sprop_param_sets_len) {
+        const pj_uint8_t start_code[3] = { 0, 0, 1 };
+        const int code_size = PJ_ARRAY_SIZE(start_code);
+        const pj_uint8_t med_start_code[4] = { 0, 0, 0, 1 };
+        const int med_code_size = PJ_ARRAY_SIZE(med_start_code);
+        unsigned i, j;
+
+        for (i = h264_fmtp.sprop_param_sets_len - code_size;
+             i >= code_size; i--)
+        {
+            for (j = 0; j < code_size; j++) {
+                if (h264_fmtp.sprop_param_sets[i + j] != start_code[j]) {
+                    break;
+                }
+            }
+        }
+
+        if (i >= code_size) {
+            h264_data->dec_sps_len = i + med_code_size - code_size;
+            h264_data->dec_pps_len = h264_fmtp.sprop_param_sets_len +
+                med_code_size - code_size - i;
+
+            h264_data->dec_sps_buf = (pj_uint8_t *)pj_pool_alloc(
+        			and_media_data->pool, h264_data->dec_sps_len);
+            h264_data->dec_pps_buf = (pj_uint8_t *)pj_pool_alloc(
+        			and_media_data->pool, h264_data->dec_pps_len);
+
+            pj_memcpy(h264_data->dec_sps_buf, med_start_code,
+                      med_code_size);
+            pj_memcpy(h264_data->dec_sps_buf + med_code_size,
+                      &h264_fmtp.sprop_param_sets[code_size],
+                      h264_data->dec_sps_len - med_code_size);
+            pj_memcpy(h264_data->dec_pps_buf, med_start_code,
+                      med_code_size);
+            pj_memcpy(h264_data->dec_pps_buf + med_code_size,
+                      &h264_fmtp.sprop_param_sets[i + code_size],
+                      h264_data->dec_pps_len - med_code_size);
+        }
+    }
+    return status;
+}
+
+static pj_status_t process_encode_h264(and_media_codec_data *and_media_data)
+{
+    pj_status_t status = PJ_SUCCESS;
+    h264_codec_data *h264_data;
+
+    h264_data = (h264_codec_data *)and_media_data->ex_data;
+    if (and_media_data->enc_buf_info.flags & AND_MEDIA_FRM_TYPE_CONFIG) {
+
+        /*
+	* Config data or SPS+PPS. Update the SPS and PPS buffer,
+	* this will be sent later when sending Keyframe.
+	*/
+	h264_data->enc_sps_pps_len = PJ_MIN(and_media_data->enc_buf_info.size,
+                                        sizeof(h264_data->enc_sps_pps_buf));
+        pj_memcpy(h264_data->enc_sps_pps_buf, and_media_data->enc_frame_whole,
+        	  h264_data->enc_sps_pps_len);
+
+        AMediaCodec_releaseOutputBuffer(and_media_data->enc,
+                                        and_media_data->enc_output_buf_idx,
+                                        0);
+
+        return PJ_EIGNORED;
+    }
+    if (and_media_data->enc_buf_info.flags & AND_MEDIA_FRM_TYPE_KEYFRAME) {
+	h264_data->enc_sps_pps_ex = PJ_TRUE;
+        and_media_data->enc_frame_size = h264_data->enc_sps_pps_len;
+    } else {
+	h264_data->enc_sps_pps_ex = PJ_FALSE;
+    }
+
+    return status;
+}
+
+static pj_status_t encode_more_h264(and_media_codec_data *and_media_data,
+				    unsigned out_size,
+				    pjmedia_frame *output,
+				    pj_bool_t *has_more)
+{
+    const pj_uint8_t *payload;
+    pj_size_t payload_len;
+    pj_status_t status;
+    pj_uint8_t *data_buf = NULL;
+    h264_codec_data *h264_data;
+
+    h264_data = (h264_codec_data *)and_media_data->ex_data;
+    if (h264_data->enc_sps_pps_ex) {
+	data_buf = h264_data->enc_sps_pps_buf;
+    } else {
+	data_buf = and_media_data->enc_frame_whole;
+    }
+    /* We have outstanding frame in packetizer */
+    status = pjmedia_h264_packetize(h264_data->pktz,
+				    data_buf,
+				    and_media_data->enc_frame_size,
+				    &and_media_data->enc_processed,
+				    &payload, &payload_len);
+    if (status != PJ_SUCCESS) {
+	/* Reset */
+	and_media_data->enc_frame_size = and_media_data->enc_processed = 0;
+	*has_more = (and_media_data->enc_processed <
+		     and_media_data->enc_frame_size);
+
+	PJ_PERROR(3,(THIS_FILE, status, "pjmedia_h264_packetize() error"));
+	return status;
+    }
+
+    PJ_ASSERT_RETURN(payload_len <= out_size, PJMEDIA_CODEC_EFRMTOOSHORT);
+
+    output->type = PJMEDIA_FRAME_TYPE_VIDEO;
+    pj_memcpy(output->buf, payload, payload_len);
+    output->size = payload_len;
+
+    if (and_media_data->enc_processed >= and_media_data->enc_frame_size) {
+	h264_codec_data *h264_data = (h264_codec_data *)and_media_data->ex_data;
+
+	if (h264_data->enc_sps_pps_ex) {
+	    *has_more = PJ_TRUE;
+	    h264_data->enc_sps_pps_ex = PJ_FALSE;
+	    and_media_data->enc_processed = 0;
+	    and_media_data->enc_frame_size = and_media_data->enc_buf_info.size;
+	} else {
+	    *has_more = PJ_FALSE;
+	}
+    } else {
+	*has_more = PJ_TRUE;
+    }
+
+    return PJ_SUCCESS;
+}
+
+static pj_status_t decode_h264(pjmedia_vid_codec *codec,
+			       pj_size_t count,
+			       pjmedia_frame packets[],
+			       unsigned out_size,
+			       pjmedia_frame *output)
+{
+    struct and_media_codec_data *and_media_data;
+    const pj_uint8_t start_code[] = { 0, 0, 0, 1 };
+    const int code_size = PJ_ARRAY_SIZE(start_code);
+    unsigned buf_pos, whole_len = 0;
+    unsigned i, frm_cnt;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(codec && count && packets && out_size && output,
+                     PJ_EINVAL);
+    PJ_ASSERT_RETURN(output->buf, PJ_EINVAL);
+
+    and_media_data = (and_media_codec_data*) codec->codec_data;
+
+    /*
+     * Step 1: unpacketize the packets/frames
+     */
+    whole_len = 0;
+    if (and_media_data->whole) {
+	for (i=0; i<count; ++i) {
+	    if (whole_len + packets[i].size > and_media_data->dec_buf_size) {
+		PJ_LOG(4,(THIS_FILE, "Decoding buffer overflow [1]"));
+		return PJMEDIA_CODEC_EFRMTOOSHORT;
+	    }
+
+	    pj_memcpy( and_media_data->dec_buf + whole_len,
+	               (pj_uint8_t*)packets[i].buf,
+	               packets[i].size);
+	    whole_len += packets[i].size;
+	}
+
+    } else {
+	h264_codec_data *h264_data = (h264_codec_data *)and_media_data->ex_data;
+
+	for (i=0; i<count; ++i) {
+
+	    if (whole_len + packets[i].size + code_size >
+                and_media_data->dec_buf_size)
+	    {
+		PJ_LOG(4,(THIS_FILE, "Decoding buffer overflow [2]"));
+		return PJMEDIA_CODEC_EFRMTOOSHORT;
+	    }
+
+	    status = pjmedia_h264_unpacketize( h264_data->pktz,
+					       (pj_uint8_t*)packets[i].buf,
+					       packets[i].size,
+					       and_media_data->dec_buf,
+					       and_media_data->dec_buf_size,
+					       &whole_len);
+	    if (status != PJ_SUCCESS) {
+		PJ_PERROR(4,(THIS_FILE, status, "Unpacketize error"));
+		continue;
+	    }
+	}
+    }
+
+    if (whole_len + code_size > and_media_data->dec_buf_size ||
+    	whole_len <= code_size + 1)
+    {
+	PJ_LOG(4,(THIS_FILE, "Decoding buffer overflow or unpacketize error "
+			     "size: %d, buffer: %d", whole_len,
+			     and_media_data->dec_buf_size));
+	return PJMEDIA_CODEC_EFRMTOOSHORT;
+    }
+
+    /* Dummy NAL sentinel */
+    pj_memcpy(and_media_data->dec_buf + whole_len, start_code, code_size);
+
+    /*
+     * Step 2: parse the individual NAL and give to decoder
+     */
+    buf_pos = 0;
+    for ( frm_cnt=0; ; ++frm_cnt) {
+	pj_uint32_t frm_size;
+	pj_bool_t write_output = PJ_FALSE;
+	unsigned char *start;
+
+	for (i = code_size - 1; buf_pos + i < whole_len; i++) {
+	    if (and_media_data->dec_buf[buf_pos + i] == 0 &&
+		and_media_data->dec_buf[buf_pos + i + 1] == 0 &&
+		and_media_data->dec_buf[buf_pos + i + 2] == 0 &&
+		and_media_data->dec_buf[buf_pos + i + 3] == 1)
+	    {
+		break;
+	    }
+	}
+
+	frm_size = i;
+	start = and_media_data->dec_buf + buf_pos;
+	write_output = (buf_pos + frm_size >= whole_len);
+
+	status = and_media_decode(codec, and_media_data, start, frm_size, 0,
+		              &packets[0].timestamp, write_output, output);
+	if (status != PJ_SUCCESS)
+	    return status;
+
+	if (write_output)
+	    break;
+
+	buf_pos += frm_size;
+    }
+
+    return PJ_SUCCESS;
+}
+
+#endif
+
+#if PJMEDIA_HAS_AND_MEDIA_VP8 || PJMEDIA_HAS_AND_MEDIA_VP9
+
+static pj_status_t open_vpx(and_media_codec_data *and_media_data)
+{
+    vpx_codec_data *vpx_data;
+    pjmedia_vid_codec_vpx_fmtp vpx_fmtp;
+    pjmedia_vpx_packetizer_cfg pktz_cfg;
+    pj_status_t status = PJ_SUCCESS;
+    unsigned max_res = MAX_RX_WIDTH;
+
+    if (!and_media_data->prm->ignore_fmtp) {
+        status = pjmedia_vid_codec_vpx_apply_fmtp(and_media_data->prm);
+	if (status != PJ_SUCCESS)
+	    return status;
+    }
+
+    vpx_data = PJ_POOL_ZALLOC_T(and_media_data->pool, vpx_codec_data);
+    if (!vpx_data)
+        return PJ_ENOMEM;
+
+    /* Parse local fmtp */
+    status = pjmedia_vid_codec_vpx_parse_fmtp(&and_media_data->prm->dec_fmtp,
+					      &vpx_fmtp);
+    if (status != PJ_SUCCESS)
+	return status;
+
+    if (vpx_fmtp.max_fs > 0) {
+    	max_res = ((int)pj_isqrt(vpx_fmtp.max_fs * 8)) * 16;
+    }
+    and_media_data->dec_buf_size = (max_res * max_res * 3 >> 1) + (max_res);
+
+    pj_bzero(&pktz_cfg, sizeof(pktz_cfg));
+    pktz_cfg.mtu = and_media_data->prm->enc_mtu;
+    pktz_cfg.fmt_id = and_media_data->prm->enc_fmt.id;
+
+    status = pjmedia_vpx_packetizer_create(and_media_data->pool, &pktz_cfg,
+                                            &vpx_data->pktz);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    and_media_data->ex_data = vpx_data;
+
+    return status;
+}
+
+static pj_status_t encode_more_vpx(and_media_codec_data *and_media_data,
+				   unsigned out_size,
+				   pjmedia_frame *output,
+				   pj_bool_t *has_more)
+{
+    pj_status_t status = PJ_SUCCESS;
+    struct vpx_codec_data *vpx_data = (vpx_codec_data *)and_media_data->ex_data;
+
+    PJ_ASSERT_RETURN(and_media_data && out_size && output && has_more,
+                     PJ_EINVAL);
+
+    if ((and_media_data->prm->enc_fmt.id != PJMEDIA_FORMAT_VP8) &&
+	(and_media_data->prm->enc_fmt.id != PJMEDIA_FORMAT_VP9))
+    {
+    	*has_more = PJ_FALSE;
+    	output->size = 0;
+    	output->type = PJMEDIA_FRAME_TYPE_NONE;
+
+	return PJ_SUCCESS;
+    }
+
+    if (and_media_data->enc_processed < and_media_data->enc_frame_size) {
+    	unsigned payload_desc_size = 1;
+    	pj_size_t payload_len = out_size;
+    	pj_uint8_t *p = (pj_uint8_t *)output->buf;
+        pj_bool_t is_keyframe = and_media_data->enc_buf_info.flags &
+        		        AND_MEDIA_FRM_TYPE_KEYFRAME;
+
+    	status = pjmedia_vpx_packetize(vpx_data->pktz,
+    				       and_media_data->enc_frame_size,
+				       &and_media_data->enc_processed,
+				       is_keyframe,
+				       &p,
+				       &payload_len);
+    	if (status != PJ_SUCCESS) {
+    	    return status;
+    	}
+        pj_memcpy(p + payload_desc_size,
+              (and_media_data->enc_frame_whole + and_media_data->enc_processed),
+              payload_len);
+        output->size = payload_len + payload_desc_size;
+        if (is_keyframe) {
+            output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
+        }
+        and_media_data->enc_processed += payload_len;
+        *has_more = (and_media_data->enc_processed <
+        	     and_media_data->enc_frame_size);
+    }
+
+    return status;
+}
+
+static pj_status_t decode_vpx(pjmedia_vid_codec *codec,
+			      pj_size_t count,
+			      pjmedia_frame packets[],
+			      unsigned out_size,
+			      pjmedia_frame *output)
+{
+    unsigned i, whole_len = 0;
+    pj_status_t status;
+    and_media_codec_data *and_media_data =
+				      (and_media_codec_data*) codec->codec_data;
+    struct vpx_codec_data *vpx_data = (vpx_codec_data *)and_media_data->ex_data;
+
+    PJ_ASSERT_RETURN(codec && count && packets && out_size && output,
+                     PJ_EINVAL);
+    PJ_ASSERT_RETURN(output->buf, PJ_EINVAL);
+
+    whole_len = 0;
+    if (and_media_data->whole) {
+	for (i = 0; i < count; ++i) {
+	    if (whole_len + packets[i].size > and_media_data->dec_buf_size) {
+		PJ_LOG(4,(THIS_FILE, "Decoding buffer overflow [1]"));
+		return PJMEDIA_CODEC_EFRMTOOSHORT;
+	    }
+
+	    pj_memcpy( and_media_data->dec_buf + whole_len,
+	               (pj_uint8_t*)packets[i].buf,
+	               packets[i].size);
+	    whole_len += packets[i].size;
+	}
+	status = and_media_decode(codec, and_media_data,
+				  and_media_data->dec_buf, whole_len, 0,
+				  &packets[0].timestamp, PJ_TRUE, output);
+
+	if (status != PJ_SUCCESS)
+	    return status;
+
+    } else {
+    	for (i = 0; i < count; ++i) {
+    	    unsigned desc_len;
+    	    unsigned packet_size = packets[i].size;
+    	    pj_status_t status;
+    	    pj_bool_t write_output;
+
+            status = pjmedia_vpx_unpacketize(vpx_data->pktz,
+        				     (pj_uint8_t *)packets[i].buf,
+                                             packet_size,
+                                             &desc_len);
+    	    if (status != PJ_SUCCESS) {
+	    	PJ_LOG(4,(THIS_FILE, "Unpacketize error packet size[%d]",
+	    		  packet_size));
+	    	return status;
+    	    }
+
+    	    packet_size -= desc_len;
+    	    if (whole_len + packet_size > and_media_data->dec_buf_size) {
+	    	PJ_LOG(4,(THIS_FILE, "Decoding buffer overflow [2]"));
+	    	return PJMEDIA_CODEC_EFRMTOOSHORT;
+            }
+
+    	    write_output = (i == count - 1);
+
+    	    status = and_media_decode(codec, and_media_data,
+    				  (pj_uint8_t *)packets[i].buf + desc_len,
+    				  packet_size, 0, &packets[0].timestamp,
+    				  write_output, output);
+    	    if (status != PJ_SUCCESS)
+    		return status;
+
+	    whole_len += packet_size;
+    	}
+    }
+    return PJ_SUCCESS;
+}
+
+#endif
+
+#endif	/* PJMEDIA_HAS_ANDROID_MEDIACODEC */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/audio_codecs.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/audio_codecs.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/audio_codecs.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/audio_codecs.c	2022-02-24 07:54:38.000000000 +0000
@@ -44,6 +44,14 @@
 
     PJ_ASSERT_RETURN(c->ilbc.mode==20 || c->ilbc.mode==30, PJ_EINVAL);
 
+#if PJMEDIA_HAS_ANDROID_MEDIACODEC
+    /* Register Android MediaCodec */
+    status = pjmedia_codec_and_media_aud_init(endpt);
+    if (status != PJ_SUCCESS) {
+	return status;
+    }
+#endif
+
 #if PJMEDIA_HAS_PASSTHROUGH_CODECS
     status = pjmedia_codec_passthrough_init2(endpt, &c->passthrough.setting);
     if (status != PJ_SUCCESS)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c	2022-02-24 07:54:38.000000000 +0000
@@ -19,6 +19,7 @@
 #include <pjmedia-codec/ffmpeg_vid_codecs.h>
 #include <pjmedia-codec/h263_packetizer.h>
 #include <pjmedia-codec/h264_packetizer.h>
+#include <pjmedia-codec/vpx_packetizer.h>
 #include <pjmedia/errno.h>
 #include <pjmedia/vid_codec_util.h>
 #include <pj/assert.h>
@@ -81,6 +82,8 @@
 #endif
 #define AVCODEC_HAS_DECODE(c)		(c->decode)
 
+/* AVCodec H264 default PT */
+#define AVC_H264_PT                       PJMEDIA_RTP_PT_H264_RSV3
 
 /* Prototypes for FFMPEG codecs factory */
 static pj_status_t ffmpeg_test_alloc( pjmedia_vid_codec_factory *factory, 
@@ -208,7 +211,7 @@
 #define FUNC_PACKETIZE(name) \
     pj_status_t(name)(ffmpeg_private *ff, pj_uint8_t *bits, \
 		      pj_size_t bits_len, unsigned *bits_pos, \
-		      const pj_uint8_t **payload, pj_size_t *payload_len)
+		      pj_uint8_t *payload, pj_size_t *payload_len, pj_bool_t is_keyframe)
 
 #define FUNC_UNPACKETIZE(name) \
     pj_status_t(name)(ffmpeg_private *ff, const pj_uint8_t *payload, \
@@ -268,6 +271,13 @@
 #define PROFILE_H264_MAIN		77
 
 /* Codec specific functions */
+#if  PJMEDIA_HAS_FFMPEG_CODEC_VP8 || PJMEDIA_HAS_FFMPEG_CODEC_VP9
+static pj_status_t vpx_preopen(ffmpeg_private *ff);
+static pj_status_t vpx_postopen(ffmpeg_private *ff);
+static FUNC_PACKETIZE(vpx_packetize);
+static FUNC_UNPACKETIZE(vpx_unpacketize);
+#endif
+
 #if PJMEDIA_HAS_FFMPEG_CODEC_H264
 static pj_status_t h264_preopen(ffmpeg_private *ff);
 static pj_status_t h264_postopen(ffmpeg_private *ff);
@@ -285,7 +295,7 @@
 {
 #if PJMEDIA_HAS_FFMPEG_CODEC_H264
     {
-	{PJMEDIA_FORMAT_H264, PJMEDIA_RTP_PT_H264, {"H264",4},
+	{PJMEDIA_FORMAT_H264, AVC_H264_PT, {"H264",4},
 	 {"Constrained Baseline (level=30, pack=1)", 39}},
 	0,
 	{720, 480},	{15, 1},	256000, 256000,
@@ -297,6 +307,30 @@
     },
 #endif
 
+#if PJMEDIA_HAS_FFMPEG_CODEC_VP8
+    {
+	{PJMEDIA_FORMAT_VP8, PJMEDIA_RTP_PT_VP8_RSV2, {"VP8",3},
+	 {"FF VP8", 6}},
+	0,
+	{720, 480},	{15, 1},	256000, 256000,
+	&vpx_packetize, &vpx_unpacketize, &vpx_preopen, &vpx_postopen, NULL,
+	{2, { {{"max-fr",6},   {"30",2}}, 
+	      {{" max-fs",7},  {"580",3}}, } },
+    },
+#endif
+
+#if PJMEDIA_HAS_FFMPEG_CODEC_VP9
+    {
+	{PJMEDIA_FORMAT_VP9, PJMEDIA_RTP_PT_VP9_RSV2, {"VP9",3},
+	 {"FF VP9", 6}},
+	0,
+	{720, 480},	{15, 1},	256000, 256000,
+	&vpx_packetize, &vpx_unpacketize, &vpx_preopen, &vpx_postopen, NULL,
+	{2, { {{"max-fr",6},   {"30",2}}, 
+	      {{" max-fs",7},  {"580",3}}, } },
+    },
+#endif
+
 #if PJMEDIA_HAS_FFMPEG_CODEC_H263P
     {
 	{PJMEDIA_FORMAT_H263P, PJMEDIA_RTP_PT_H263P, {"H263-1998",9}},
@@ -324,6 +358,102 @@
     },
 };
 
+#if PJMEDIA_HAS_FFMPEG_CODEC_VP8 || PJMEDIA_HAS_FFMPEG_CODEC_VP9
+typedef struct vpx_data
+{
+    pjmedia_vpx_packetizer *pktz;
+} vpx_data;
+
+static pj_status_t vpx_preopen(ffmpeg_private *ff)
+{
+    vpx_data *data;
+    pjmedia_vpx_packetizer_cfg pktz_cfg;
+    pj_status_t status;
+
+    data = PJ_POOL_ZALLOC_T(ff->pool, vpx_data);
+    ff->data = data;
+
+    /* Parse local fmtp */
+    if (!ff->param.ignore_fmtp)
+    {
+        pjmedia_vid_codec_vpx_fmtp vpx_fmtp;
+        const unsigned MAX_RX_RES = 1200;
+        unsigned max_res = MAX_RX_RES;
+
+        status = pjmedia_vid_codec_vpx_parse_fmtp(&ff->param.dec_fmtp, &vpx_fmtp);
+        if (status != PJ_SUCCESS)
+        {
+            PJ_LOG(2, (THIS_FILE, "Parse vpx fmtp fail, status:%d", status));
+            return status;
+        }
+        if (vpx_fmtp.max_fs > 0)
+        {
+            max_res = ((int)pj_isqrt(vpx_fmtp.max_fs * 8)) * 16;
+        }
+        ff->dec_buf_size = (max_res * max_res * 3 >> 1) + (max_res);
+    }
+
+    /* Create packetizer */
+    pktz_cfg.fmt_id = ff->desc->info.fmt_id;
+    pktz_cfg.mtu = ff->param.enc_mtu;
+    status = pjmedia_vpx_packetizer_create(ff->pool, &pktz_cfg, &data->pktz);
+    if (status != PJ_SUCCESS)
+    {
+        return status;
+    }
+
+    return PJ_SUCCESS;
+}
+
+static pj_status_t vpx_postopen(ffmpeg_private *ff)
+{
+    vpx_data *data = (vpx_data *)ff->data;
+    PJ_UNUSED_ARG(data);
+    return PJ_SUCCESS;
+}
+
+static FUNC_PACKETIZE(vpx_packetize)
+{
+    vpx_data *data = (vpx_data *)ff->data;
+    pj_status_t status;
+    unsigned payload_desc_size = 1;
+    pj_uint8_t *outbuf = payload;
+    pj_size_t out_size = *payload_len;
+    out_size -= payload_desc_size;
+
+    status = pjmedia_vpx_packetize(data->pktz, bits_len, bits_pos, is_keyframe,
+                                   &outbuf, &out_size);
+    if (status != PJ_SUCCESS)
+        return status;
+    pj_memcpy(outbuf + payload_desc_size, bits + *bits_pos, out_size);
+    *payload_len = out_size + payload_desc_size;
+    *bits_pos += out_size;
+    return PJ_SUCCESS;
+}
+
+static FUNC_UNPACKETIZE(vpx_unpacketize)
+{
+    vpx_data *data = (vpx_data *)ff->data;
+    unsigned desc_len = 0;
+    pj_status_t status;
+    unsigned pos = *bits_pos;
+    status = pjmedia_vpx_unpacketize(data->pktz, payload, payload_len, &desc_len);
+    if (status != PJ_SUCCESS)
+        return status;
+    payload_len -= desc_len;
+    if (pos + payload_len > bits_len)
+    {
+        PJ_LOG(2, (THIS_FILE, "Vpx unpacketize buffer overflow"));
+        return PJMEDIA_CODEC_EFRMTOOSHORT;
+    }
+
+    pj_memcpy(bits + pos, (char *)payload + desc_len, payload_len);
+    pos += payload_len;
+    *bits_pos = pos;
+    return PJ_SUCCESS;
+}
+#endif  // PJMEDIA_HAS_FFMPEG_CODEC_VP8/VP9
+
 #if PJMEDIA_HAS_FFMPEG_CODEC_H264
 
 typedef struct h264_data
@@ -473,8 +603,17 @@
 static FUNC_PACKETIZE(h264_packetize)
 {
     h264_data *data = (h264_data*)ff->data;
-    return pjmedia_h264_packetize(data->pktz, bits, bits_len, bits_pos,
-				  payload, payload_len);
+    pj_status_t status;
+    pj_uint8_t *outbuf = payload;
+    pj_size_t out_size = *payload_len;
+    status = pjmedia_h264_packetize(data->pktz, bits, bits_len, bits_pos,
+				  &payload, payload_len);
+    if (status != PJ_SUCCESS)
+        return status;
+    if (out_size < *payload_len)
+        return PJMEDIA_CODEC_EFRMTOOSHORT;
+    pj_memcpy(outbuf, payload, *payload_len);
+    return PJ_SUCCESS;
 }
 
 static FUNC_UNPACKETIZE(h264_unpacketize)
@@ -537,8 +676,17 @@
 static FUNC_PACKETIZE(h263_packetize)
 {
     h263_data *data = (h263_data*)ff->data;
-    return pjmedia_h263_packetize(data->pktz, bits, bits_len, bits_pos,
-				  payload, payload_len);
+    pj_status_t status;
+    pj_uint8_t *outbuf = payload;
+    pj_size_t out_size = *payload_len;
+    status = pjmedia_h263_packetize(data->pktz, bits, bits_len, bits_pos,
+				  &payload, payload_len);
+    if (status != PJ_SUCCESS)
+        return status;
+    if (out_size < *payload_len)
+        return PJMEDIA_CODEC_EFRMTOOSHORT;
+    pj_memcpy(outbuf, payload, *payload_len);
+    return PJ_SUCCESS;
 }
 
 static FUNC_UNPACKETIZE(h263_unpacketize)
@@ -1294,7 +1442,7 @@
 	ff->enc_buf_size = (unsigned)ff->enc_vafp.framebytes;
 	ff->enc_buf = pj_pool_alloc(ff->pool, ff->enc_buf_size);
 
-	ff->dec_buf_size = (unsigned)ff->dec_vafp.framebytes;
+	ff->dec_buf_size = PJ_MAX((unsigned)ff->dec_vafp.framebytes, ff->dec_buf_size);
 	ff->dec_buf = pj_pool_alloc(ff->pool, ff->dec_buf_size);
     }
 
@@ -1371,14 +1519,14 @@
                                        pj_uint8_t *bits,
                                        pj_size_t bits_len,
                                        unsigned *bits_pos,
-                                       const pj_uint8_t **payload,
-                                       pj_size_t *payload_len)
+                                       pj_uint8_t *payload,
+                                       pj_size_t *payload_len, pj_bool_t is_keyframe)
 {
     ffmpeg_private *ff = (ffmpeg_private*)codec->codec_data;
 
     if (ff->desc->packetize) {
 	return (*ff->desc->packetize)(ff, bits, bits_len, bits_pos,
-                                      payload, payload_len);
+                                      payload, payload_len, is_keyframe);
     }
 
     return PJ_ENOTSUP;
@@ -1451,6 +1599,12 @@
         p += ff->enc_vafp.plane_bytes[i[0]];
     }
 
+#if LIBAVCODEC_VER_AT_LEAST(58,134)
+    avframe.height = ff->enc_ctx->height;
+    avframe.width = ff->enc_ctx->width;
+    avframe.format = ff->enc_ctx->pix_fmt;
+#endif
+
     /* Force keyframe */
     if (opt && opt->force_keyframe) {
 #if LIBAVCODEC_VER_AT_LEAST(53,20)
@@ -1510,9 +1664,6 @@
 					   output);
     } else {
 	pjmedia_frame whole_frm;
-        const pj_uint8_t *payload;
-        pj_size_t payload_len;
-
 	pj_bzero(&whole_frm, sizeof(whole_frm));
 	whole_frm.buf = ff->enc_buf;
 	whole_frm.size = ff->enc_buf_size;
@@ -1526,23 +1677,7 @@
 				   PJMEDIA_VID_FRM_KEYFRAME);
 	ff->enc_frame_len = (unsigned)whole_frm.size;
 	ff->enc_processed = 0;
-        status = ffmpeg_packetize(codec, (pj_uint8_t*)whole_frm.buf,
-                                  whole_frm.size, &ff->enc_processed,
-				  &payload, &payload_len);
-        if (status != PJ_SUCCESS)
-            return status;
-
-        if (out_size < payload_len)
-            return PJMEDIA_CODEC_EFRMTOOSHORT;
-
-        output->type = PJMEDIA_FRAME_TYPE_VIDEO;
-        pj_memcpy(output->buf, payload, payload_len);
-        output->size = payload_len;
-
-	if (ff->enc_buf_is_keyframe)
-	    output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
-
-        *has_more = (ff->enc_processed < ff->enc_frame_len);
+	status = ffmpeg_codec_encode_more(codec, out_size, output, has_more);
     }
 
     return status;
@@ -1554,8 +1689,8 @@
 					    pj_bool_t *has_more)
 {
     ffmpeg_private *ff = (ffmpeg_private*)codec->codec_data;
-    const pj_uint8_t *payload;
-    pj_size_t payload_len;
+    pj_uint8_t *payload = (pj_uint8_t *)output->buf;
+    pj_size_t payload_len = (pj_size_t) out_size;
     pj_status_t status;
 
     *has_more = PJ_FALSE;
@@ -1567,15 +1702,11 @@
 
     status = ffmpeg_packetize(codec, (pj_uint8_t*)ff->enc_buf,
                               ff->enc_frame_len, &ff->enc_processed,
-                              &payload, &payload_len);
+                              payload, &payload_len, ff->enc_buf_is_keyframe);
     if (status != PJ_SUCCESS)
         return status;
 
-    if (out_size < payload_len)
-        return PJMEDIA_CODEC_EFRMTOOSHORT;
-
     output->type = PJMEDIA_FRAME_TYPE_VIDEO;
-    pj_memcpy(output->buf, payload, payload_len);
     output->size = payload_len;
 
     if (ff->enc_buf_is_keyframe)
@@ -1710,7 +1841,16 @@
      * Normally, encoded buffer is allocated more than needed, so lets just
      * bzero the input buffer end/pad, hope it will be just fine.
      */
+#if LIBAVCODEC_VER_AT_LEAST(56,35)
+    /* 2015-07-27 - lavc 56.56.100 / 56.35.0 - avcodec.h
+    *  29d147c / 059a9348 
+    * - Rename FF_INPUT_BUFFER_PADDING_SIZE and FF_MIN_BUFFER_SIZE
+    *   to AV_INPUT_BUFFER_PADDING_SIZE and AV_INPUT_BUFFER_MIN_SIZE.
+    */
+    pj_bzero(avpacket.data+avpacket.size, AV_INPUT_BUFFER_PADDING_SIZE);
+#else
     pj_bzero(avpacket.data+avpacket.size, FF_INPUT_BUFFER_PADDING_SIZE);
+#endif
 
     output->bit_info = 0;
     output->timestamp = input->timestamp;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/g722.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/g722.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/g722.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/g722.c	2022-02-24 07:54:38.000000000 +0000
@@ -54,7 +54,6 @@
 #   define TRACE_(expr)
 #endif
 
-
 /* Prototypes for G722 factory */
 static pj_status_t g722_test_alloc(pjmedia_codec_factory *factory, 
 				   const pjmedia_codec_info *id );
@@ -174,8 +173,9 @@
     g722_codec_factory.endpt = endpt;
     g722_codec_factory.pcm_shift = PJMEDIA_G722_DEFAULT_PCM_SHIFT;
 
-    g722_codec_factory.pool = pjmedia_endpt_create_pool(endpt, "g722", 1000, 
-						        1000);
+    g722_codec_factory.pool = pjmedia_endpt_create_pool(endpt, "g722",
+						        PJMEDIA_POOL_LEN_G722_CODEC,
+						        PJMEDIA_POOL_INC_G722_CODEC);
     if (!g722_codec_factory.pool)
 	return PJ_ENOMEM;
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/ilbc.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/ilbc.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/ilbc.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/ilbc.c	2022-02-24 07:54:38.000000000 +0000
@@ -595,7 +595,7 @@
 	frames[count].type = PJMEDIA_FRAME_TYPE_AUDIO;
 	frames[count].buf = pkt;
 	frames[count].size = ilbc_codec->dec_frame_size;
-	frames[count].timestamp.u64 = ts->u64 + count * 
+	frames[count].timestamp.u64 = ts->u64 + (pj_uint64_t)count * 
 				      ilbc_codec->dec_samples_per_frame;
 
 	pkt = ((char*)pkt) + ilbc_codec->dec_frame_size;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/ipp_codecs.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/ipp_codecs.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/ipp_codecs.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/ipp_codecs.c	2022-02-24 07:54:38.000000000 +0000
@@ -939,6 +939,7 @@
     }
     if (idx == -1) {
 	*p_codec = NULL;
+	pj_mutex_unlock(ipp_factory.mutex);
 	return PJMEDIA_CODEC_EFAILED;
     }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/openh264.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/openh264.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/openh264.cpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/openh264.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -56,6 +56,14 @@
 #define MAX_RX_WIDTH		1200
 #define MAX_RX_HEIGHT		800
 
+/* OpenH264 default PT */
+#define OH264_PT                PJMEDIA_RTP_PT_H264
+
+/* Minimum interval (in msec) between generating two missing keyframe events.
+ * This is to avoid sending too many events during consecutive decode
+ * failures.
+ */
+#define MISSING_KEYFRAME_EV_MIN_INTERVAL	1000
 
 /*
  * Factory operations.
@@ -159,6 +167,8 @@
     ISVCDecoder			*dec;
     pj_uint8_t			*dec_buf;
     unsigned			 dec_buf_size;
+    unsigned			 missing_kf_interval;
+    unsigned			 last_missing_kf_event;
 } oh264_codec_data;
 
 struct SLayerPEncCtx
@@ -248,7 +258,7 @@
     PJ_ASSERT_RETURN(factory == &oh264_factory.base, PJ_EINVAL);
 
     if (info->fmt_id == PJMEDIA_FORMAT_H264 &&
-	info->pt != 0)
+	info->pt == OH264_PT)
     {
 	return PJ_SUCCESS;
     }
@@ -304,7 +314,7 @@
 
     *count = 1;
     info->fmt_id = PJMEDIA_FORMAT_H264;
-    info->pt = PJMEDIA_RTP_PT_H264;
+    info->pt = OH264_PT;
     info->encoding_name = pj_str((char*)"H264");
     info->encoding_desc = pj_str((char*)"OpenH264 codec");
     info->clock_rate = 90000;
@@ -584,15 +594,17 @@
     sDecParam.eEcActiveIdc          	= ERROR_CON_SLICE_COPY;
     sDecParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
 
+    /* Calculate minimum missing keyframe event interval in frames. */
+    oh264_data->missing_kf_interval =
+	(unsigned)((1.0f * param->dec_fmt.det.vid.fps.num /
+	param->dec_fmt.det.vid.fps.denum) *
+	MISSING_KEYFRAME_EV_MIN_INTERVAL/1000);
+    oh264_data->last_missing_kf_event = oh264_data->missing_kf_interval;
+
     //TODO:
     // Apply "sprop-parameter-sets" here
 
-    rc = WelsCreateDecoder(&oh264_data->dec);
-    if (rc) {
-	PJ_LOG(4,(THIS_FILE, "Unable to create OpenH264 decoder"));
-	return PJMEDIA_CODEC_EFAILED;
-    }
-
+    /* Initialize decoder */
     rc = oh264_data->dec->Initialize (&sDecParam);
     if (rc) {
 	PJ_LOG(4,(THIS_FILE, "Decoder initialization failed, rc=%d", rc));
@@ -890,7 +902,7 @@
     if (i < iHeight)
 	return -1;
 
-    return dst - buf;
+    return (int)(dst - buf);
 }
 
 static pj_status_t oh264_got_decoded_frame(pjmedia_vid_codec *codec,
@@ -972,6 +984,7 @@
     const pj_uint8_t nal_start[] = { 0, 0, 1 };
     SBufferInfo sDstBufInfo;
     pj_bool_t has_frame = PJ_FALSE;
+    pj_bool_t kf_requested = PJ_FALSE;
     unsigned buf_pos, whole_len = 0;
     unsigned i, frm_cnt;
     pj_status_t status = PJ_SUCCESS;
@@ -982,6 +995,10 @@
     PJ_ASSERT_RETURN(output->buf, PJ_EINVAL);
 
     oh264_data = (oh264_codec_data*) codec->codec_data;
+    oh264_data->last_missing_kf_event++;
+    /* Check if we have recently generated missing keyframe event. */
+    if (oh264_data->last_missing_kf_event < oh264_data->missing_kf_interval)
+    	kf_requested = PJ_TRUE;
 
     /*
      * Step 1: unpacketize the packets/frames
@@ -997,7 +1014,7 @@
 	    pj_memcpy( oh264_data->dec_buf + whole_len,
 	               (pj_uint8_t*)packets[i].buf,
 	               packets[i].size);
-	    whole_len += packets[i].size;
+	    whole_len += (unsigned)packets[i].size;
 	}
 
     } else {
@@ -1056,7 +1073,19 @@
 	start = oh264_data->dec_buf + buf_pos;
 
 	/* Decode */
-	oh264_data->dec->DecodeFrame2( start, frm_size, pData, &sDstBufInfo);
+	ret = oh264_data->dec->DecodeFrame2( start, frm_size, pData,
+					     &sDstBufInfo);
+
+	if (ret != dsErrorFree && !kf_requested) {
+	    /* Broadcast missing keyframe event */
+	    pjmedia_event event;
+	    pjmedia_event_init(&event, PJMEDIA_EVENT_KEYFRAME_MISSING,
+			       &packets[0].timestamp, codec);
+	    pjmedia_event_publish(NULL, codec, &event,
+				  PJMEDIA_EVENT_PUBLISH_DEFAULT);
+	    kf_requested = PJ_TRUE;
+	    oh264_data->last_missing_kf_event = 0;
+	}
 
 	if (0 && sDstBufInfo.iBufferStatus == 1) {
 	    // Better to just get the frame later after all NALs are consumed
@@ -1100,13 +1129,15 @@
     }
 
     if (ret != dsErrorFree) {
-	pjmedia_event event;
-
-	/* Broadcast missing keyframe event */
-	pjmedia_event_init(&event, PJMEDIA_EVENT_KEYFRAME_MISSING,
-	                   &packets[0].timestamp, codec);
-	pjmedia_event_publish(NULL, codec, &event,
-	                      PJMEDIA_EVENT_PUBLISH_DEFAULT);
+	if (!kf_requested) {
+	    /* Broadcast missing keyframe event */
+	    pjmedia_event event;
+	    pjmedia_event_init(&event, PJMEDIA_EVENT_KEYFRAME_MISSING,
+	                       &packets[0].timestamp, codec);
+	    pjmedia_event_publish(NULL, codec, &event,
+				  PJMEDIA_EVENT_PUBLISH_DEFAULT);
+	    oh264_data->last_missing_kf_event = 0;
+	}
 
 	if (has_frame) {
 	    PJ_LOG(5,(oh264_data->pool->obj_name,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/opus.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/opus.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/opus.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/opus.c	2022-02-24 07:54:38.000000000 +0000
@@ -723,6 +723,7 @@
 			    OPUS_APPLICATION_VOIP);
     if (err != OPUS_OK) {
 	PJ_LOG(2, (THIS_FILE, "Unable to create encoder"));
+	pj_mutex_unlock (opus_data->mutex);
 	return PJMEDIA_CODEC_EFAILED;
     }
     
@@ -767,6 +768,7 @@
 			     attr->info.channel_cnt);
     if (err != OPUS_OK) {
 	PJ_LOG(2, (THIS_FILE, "Unable to initialize decoder"));
+	pj_mutex_unlock (opus_data->mutex);
 	return PJMEDIA_CODEC_EFAILED;
     }
 
@@ -861,25 +863,43 @@
     opus_repacketizer_cat(opus_data->dec_packer, tmp_buf, pkt_size);
 
     num_frames = opus_repacketizer_get_nb_frames(opus_data->dec_packer);
+    if (num_frames == 0) {
+      PJ_LOG(2, (THIS_FILE, "No frames retrieved (num_frames = 0)"));
+      pj_mutex_unlock(opus_data->mutex);
+      return PJMEDIA_CODEC_EFAILED;
+    }
+
     out_pos = 0;
     for (i = 0; i < num_frames; ++i) {
 	size = opus_repacketizer_out_range(opus_data->dec_packer, i, i+1,
 					   ((unsigned char*)pkt) + out_pos,
 					   sizeof(tmp_buf));
 	if (size < 0) {
-	    PJ_LOG(5, (THIS_FILE, "Parse failed! (%d)", pkt_size));
+	    PJ_LOG(5, (THIS_FILE, "Parse failed! (pkt_size=%d, err=%d)",
+		       pkt_size, size));
             pj_mutex_unlock (opus_data->mutex);
 	    return PJMEDIA_CODEC_EFAILED;
 	}
 	frames[i].type = PJMEDIA_FRAME_TYPE_AUDIO;
 	frames[i].buf = ((char*)pkt) + out_pos;
 	frames[i].size = size;
-	frames[i].bit_info = opus_packet_get_nb_samples(frames[i].buf,
-			     frames[i].size, opus_data->cfg.sample_rate);
+	frames[i].bit_info = 0;
 
 	if (i == 0) {
-    	    unsigned ptime = frames[i].bit_info * 1000 /
-    	    		     opus_data->cfg.sample_rate;
+	    int nsamples;
+	    unsigned ptime;
+
+	    nsamples = opus_packet_get_nb_samples(frames[i].buf,
+						  frames[i].size,
+						  opus_data->cfg.sample_rate);
+	    if (nsamples <= 0) {
+		PJ_LOG(5, (THIS_FILE, "Parse failed to get samples number! "
+				      "(err=%d)", nsamples));
+		pj_mutex_unlock (opus_data->mutex);
+		return PJMEDIA_CODEC_EFAILED;
+	    }
+
+	    ptime = nsamples * 1000 / opus_data->cfg.sample_rate;
     	    if (ptime != opus_data->dec_ptime) {
              	PJ_LOG(4, (THIS_FILE, "Opus ptime change detected: %d ms "
              			      "--> %d ms",
@@ -888,9 +908,9 @@
         	opus_data->dec_frame_index = -1;
 
         	/* Signal to the stream about ptime change. */
-     	    	frames[i].bit_info |= 0x10000;
+		frames[i].bit_info = 0x10000 | nsamples;
     	    }
-     	    samples_per_frame = frames[i].bit_info;
+	    samples_per_frame = nsamples;
    	}
 
 	frames[i].timestamp.u64 = ts->u64 + i * samples_per_frame;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/passthrough.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/passthrough.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/passthrough.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/passthrough.c	2022-02-24 07:54:38.000000000 +0000
@@ -625,6 +625,7 @@
     }
     if (idx == -1) {
 	*p_codec = NULL;
+	pj_mutex_unlock(codec_factory.mutex);
 	return PJMEDIA_CODEC_EUNSUP;
     }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/speex_codec.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/speex_codec.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/speex_codec.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/speex_codec.c	2022-02-24 07:54:38.000000000 +0000
@@ -379,6 +379,7 @@
     if (!codec_mgr) {
 	pj_pool_release(spx_factory.pool);
 	spx_factory.pool = NULL;
+	pj_mutex_unlock(spx_factory.mutex);
 	return PJ_EINVALIDOP;
     }
 
@@ -851,7 +852,8 @@
 	/* Bit info contains start bit offset of the frame */
 	frames[count].bit_info = bit_ptr;
 	frames[count].type = PJMEDIA_FRAME_TYPE_AUDIO;
-	frames[count].timestamp.u64 = ts->u64 + count * samples_per_frame;
+	frames[count].timestamp.u64 = ts->u64 +
+				      (pj_uint64_t)count * samples_per_frame;
 	frames[count].size = spx->dec_bits.charPtr - char_ptr;
 	if (spx->dec_bits.bitPtr)
 	    ++frames[count].size;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/vid_toolbox.m asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/vid_toolbox.m
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/vid_toolbox.m	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/vid_toolbox.m	2022-02-24 07:54:38.000000000 +0000
@@ -59,8 +59,10 @@
 #define DECODE_WHOLE		PJ_TRUE
 
 /* Maximum duration from one key frame to the next (in seconds). */
-#define KEYFRAME_INTERVAL	5
+#define KEYFRAME_INTERVAL	PJMEDIA_CODEC_VID_TOOLBOX_MAX_KEYFRAME_INTERVAL
 
+/* vidtoolbox H264 default PT */
+#define VT_H264_PT		PJMEDIA_RTP_PT_H264_RSV1
 /*
  * Factory operations.
  */
@@ -167,6 +169,7 @@
     pj_uint8_t			*dec_buf;
     unsigned			 dec_buf_size;
     CMFormatDescriptionRef	 dec_format;
+    OSStatus             dec_status;
 
     unsigned			 dec_sps_size;
     unsigned			 dec_pps_size;
@@ -180,6 +183,7 @@
 /* Prototypes */
 static OSStatus create_decoder(struct vtool_codec_data *vtool_data);
 
+#if TARGET_OS_IPHONE
 static void dispatch_sync_on_main_queue(void (^block)(void))
 {
     if ([NSThread isMainThread]) {
@@ -188,6 +192,7 @@
         dispatch_sync(dispatch_get_main_queue(), block);
     }
 }
+#endif
 
 PJ_DEF(pj_status_t) pjmedia_codec_vid_toolbox_init(pjmedia_vid_codec_mgr *mgr,
                                                    pj_pool_factory *pf)
@@ -265,7 +270,7 @@
     PJ_ASSERT_RETURN(factory == &vtool_factory.base, PJ_EINVAL);
 
     if (info->fmt_id == PJMEDIA_FORMAT_H264 &&
-	info->pt != 0)
+	info->pt == VT_H264_PT)
     {
 	return PJ_SUCCESS;
     }
@@ -321,7 +326,7 @@
 
     *count = 1;
     info->fmt_id = PJMEDIA_FORMAT_H264;
-    info->pt = PJMEDIA_RTP_PT_H264;
+    info->pt = VT_H264_PT;
     info->encoding_name = pj_str((char*)"H264");
     info->encoding_desc = pj_str((char*)"Video Toolbox codec");
     info->clock_rate = 90000;
@@ -1018,10 +1023,10 @@
     /* This callback can be called from another, unregistered thread.
      * So do not call pjlib functions here.
      */
-
-    if (status != noErr) return;
-
     vtool_data = (struct vtool_codec_data *)decompressionOutputRefCon;
+    vtool_data->dec_status = status;
+    if (vtool_data->dec_status != noErr)
+        return;
 
     CVPixelBufferLockBaseAddress(imageBuffer,0);
     
@@ -1315,10 +1320,13 @@
 		    }
 		}
 
-		if (ret != noErr) {
+		if ((ret != noErr) || (vtool_data->dec_status != noErr)) {
+            char *ret_err = (ret != noErr)?"decode err":"cb err";
+            OSStatus err_code = (ret != noErr)?ret:vtool_data->dec_status;
+
 		    PJ_LOG(5,(THIS_FILE, "Failed to decode frame %d of size "
-		    			 "%d: %d", nalu_type, frm_size,
-		    			 ret));
+                                 "%d %s:%d", nalu_type, frm_size, ret_err,
+                                 err_code));
 		} else {
     		    has_frame = PJ_TRUE;
     		    output->type = PJMEDIA_FRAME_TYPE_VIDEO;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/vpx.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/vpx.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/vpx.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/vpx.c	2022-02-24 07:54:38.000000000 +0000
@@ -30,6 +30,8 @@
 #   pragma comment( lib, "vpx.lib")
 #endif
 
+#include <pjmedia-codec/vpx_packetizer.h>
+
 /* VPX */
 #include <vpx/vpx_encoder.h>
 #include <vpx/vpx_decoder.h>
@@ -56,6 +58,10 @@
 
 #define MAX_RX_RES		1200
 
+/* VPX VP8 default PT */
+#define VPX_VP8_PT		PJMEDIA_RTP_PT_VP8
+/* VPX VP9 default PT */
+#define VPX_VP9_PT		PJMEDIA_RTP_PT_VP9
 
 /*
  * Factory operations.
@@ -142,6 +148,7 @@
     pj_pool_t			*pool;
     pjmedia_vid_codec_param	*prm;
     pj_bool_t			 whole;
+    pjmedia_vpx_packetizer	*pktz;
 
     /* Encoder */
     vpx_codec_iface_t 		*(*enc_if)();
@@ -229,8 +236,8 @@
 {
     PJ_ASSERT_RETURN(factory == &vpx_factory.base, PJ_EINVAL);
 
-    if ((info->fmt_id == PJMEDIA_FORMAT_VP8 ||
-         info->fmt_id == PJMEDIA_FORMAT_VP9) && info->pt != 0)
+    if (((info->fmt_id == PJMEDIA_FORMAT_VP8) && (info->pt == VPX_VP8_PT)) ||
+        ((info->fmt_id == PJMEDIA_FORMAT_VP9) && (info->pt == VPX_VP9_PT)))
     {
 	return PJ_SUCCESS;
     }
@@ -291,7 +298,7 @@
 
 #if PJMEDIA_HAS_VPX_CODEC_VP8
     info[i].fmt_id = PJMEDIA_FORMAT_VP8;
-    info[i].pt = PJMEDIA_RTP_PT_VP8;
+    info[i].pt = VPX_VP8_PT;
     info[i].encoding_name = pj_str((char*)"VP8");
     info[i].encoding_desc = pj_str((char*)"VPX VP8 codec");
     i++;
@@ -300,7 +307,7 @@
 #if PJMEDIA_HAS_VPX_CODEC_VP9
     if (i + 1 < *count) {
     	info[i].fmt_id = PJMEDIA_FORMAT_VP9;
-    	info[i].pt = PJMEDIA_RTP_PT_VP9;
+        info[i].pt = VPX_VP9_PT;
     	info[i].encoding_name = pj_str((char*)"VP9");
     	info[i].encoding_desc = pj_str((char*)"VPX VP9 codec");
     	i++;
@@ -401,6 +408,7 @@
     pjmedia_vid_codec_vpx_fmtp   vpx_fmtp;
     vpx_codec_enc_cfg_t cfg;
     vpx_codec_err_t res;
+    pjmedia_vpx_packetizer_cfg  pktz_cfg;
     unsigned max_res = MAX_RX_RES;
     pj_status_t	status;
 
@@ -497,6 +505,15 @@
     /* Need to update param back after values are negotiated */
     pj_memcpy(codec_param, param, sizeof(*codec_param));
 
+    pj_bzero(&pktz_cfg, sizeof(pktz_cfg));
+    pktz_cfg.mtu = param->enc_mtu;
+    pktz_cfg.fmt_id = param->enc_fmt.id;
+
+    status = pjmedia_vpx_packetizer_create(vpx_data->pool, &pktz_cfg,
+                                           &vpx_data->pktz);
+    if (status != PJ_SUCCESS)
+        return status;
+
     return PJ_SUCCESS;
 }
 
@@ -636,6 +653,7 @@
                                          pj_bool_t *has_more)
 {
     struct vpx_codec_data *vpx_data;
+    pj_status_t status = PJ_SUCCESS;
 
     PJ_ASSERT_RETURN(codec && out_size && output && has_more,
                      PJ_EINVAL);
@@ -644,156 +662,36 @@
     
     if (vpx_data->enc_processed < vpx_data->enc_frame_size) {
     	unsigned payload_desc_size = 1;
-        unsigned max_size = vpx_data->prm->enc_mtu - payload_desc_size;
-        unsigned remaining_size = vpx_data->enc_frame_size -
-        			  vpx_data->enc_processed;
-        unsigned payload_len = PJ_MIN(remaining_size, max_size);
-        pj_uint8_t *p = (pj_uint8_t *)output->buf;
+    	pj_size_t payload_len = out_size;
+    	pj_uint8_t *p = (pj_uint8_t *)output->buf;
 
-	if (payload_len + payload_desc_size > out_size)
-	    return PJMEDIA_CODEC_EFRMTOOSHORT;
+    	status = pjmedia_vpx_packetize(vpx_data->pktz,
+				       vpx_data->enc_frame_size,
+				       &vpx_data->enc_processed,
+				       vpx_data->enc_frame_is_keyframe,
+				       &p,
+				       &payload_len);
 
+    	if (status != PJ_SUCCESS) {
+    	    return status;
+    	}
+        pj_memcpy(p + payload_desc_size,
+        	  (vpx_data->enc_frame_whole + vpx_data->enc_processed),
+        	  payload_len);
+        output->size = payload_len + payload_desc_size;
         output->timestamp = vpx_data->ets;
         output->type = PJMEDIA_FRAME_TYPE_VIDEO;
         output->bit_info = 0;
         if (vpx_data->enc_frame_is_keyframe) {
             output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
         }
-
-        /* Set payload header */
-        p[0] = 0;
-        if (vpx_data->prm->enc_fmt.id == PJMEDIA_FORMAT_VP8) {
-	    /* Set N: Non-reference frame */
-            if (!vpx_data->enc_frame_is_keyframe) p[0] |= 0x20;
-            /* Set S: Start of VP8 partition. */
-            if (vpx_data->enc_processed == 0) p[0] |= 0x10;
-        } else if (vpx_data->prm->enc_fmt.id == PJMEDIA_FORMAT_VP9) {
-	    /* Set P: Inter-picture predicted frame */
-            if (!vpx_data->enc_frame_is_keyframe) p[0] |= 0x40;
-            /* Set B: Start of a frame */
-            if (vpx_data->enc_processed == 0) p[0] |= 0x8;
-            /* Set E: End of a frame */
-            if (vpx_data->enc_processed + payload_len ==
-            	vpx_data->enc_frame_size)
-            {
-	    	p[0] |= 0x4;
-	    }
-	}
-
-        pj_memcpy(p + payload_desc_size,
-        	  (vpx_data->enc_frame_whole + vpx_data->enc_processed),
-        	  payload_len);
-        output->size = payload_len + payload_desc_size;
-
         vpx_data->enc_processed += payload_len;
         *has_more = (vpx_data->enc_processed < vpx_data->enc_frame_size);
     }
 
-    return PJ_SUCCESS;
-}
-
-
-static pj_status_t vpx_unpacketize(struct vpx_codec_data *vpx_data,
-				   const pj_uint8_t *buf,
-                                   pj_size_t   packet_size,
-				   unsigned   *p_desc_len)
-{
-    unsigned desc_len = 1;
-    pj_uint8_t *p = (pj_uint8_t *)buf;
-
-#define INC_DESC_LEN() {if (++desc_len >= packet_size) return PJ_ETOOSMALL;}
-
-    if (packet_size <= desc_len) return PJ_ETOOSMALL;
-
-    if (vpx_data->prm->enc_fmt.id == PJMEDIA_FORMAT_VP8) {
-        /*  0 1 2 3 4 5 6 7
-         * +-+-+-+-+-+-+-+-+
-         * |X|R|N|S|R| PID | (REQUIRED)
-         */
-	/* X: Extended control bits present. */
-	if (p[0] & 0x80) {
-	    INC_DESC_LEN();
-	    /* |I|L|T|K| RSV   | */
-	    /* I: PictureID present. */
-	    if (p[1] & 0x80) {
-	    	INC_DESC_LEN();
-	    	/* If M bit is set, the PID field MUST contain 15 bits. */
-	    	if (p[2] & 0x80) INC_DESC_LEN();
-	    }
-	    /* L: TL0PICIDX present. */
-	    if (p[1] & 0x40) INC_DESC_LEN();
-	    /* T: TID present or K: KEYIDX present. */
-	    if ((p[1] & 0x20) || (p[1] & 0x10)) INC_DESC_LEN();
-	}
-
-    } else if (vpx_data->prm->enc_fmt.id == PJMEDIA_FORMAT_VP9) {
-        /*  0 1 2 3 4 5 6 7
-         * +-+-+-+-+-+-+-+-+
-         * |I|P|L|F|B|E|V|-| (REQUIRED)
-         */
-        /* I: Picture ID (PID) present. */
-	if (p[0] & 0x80) {
-	    INC_DESC_LEN();
-	    /* If M bit is set, the PID field MUST contain 15 bits. */
-	    if (p[1] & 0x80) INC_DESC_LEN();
-	}
-	/* L: Layer indices present. */
-	if (p[0] & 0x20) {
-	    INC_DESC_LEN();
-	    if (!(p[0] & 0x10)) INC_DESC_LEN();
-	}
-	/* F: Flexible mode.
-	 * I must also be set to 1, and if P is set, there's up to 3
-	 * reference index.
-	 */
-	if ((p[0] & 0x10) && (p[0] & 0x80) && (p[0] & 0x40)) {
-	    unsigned char *q = p + desc_len;
-
-	    INC_DESC_LEN();
-	    if (*q & 0x1) {
-	    	q++;
-	    	INC_DESC_LEN();
-	    	if (*q & 0x1) {
-	    	    q++;
-	    	    INC_DESC_LEN();
-	    	}
-	    }
-	}
-	/* V: Scalability structure (SS) data present. */
-	if (p[0] & 0x2) {
-	    unsigned char *q = p + desc_len;
-	    unsigned N_S = (*q >> 5) + 1;
-	    
-	    INC_DESC_LEN();
-	    /* Y: Each spatial layer's frame resolution present. */
-	    if (*q & 0x10) desc_len += N_S * 4;
-	    
-	    /* G: PG description present flag. */
-	    if (*q & 0x8) {
-	    	unsigned j;
-	    	unsigned N_G = *(p + desc_len);
-
-	    	INC_DESC_LEN();
-	    	for (j = 0; j< N_G; j++) {
-	    	    unsigned R;
-
-	    	    q = p + desc_len;
-	    	    INC_DESC_LEN();
-	    	    R = (*q & 0x0F) >> 2;
-	    	    desc_len += R;
-	    	    if (desc_len >= packet_size)
-	    	    	return PJ_ETOOSMALL;
-	    	}
-	    }
-	}
-    }
-#undef INC_DESC_LEN
-
-    *p_desc_len = desc_len;
-    return PJ_SUCCESS;
+    return status;
 }
 
-
 static pj_status_t vpx_codec_decode_(pjmedia_vid_codec *codec,
                                      pj_size_t count,
                                      pjmedia_frame packets[],
@@ -837,20 +735,20 @@
     	    unsigned desc_len;
     	    unsigned packet_size = packets[i].size;
     	    pj_status_t status;
-    	
-    	    status = vpx_unpacketize(vpx_data, packets[i].buf, packet_size,
-    				     &desc_len);
+
+            status = pjmedia_vpx_unpacketize(vpx_data->pktz, packets[i].buf,
+                                             packet_size, &desc_len);
     	    if (status != PJ_SUCCESS) {
 	    	PJ_LOG(4,(THIS_FILE, "Unpacketize error"));
 	    	return status;
     	    }
 
-    	    packet_size -= desc_len;	
+	    packet_size -= desc_len;
     	    if (whole_len + packet_size > vpx_data->dec_buf_size) {
 	    	PJ_LOG(4,(THIS_FILE, "Decoding buffer overflow [2]"));
 	    	return PJMEDIA_CODEC_EFRMTOOSHORT;
             }
-        
+
 	    pj_memcpy(vpx_data->dec_buf + whole_len,
 		      (char *)packets[i].buf + desc_len, packet_size);
 	    whole_len += packet_size;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/vpx_packetizer.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/vpx_packetizer.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-codec/vpx_packetizer.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-codec/vpx_packetizer.c	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,225 @@
+/* 
+ * Copyright (C) 2020 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+#include <pjmedia-codec/vpx_packetizer.h>
+#include <pjmedia/errno.h>
+#include <pjmedia/types.h>
+#include <pjmedia/vid_codec_util.h>
+#include <pj/assert.h>
+#include <pj/errno.h>
+#include <pj/log.h>
+#include <pj/pool.h>
+#include <pj/string.h>
+
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+
+#define THIS_FILE		"vpx_packetizer.c"
+
+/* VPX packetizer definition */
+struct pjmedia_vpx_packetizer
+{
+    /* Current settings */
+    pjmedia_vpx_packetizer_cfg cfg;
+};
+
+/*
+ * Initialize VPX packetizer.
+ */
+PJ_DEF(void) pjmedia_vpx_packetizer_cfg_default(pjmedia_vpx_packetizer_cfg *cfg)
+{
+    pj_bzero(cfg, sizeof(*cfg));
+
+    cfg->fmt_id = PJMEDIA_FORMAT_VP8;
+    cfg->mtu =PJMEDIA_MAX_VID_PAYLOAD_SIZE;
+}
+
+/*
+ * Create vpx packetizer.
+ */
+PJ_DEF(pj_status_t) pjmedia_vpx_packetizer_create(
+				pj_pool_t *pool,
+				const pjmedia_vpx_packetizer_cfg *cfg,
+				pjmedia_vpx_packetizer **p)
+{
+    pjmedia_vpx_packetizer *p_;
+
+    PJ_ASSERT_RETURN(pool && p, PJ_EINVAL);
+
+    if (cfg && cfg->fmt_id != PJMEDIA_FORMAT_VP8 &&
+	cfg->fmt_id != PJMEDIA_FORMAT_VP9)
+    {
+	return PJ_ENOTSUP;
+    }
+
+    p_ = PJ_POOL_ZALLOC_T(pool, pjmedia_vpx_packetizer);
+    if (cfg) {
+	pj_memcpy(&p_->cfg, cfg, sizeof(*cfg));
+    } else {
+	pjmedia_vpx_packetizer_cfg_default(&p_->cfg);
+    }
+    *p = p_;
+
+    return PJ_SUCCESS;
+}
+
+/*
+ * Generate an RTP payload from H.264 frame bitstream, in-place processing.
+ */
+PJ_DEF(pj_status_t) pjmedia_vpx_packetize(const pjmedia_vpx_packetizer *pktz,
+					  pj_size_t bits_len,
+                                          unsigned *bits_pos,
+                                          pj_bool_t is_keyframe,
+                                          pj_uint8_t **payload,
+                                          pj_size_t *payload_len)
+{
+    unsigned payload_desc_size = 1;
+    unsigned max_size = pktz->cfg.mtu - payload_desc_size;
+    unsigned remaining_size = (unsigned)bits_len - *bits_pos;
+    unsigned out_size = (unsigned)*payload_len;
+    pj_uint8_t *bits = *payload;
+
+    *payload_len = PJ_MIN(remaining_size, max_size);
+    if (*payload_len + payload_desc_size > out_size)
+	return PJMEDIA_CODEC_EFRMTOOSHORT;
+
+    /* Set payload header */
+    bits[0] = 0;
+    if (pktz->cfg.fmt_id == PJMEDIA_FORMAT_VP8) {
+	/* Set N: Non-reference frame */
+        if (!is_keyframe) bits[0] |= 0x20;
+        /* Set S: Start of VP8 partition. */
+        if (*bits_pos == 0) bits[0] |= 0x10;
+    } else if (pktz->cfg.fmt_id == PJMEDIA_FORMAT_VP9) {
+	/* Set P: Inter-picture predicted frame */
+        if (!is_keyframe) bits[0] |= 0x40;
+        /* Set B: Start of a frame */
+        if (*bits_pos == 0) bits[0] |= 0x8;
+        /* Set E: End of a frame */
+        if (*bits_pos + *payload_len == bits_len) {
+            bits[0] |= 0x4;
+	}
+    }
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Append RTP payload to a VPX picture bitstream
+ */
+PJ_DEF(pj_status_t) pjmedia_vpx_unpacketize(pjmedia_vpx_packetizer *pktz,
+					    const pj_uint8_t *payload,
+                                            pj_size_t payload_len,
+					    unsigned  *payload_desc_len)
+{
+    unsigned desc_len = 1;
+    pj_uint8_t *p = (pj_uint8_t *)payload;
+
+#define INC_DESC_LEN() {if (++desc_len >= payload_len) return PJ_ETOOSMALL;}
+
+    if (payload_len <= desc_len) return PJ_ETOOSMALL;
+
+    if (pktz->cfg.fmt_id == PJMEDIA_FORMAT_VP8) {
+        /*  0 1 2 3 4 5 6 7
+         * +-+-+-+-+-+-+-+-+
+         * |X|R|N|S|R| PID | (REQUIRED)
+         */
+	/* X: Extended control bits present. */
+	if (p[0] & 0x80) {
+	    INC_DESC_LEN();
+	    /* |I|L|T|K| RSV   | */
+	    /* I: PictureID present. */
+	    if (p[1] & 0x80) {
+	    	INC_DESC_LEN();
+	    	/* If M bit is set, the PID field MUST contain 15 bits. */
+	    	if (p[2] & 0x80) INC_DESC_LEN();
+	    }
+	    /* L: TL0PICIDX present. */
+	    if (p[1] & 0x40) INC_DESC_LEN();
+	    /* T: TID present or K: KEYIDX present. */
+	    if ((p[1] & 0x20) || (p[1] & 0x10)) INC_DESC_LEN();
+	}
+
+    } else if (pktz->cfg.fmt_id == PJMEDIA_FORMAT_VP9) {
+        /*  0 1 2 3 4 5 6 7
+         * +-+-+-+-+-+-+-+-+
+         * |I|P|L|F|B|E|V|-| (REQUIRED)
+         */
+        /* I: Picture ID (PID) present. */
+	if (p[0] & 0x80) {
+	    INC_DESC_LEN();
+	    /* If M bit is set, the PID field MUST contain 15 bits. */
+	    if (p[1] & 0x80) INC_DESC_LEN();
+	}
+	/* L: Layer indices present. */
+	if (p[0] & 0x20) {
+	    INC_DESC_LEN();
+	    if (!(p[0] & 0x10)) INC_DESC_LEN();
+	}
+	/* F: Flexible mode.
+	 * I must also be set to 1, and if P is set, there's up to 3
+	 * reference index.
+	 */
+	if ((p[0] & 0x10) && (p[0] & 0x80) && (p[0] & 0x40)) {
+	    unsigned char *q = p + desc_len;
+
+	    INC_DESC_LEN();
+	    if (*q & 0x1) {
+	    	q++;
+	    	INC_DESC_LEN();
+	    	if (*q & 0x1) {
+	    	    q++;
+	    	    INC_DESC_LEN();
+	    	}
+	    }
+	}
+	/* V: Scalability structure (SS) data present. */
+	if (p[0] & 0x2) {
+	    unsigned char *q = p + desc_len;
+	    unsigned N_S = (*q >> 5) + 1;
+
+	    INC_DESC_LEN();
+	    /* Y: Each spatial layer's frame resolution present. */
+	    if (*q & 0x10) desc_len += N_S * 4;
+
+	    /* G: PG description present flag. */
+	    if (*q & 0x8) {
+	    	unsigned j;
+	    	unsigned N_G = *(p + desc_len);
+
+	    	INC_DESC_LEN();
+	    	for (j = 0; j< N_G; j++) {
+	    	    unsigned R;
+
+	    	    q = p + desc_len;
+	    	    INC_DESC_LEN();
+	    	    R = (*q & 0x0F) >> 2;
+	    	    desc_len += R;
+	    	    if (desc_len >= payload_len)
+	    	    	return PJ_ETOOSMALL;
+	    	}
+	    }
+	}
+    }
+#undef INC_DESC_LEN
+
+    *payload_desc_len = desc_len;
+    return PJ_SUCCESS;
+}
+
+
+#endif /* PJMEDIA_HAS_VIDEO */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/android/PjCamera2.java asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/android/PjCamera2.java
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/android/PjCamera2.java	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/android/PjCamera2.java	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,305 @@
+/*
+ * Copyright (C) 2021 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.pjsip;
+
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CameraMetadata;
+import android.hardware.camera2.CaptureRequest;
+import android.media.Image;
+import android.media.ImageReader;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.util.Log;
+import android.util.Range;
+import android.view.Surface;
+import android.view.SurfaceView;
+import android.view.SurfaceHolder;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.pjsip.PjCameraInfo2;
+
+public class PjCamera2
+{
+    private final String TAG = "PjCamera2";
+
+    private CameraDevice camera = null;
+    private CameraCaptureSession previewSession = null;
+
+    private boolean isRunning = false;
+    private boolean start_with_fps = true;
+    private int camIdx;
+    private final long userData;
+    private final int fps;
+
+    private final ImageReader imageReader;
+    private HandlerThread handlerThread = null;
+    private Handler handler;
+
+    /* For debugging purpose only */
+    private final SurfaceView surfaceView;
+
+    native void PushFrame2(long userData_,
+			   ByteBuffer plane0, int rowStride0, int pixStride0,
+			   ByteBuffer plane1, int rowStride1, int pixStride1,
+			   ByteBuffer plane2, int rowStride2, int pixStride2);
+
+    ImageReader.OnImageAvailableListener imageAvailListener = new ImageReader.OnImageAvailableListener() {
+	@Override
+	public void onImageAvailable(ImageReader reader) {
+	    if (!isRunning)
+		return;
+
+	    Image image = reader.acquireLatestImage();
+	    if (image == null)
+		return;
+
+	    /* Get planes buffers. According to the docs, the buffers are always direct buffers */
+	    Image.Plane[] planes = image.getPlanes();
+	    ByteBuffer plane0 = planes[0].getBuffer();
+	    ByteBuffer plane1 = planes.length > 1 ? planes[1].getBuffer() : null;
+	    ByteBuffer plane2 = planes.length > 2 ? planes[2].getBuffer() : null;
+	    assert plane0.isDirect();
+
+	    //for (Image.Plane p: planes) {
+	    //	Log.d(TAG, String.format("size=%d bytes, getRowStride()=%d getPixelStride()=%d", p.getBuffer().remaining(), p.getRowStride(), p.getPixelStride()));
+	    //}
+
+	    PushFrame2(	userData,
+		       	plane0, planes[0].getRowStride(), planes[0].getPixelStride(),
+		       	plane1, plane1!=null? planes[1].getRowStride():0, plane1!=null? planes[1].getPixelStride():0,
+		    	plane2, plane2!=null? planes[2].getRowStride():0, plane2!=null? planes[2].getPixelStride():0);
+
+	    image.close();
+	}
+    };
+
+    private final CameraDevice.StateCallback camStateCallback = new CameraDevice.StateCallback() {
+	@Override
+	public void onOpened(CameraDevice c) {
+	    Log.i(TAG, "CameraDevice.StateCallback.onOpened");
+	    camera = c;
+	    StartPreview();
+	}
+	@Override
+	public void onClosed(CameraDevice c) {
+	    Log.i(TAG, "CameraDevice.StateCallback.onClosed");
+	}
+	@Override
+	public void onDisconnected(CameraDevice c) {
+	    Log.i(TAG, "CameraDevice.StateCallback.onDisconnected");
+	    Stop();
+	}
+	@Override
+	public void onError(CameraDevice c, int error) {
+	    Log.e(TAG, "CameraDevice.StateCallback.onError: " + error);
+
+	    boolean was_with_fps = start_with_fps;
+	    Stop();
+
+	    /* First retry */
+	    if ((error == CameraDevice.StateCallback.ERROR_CAMERA_DEVICE ||
+		 error == CameraDevice.StateCallback.ERROR_CAMERA_SERVICE) &&
+		was_with_fps)
+	    {
+		Log.i(TAG, "Retrying without enforcing frame rate..");
+		start_with_fps = false;
+		Start();
+	    }
+	}
+    };
+
+    private final SurfaceHolder.Callback surfaceHolderCallback = new SurfaceHolder.Callback() {
+	@Override
+	public void surfaceCreated(SurfaceHolder holder) {
+	    Log.d(TAG, "SurfaceHolder.Callback.surfaceCreated");
+	    if (camera != null) {
+		StartPreview();
+	    }
+	}
+
+	@Override
+	public void surfaceChanged(SurfaceHolder holder,
+				   int format, int width, int height)
+	{
+	    Log.d(TAG, "SurfaceHolder.Callback.surfaceChanged");
+	}
+
+	@Override
+	public void surfaceDestroyed(SurfaceHolder holder)
+	{
+	    Log.d(TAG, "SurfaceHolder.Callback.surfaceDestroyed");
+	}
+    };
+
+    public PjCamera2(int idx, int w, int h, int fmt, int fps_,
+	    	    long userData_, SurfaceView surface)
+    {
+	camIdx = idx;
+	userData = userData_;
+	fps = fps_;
+	surfaceView = surface;
+
+	/* Some say to put a larger maxImages to improve FPS */
+	imageReader = ImageReader.newInstance(w, h, fmt, 3);
+    }
+
+    public int SwitchDevice(int idx)
+    {
+	boolean isCaptureRunning = isRunning;
+	int oldIdx = camIdx;
+
+	if (isCaptureRunning)
+	    Stop();
+
+	camIdx = idx;
+
+	if (isCaptureRunning) {
+	    int ret = Start();
+	    if (ret != 0) {
+		/* Try to revert back */
+		camIdx = oldIdx;
+		Start();
+		return ret;
+	    }
+	}
+
+	return 0;
+    }
+
+    private void StartPreview()
+    {
+	try {
+	    List<Surface> surfaceList = new ArrayList<>();
+	    surfaceList.add(imageReader.getSurface());
+	    if (surfaceView != null)
+		surfaceList.add(surfaceView.getHolder().getSurface());
+
+	    camera.createCaptureSession(surfaceList,
+		new CameraCaptureSession.StateCallback() {
+		    @Override
+		    public void onConfigured(CameraCaptureSession session) {
+			Log.d(TAG, "CameraCaptureSession.StateCallback.onConfigured");
+
+			try {
+			    CaptureRequest.Builder previewBuilder = camera.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
+			    previewBuilder.addTarget(imageReader.getSurface());
+			    if (surfaceView != null)
+				previewBuilder.addTarget(surfaceView.getHolder().getSurface());
+			    previewBuilder.set(CaptureRequest.CONTROL_MODE, CameraMetadata.CONTROL_MODE_AUTO);
+			    if (start_with_fps) {
+				Range<Integer> fpsRange = new Range<>(fps, fps);
+				previewBuilder.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, fpsRange);
+			    }
+			    session.setRepeatingRequest(previewBuilder.build(), null, handler);
+			    previewSession = session;
+			} catch (Exception e) {
+			    Log.d(TAG, e.getMessage());
+			    Stop();
+			}
+			if (surfaceView!=null)
+			    surfaceView.getHolder().addCallback(surfaceHolderCallback);
+		    }
+		    @Override
+		    public void onConfigureFailed(CameraCaptureSession session) {
+			Log.e(TAG, "CameraCaptureSession.StateCallback.onConfigureFailed");
+			Stop();
+		    }
+		}, handler);
+	} catch (Exception e) {
+	    Log.d(TAG, e.getMessage());
+	    Stop();
+	}
+    }
+
+    public int Start()
+    {
+	PjCameraInfo2 ci = PjCameraInfo2.GetCameraInfo(camIdx);
+	if (ci == null) {
+	    Log.e(TAG, "Invalid device index: " + camIdx);
+	    return -1;
+	}
+
+	CameraManager cm = PjCameraInfo2.GetCameraManager();
+	if (cm == null)
+	    return -2;
+
+	handlerThread = new HandlerThread("Cam2HandlerThread");
+	handlerThread.start();
+	handler = new Handler(handlerThread.getLooper());
+	imageReader.setOnImageAvailableListener(imageAvailListener, handler);
+	isRunning = true;
+
+	try {
+	    cm.openCamera(ci.id, camStateCallback, handler);
+	} catch (Exception e) {
+	    Log.d(TAG, e.getMessage());
+	    Stop();
+	    return -10;
+	}
+
+	return 0;
+    }
+
+    public void Stop()
+    {
+        if (!isRunning)
+            return;
+
+	isRunning = false;
+	Log.d(TAG, "Stopping..");
+
+	if (previewSession != null) {
+	    previewSession.close();
+	    previewSession = null;
+	}
+
+	if (camera != null) {
+	    camera.close();
+	    camera = null;
+	}
+
+	if (surfaceView != null)
+	    surfaceView.getHolder().removeCallback(surfaceHolderCallback);
+
+	if (handlerThread != null) {
+	    handlerThread.quitSafely();
+	    try {
+	        if (handlerThread.getId() != Thread.currentThread().getId()) {
+		    Log.d(TAG, "Wait thread..");
+		    handlerThread.join();
+		    Log.d(TAG, "Wait thread done");
+		}
+		handlerThread = null;
+		handler = null;
+	    } catch (InterruptedException e) {
+		e.printStackTrace();
+	    }
+	}
+
+	/* Reset setting */
+	start_with_fps = true;
+
+	Log.d(TAG, "Stopped.");
+    }
+
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/android/PjCameraInfo2.java asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/android/PjCameraInfo2.java
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/android/PjCameraInfo2.java	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/android/PjCameraInfo2.java	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2021 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.pjsip;
+
+import java.util.Arrays;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.params.StreamConfigurationMap;
+import android.util.Log;
+import android.util.Size;
+import android.graphics.ImageFormat;
+
+public class PjCameraInfo2 {
+    public String id;
+    public int facing;			// 0: back, 1: front, 2: external
+    public int orient;
+    public int[] supportedSize;		// [w1, h1, w2, h2, ...]
+    public int[] supportedFps1000;	// [min1, max1, min2, max2, ...]
+    public int[] supportedFormat;	// [fmt1, fmt2, ...]
+
+    private static final String TAG = "PjCameraInfo2";
+
+    /* The camera2 is a bit tricky with format, for example it reports
+     * for I420 support (and no NV21 support), however the incoming frame
+     * buffers are actually in NV21 format (e.g: pixel stride is 2).
+     *
+     * For now, we only support I420.
+     */
+    private static final int[] PJ_SUPPORTED_FORMAT = {
+    	ImageFormat.YUV_420_888,	// PJMEDIA_FORMAT_I420
+    };
+
+    private static boolean is_inited = false;
+    private static PjCameraInfo2[] camInfo = null;
+    private static int camInfoCnt = 0;
+    private static CameraManager cameraManager = null;
+
+    public static void SetCameraManager(CameraManager cm) {
+        cameraManager = cm;
+    }
+
+    public static CameraManager GetCameraManager() {
+	return cameraManager;
+    }
+
+    private static int Refresh() {
+	CameraManager cm = GetCameraManager();
+	if (cm==null) {
+	    Log.e(TAG, "Need camera manager instance for enumerating camera");
+	    return -1;
+	}
+
+	is_inited = false;
+
+	String[] camIds;
+	try {
+	    camIds = cm.getCameraIdList();
+	} catch (CameraAccessException e) {
+	    Log.d(TAG, e.getMessage());
+	    e.printStackTrace();
+	    return -1;
+	}
+
+	camInfo = new PjCameraInfo2[camIds.length];
+	camInfoCnt = 0;
+
+	Log.i(TAG, "Found " + camIds.length + " cameras:");
+	for (int i = 0; i < camIds.length; ++i) {
+	    Integer facing;
+	    CameraCharacteristics cc;
+	    StreamConfigurationMap scm;
+	    int[] outFmts;
+
+	    /* Query basic info */
+	    try {
+		cc = cm.getCameraCharacteristics(camIds[i]);
+		facing = cc.get(CameraCharacteristics.LENS_FACING);
+		scm = cc.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+		outFmts = scm.getOutputFormats();
+	    } catch (Exception e) {
+		Log.d(TAG, e.getMessage());
+		Log.w(TAG, String.format("%3d: id=%s skipped due to failure in querying info",
+			i, camIds[i]));
+		continue;
+	    }
+
+	    PjCameraInfo2 pjci = new PjCameraInfo2();
+	    pjci.id = camIds[i];
+	    switch(facing) {
+		case CameraCharacteristics.LENS_FACING_BACK:
+		    pjci.facing = 0;
+		    break;
+		case CameraCharacteristics.LENS_FACING_FRONT:
+		    pjci.facing = 1;
+		    break;
+		default:
+		    pjci.facing = 2;
+		    break;
+	    }
+
+	    int[] fmts = new int[outFmts.length];
+	    int fmtCnt = 0;
+	    for (int pjFmt : PJ_SUPPORTED_FORMAT) {
+		for (int outFmt : outFmts) {
+		    if (outFmt == pjFmt) {
+			fmts[fmtCnt++] = pjFmt;
+			break;
+		    }
+		}
+	    }
+	    Log.i(TAG, String.format("%3d: id=%s formats=%s",
+		    i, pjci.id, Arrays.toString(outFmts)));
+	    if (fmtCnt == 0) {
+		Log.w(TAG, String.format("%3d: id=%s skipped due to no PJSIP compatible format",
+			i, pjci.id));
+		continue;
+	    }
+
+	    pjci.supportedFormat = new int[fmtCnt];
+	    System.arraycopy(fmts, 0, pjci.supportedFormat, 0, fmtCnt);
+
+	    /* Query additional info */
+	    try {
+		pjci.orient = cc.get(CameraCharacteristics.SENSOR_ORIENTATION);
+	    } catch (Exception e) {
+		Log.d(TAG, e.getMessage());
+		Log.w(TAG, String.format("%3d: id=%s failed in getting orient",
+			i, camIds[i]));
+	    }
+
+	    try {
+		Size[] suppSize = scm.getOutputSizes(pjci.supportedFormat[0]);
+		pjci.supportedSize = new int[suppSize.length * 2];
+		for (int j = 0; j < suppSize.length; ++j) {
+		    pjci.supportedSize[j*2] 	= suppSize[j].getWidth();
+		    pjci.supportedSize[j*2 + 1] = suppSize[j].getHeight();
+		}
+	    } catch (Exception e) {
+		Log.d(TAG, e.getMessage());
+		Log.w(TAG, String.format("%3d: id=%s failed in getting sizes",
+			i, camIds[i]));
+
+		/* Query failed, let's just hardcode the supported sizes */
+		pjci.supportedSize = new int[] {176, 144, 320, 240, 352, 288, 640, 480, 1280, 720, 1920, 1080};
+	    }
+
+	    /* FPS info is not really used for now, let's just hardcode it */
+	    pjci.supportedFps1000 = new int[] { 1000, 30000 };
+
+	    camInfo[camInfoCnt++] = pjci;
+
+	    Log.i(TAG, String.format("%3d: id=%s facing=%d orient=%d formats=%s sizes=%s",
+		    		     i, pjci.id, pjci.facing, pjci.orient,
+		    		     Arrays.toString(pjci.supportedFormat),
+		    		     Arrays.toString(pjci.supportedSize)));
+	}
+
+	is_inited = true;
+	return 0;
+    }
+
+    public static int GetCameraCount()
+    {
+        /* Always refresh */
+	if (Refresh() != 0) {
+	    return -1;
+	}
+	return camInfoCnt;
+    }
+
+    /* Get camera info: facing, orientation, supported size/fps/format. */
+    public static PjCameraInfo2 GetCameraInfo(int idx)
+    {
+	if (!is_inited) {
+	    Log.e(TAG, "Not initalized");
+	    return null;
+	}
+
+	if (idx < 0 || idx >= camInfoCnt) {
+	    Log.e(TAG, "Invalid camera ID");
+	    return null;
+	}
+
+	return camInfo[idx];
+    }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/android_dev.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/android_dev.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/android_dev.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/android_dev.c	2022-02-24 07:54:38.000000000 +0000
@@ -130,8 +130,7 @@
     pjmedia_vid_dev_conv    conv;
     
     /** Frame format param for NV21/YV12 -> I420 conversion */
-    pjmedia_video_apply_fmt_param
-			    vafp;
+    pjmedia_video_apply_fmt_param vafp;
 } and_stream;
 
 
@@ -197,8 +196,22 @@
  * JNI stuff
  */
 extern JavaVM *pj_jni_jvm;
-#define PJ_CAMERA_CLASS_PATH		"org/pjsip/PjCamera"
-#define PJ_CAMERA_INFO_CLASS_PATH	"org/pjsip/PjCameraInfo"
+
+/* Use camera2 (since Android API level 21) */
+#define USE_CAMERA2	1
+
+#if USE_CAMERA2
+#define PJ_CAMERA			"PjCamera2"
+#define PJ_CAMERA_INFO			"PjCameraInfo2"
+#else
+#define PJ_CAMERA			"PjCamera"
+#define PJ_CAMERA_INFO			"PjCameraInfo"
+#endif
+
+#define PJ_CLASS_PATH			"org/pjsip/"
+#define PJ_CAMERA_CLASS_PATH		PJ_CLASS_PATH PJ_CAMERA
+#define PJ_CAMERA_INFO_CLASS_PATH	PJ_CLASS_PATH PJ_CAMERA_INFO
+
 
 static struct jni_objs_t
 {
@@ -224,9 +237,17 @@
 } jobjs;
 
 
+#if USE_CAMERA2
+static void JNICALL OnGetFrame2(JNIEnv *env, jobject obj,
+				jlong user_data,
+				jobject plane0, jint rowStride0, jint pixStride0,
+				jobject plane1, jint rowStride1, jint pixStride1,
+				jobject plane2, jint rowStride2, jint pixStride2);
+#else
 static void JNICALL OnGetFrame(JNIEnv *env, jobject obj,
                                jbyteArray data, jint length,
 			       jlong user_data);
+#endif
 
 
 static pj_bool_t jni_get_env(JNIEnv **jni_env)
@@ -310,33 +331,33 @@
     }
 
     /* PjCamera class info */
-    GET_CLASS(PJ_CAMERA_CLASS_PATH, "PjCamera", jobjs.cam.cls);
-    GET_METHOD_ID(jobjs.cam.cls, "PjCamera", "<init>",
+    GET_CLASS(PJ_CAMERA_CLASS_PATH, PJ_CAMERA, jobjs.cam.cls);
+    GET_METHOD_ID(jobjs.cam.cls, PJ_CAMERA, "<init>",
 		  "(IIIIIJLandroid/view/SurfaceView;)V",
 		  jobjs.cam.m_init);
-    GET_METHOD_ID(jobjs.cam.cls, "PjCamera", "Start", "()I",
+    GET_METHOD_ID(jobjs.cam.cls, PJ_CAMERA, "Start", "()I",
 		  jobjs.cam.m_start);
-    GET_METHOD_ID(jobjs.cam.cls, "PjCamera", "Stop", "()V",
+    GET_METHOD_ID(jobjs.cam.cls, PJ_CAMERA, "Stop", "()V",
 		  jobjs.cam.m_stop);
-    GET_METHOD_ID(jobjs.cam.cls, "PjCamera", "SwitchDevice", "(I)I",
+    GET_METHOD_ID(jobjs.cam.cls, PJ_CAMERA, "SwitchDevice", "(I)I",
 		  jobjs.cam.m_switch);
 
     /* PjCameraInfo class info */
-    GET_CLASS(PJ_CAMERA_INFO_CLASS_PATH, "PjCameraInfo", jobjs.cam_info.cls);
-    GET_SMETHOD_ID(jobjs.cam_info.cls, "PjCameraInfo", "GetCameraCount", "()I",
+    GET_CLASS(PJ_CAMERA_INFO_CLASS_PATH, PJ_CAMERA_INFO, jobjs.cam_info.cls);
+    GET_SMETHOD_ID(jobjs.cam_info.cls, PJ_CAMERA_INFO, "GetCameraCount", "()I",
 		   jobjs.cam_info.m_get_cnt);
-    GET_SMETHOD_ID(jobjs.cam_info.cls, "PjCameraInfo", "GetCameraInfo",
+    GET_SMETHOD_ID(jobjs.cam_info.cls, PJ_CAMERA_INFO, "GetCameraInfo",
 		   "(I)L" PJ_CAMERA_INFO_CLASS_PATH ";",
 		   jobjs.cam_info.m_get_info);
-    GET_FIELD_ID(jobjs.cam_info.cls, "PjCameraInfo", "facing", "I",
+    GET_FIELD_ID(jobjs.cam_info.cls, PJ_CAMERA_INFO, "facing", "I",
 		 jobjs.cam_info.f_facing);
-    GET_FIELD_ID(jobjs.cam_info.cls, "PjCameraInfo", "orient", "I",
+    GET_FIELD_ID(jobjs.cam_info.cls, PJ_CAMERA_INFO, "orient", "I",
 		 jobjs.cam_info.f_orient);
-    GET_FIELD_ID(jobjs.cam_info.cls, "PjCameraInfo", "supportedSize", "[I",
+    GET_FIELD_ID(jobjs.cam_info.cls, PJ_CAMERA_INFO, "supportedSize", "[I",
 		 jobjs.cam_info.f_sup_size);
-    GET_FIELD_ID(jobjs.cam_info.cls, "PjCameraInfo", "supportedFormat", "[I",
+    GET_FIELD_ID(jobjs.cam_info.cls, PJ_CAMERA_INFO, "supportedFormat", "[I",
 		 jobjs.cam_info.f_sup_fmt);
-    GET_FIELD_ID(jobjs.cam_info.cls, "PjCameraInfo", "supportedFps1000", "[I",
+    GET_FIELD_ID(jobjs.cam_info.cls, PJ_CAMERA_INFO, "supportedFps1000", "[I",
 		 jobjs.cam_info.f_sup_fps);
 
 #undef GET_CLASS_ID
@@ -346,7 +367,11 @@
 
     /* Register native function */
     {
+#if USE_CAMERA2
+	JNINativeMethod m = { "PushFrame2", "(JLjava/nio/ByteBuffer;IILjava/nio/ByteBuffer;IILjava/nio/ByteBuffer;II)V", (void*)&OnGetFrame2 };
+#else
 	JNINativeMethod m = { "PushFrame", "([BIJ)V", (void*)&OnGetFrame };
+#endif
 	if ((*jni_env)->RegisterNatives(jni_env, jobjs.cam.cls, &m, 1)) {
 	    PJ_LOG(3, (THIS_FILE, "[JNI] Failed in registering native "
 				  "function 'OnGetFrame()'"));
@@ -597,6 +622,8 @@
 					  DEFAULT_FPS, 1);
 	    }
 
+/* Camera2 supports only I420 for now */
+#if !USE_CAMERA2
 	    /* YV12 */
 	    if (adi->has_yv12) {
 		for (k = 0; k < adi->sup_size_cnt &&
@@ -636,6 +663,7 @@
 					      DEFAULT_FPS, 1);
 		}
 	    }
+#endif
 	    
 	} else {
 	    goto on_skip_dev;
@@ -770,6 +798,12 @@
                      param->dir == PJMEDIA_DIR_CAPTURE,
 		     PJ_EINVAL);
 
+/* Camera2 supports only I420 for now */
+#if USE_CAMERA2
+    if (param->fmt.id != PJMEDIA_FORMAT_I420)
+        return PJMEDIA_EVID_BADFORMAT;
+#endif
+
     pj_bzero(&vafp, sizeof(vafp));
     adi = &f->dev_info[param->cap_id];
     vfd = pjmedia_format_get_video_format_detail(&param->fmt, PJ_TRUE);
@@ -808,8 +842,13 @@
     pj_memcpy(&strm->vafp, &vafp, sizeof(vafp));
     strm->ts_inc = PJMEDIA_SPF2(param->clock_rate, &vfd->fps, 1);
 
-    /* Allocate buffer for YV12 -> I420 conversion */
-    if (convert_to_i420) {
+    /* Allocate buffer for YV12 -> I420 conversion.
+     * The camera2 is a bit tricky with format, for example it reports
+     * for I420 support (and no NV21 support), however the incoming frame
+     * buffers are actually in NV21 format (e.g: pixel stride is 2), so
+     * we should always check and conversion buffer may be needed.
+     */
+    if (USE_CAMERA2 || convert_to_i420) {
 	pj_assert(vfi->plane_cnt > 1);
 	strm->convert_to_i420 = convert_to_i420;
 	strm->convert_buf = pj_pool_alloc(pool, vafp.plane_bytes[1]);
@@ -829,7 +868,11 @@
 				 strm->cam_size.w,	/* w */
 				 strm->cam_size.h,	/* h */
 				 and_fmt,		/* fmt */
+#if USE_CAMERA2
+				 vfd->fps.num/
+#else
 				 vfd->fps.num*1000/
+#endif
 				 vfd->fps.denum,	/* fps */
 				 (jlong)(intptr_t)strm,	/* user data */
 				 NULL			/* SurfaceView */
@@ -1109,6 +1152,231 @@
     return PJ_SUCCESS;
 }
 
+#if USE_CAMERA2
+
+PJ_INLINE(void) strip_padding(void *dst, void *src, int w, int h, int stride)
+{
+    int i;
+    for (i = 0; i < h; ++i) {
+	pj_memmove(dst, src, w);
+	src += stride;
+	dst += w;
+    }
+}
+
+static void JNICALL OnGetFrame2(JNIEnv *env, jobject obj,
+				jlong user_data,
+				jobject plane0, jint rowStride0, jint pixStride0,
+				jobject plane1, jint rowStride1, jint pixStride1,
+				jobject plane2, jint rowStride2, jint pixStride2)
+{
+    and_stream *strm = (and_stream*)(intptr_t)user_data;
+    pjmedia_frame f;
+    pj_uint8_t *p0, *p1, *p2, *p0_end;
+    pj_uint8_t *Y, *U, *V;
+    pj_status_t status;
+    void *frame_buf, *data_buf;
+    
+    strm->frame_ts.u64 += strm->ts_inc;
+    if (!strm->vid_cb.capture_cb)
+	return;
+
+    if (strm->thread_initialized == 0 || !pj_thread_is_registered()) {
+	pj_status_t status;
+	pj_bzero(strm->thread_desc, sizeof(pj_thread_desc));
+	status = pj_thread_register("and_cam", strm->thread_desc,
+				    &strm->thread);
+	if (status != PJ_SUCCESS)
+	    return;
+	strm->thread_initialized = 1;
+	PJ_LOG(5,(THIS_FILE, "Android camera thread registered"));
+    }
+
+    p0 = (pj_uint8_t*)(*env)->GetDirectBufferAddress(env, plane0);
+    p1 = (pj_uint8_t*)(*env)->GetDirectBufferAddress(env, plane1);
+    p2 = (pj_uint8_t*)(*env)->GetDirectBufferAddress(env, plane2);
+    
+    /* Assuming the buffers are originally a large contigue buffer,
+     * minimum check for now: plane 1 or 2 must be after plane 0.
+     */
+    p0_end = p0 + strm->vafp.size.h * rowStride0;
+    pj_assert(p1 >= p0_end || p2 >= p0_end);
+
+    f.type = PJMEDIA_FRAME_TYPE_VIDEO;
+    f.size = strm->vafp.framebytes;
+    f.timestamp.u64 = strm->frame_ts.u64;
+    f.buf = data_buf = p0;
+
+    /* In this implementation, we only return I420 frames, so here we need to
+     * convert other formats and strip any padding.
+     */
+
+    Y = (pj_uint8_t*)f.buf;
+    U = Y + strm->vafp.plane_bytes[0];
+    V = U + strm->vafp.plane_bytes[1];
+
+    /* Check if we need conversion here, this is the tricky part of camera2.
+     * When we request I420, the returned buffer may not be actually I420,
+     * for example NV21. The camera2 'cheats' us via it's Plane type which
+     * has pixel stride attribute. For example, NV21 buffer structure will
+     * be represented as I420 using Plane array with the following attributes:
+     * - Plane[1], or U plane, points to address of (Plane[0] + Ysize + 1).
+     * - Plane[2], or V plane, points to address of (Plane[0] + Ysize).
+     * - Pixel stride is set to 2 for U & V planes, and 1 for Y plane.
+     */
+
+    /* Already I420 without padding, nothing to do */
+    if (p1 == U && p2 == V) {}
+
+    /* I420 with padding, remove padding */
+    else if (pixStride1==1 && pixStride2==1 && p2 > p1 && p1 > p0)
+    {
+	/* Strip out Y padding */
+	if (rowStride0 > strm->vafp.size.w) {
+	    strip_padding(Y, p0, strm->vafp.size.w, strm->vafp.size.h,
+			  rowStride0);
+	}
+
+	/* Get U & V planes */
+
+	if (rowStride1 == strm->vafp.size.w/2) {
+	    /* No padding, simply bulk memmove U & V */
+	    pj_memmove(U, p1, strm->vafp.plane_bytes[1]);
+	    pj_memmove(V, p2, strm->vafp.plane_bytes[2]);
+	} else if (rowStride1 > strm->vafp.size.w/2) {
+	    /* Strip padding */
+	    strip_padding(U, p1, strm->vafp.size.w/2, strm->vafp.size.h/2,
+			  rowStride1);
+	    strip_padding(V, p2, strm->vafp.size.w/2, strm->vafp.size.h/2,
+			  rowStride2);
+	}
+    }
+
+    /* The buffer may be originally NV21, i.e: V/U is interleaved */
+    else if (p1-p2==1 && pixStride0==1 &&  pixStride1==2 && pixStride2==2)
+    {
+	/* Strip out Y padding */
+	if (rowStride0 > strm->vafp.size.w) {
+	    strip_padding(Y, p0, strm->vafp.size.w, strm->vafp.size.h,
+			  rowStride0);
+	}
+
+	/* Get U & V, and strip if needed */
+	{
+	    pj_uint8_t *src = p2;
+	    pj_uint8_t *dst_u = U;
+	    pj_uint8_t *dst_v = strm->convert_buf;
+	    int diff = rowStride1 - strm->vafp.size.w;
+	    int i;
+	    for (i = 0; i < strm->vafp.size.h/2; ++i) {
+		int j;
+		for (j = 0; j < strm->vafp.size.w/2; ++j) {
+		    *dst_v++ = *src++;
+		    *dst_u++ = *src++;
+		}
+		src += diff; /* stripping any padding */
+	    }
+	    pj_memcpy(V, strm->convert_buf, strm->vafp.plane_bytes[2]);
+	}
+    }
+    
+    /* The buffer may be originally YV12, i.e: U & V planes are swapped.
+     * We also need to strip out padding, if any.
+     */
+    else if (pixStride1==1 && pixStride2==1 && p1 > p2 && p2 > p0)
+    {
+	/* Strip out Y padding */
+	if (rowStride0 > strm->vafp.size.w) {
+	    strip_padding(Y, p0, strm->vafp.size.w, strm->vafp.size.h,
+			  rowStride0);
+	}
+
+	/* Swap U & V planes */
+	if (rowStride1 == strm->vafp.size.w/2) {
+
+	    /* No padding, note Y plane should be no padding too! */
+	    pj_assert(rowStride0 == strm->vafp.size.w);
+	    pj_memcpy(strm->convert_buf, p1, strm->vafp.plane_bytes[1]);
+	    pj_memmove(U, p1, strm->vafp.plane_bytes[1]);
+	    pj_memcpy(V, strm->convert_buf, strm->vafp.plane_bytes[1]);
+
+	} else if (rowStride1 > strm->vafp.size.w/2) {
+
+	    /* Strip padding */
+	    strip_padding(strm->convert_buf, p1, strm->vafp.size.w/2,
+			  strm->vafp.size.h/2, rowStride1);
+	    strip_padding(V, p2, strm->vafp.size.w/2, strm->vafp.size.h/2,
+			  rowStride2);
+
+	    /* Get V plane data from conversion buffer */
+	    pj_memcpy(V, strm->convert_buf, strm->vafp.plane_bytes[2]);
+
+	}
+    }
+    
+    /* Else, let's just print log for now */
+    else {
+	jlong p0_len, p1_len, p2_len;
+
+	p0_len = (*env)->GetDirectBufferCapacity(env, plane0);
+	p1_len = (*env)->GetDirectBufferCapacity(env, plane1);
+	p2_len = (*env)->GetDirectBufferCapacity(env, plane2);
+
+	PJ_LOG(1,(THIS_FILE, "Unrecognized image format from Android camera2, "
+			     "please report the following plane format:"));
+	PJ_LOG(1,(THIS_FILE, " Planes (buf/len/row_stride/pix_stride):"
+			     " p0=%p/%d/%d/%d p1=%p/%d/%d/%d p2=%p/%d/%d/%d",
+			     p0, p0_len, rowStride0, pixStride0,
+			     p1, p1_len, rowStride1, pixStride1,
+			     p2, p2_len, rowStride2, pixStride2));
+
+#if 1
+	/* Generic converter to I420, based on row stride & pixel stride */
+
+	/* Strip out Y padding */
+	if (rowStride0 > strm->vafp.size.w) {
+	    strip_padding(Y, p0, strm->vafp.size.w, strm->vafp.size.h,
+			  rowStride0);
+	}
+
+	/* Get U & V, and strip if needed */
+	{
+	    pj_uint8_t *src_u = p1;
+	    pj_uint8_t *src_v = p2;
+	    pj_uint8_t *dst_u = U;
+	    pj_uint8_t *dst_v = strm->convert_buf;
+	    int i;
+
+	    /* Note, we use convert buffer for V, just in case U & V are
+	     * swapped.
+	     */
+	    for (i = 0; i < strm->vafp.size.h/2; ++i) {
+		int j;
+		for (j = 0; j < strm->vafp.size.w/2; ++j) {
+		    *dst_v++ = *(src_v + j*pixStride2);
+		    *dst_u++ = *(src_u + j*pixStride1);
+		}
+		src_u += rowStride1;
+		src_v += rowStride2;
+	    }
+	    pj_memcpy(V, strm->convert_buf, strm->vafp.plane_bytes[2]);
+	}
+#endif
+
+    }
+
+    status = pjmedia_vid_dev_conv_resize_and_rotate(&strm->conv, 
+    						    f.buf,
+    				       		    &frame_buf);
+    if (status == PJ_SUCCESS) {
+        f.buf = frame_buf;
+    }
+
+    (*strm->vid_cb.capture_cb)(&strm->base, strm->user_data, &f);
+}
+
+#else
+
 static void JNICALL OnGetFrame(JNIEnv *env, jobject obj,
                                jbyteArray data, jint length,
 			       jlong user_data)
@@ -1225,4 +1493,6 @@
     (*env)->ReleaseByteArrayElements(env, data, data_buf, JNI_ABORT);
 }
 
+#endif /* USE_CAMERA2 */
+
 #endif	/* PJMEDIA_VIDEO_DEV_HAS_ANDROID */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/darwin_dev.m asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/darwin_dev.m
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/darwin_dev.m	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/darwin_dev.m	2022-02-24 07:54:38.000000000 +0000
@@ -268,6 +268,24 @@
 /* API: init factory */
 static pj_status_t darwin_factory_init(pjmedia_vid_dev_factory *f)
 {
+    return darwin_factory_refresh(f);
+}
+
+/* API: destroy factory */
+static pj_status_t darwin_factory_destroy(pjmedia_vid_dev_factory *f)
+{
+    struct darwin_factory *qf = (struct darwin_factory*)f;
+    pj_pool_t *pool = qf->pool;
+
+    qf->pool = NULL;
+    pj_pool_release(pool);
+
+    return PJ_SUCCESS;
+}
+
+/* API: refresh the list of devices */
+static pj_status_t darwin_factory_refresh(pjmedia_vid_dev_factory *f)
+{
     struct darwin_factory *qf = (struct darwin_factory*)f;
     struct darwin_dev_info *qdi;
     unsigned i, l, first_idx, front_idx = -1;
@@ -305,6 +323,9 @@
     	    AVCaptureDeviceDiscoverySession *dds;
 	    NSArray<AVCaptureDeviceType> *dev_types =
 	    	@[AVCaptureDeviceTypeBuiltInWideAngleCamera
+#if TARGET_OS_OSX && defined(__MAC_10_15)
+	    	  , AVCaptureDeviceTypeExternalUnknown
+#endif
 #if TARGET_OS_IPHONE && defined(__IPHONE_10_0)
 	    	  , AVCaptureDeviceTypeBuiltInDuoCamera
 	    	  , AVCaptureDeviceTypeBuiltInTelephotoCamera
@@ -433,25 +454,6 @@
     return PJ_SUCCESS;
 }
 
-/* API: destroy factory */
-static pj_status_t darwin_factory_destroy(pjmedia_vid_dev_factory *f)
-{
-    struct darwin_factory *qf = (struct darwin_factory*)f;
-    pj_pool_t *pool = qf->pool;
-
-    qf->pool = NULL;
-    pj_pool_release(pool);
-
-    return PJ_SUCCESS;
-}
-
-/* API: refresh the list of devices */
-static pj_status_t darwin_factory_refresh(pjmedia_vid_dev_factory *f)
-{
-    PJ_UNUSED_ARG(f);
-    return PJ_SUCCESS;
-}
-
 /* API: get number of devices */
 static unsigned darwin_factory_get_dev_count(pjmedia_vid_dev_factory *f)
 {
@@ -530,6 +532,15 @@
 
 - (void)session_runtime_error:(NSNotification *)notification
 {
+    // This function is called from NSNotificationCenter.
+    // Make sure the thread is registered.
+    if (!pj_thread_is_registered()) {
+        pj_thread_t *thread;
+        static pj_thread_desc thread_desc;
+        pj_bzero(thread_desc, sizeof(pj_thread_desc));
+        pj_thread_register("NSNotificationCenter", thread_desc, &thread);
+    }
+
     NSError *error = notification.userInfo[AVCaptureSessionErrorKey];
     PJ_LOG(3, (THIS_FILE, "Capture session runtime error: %s, %s",
     	       [error.localizedDescription UTF8String],
@@ -1171,10 +1182,10 @@
         {
             pj_memcpy(&strm->param.disp_size, pval,
                       sizeof(strm->param.disp_size));
-            CGRect r = strm->render_view.bounds;
-            r.size = CGSizeMake(strm->param.disp_size.w,
-                                strm->param.disp_size.h);
             dispatch_sync_on_main_queue(^{
+            	CGRect r = strm->render_view.bounds;
+            	r.size = CGSizeMake(strm->param.disp_size.w,
+                                    strm->param.disp_size.h);
 		strm->render_view.bounds = r;
                 if (strm->prev_layer)
                     strm->prev_layer.frame = r;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/dshow_dev.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/dshow_dev.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/dshow_dev.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/dshow_dev.c	2022-02-24 07:54:38.000000000 +0000
@@ -38,6 +38,8 @@
 
 #ifdef _MSC_VER
 #   pragma warning(pop)
+#else
+#include <amvideo2.h>
 #endif
 
 #pragma comment(lib, "Strmiids.lib")
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/sdl_dev.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/sdl_dev.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/sdl_dev.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/sdl_dev.c	2022-02-24 07:54:38.000000000 +0000
@@ -704,7 +704,10 @@
         if ((strm->param.flags & PJMEDIA_VID_DEV_CAP_OUTPUT_FULLSCREEN) &&
             strm->param.window_fullscreen)
         {
-            flags |= SDL_WINDOW_FULLSCREEN;
+	    if (strm->param.window_fullscreen == PJMEDIA_VID_DEV_FULLSCREEN)
+		flags |= SDL_WINDOW_FULLSCREEN;
+	    else
+		flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
         }
 
 #if PJMEDIA_VIDEO_DEV_SDL_HAS_OPENGL
@@ -1111,7 +1114,15 @@
 	return PJ_SUCCESS;
     } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_FULLSCREEN) {
 	Uint32 flag = SDL_GetWindowFlags(strm->window);
-	*((pj_bool_t *)pval) = (flag & SDL_WINDOW_FULLSCREEN)? PJ_TRUE: PJ_FALSE;
+	pjmedia_vid_dev_fullscreen_flag val = PJMEDIA_VID_DEV_WINDOWED;
+	if ((flag & SDL_WINDOW_FULLSCREEN_DESKTOP) ==
+		    SDL_WINDOW_FULLSCREEN_DESKTOP)
+	{
+	     val = PJMEDIA_VID_DEV_FULLSCREEN_DESKTOP;
+	} else if ((flag & SDL_WINDOW_FULLSCREEN) == SDL_WINDOW_FULLSCREEN) {
+	     val = PJMEDIA_VID_DEV_FULLSCREEN;
+	}
+	*((pjmedia_vid_dev_fullscreen_flag*)pval) = val;
 	return PJ_SUCCESS;
     }
 
@@ -1191,9 +1202,24 @@
 	return status;
     } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_RESIZE) {
 	pjmedia_rect_size *new_size = (pjmedia_rect_size *)pval;
+	Uint32 flag = SDL_GetWindowFlags(strm->window);
+	pj_status_t status;
+
+	/**
+	 * Exit full-screen if engaged, since resizing while in full-screen is
+         * not supported.
+	 */
+	if (flag & SDL_WINDOW_FULLSCREEN_DESKTOP)
+	    SDL_SetWindowFullscreen(strm->window, 0);
 
 	SDL_SetWindowSize(strm->window, new_size->w, new_size->h);
-        return resize_disp(strm, new_size);
+	status = resize_disp(strm, new_size);
+
+	/* Restore full-screen if it was engaged. */
+	if (flag & SDL_WINDOW_FULLSCREEN_DESKTOP)
+	    SDL_SetWindowFullscreen(strm->window, SDL_WINDOW_FULLSCREEN_DESKTOP);
+
+	return status;
     } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW) {
 	pjmedia_vid_dev_hwnd *hwnd = (pjmedia_vid_dev_hwnd*)pval;
 	pj_status_t status = PJ_SUCCESS;
@@ -1210,12 +1236,16 @@
 	return status;	
     } else if (cap == PJMEDIA_VID_DEV_CAP_OUTPUT_FULLSCREEN) {
         Uint32 flag;
+	pjmedia_vid_dev_fullscreen_flag val =
+				    *(pjmedia_vid_dev_fullscreen_flag*)pval;
 
 	flag = SDL_GetWindowFlags(strm->window);
-        if (*(pj_bool_t *)pval)
+	if (val == PJMEDIA_VID_DEV_FULLSCREEN_DESKTOP)
+	    flag |= SDL_WINDOW_FULLSCREEN_DESKTOP;
+	else if (val == PJMEDIA_VID_DEV_FULLSCREEN)
             flag |= SDL_WINDOW_FULLSCREEN;
         else
-            flag &= (~SDL_WINDOW_FULLSCREEN);
+            flag &= (~SDL_WINDOW_FULLSCREEN_DESKTOP);
 
         SDL_SetWindowFullscreen(strm->window, flag);
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/util.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/util.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/util.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/util.c	2022-02-24 07:54:38.000000000 +0000
@@ -164,8 +164,8 @@
     
     conv->wxh = conv->dst_size.w * conv->dst_size.h;
     conv->src_frame_size = dst_size.w * dst_size.h * vfi->bpp / 8;
-    conv->conv_frame_size = conv->rot_size.w * conv->rot_size.h;
-    conv->conv_frame_size *= vfi->bpp / 8;
+    conv->conv_frame_size = conv->rot_size.w * conv->rot_size.h *
+     			    vfi->bpp / 8;
     conv->conv_buf = pj_pool_alloc(pool, conv->src_frame_size);
     
     pjmedia_vid_dev_conv_set_rotation(conv, PJMEDIA_ORIENT_NATURAL);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/v4l2_dev.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/v4l2_dev.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/v4l2_dev.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/v4l2_dev.c	2022-02-24 07:54:38.000000000 +0000
@@ -115,7 +115,8 @@
     { PJMEDIA_FORMAT_RGB32,	V4L2_PIX_FMT_BGR32 },
     { PJMEDIA_FORMAT_AYUV,	V4L2_PIX_FMT_YUV32 },
     { PJMEDIA_FORMAT_YUY2,	V4L2_PIX_FMT_YUYV },
-    { PJMEDIA_FORMAT_UYVY,	V4L2_PIX_FMT_UYVY }
+    { PJMEDIA_FORMAT_UYVY,	V4L2_PIX_FMT_UYVY },
+    { PJMEDIA_FORMAT_I420,	V4L2_PIX_FMT_YUV420 }
 };
 
 /* Prototypes */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/videodev.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/videodev.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/videodev.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/pjmedia-videodev/videodev.c	2022-02-24 07:54:38.000000000 +0000
@@ -225,7 +225,7 @@
 	    pjmedia_vid_driver_deinit(i);
         }
 
-        vid_subsys->pf = NULL;
+        pj_bzero(vid_subsys, sizeof(pjmedia_vid_subsys));
     }
     return PJ_SUCCESS;
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/audio_tool.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/audio_tool.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/audio_tool.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/audio_tool.c	2022-02-24 07:54:38.000000000 +0000
@@ -179,8 +179,9 @@
     info.samples_per_sec = 8000;
 
     stream = pj_snd_open_recorder(-1, &info, &rec_callback, NULL);
-    if (!stream)
-	return -1;
+    if (!stream){
+	goto on_error;
+    }
 
     status = pj_snd_stream_start(stream);
     if (status != 0)
@@ -199,6 +200,11 @@
     return 0;
 
 on_error:
+#if WRITE_ORIGINAL_PCM
+    fclose(fhnd_pcm);
+#endif
+    fclose(fhnd);
+
     pj_snd_stream_stop(stream);
     pj_snd_stream_close(stream);
     return -1;
@@ -226,8 +232,10 @@
     info.samples_per_sec = 8000;
 
     stream = pj_snd_open_player(-1, &info, &play_callback, NULL);
-    if (!stream)
+    if (!stream){
+	fclose(fhnd);
 	return -1;
+    }
 
     status = pj_snd_stream_start(stream);
     if (status != 0)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/codec_vectors.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/codec_vectors.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/codec_vectors.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/codec_vectors.c	2022-02-24 07:54:38.000000000 +0000
@@ -222,7 +222,7 @@
 			   pj_bool_t swap_endian)
 {
     enum { MAX_BITS_PER_FRAME = 160*8 };
-    short i,j;
+    int i,j;
     short nsamp;
     short packed_word;
     short bit_count;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/main.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/main.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/main.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/main.c	2022-02-24 07:54:38.000000000 +0000
@@ -31,16 +31,64 @@
 #   include "../../../pjlib/include/rtems-network-config.h"
 #endif
 
+
+#if PJ_LINUX || PJ_DARWINOS
+
+#include <execinfo.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+static void print_stack(int sig)
+{
+    void *array[16];
+    size_t size;
+
+    size = backtrace(array, 16);
+    fprintf(stderr, "Error: signal %d:\n", sig);
+    backtrace_symbols_fd(array, size, STDERR_FILENO);
+    exit(1);
+}
+
+static void init_signals(void)
+{
+    signal(SIGSEGV, &print_stack);
+    signal(SIGABRT, &print_stack);
+}
+
+#else
+#define init_signals()
+#endif
+
+
 static int main_func(int argc, char *argv[])
 {
     int rc;
-    char s[10];
+    int interractive = 0;
+    int no_trap = 0;
+
+    while (argc > 1) {
+        char *arg = argv[--argc];
+
+	if (*arg=='-' && *(arg+1)=='i') {
+	    interractive = 1;
+
+	} else if (*arg=='-' && *(arg+1)=='n') {
+	    no_trap = 1;
+	}
+    }
+
+    if (!no_trap) {
+	init_signals();
+    }
 
     rc = test_main();
 
-    if (argc == 2 && argv[1][0]=='-' && argv[1][1]=='i') {
-	puts("\nPress <ENTER> to quit");
-	if (fgets(s, sizeof(s), stdin) == NULL)
+    if (interractive) {
+	char s[10];
+	puts("");
+	puts("Press <ENTER> to exit");
+	if (!fgets(s, sizeof(s), stdin))
 	    return rc;
     }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/mips_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/mips_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/mips_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/mips_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -1773,6 +1773,7 @@
     si.rx_event_pt = 101;
     si.ssrc = pj_rand();
     si.jb_init = si.jb_min_pre = si.jb_max_pre = si.jb_max = -1;
+    si.jb_discard_algo = PJMEDIA_JB_DISCARD_PROGRESSIVE;
 
     /* Create loop transport */
     status = pjmedia_transport_loop_create(sp->endpt, &sp->transport);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/test.c	2022-02-24 07:54:38.000000000 +0000
@@ -64,7 +64,8 @@
     pj_caching_pool_init(&caching_pool, &pj_pool_factory_default_policy, 0);
     pool = pj_pool_create(&caching_pool.factory, "test", 1000, 512, NULL);
 
-    pj_log_set_decor(PJ_LOG_HAS_NEWLINE);
+    pj_log_set_decor(PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME |
+		     PJ_LOG_HAS_MICRO_SEC | PJ_LOG_HAS_INDENT);
     pj_log_set_level(3);
 
     mem = &caching_pool.factory;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/test.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/test.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/test.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/test.h	2022-02-24 07:54:38.000000000 +0000
@@ -23,12 +23,20 @@
 #include <pjmedia.h>
 #include <pjlib.h>
 
+#if defined(PJ_EXCLUDE_BENCHMARK_TESTS) && (PJ_EXCLUDE_BENCHMARK_TESTS==1)
+#   define WITH_BENCHMARK	    0
+#else
+#   define WITH_BENCHMARK	    1
+#endif
+
 #define HAS_VID_DEV_TEST	PJMEDIA_HAS_VIDEO
 #define HAS_VID_PORT_TEST	PJMEDIA_HAS_VIDEO
-#define HAS_VID_CODEC_TEST	PJMEDIA_HAS_VIDEO
+#ifndef HAS_VID_CODEC_TEST
+    #define HAS_VID_CODEC_TEST	PJMEDIA_HAS_VIDEO
+#endif
 #define HAS_SDP_NEG_TEST	1
 #define HAS_JBUF_TEST		1
-#define HAS_MIPS_TEST		1
+#define HAS_MIPS_TEST		WITH_BENCHMARK
 #define HAS_CODEC_VECTOR_TEST	1
 
 int session_test(void);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/vid_codec_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/vid_codec_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjmedia/src/test/vid_codec_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjmedia/src/test/vid_codec_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -546,6 +546,9 @@
     pj_pool_release(pool);
     pj_log_set_level(orig_log_level);
 
+    /* Avoid compile warning */
+    PJ_UNUSED_ARG(encode_decode_test);
+
     return rc;
 }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/build/pjnath_test.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/build/pjnath_test.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/build/pjnath_test.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/build/pjnath_test.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -101,110 +125,177 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
     <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType>
     <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType>
-  </PropertyGroup>  
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
-	  <TargetName>pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+    <TargetName>pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
   </PropertyGroup>
   <!-- Compile and link option definition -->
   <ItemDefinitionGroup>
@@ -242,6 +333,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -268,6 +373,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -295,6 +413,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -321,6 +453,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -348,6 +493,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -374,6 +533,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjnath-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\pjnath-test\concur_test.c" />
     <ClCompile Include="..\src\pjnath-test\ice_test.c" />
@@ -381,16 +553,22 @@
     <ClCompile Include="..\src\pjnath-test\main_win32.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pjnath-test\server.c" />
     <ClCompile Include="..\src\pjnath-test\sess_auth.c" />
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/build/pjnath.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/build/pjnath.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/build/pjnath.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/build/pjnath.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -78,7 +102,7 @@
   <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}</ProjectGuid>
-    <RootNamespace>pjnath</RootNamespace>    
+    <RootNamespace>pjnath</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -161,40 +185,77 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -264,31 +325,61 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -314,11 +405,21 @@
     <CodeAnalysisRules />
     <CodeAnalysisRuleAssemblies />
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
     <CodeAnalysisRuleAssemblies />
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
@@ -344,6 +445,11 @@
     <CodeAnalysisRules />
     <CodeAnalysisRuleAssemblies />
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
@@ -359,6 +465,11 @@
     <CodeAnalysisRules />
     <CodeAnalysisRuleAssemblies />
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
@@ -374,11 +485,21 @@
     <CodeAnalysisRules />
     <CodeAnalysisRuleAssemblies />
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
     <CodeAnalysisRuleAssemblies />
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
@@ -414,6 +535,15 @@
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -440,6 +570,16 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -466,6 +606,16 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -491,6 +641,15 @@
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -517,6 +676,16 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -542,6 +711,15 @@
       <PrecompiledHeaderOutputFile />
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\pjnath\errno.c" />
     <ClCompile Include="..\src\pjnath\ice_session.c" />
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/build/pjnath.vcxproj.filters asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/build/pjnath.vcxproj.filters
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/build/pjnath.vcxproj.filters	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/build/pjnath.vcxproj.filters	2022-02-24 07:54:38.000000000 +0000
@@ -76,9 +76,6 @@
     <ClInclude Include="..\include\pjnath\stun_config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\pjnath\stun_doc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\include\pjnath\stun_msg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/config.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/config.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/config.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/config.h	2022-02-24 07:54:38.000000000 +0000
@@ -286,7 +286,7 @@
 /**
  * Maximum number of ICE components.
  */
-#define PJ_ICE_MAX_COMP				    (2<<PJ_ICE_COMP_BITS)
+#define PJ_ICE_MAX_COMP				    (1<<PJ_ICE_COMP_BITS)
 
 /**
  * Use the priority value according to the ice-draft.
@@ -457,6 +457,41 @@
 #endif
 
 
+/**
+ * This constant specifies whether ICE stream transport should allow TURN
+ * client session to automatically renew permission for all remote candidates.
+ *
+ * Default: PJ_FALSE
+ */
+#ifndef PJ_ICE_ST_USE_TURN_PERMANENT_PERM
+#   define PJ_ICE_ST_USE_TURN_PERMANENT_PERM	    PJ_FALSE
+#endif
+
+
+/**
+ * For trickle ICE, this macro specifies the maximum time of waiting for
+ * end-of-candidates indication from remote once ICE connectivity checks
+ * is started, in seconds. When the timer expires, ICE will assume that
+ * end-of-candidates indication is received so any further remote candidate
+ * update will be ignored.
+ *
+ * Note that without remote end-of-candidates indication, ICE will not be
+ * able to conclude that the ICE negotiation has failed when all pair checks
+ * are completed but there is no valid pair (on the other hand, the ICE
+ * negotiation may be completed as successful before the end-of-candidates
+ * indication is received when valid pairs are found very quickly).
+ *
+ * Also note that the ICE connectivity checks should only be started after
+ * both agents have started trickling ICE candidates (e.g: both have sent
+ * their SDPs, either via normal SDP offer/answer or SIP INFO).
+ *
+ * Default: 40 seconds.
+ */
+#ifndef PJ_TRICKLE_ICE_END_OF_CAND_TIMEOUT
+#   define PJ_TRICKLE_ICE_END_OF_CAND_TIMEOUT	    40
+#endif
+
+
 /** ICE session pool initial size. */
 #ifndef PJNATH_POOL_LEN_ICE_SESS
 #   define PJNATH_POOL_LEN_ICE_SESS		    512
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/ice_session.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/ice_session.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/ice_session.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/ice_session.h	2022-02-24 07:54:38.000000000 +0000
@@ -170,6 +170,8 @@
 /** Forward declaration for pj_ice_sess_check */
 typedef struct pj_ice_sess_check pj_ice_sess_check;
 
+/** Forward declaration for pj_ice_sess_cand */
+typedef struct pj_ice_sess_cand pj_ice_sess_cand;
 
 /**
  * This structure describes ICE component. 
@@ -221,6 +223,8 @@
 	    pj_ice_sess		    *ice;   /**< ICE session	*/
 	    pj_ice_sess_checklist   *clist; /**< Checklist	*/
 	    unsigned		     ckid;  /**< Check ID	*/
+	    pj_ice_sess_cand	    *lcand; /**< Local cand	*/
+	    pj_ice_sess_cand	    *rcand; /**< Remote cand	*/
 	} req;
     } data;
 
@@ -235,9 +239,14 @@
  * (server reflexive, relayed or host), priority, foundation, and
  * base.
  */
-typedef struct pj_ice_sess_cand
+struct pj_ice_sess_cand
 {
     /**
+     * The candidate ID.
+     */
+    unsigned		 id;
+
+    /**
      * The candidate type, as described in #pj_ice_cand_type enumeration.
      */
     pj_ice_cand_type	 type;
@@ -309,7 +318,7 @@
      */
     pj_sockaddr		 rel_addr;
 
-} pj_ice_sess_cand;
+};
 
 
 /**
@@ -375,6 +384,11 @@
     pj_ice_sess_cand	*rcand;
 
     /**
+     * Foundation index, referring to foundation array defined in checklist.
+     */
+    int			 foundation_idx;
+
+    /**
      * Check priority.
      */
     pj_timestamp	 prio;
@@ -453,6 +467,16 @@
     pj_ice_sess_check	     checks[PJ_ICE_MAX_CHECKS];
 
     /**
+     * Number of foundations.
+     */
+    unsigned		     foundation_cnt;
+
+    /**
+     * Array of foundations, check foundation index refers to this array.
+     */
+    pj_str_t		     foundation[PJ_ICE_MAX_CHECKS * 2];
+
+    /**
      * A timer used to perform periodic check for this checklist.
      */
     pj_timer_entry	     timer;
@@ -573,6 +597,39 @@
 
 
 /**
+ * This enumeration describes the modes of trickle ICE.
+ */
+typedef enum pj_ice_sess_trickle
+{
+    /**
+     * Trickle ICE is disabled.
+     */
+    PJ_ICE_SESS_TRICKLE_DISABLED,
+
+    /**
+     * Half trickle ICE. This mode has better interoperability when remote
+     * capability of ICE trickle is unknown at ICE initialization.
+     *
+     * As ICE initiator, it will convey all local ICE candidates to remote
+     * (just like regular ICE) and be ready to receive either response,
+     * trickle or regular ICE. As ICE answerer, it will do trickle ICE if
+     * it receives an offer with trickle ICE indication, otherwise it will do
+     * regular ICE.
+     */
+    PJ_ICE_SESS_TRICKLE_HALF,
+
+    /**
+     * Full trickle ICE. Only use this mode if it is known that that remote
+     * supports trickle ICE. The discovery whether remote supports trickle
+     * ICE should be done prior to ICE initialization and done by application
+     * (ICE does not provide the discovery mechanism).
+     */
+    PJ_ICE_SESS_TRICKLE_FULL
+
+} pj_ice_sess_trickle;
+
+
+/**
  * This structure describes various ICE session options. Application
  * configure the ICE session with these options by calling 
  * #pj_ice_sess_set_options().
@@ -580,7 +637,8 @@
 typedef struct pj_ice_sess_options
 {
     /**
-     * Specify whether to use aggressive nomination.
+     * Specify whether to use aggressive nomination. This setting can only
+     * be enabled when trickle ICE is disabled.
      */
     pj_bool_t		aggressive;
 
@@ -607,6 +665,14 @@
      */
     int			controlled_agent_want_nom_timeout;
 
+    /**
+     * Trickle ICE mode. Note that, when enabled, aggressive nomination will
+     * be automatically disabled.
+     *
+     * Default value is PJ_ICE_SESS_TRICKLE_DISABLED.
+     */
+    pj_ice_sess_trickle	trickle;
+
 } pj_ice_sess_options;
 
 
@@ -634,8 +700,11 @@
     pj_bool_t		 is_complete;		    /**< Complete?	    */
     pj_bool_t		 is_destroying;		    /**< Destroy is called  */
     pj_bool_t            valid_pair_found;          /**< First pair found   */
+    pj_bool_t		 is_trickling;		    /**< End-of-candidates ind
+							 sent/received?	    */
     pj_status_t		 ice_status;		    /**< Error status.	    */
     pj_timer_entry	 timer;			    /**< ICE timer.	    */
+    pj_timer_entry	 timer_end_of_cand;	    /**< End-of-cand timer. */
     pj_ice_sess_cb	 cb;			    /**< Callback.	    */
 
     pj_stun_config	 stun_cfg;		    /**< STUN settings.	    */
@@ -656,10 +725,14 @@
     /* Local candidates */
     unsigned		 lcand_cnt;		    /**< # of local cand.   */
     pj_ice_sess_cand	 lcand[PJ_ICE_MAX_CAND];    /**< Array of cand.	    */
+    unsigned		 lcand_paired;		    /**< # of local cand
+							 paired (trickling) */
 
     /* Remote candidates */
     unsigned		 rcand_cnt;		    /**< # of remote cand.  */
     pj_ice_sess_cand	 rcand[PJ_ICE_MAX_CAND];    /**< Array of cand.	    */
+    unsigned		 rcand_paired;		    /**< # of remote cand
+							 paired (trickling) */
 
     /** Array of transport datas */
     pj_ice_msg_data	 tp_data[PJ_ICE_MAX_STUN + PJ_ICE_MAX_TURN];
@@ -788,6 +861,27 @@
 PJ_DECL(pj_status_t) pj_ice_sess_set_options(pj_ice_sess *ice,
 					     const pj_ice_sess_options *opt);
 
+
+/**
+ * Detach ICE session from group lock. This will delete ICE session group lock
+ * handler.
+ *
+ * This function is useful when application creates an ICE session with
+ * group lock and later it needs to recreate ICE session (e.g: for ICE
+ * restart) so the previous ICE session resources can be released manually
+ * (by calling the group lock handler) without waiting for the group lock
+ * destroy to avoid memory bloat.
+ *
+ * @param ice		ICE session instance.
+ * @param handler	Pointer to receive the group lock handler of
+ *			this ICE session.
+ *
+ * @return		PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pj_ice_sess_detach_grp_lock(pj_ice_sess *ice,
+						 pj_grp_lock_handler *handler);
+
+
 /**
  * Destroy ICE session. This will cancel any connectivity checks currently
  * running, if any, and any other events scheduled by this session, as well
@@ -916,6 +1010,41 @@
 			      unsigned rem_cand_cnt,
 			      const pj_ice_sess_cand rem_cand[]);
 
+
+/**
+ * Update check list after receiving new remote ICE candidates or after
+ * new local ICE candidates are found and conveyed to remote. This function
+ * can also be called to indicate that trickling has completed, i.e:
+ * local candidates gathering completed and remote has sent end-of-candidate
+ * indication.
+ *
+ * This function is only applicable when trickle ICE is not disabled.
+ *
+ * @param ice		ICE session instance.
+ * @param rem_ufrag	Remote ufrag, as seen in the SDP received from 
+ *			the remote agent.
+ * @param rem_passwd	Remote password, as seen in the SDP received from
+ *			the remote agent.
+ * @param rem_cand_cnt	Number of remote candidates.
+ * @param rem_cand	Remote candidate array. Remote candidates are
+ *			gathered from the SDP received from the remote 
+ *			agent.
+ * @param trickle_done	Flag to indicate end of trickling, set to PJ_TRUE
+ *			after all local candidates have been gathered AND
+ *			after receiving end-of-candidate indication from
+ *			remote.
+ *
+ * @return		PJ_SUCCESS or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) 
+pj_ice_sess_update_check_list(pj_ice_sess *ice,
+			      const pj_str_t *rem_ufrag,
+			      const pj_str_t *rem_passwd,
+			      unsigned rem_cand_cnt,
+			      const pj_ice_sess_cand rem_cand[],
+			      pj_bool_t trickle_done);
+
+
 /**
  * Start ICE periodic check. This function will return immediately, and
  * application will be notified about the connectivity check status in
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/ice_strans.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/ice_strans.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/ice_strans.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/ice_strans.h	2022-02-24 07:54:38.000000000 +0000
@@ -182,6 +182,14 @@
 			    pj_ssize_t sent);
 
     /**
+     * An optional callback that will be called by the ICE transport when a
+     * valid pair has been found during ICE negotiation.
+     *
+     * @param ice_st	    The ICE stream transport.
+     */
+    void (*on_valid_pair)(pj_ice_strans *ice_st);
+
+    /**
      * Callback to report status of various ICE operations.
      * 
      * @param ice_st	    The ICE stream transport.
@@ -192,6 +200,25 @@
 			       pj_ice_strans_op op,
 			       pj_status_t status);
 
+    /**
+     * Callback to report a new ICE local candidate, e.g: after successful
+     * STUN Binding, after a successful TURN allocation. Only new candidates
+     * whose type is server reflexive or relayed will be notified via this
+     * callback. This callback also indicates end-of-candidate via parameter
+     * 'last'.
+     *
+     * Trickle ICE can use this callback to convey the new candidate
+     * to remote agent and monitor end-of-candidate indication.
+     *
+     * @param ice_st	    The ICE stream transport.
+     * @param cand	    The new local candidate, can be NULL when the last
+     *			    local candidate initialization failed/timeout.
+     * @param end_of_cand   PJ_TRUE if this is the last of local candidate.
+     */
+    void    (*on_new_candidate)(pj_ice_strans *ice_st,
+				const pj_ice_sess_cand *cand,
+				pj_bool_t end_of_cand);
+
 } pj_ice_strans_cb;
 
 
@@ -694,6 +721,19 @@
 					       const pj_ice_sess_options *opt);
 
 /**
+ * Update number of components of the ICE stream transport. This can only
+ * reduce the number of components from the initial value specified in
+ * pj_ice_strans_create() and before ICE session is initialized.
+ *
+ * @param ice_st	The ICE stream transport.
+ * @param comp_cnt	Number of components.
+ *
+ * @return		PJ_SUCCESS on success, or the appropriate error.
+ */
+PJ_DECL(pj_status_t) pj_ice_strans_update_comp_cnt(pj_ice_strans *ice_st,
+						   unsigned comp_cnt);
+
+/**
  * Get the group lock for this ICE stream transport.
  *
  * @param ice_st	The ICE stream transport.
@@ -905,6 +945,36 @@
 					     unsigned rcand_cnt,
 					     const pj_ice_sess_cand rcand[]);
 
+
+/**
+ * Update check list after receiving new remote ICE candidates or after
+ * new local ICE candidates are found and conveyed to remote. This function
+ * can also be called after receiving end of candidate indication from
+ * either remote or local agent.
+ *
+ * This function is only applicable when trickle ICE is not disabled and
+ * after ICE session has been created using pj_ice_strans_init_ice().
+ *
+ * @param ice_st	The ICE stream transport.
+ * @param rem_ufrag	Remote ufrag, as seen in the SDP received from
+ *			the remote agent.
+ * @param rem_passwd	Remote password, as seen in the SDP received from
+ *			the remote agent.
+ * @param rcand_cnt	Number of new remote candidates in the array.
+ * @param rcand		New remote candidates array.
+ * @param rcand_end	Set to PJ_TRUE if remote has signalled
+ *			end-of-candidate.
+ *
+ * @return		PJ_SUCCESS, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pj_ice_strans_update_check_list(
+					     pj_ice_strans *ice_st,
+					     const pj_str_t *rem_ufrag,
+					     const pj_str_t *rem_passwd,
+					     unsigned rcand_cnt,
+					     const pj_ice_sess_cand rcand[],
+					     pj_bool_t rcand_end);
+
 /**
  * Retrieve the candidate pair that has been nominated and successfully
  * checked for the specified component. If ICE negotiation is still in
@@ -991,16 +1061,19 @@
 
 
 /**
- * Send outgoing packet using this transport. 
+ * Send outgoing packet using this transport.
  * Application can send data (normally RTP or RTCP packets) at any time
  * by calling this function. This function takes a destination
  * address as one of the arguments, and this destination address should
  * be taken from the default transport address of the component (that is
- * the address in SDP c= and m= lines, or in a=rtcp attribute). 
- * If ICE negotiation is in progress, this function will send the data 
- * to the destination address. Otherwise if ICE negotiation has completed
- * successfully, this function will send the data to the nominated remote 
- * address, as negotiated by ICE.
+ * the address in SDP c= and m= lines, or in a=rtcp attribute).
+ * If ICE negotiation is in progress, this function will try to send the data
+ * via any valid candidate pair (which has passed ICE connectivity test).
+ * If ICE negotiation has completed successfully, this function will send
+ * the data to the nominated remote address, as negotiated by ICE.
+ * If the ICE negotiation fails or valid candidate pair is not yet available,
+ * this function will send the data using default candidate to the specified
+ * destination address.
  *
  * Note that application shouldn't mix using pj_ice_strans_sendto() and
  * pj_ice_strans_sendto2() to avoid inconsistent calling of
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/stun_msg.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/stun_msg.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/stun_msg.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/stun_msg.h	2022-02-24 07:54:38.000000000 +0000
@@ -308,6 +308,10 @@
      */
     PJ_STUN_CHANNEL_BIND_ERROR_RESPONSE	    = 0x0119,
 
+    /**
+     * STUN/TURN Connect Request
+     */
+    PJ_STUN_CONNECT_REQUEST                 = 0x000a,
 
     /**
      * STUN/TURN ConnectBind Request
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/stun_session.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/stun_session.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/stun_session.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/stun_session.h	2022-02-24 07:54:38.000000000 +0000
@@ -341,6 +341,7 @@
     pj_pool_t		*pool;		/**< Pool.			    */
     pj_stun_session	*sess;		/**< The STUN session.		    */
     pj_stun_msg		*msg;		/**< The STUN message.		    */
+    pj_bool_t		 is_destroying; /**< Is destroying?		    */
 
     void		*token;		/**< The token.			    */
 
@@ -747,7 +748,6 @@
  * @param sess	    The STUN session.
  * @param tdata	    The transmit data.
  *
- * @return	    PJ_SUCCESS on success, or the appropriate error code.
  */
 PJ_DECL(void) pj_stun_msg_destroy_tdata(pj_stun_session *sess,
 					pj_stun_tx_data *tdata);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/stun_sock.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/stun_sock.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/stun_sock.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/stun_sock.h	2022-02-24 07:54:38.000000000 +0000
@@ -391,7 +391,7 @@
  *			queued, or the appropriate error code on failure.
  *			When this function returns PJ_SUCCESS, the final
  *			result of the allocation process will be notified
- *			to application in \a on_state() callback.
+ *			to application in \a on_status() callback.
  */
 PJ_DECL(pj_status_t) pj_stun_sock_start(pj_stun_sock *stun_sock,
 				        const pj_str_t *domain,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/turn_session.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/turn_session.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/turn_session.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/turn_session.h	2022-02-24 07:54:38.000000000 +0000
@@ -361,6 +361,22 @@
 				      const pj_sockaddr_t *peer_addr,
 				      unsigned addr_len);
 
+    /**
+     * Notification for Connect request sent using
+     * pj_turn_session_connect().
+     *
+     * @param sess	The TURN session.
+     * @param status	The status code.
+     * @param conn_id	The connection ID.
+     * @param peer_addr	Peer address.
+     * @param addr_len	Length of the peer address.
+     */
+    void (*on_connect_complete)(pj_turn_session *sess,
+		       pj_status_t status,
+		       pj_uint32_t conn_id,
+		       const pj_sockaddr_t *peer_addr,
+		       unsigned addr_len);
+
 } pj_turn_session_cb;
 
 
@@ -897,6 +913,29 @@
 					    pj_uint32_t conn_id,
 					    const pj_sockaddr_t *peer_addr,
 					    unsigned addr_len);
+/**
+ * Initiate connection to the specified peer using Connect request.
+ * Application must call this function when it uses RFC 6062 (TURN TCP
+ * allocations) to initiate a data connection to a peer. When Connect response
+ * received, on_connect_complete will be called, application must implement
+ * this callback and initiate a new data connection to the specified peer.
+ *
+ * According to RFC 6062, a control connection must be a TCP connection,
+ * and application must send TCP Allocate request
+ * (with pj_turn_session_alloc()，set TURN allocation parameter peer_conn_type
+ * to PJ_TURN_TP_TCP) before calling this function.
+ *
+ * @param sess		The TURN client session.
+ * @param peer_addr	Peer address.
+ * @param addr_len	Length of the peer address.
+ *
+ * @return		PJ_SUCCESS if the operation has been successfully
+ *			issued, or the appropriate error code. Note that
+ *			the operation itself will complete asynchronously.
+ */
+PJ_DECL(pj_status_t) pj_turn_session_connect(pj_turn_session *sess,
+                        const pj_sockaddr_t *peer_addr,
+                        unsigned addr_len);
 
 /**
  * @}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/turn_sock.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/turn_sock.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/include/pjnath/turn_sock.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/include/pjnath/turn_sock.h	2022-02-24 07:54:38.000000000 +0000
@@ -622,6 +622,43 @@
 PJ_DECL(pj_status_t) pj_turn_sock_bind_channel(pj_turn_sock *turn_sock,
 					       const pj_sockaddr_t *peer,
 					       unsigned addr_len);
+/**
+ * Initiate connection to the specified peer using Connect request.
+ * Application must call this function when it uses RFC 6062 (TURN TCP
+ * allocations) to initiate a data connection to a peer. The connection status
+ * will be notified via on_connection_status callback.
+ *
+ * According to RFC 6062, the TURN transport instance must be created with
+ * connection type are set to PJ_TURN_TP_TCP, application must send TCP
+ * Allocate request (with pj_turn_session_alloc()，set TURN allocation
+ * parameter peer_conn_type to PJ_TURN_TP_TCP) before calling this function.
+ *
+ *
+ * @param turn_sock	The TURN transport instance.
+ * @param peer		The remote peer address.
+ * @param addr_len	Length of the address.
+ *
+ * @return		PJ_SUCCESS if the operation has been successful,
+ *			or the appropriate error code on failure.
+ */
+PJ_DECL(pj_status_t) pj_turn_sock_connect(pj_turn_sock *turn_sock,
+					  const pj_sockaddr_t *peer,
+					  unsigned addr_len);
+/**
+ * Close previous TCP data connection for the specified peer.
+ * According to RFC 6062, when the client wishes to terminate its relayed
+ * connection to the peer, it closes the data connection to the server.
+ *
+ * @param turn_sock	The TURN transport instance.
+ * @param peer		The remote peer address.
+ * @param addr_len	Length of the address.
+ *
+ * @return		PJ_SUCCESS if the operation has been successful,
+ *			or the appropriate error code on failure.
+ */
+PJ_DECL(pj_status_t) pj_turn_sock_disconnect(pj_turn_sock *turn_sock,
+					   const pj_sockaddr_t *peer,
+					   unsigned addr_len);
 
 
 /**
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath/ice_session.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath/ice_session.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath/ice_session.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath/ice_session.c	2022-02-24 07:54:38.000000000 +0000
@@ -145,6 +145,8 @@
 			  pj_timer_entry *te);
 static void handle_incoming_check(pj_ice_sess *ice,
 				  const pj_ice_rx_check *rcheck);
+static void end_of_cand_ind_timer(pj_timer_heap_t *th,
+				  pj_timer_entry *te);
 
 /* These are the callbacks registered to the STUN sessions */
 static pj_status_t on_stun_send_msg(pj_stun_session *sess,
@@ -323,6 +325,7 @@
     opt->nominated_check_delay = PJ_ICE_NOMINATED_CHECK_DELAY;
     opt->controlled_agent_want_nom_timeout = 
 	ICE_CONTROLLED_AGENT_WAIT_NOMINATION_TIMEOUT;
+    opt->trickle = PJ_ICE_SESS_TRICKLE_DISABLED;
 }
 
 /*
@@ -450,6 +453,19 @@
 {
     PJ_ASSERT_RETURN(ice && opt, PJ_EINVAL);
     pj_memcpy(&ice->opt, opt, sizeof(*opt));
+    ice->is_trickling = (ice->opt.trickle != PJ_ICE_SESS_TRICKLE_DISABLED);
+    if (ice->is_trickling) {
+	LOG5((ice->obj_name, "Trickle ICE is active (%s mode)",
+	      (ice->opt.trickle==PJ_ICE_SESS_TRICKLE_HALF? "half":"full")));
+
+	if (ice->opt.aggressive) {
+	    /* Disable aggressive when ICE trickle is active */
+	    ice->opt.aggressive = PJ_FALSE;
+	    LOG4((ice->obj_name, "Warning: aggressive nomination is disabled"
+				 " as trickle ICE is active"));
+	}
+    }
+
     LOG5((ice->obj_name, "ICE nomination type set to %s",
 	  (ice->opt.aggressive ? "aggressive" : "regular")));
     return PJ_SUCCESS;
@@ -520,6 +536,22 @@
 
 
 /*
+ * Detach ICE session from group lock.
+ */
+PJ_DEF(pj_status_t) pj_ice_sess_detach_grp_lock(pj_ice_sess *ice,
+						pj_grp_lock_handler *handler)
+{
+    PJ_ASSERT_RETURN(ice && handler, PJ_EINVAL);
+
+    pj_grp_lock_acquire(ice->grp_lock);
+    pj_grp_lock_del_handler(ice->grp_lock, ice, &ice_on_destroy);
+    *handler = &ice_on_destroy;
+    pj_grp_lock_release(ice->grp_lock);
+    return PJ_SUCCESS;
+}
+
+
+/*
  * Change session role. 
  */
 PJ_DEF(pj_status_t) pj_ice_sess_change_role(pj_ice_sess *ice,
@@ -686,9 +718,9 @@
 	   (((256 - comp_id) & 0xFF) << 0);
 #else
     enum {
-	type_mask   = ((2 << PJ_ICE_CAND_TYPE_PREF_BITS) - 1),
-	local_mask  = ((2 << PJ_ICE_LOCAL_PREF_BITS) - 1),
-	comp_mask   = ((2 << PJ_ICE_COMP_BITS) - 1),
+	type_mask   = ((1 << PJ_ICE_CAND_TYPE_PREF_BITS) - 1),
+	local_mask  = ((1 << PJ_ICE_LOCAL_PREF_BITS) - 1),
+	comp_mask   = ((1 << PJ_ICE_COMP_BITS) - 1),
 
 	comp_shift  = 0,
 	local_shift = (PJ_ICE_COMP_BITS),
@@ -733,14 +765,38 @@
 
     if (ice->lcand_cnt >= PJ_ARRAY_SIZE(ice->lcand)) {
 	status = PJ_ETOOMANY;
-	goto on_error;
+	goto on_return;
+    }
+
+    if (ice->opt.trickle != PJ_ICE_SESS_TRICKLE_DISABLED) {
+	/* Trickle ICE:
+	 * Make sure that candidate has not been added
+	 */
+	for (i=0; i<ice->lcand_cnt; ++i) {
+	    const pj_ice_sess_cand *c = &ice->lcand[i];
+	    if (c->comp_id==comp_id && c->type == type &&
+		pj_sockaddr_cmp(&c->addr, addr)==0 &&
+		pj_sockaddr_cmp(&c->base_addr, base_addr)==0)
+	    {
+		break;
+	    }
+	}
+
+	/* Skip candidate, it has been added */
+	if (i < ice->lcand_cnt) {
+	    if (p_cand_id)
+		*p_cand_id = i;
+	    goto on_return;
+	}
     }
 
     lcand = &ice->lcand[ice->lcand_cnt];
+    lcand->id = ice->lcand_cnt;
     lcand->comp_id = (pj_uint8_t)comp_id;
     lcand->transport_id = (pj_uint8_t)transport_id;
     lcand->type = type;
     pj_strdup(ice->pool, &lcand->foundation, foundation);
+    lcand->local_pref = local_pref;
     lcand->prio = CALC_CAND_PRIO(ice, type, local_pref, lcand->comp_id);
     pj_sockaddr_cp(&lcand->addr, addr);
     pj_sockaddr_cp(&lcand->base_addr, base_addr);
@@ -768,7 +824,7 @@
     LOG4((ice->obj_name, 
 	 "Candidate %d added: comp_id=%d, type=%s, foundation=%.*s, "
 	 "addr=%s:%d, base=%s:%d, prio=0x%x (%u)",
-	 ice->lcand_cnt, 
+	 lcand->id,
 	 lcand->comp_id, 
 	 cand_type_names[lcand->type],
 	 (int)lcand->foundation.slen,
@@ -780,11 +836,11 @@
 	 lcand->prio, lcand->prio));
 
     if (p_cand_id)
-	*p_cand_id = ice->lcand_cnt;
+	*p_cand_id = lcand->id;
 
     ++ice->lcand_cnt;
 
-on_error:
+on_return:
     pj_grp_lock_release(ice->grp_lock);
     return status;
 }
@@ -898,6 +954,25 @@
     return prio;
 }
 
+PJ_INLINE(int) CMP_CHECK_STATE(const pj_ice_sess_check *c1,
+			       const pj_ice_sess_check *c2)
+{
+    /* SUCCEEDED has higher state than FAILED */
+    if (c1->state == PJ_ICE_SESS_CHECK_STATE_SUCCEEDED &&
+	c2->state == PJ_ICE_SESS_CHECK_STATE_FAILED)
+    {
+	return 1;
+    }
+    if (c2->state == PJ_ICE_SESS_CHECK_STATE_SUCCEEDED &&
+	c1->state == PJ_ICE_SESS_CHECK_STATE_FAILED)
+    {
+	return -1;
+    }
+
+    /* Other state, just compare the state value */
+    return (c1->state - c2->state);
+}
+
 
 PJ_INLINE(int) CMP_CHECK_PRIO(const pj_ice_sess_check *c1,
 			      const pj_ice_sess_check *c2)
@@ -961,12 +1036,19 @@
 			    pj_ice_sess_check_state st, 
 			    pj_status_t err_code)
 {
-    pj_assert(check->state < PJ_ICE_SESS_CHECK_STATE_SUCCEEDED);
-
     LOG5((ice->obj_name, "Check %s: state changed from %s to %s",
 	 dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), &ice->clist, check),
 	 check_state_name[check->state],
 	 check_state_name[st]));
+
+    /* Put the assert after printing log for debugging purpose */
+    // There is corner case, nomination (in non-aggressive ICE mode) may be
+    // done using an in-progress pair instead of successful pair, this is
+    // possible because host candidates actually share a single STUN transport
+    // and pair selection for nomination compares transport instead of
+    // candidate. So later the pair will receive double completions.
+    //pj_assert(check->state < PJ_ICE_SESS_CHECK_STATE_SUCCEEDED);
+
     check->state = st;
     check->err_code = err_code;
 }
@@ -982,7 +1064,9 @@
     }
 }
 
-/* Sort checklist based on priority */
+/* Sort checklist based on state & priority, we need to put Successful pairs
+ * on top of the list for pruning.
+ */
 static void sort_checklist(pj_ice_sess *ice, pj_ice_sess_checklist *clist)
 {
     unsigned i;
@@ -1003,7 +1087,12 @@
 	unsigned j, highest = i;
 
 	for (j=i+1; j<clist->count; ++j) {
-	    if (CMP_CHECK_PRIO(&clist->checks[j], &clist->checks[highest]) > 0) {
+	    int cmp_state = CMP_CHECK_STATE(&clist->checks[j],
+					    &clist->checks[highest]);
+	    if (cmp_state > 0 ||
+		(cmp_state==0 && CMP_CHECK_PRIO(&clist->checks[j],
+						&clist->checks[highest]) > 0))
+	    {
 		highest = j;
 	    }
 	}
@@ -1031,6 +1120,21 @@
     }
 }
 
+/* Remove a check pair from checklist */
+static void remove_check(pj_ice_sess *ice, pj_ice_sess_checklist *clist,
+			 unsigned check_idx,
+			 const char *reason)
+{
+    LOG5((ice->obj_name, "Check %s pruned (%s)",
+	  dump_check(ice->tmp.txt, sizeof(ice->tmp.txt),
+		     clist, &clist->checks[check_idx]),
+	  reason));
+
+    pj_array_erase(clist->checks, sizeof(clist->checks[0]),
+		   clist->count, check_idx);
+    --clist->count;
+}
+
 /* Prune checklist, this must have been done after the checklist
  * is sorted.
  */
@@ -1053,7 +1157,9 @@
     for (i=0; i<clist->count; ++i) {
 	pj_ice_sess_cand *srflx = clist->checks[i].lcand;
 
-	if (clist->checks[i].lcand->type == PJ_ICE_CAND_TYPE_SRFLX) {
+	if (srflx->type == PJ_ICE_CAND_TYPE_SRFLX ||
+	    srflx->type == PJ_ICE_CAND_TYPE_PRFLX)
+	{
 	    /* Find the base for this candidate */
 	    unsigned j;
 	    for (j=0; j<ice->lcand_cnt; ++j) {
@@ -1063,7 +1169,7 @@
 		    continue;
 
 		if (pj_sockaddr_cmp(&srflx->base_addr, &host->addr) == 0) {
-		    /* Replace this SRFLX with its BASE */
+		    /* Replace this SRFLX/PRFLX with its BASE */
 		    clist->checks[i].lcand = host;
 		    break;
 		}
@@ -1077,7 +1183,7 @@
 		      pj_sockaddr_print(&srflx->base_addr, baddr,
 		                        sizeof(baddr), 2),
 		      pj_sockaddr_get_port(&srflx->base_addr),
-		      GET_LCAND_ID(clist->checks[i].lcand)));
+		      GET_LCAND_ID(srflx)));
 		return PJNATH_EICENOHOSTCAND;
 	    }
 	}
@@ -1101,6 +1207,14 @@
 	    pj_ice_sess_cand *rjcand = clist->checks[j].rcand;
 	    const char *reason = NULL;
 
+	    /* Only discard Frozen/Waiting checks */
+	    if (clist->checks[j].state != PJ_ICE_SESS_CHECK_STATE_FROZEN &&
+		clist->checks[j].state != PJ_ICE_SESS_CHECK_STATE_WAITING)
+	    {
+		++j;
+		continue;
+	    }
+
 	    if ((licand == ljcand) && (ricand == rjcand)) {
 		reason = "duplicate found";
 	    } else if ((rjcand == ricand) &&
@@ -1112,15 +1226,7 @@
 
 	    if (reason != NULL) {
 		/* Found duplicate, remove it */
-		LOG5((ice->obj_name, "Check %s pruned (%s)",
-		      dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), 
-				 &ice->clist, &clist->checks[j]),
-		      reason));
-
-		pj_array_erase(clist->checks, sizeof(clist->checks[0]),
-			       clist->count, j);
-		--clist->count;
-
+		remove_check(ice, clist, j, reason);
 	    } else {
 		++j;
 	    }
@@ -1297,7 +1403,23 @@
     if (comp->valid_check == NULL) {
 	comp->valid_check = check;
     } else {
-	if (CMP_CHECK_PRIO(comp->valid_check, check) < 0)
+	pj_bool_t update = PJ_FALSE;
+
+	/* Update component's valid check with conditions:
+	 * - it is the first nominated check, or
+	 * - it has higher prio, as long as nomination status is NOT degraded
+	 *   (existing is nominated -> new is not-nominated).
+	 */
+	if (!comp->nominated_check && check->nominated)
+	{
+	    update = PJ_TRUE;
+	} else if (CMP_CHECK_PRIO(comp->valid_check, check) < 0 &&
+		   (!comp->nominated_check || check->nominated))
+	{
+	    update = PJ_TRUE;
+	}
+
+	if (update)
 	    comp->valid_check = check;
     }
 
@@ -1312,115 +1434,11 @@
     }
 }
 
-/* This function is called when one check completes */
-static pj_bool_t on_check_complete(pj_ice_sess *ice,
-				   pj_ice_sess_check *check)
+/* Check if ICE nego completed */
+static pj_bool_t check_ice_complete(pj_ice_sess *ice)
 {
-    pj_ice_sess_comp *comp;
     unsigned i;
-
-    pj_assert(check->state >= PJ_ICE_SESS_CHECK_STATE_SUCCEEDED);
-
-    comp = find_comp(ice, check->lcand->comp_id);
-
-    /* 7.1.2.2.2.  Updating Pair States
-     * 
-     * The agent sets the state of the pair that generated the check to
-     * Succeeded.  The success of this check might also cause the state of
-     * other checks to change as well.  The agent MUST perform the following
-     * two steps:
-     * 
-     * 1.  The agent changes the states for all other Frozen pairs for the
-     *     same media stream and same foundation to Waiting.  Typically
-     *     these other pairs will have different component IDs but not
-     *     always.
-     */
-    if (check->err_code==PJ_SUCCESS) {
-
-	for (i=0; i<ice->clist.count; ++i) {
-	    pj_ice_sess_check *c = &ice->clist.checks[i];
-	    if (pj_strcmp(&c->lcand->foundation, &check->lcand->foundation)==0
-		 && c->state == PJ_ICE_SESS_CHECK_STATE_FROZEN)
-	    {
-		check_set_state(ice, c, PJ_ICE_SESS_CHECK_STATE_WAITING, 0);
-	    }
-	}
-
-	LOG5((ice->obj_name, "Check %d is successful%s",
-	     GET_CHECK_ID(&ice->clist, check),
-	     (check->nominated ? "  and nominated" : "")));
-
-	/* On the first valid pair, we call the callback, if present */
-	if (ice->valid_pair_found == PJ_FALSE) {
-	    ice->valid_pair_found = PJ_TRUE;
-
-	    if (ice->cb.on_valid_pair) {
-		(*ice->cb.on_valid_pair)(ice);
-	    }
-	}
-    }
-
-    /* 8.2.  Updating States
-     * 
-     * For both controlling and controlled agents, the state of ICE
-     * processing depends on the presence of nominated candidate pairs in
-     * the valid list and on the state of the check list:
-     *
-     * o  If there are no nominated pairs in the valid list for a media
-     *    stream and the state of the check list is Running, ICE processing
-     *    continues.
-     *
-     * o  If there is at least one nominated pair in the valid list:
-     *
-     *    - The agent MUST remove all Waiting and Frozen pairs in the check
-     *      list for the same component as the nominated pairs for that
-     *      media stream
-     *
-     *    - If an In-Progress pair in the check list is for the same
-     *      component as a nominated pair, the agent SHOULD cease
-     *      retransmissions for its check if its pair priority is lower
-     *      than the lowest priority nominated pair for that component
-     */
-    if (check->err_code==PJ_SUCCESS && check->nominated) {
-
-	for (i=0; i<ice->clist.count; ++i) {
-
-	    pj_ice_sess_check *c = &ice->clist.checks[i];
-
-	    if (c->lcand->comp_id == check->lcand->comp_id) {
-
-		if (c->state < PJ_ICE_SESS_CHECK_STATE_IN_PROGRESS) {
-
-		    /* Just fail Frozen/Waiting check */
-		    LOG5((ice->obj_name, 
-			 "Check %s to be failed because state is %s",
-			 dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), 
-				    &ice->clist, c), 
-			 check_state_name[c->state]));
-		    check_set_state(ice, c, PJ_ICE_SESS_CHECK_STATE_FAILED,
-				    PJ_ECANCELLED);
-
-		} else if (c->state == PJ_ICE_SESS_CHECK_STATE_IN_PROGRESS
-			   && (PJ_ICE_CANCEL_ALL ||
-			        CMP_CHECK_PRIO(c, check) < 0)) {
-
-		    /* State is IN_PROGRESS, cancel transaction */
-		    if (c->tdata) {
-			LOG5((ice->obj_name, 
-			     "Cancelling check %s (In Progress)",
-			     dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), 
-					&ice->clist, c)));
-			pj_stun_session_cancel_req(comp->stun_sess, 
-						   c->tdata, PJ_FALSE, 0);
-			c->tdata = NULL;
-			check_set_state(ice, c, PJ_ICE_SESS_CHECK_STATE_FAILED,
-					PJ_ECANCELLED);
-		    }
-		}
-	    }
-	}
-    }
-
+    pj_bool_t no_pending_check = PJ_FALSE;
 
     /* Still in 8.2.  Updating States
      * 
@@ -1479,14 +1497,17 @@
      * See if all checks in the checklist have completed. If we do,
      * then mark ICE processing as failed.
      */
-    for (i=0; i<ice->clist.count; ++i) {
-	pj_ice_sess_check *c = &ice->clist.checks[i];
-	if (c->state < PJ_ICE_SESS_CHECK_STATE_SUCCEEDED) {
-	    break;
+    if (!ice->is_trickling) {
+	for (i=0; i<ice->clist.count; ++i) {
+	    pj_ice_sess_check *c = &ice->clist.checks[i];
+	    if (c->state < PJ_ICE_SESS_CHECK_STATE_SUCCEEDED) {
+		break;
+	    }
 	}
+	no_pending_check = (i == ice->clist.count);
     }
 
-    if (i == ice->clist.count) {
+    if (no_pending_check) {
 	/* All checks have completed, but we don't have nominated pair.
 	 * If agent's role is controlled, check if all components have
 	 * valid pair. If it does, this means the controlled agent has
@@ -1571,52 +1592,500 @@
 	}
     }
 
-    /* If this connectivity check has been successful, scan all components
-     * and see if they have a valid pair, if we are controlling and we haven't
-     * started our nominated check yet.
+    /* If this connectivity check has been successful, scan all components
+     * and see if they have a valid pair, if we are controlling and we haven't
+     * started our nominated check yet.
+     */
+    /* Always scan regardless the last connectivity check result */
+    if (/*check->err_code == PJ_SUCCESS && */
+	ice->role==PJ_ICE_SESS_ROLE_CONTROLLING &&
+	!ice->is_nominating &&
+	ice->timer.id == TIMER_NONE) 
+    {
+	pj_time_val delay;
+
+	for (i=0; i<ice->comp_cnt; ++i) {
+	    if (ice->comp[i].valid_check == NULL)
+		break;
+	}
+
+	if (i < ice->comp_cnt) {
+	    /* Some components still don't have valid pair, continue
+	     * processing.
+	     */
+	    return PJ_FALSE;
+	}
+
+	LOG4((ice->obj_name, 
+	      "Scheduling nominated check in %d ms",
+	      ice->opt.nominated_check_delay));
+
+	pj_timer_heap_cancel_if_active(ice->stun_cfg.timer_heap, &ice->timer,
+	                               TIMER_NONE);
+
+	/* All components have valid pair. Let connectivity checks run for
+	 * a little bit more time, then start our nominated check.
+	 */
+	delay.sec = 0;
+	delay.msec = ice->opt.nominated_check_delay;
+	pj_time_val_normalize(&delay);
+
+	pj_timer_heap_schedule_w_grp_lock(ice->stun_cfg.timer_heap,
+	                                  &ice->timer, &delay,
+	                                  TIMER_START_NOMINATED_CHECK,
+	                                  ice->grp_lock);
+	return PJ_FALSE;
+    }
+
+    /* We still have checks to perform */
+    return PJ_FALSE;
+}
+
+/* This function is called when one check completes */
+static pj_bool_t on_check_complete(pj_ice_sess *ice,
+				   pj_ice_sess_check *check)
+{
+    pj_ice_sess_comp *comp;
+    unsigned i;
+
+    pj_assert(check->state >= PJ_ICE_SESS_CHECK_STATE_SUCCEEDED);
+
+    comp = find_comp(ice, check->lcand->comp_id);
+
+    /* 7.1.2.2.2.  Updating Pair States
+     * 
+     * The agent sets the state of the pair that generated the check to
+     * Succeeded.  The success of this check might also cause the state of
+     * other checks to change as well.  The agent MUST perform the following
+     * two steps:
+     * 
+     * 1.  The agent changes the states for all other Frozen pairs for the
+     *     same media stream and same foundation to Waiting.  Typically
+     *     these other pairs will have different component IDs but not
+     *     always.
+     */
+    if (check->err_code==PJ_SUCCESS) {
+
+	for (i=0; i<ice->clist.count; ++i) {
+	    pj_ice_sess_check *c = &ice->clist.checks[i];
+	    if (c->foundation_idx == check->foundation_idx &&
+		c->state == PJ_ICE_SESS_CHECK_STATE_FROZEN)
+	    {
+		check_set_state(ice, c, PJ_ICE_SESS_CHECK_STATE_WAITING, 0);
+	    }
+	}
+
+	LOG5((ice->obj_name, "Check %d is successful%s",
+	     GET_CHECK_ID(&ice->clist, check),
+	     (check->nominated ? " and nominated" : "")));
+
+	/* On the first valid pair, we call the callback, if present */
+	if (ice->valid_pair_found == PJ_FALSE) {
+	    ice->valid_pair_found = PJ_TRUE;
+
+	    if (ice->cb.on_valid_pair) {
+		(*ice->cb.on_valid_pair)(ice);
+	    }
+	}
+    }
+
+    /* 8.2.  Updating States
+     * 
+     * For both controlling and controlled agents, the state of ICE
+     * processing depends on the presence of nominated candidate pairs in
+     * the valid list and on the state of the check list:
+     *
+     * o  If there are no nominated pairs in the valid list for a media
+     *    stream and the state of the check list is Running, ICE processing
+     *    continues.
+     *
+     * o  If there is at least one nominated pair in the valid list:
+     *
+     *    - The agent MUST remove all Waiting and Frozen pairs in the check
+     *      list for the same component as the nominated pairs for that
+     *      media stream
+     *
+     *    - If an In-Progress pair in the check list is for the same
+     *      component as a nominated pair, the agent SHOULD cease
+     *      retransmissions for its check if its pair priority is lower
+     *      than the lowest priority nominated pair for that component
+     */
+    if (check->err_code==PJ_SUCCESS && check->nominated) {
+
+	for (i=0; i<ice->clist.count; ++i) {
+
+	    pj_ice_sess_check *c = &ice->clist.checks[i];
+
+	    if (c->lcand->comp_id == check->lcand->comp_id) {
+
+		if (c->state < PJ_ICE_SESS_CHECK_STATE_IN_PROGRESS) {
+
+		    /* Just fail Frozen/Waiting check */
+		    LOG5((ice->obj_name, 
+			 "Check %s to be failed because state is %s",
+			 dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), 
+				    &ice->clist, c), 
+			 check_state_name[c->state]));
+		    check_set_state(ice, c, PJ_ICE_SESS_CHECK_STATE_FAILED,
+				    PJ_ECANCELLED);
+
+		} else if (c->state == PJ_ICE_SESS_CHECK_STATE_IN_PROGRESS
+			   && (PJ_ICE_CANCEL_ALL ||
+			        CMP_CHECK_PRIO(c, check) < 0)) {
+
+		    /* State is IN_PROGRESS, cancel transaction */
+		    if (c->tdata) {
+			LOG5((ice->obj_name, 
+			     "Cancelling check %s (In Progress)",
+			     dump_check(ice->tmp.txt, sizeof(ice->tmp.txt), 
+					&ice->clist, c)));
+			pj_stun_session_cancel_req(comp->stun_sess, 
+						   c->tdata, PJ_FALSE, 0);
+			c->tdata = NULL;
+			check_set_state(ice, c, PJ_ICE_SESS_CHECK_STATE_FAILED,
+					PJ_ECANCELLED);
+		    }
+		}
+	    }
+	}
+    }
+
+    return check_ice_complete(ice);
+}
+
+
+/* Get foundation index of a check pair. This function can also be used for
+ * adding a new foundation (combination of local & remote cands foundations)
+ * to checklist.
+ */
+static int get_check_foundation_idx(pj_ice_sess *ice,
+				    const pj_ice_sess_cand *lcand,
+				    const pj_ice_sess_cand *rcand,
+				    pj_bool_t add_if_not_found)
+{
+    pj_ice_sess_checklist *clist = &ice->clist;
+    char fnd_str[65];
+    unsigned i;
+
+    pj_ansi_snprintf(fnd_str, sizeof(fnd_str), "%.*s|%.*s",
+		     (int)lcand->foundation.slen, lcand->foundation.ptr,
+		     (int)rcand->foundation.slen, rcand->foundation.ptr);
+    for (i=0; i<clist->foundation_cnt; ++i) {
+	if (pj_strcmp2(&clist->foundation[i], fnd_str) == 0)
+	    return i;
+    }
+
+    if (add_if_not_found && clist->foundation_cnt < PJ_ICE_MAX_CHECKS) {
+	pj_strdup2(ice->pool, &clist->foundation[i], fnd_str);
+	++clist->foundation_cnt;
+	return i;
+    }
+
+    return -1;
+}
+
+/* Discard a pair check with Failed state or lowest prio (as long as lower
+ * than prio_lower_than.
+ */
+static int discard_check(pj_ice_sess *ice, pj_ice_sess_checklist *clist,
+			 const pj_timestamp *prio_lower_than)
+{
+    /* Discard any Failed check */
+    unsigned k;
+    for (k=0; k < clist->count; ++k) {
+	if (clist->checks[k].state==PJ_ICE_SESS_CHECK_STATE_FAILED) {
+	    remove_check(ice, clist, k, "too many, drop Failed");
+	    return 1;
+	}
+    }
+
+    /* If none, discard the lowest prio */
+    /* Re-sort before discarding the last */
+    sort_checklist(ice, clist);
+    if (!prio_lower_than ||
+	pj_cmp_timestamp(&clist->checks[k-1].prio, prio_lower_than) < 0)
+    {
+	remove_check(ice, clist, k-1, "too many, drop low-prio");
+	return 1;
+    }
+
+    return 0;
+}
+
+
+/* Timer callback for end of candidate indication from remote */
+static void end_of_cand_ind_timer(pj_timer_heap_t *th,
+				  pj_timer_entry *te)
+{
+    pj_ice_sess *ice = (pj_ice_sess*)te->user_data;
+    PJ_UNUSED_ARG(th);
+
+    pj_grp_lock_acquire(ice->grp_lock);
+
+    if (ice->is_trickling && !ice->is_complete) {
+	LOG5((ice->obj_name, "End-of-candidate timer timeout, any future "
+			     "remote candidate update will be ignored"));
+	ice->is_trickling = PJ_FALSE;
+
+	/* ICE checks may have been completed/failed */
+	check_ice_complete(ice);
+    }
+
+    pj_grp_lock_release(ice->grp_lock);
+}
+
+
+/* Add remote candidates and create/update checklist */
+static pj_status_t add_rcand_and_update_checklist(
+			      pj_ice_sess *ice,
+			      unsigned rem_cand_cnt,
+			      const pj_ice_sess_cand rem_cand[],
+			      pj_bool_t trickle_done)
+{
+    pj_ice_sess_checklist *clist;
+    unsigned i, j, new_pair = 0;
+    pj_status_t status;
+
+    /* Save remote candidates */
+    for (i=0; i<rem_cand_cnt; ++i) {
+	pj_ice_sess_cand *cn = &ice->rcand[ice->rcand_cnt];
+
+	/* Check component ID */
+	if (rem_cand[i].comp_id==0 || rem_cand[i].comp_id > ice->comp_cnt)
+	{
+	    continue;
+	}
+
+	if (ice->opt.trickle != PJ_ICE_SESS_TRICKLE_DISABLED) {
+	    /* Trickle ICE:
+	     * Make sure that candidate has not been added
+	     */
+	    for (j=0; j<ice->rcand_cnt; ++j) {
+		const pj_ice_sess_cand *c1 = &rem_cand[i];
+		const pj_ice_sess_cand *c2 = &ice->rcand[j];
+		if (c1->comp_id==c2->comp_id && c1->type==c2->type &&
+		    pj_sockaddr_cmp(&c1->addr, &c2->addr)==0)
+		{
+		    break;
+		}
+	    }
+
+	    /* Skip candidate, it has been added */
+	    if (j < ice->rcand_cnt)
+		continue;
+	}
+	
+	/* Available cand slot? */
+	if (ice->rcand_cnt >= PJ_ICE_MAX_CAND) {
+	    char tmp[PJ_INET6_ADDRSTRLEN + 10];
+	    PJ_PERROR(3,(ice->obj_name, PJ_ETOOMANY,
+			 "Cannot add remote candidate %s",
+			 pj_sockaddr_print(&rem_cand[i].addr,
+					   tmp, sizeof(tmp), 3)));
+	    continue;
+	}
+
+	/* Add this candidate */
+	pj_memcpy(cn, &rem_cand[i], sizeof(pj_ice_sess_cand));
+	pj_strdup(ice->pool, &cn->foundation, &rem_cand[i].foundation);
+	cn->id = ice->rcand_cnt++;
+    }
+
+    /* Generate checklist */
+    clist = &ice->clist;
+    for (i=0; i<ice->lcand_cnt; ++i) {
+	/* First index of remote cand to be paired with this local cand */
+	unsigned rstart = (i >= ice->lcand_paired)? 0 : ice->rcand_paired;
+	for (j=rstart; j<ice->rcand_cnt; ++j) {
+
+	    pj_ice_sess_cand *lcand = &ice->lcand[i];
+	    pj_ice_sess_cand *rcand = &ice->rcand[j];
+	    pj_ice_sess_check *chk = NULL;
+
+	    if (clist->count >= PJ_ICE_MAX_CHECKS) {
+		// Instead of returning PJ_ETOOMANY, discard Failed/low-prio.
+		// If this check is actually the lowest prio, just skip it.
+		//return PJ_ETOOMANY;
+		pj_timestamp max_prio = CALC_CHECK_PRIO(ice, lcand, rcand);
+		if (discard_check(ice, clist, &max_prio) == 0)
+		    continue;
+	    }
+	    
+	    /* A local candidate is paired with a remote candidate if
+	     * and only if the two candidates have the same component ID 
+	     * and have the same IP address version. 
+	     */
+	    if ((lcand->comp_id != rcand->comp_id) ||
+		(lcand->addr.addr.sa_family != rcand->addr.addr.sa_family))
+	    {
+		continue;
+	    }
+
+#if 0
+	    /* Trickle ICE:
+	     * Make sure that pair has not been added to checklist
+	     */
+	    // Should not happen, paired cands are already marked using
+	    // lcand_paired & rcand_paired.
+	    if (ice->opt.trickle != PJ_ICE_SESS_TRICKLE_DISABLED) {
+		unsigned k;
+		for (k=0; k<clist->count; ++k) {
+		    chk = &clist->checks[k];
+		    if (chk->lcand == lcand && chk->rcand == rcand)
+			break;
+		}
+
+		/* Pair already exists */
+		if (k < clist->count)
+		    continue;
+	    }
+#endif
+
+
+	    /* Add the pair */
+	    chk = &clist->checks[clist->count];
+	    chk->lcand = lcand;
+	    chk->rcand = rcand;
+	    chk->prio = CALC_CHECK_PRIO(ice, lcand, rcand);
+	    chk->state = PJ_ICE_SESS_CHECK_STATE_FROZEN;
+	    chk->foundation_idx = get_check_foundation_idx(ice, lcand, rcand,
+							   PJ_TRUE);
+
+	    /* Check if foundation cannot be added (e.g: list is full) */
+	    if (chk->foundation_idx < 0)
+		continue;
+
+	    /* Check if the check can be unfrozen */
+	    if (ice->is_trickling) {
+		unsigned k;
+
+		/* For this foundation, unfreeze if this pair has the lowest
+		 * comp ID, or the highest priority among existing pairs with
+		 * same comp ID, or any other checks in Succeeded.
+		 */
+		for (k=0; k<clist->count; ++k) {
+		    if (clist->checks[k].foundation_idx != chk->foundation_idx)
+			continue;
+
+		    /* Unfreeze if there is already check in Succeeded */
+		    if (clist->checks[k].state==PJ_ICE_SESS_CHECK_STATE_SUCCEEDED)
+		    {
+			k = clist->count;
+			break;
+		    }
+
+		    /* Don't unfreeze if there is already check in Waiting or
+		     * In Progress.
+		     */
+		    if (clist->checks[k].state==PJ_ICE_SESS_CHECK_STATE_WAITING ||
+		        clist->checks[k].state==PJ_ICE_SESS_CHECK_STATE_IN_PROGRESS)
+		    {
+			break;
+		    }
+
+		    /* Don't unfreeze if this pair does not have the lowest
+		     * comp ID.
+		     */
+		    if (clist->checks[k].lcand->comp_id < lcand->comp_id)
+			break;
+
+		    /* Don't unfreeze if this pair has the lowest comp ID, but
+		     * does not have the highest prio.
+		     */
+		    if (clist->checks[k].lcand->comp_id == lcand->comp_id &&
+			pj_cmp_timestamp(&clist->checks[k].prio, &chk->prio) > 0)
+		    {
+			break;
+		    }
+		}
+
+		/* Unfreeze */
+		if (k == clist->count)
+		     check_set_state(ice, chk, PJ_ICE_SESS_CHECK_STATE_WAITING, 0);
+	    }
+
+	    clist->count++;
+	    new_pair++;
+	}
+    }
+
+    /* This could happen if candidates have no matching address families */
+    if (clist->count==0 && trickle_done) {
+	LOG4((ice->obj_name,  "Error: no checklist can be created"));
+	return PJ_ENOTFOUND;
+    }
+
+    /* Update paired candidate counts */
+    ice->lcand_paired = ice->lcand_cnt;
+    ice->rcand_paired = ice->rcand_cnt;
+
+    if (new_pair) {
+	/* Sort checklist based on priority */
+	//dump_checklist("Checklist before sort:", ice, &ice->clist);
+	sort_checklist(ice, clist);
+
+	/* Prune the checklist */
+	//dump_checklist("Checklist before prune:", ice, &ice->clist);
+	status = prune_checklist(ice, clist);
+	if (status != PJ_SUCCESS)
+	    return status;
+    }
+
+    /* Regular ICE or trickle ICE after end-of-candidates indication:
+     * Disable our components which don't have matching component
      */
-    if (check->err_code == PJ_SUCCESS && 
-	ice->role==PJ_ICE_SESS_ROLE_CONTROLLING &&
-	!ice->is_nominating &&
-	ice->timer.id == TIMER_NONE) 
-    {
-	pj_time_val delay;
+    if (trickle_done) {
+	unsigned highest_comp = 0;
 
-	for (i=0; i<ice->comp_cnt; ++i) {
-	    if (ice->comp[i].valid_check == NULL)
-		break;
+	for (i=0; i<ice->rcand_cnt; ++i) {
+	    if (ice->rcand[i].comp_id > highest_comp)
+		highest_comp = ice->rcand[i].comp_id;
 	}
 
-	if (i < ice->comp_cnt) {
-	    /* Some components still don't have valid pair, continue
-	     * processing.
-	     */
-	    return PJ_FALSE;
+	for (i=highest_comp; i<ice->comp_cnt; ++i) {
+	    if (ice->comp[i].stun_sess) {
+		pj_stun_session_destroy(ice->comp[i].stun_sess);
+		pj_bzero(&ice->comp[i], sizeof(ice->comp[i]));
+	    }
 	}
+	ice->comp_cnt = highest_comp;
 
-	LOG4((ice->obj_name, 
-	      "Scheduling nominated check in %d ms",
-	      ice->opt.nominated_check_delay));
-
-	pj_timer_heap_cancel_if_active(ice->stun_cfg.timer_heap, &ice->timer,
-	                               TIMER_NONE);
-
-	/* All components have valid pair. Let connectivity checks run for
-	 * a little bit more time, then start our nominated check.
+	/* If using trickle ICE and end-of-candidate has been signalled,
+	 * check for ICE nego completion.
 	 */
-	delay.sec = 0;
-	delay.msec = ice->opt.nominated_check_delay;
-	pj_time_val_normalize(&delay);
+	if (ice->opt.trickle != PJ_ICE_SESS_TRICKLE_DISABLED)
+	    check_ice_complete(ice);
+    }
 
-	pj_timer_heap_schedule_w_grp_lock(ice->stun_cfg.timer_heap,
-	                                  &ice->timer, &delay,
-	                                  TIMER_START_NOMINATED_CHECK,
-	                                  ice->grp_lock);
-	return PJ_FALSE;
+    /* For trickle ICE: resume the periodic check, it may be halted when
+     * there is no available check pair.
+     */
+    if (ice->opt.trickle != PJ_ICE_SESS_TRICKLE_DISABLED &&
+	clist->count > 0 && !ice->is_complete &&
+	clist->state == PJ_ICE_SESS_CHECKLIST_ST_RUNNING)
+    {
+	if (!pj_timer_entry_running(&clist->timer)) {
+	    pj_time_val delay = {0, 0};
+	    status = pj_timer_heap_schedule_w_grp_lock(
+						    ice->stun_cfg.timer_heap,
+						    &clist->timer, &delay,
+						    PJ_TRUE,
+						    ice->grp_lock);
+	    if (status == PJ_SUCCESS) {
+		LOG5((ice->obj_name,
+		      "Trickle ICE resumes periodic check because "
+		      "check pair is available"));
+	    }
+	}
     }
 
-    /* We still have checks to perform */
-    return PJ_FALSE;
+    /* Stop the end-of-candidates indication timer if trickling is done */
+    if (trickle_done && pj_timer_entry_running(&ice->timer_end_of_cand)) {
+	pj_timer_heap_cancel_if_active(ice->stun_cfg.timer_heap,
+				       &ice->timer_end_of_cand, 0);
+    }
+
+    return PJ_SUCCESS;
 }
 
 
@@ -1632,133 +2101,128 @@
     char buf[128];
     pj_str_t username;
     timer_data *td;
-    unsigned i, j;
-    unsigned highest_comp = 0;
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(ice && rem_ufrag && rem_passwd && rem_cand_cnt &&
-		     rem_cand, PJ_EINVAL);
-    PJ_ASSERT_RETURN(rem_cand_cnt + ice->rcand_cnt <= PJ_ICE_MAX_CAND,
-		     PJ_ETOOMANY);
+    PJ_ASSERT_RETURN(ice && rem_ufrag && rem_passwd, PJ_EINVAL);
 
     pj_grp_lock_acquire(ice->grp_lock);
 
+    if (ice->tx_ufrag.slen) {
+	/* Checklist has been created */
+	pj_grp_lock_release(ice->grp_lock);
+	return PJ_SUCCESS;
+    }
+
     /* Save credentials */
     username.ptr = buf;
 
     pj_strcpy(&username, rem_ufrag);
     pj_strcat2(&username, ":");
     pj_strcat(&username, &ice->rx_ufrag);
-
     pj_strdup(ice->pool, &ice->tx_uname, &username);
+
     pj_strdup(ice->pool, &ice->tx_ufrag, rem_ufrag);
     pj_strdup(ice->pool, &ice->tx_pass, rem_passwd);
 
     pj_strcpy(&username, &ice->rx_ufrag);
     pj_strcat2(&username, ":");
     pj_strcat(&username, rem_ufrag);
-
     pj_strdup(ice->pool, &ice->rx_uname, &username);
 
+    /* Init timer entry in the checklist. Initially the timer ID is FALSE
+     * because timer is not running.
+     */
+    clist = &ice->clist;
+    clist->timer.id = PJ_FALSE;
+    td = PJ_POOL_ZALLOC_T(ice->pool, timer_data);
+    td->ice = ice;
+    td->clist = clist;
+    clist->timer.user_data = (void*)td;
+    clist->timer.cb = &periodic_timer;
 
-    /* Save remote candidates */
-    ice->rcand_cnt = 0;
-    for (i=0; i<rem_cand_cnt; ++i) {
-	pj_ice_sess_cand *cn = &ice->rcand[ice->rcand_cnt];
+    ice->clist.count = 0;
+    ice->lcand_paired = ice->rcand_paired = 0;
 
-	/* Ignore candidate which has no matching component ID */
-	if (rem_cand[i].comp_id==0 || rem_cand[i].comp_id > ice->comp_cnt) {
-	    continue;
+    /* Build checklist only if both sides have candidates already */
+    if (ice->lcand_cnt > 0 && rem_cand_cnt > 0) {
+	status = add_rcand_and_update_checklist(ice, rem_cand_cnt, rem_cand,
+						!ice->is_trickling);
+	if (status != PJ_SUCCESS) {
+	    pj_grp_lock_release(ice->grp_lock);
+	    return status;
 	}
 
-	if (rem_cand[i].comp_id > highest_comp)
-	    highest_comp = rem_cand[i].comp_id;
-
-	pj_memcpy(cn, &rem_cand[i], sizeof(pj_ice_sess_cand));
-	pj_strdup(ice->pool, &cn->foundation, &rem_cand[i].foundation);
-	ice->rcand_cnt++;
+	/* Log checklist */
+	dump_checklist("Checklist created:", ice, clist);
     }
 
-    /* Generate checklist */
-    clist = &ice->clist;
-    for (i=0; i<ice->lcand_cnt; ++i) {
-	for (j=0; j<ice->rcand_cnt; ++j) {
-
-	    pj_ice_sess_cand *lcand = &ice->lcand[i];
-	    pj_ice_sess_cand *rcand = &ice->rcand[j];
-	    pj_ice_sess_check *chk = NULL;
-
-	    if (clist->count >= PJ_ICE_MAX_CHECKS) {
-		pj_grp_lock_release(ice->grp_lock);
-		return PJ_ETOOMANY;
-	    } 
-
-           chk = &clist->checks[clist->count];
+    pj_grp_lock_release(ice->grp_lock);
 
-	    /* A local candidate is paired with a remote candidate if
-	     * and only if the two candidates have the same component ID 
-	     * and have the same IP address version. 
-	     */
-	    if ((lcand->comp_id != rcand->comp_id) ||
-		(lcand->addr.addr.sa_family != rcand->addr.addr.sa_family))
-	    {
-		continue;
-	    }
+    return PJ_SUCCESS;
+}
 
 
-	    chk->lcand = lcand;
-	    chk->rcand = rcand;
-	    chk->state = PJ_ICE_SESS_CHECK_STATE_FROZEN;
+/* Update checklist by pairing local candidates with remote candidates */
+PJ_DEF(pj_status_t) pj_ice_sess_update_check_list(
+			      pj_ice_sess *ice,
+			      const pj_str_t *rem_ufrag,
+			      const pj_str_t *rem_passwd,
+			      unsigned rem_cand_cnt,
+			      const pj_ice_sess_cand rem_cand[],
+			      pj_bool_t trickle_done)
+{
+    pj_status_t status = PJ_SUCCESS;
 
-	    chk->prio = CALC_CHECK_PRIO(ice, lcand, rcand);
+    PJ_ASSERT_RETURN(ice && ((rem_cand_cnt==0) ||
+			     (rem_ufrag && rem_passwd && rem_cand)),
+		     PJ_EINVAL);
 
-	    clist->count++;
-	}
-    }
+    pj_grp_lock_acquire(ice->grp_lock);
 
-    /* This could happen if candidates have no matching address families */
-    if (clist->count == 0) {
-	LOG4((ice->obj_name,  "Error: no checklist can be created"));
+    /* Ignore if remote ufrag has not known yet */
+    if (ice->tx_ufrag.slen == 0) {
+	LOG5((ice->obj_name,
+	      "Cannot update ICE checklist when remote ufrag is unknown"));
 	pj_grp_lock_release(ice->grp_lock);
-	return PJ_ENOTFOUND;
+	return PJ_EINVALIDOP;
     }
 
-    /* Sort checklist based on priority */
-    sort_checklist(ice, clist);
-
-    /* Prune the checklist */
-    status = prune_checklist(ice, clist);
-    if (status != PJ_SUCCESS) {
+    /* Ignore if trickle has been stopped (e.g: received end-of-candidate) */
+    if (!ice->is_trickling && rem_cand_cnt) {
+	LOG5((ice->obj_name,
+	      "Ignored remote candidate update as ICE trickling has ended"));
 	pj_grp_lock_release(ice->grp_lock);
-	return status;
+	return PJ_SUCCESS;
     }
-
-    /* Disable our components which don't have matching component */
-    for (i=highest_comp; i<ice->comp_cnt; ++i) {
-	if (ice->comp[i].stun_sess) {
-	    pj_stun_session_destroy(ice->comp[i].stun_sess);
-	    pj_bzero(&ice->comp[i], sizeof(ice->comp[i]));
-	}
+    
+    /* Verify remote ufrag & passwd, if remote candidate specified */
+    if (rem_cand_cnt && (pj_strcmp(&ice->tx_ufrag, rem_ufrag) ||
+			 pj_strcmp(&ice->tx_pass, rem_passwd)))
+    {
+	LOG5((ice->obj_name, "Ignored remote candidate update due to remote "
+			     "ufrag/pwd mismatch"));
+	rem_cand_cnt = 0;
     }
-    ice->comp_cnt = highest_comp;
-
-    /* Init timer entry in the checklist. Initially the timer ID is FALSE
-     * because timer is not running.
-     */
-    clist->timer.id = PJ_FALSE;
-    td = PJ_POOL_ZALLOC_T(ice->pool, timer_data);
-    td->ice = ice;
-    td->clist = clist;
-    clist->timer.user_data = (void*)td;
-    clist->timer.cb = &periodic_timer;
 
+    if (status == PJ_SUCCESS) {
+	status = add_rcand_and_update_checklist(ice, rem_cand_cnt, rem_cand,
+						trickle_done);
+    }
 
     /* Log checklist */
-    dump_checklist("Checklist created:", ice, clist);
+    if (status == PJ_SUCCESS)
+	dump_checklist("Checklist updated:", ice, &ice->clist);
+
+    if (trickle_done && ice->is_trickling) {
+	LOG5((ice->obj_name, "Remote signalled end-of-candidates "
+			     "and local candidates gathering completed, "
+			     "will ignore any candidate update"));
+	ice->is_trickling = PJ_FALSE;
+    }
 
     pj_grp_lock_release(ice->grp_lock);
 
-    return PJ_SUCCESS;
+    return status;
 }
 
 /* Perform check on the specified candidate pair. */
@@ -1804,13 +2268,16 @@
     msg_data->data.req.ice = ice;
     msg_data->data.req.clist = clist;
     msg_data->data.req.ckid = check_id;
+    msg_data->data.req.lcand = check->lcand;
+    msg_data->data.req.rcand = check->rcand;
 
     /* Add PRIORITY */
 #if PJNATH_ICE_PRIO_STD
-    prio = CALC_CAND_PRIO(ice, PJ_ICE_CAND_TYPE_PRFLX, 65535, 
+    prio = CALC_CAND_PRIO(ice, PJ_ICE_CAND_TYPE_PRFLX, 65535 - lcand->id,
 			  lcand->comp_id);
 #else
-    prio = CALC_CAND_PRIO(ice, PJ_ICE_CAND_TYPE_PRFLX, 0, 
+    prio = CALC_CAND_PRIO(ice, PJ_ICE_CAND_TYPE_PRFLX,
+			  ((1 << PJ_ICE_LOCAL_PREF_BITS) - 1) - lcand->id,
 			  lcand->comp_id);
 #endif
     pj_stun_msg_add_uint_attr(check->tdata->pool, check->tdata->msg, 
@@ -1932,10 +2399,11 @@
 	}
     }
 
-    /* Cannot start check because there's no suitable candidate pair.
+    /* Schedule next check for next candidate pair, unless there is no
+     * suitable candidate pair (all pairs have been checked or empty
+     * checklist).
      */
     if (start_count!=0) {
-	/* Schedule for next timer */
 	pj_time_val timeout = {0, PJ_ICE_TA_VAL};
 
 	pj_time_val_normalize(&timeout);
@@ -1961,6 +2429,12 @@
 
     pj_assert(ice->is_nominating == PJ_FALSE);
 
+    /* Stop trickling if not yet */
+    if (ice->is_trickling) {
+	ice->is_trickling = PJ_FALSE;
+	LOG5((ice->obj_name, "Trickling stopped as nomination started."));
+    }
+
     /* Stop our timer if it's active */
     if (ice->timer.id == TIMER_START_NOMINATED_CHECK) {
 	pj_timer_heap_cancel_if_active(ice->stun_cfg.timer_heap, &ice->timer,
@@ -2016,19 +2490,6 @@
 }
 
 
-/* Utility: find string in string array */
-static const pj_str_t *find_str(const pj_str_t *strlist[], unsigned count,
-				const pj_str_t *str)
-{
-    unsigned i;
-    for (i=0; i<count; ++i) {
-	if (pj_strcmp(strlist[i], str)==0)
-	    return strlist[i];
-    }
-    return NULL;
-}
-
-
 /*
  * Start ICE periodic check. This function will return immediately, and
  * application will be notified about the connectivity check status in
@@ -2037,17 +2498,15 @@
 PJ_DEF(pj_status_t) pj_ice_sess_start_check(pj_ice_sess *ice)
 {
     pj_ice_sess_checklist *clist;
-    const pj_ice_sess_cand *cand0;
-    const pj_str_t *flist[PJ_ICE_MAX_CAND]; // XXX
     pj_ice_rx_check *rcheck;
-    unsigned i, flist_cnt = 0;
-    pj_time_val delay;
-    pj_status_t status;
+    unsigned i;
+    pj_status_t status = PJ_SUCCESS;
 
     PJ_ASSERT_RETURN(ice, PJ_EINVAL);
 
     /* Checklist must have been created */
-    PJ_ASSERT_RETURN(ice->clist.count > 0, PJ_EINVALIDOP);
+    if (ice->clist.count == 0 && !ice->is_trickling)
+    	return PJ_EINVALIDOP;
 
     /* Lock session */
     pj_grp_lock_acquire(ice->grp_lock);
@@ -2072,48 +2531,42 @@
      */
 
     clist = &ice->clist;
+    for (i=0; i < clist->foundation_cnt; ++i) {
+	unsigned k;
+	pj_ice_sess_check *chk = NULL;
+
+	for (k=0; k < clist->count; ++k) {
+	    pj_ice_sess_check *c = &clist->checks[k];
+	    if (c->foundation_idx != (int)i ||
+		c->state != PJ_ICE_SESS_CHECK_STATE_FROZEN)
+	    {
+		continue;
+	    }
 
-    /* Pickup the first pair for component 1. */
-    for (i=0; i<clist->count; ++i) {
-	if (clist->checks[i].lcand->comp_id == 1)
-	    break;
-    }
-    if (i == clist->count) {
-	pj_assert(!"Unable to find checklist for component 1");
-	pj_grp_lock_release(ice->grp_lock);
-	pj_log_pop_indent();
-	return PJNATH_EICEINCOMPID;
-    }
-
-    /* Set this check to WAITING only if state is frozen. It may be possible
-     * that this check has already been started by a trigger check
-     */
-    if (clist->checks[i].state == PJ_ICE_SESS_CHECK_STATE_FROZEN) {
-	check_set_state(ice, &clist->checks[i], 
-			PJ_ICE_SESS_CHECK_STATE_WAITING, PJ_SUCCESS);
-    }
-
-    cand0 = clist->checks[i].lcand;
-    flist[flist_cnt++] = &clist->checks[i].lcand->foundation;
-
-    /* Find all of the other pairs in that check list with the same
-     * component ID, but different foundations, and sets all of their
-     * states to Waiting as well.
-     */
-    for (++i; i<clist->count; ++i) {
-	const pj_ice_sess_cand *cand1;
+	    /* First pair of this foundation */
+	    if (chk == NULL) {
+		chk = c;
+		continue;
+	    }
 
-	cand1 = clist->checks[i].lcand;
+	    /* Found the lowest comp ID so far */
+	    if (c->lcand->comp_id < chk->lcand->comp_id) {
+		chk = c;
+		continue;
+	    }
 
-	if (cand1->comp_id==cand0->comp_id &&
-	    find_str(flist, flist_cnt, &cand1->foundation)==NULL)
-	{
-	    if (clist->checks[i].state == PJ_ICE_SESS_CHECK_STATE_FROZEN) {
-		check_set_state(ice, &clist->checks[i], 
-				PJ_ICE_SESS_CHECK_STATE_WAITING, PJ_SUCCESS);
+	    /* Found the lowest comp ID and the highest prio so far */
+	    if (c->lcand->comp_id == chk->lcand->comp_id &&
+		pj_cmp_timestamp(&c->prio, &chk->prio) > 0)
+	    {
+		chk = c;
+		continue;
 	    }
-	    flist[flist_cnt++] = &cand1->foundation;
 	}
+
+	/* Unfreeze */
+	if (chk)
+	    check_set_state(ice, chk, PJ_ICE_SESS_CHECK_STATE_WAITING, 0);
     }
 
     /* First, perform all pending triggered checks, simultaneously. */
@@ -2134,12 +2587,30 @@
      * instead to reduce stack usage:
      * return start_periodic_check(ice->stun_cfg.timer_heap, &clist->timer);
      */
-    delay.sec = delay.msec = 0;
-    status = pj_timer_heap_schedule_w_grp_lock(ice->stun_cfg.timer_heap,
-                                               &clist->timer, &delay,
-                                               PJ_TRUE, ice->grp_lock);
-    if (status != PJ_SUCCESS) {
-	clist->timer.id = PJ_FALSE;
+    if (!pj_timer_entry_running(&clist->timer)) {
+	pj_time_val delay = {0, 0};
+	status = pj_timer_heap_schedule_w_grp_lock(ice->stun_cfg.timer_heap,
+						   &clist->timer, &delay,
+						   PJ_TRUE, ice->grp_lock);
+    }
+
+    /* For trickle ICE, start timer for end-of-candidates indication from
+     * remote.
+     */
+    if (ice->is_trickling && !pj_timer_entry_running(&ice->timer_end_of_cand))
+    {
+	pj_time_val delay = {PJ_TRICKLE_ICE_END_OF_CAND_TIMEOUT, 0};
+	pj_timer_entry_init(&ice->timer_end_of_cand, 0, ice,
+			    &end_of_cand_ind_timer);
+	status = pj_timer_heap_schedule_w_grp_lock(
+						ice->stun_cfg.timer_heap,
+						&ice->timer_end_of_cand,
+						&delay, PJ_TRUE,
+						ice->grp_lock);
+	if (status != PJ_SUCCESS) {
+	    LOG4((ice->obj_name,
+		  "Failed to schedule end-of-candidate indication timer"));
+	}
     }
 
     pj_grp_lock_release(ice->grp_lock);
@@ -2198,7 +2669,7 @@
     pj_ice_sess_checklist *clist;
     pj_stun_xor_mapped_addr_attr *xaddr;
     const pj_sockaddr_t *source_addr = src_addr;
-    unsigned i;
+    unsigned i, ckid;
 
     PJ_UNUSED_ARG(stun_sess);
     PJ_UNUSED_ARG(src_addr_len);
@@ -2207,12 +2678,8 @@
 
     ice = msg_data->data.req.ice;
     clist = msg_data->data.req.clist;
-    check = &clist->checks[msg_data->data.req.ckid];
-    
-
-    /* Mark STUN transaction as complete */
-    pj_assert(tdata == check->tdata);
-    check->tdata = NULL;
+    ckid = msg_data->data.req.ckid;
+    check = &clist->checks[ckid];
 
     pj_grp_lock_acquire(ice->grp_lock);
 
@@ -2222,6 +2689,31 @@
 	return;
     }
 
+    /* Verify check (check ID may change as trickle ICE re-sort the list */
+    if (tdata != check->tdata) {
+	/* Okay, it was re-sorted, lookup using lcand & rcand */
+	for (i = 0; i < clist->count; ++i) {
+	    if (clist->checks[i].lcand == msg_data->data.req.lcand &&
+		clist->checks[i].rcand == msg_data->data.req.rcand)
+	    {
+		check = &clist->checks[i];
+		ckid = i;
+		break;
+	    }
+	}
+	if (i == clist->count) {
+	    /* The check may have been pruned (due to low prio) */
+	    check->tdata = NULL;
+	    pj_grp_lock_release(ice->grp_lock);
+	    return;
+	}
+    }
+
+    /* Mark STUN transaction as complete */
+    // Find 'corner case ...'.
+    //pj_assert(tdata == check->tdata);
+    check->tdata = NULL;
+
     /* Init lcand to NULL. lcand will be found from the mapped address
      * found in the response.
      */
@@ -2268,7 +2760,7 @@
 	    LOG4((ice->obj_name, "Resending check because of role conflict"));
 	    pj_log_push_indent();
 	    check_set_state(ice, check, PJ_ICE_SESS_CHECK_STATE_WAITING, 0);
-	    perform_check(ice, clist, msg_data->data.req.ckid, 
+	    perform_check(ice, clist, ckid,
 			  check->nominated || ice->is_nominating);
 	    pj_log_pop_indent();
 	    pj_grp_lock_release(ice->grp_lock);
@@ -2377,6 +2869,54 @@
 	{
 	    /* Match */
 	    lcand = &ice->lcand[i];
+
+#if 0
+	    // The following code tries to verify if the STUN request belongs
+	    // to the correct ICE check (so if it doesn't, it will set current
+	    // ICE check state to FAILED (why?) and try to find the correct
+	    // check). However, ICE check verification has been added in
+	    // the beginning of this function, so the following block should
+	    // not be needed anymore.
+
+	    /* Verify lcand==check->lcand, this may happen when a STUN socket
+	     * corresponds to multiple host candidates.
+	     */
+	    if (lcand != check->lcand) {
+		unsigned j;
+
+		pj_log_push_indent();
+		LOG4((ice->obj_name,
+		     "Check %s%s: local candidate mismatch",
+		     dump_check(ice->tmp.txt, sizeof(ice->tmp.txt),
+				&ice->clist, check),
+		     (check->nominated ? " (nominated)" : " (not nominated)")));
+
+
+		/* Local candidate does not belong to this check! Set current
+		 * check state to Failed.
+		 */
+		check_set_state(ice, check, PJ_ICE_SESS_CHECK_STATE_FAILED,
+				PJNATH_ESTUNNOMAPPEDADDR);
+
+		/* Find the matching check */
+		for (j = 0; j < clist->count; ++j) {
+		    if (clist->checks[j].lcand == lcand &&
+			clist->checks[j].rcand == check->rcand)
+		    {
+			check = &clist->checks[j];
+			break;
+		    }
+		}
+		if (j == clist->count) {
+		    on_check_complete(ice, check);
+		    pj_log_pop_indent();
+		    pj_grp_lock_release(ice->grp_lock);
+		    return;
+		}
+
+		pj_log_pop_indent();
+	    }
+#endif
 	    break;
 	}
     }
@@ -2406,7 +2946,13 @@
 	status = pj_ice_sess_add_cand(ice, check->lcand->comp_id, 
 				      msg_data->transport_id,
 				      PJ_ICE_CAND_TYPE_PRFLX,
-				      65535, &foundation,
+#if PJNATH_ICE_PRIO_STD
+				      65535 - (pj_uint16_t)ice->lcand_cnt,
+#else
+				      ((1 << PJ_ICE_LOCAL_PREF_BITS) - 1) -
+				      ice->lcand_cnt,
+#endif
+				      &foundation,
 				      &xaddr->sockaddr, 
 				      &check->lcand->base_addr, 
 				      &check->lcand->base_addr,
@@ -2422,7 +2968,6 @@
 
 	/* Update local candidate */
 	lcand = &ice->lcand[cand_id];
-
     }
 
     /* 7.1.2.2.3.  Constructing a Valid Pair
@@ -2560,11 +3105,11 @@
 	            pj_stun_msg_find_attr(msg, PJ_STUN_ATTR_ICE_CONTROLLED, 0);
     }
 
-    /* Handle the case when request comes before answer is received.
+    /* Handle the case when request comes before SDP answer is received.
      * We need to put credential in the response, and since we haven't
-     * got the response, copy the username from the request.
+     * got the SDP answer, copy the username from the request.
      */
-    if (ice->rcand_cnt == 0) {
+    if (ice->tx_ufrag.slen == 0) {
 	pj_stun_string_attr *uname_attr;
 
 	uname_attr = (pj_stun_string_attr*)
@@ -2685,7 +3230,7 @@
      * don't have checklist yet, so just save this check in a pending
      * triggered check array to be acted upon later.
      */
-    if (ice->rcand_cnt == 0) {
+    if (ice->tx_ufrag.slen == 0) {
 	rcheck = PJ_POOL_ZALLOC_T(ice->pool, pj_ice_rx_check);
     } else {
 	rcheck = &tmp_rcheck;
@@ -2700,7 +3245,7 @@
     rcheck->priority = prio_attr->value;
     rcheck->role_attr = role_attr;
 
-    if (ice->rcand_cnt == 0) {
+    if (ice->tx_ufrag.slen == 0) {
 	/* We don't have answer yet, so keep this request for later */
 	LOG4((ice->obj_name, "Received an early check for comp %d",
 	      rcheck->comp_id));
@@ -2853,14 +3398,22 @@
 	if (c->state == PJ_ICE_SESS_CHECK_STATE_FROZEN ||
 	    c->state == PJ_ICE_SESS_CHECK_STATE_WAITING)
 	{
-	    /* See if we shall nominate this check */
-	    pj_bool_t nominate = (c->nominated || ice->is_nominating);
-
-	    LOG5((ice->obj_name, "Performing triggered check for check %d",i));
-	    pj_log_push_indent();
-	    perform_check(ice, &ice->clist, i, nominate);
-	    pj_log_pop_indent();
+	    /* If we are nominating in regular nomination, don't nominate this
+	     * triggered check immediately, just wait for its scheduled check.
+	     */
+	    if (ice->is_nominating && !ice->opt.aggressive) {
+		LOG5((ice->obj_name, "Triggered check for check %d not "
+		      "performed because nomination is in progress", i));
+	    } else {
+		/* See if we shall nominate this check */
+		pj_bool_t nominate = (c->nominated || ice->is_nominating);
 
+		LOG5((ice->obj_name, "Performing triggered check for "
+		      "check %d",i));
+		pj_log_push_indent();
+		perform_check(ice, &ice->clist, i, nominate);
+		pj_log_pop_indent();
+	    }
 	} else if (c->state == PJ_ICE_SESS_CHECK_STATE_IN_PROGRESS) {
 	    /* Should retransmit immediately
 	     */
@@ -2920,7 +3473,7 @@
     else if (ice->clist.count < PJ_ICE_MAX_CHECKS) {
 
 	pj_ice_sess_check *c = &ice->clist.checks[ice->clist.count];
-	pj_bool_t nominate;
+	unsigned check_id = ice->clist.count;
 
 	c->lcand = lcand;
 	c->rcand = rcand;
@@ -2928,14 +3481,37 @@
 	c->state = PJ_ICE_SESS_CHECK_STATE_WAITING;
 	c->nominated = rcheck->use_candidate;
 	c->err_code = PJ_SUCCESS;
+	++ice->clist.count;
 
-	nominate = (c->nominated || ice->is_nominating);
+	LOG4((ice->obj_name, "New triggered check added: %d", check_id));
 
-	LOG4((ice->obj_name, "New triggered check added: %d", 
-	     ice->clist.count));
-	pj_log_push_indent();
-	perform_check(ice, &ice->clist, ice->clist.count++, nominate);
-	pj_log_pop_indent();
+	/* If we are nominating in regular nomination, don't nominate this
+	 * newly found pair.
+	 */
+	if (ice->is_nominating && !ice->opt.aggressive) {
+	    LOG5((ice->obj_name, "Triggered check for check %d not "
+		  "performed because nomination is in progress", check_id));
+
+	    /* Just in case the periodic check has been stopped (due to no more
+	     * pair to check), let's restart it for this pair.
+	     */
+	    if (!pj_timer_entry_running(&ice->clist.timer)) {
+		pj_time_val delay = {0, 0};
+		pj_timer_heap_schedule_w_grp_lock(ice->stun_cfg.timer_heap,
+						  &ice->clist.timer, &delay,
+						  PJ_TRUE, ice->grp_lock);
+	    }
+	} else {
+	    pj_bool_t nominate;
+	    nominate = (c->nominated || ice->is_nominating);
+
+	    pj_log_push_indent();
+	    perform_check(ice, &ice->clist, check_id, nominate);
+	    pj_log_pop_indent();
+	}
+
+    	/* Re-sort the list because of the newly added pair. */
+    	sort_checklist(ice, &ice->clist);
 
     } else {
 	LOG4((ice->obj_name, "Error: unable to perform triggered check: "
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath/ice_strans.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath/ice_strans.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath/ice_strans.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath/ice_strans.c	2022-02-24 07:54:38.000000000 +0000
@@ -64,9 +64,9 @@
 #   define HOST_PREF   65535
 #   define RELAY_PREF  65535
 #else
-#   define SRFLX_PREF  0
-#   define HOST_PREF   0
-#   define RELAY_PREF  0
+#   define SRFLX_PREF  ((1 << PJ_ICE_LOCAL_PREF_BITS) - 1)
+#   define HOST_PREF   ((1 << PJ_ICE_LOCAL_PREF_BITS) - 1)
+#   define RELAY_PREF  ((1 << PJ_ICE_LOCAL_PREF_BITS) - 1)
 #endif
 
 
@@ -89,6 +89,7 @@
 
 
 /* ICE callbacks */
+static void	   on_valid_pair(pj_ice_sess *ice);
 static void	   on_ice_complete(pj_ice_sess *ice, pj_status_t status);
 static pj_status_t ice_tx_pkt(pj_ice_sess *ice,
 			      unsigned comp_id,
@@ -207,6 +208,8 @@
 
     pj_ice_strans_state	     state;	/**< Session state.		*/
     pj_ice_sess		    *ice;	/**< ICE session.		*/
+    pj_ice_sess		    *ice_prev;	/**< Previous ICE session.	*/
+    pj_grp_lock_handler	     ice_prev_hndlr; /**< Handler of prev ICE	*/
     pj_time_val		     start_time;/**< Time when ICE was started	*/
 
     unsigned		     comp_cnt;	/**< Number of components.	*/
@@ -225,6 +228,11 @@
     pj_bool_t		     destroy_req;/**< Destroy has been called?	*/
     pj_bool_t		     cb_called;	/**< Init error callback called?*/
     pj_bool_t		     call_send_cb;/**< Need to call send cb?	*/
+
+    pj_bool_t		     rem_cand_end;/**< Trickle ICE: remote has
+					       signalled end of candidate? */
+    pj_bool_t		     loc_cand_end;/**< Trickle ICE: local has
+					       signalled end of candidate? */
 };
 
 
@@ -417,7 +425,7 @@
 	cand = &comp->cand_list[comp->cand_cnt];
 	cand->type = PJ_ICE_CAND_TYPE_RELAYED;
 	cand->status = PJ_EPENDING;
-	cand->local_pref = RELAY_PREF;
+	cand->local_pref = (pj_uint16_t)(RELAY_PREF - idx);
 	cand->transport_id = tp_id;
 	cand->comp_id = (pj_uint8_t) comp->comp_id;
 	new_cand = PJ_TRUE;
@@ -437,6 +445,14 @@
 	return status;
     }
 
+    if (new_cand) {
+	/* Commit the relayed candidate before pj_turn_sock_alloc(), as
+	 * otherwise there can be race condition, please check
+	 * https://github.com/pjsip/pjproject/pull/2525 for more info.
+	 */
+	comp->cand_cnt++;
+    }
+
     /* Add pending job */
     ///sess_add_ref(ice_st);
 
@@ -449,14 +465,10 @@
 			      &turn_cfg->alloc_param);
     if (status != PJ_SUCCESS) {
 	///sess_dec_ref(ice_st);
+	cand->status = status;
 	return status;
     }
 
-    if (new_cand) {
-	/* Commit the relayed candidate. */
-	comp->cand_cnt++;
-    }
-
     PJ_LOG(4,(ice_st->obj_name,
 		  "Comp %d/%d: TURN relay candidate (tpid=%d) "
 		  "waiting for allocation",
@@ -479,7 +491,8 @@
         || lcand->status != rcand->status
         || lcand->comp_id != rcand->comp_id
         || lcand->transport_id != rcand->transport_id
-        || lcand->local_pref != rcand->local_pref
+	// local pref is no longer a constant, so it may be different
+        //|| lcand->local_pref != rcand->local_pref
         || lcand->prio != rcand->prio
         || pj_sockaddr_cmp(&lcand->addr, &rcand->addr) != 0
         || pj_sockaddr_cmp(&lcand->base_addr, &rcand->base_addr) != 0)
@@ -538,7 +551,7 @@
     cand = &comp->cand_list[comp->cand_cnt];
     cand->type = PJ_ICE_CAND_TYPE_SRFLX;
     cand->status = PJ_EPENDING;
-    cand->local_pref = SRFLX_PREF;
+    cand->local_pref = (pj_uint16_t)(SRFLX_PREF - idx);
     cand->transport_id = CREATE_TP_ID(TP_STUN, idx);
     cand->comp_id = (pj_uint8_t) comp->comp_id;
 
@@ -655,7 +668,7 @@
 		    continue;
 		}
 		else if (stun_cfg->af == pj_AF_INET6()) {
-		    pj_in6_addr in6addr = {{0}};
+		    pj_in6_addr in6addr = {{{0}}};
 		    in6addr.s6_addr[15] = 1;
 		    if (pj_memcmp(&in6addr, &addr->ipv6.sin6_addr,
 				  sizeof(in6addr))==0)
@@ -678,7 +691,7 @@
 
 	    cand->type = PJ_ICE_CAND_TYPE_HOST;
 	    cand->status = PJ_SUCCESS;
-	    cand->local_pref = HOST_PREF;
+	    cand->local_pref = (pj_uint16_t)(HOST_PREF - cand_cnt);
 	    cand->transport_id = CREATE_TP_ID(TP_STUN, idx);
 	    cand->comp_id = (pj_uint8_t) comp->comp_id;
 	    pj_sockaddr_cp(&cand->addr, addr);
@@ -955,6 +968,15 @@
     /* Check if all candidates are ready (this may call callback) */
     sess_init_update(ice_st);
 
+    /* If ICE init done, notify app about end of candidate gathering via
+     * on_new_candidate() callback.
+     */
+    if (ice_st->state==PJ_ICE_STRANS_STATE_READY &&
+	ice_st->cb.on_new_candidate)
+    {
+	(*ice_st->cb.on_new_candidate)(ice_st, NULL, PJ_TRUE);
+    }
+
     pj_log_pop_indent();
 
     return PJ_SUCCESS;
@@ -965,6 +987,12 @@
 {
     pj_ice_strans *ice_st = (pj_ice_strans*)obj;
 
+    /* Destroy any previous ICE session */
+    if (ice_st->ice_prev) {
+	(*ice_st->ice_prev_hndlr)(ice_st->ice_prev);
+	ice_st->ice_prev = NULL;
+    }
+
     PJ_LOG(4,(ice_st->obj_name, "ICE stream transport %p destroyed", obj));
 
     /* Done */
@@ -996,8 +1024,9 @@
 
     /* Destroy ICE if we have ICE */
     if (ice_st->ice) {
-	pj_ice_sess_destroy(ice_st->ice);
+	pj_ice_sess *ice = ice_st->ice;
 	ice_st->ice = NULL;
+	pj_ice_sess_destroy(ice);
     }
 
     /* Destroy all components */
@@ -1127,6 +1156,13 @@
     if (ice_st->cb.on_ice_complete)
 	(*ice_st->cb.on_ice_complete)(ice_st, PJ_ICE_STRANS_OP_INIT,
 				      status);
+
+    /* Tell ICE session that trickling is done */
+    ice_st->loc_cand_end = PJ_TRUE;
+    if (ice_st->ice && ice_st->ice->is_trickling && ice_st->rem_cand_end) {
+	pj_ice_sess_update_check_list(ice_st->ice, NULL, NULL, 0, NULL,
+				      PJ_TRUE);
+    }
 }
 
 /*
@@ -1173,6 +1209,49 @@
     return PJ_SUCCESS;
 }
 
+/*
+ * Update number of components of the ICE stream transport.
+ */
+PJ_DEF(pj_status_t) pj_ice_strans_update_comp_cnt( pj_ice_strans *ice_st,
+						   unsigned comp_cnt)
+{
+    unsigned i;
+
+    PJ_ASSERT_RETURN(ice_st && comp_cnt < ice_st->comp_cnt, PJ_EINVAL);
+    PJ_ASSERT_RETURN(ice_st->ice == NULL, PJ_EINVALIDOP);
+
+    pj_grp_lock_acquire(ice_st->grp_lock);
+
+    for (i=comp_cnt; i<ice_st->comp_cnt; ++i) {
+	pj_ice_strans_comp *comp = ice_st->comp[i];
+	unsigned j;
+
+	/* Destroy the component */
+	for (j = 0; j < ice_st->cfg.stun_tp_cnt; ++j) {
+	    if (comp->stun[j].sock) {
+		pj_stun_sock_destroy(comp->stun[j].sock);
+		comp->stun[j].sock = NULL;
+	    }
+	}
+	for (j = 0; j < ice_st->cfg.turn_tp_cnt; ++j) {
+	    if (comp->turn[j].sock) {
+		pj_turn_sock_destroy(comp->turn[j].sock);
+		comp->turn[j].sock = NULL;
+	    }
+	}
+	comp->cand_cnt = 0;
+	ice_st->comp[i] = NULL;
+    }
+    ice_st->comp_cnt = comp_cnt;
+    pj_grp_lock_release(ice_st->grp_lock);
+
+    PJ_LOG(4,(ice_st->obj_name,
+	      "Updated ICE stream transport components number to %d",
+	      comp_cnt));
+
+    return PJ_SUCCESS;
+}
+
 /**
  * Get the group lock for this ICE stream transport.
  */
@@ -1204,10 +1283,20 @@
 
     /* Init callback */
     pj_bzero(&ice_cb, sizeof(ice_cb));
+    ice_cb.on_valid_pair   = &on_valid_pair;
     ice_cb.on_ice_complete = &on_ice_complete;
     ice_cb.on_rx_data = &ice_rx_data;
     ice_cb.on_tx_pkt = &ice_tx_pkt;
 
+    /* Release the pool of previous ICE session to avoid memory bloat,
+     * as otherwise it will only be released after ICE strans is destroyed
+     * (due to group lock).
+     */
+    if (ice_st->ice_prev) {
+	(*ice_st->ice_prev_hndlr)(ice_st->ice_prev);
+	ice_st->ice_prev = NULL;
+    }
+
     /* Create! */
     status = pj_ice_sess_create(&ice_st->cfg.stun_cfg, ice_st->obj_name, role,
 			        ice_st->comp_cnt, &ice_cb,
@@ -1312,7 +1401,9 @@
  */
 PJ_DEF(pj_bool_t) pj_ice_strans_sess_is_running(pj_ice_strans *ice_st)
 {
-    return ice_st && ice_st->ice && ice_st->ice->rcand_cnt &&
+    // Trickle ICE can start ICE before remote candidate list is received
+    return ice_st && ice_st->ice && /* ice_st->ice->rcand_cnt && */
+	   ice_st->ice->clist.state == PJ_ICE_SESS_CHECKLIST_ST_RUNNING &&
 	   !pj_ice_strans_sess_is_complete(ice_st);
 }
 
@@ -1356,7 +1447,8 @@
     if (loc_pwd) *loc_pwd = ice_st->ice->rx_pass;
 
     if (rem_ufrag || rem_pwd) {
-	PJ_ASSERT_RETURN(ice_st->ice->rcand_cnt != 0, PJ_EINVALIDOP);
+	// In trickle ICE, remote may send initial SDP with empty candidates
+	//PJ_ASSERT_RETURN(ice_st->ice->rcand_cnt != 0, PJ_EINVALIDOP);
 	if (rem_ufrag) *rem_ufrag = ice_st->ice->tx_ufrag;
 	if (rem_pwd) *rem_pwd = ice_st->ice->tx_pass;
     }
@@ -1454,43 +1546,36 @@
     return pj_ice_sess_change_role(ice_st->ice, new_role);
 }
 
-/*
- * Start ICE processing !
- */
-PJ_DEF(pj_status_t) pj_ice_strans_start_ice( pj_ice_strans *ice_st,
-					     const pj_str_t *rem_ufrag,
-					     const pj_str_t *rem_passwd,
-					     unsigned rem_cand_cnt,
-					     const pj_ice_sess_cand rem_cand[])
+static pj_status_t setup_turn_perm( pj_ice_strans *ice_st)
 {
     unsigned n;
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(ice_st && rem_ufrag && rem_passwd &&
-		     rem_cand_cnt && rem_cand, PJ_EINVAL);
-
-    /* Mark start time */
-    pj_gettimeofday(&ice_st->start_time);
-
-    /* Build check list */
-    status = pj_ice_sess_create_check_list(ice_st->ice, rem_ufrag, rem_passwd,
-					   rem_cand_cnt, rem_cand);
-    if (status != PJ_SUCCESS)
-	return status;
-
-    /* If we have TURN candidate, now is the time to create the permissions */
     for (n = 0; n < ice_st->cfg.turn_tp_cnt; ++n) {
-	unsigned i;
+	unsigned i, comp_cnt;
 
-	for (i=0; i<ice_st->comp_cnt; ++i) {
+	comp_cnt = pj_ice_strans_get_running_comp_cnt(ice_st);
+	for (i=0; i<comp_cnt; ++i) {
 	    pj_ice_strans_comp *comp = ice_st->comp[i];
+	    pj_turn_session_info info;
 	    pj_sockaddr addrs[PJ_ICE_ST_MAX_CAND];
 	    unsigned j, count=0;
+	    unsigned rem_cand_cnt;
+	    const pj_ice_sess_cand *rem_cand;
 
 	    if (!comp->turn[n].sock)
 		continue;
 
+	    status = pj_turn_sock_get_info(comp->turn[n].sock, &info);
+	    if (status != PJ_SUCCESS || info.state != PJ_TURN_STATE_READY)
+		continue;
+
 	    /* Gather remote addresses for this component */
+	    rem_cand_cnt = ice_st->ice->rcand_cnt;
+	    rem_cand = ice_st->ice->rcand;
+	    if (status != PJ_SUCCESS)
+		continue;
+
 	    for (j=0; j<rem_cand_cnt && count<PJ_ARRAY_SIZE(addrs); ++j) {
 		if (rem_cand[j].comp_id==i+1 &&
 		    rem_cand[j].addr.addr.sa_family==
@@ -1501,8 +1586,9 @@
 	    }
 
 	    if (count && !comp->turn[n].err_cnt && comp->turn[n].sock) {
-		status = pj_turn_sock_set_perm(comp->turn[n].sock, count,
-					       addrs, 0);
+		status = pj_turn_sock_set_perm(
+				    comp->turn[n].sock, count,
+				    addrs, PJ_ICE_ST_USE_TURN_PERMANENT_PERM);
 		if (status != PJ_SUCCESS) {
 		    pj_ice_strans_stop_ice(ice_st);
 		    return status;
@@ -1511,6 +1597,40 @@
 	}
     }
 
+    return PJ_SUCCESS;
+}
+
+/*
+ * Start ICE processing !
+ */
+PJ_DEF(pj_status_t) pj_ice_strans_start_ice( pj_ice_strans *ice_st,
+					     const pj_str_t *rem_ufrag,
+					     const pj_str_t *rem_passwd,
+					     unsigned rem_cand_cnt,
+					     const pj_ice_sess_cand rem_cand[])
+{
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(ice_st, PJ_EINVAL);
+    PJ_ASSERT_RETURN(ice_st->ice, PJ_EINVALIDOP);
+
+    /* Mark start time */
+    pj_gettimeofday(&ice_st->start_time);
+
+    /* Update check list */
+    status = pj_ice_strans_update_check_list(ice_st, rem_ufrag, rem_passwd,
+					     rem_cand_cnt, rem_cand,
+					     !ice_st->ice->is_trickling);
+    if (status != PJ_SUCCESS)
+	return status;
+
+    /* If we have TURN candidate, now is the time to create the permissions */
+    status = setup_turn_perm(ice_st);
+    if (status != PJ_SUCCESS) {
+	pj_ice_strans_stop_ice(ice_st);
+	return status;
+    }
+
     /* Start ICE negotiation! */
     status = pj_ice_sess_start_check(ice_st->ice);
     if (status != PJ_SUCCESS) {
@@ -1522,6 +1642,78 @@
     return status;
 }
 
+
+/*
+ * Update check list after discovering and conveying new local ICE candidate,
+ * or receiving update of remote ICE candidates in trickle ICE.
+ */
+PJ_DEF(pj_status_t) pj_ice_strans_update_check_list(
+					 pj_ice_strans *ice_st,
+					 const pj_str_t *rem_ufrag,
+					 const pj_str_t *rem_passwd,
+					 unsigned rem_cand_cnt,
+					 const pj_ice_sess_cand rem_cand[],
+					 pj_bool_t rcand_end)
+{
+    pj_bool_t checklist_created;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(ice_st && ((rem_cand_cnt==0) ||
+			        (rem_ufrag && rem_passwd && rem_cand)),
+		     PJ_EINVAL);
+    PJ_ASSERT_RETURN(ice_st->ice, PJ_EINVALIDOP);
+
+    pj_grp_lock_acquire(ice_st->grp_lock);
+
+    checklist_created = ice_st->ice->tx_ufrag.slen > 0;
+
+    /* Create checklist (if not yet) */
+    if (rem_ufrag && !checklist_created) {
+	status = pj_ice_sess_create_check_list(ice_st->ice, rem_ufrag,
+					       rem_passwd, rem_cand_cnt,
+					       rem_cand);
+	if (status != PJ_SUCCESS) {
+	    PJ_PERROR(4,(ice_st->obj_name, status,
+			 "Failed setting up remote ufrag"));
+	    pj_grp_lock_release(ice_st->grp_lock);
+	    return status;
+	}
+    }
+
+    /* Update checklist for trickling ICE */
+    if (ice_st->ice->is_trickling) {
+	if (rcand_end && !ice_st->rem_cand_end)
+	    ice_st->rem_cand_end = PJ_TRUE;
+
+	status = pj_ice_sess_update_check_list(
+			    ice_st->ice, rem_ufrag, rem_passwd,
+			    (checklist_created? rem_cand_cnt:0), rem_cand,
+			    (ice_st->rem_cand_end && ice_st->loc_cand_end));
+	if (status != PJ_SUCCESS) {
+	    PJ_PERROR(4,(ice_st->obj_name, status,
+			 "Failed updating checklist"));
+	    pj_grp_lock_release(ice_st->grp_lock);
+	    return status;
+	}
+    }
+
+    /* Update TURN permissions if periodic check has been started. */
+    if (pj_ice_strans_sess_is_running(ice_st)) {
+	status = setup_turn_perm(ice_st);
+	if (status != PJ_SUCCESS) {
+	    PJ_PERROR(4,(ice_st->obj_name, status,
+			 "Failed setting up TURN permission"));
+	    pj_grp_lock_release(ice_st->grp_lock);
+	    return status;
+	}
+    }
+
+    pj_grp_lock_release(ice_st->grp_lock);
+
+    return PJ_SUCCESS;
+}
+
+
 /*
  * Get valid pair.
  */
@@ -1552,8 +1744,10 @@
     pj_grp_lock_acquire(ice_st->grp_lock);
 
     if (ice_st->ice) {
-	pj_ice_sess_destroy(ice_st->ice);
+	ice_st->ice_prev = ice_st->ice;
 	ice_st->ice = NULL;
+	pj_ice_sess_detach_grp_lock(ice_st->ice_prev, &ice_st->ice_prev_hndlr);
+	pj_ice_sess_destroy(ice_st->ice_prev);
     }
 
     ice_st->state = PJ_ICE_STRANS_STATE_INIT;
@@ -1575,7 +1769,7 @@
     pj_status_t status;
 
     /* Allocate send buffer, if necessary. */
-    status = alloc_send_buf(ice_st, data_len);
+    status = alloc_send_buf(ice_st, (unsigned)data_len);
     if (status != PJ_SUCCESS)
     	return status;
     
@@ -1651,18 +1845,20 @@
     	}
     }
 
-    /* If ICE is available, send data with ICE, otherwise send with the
-     * default candidate selected during initialization.
+    /* If ICE is available, send data with ICE. If ICE nego is not completed
+     * yet, ICE will try to send using any valid candidate pair. For any
+     * failure, it will fallback to sending with the default candidate
+     * selected during initialization.
      *
      * https://trac.pjsip.org/repos/ticket/1416:
      * Once ICE has failed, also send data with the default candidate.
      */
-    if (ice_st->ice && ice_st->state == PJ_ICE_STRANS_STATE_RUNNING) {
+    if (ice_st->ice && ice_st->state <= PJ_ICE_STRANS_STATE_RUNNING) {
 	status = pj_ice_sess_send_data(ice_st->ice, comp_id, buf, data_len);
-	
-	pj_grp_lock_release(ice_st->grp_lock);
-	
-	goto on_return;
+	if (status == PJ_SUCCESS || status == PJ_EPENDING) {
+	    pj_grp_lock_release(ice_st->grp_lock);
+	    goto on_return;
+	}
     } 
 
     pj_grp_lock_release(ice_st->grp_lock);
@@ -1792,6 +1988,86 @@
     		     dst_addr_len, PJ_TRUE, PJ_FALSE);
 }
 
+static void on_valid_pair(pj_ice_sess *ice)
+{
+    pj_time_val t;
+    unsigned msec;
+    pj_ice_strans *ice_st = (pj_ice_strans *)ice->user_data;
+    pj_ice_strans_cb cb   = ice_st->cb;
+    pj_status_t status    = PJ_SUCCESS;
+
+    pj_grp_lock_add_ref(ice_st->grp_lock);
+
+    pj_gettimeofday(&t);
+    PJ_TIME_VAL_SUB(t, ice_st->start_time);
+    msec = PJ_TIME_VAL_MSEC(t);
+
+    if (cb.on_valid_pair) {
+	unsigned i;
+	enum {
+	    msg_disable_ind = 0xFFFF & ~(PJ_STUN_SESS_LOG_TX_IND |
+	                                 PJ_STUN_SESS_LOG_RX_IND)
+	};
+
+	PJ_LOG(4,
+	       (ice_st->obj_name, "First ICE candidate nominated in %ds:%03d",
+	        msec / 1000, msec % 1000));
+
+	for (i = 0; i < ice_st->comp_cnt; ++i) {
+	    const pj_ice_sess_check *check;
+	    pj_ice_strans_comp *comp = ice_st->comp[i];
+
+	    check = pj_ice_strans_get_valid_pair(ice_st, i + 1);
+	    if (check) {
+		char lip[PJ_INET6_ADDRSTRLEN + 10];
+		char rip[PJ_INET6_ADDRSTRLEN + 10];
+		unsigned tp_idx = GET_TP_IDX(check->lcand->transport_id);
+		unsigned tp_typ = GET_TP_TYPE(check->lcand->transport_id);
+
+		pj_sockaddr_print(&check->lcand->addr, lip, sizeof(lip), 3);
+		pj_sockaddr_print(&check->rcand->addr, rip, sizeof(rip), 3);
+
+		if (tp_typ == TP_TURN) {
+		    /* Activate channel binding for the remote address
+		     * for more efficient data transfer using TURN.
+		     */
+		    status = pj_turn_sock_bind_channel(
+		            comp->turn[tp_idx].sock, &check->rcand->addr,
+		            sizeof(check->rcand->addr));
+
+		    /* Disable logging for Send/Data indications */
+		    PJ_LOG(5, (ice_st->obj_name,
+		               "Disabling STUN Indication logging for "
+		               "component %d",
+		               i + 1));
+		    pj_turn_sock_set_log(comp->turn[tp_idx].sock,
+		                         msg_disable_ind);
+		    comp->turn[tp_idx].log_off = PJ_TRUE;
+		}
+
+		PJ_LOG(4, (ice_st->obj_name,
+		           " Comp %d: "
+		           "sending from %s candidate %s to "
+		           "%s candidate %s",
+		           i + 1, pj_ice_get_cand_type_name(check->lcand->type),
+		           lip, pj_ice_get_cand_type_name(check->rcand->type),
+		           rip));
+
+	    } else {
+		PJ_LOG(4, (ice_st->obj_name, "Comp %d: disabled", i + 1));
+	    }
+	}
+
+	ice_st->state = (status == PJ_SUCCESS) ? PJ_ICE_STRANS_STATE_RUNNING :
+	                                         PJ_ICE_STRANS_STATE_FAILED;
+
+	pj_log_push_indent();
+	(*cb.on_valid_pair)(ice_st);
+	pj_log_pop_indent();
+    }
+
+    pj_grp_lock_dec_ref(ice_st->grp_lock);
+}
 
 /*
  * Callback called by ICE session when ICE processing is complete, either
@@ -2190,6 +2466,7 @@
 				    "Binding discovery complete" :
 				    "srflx address changed";
 		pj_bool_t dup = PJ_FALSE;
+		pj_bool_t init_done;
 
 		if (info.mapped_addr.addr.sa_family == pj_AF_INET() &&
 		    cand->base_addr.addr.sa_family == pj_AF_INET6())
@@ -2258,6 +2535,22 @@
 		    /* Otherwise update the address */
 		    pj_sockaddr_cp(&cand->addr, &info.mapped_addr);
 		    cand->status = PJ_SUCCESS;
+
+		    /* Add the candidate (for trickle ICE) */
+		    if (pj_ice_strans_has_sess(ice_st)) {
+			status = pj_ice_sess_add_cand(
+					ice_st->ice,
+					comp->comp_id,
+					cand->transport_id,
+					cand->type,
+					cand->local_pref,
+					&cand->foundation,
+					&cand->addr,
+					&cand->base_addr,
+					&cand->rel_addr,
+					pj_sockaddr_get_len(&cand->addr),
+					NULL);
+		    }
 		}
 
 		PJ_LOG(4,(comp->ice_st->obj_name,
@@ -2268,7 +2561,16 @@
 					     sizeof(ipaddr), 3)));
 
 		sess_init_update(ice_st);
-		
+
+		/* Invoke on_new_candidate() callback */
+		init_done = (ice_st->state==PJ_ICE_STRANS_STATE_READY);
+		if (op == PJ_STUN_SOCK_BINDING_OP && status == PJ_SUCCESS &&
+		    ice_st->cb.on_new_candidate && (!dup || init_done))
+		{
+		    (*ice_st->cb.on_new_candidate)
+					(ice_st, (dup? NULL:cand), init_done);
+		}
+
 		if (op == PJ_STUN_SOCK_MAPPED_ADDR_CHANGE &&
 		    ice_st->cb.on_ice_complete)
 		{
@@ -2289,6 +2591,8 @@
 		sess_fail(ice_st, PJ_ICE_STRANS_OP_INIT,
 			  "STUN binding request failed", status);
 	    } else {
+		pj_bool_t init_done;
+
 		PJ_LOG(4,(ice_st->obj_name,
 			  "STUN error is ignored for comp %d",
 			  comp->comp_id));
@@ -2303,6 +2607,14 @@
 		}
 
 		sess_init_update(ice_st);
+
+		/* Invoke on_new_candidate() callback */
+		init_done = (ice_st->state==PJ_ICE_STRANS_STATE_READY);
+		if (op == PJ_STUN_SOCK_BINDING_OP &&
+		    ice_st->cb.on_new_candidate && init_done)
+		{
+		    (*ice_st->cb.on_new_candidate) (ice_st, NULL, PJ_TRUE);
+		}
 	    }
 	}
 	break;
@@ -2435,10 +2747,12 @@
 		break;
 	    }
 	}
-	pj_assert(cand != NULL);
 
 	pj_grp_lock_release(comp->ice_st->grp_lock);
 
+	if (cand == NULL)
+	    goto on_return;
+
 	/* Update candidate */
 	pj_sockaddr_cp(&cand->addr, &rel_info.relay_addr);
 	pj_sockaddr_cp(&cand->base_addr, &rel_info.relay_addr);
@@ -2481,8 +2795,67 @@
 		  pj_sockaddr_print(&rel_info.relay_addr, ipaddr,
 				     sizeof(ipaddr), 3)));
 
+	/* For trickle ICE, add the candidate to ICE session and setup TURN
+	 * permission for remote candidates.
+	 */
+	if (comp->ice_st->cfg.opt.trickle != PJ_ICE_SESS_TRICKLE_DISABLED &&
+	    pj_ice_strans_has_sess(comp->ice_st))
+	{
+	    pj_sockaddr addrs[PJ_ICE_ST_MAX_CAND];
+	    pj_ice_sess *sess = comp->ice_st->ice;
+	    unsigned j, count=0;
+	    pj_status_t status;
+
+	    /* Add the candidate */
+	    status = pj_ice_sess_add_cand(comp->ice_st->ice,
+					  comp->comp_id,
+					  cand->transport_id,
+					  cand->type,
+					  cand->local_pref,
+					  &cand->foundation,
+					  &cand->addr,
+					  &cand->base_addr, 
+					  &cand->rel_addr,
+					  pj_sockaddr_get_len(&cand->addr),
+					  NULL);
+	    if (status != PJ_SUCCESS) {
+		PJ_PERROR(4,(comp->ice_st->obj_name, status,
+			  "Comp %d/%d: failed to add TURN (tpid=%d) to ICE",
+			  comp->comp_id, cand_idx, cand->transport_id));
+		sess_fail(comp->ice_st, PJ_ICE_STRANS_OP_INIT,
+			  "adding TURN candidate failed", status);
+	    }
+
+	    /* Gather remote addresses for this component */
+	    for (j=0; j<sess->rcand_cnt && count<PJ_ARRAY_SIZE(addrs); ++j) {
+		if (sess->rcand[j].addr.addr.sa_family==
+		    rel_info.relay_addr.addr.sa_family)
+		{
+		    pj_sockaddr_cp(&addrs[count++], &sess->rcand[j].addr);
+		}
+	    }
+
+	    if (count) {
+		status = pj_turn_sock_set_perm(turn_sock, count, addrs, 0);
+		if (status != PJ_SUCCESS) {
+		    PJ_PERROR(4,(comp->ice_st->obj_name, status,
+			      "Comp %d/%d: TURN set perm (tpid=%d) failed",
+			      comp->comp_id, cand_idx, cand->transport_id));
+		    sess_fail(comp->ice_st, PJ_ICE_STRANS_OP_INIT,
+			      "TURN set permission failed", status);
+		}
+	    }
+	}
+
 	sess_init_update(comp->ice_st);
 
+	/* Invoke on_new_candidate() callback */
+	if (comp->ice_st->cb.on_new_candidate) {
+	    (*comp->ice_st->cb.on_new_candidate)
+			(comp->ice_st, cand,
+			 (comp->ice_st->state==PJ_ICE_STRANS_STATE_READY));
+	}
+
     } else if ((old_state == PJ_TURN_STATE_RESOLVING ||
                 old_state == PJ_TURN_STATE_RESOLVED ||
                 old_state == PJ_TURN_STATE_ALLOCATING) &&
@@ -2534,6 +2907,13 @@
 
 	sess_init_update(comp->ice_st);
 
+	/* Invoke on_new_candidate() callback */
+	if (comp->ice_st->cb.on_new_candidate &&
+	    comp->ice_st->state==PJ_ICE_STRANS_STATE_READY)
+	{
+	    (*comp->ice_st->cb.on_new_candidate)(comp->ice_st, NULL, PJ_TRUE);
+	}
+
     } else if (new_state >= PJ_TURN_STATE_DEALLOCATING) {
 	pj_turn_session_info info;
 
@@ -2566,6 +2946,7 @@
 	}
     }
 
+on_return:
     pj_grp_lock_dec_ref(comp->ice_st->grp_lock);
 
     pj_log_pop_indent();
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath/stun_msg.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath/stun_msg.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath/stun_msg.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath/stun_msg.c	2022-02-24 07:54:38.000000000 +0000
@@ -1763,6 +1763,9 @@
     /* Get pointer to the string in the message */
     value.ptr = ((char*)buf + ATTR_HDR_LEN + 4);
     value.slen = attr->hdr.length - 4;
+    /* Make sure the length is never negative */
+    if (value.slen < 0)
+    	value.slen = 0;
 
     /* Copy the string to the attribute */
     pj_strdup(pool, &attr->reason, &value);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath/stun_session.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath/stun_session.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath/stun_session.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath/stun_session.c	2022-02-24 07:54:38.000000000 +0000
@@ -167,16 +167,27 @@
 {
     pj_stun_tx_data *tdata = (pj_stun_tx_data*)arg;
 
+    if (tdata->grp_lock) {
+	pj_grp_lock_dec_ref(tdata->sess->grp_lock);
+    }
+
     pj_pool_safe_release(&tdata->pool);
 }
 
 static void destroy_tdata(pj_stun_tx_data *tdata, pj_bool_t force)
 {
-    TRACE_((THIS_FILE, "tdata %p destroy request, force=%d, tsx=%p", tdata,
-	    force, tdata->client_tsx));
+    TRACE_((THIS_FILE,
+	    "tdata %p destroy request, force=%d, tsx=%p, destroying=%d",
+	    tdata, force, tdata->client_tsx, tdata->is_destroying));
+
+    /* Just return if destroy has been requested before */
+    if (tdata->is_destroying)
+	return;
 
     /* STUN session may have been destroyed, except when tdata is cached. */
 
+    tdata->is_destroying = PJ_TRUE;
+
     if (tdata->res_timer.id != PJ_FALSE) {
 	pj_timer_heap_cancel_if_active(tdata->sess->cfg->timer_heap,
 				       &tdata->res_timer, PJ_FALSE);
@@ -189,7 +200,6 @@
 	    pj_stun_client_tsx_set_data(tdata->client_tsx, NULL);
 	}
 	if (tdata->grp_lock) {
-	    pj_grp_lock_dec_ref(tdata->sess->grp_lock);
 	    pj_grp_lock_dec_ref(tdata->grp_lock);
 	} else {
 	    tdata_on_destroy(tdata);
@@ -200,11 +210,11 @@
 	    /* "Probably" this is to absorb retransmission */
 	    pj_time_val delay = {0, 300};
 	    pj_stun_client_tsx_schedule_destroy(tdata->client_tsx, &delay);
+	    tdata->is_destroying = PJ_FALSE;
 
 	} else {
 	    pj_list_erase(tdata);
 	    if (tdata->grp_lock) {
-		pj_grp_lock_dec_ref(tdata->sess->grp_lock);
 		pj_grp_lock_dec_ref(tdata->grp_lock);
 	    } else {
 		tdata_on_destroy(tdata);
@@ -238,7 +248,7 @@
     sess = tdata->sess;
 
     pj_grp_lock_acquire(sess->grp_lock);
-    if (sess->is_destroying) {
+    if (sess->is_destroying || tdata->is_destroying) {
 	pj_grp_lock_release(sess->grp_lock);
 	return;
     }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath/turn_session.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath/turn_session.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath/turn_session.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath/turn_session.c	2022-02-24 07:54:38.000000000 +0000
@@ -886,7 +886,12 @@
 	}
     }
 
-    pj_assert(attr_added != 0);
+    /* No address to set */
+    if (attr_added == 0) {
+	pj_stun_msg_destroy_tdata(sess->stun, tdata);
+	pj_grp_lock_release(sess->grp_lock);
+	return PJ_SUCCESS;
+    }
 
     /* Send the request */
     status = pj_stun_session_send_msg(sess->stun, req_token, PJ_FALSE, 
@@ -1201,6 +1206,41 @@
     return status;
 }
 
+/**
+ * Send Connect request.
+ */
+PJ_DEF(pj_status_t) pj_turn_session_connect(pj_turn_session *sess,
+					    const pj_sockaddr_t *peer_addr,
+					    unsigned addr_len)
+{
+    pj_stun_tx_data *tdata;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(sess && peer_addr && addr_len, PJ_EINVAL);
+    PJ_ASSERT_RETURN(sess->state == PJ_TURN_STATE_READY, PJ_EINVALIDOP);
+
+    pj_grp_lock_acquire(sess->grp_lock);
+
+    /* Create blank Connect request */
+    status = pj_stun_session_create_req(sess->stun, PJ_STUN_CONNECT_REQUEST,
+    					PJ_STUN_MAGIC, NULL, &tdata);
+    if (status != PJ_SUCCESS)
+	goto on_return;
+
+    status = pj_stun_msg_add_sockaddr_attr(tdata->pool, tdata->msg,
+					   PJ_STUN_ATTR_XOR_PEER_ADDR,
+					   PJ_TRUE, peer_addr, addr_len);
+    if (status != PJ_SUCCESS) goto on_return;
+    status = pj_stun_session_send_msg(sess->stun, (void *)peer_addr, PJ_FALSE,
+				      PJ_FALSE, sess->srv_addr,
+				      pj_sockaddr_get_len(sess->srv_addr),
+				      tdata);
+
+on_return:
+    pj_grp_lock_release(sess->grp_lock);
+    return status;
+}
+
 PJ_DEF(pj_status_t) pj_turn_session_on_rx_pkt(pj_turn_session *sess,
 					      void *pkt,
 					      pj_size_t pkt_len,
@@ -1757,6 +1797,49 @@
 			(sess, status, conn_bind->id,
 			&conn_bind->peer_addr, conn_bind->peer_addr_len);
 	}
+    } else if (method == PJ_STUN_CONNECT_METHOD) {
+	/* Handle Connct response */
+	struct pj_sockaddr_t *peer_addr = (struct pj_sockaddr_t*)token;
+	pj_uint32_t conn_id = 0;
+
+	if (status != PJ_SUCCESS ||
+	    !PJ_STUN_IS_SUCCESS_RESPONSE(response->hdr.type))
+	{
+	    pj_str_t reason = {0};
+	    if (status == PJ_SUCCESS) {
+		const pj_stun_errcode_attr *err_attr;
+		err_attr = (const pj_stun_errcode_attr*)
+			   pj_stun_msg_find_attr(response,
+						 PJ_STUN_ATTR_ERROR_CODE, 0);
+		if (err_attr) {
+		    status = PJ_STATUS_FROM_STUN_CODE(err_attr->err_code);
+		    reason = err_attr->reason;
+		} else {
+		    status = PJNATH_EINSTUNMSG;
+		}
+	    }
+	    pj_perror(1, sess->obj_name, status, "Connect failed: %.*s",
+		      (int)reason.slen, reason.ptr);
+	} else {
+	    const pj_stun_uint_attr *conn_id_attr;
+	    conn_id_attr = (const pj_stun_uint_attr*)
+	    pj_stun_msg_find_attr(response, PJ_STUN_ATTR_CONNECTION_ID, 0);
+	    if (conn_id_attr == NULL) {
+		status = PJNATH_EINSTUNMSG;
+		pj_perror(1, sess->obj_name, status,
+			  "Error: Missing CONNECTION-ID attribute");
+	    }
+	    else {
+		conn_id = conn_id_attr->value;
+	    }
+	}
+
+	/* Notify app */
+	if (sess->cb.on_connect_complete) {
+	    (*sess->cb.on_connect_complete)
+			(sess, status, conn_id,
+			peer_addr, pj_sockaddr_get_len(peer_addr));
+	}
     } else {
 	PJ_LOG(4,(sess->obj_name, "Unexpected STUN %s response",
 		  pj_stun_get_method_name(response->hdr.type)));
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath/turn_sock.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath/turn_sock.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath/turn_sock.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath/turn_sock.c	2022-02-24 07:54:38.000000000 +0000
@@ -137,6 +137,11 @@
 					   pj_uint32_t conn_id,
 					   const pj_sockaddr_t *peer_addr,
 					   unsigned addr_len);
+static void turn_on_connect_complete(pj_turn_session *sess,
+				     pj_status_t status,
+				     pj_uint32_t conn_id,
+				     const pj_sockaddr_t *peer_addr,
+				     unsigned addr_len);
 
 static pj_bool_t on_data_read(pj_turn_sock *turn_sock,
 			      void *data,
@@ -348,6 +353,7 @@
     sess_cb.on_channel_bound = &turn_on_channel_bound;
     sess_cb.on_rx_data = &turn_on_rx_data;
     sess_cb.on_state = &turn_on_state;
+    sess_cb.on_connect_complete = &turn_on_connect_complete;
     sess_cb.on_connection_attempt = &turn_on_connection_attempt;
     sess_cb.on_connection_bind_status = &turn_on_connection_bind_status;
     status = pj_turn_session_create(cfg, pool->obj_name, af, conn_type,
@@ -666,6 +672,53 @@
     return pj_turn_session_bind_channel(turn_sock->sess, peer, addr_len);
 }
 
+/**
+ * Send Connect request for the specified a peer address.
+ */
+PJ_DEF(pj_status_t) pj_turn_sock_connect( pj_turn_sock *turn_sock,
+					 const pj_sockaddr_t *peer_addr,
+					 unsigned addr_len)
+{
+    PJ_ASSERT_RETURN(turn_sock && peer_addr && addr_len, PJ_EINVAL);
+    PJ_ASSERT_RETURN(turn_sock->sess != NULL, PJ_EINVALIDOP);
+
+    return pj_turn_session_connect(turn_sock->sess, peer_addr, addr_len);
+}
+
+/**
+ * Close existing connection to the peer address.
+ */
+PJ_DEF(pj_status_t) pj_turn_sock_disconnect( pj_turn_sock *turn_sock,
+					  const pj_sockaddr_t *peer_addr,
+					  unsigned addr_len)
+
+{
+    unsigned i;
+    char addrtxt[PJ_INET6_ADDRSTRLEN+8];
+
+    PJ_ASSERT_RETURN(turn_sock && peer_addr && addr_len, PJ_EINVAL);
+    PJ_ASSERT_RETURN(turn_sock->sess != NULL, PJ_EINVALIDOP);
+
+    pj_grp_lock_acquire(turn_sock->grp_lock);
+    for (i=0; i < PJ_TURN_MAX_TCP_CONN_CNT; ++i) {
+	tcp_data_conn_t *conn = &turn_sock->data_conn[i];
+	if (conn->state < DATACONN_STATE_CONN_BINDING)
+	    continue;
+	if (pj_sockaddr_cmp(&conn->peer_addr, peer_addr) == 0) {
+	    dataconn_cleanup(conn);
+	    --turn_sock->data_conn_cnt;
+	    pj_grp_lock_release(turn_sock->grp_lock);
+	    return PJ_SUCCESS;
+	}
+    }
+
+    PJ_LOG(4, (turn_sock->obj_name, "Connection for peer %s is not exist",
+	       pj_sockaddr_print(peer_addr, addrtxt, sizeof(addrtxt), 3)));
+
+    pj_grp_lock_release(turn_sock->grp_lock);
+    return PJ_ENOTFOUND;
+}
+
 
 /*
  * Notification when outgoing TCP socket has been connected.
@@ -1195,6 +1248,7 @@
 					 turn_sock->setting.port_range,
 					 max_bind_retry);
 	    if (status != PJ_SUCCESS) {
+	    	pj_sock_close(sock);
 		pj_turn_sock_destroy(turn_sock);
 		return;
 	    }
@@ -1205,6 +1259,7 @@
 				    turn_sock->pool->obj_name, NULL);
 	    if (status != PJ_SUCCESS && !turn_sock->setting.qos_ignore_error) 
 	    {
+	    	pj_sock_close(sock);
 		pj_turn_sock_destroy(turn_sock);
 		return;
 	    }
@@ -1261,7 +1316,9 @@
 					  sock_type, &asock_cfg,
 					  turn_sock->cfg.ioqueue, &asock_cb,
 					  turn_sock,
-					  &turn_sock->active_sock);
+					  &turn_sock->active_sock);                                                                                                                                                                                                                                                                             
+	    if (status != PJ_SUCCESS)
+	    	pj_sock_close(sock);
 	}
 #if PJ_HAS_SSL_SOCK
 	else {
@@ -1449,7 +1506,7 @@
 	if (conn->state == DATACONN_STATE_READY) {
 	    /* Application data */
 	    if (turn_sock->cb.on_rx_data) {
-		(*turn_sock->cb.on_rx_data)(turn_sock, data, *remainder,
+		(*turn_sock->cb.on_rx_data)(turn_sock, data, (unsigned)*remainder,
 					    &conn->peer_addr,
 					    conn->peer_addr_len);
 	    }
@@ -1553,7 +1610,7 @@
 		      return);
 
     PJ_LOG(5,(turn_sock->pool->obj_name, "Connection attempt from peer %s",
-	      pj_sockaddr_print(&peer_addr, addrtxt, sizeof(addrtxt), 3)));
+	      pj_sockaddr_print(peer_addr, addrtxt, sizeof(addrtxt), 3)));
 
     if (turn_sock == NULL) {
 	/* We've been destroyed */
@@ -1766,3 +1823,193 @@
 					      peer_addr, addr_len);
     }
 }
+
+static void turn_on_connect_complete(pj_turn_session *sess,
+				     pj_status_t status,
+				     pj_uint32_t conn_id,
+				     const pj_sockaddr_t *peer_addr,
+				     unsigned addr_len)
+{
+    pj_turn_sock *turn_sock = (pj_turn_sock*) 
+			      pj_turn_session_get_user_data(sess);
+    pj_pool_t *pool;
+    tcp_data_conn_t *new_conn;
+    pj_turn_session_info info;
+    pj_sock_t sock = PJ_INVALID_SOCKET;
+    pj_activesock_cfg asock_cfg;
+    pj_activesock_cb asock_cb;
+    pj_sockaddr bound_addr, *cfg_bind_addr;
+    pj_uint16_t max_bind_retry;
+    char addrtxt[PJ_INET6_ADDRSTRLEN+8];
+    unsigned i;
+
+    if (turn_sock == NULL) {
+	/* We've been destroyed */
+	return;
+    }
+
+    PJ_ASSERT_ON_FAIL(turn_sock->conn_type == PJ_TURN_TP_TCP &&
+		      turn_sock->alloc_param.peer_conn_type == PJ_TURN_TP_TCP,
+		      return);
+    PJ_LOG(5,(turn_sock->pool->obj_name, "Trying to connect to peer %s",
+	      pj_sockaddr_print(peer_addr, addrtxt, sizeof(addrtxt), 3)));
+
+    pj_grp_lock_acquire(turn_sock->grp_lock);
+
+    if (turn_sock->data_conn_cnt == PJ_TURN_MAX_TCP_CONN_CNT) {
+	/* Data connection has reached limit */
+
+	status = PJ_ETOOMANY;
+	pj_perror(4, turn_sock->pool->obj_name, status,
+		  "Failed in connect to peer %s",
+		  pj_sockaddr_print(peer_addr, addrtxt, sizeof(addrtxt), 3));
+
+	/* Notify app for failure */
+	if (turn_sock->cb.on_connection_status) {
+	    (*turn_sock->cb.on_connection_status)(turn_sock, status, conn_id,
+						  peer_addr, addr_len);
+	}
+
+	pj_grp_lock_release(turn_sock->grp_lock);
+	return;
+    }
+
+    /* Find free data connection slot */
+    for (i=0; i < PJ_TURN_MAX_TCP_CONN_CNT; ++i) {
+	if (turn_sock->data_conn[i].state == DATACONN_STATE_NULL)
+	    break;
+    }
+
+    /* Verify that a free slot is found */
+    pj_assert(i < PJ_TURN_MAX_TCP_CONN_CNT);
+    ++turn_sock->data_conn_cnt;
+
+    /* Init new data connection */
+    new_conn = &turn_sock->data_conn[i];
+    pj_bzero(new_conn, sizeof(*new_conn));
+    pool = pj_pool_create(turn_sock->cfg.pf, "dataconn", 128, 128, NULL);
+    new_conn->pool = pool;
+    new_conn->id = conn_id;
+    new_conn->turn_sock = turn_sock;
+    pj_sockaddr_cp(&new_conn->peer_addr, peer_addr);
+    new_conn->peer_addr_len = addr_len;
+    pj_ioqueue_op_key_init(&new_conn->send_key, sizeof(new_conn->send_key));
+    new_conn->state = DATACONN_STATE_INITSOCK;
+
+    /* Init socket */
+    status = pj_sock_socket(turn_sock->af, pj_SOCK_STREAM(), 0, &sock);
+    if (status != PJ_SUCCESS)
+	goto on_return;
+
+    /* Bind socket */
+    cfg_bind_addr = &turn_sock->setting.bound_addr;
+    max_bind_retry = MAX_BIND_RETRY;
+    if (turn_sock->setting.port_range &&
+	turn_sock->setting.port_range < max_bind_retry)
+    {
+	max_bind_retry = turn_sock->setting.port_range;
+    }
+    pj_sockaddr_init(turn_sock->af, &bound_addr, NULL, 0);
+    if (cfg_bind_addr->addr.sa_family == pj_AF_INET() ||
+	cfg_bind_addr->addr.sa_family == pj_AF_INET6())
+    {
+	pj_sockaddr_cp(&bound_addr, cfg_bind_addr);
+    }
+    status = pj_sock_bind_random(sock, &bound_addr,
+				 turn_sock->setting.port_range,
+				 max_bind_retry);
+    if (status != PJ_SUCCESS)
+	goto on_return;
+
+    /* Apply socket buffer size */
+    if (turn_sock->setting.so_rcvbuf_size > 0) {
+	unsigned sobuf_size = turn_sock->setting.so_rcvbuf_size;
+	status = pj_sock_setsockopt_sobuf(sock, pj_SO_RCVBUF(), PJ_TRUE,
+					  &sobuf_size);
+	if (status != PJ_SUCCESS) {
+	    pj_perror(3, turn_sock->obj_name, status,
+		      "Failed setting SO_RCVBUF");
+	} else {
+	    if (sobuf_size < turn_sock->setting.so_rcvbuf_size) {
+		PJ_LOG(4, (turn_sock->obj_name,
+			   "Warning! Cannot set SO_RCVBUF as configured,"
+			   " now=%d, configured=%d", sobuf_size,
+			   turn_sock->setting.so_rcvbuf_size));
+	    } else {
+		PJ_LOG(5, (turn_sock->obj_name, "SO_RCVBUF set to %d",
+			   sobuf_size));
+	    }
+	}
+    }
+    if (turn_sock->setting.so_sndbuf_size > 0) {
+	unsigned sobuf_size = turn_sock->setting.so_sndbuf_size;
+	status = pj_sock_setsockopt_sobuf(sock, pj_SO_SNDBUF(), PJ_TRUE,
+					  &sobuf_size);
+	if (status != PJ_SUCCESS) {
+	    pj_perror(3, turn_sock->obj_name, status,
+		      "Failed setting SO_SNDBUF");
+	} else {
+	    if (sobuf_size < turn_sock->setting.so_sndbuf_size) {
+		PJ_LOG(4, (turn_sock->obj_name,
+			   "Warning! Cannot set SO_SNDBUF as configured,"
+			   " now=%d, configured=%d", sobuf_size,
+			   turn_sock->setting.so_sndbuf_size));
+	    } else {
+		PJ_LOG(5, (turn_sock->obj_name, "SO_SNDBUF set to %d",
+			   sobuf_size));
+	    }
+	}
+    }
+
+    /* Create active socket */
+    pj_activesock_cfg_default(&asock_cfg);
+    asock_cfg.grp_lock = turn_sock->grp_lock;
+
+    pj_bzero(&asock_cb, sizeof(asock_cb));
+    asock_cb.on_data_read = &dataconn_on_data_read;
+    asock_cb.on_data_sent = &dataconn_on_data_sent;
+    asock_cb.on_connect_complete = &dataconn_on_connect_complete;
+    status = pj_activesock_create(pool, sock,
+				  pj_SOCK_STREAM(), &asock_cfg,
+				  turn_sock->cfg.ioqueue, &asock_cb,
+				  new_conn, &new_conn->asock);
+    if (status != PJ_SUCCESS)
+	goto on_return;
+
+    /* Connect to TURN server for data connection */
+    pj_turn_session_get_info(turn_sock->sess, &info);
+    status = pj_activesock_start_connect(new_conn->asock,
+					 pool,
+					 &info.server,
+					 pj_sockaddr_get_len(&info.server));
+    if (status == PJ_SUCCESS) {
+	dataconn_on_connect_complete(new_conn->asock, PJ_SUCCESS);
+	pj_grp_lock_release(turn_sock->grp_lock);
+	return;
+    }
+
+on_return:
+    if (status == PJ_EPENDING) {
+	PJ_LOG(5,(pool->obj_name,
+		  "Connecting to peer %s",
+		  pj_sockaddr_print(peer_addr, addrtxt, sizeof(addrtxt), 3)));
+    } else {
+	/* not PJ_SUCCESS */
+	pj_perror(4, pool->obj_name, status,
+		  "Failed in connect to peer %s",
+		  pj_sockaddr_print(peer_addr, addrtxt, sizeof(addrtxt), 3));
+
+	if (!new_conn->asock && sock != PJ_INVALID_SOCKET)
+	    pj_sock_close(sock);    
+
+	dataconn_cleanup(new_conn);
+	--turn_sock->data_conn_cnt;
+
+	/* Notify app for failure */
+	if (turn_sock->cb.on_connection_status) {
+	    (*turn_sock->cb.on_connection_status)(turn_sock, status, conn_id,
+						  peer_addr, addr_len);
+	}
+    }
+    pj_grp_lock_release(turn_sock->grp_lock);
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath-test/ice_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath-test/ice_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath-test/ice_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath-test/ice_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -70,6 +70,7 @@
     struct test_result expected;/* Expected result		*/
 
     pj_bool_t   nom_regular;	/* Use regular nomination?	*/
+    pj_ice_sess_trickle trickle;    /* Trickle ICE mode		*/
 };
 
 /* ICE endpoint state */
@@ -81,6 +82,9 @@
 
     pj_str_t		 ufrag;	/* username fragment.		*/
     pj_str_t		 pass;	/* password			*/
+
+    /* Trickle ICE */
+    pj_bool_t		 last_cand; /* Got last candidate?	*/
 };
 
 /* Session param */
@@ -122,6 +126,10 @@
 static void ice_on_ice_complete(pj_ice_strans *ice_st,
 			        pj_ice_strans_op op,
 			        pj_status_t status);
+static void ice_on_new_candidate(pj_ice_strans *ice_st,
+				 const pj_ice_sess_cand *cand,
+				 pj_bool_t last);
+
 static void destroy_sess(struct test_sess *sess, unsigned wait_msec);
 
 #if USE_IPV6
@@ -235,9 +243,11 @@
     pj_bzero(&ice_cb, sizeof(ice_cb));
     ice_cb.on_rx_data = &ice_on_rx_data;
     ice_cb.on_ice_complete = &ice_on_ice_complete;
+    ice_cb.on_new_candidate = &ice_on_new_candidate;
 
     /* Init ICE stream transport configuration structure */
     pj_ice_strans_cfg_default(&ice_cfg);
+    ice_cfg.opt.trickle = ept->cfg.trickle;
     pj_memcpy(&ice_cfg.stun_cfg, test_sess->stun_cfg, sizeof(pj_stun_config));
     if ((ept->cfg.enable_stun & SRV)==SRV || (ept->cfg.enable_turn & SRV)==SRV)
 	ice_cfg.resolver = test_sess->resolver;
@@ -452,6 +462,32 @@
     }
 }
 
+static void ice_on_new_candidate(pj_ice_strans *ice_st,
+				 const pj_ice_sess_cand *cand,
+				 pj_bool_t last)
+{
+    struct ice_ept *ept;
+    char buf1[PJ_INET6_ADDRSTRLEN+10];
+    char buf2[PJ_INET6_ADDRSTRLEN+10];
+
+    ept = (struct ice_ept*) pj_ice_strans_get_user_data(ice_st);
+    if (!ept)
+	return;
+
+    ept->last_cand = last;
+
+    if (cand) {
+	PJ_LOG(4,(THIS_FILE, INDENT "%p: discovered a new candidate "
+		  "comp=%d, type=%s, addr=%s, baseaddr=%s, end=%d",
+		  ept->ice, cand->comp_id,
+		  pj_ice_get_cand_type_name(cand->type),
+		  pj_sockaddr_print(&cand->addr, buf1, sizeof(buf1), 3),
+		  pj_sockaddr_print(&cand->base_addr, buf2, sizeof(buf2), 3),
+		  last));
+    } else if (ept->ice && last) {
+	PJ_LOG(4,(THIS_FILE, INDENT "%p: end of candidate", ept->ice));
+    }
+}
 
 /* Start ICE negotiation on the endpoint, based on parameter from
  * the other endpoint.
@@ -459,18 +495,21 @@
 static pj_status_t start_ice(struct ice_ept *ept, const struct ice_ept *remote)
 {
     pj_ice_sess_cand rcand[32];
-    unsigned i, rcand_cnt = 0;
+    unsigned rcand_cnt = 0;
     pj_status_t status;
 
     /* Enum remote candidates */
-    for (i=0; i<remote->cfg.comp_cnt; ++i) {
-	unsigned cnt = PJ_ARRAY_SIZE(rcand) - rcand_cnt;
-	status = pj_ice_strans_enum_cands(remote->ice, i+1, &cnt, rcand+rcand_cnt);
-	if (status != PJ_SUCCESS) {
-	    app_perror(INDENT "err: pj_ice_strans_enum_cands()", status);
-	    return status;
+    if (ept->cfg.trickle == PJ_ICE_SESS_TRICKLE_DISABLED) {
+	unsigned i;
+	for (i=0; i<remote->cfg.comp_cnt; ++i) {
+	    unsigned cnt = PJ_ARRAY_SIZE(rcand) - rcand_cnt;
+	    status = pj_ice_strans_enum_cands(remote->ice, i+1, &cnt, rcand+rcand_cnt);
+	    if (status != PJ_SUCCESS) {
+		app_perror(INDENT "err: pj_ice_strans_enum_cands()", status);
+		return status;
+	    }
+	    rcand_cnt += cnt;
 	}
-	rcand_cnt += cnt;
     }
 
     status = pj_ice_strans_start_ice(ept->ice, &remote->ufrag, &remote->pass,
@@ -1228,3 +1267,338 @@
 
     return rc;
 }
+
+struct timer_data
+{
+    struct test_sess	*sess;
+    unsigned		 caller_last_cand_cnt[PJ_ICE_MAX_COMP];
+    unsigned		 callee_last_cand_cnt[PJ_ICE_MAX_COMP];
+};
+
+
+/* Timer callback to check & signal new candidates */
+static void timer_new_cand(pj_timer_heap_t *th, pj_timer_entry *te)
+{
+    struct timer_data *data = (struct timer_data*)te->user_data;
+    struct test_sess *sess = data->sess;
+    struct ice_ept *caller = &sess->caller;
+    struct ice_ept *callee = &sess->callee;
+    pj_bool_t caller_last_cand, callee_last_cand;
+    unsigned i, ncomp;
+    pj_status_t rc;
+
+    /* ICE transport may have been destroyed */
+    if (!caller->ice || !callee->ice)
+	return;
+
+    caller_last_cand = caller->last_cand;
+    callee_last_cand = callee->last_cand;
+    //PJ_LOG(3,(THIS_FILE, INDENT "End-of-cand status: caller=%d callee=%d",
+    //		caller_last_cand, callee_last_cand));
+
+    ncomp = PJ_MIN(caller->cfg.comp_cnt, callee->cfg.comp_cnt);
+    for (i = 0; i < ncomp; ++i) {
+	pj_ice_sess_cand cand[PJ_ICE_ST_MAX_CAND];
+	unsigned j, cnt;
+
+	/* Check caller candidates */
+	cnt = PJ_ICE_ST_MAX_CAND;
+	rc = pj_ice_strans_enum_cands(caller->ice, i+1, &cnt, cand);
+	if (rc != PJ_SUCCESS) {
+	    app_perror(INDENT "err: caller pj_ice_strans_enum_cands()", rc);
+	    continue;
+	}
+
+	if (cnt > data->caller_last_cand_cnt[i]) {
+	    unsigned new_cnt = cnt - data->caller_last_cand_cnt[i];
+
+	    /* Update remote with new candidates */
+	    rc = pj_ice_strans_update_check_list(callee->ice,
+						 &caller->ufrag,
+						 &caller->pass,
+						 new_cnt, &cand[cnt - new_cnt],
+						 caller_last_cand && (i==ncomp-1));
+	    if (rc != PJ_SUCCESS) {
+		app_perror(INDENT "err: callee pj_ice_strans_update_check_list()", rc);
+		continue;
+	    }
+
+	    data->caller_last_cand_cnt[i] = cnt;
+	    PJ_LOG(4,(THIS_FILE, INDENT "Updated callee with %d new candidates %s",
+		      new_cnt, (caller_last_cand?"(last)":"")));
+
+	    for (j = 0; j < new_cnt; ++j) {
+		pj_ice_sess_cand *c = &cand[cnt - new_cnt + j];
+		char buf1[PJ_INET6_ADDRSTRLEN+10];
+		char buf2[PJ_INET6_ADDRSTRLEN+10];
+		PJ_LOG(4,(THIS_FILE, INDENT
+			  "%d: comp=%d, type=%s, addr=%s, baseaddr=%s",
+			  j+1, c->comp_id,
+			  pj_ice_get_cand_type_name(c->type),
+			  pj_sockaddr_print(&c->addr, buf1, sizeof(buf1), 3),
+			  pj_sockaddr_print(&c->base_addr, buf2, sizeof(buf2), 3)
+			  ));
+	    }
+	}
+
+	/* Check callee candidates */
+	cnt = PJ_ICE_ST_MAX_CAND;
+	rc = pj_ice_strans_enum_cands(callee->ice, i+1, &cnt, cand);
+	if (rc != PJ_SUCCESS) {
+	    app_perror(INDENT "err: caller pj_ice_strans_enum_cands()", rc);
+	    continue;
+	}
+
+	if (cnt > data->callee_last_cand_cnt[i]) {
+	    unsigned new_cnt = cnt - data->callee_last_cand_cnt[i];
+
+	    /* Update remote with new candidates */
+	    rc = pj_ice_strans_update_check_list(caller->ice,
+						 &callee->ufrag,
+						 &callee->pass,
+						 new_cnt, &cand[cnt - new_cnt],
+						 callee_last_cand && (i==ncomp-1));
+	    if (rc != PJ_SUCCESS) {
+		app_perror(INDENT "err: caller pj_ice_strans_update_check_list()", rc);
+		continue;
+	    }
+
+	    data->callee_last_cand_cnt[i] = cnt;
+	    PJ_LOG(4,(THIS_FILE, INDENT "Updated caller with %d new candidates %s",
+		      new_cnt, (callee_last_cand?"(last)":"")));
+
+	    for (j = 0; j < new_cnt; ++j) {
+		pj_ice_sess_cand *c = &cand[cnt - new_cnt + j];
+		char buf1[PJ_INET6_ADDRSTRLEN+10];
+		char buf2[PJ_INET6_ADDRSTRLEN+10];
+		PJ_LOG(4,(THIS_FILE, INDENT
+			  "%d: comp=%d, type=%s, addr=%s, baseaddr=%s",
+			  j+1, c->comp_id,
+			  pj_ice_get_cand_type_name(c->type),
+			  pj_sockaddr_print(&c->addr, buf1, sizeof(buf1), 3),
+			  pj_sockaddr_print(&c->base_addr, buf2, sizeof(buf2), 3)
+			  ));
+	    }
+	}
+    }
+
+    if (!caller_last_cand || !callee_last_cand) {
+	/* Reschedule until all candidates are gathered */
+	pj_time_val timeout = {0, 10};
+	pj_time_val_normalize(&timeout);
+	pj_timer_heap_schedule(th, te, &timeout);
+	//PJ_LOG(3,(THIS_FILE, INDENT "Rescheduled new candidate check"));
+    }
+}
+
+
+static int perform_trickle_test(const char *title,
+				pj_stun_config *stun_cfg,
+				unsigned server_flag,
+				struct test_cfg *caller_cfg,
+				struct test_cfg *callee_cfg,
+				struct sess_param *test_param)
+{
+    pjlib_state pjlib_state;
+    struct test_sess *sess;
+    struct timer_data timer_data;
+    pj_timer_entry te_new_cand;
+    int rc;
+
+    PJ_LOG(3,(THIS_FILE, "%s, %d vs %d components",
+	      title, caller_cfg->comp_cnt, callee_cfg->comp_cnt));
+
+    capture_pjlib_state(stun_cfg, &pjlib_state);
+
+    rc = create_sess(stun_cfg, server_flag, caller_cfg, callee_cfg,
+		     test_param, &sess);
+    if (rc != 0)
+	return rc;
+
+    /* Init ICE on caller */
+    rc = pj_ice_strans_init_ice(sess->caller.ice, sess->caller.cfg.role,
+				&sess->caller.ufrag, &sess->caller.pass);
+    if (rc != PJ_SUCCESS) {
+	app_perror(INDENT "err: caller pj_ice_strans_init_ice()", rc);
+	rc = -100;
+	goto on_return;
+    }
+
+    /* Init ICE on callee */
+    rc = pj_ice_strans_init_ice(sess->callee.ice, sess->callee.cfg.role,
+				&sess->callee.ufrag, &sess->callee.pass);
+    if (rc != PJ_SUCCESS) {
+	app_perror(INDENT "err: callee pj_ice_strans_init_ice()", rc);
+	rc = -110;
+	goto on_return;
+    }
+
+    /* Start ICE on callee */
+    rc = start_ice(&sess->callee, &sess->caller);
+    if (rc != PJ_SUCCESS) {
+	int retval = (rc == sess->callee.cfg.expected.start_status)?0:-120;
+	rc = retval;
+	goto on_return;
+    }
+
+    /* Start ICE on caller */
+    rc = start_ice(&sess->caller, &sess->callee);
+    if (rc != PJ_SUCCESS) {
+	int retval = (rc == sess->caller.cfg.expected.start_status)?0:-130;
+	rc = retval;
+	goto on_return;
+    }
+
+    /* Start polling new candidate */
+    //if (!sess->caller.last_cand || !sess->callee.last_cand)
+    {
+	pj_time_val timeout = {0, 10};
+
+	pj_bzero(&timer_data, sizeof(timer_data));
+	timer_data.sess = sess;
+
+	pj_time_val_normalize(&timeout);
+	pj_timer_entry_init(&te_new_cand, 0, &timer_data, &timer_new_cand);
+	pj_timer_heap_schedule(stun_cfg->timer_heap, &te_new_cand, &timeout);
+    }
+
+    WAIT_UNTIL(30000, ALL_DONE, rc);
+    if (!ALL_DONE) {
+	PJ_LOG(3,(THIS_FILE, INDENT "err: negotiation timed-out"));
+	rc = -140;
+	goto on_return;
+    }
+
+    if (rc != 0)
+	goto on_return;
+
+    if (sess->caller.result.nego_status != sess->caller.cfg.expected.nego_status) {
+	app_perror(INDENT "err: caller negotiation failed", sess->caller.result.nego_status);
+	rc = -150;
+	goto on_return;
+    }
+
+    if (sess->callee.result.nego_status != sess->callee.cfg.expected.nego_status) {
+	app_perror(INDENT "err: callee negotiation failed", sess->callee.result.nego_status);
+	rc = -160;
+	goto on_return;
+    }
+
+    /* Verify that both agents have agreed on the same pair */
+    rc = check_pair(&sess->caller, &sess->callee, -170);
+    if (rc != 0) {
+	goto on_return;
+    }
+    rc = check_pair(&sess->callee, &sess->caller, -180);
+    if (rc != 0) {
+	goto on_return;
+    }
+
+    /* Looks like everything is okay */
+
+    /* Destroy ICE stream transports first to let it de-allocate
+     * TURN relay (otherwise there'll be timer/memory leak, unless
+     * we wait for long time in the last poll_events() below).
+     */
+    if (sess->caller.ice) {
+	pj_ice_strans_destroy(sess->caller.ice);
+	sess->caller.ice = NULL;
+    }
+
+    if (sess->callee.ice) {
+	pj_ice_strans_destroy(sess->callee.ice);
+	sess->callee.ice = NULL;
+    }
+
+on_return:
+    /* Wait.. */
+    poll_events(stun_cfg, 200, PJ_FALSE);
+
+    /* Now destroy everything */
+    destroy_sess(sess, 500);
+
+    /* Flush events */
+    poll_events(stun_cfg, 100, PJ_FALSE);
+
+    if (rc == 0)
+	rc = check_pjlib_state(stun_cfg, &pjlib_state);
+
+    return rc;
+}
+
+
+/* Simple trickle ICE test */
+int trickle_ice_test(void)
+{
+    pj_pool_t *pool;
+    pj_stun_config stun_cfg;
+    struct sess_param test_param;
+    unsigned i;
+    int rc;
+
+    struct sess_cfg_t {
+	const char	*title;
+	unsigned	 server_flag;
+	struct test_cfg	 ua1;
+	struct test_cfg	 ua2;
+    } cfg[] = {
+    {
+	"With host-only",
+	0x1FFF,
+	/*Role  comp# host? stun? turn? flag?        ans_del snd_del des_del */
+	{ROLE1, 1,    YES,  NO,   NO,   CLIENT_IPV4, 0,      0,      0,      {PJ_SUCCESS, PJ_SUCCESS, PJ_SUCCESS}},
+	{ROLE2, 1,    YES,  NO,   NO,   CLIENT_IPV4, 0,      0,      0,      {PJ_SUCCESS, PJ_SUCCESS, PJ_SUCCESS}}
+    },
+    {
+	"With turn-only",
+	0x1FFF,
+	/*Role  comp# host? stun? turn? flag?        ans_del snd_del des_del */
+	{ROLE1, 1,    NO,   NO,   YES,  CLIENT_IPV4, 0,      0,      0,      {PJ_SUCCESS, PJ_SUCCESS, PJ_SUCCESS}},
+	{ROLE2, 1,    NO,   NO,   YES,  CLIENT_IPV4, 0,      0,      0,      {PJ_SUCCESS, PJ_SUCCESS, PJ_SUCCESS}}
+    },
+    {
+	/* STUN candidates will be pruned */
+	"With host+turn",
+	0x1FFF,
+	/*Role  comp# host? stun? turn? flag?        ans_del snd_del des_del */
+	{ROLE1, 1,    YES,  YES,  YES,  CLIENT_IPV4, 0,      0,      0,      {PJ_SUCCESS, PJ_SUCCESS, PJ_SUCCESS}},
+	{ROLE2, 1,    YES,  YES,  YES,  CLIENT_IPV4, 0,      0,      0,      {PJ_SUCCESS, PJ_SUCCESS, PJ_SUCCESS}}
+    }};
+
+    PJ_LOG(3,(THIS_FILE, "Trickle ICE"));
+    pj_log_push_indent();
+
+    pool = pj_pool_create(mem, NULL, 512, 512, NULL);
+
+    rc = create_stun_config(pool, &stun_cfg);
+    if (rc != PJ_SUCCESS) {
+	pj_pool_release(pool);
+	pj_log_pop_indent();
+	return -10;
+    }
+
+    for (i = 0; i < PJ_ARRAY_SIZE(cfg) && !rc; ++i) {
+	unsigned c1, c2;
+	cfg[i].ua1.trickle = PJ_ICE_SESS_TRICKLE_FULL;
+	cfg[i].ua2.trickle = PJ_ICE_SESS_TRICKLE_FULL;
+	for (c1 = 1; c1 <= 2 && !rc; ++c1) {
+	    for (c2 = 1; c2 <= 2 && !rc; ++c2) {
+		pj_bzero(&test_param, sizeof(test_param));
+		cfg[i].ua1.comp_cnt = c1;
+		cfg[i].ua2.comp_cnt = c2;
+		rc = perform_trickle_test(cfg[i].title,
+					  &stun_cfg,
+					  cfg[i].server_flag,
+					  &cfg[i].ua1,
+					  &cfg[i].ua2,
+					  &test_param);
+	    }
+	}
+    }
+
+    destroy_stun_config(&stun_cfg);
+    pj_pool_release(pool);
+    pj_log_pop_indent();
+
+    return rc;
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath-test/main.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath-test/main.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath-test/main.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath-test/main.c	2022-02-24 07:54:38.000000000 +0000
@@ -20,6 +20,7 @@
 #include "test.h"
 
 #if defined(PJ_SUNOS) && PJ_SUNOS!=0
+
 #include <signal.h>
 static void init_signals()
 {
@@ -31,6 +32,30 @@
     sigaction(SIGALRM, &act, NULL);
 }
 
+#elif PJ_LINUX || PJ_DARWINOS
+
+#include <execinfo.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+static void print_stack(int sig)
+{
+    void *array[16];
+    size_t size;
+
+    size = backtrace(array, 16);
+    fprintf(stderr, "Error: signal %d:\n", sig);
+    backtrace_symbols_fd(array, size, STDERR_FILENO);
+    exit(1);
+}
+
+static void init_signals(void)
+{
+    signal(SIGSEGV, &print_stack);
+    signal(SIGABRT, &print_stack);
+}
+
 #else
 #define init_signals()
 #endif
@@ -40,20 +65,33 @@
 int main(int argc, char *argv[])
 {
     int rc;
-
-    PJ_UNUSED_ARG(argc);
-    PJ_UNUSED_ARG(argv);
+    int interractive = 0;
+    int no_trap = 0;
 
     boost();
-    init_signals();
 
-    rc = test_main();
+    while (argc > 1) {
+        char *arg = argv[--argc];
+
+	if (*arg=='-' && *(arg+1)=='i') {
+	    interractive = 1;
+
+	} else if (*arg=='-' && *(arg+1)=='n') {
+	    no_trap = 1;
+	}
+    }
+
+    if (!no_trap) {
+	init_signals();
+    }
 
-    if (argc == 2 && pj_ansi_strcmp(argv[1], "-i")==0) {
-	char buf[10];
+    rc = test_main();
 
+    if (interractive) {
+	char s[10];
+	puts("");
 	puts("Press <ENTER> to exit");
-	if (fgets(buf, sizeof(buf), stdin) == NULL)
+	if (!fgets(s, sizeof(s), stdin))
 	    return rc;
     }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath-test/server.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath-test/server.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath-test/server.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath-test/server.c	2022-02-24 07:54:38.000000000 +0000
@@ -27,7 +27,9 @@
 #define CERT_CA_FILE		    CERT_DIR "cacert.pem"
 #define CERT_FILE		    CERT_DIR "cacert.pem"
 #define CERT_PRIVKEY_FILE	    CERT_DIR "privkey.pem"
-#define CERT_PRIVKEY_PASS	    ""
+#define CERT_PRIVKEY_PASS	    "privkeypass"
+
+#define RETURN_ERROR(rc)	    {app_perror("", rc);return rc;}
 
 static pj_bool_t stun_on_data_recvfrom(pj_activesock_t *asock,
 				       void *data,
@@ -101,7 +103,7 @@
     } else {
 	status = pj_gethostip(GET_AF(use_ipv6), &hostip);
 	if (status != PJ_SUCCESS)
-	    return status;
+	    RETURN_ERROR(status);
     }
 
     pool = pj_pool_create(mem, THIS_FILE, 512, 512, NULL);
@@ -122,7 +124,7 @@
 				      0, &test_srv->dns_server);
 	if (status != PJ_SUCCESS) {
 	    destroy_test_server(test_srv);
-	    return status;
+	    RETURN_ERROR(status);
 	}
 
 	/* Add DNS A record for the domain, for fallback */
@@ -161,14 +163,14 @@
 					  &test_srv->stun_sock, NULL);
 	if (status != PJ_SUCCESS) {
 	    destroy_test_server(test_srv);
-	    return status;
+	    RETURN_ERROR(status);
 	}
 
 	status = pj_activesock_start_recvfrom(test_srv->stun_sock, pool,
 					      MAX_STUN_PKT, 0);
 	if (status != PJ_SUCCESS) {
 	    destroy_test_server(test_srv);
-	    return status;
+	    RETURN_ERROR(status);
 	}
 
 	if (test_srv->dns_server && (flags & CREATE_STUN_SERVER_DNS_SRV)) {
@@ -222,7 +224,7 @@
 
 	    if (status != PJ_SUCCESS) {
 		destroy_test_server(test_srv);
-		return status;
+		RETURN_ERROR(status);
 	    }
 
 	    status = pj_activesock_start_recvfrom(test_srv->turn_sock, pool,
@@ -236,20 +238,26 @@
 	    status = pj_sock_socket(GET_AF(use_ipv6), pj_SOCK_STREAM(), 0,
 				    &sock_fd);
 	    if (status != PJ_SUCCESS) {
-		return status;
+		RETURN_ERROR(status);
+	    }
+
+	    {
+		int val = 1;
+		pj_sock_setsockopt(sock_fd, pj_SOL_SOCKET(), pj_SO_REUSEADDR(),
+				   &val, sizeof(val));
 	    }
 
 	    status = pj_sock_bind(sock_fd, &bound_addr, 
 				  pj_sockaddr_get_len(&bound_addr));
 	    if (status != PJ_SUCCESS) {
 		pj_sock_close(sock_fd);
-		return status;
+		RETURN_ERROR(status);
 	    }
 
 	    status = pj_sock_listen(sock_fd, 4);
 	    if (status != PJ_SUCCESS) {
 		pj_sock_close(sock_fd);
-		return status;
+		RETURN_ERROR(status);
 	    }
 
 	    status = pj_activesock_create(pool, sock_fd, pj_SOCK_STREAM(), 
@@ -259,7 +267,7 @@
 					  &test_srv->turn_sock);
 	    if (status != PJ_SUCCESS) {
 		pj_sock_close(sock_fd);
-		return status;
+		RETURN_ERROR(status);
 	    }
 
 	    status = pj_activesock_start_accept(test_srv->turn_sock,
@@ -309,7 +317,7 @@
 #endif
 	if (status != PJ_SUCCESS) {
 	    destroy_test_server(test_srv);
-	    return status;
+	    RETURN_ERROR(status);
 	}
 
 	if (test_srv->dns_server && (flags & CREATE_TURN_SERVER_DNS_SRV)) {
@@ -576,7 +584,9 @@
 	/* Not STUN message, this probably is a ChannelData */
 	pj_turn_channel_data cd;
 	const pj_turn_channel_data *pcd = (const pj_turn_channel_data*)data;
+	char peer_info[PJ_INET6_ADDRSTRLEN];
 	pj_ssize_t sent;
+	unsigned j;
 
 	if (i==test_srv->turn_alloc_cnt) {
 	    /* Invalid data */
@@ -598,23 +608,26 @@
 	}
 
 	/* Lookup peer */
-	for (i=0; i<alloc->perm_cnt; ++i) {
-	    if (alloc->chnum[i] == cd.ch_number)
+	for (j=0; j<alloc->perm_cnt; ++j) {
+	    if (alloc->chnum[j] == cd.ch_number)
 		break;
 	}
 
-	if (i==alloc->perm_cnt) {
+	if (j==alloc->perm_cnt) {
 	    PJ_LOG(1,(THIS_FILE, 
 		      "TURN Server: ChannelData discarded: invalid channel number"));
 	    goto on_return;
 	}
 
 	/* Relay the data to peer */
+	pj_sockaddr_print(&alloc->perm[j], peer_info, sizeof(peer_info), 3);
+	PJ_LOG(5,(THIS_FILE, "Relaying %d bytes data from client %s to peer %s",
+			      cd.length, client_info, peer_info));
 	sent = cd.length;
 	pj_activesock_sendto(alloc->sock, &alloc->send_key,
 			     pcd+1, &sent, 0,
-			     &alloc->perm[i],
-			     pj_sockaddr_get_len(&alloc->perm[i]));
+			     &alloc->perm[j],
+			     pj_sockaddr_get_len(&alloc->perm[j]));
 
 	/* Done */
 	goto on_return;
@@ -871,15 +884,15 @@
 		    break;
 	    }
 
-	    if (i==alloc->perm_cnt) {
+	    if (j==alloc->perm_cnt) {
 		if (alloc->perm_cnt==MAX_TURN_PERM) {
 		    pj_stun_msg_create_response(pool, req, PJ_STUN_SC_INSUFFICIENT_CAPACITY, NULL, &resp);
 		    goto send_pkt;
 		}
-		pj_sockaddr_cp(&alloc->perm[i], &pa->sockaddr);
+		pj_sockaddr_cp(&alloc->perm[j], &pa->sockaddr);
 		++alloc->perm_cnt;
 	    }
-	    alloc->chnum[i] = cn;
+	    alloc->chnum[j] = cn;
 
 	    resp = create_success_response(test_srv, alloc, req, pool, 0, &auth_key);
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath-test/stun_sock_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath-test/stun_sock_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath-test/stun_sock_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath-test/stun_sock_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -25,7 +25,6 @@
     RESPOND_STUN    = 1,
     WITH_MAPPED	    = 2,
     WITH_XOR_MAPPED = 4,
-
     ECHO	    = 8
 };
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath-test/test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath-test/test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath-test/test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath-test/test.c	2022-02-24 07:54:38.000000000 +0000
@@ -21,14 +21,16 @@
 #include <pjlib.h>
 #include <pj/compat/socket.h>
 
-void app_perror(const char *msg, pj_status_t rc)
+void app_perror_dbg(const char *msg, pj_status_t rc,
+		    const char *file, int line)
 {
     char errbuf[256];
 
     PJ_CHECK_STACK();
 
     pj_strerror(rc, errbuf, sizeof(errbuf));
-    PJ_LOG(1,("test", "%s: [pj_status_t=%d] %s", msg, rc, errbuf));
+    PJ_LOG(1,("test", "%s:%d: %s: [pj_status_t=%d] %s", file, line, msg,
+	      rc, errbuf));
 }
 
 /* Set socket to nonblocking. */
@@ -168,7 +170,7 @@
 
 pj_pool_factory *mem;
 
-int param_log_decor = PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME |
+int param_log_decor = PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME | PJ_LOG_HAS_SENDER |
 		      PJ_LOG_HAS_MICRO_SEC;
 
 pj_log_func *orig_log_func;
@@ -204,7 +206,7 @@
     rc = pj_init();
     if (rc != 0) {
 	app_perror("pj_init() error!!", rc);
-	return rc;
+	goto on_return;
     }
 
     pj_dump_config();
@@ -222,6 +224,10 @@
     DO_TEST(ice_test());
 #endif
 
+#if INCLUDE_TRICKLE_ICE_TEST
+    DO_TEST(trickle_ice_test());
+#endif
+
 #if INCLUDE_STUN_SOCK_TEST
     DO_TEST(stun_sock_test());
 #endif
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath-test/test.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath-test/test.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjnath/src/pjnath-test/test.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjnath/src/pjnath-test/test.h	2022-02-24 07:54:38.000000000 +0000
@@ -21,8 +21,15 @@
 #include <pjlib-util.h>
 #include <pjnath.h>
 
+#if defined(PJ_EXCLUDE_BENCHMARK_TESTS) && (PJ_EXCLUDE_BENCHMARK_TESTS==1)
+#   define WITH_BENCHMARK	    0
+#else
+#   define WITH_BENCHMARK	    1
+#endif
+
 #define INCLUDE_STUN_TEST	    1
 #define INCLUDE_ICE_TEST	    1
+#define INCLUDE_TRICKLE_ICE_TEST    1
 #define INCLUDE_STUN_SOCK_TEST	    1
 #define INCLUDE_TURN_SOCK_TEST	    1
 #define INCLUDE_CONCUR_TEST    	    1
@@ -46,10 +53,13 @@
 int stun_sock_test(void);
 int turn_sock_test(void);
 int ice_test(void);
+int trickle_ice_test(void);
 int concur_test(void);
 int test_main(void);
 
-extern void app_perror(const char *title, pj_status_t rc);
+#define app_perror(msg, rc) app_perror_dbg(msg, rc, __FILE__, __LINE__)
+extern void app_perror_dbg(const char *msg, pj_status_t rc,
+			   const char *file, int line);
 extern void app_set_sock_nb(pj_sock_t sock);
 extern pj_pool_factory *mem;
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjproject-vs14.sln asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjproject-vs14.sln
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjproject-vs14.sln	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjproject-vs14.sln	2022-02-24 07:54:38.000000000 +0000
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31515.178
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1DFF1CF3-DBD7-4DA4-A36D-663D695EB678}"
 	ProjectSection(SolutionItems) = preProject
@@ -114,35 +114,42 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swig_java_pjsua2", "pjsip-apps\build\swig_java_pjsua2.vcxproj", "{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebrtc_aec3", "third_party\build\webrtc_aec3\libwebrtc_aec3.vcxproj", "{D738A812-CE37-40A4-B2FA-D81488C12C87}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{207e7bd4-7b11-4a40-ba3a-cc627762a7b6}*SharedItemsImports = 4
 		pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9
-		pjsip-apps\src\pjsua\winrt\cli\comp\pjsua_cli_shared_comp.vcxitems*{e75efd41-c7f5-44c8-8ff1-a310d920989d}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
 		Debug-Dynamic|Any CPU = Debug-Dynamic|Any CPU
 		Debug-Dynamic|ARM = Debug-Dynamic|ARM
+		Debug-Dynamic|ARM64 = Debug-Dynamic|ARM64
 		Debug-Dynamic|Win32 = Debug-Dynamic|Win32
 		Debug-Dynamic|x64 = Debug-Dynamic|x64
 		Debug-Static|Any CPU = Debug-Static|Any CPU
 		Debug-Static|ARM = Debug-Static|ARM
+		Debug-Static|ARM64 = Debug-Static|ARM64
 		Debug-Static|Win32 = Debug-Static|Win32
 		Debug-Static|x64 = Debug-Static|x64
 		Release|Any CPU = Release|Any CPU
 		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 		Release-Dynamic|Any CPU = Release-Dynamic|Any CPU
 		Release-Dynamic|ARM = Release-Dynamic|ARM
+		Release-Dynamic|ARM64 = Release-Dynamic|ARM64
 		Release-Dynamic|Win32 = Release-Dynamic|Win32
 		Release-Dynamic|x64 = Release-Dynamic|x64
 		Release-Static|Any CPU = Release-Static|Any CPU
 		Release-Static|ARM = Release-Static|ARM
+		Release-Static|ARM64 = Release-Static|ARM64
 		Release-Static|Win32 = Release-Static|Win32
 		Release-Static|x64 = Release-Static|x64
 	EndGlobalSection
@@ -150,6 +157,8 @@
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|ARM.ActiveCfg = Debug|ARM
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|ARM.Build.0 = Debug|ARM
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|ARM64.Build.0 = Debug|ARM64
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|Win32.Build.0 = Debug|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|x64.ActiveCfg = Debug|x64
@@ -157,6 +166,8 @@
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -164,6 +175,8 @@
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -171,6 +184,8 @@
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|Any CPU.ActiveCfg = Release|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|ARM.ActiveCfg = Release|ARM
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|ARM.Build.0 = Release|ARM
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|ARM64.ActiveCfg = Release|ARM64
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|ARM64.Build.0 = Release|ARM64
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|Win32.ActiveCfg = Release|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|Win32.Build.0 = Release|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|x64.ActiveCfg = Release|x64
@@ -178,6 +193,8 @@
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -185,6 +202,8 @@
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -192,36 +211,48 @@
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug|ARM.ActiveCfg = Debug|ARM
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug|ARM.Build.0 = Debug|ARM
+		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug|ARM64.Build.0 = Debug|ARM64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug|Win32.Build.0 = Debug|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug|x64.ActiveCfg = Debug|x64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug|x64.Build.0 = Debug|x64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32
+		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32
+		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Debug-Static|x64.Build.0 = Debug-Static|x64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release|Any CPU.ActiveCfg = Release|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release|ARM.ActiveCfg = Release|Win32
+		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release|ARM64.ActiveCfg = Release|ARM64
+		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release|ARM64.Build.0 = Release|ARM64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release|Win32.ActiveCfg = Release|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release|Win32.Build.0 = Release|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release|x64.ActiveCfg = Release|x64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release|x64.Build.0 = Release|x64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32
+		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Static|ARM.ActiveCfg = Release-Static|Win32
+		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -229,6 +260,8 @@
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|ARM.ActiveCfg = Debug|ARM
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|ARM.Build.0 = Debug|ARM
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|ARM64.Build.0 = Debug|ARM64
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|Win32.Build.0 = Debug|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|x64.ActiveCfg = Debug|x64
@@ -236,6 +269,8 @@
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -243,6 +278,8 @@
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -250,6 +287,8 @@
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release|Any CPU.ActiveCfg = Release|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release|ARM.ActiveCfg = Release|ARM
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release|ARM.Build.0 = Release|ARM
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release|ARM64.Build.0 = Release|ARM64
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release|Win32.ActiveCfg = Release|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release|Win32.Build.0 = Release|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release|x64.ActiveCfg = Release|x64
@@ -257,6 +296,8 @@
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -264,42 +305,56 @@
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Static|x64.ActiveCfg = Release-Static|x64
 		{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Release-Static|x64.Build.0 = Release-Static|x64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug|ARM.ActiveCfg = Debug|Win32
+		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug|ARM64.Build.0 = Debug|ARM64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug|Win32.Build.0 = Debug|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug|x64.ActiveCfg = Debug|x64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug|x64.Build.0 = Debug|x64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32
+		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32
+		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Debug-Static|x64.Build.0 = Debug-Static|x64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release|Any CPU.ActiveCfg = Release|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release|ARM.ActiveCfg = Release|Win32
+		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release|ARM64.Build.0 = Release|ARM64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release|Win32.ActiveCfg = Release|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release|Win32.Build.0 = Release|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release|x64.ActiveCfg = Release|x64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release|x64.Build.0 = Release|x64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32
+		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Static|ARM.ActiveCfg = Release-Static|Win32
+		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{ED02BE13-8297-4770-8097-27DC2CCABF9A}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -307,6 +362,8 @@
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug|ARM.ActiveCfg = Debug|ARM
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug|ARM.Build.0 = Debug|ARM
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug|ARM64.Build.0 = Debug|ARM64
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug|Win32.Build.0 = Debug|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug|x64.ActiveCfg = Debug|x64
@@ -314,6 +371,8 @@
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -321,6 +380,8 @@
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -328,6 +389,8 @@
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release|Any CPU.ActiveCfg = Release|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release|ARM.ActiveCfg = Release|ARM
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release|ARM.Build.0 = Release|ARM
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release|ARM64.ActiveCfg = Release|ARM64
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release|ARM64.Build.0 = Release|ARM64
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release|Win32.ActiveCfg = Release|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release|Win32.Build.0 = Release|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release|x64.ActiveCfg = Release|x64
@@ -335,6 +398,8 @@
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -342,6 +407,8 @@
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -349,6 +416,8 @@
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug|ARM.ActiveCfg = Debug|ARM
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug|ARM.Build.0 = Debug|ARM
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug|ARM64.Build.0 = Debug|ARM64
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug|Win32.Build.0 = Debug|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug|x64.ActiveCfg = Debug|x64
@@ -356,6 +425,8 @@
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -363,6 +434,8 @@
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -370,6 +443,8 @@
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release|Any CPU.ActiveCfg = Release|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release|ARM.ActiveCfg = Release|ARM
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release|ARM.Build.0 = Release|ARM
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release|ARM64.ActiveCfg = Release|ARM64
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release|ARM64.Build.0 = Release|ARM64
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release|Win32.ActiveCfg = Release|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release|Win32.Build.0 = Release|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release|x64.ActiveCfg = Release|x64
@@ -377,6 +452,8 @@
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -384,6 +461,8 @@
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -391,6 +470,8 @@
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug|ARM.ActiveCfg = Debug|ARM
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug|ARM.Build.0 = Debug|ARM
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug|Win32.Build.0 = Debug|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug|x64.ActiveCfg = Debug|x64
@@ -398,12 +479,16 @@
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -411,6 +496,8 @@
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release|Any CPU.ActiveCfg = Release|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release|ARM.ActiveCfg = Release|ARM
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release|ARM.Build.0 = Release|ARM
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release|ARM64.Build.0 = Release|ARM64
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release|Win32.ActiveCfg = Release|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release|Win32.Build.0 = Release|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release|x64.ActiveCfg = Release|x64
@@ -418,6 +505,8 @@
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -425,6 +514,8 @@
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{2BB84911-C1B4-4747-B93D-36AA82CC5031}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -432,6 +523,8 @@
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug|ARM.ActiveCfg = Debug|ARM
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug|ARM.Build.0 = Debug|ARM
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug|ARM64.Build.0 = Debug|ARM64
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug|Win32.Build.0 = Debug|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug|x64.ActiveCfg = Debug|x64
@@ -439,6 +532,8 @@
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -446,6 +541,8 @@
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -453,6 +550,8 @@
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release|Any CPU.ActiveCfg = Release|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release|ARM.ActiveCfg = Release|ARM
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release|ARM.Build.0 = Release|ARM
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release|ARM64.ActiveCfg = Release|ARM64
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release|ARM64.Build.0 = Release|ARM64
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release|Win32.ActiveCfg = Release|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release|Win32.Build.0 = Release|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release|x64.ActiveCfg = Release|x64
@@ -460,6 +559,8 @@
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -467,6 +568,8 @@
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -474,6 +577,8 @@
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug|ARM.ActiveCfg = Debug|ARM
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug|ARM.Build.0 = Debug|ARM
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug|ARM64.Build.0 = Debug|ARM64
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug|Win32.Build.0 = Debug|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug|x64.ActiveCfg = Debug|x64
@@ -481,6 +586,8 @@
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -488,6 +595,8 @@
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -495,6 +604,8 @@
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release|ARM.ActiveCfg = Release|ARM
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release|ARM.Build.0 = Release|ARM
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release|ARM64.Build.0 = Release|ARM64
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release|Win32.ActiveCfg = Release|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release|Win32.Build.0 = Release|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release|x64.ActiveCfg = Release|x64
@@ -502,6 +613,8 @@
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -509,6 +622,8 @@
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{B8719FD5-E8A6-4A36-943C-891D07F5DD21}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -516,6 +631,8 @@
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug|ARM.ActiveCfg = Debug|ARM
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug|ARM.Build.0 = Debug|ARM
+		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug|ARM64.Build.0 = Debug|ARM64
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug|Win32.Build.0 = Debug|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug|x64.ActiveCfg = Debug|x64
@@ -523,6 +640,8 @@
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -530,6 +649,8 @@
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -537,6 +658,8 @@
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release|Any CPU.ActiveCfg = Release|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release|ARM.ActiveCfg = Release|ARM
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release|ARM.Build.0 = Release|ARM
+		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release|ARM64.ActiveCfg = Release|ARM64
+		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release|ARM64.Build.0 = Release|ARM64
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release|Win32.ActiveCfg = Release|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release|Win32.Build.0 = Release|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release|x64.ActiveCfg = Release|x64
@@ -544,6 +667,8 @@
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -551,6 +676,8 @@
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{8310649E-A25E-4AF0-91E8-9E3CC659BB89}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -558,6 +685,8 @@
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug|ARM.ActiveCfg = Debug|ARM
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug|ARM.Build.0 = Debug|ARM
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug|ARM64.Build.0 = Debug|ARM64
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug|Win32.Build.0 = Debug|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug|x64.ActiveCfg = Debug|x64
@@ -565,6 +694,8 @@
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -572,6 +703,8 @@
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -579,6 +712,8 @@
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release|Any CPU.ActiveCfg = Release|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release|ARM.ActiveCfg = Release|ARM
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release|ARM.Build.0 = Release|ARM
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release|ARM64.ActiveCfg = Release|ARM64
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release|ARM64.Build.0 = Release|ARM64
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release|Win32.ActiveCfg = Release|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release|Win32.Build.0 = Release|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release|x64.ActiveCfg = Release|x64
@@ -586,6 +721,8 @@
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -593,42 +730,56 @@
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Static|x64.ActiveCfg = Release-Static|x64
 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}.Release-Static|x64.Build.0 = Release-Static|x64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug|ARM.ActiveCfg = Debug|Win32
+		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug|ARM64.Build.0 = Debug|ARM64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug|Win32.Build.0 = Debug|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug|x64.ActiveCfg = Debug|x64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug|x64.Build.0 = Debug|x64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32
+		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32
+		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Debug-Static|x64.Build.0 = Debug-Static|x64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release|Any CPU.ActiveCfg = Release|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release|ARM.ActiveCfg = Release|Win32
+		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release|ARM64.Build.0 = Release|ARM64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release|Win32.ActiveCfg = Release|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release|Win32.Build.0 = Release|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release|x64.ActiveCfg = Release|x64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release|x64.Build.0 = Release|x64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32
+		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Static|ARM.ActiveCfg = Release-Static|Win32
+		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{A0F1AA62-0F6F-420D-B09A-AC04B6862821}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -636,6 +787,8 @@
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug|ARM.ActiveCfg = Debug|ARM
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug|ARM.Build.0 = Debug|ARM
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug|ARM64.Build.0 = Debug|ARM64
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug|Win32.Build.0 = Debug|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug|x64.ActiveCfg = Debug|x64
@@ -643,6 +796,8 @@
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -650,6 +805,8 @@
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -657,6 +814,8 @@
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release|Any CPU.ActiveCfg = Release|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release|ARM.ActiveCfg = Release|ARM
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release|ARM.Build.0 = Release|ARM
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release|ARM64.Build.0 = Release|ARM64
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release|Win32.ActiveCfg = Release|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release|Win32.Build.0 = Release|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release|x64.ActiveCfg = Release|x64
@@ -664,6 +823,8 @@
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -671,6 +832,8 @@
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -678,6 +841,8 @@
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug|ARM.ActiveCfg = Debug|ARM
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug|ARM.Build.0 = Debug|ARM
+		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug|ARM64.Build.0 = Debug|ARM64
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug|Win32.Build.0 = Debug|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug|x64.ActiveCfg = Debug|x64
@@ -685,6 +850,8 @@
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -692,6 +859,8 @@
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -699,6 +868,8 @@
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release|Any CPU.ActiveCfg = Release|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release|ARM.ActiveCfg = Release|ARM
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release|ARM.Build.0 = Release|ARM
+		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release|ARM64.Build.0 = Release|ARM64
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release|Win32.ActiveCfg = Release|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release|Win32.Build.0 = Release|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release|x64.ActiveCfg = Release|x64
@@ -706,6 +877,8 @@
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -713,6 +886,8 @@
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{E53AA5FF-B737-40AA-BD13-387EFA99023D}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -720,6 +895,8 @@
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug|ARM.ActiveCfg = Debug|ARM
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug|ARM.Build.0 = Debug|ARM
+		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug|ARM64.Build.0 = Debug|ARM64
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug|Win32.Build.0 = Debug|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug|x64.ActiveCfg = Debug|x64
@@ -727,6 +904,8 @@
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -734,6 +913,8 @@
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -741,6 +922,8 @@
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release|ARM.ActiveCfg = Release|ARM
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release|ARM.Build.0 = Release|ARM
+		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release|ARM64.Build.0 = Release|ARM64
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release|Win32.ActiveCfg = Release|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release|Win32.Build.0 = Release|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release|x64.ActiveCfg = Release|x64
@@ -748,6 +931,8 @@
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -755,6 +940,8 @@
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -762,6 +949,8 @@
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|ARM.ActiveCfg = Debug|ARM
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|ARM.Build.0 = Debug|ARM
+		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|ARM64.Build.0 = Debug|ARM64
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|Win32.Build.0 = Debug|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug|x64.ActiveCfg = Debug|x64
@@ -769,6 +958,8 @@
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -776,6 +967,8 @@
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -783,6 +976,8 @@
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release|Any CPU.ActiveCfg = Release|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release|ARM.ActiveCfg = Release|ARM
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release|ARM.Build.0 = Release|ARM
+		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release|ARM64.Build.0 = Release|ARM64
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release|Win32.ActiveCfg = Release|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release|Win32.Build.0 = Release|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release|x64.ActiveCfg = Release|x64
@@ -790,6 +985,8 @@
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -797,6 +994,8 @@
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{6794B975-4E84-4F49-B2DC-C31F2224E03E}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -804,6 +1003,8 @@
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug|ARM.ActiveCfg = Debug|ARM
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug|ARM.Build.0 = Debug|ARM
+		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug|ARM64.Build.0 = Debug|ARM64
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug|Win32.Build.0 = Debug|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug|x64.ActiveCfg = Debug|x64
@@ -811,6 +1012,8 @@
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -818,6 +1021,8 @@
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -825,6 +1030,8 @@
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release|Any CPU.ActiveCfg = Release|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release|ARM.ActiveCfg = Release|ARM
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release|ARM.Build.0 = Release|ARM
+		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release|ARM64.ActiveCfg = Release|ARM64
+		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release|ARM64.Build.0 = Release|ARM64
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release|Win32.ActiveCfg = Release|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release|Win32.Build.0 = Release|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release|x64.ActiveCfg = Release|x64
@@ -832,6 +1039,8 @@
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -839,6 +1048,8 @@
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -846,6 +1057,8 @@
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug|ARM.ActiveCfg = Debug|ARM
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug|ARM.Build.0 = Debug|ARM
+		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug|ARM64.Build.0 = Debug|ARM64
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug|Win32.Build.0 = Debug|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug|x64.ActiveCfg = Debug|x64
@@ -853,6 +1066,8 @@
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -860,6 +1075,8 @@
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -867,6 +1084,8 @@
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release|Any CPU.ActiveCfg = Release|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release|ARM.ActiveCfg = Release|ARM
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release|ARM.Build.0 = Release|ARM
+		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release|ARM64.Build.0 = Release|ARM64
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release|Win32.ActiveCfg = Release|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release|Win32.Build.0 = Release|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release|x64.ActiveCfg = Release|x64
@@ -874,6 +1093,8 @@
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -881,6 +1102,8 @@
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -888,6 +1111,8 @@
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug|ARM.ActiveCfg = Debug|ARM
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug|ARM.Build.0 = Debug|ARM
+		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug|ARM64.Build.0 = Debug|ARM64
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug|Win32.Build.0 = Debug|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug|x64.ActiveCfg = Debug|x64
@@ -895,6 +1120,8 @@
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -902,6 +1129,8 @@
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -909,6 +1138,8 @@
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release|Any CPU.ActiveCfg = Release|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release|ARM.ActiveCfg = Release|ARM
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release|ARM.Build.0 = Release|ARM
+		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release|ARM64.Build.0 = Release|ARM64
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release|Win32.ActiveCfg = Release|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release|Win32.Build.0 = Release|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release|x64.ActiveCfg = Release|x64
@@ -916,6 +1147,8 @@
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -923,78 +1156,104 @@
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Static|x64.ActiveCfg = Release-Static|x64
 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release-Static|x64.Build.0 = Release-Static|x64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug|ARM.ActiveCfg = Debug|Win32
+		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug|ARM64.Build.0 = Debug|ARM64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug|Win32.Build.0 = Debug|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug|x64.ActiveCfg = Debug|x64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug|x64.Build.0 = Debug|x64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32
+		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32
+		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug-Static|x64.Build.0 = Debug-Static|x64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release|Any CPU.ActiveCfg = Release|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release|ARM.ActiveCfg = Release|Win32
+		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release|ARM64.ActiveCfg = Release|ARM64
+		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release|ARM64.Build.0 = Release|ARM64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release|Win32.ActiveCfg = Release|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release|Win32.Build.0 = Release|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release|x64.ActiveCfg = Release|x64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release|x64.Build.0 = Release|x64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32
+		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Static|ARM.ActiveCfg = Release-Static|Win32
+		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Static|x64.ActiveCfg = Release-Static|x64
 		{553C094C-F581-4A80-9540-D5D7B398A2C6}.Release-Static|x64.Build.0 = Release-Static|x64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug|ARM.ActiveCfg = Debug|Win32
+		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug|ARM64.Build.0 = Debug|ARM64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug|Win32.ActiveCfg = Debug|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug|Win32.Build.0 = Debug|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug|x64.ActiveCfg = Debug|x64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug|x64.Build.0 = Debug|x64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32
+		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32
+		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug-Static|x64.Build.0 = Debug-Static|x64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release|Any CPU.ActiveCfg = Release|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release|ARM.ActiveCfg = Release|Win32
+		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release|ARM64.ActiveCfg = Release|ARM64
+		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release|ARM64.Build.0 = Release|ARM64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release|Win32.ActiveCfg = Release|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release|Win32.Build.0 = Release|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release|x64.ActiveCfg = Release|x64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release|x64.Build.0 = Release|x64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32
+		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Static|ARM.ActiveCfg = Release-Static|Win32
+		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -1002,6 +1261,8 @@
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug|ARM.ActiveCfg = Debug|ARM
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug|ARM.Build.0 = Debug|ARM
+		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug|ARM64.Build.0 = Debug|ARM64
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug|Win32.Build.0 = Debug|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug|x64.ActiveCfg = Debug|x64
@@ -1009,6 +1270,8 @@
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -1016,6 +1279,8 @@
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -1023,6 +1288,8 @@
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release|Any CPU.ActiveCfg = Release|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release|ARM.ActiveCfg = Release|ARM
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release|ARM.Build.0 = Release|ARM
+		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release|ARM64.ActiveCfg = Release|ARM64
+		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release|ARM64.Build.0 = Release|ARM64
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release|Win32.ActiveCfg = Release|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release|Win32.Build.0 = Release|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release|x64.ActiveCfg = Release|x64
@@ -1030,6 +1297,8 @@
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -1037,6 +1306,8 @@
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{4281CA5E-1D48-45D4-A991-2718A454B4BA}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -1044,6 +1315,8 @@
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug|ARM.ActiveCfg = Debug|ARM
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug|ARM.Build.0 = Debug|ARM
+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug|ARM64.Build.0 = Debug|ARM64
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug|Win32.Build.0 = Debug|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug|x64.ActiveCfg = Debug|x64
@@ -1051,6 +1324,8 @@
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -1058,6 +1333,8 @@
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -1065,6 +1342,8 @@
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release|Any CPU.ActiveCfg = Release|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release|ARM.ActiveCfg = Release|ARM
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release|ARM.Build.0 = Release|ARM
+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release|ARM64.Build.0 = Release|ARM64
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release|Win32.ActiveCfg = Release|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release|Win32.Build.0 = Release|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release|x64.ActiveCfg = Release|x64
@@ -1072,6 +1351,8 @@
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -1079,78 +1360,104 @@
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|x64.ActiveCfg = Release-Static|x64
 		{2A3F241E-682C-47E1-9543-DC28708B406A}.Release-Static|x64.Build.0 = Release-Static|x64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug|ARM.ActiveCfg = Debug|Win32
+		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug|ARM64.Build.0 = Debug|ARM64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug|Win32.Build.0 = Debug|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug|x64.ActiveCfg = Debug|x64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug|x64.Build.0 = Debug|x64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32
+		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32
+		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Debug-Static|x64.Build.0 = Debug-Static|x64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release|Any CPU.ActiveCfg = Release|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release|ARM.ActiveCfg = Release|Win32
+		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release|ARM64.Build.0 = Release|ARM64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release|Win32.ActiveCfg = Release|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release|Win32.Build.0 = Release|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release|x64.ActiveCfg = Release|x64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release|x64.Build.0 = Release|x64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32
+		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Static|ARM.ActiveCfg = Release-Static|Win32
+		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Static|x64.ActiveCfg = Release-Static|x64
 		{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}.Release-Static|x64.Build.0 = Release-Static|x64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug|ARM.ActiveCfg = Debug|Win32
+		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug|ARM64.Build.0 = Debug|ARM64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug|Win32.Build.0 = Debug|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug|x64.ActiveCfg = Debug|x64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug|x64.Build.0 = Debug|x64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32
+		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32
+		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Debug-Static|x64.Build.0 = Debug-Static|x64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release|ARM.ActiveCfg = Release|Win32
+		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release|ARM64.Build.0 = Release|ARM64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release|Win32.ActiveCfg = Release|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release|Win32.Build.0 = Release|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release|x64.ActiveCfg = Release|x64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release|x64.Build.0 = Release|x64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32
+		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Static|ARM.ActiveCfg = Release-Static|Win32
+		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -1158,6 +1465,8 @@
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug|ARM.ActiveCfg = Debug|ARM
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug|ARM.Build.0 = Debug|ARM
+		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug|ARM64.Build.0 = Debug|ARM64
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug|Win32.Build.0 = Debug|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug|x64.ActiveCfg = Debug|x64
@@ -1165,6 +1474,8 @@
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -1172,6 +1483,8 @@
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -1179,6 +1492,8 @@
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release|Any CPU.ActiveCfg = Release|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release|ARM.ActiveCfg = Release|ARM
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release|ARM.Build.0 = Release|ARM
+		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release|ARM64.ActiveCfg = Release|ARM64
+		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release|ARM64.Build.0 = Release|ARM64
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release|Win32.ActiveCfg = Release|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release|Win32.Build.0 = Release|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release|x64.ActiveCfg = Release|x64
@@ -1186,6 +1501,8 @@
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -1193,40 +1510,54 @@
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|x64.ActiveCfg = Release-Static|x64
 		{23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|x64.Build.0 = Release-Static|x64
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|ARM.ActiveCfg = Debug|Win32
+		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|x64.ActiveCfg = Debug|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Any CPU.ActiveCfg = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Any CPU.Build.0 = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|ARM.ActiveCfg = Debug|Win32
+		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|ARM64.ActiveCfg = Debug|ARM64
+		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|ARM64.Build.0 = Debug|ARM64
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|x64.ActiveCfg = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Any CPU.ActiveCfg = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Any CPU.Build.0 = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|ARM.ActiveCfg = Debug|Win32
+		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|ARM64.ActiveCfg = Debug|ARM64
+		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|ARM64.Build.0 = Debug|ARM64
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Win32.ActiveCfg = Debug|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|x64.ActiveCfg = Debug|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Any CPU.ActiveCfg = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|ARM.ActiveCfg = Release|Win32
+		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|ARM64.ActiveCfg = Release|ARM64
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Win32.ActiveCfg = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|x64.ActiveCfg = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Any CPU.ActiveCfg = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Any CPU.Build.0 = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|ARM.ActiveCfg = Release|Win32
+		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|ARM64.ActiveCfg = Release|ARM64
+		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|ARM64.Build.0 = Release|ARM64
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Win32.ActiveCfg = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|x64.ActiveCfg = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Any CPU.ActiveCfg = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Any CPU.Build.0 = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|ARM.ActiveCfg = Release|Win32
+		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|ARM64.ActiveCfg = Release|ARM64
+		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|ARM64.Build.0 = Release|ARM64
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Win32.ActiveCfg = Release|Win32
 		{0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|x64.ActiveCfg = Release|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug|ARM.ActiveCfg = Debug|Win32
+		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug|Win32.Build.0 = Debug|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug|x64.ActiveCfg = Debug|x64
@@ -1234,6 +1565,8 @@
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Any CPU.ActiveCfg = Release|x64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Any CPU.Build.0 = Release|x64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|ARM.ActiveCfg = Debug|Win32
+		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|ARM64.ActiveCfg = Debug|ARM64
+		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|ARM64.Build.0 = Debug|ARM64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|Win32.Build.0 = Debug|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Dynamic|x64.ActiveCfg = Debug|x64
@@ -1241,12 +1574,16 @@
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Static|Any CPU.ActiveCfg = Release|x64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Static|Any CPU.Build.0 = Release|x64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Static|ARM.ActiveCfg = Debug|Win32
+		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Static|ARM64.ActiveCfg = Debug|ARM64
+		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Static|ARM64.Build.0 = Debug|ARM64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Static|Win32.ActiveCfg = Debug|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Static|Win32.Build.0 = Debug|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Static|x64.ActiveCfg = Debug|x64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Debug-Static|x64.Build.0 = Debug|x64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release|Any CPU.ActiveCfg = Release|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release|ARM.ActiveCfg = Release|Win32
+		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release|ARM64.ActiveCfg = Release|ARM64
+		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release|ARM64.Build.0 = Release|ARM64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release|Win32.ActiveCfg = Release|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release|Win32.Build.0 = Release|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release|x64.ActiveCfg = Release|x64
@@ -1254,6 +1591,8 @@
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Any CPU.ActiveCfg = Release|x64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Any CPU.Build.0 = Release|x64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|ARM.ActiveCfg = Release|Win32
+		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|ARM64.ActiveCfg = Release|ARM64
+		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|ARM64.Build.0 = Release|ARM64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.ActiveCfg = Release|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|Win32.Build.0 = Release|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Dynamic|x64.ActiveCfg = Release|x64
@@ -1261,6 +1600,8 @@
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Static|Any CPU.ActiveCfg = Release|x64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Static|Any CPU.Build.0 = Release|x64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Static|ARM.ActiveCfg = Release|Win32
+		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Static|ARM64.ActiveCfg = Release|ARM64
+		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Static|ARM64.Build.0 = Release|ARM64
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Static|Win32.ActiveCfg = Release|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Static|Win32.Build.0 = Release|Win32
 		{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}.Release-Static|x64.ActiveCfg = Release|x64
@@ -1268,6 +1609,8 @@
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug|ARM.ActiveCfg = Debug|ARM
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug|ARM.Build.0 = Debug|ARM
+		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug|ARM64.Build.0 = Debug|ARM64
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug|Win32.Build.0 = Debug|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug|x64.ActiveCfg = Debug|x64
@@ -1275,6 +1618,8 @@
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -1282,6 +1627,8 @@
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -1289,6 +1636,8 @@
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release|Any CPU.ActiveCfg = Release|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release|ARM.ActiveCfg = Release|ARM
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release|ARM.Build.0 = Release|ARM
+		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release|ARM64.Build.0 = Release|ARM64
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release|Win32.ActiveCfg = Release|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release|Win32.Build.0 = Release|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release|x64.ActiveCfg = Release|x64
@@ -1296,6 +1645,8 @@
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -1303,6 +1654,8 @@
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{A1989FF3-9894-40F4-B5A6-6EA364476E45}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -1310,6 +1663,8 @@
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|ARM.ActiveCfg = Debug|ARM
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|ARM.Build.0 = Debug|ARM
+		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|ARM64.Build.0 = Debug|ARM64
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Win32.Build.0 = Debug|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|x64.ActiveCfg = Debug|x64
@@ -1317,6 +1672,8 @@
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -1324,6 +1681,8 @@
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -1331,6 +1690,8 @@
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Any CPU.ActiveCfg = Release|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|ARM.ActiveCfg = Release|ARM
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|ARM.Build.0 = Release|ARM
+		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|ARM64.ActiveCfg = Release|ARM64
+		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|ARM64.Build.0 = Release|ARM64
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Win32.ActiveCfg = Release|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Win32.Build.0 = Release|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|x64.ActiveCfg = Release|x64
@@ -1338,6 +1699,8 @@
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -1345,6 +1708,8 @@
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -1352,6 +1717,8 @@
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug|ARM.ActiveCfg = Debug|ARM
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug|ARM.Build.0 = Debug|ARM
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug|ARM64.Build.0 = Debug|ARM64
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug|Win32.Build.0 = Debug|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug|x64.ActiveCfg = Debug|x64
@@ -1359,6 +1726,8 @@
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -1366,6 +1735,8 @@
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -1373,6 +1744,8 @@
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release|Any CPU.ActiveCfg = Release|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release|ARM.ActiveCfg = Release|ARM
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release|ARM.Build.0 = Release|ARM
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release|ARM64.Build.0 = Release|ARM64
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release|Win32.ActiveCfg = Release|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release|Win32.Build.0 = Release|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release|x64.ActiveCfg = Release|x64
@@ -1380,6 +1753,8 @@
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -1387,6 +1762,8 @@
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -1395,6 +1772,7 @@
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug|ARM.ActiveCfg = Debug|ARM
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug|ARM.Build.0 = Debug|ARM
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug|ARM.Deploy.0 = Debug|ARM
+		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug|ARM64.ActiveCfg = Debug|x86
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug|Win32.Build.0 = Debug|Win32
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug|Win32.Deploy.0 = Debug|Win32
@@ -1407,6 +1785,7 @@
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Dynamic|ARM.Build.0 = Debug|ARM
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Dynamic|ARM.Deploy.0 = Debug|ARM
+		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Dynamic|ARM64.ActiveCfg = Release|x64
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Dynamic|Win32.Build.0 = Debug|Win32
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Dynamic|Win32.Deploy.0 = Debug|Win32
@@ -1419,6 +1798,7 @@
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Static|ARM.ActiveCfg = Debug|ARM
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Static|ARM.Build.0 = Debug|ARM
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Static|ARM.Deploy.0 = Debug|ARM
+		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Static|ARM64.ActiveCfg = Release|x64
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Static|Win32.ActiveCfg = Debug|Win32
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Static|Win32.Build.0 = Debug|Win32
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Debug-Static|Win32.Deploy.0 = Debug|Win32
@@ -1429,6 +1809,7 @@
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release|ARM.ActiveCfg = Release|ARM
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release|ARM.Build.0 = Release|ARM
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release|ARM.Deploy.0 = Release|ARM
+		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release|ARM64.ActiveCfg = Release|x86
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release|Win32.ActiveCfg = Release|Win32
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release|Win32.Build.0 = Release|Win32
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release|Win32.Deploy.0 = Release|Win32
@@ -1441,6 +1822,7 @@
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Dynamic|ARM.ActiveCfg = Release|ARM
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Dynamic|ARM.Build.0 = Release|ARM
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Dynamic|ARM.Deploy.0 = Release|ARM
+		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Dynamic|ARM64.ActiveCfg = Release|x64
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Dynamic|Win32.ActiveCfg = Release|Win32
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Dynamic|Win32.Build.0 = Release|Win32
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Dynamic|Win32.Deploy.0 = Release|Win32
@@ -1453,6 +1835,7 @@
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Static|ARM.ActiveCfg = Release|ARM
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Static|ARM.Build.0 = Release|ARM
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Static|ARM.Deploy.0 = Release|ARM
+		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Static|ARM64.ActiveCfg = Release|x64
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Static|Win32.ActiveCfg = Release|Win32
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Static|Win32.Build.0 = Release|Win32
 		{D26DD1D3-C631-4A56-BBE5-D42F1ACFD53A}.Release-Static|Win32.Deploy.0 = Release|Win32
@@ -1465,6 +1848,7 @@
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug|ARM.ActiveCfg = Debug|ARM
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug|ARM.Build.0 = Debug|ARM
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug|ARM.Deploy.0 = Debug|ARM
+		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug|Win32.Build.0 = Debug|Win32
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug|Win32.Deploy.0 = Debug|Win32
@@ -1477,6 +1861,7 @@
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Dynamic|ARM.Build.0 = Debug|ARM
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Dynamic|ARM.Deploy.0 = Debug|ARM
+		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Dynamic|ARM64.ActiveCfg = Debug|Any CPU
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Dynamic|Win32.Build.0 = Debug|Win32
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Dynamic|Win32.Deploy.0 = Debug|Win32
@@ -1489,6 +1874,7 @@
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Static|ARM.ActiveCfg = Debug|ARM
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Static|ARM.Build.0 = Debug|ARM
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Static|ARM.Deploy.0 = Debug|ARM
+		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Static|ARM64.ActiveCfg = Debug|Any CPU
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Static|Win32.ActiveCfg = Debug|Win32
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Static|Win32.Build.0 = Debug|Win32
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Debug-Static|Win32.Deploy.0 = Debug|Win32
@@ -1501,6 +1887,7 @@
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release|ARM.ActiveCfg = Release|ARM
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release|ARM.Build.0 = Release|ARM
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release|ARM.Deploy.0 = Release|ARM
+		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release|Win32.ActiveCfg = Release|Win32
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release|Win32.Build.0 = Release|Win32
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release|Win32.Deploy.0 = Release|Win32
@@ -1513,6 +1900,7 @@
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Dynamic|ARM.ActiveCfg = Release|ARM
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Dynamic|ARM.Build.0 = Release|ARM
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Dynamic|ARM.Deploy.0 = Release|ARM
+		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Dynamic|ARM64.ActiveCfg = Release|Any CPU
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Dynamic|Win32.ActiveCfg = Release|Win32
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Dynamic|Win32.Build.0 = Release|Win32
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Dynamic|Win32.Deploy.0 = Release|Win32
@@ -1525,6 +1913,7 @@
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Static|ARM.ActiveCfg = Release|ARM
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Static|ARM.Build.0 = Release|ARM
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Static|ARM.Deploy.0 = Release|ARM
+		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Static|ARM64.ActiveCfg = Release|Any CPU
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Static|Win32.ActiveCfg = Release|Win32
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Static|Win32.Build.0 = Release|Win32
 		{B3BA00A5-4F68-4F52-8081-395124F141AB}.Release-Static|Win32.Deploy.0 = Release|Win32
@@ -1534,6 +1923,7 @@
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug|ARM.ActiveCfg = Debug|ARM
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug|ARM.Build.0 = Debug|ARM
+		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug|Win32.Build.0 = Debug|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug|x64.ActiveCfg = Debug|x64
@@ -1542,6 +1932,7 @@
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Dynamic|Any CPU.Build.0 = Release|x64
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Dynamic|ARM.Build.0 = Debug|ARM
+		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Dynamic|ARM64.ActiveCfg = Release|ARM
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Dynamic|Win32.Build.0 = Debug|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Dynamic|x64.ActiveCfg = Debug|x64
@@ -1550,6 +1941,7 @@
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Static|Any CPU.Build.0 = Release|x64
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Static|ARM.ActiveCfg = Debug|ARM
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Static|ARM.Build.0 = Debug|ARM
+		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Static|ARM64.ActiveCfg = Release|ARM
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Static|Win32.ActiveCfg = Debug|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Static|Win32.Build.0 = Debug|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Debug-Static|x64.ActiveCfg = Debug|x64
@@ -1557,6 +1949,7 @@
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release|Any CPU.ActiveCfg = Release|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release|ARM.ActiveCfg = Release|ARM
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release|ARM.Build.0 = Release|ARM
+		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release|ARM64.ActiveCfg = Release|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release|Win32.ActiveCfg = Release|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release|Win32.Build.0 = Release|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release|x64.ActiveCfg = Release|x64
@@ -1565,6 +1958,7 @@
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Dynamic|Any CPU.Build.0 = Release|x64
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Dynamic|ARM.ActiveCfg = Release|ARM
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Dynamic|ARM.Build.0 = Release|ARM
+		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Dynamic|ARM64.ActiveCfg = Release|ARM
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Dynamic|Win32.ActiveCfg = Release|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Dynamic|Win32.Build.0 = Release|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Dynamic|x64.ActiveCfg = Release|x64
@@ -1573,6 +1967,7 @@
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Static|Any CPU.Build.0 = Release|x64
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Static|ARM.ActiveCfg = Release|ARM
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Static|ARM.Build.0 = Release|ARM
+		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Static|ARM64.ActiveCfg = Release|ARM
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Static|Win32.ActiveCfg = Release|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Static|Win32.Build.0 = Release|Win32
 		{207E7BD4-7B11-4A40-BA3A-CC627762A7B6}.Release-Static|x64.ActiveCfg = Release|x64
@@ -1580,6 +1975,7 @@
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug|ARM.ActiveCfg = Debug|ARM
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug|ARM.Build.0 = Debug|ARM
+		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug|Win32.Build.0 = Debug|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug|x64.ActiveCfg = Debug|Win32
@@ -1587,6 +1983,7 @@
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Dynamic|Any CPU.Build.0 = Release|ARM
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Dynamic|ARM.Build.0 = Debug|ARM
+		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Dynamic|ARM64.ActiveCfg = Release|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Dynamic|Win32.Build.0 = Debug|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Dynamic|x64.ActiveCfg = Release|ARM
@@ -1595,6 +1992,7 @@
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Static|Any CPU.Build.0 = Release|ARM
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Static|ARM.ActiveCfg = Debug|ARM
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Static|ARM.Build.0 = Debug|ARM
+		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Static|ARM64.ActiveCfg = Release|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Static|Win32.ActiveCfg = Debug|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Static|Win32.Build.0 = Debug|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Debug-Static|x64.ActiveCfg = Release|ARM
@@ -1602,6 +2000,7 @@
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release|Any CPU.ActiveCfg = Release|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release|ARM.ActiveCfg = Release|ARM
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release|ARM.Build.0 = Release|ARM
+		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release|ARM64.ActiveCfg = Release|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release|Win32.ActiveCfg = Release|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release|Win32.Build.0 = Release|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release|x64.ActiveCfg = Release|Win32
@@ -1609,6 +2008,7 @@
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Dynamic|Any CPU.Build.0 = Release|ARM
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Dynamic|ARM.ActiveCfg = Release|ARM
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Dynamic|ARM.Build.0 = Release|ARM
+		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Dynamic|ARM64.ActiveCfg = Release|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Dynamic|Win32.ActiveCfg = Release|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Dynamic|Win32.Build.0 = Release|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Dynamic|x64.ActiveCfg = Release|ARM
@@ -1617,6 +2017,7 @@
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Static|Any CPU.Build.0 = Release|ARM
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Static|ARM.ActiveCfg = Release|ARM
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Static|ARM.Build.0 = Release|ARM
+		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Static|ARM64.ActiveCfg = Release|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Static|Win32.ActiveCfg = Release|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Static|Win32.Build.0 = Release|Win32
 		{E75EFD41-C7F5-44C8-8FF1-A310D920989D}.Release-Static|x64.ActiveCfg = Release|ARM
@@ -1625,6 +2026,7 @@
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug|ARM.ActiveCfg = Debug|ARM
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug|ARM.Build.0 = Debug|ARM
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug|ARM.Deploy.0 = Debug|ARM
+		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug|ARM64.ActiveCfg = Debug|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug|Win32.ActiveCfg = Debug|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug|Win32.Build.0 = Debug|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug|Win32.Deploy.0 = Debug|x86
@@ -1637,6 +2039,7 @@
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Dynamic|ARM.Build.0 = Debug|ARM
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Dynamic|ARM.Deploy.0 = Debug|ARM
+		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Dynamic|ARM64.ActiveCfg = Release|x64
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Dynamic|Win32.ActiveCfg = Debug|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Dynamic|Win32.Build.0 = Debug|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Dynamic|Win32.Deploy.0 = Debug|x86
@@ -1649,6 +2052,7 @@
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Static|ARM.ActiveCfg = Debug|ARM
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Static|ARM.Build.0 = Debug|ARM
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Static|ARM.Deploy.0 = Debug|ARM
+		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Static|ARM64.ActiveCfg = Release|x64
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Static|Win32.ActiveCfg = Debug|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Static|Win32.Build.0 = Debug|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Debug-Static|Win32.Deploy.0 = Debug|x86
@@ -1659,6 +2063,7 @@
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release|ARM.ActiveCfg = Release|ARM
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release|ARM.Build.0 = Release|ARM
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release|ARM.Deploy.0 = Release|ARM
+		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release|ARM64.ActiveCfg = Release|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release|Win32.ActiveCfg = Release|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release|Win32.Build.0 = Release|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release|Win32.Deploy.0 = Release|x86
@@ -1671,6 +2076,7 @@
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Dynamic|ARM.ActiveCfg = Release|ARM
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Dynamic|ARM.Build.0 = Release|ARM
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Dynamic|ARM.Deploy.0 = Release|ARM
+		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Dynamic|ARM64.ActiveCfg = Release|x64
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Dynamic|Win32.ActiveCfg = Release|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Dynamic|Win32.Build.0 = Release|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Dynamic|Win32.Deploy.0 = Release|x86
@@ -1683,6 +2089,7 @@
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Static|ARM.ActiveCfg = Release|ARM
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Static|ARM.Build.0 = Release|ARM
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Static|ARM.Deploy.0 = Release|ARM
+		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Static|ARM64.ActiveCfg = Release|x64
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Static|Win32.ActiveCfg = Release|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Static|Win32.Build.0 = Release|x86
 		{B11B5672-B1E8-4C77-BDA1-4E6620F96BF9}.Release-Static|Win32.Deploy.0 = Release|x86
@@ -1692,6 +2099,7 @@
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug|ARM.ActiveCfg = Debug|ARM
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug|ARM.Build.0 = Debug|ARM
+		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug|Win32.Build.0 = Debug|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug|x64.ActiveCfg = Debug|x64
@@ -1700,6 +2108,7 @@
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Dynamic|Any CPU.Build.0 = Release|x64
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Dynamic|ARM.Build.0 = Debug|ARM
+		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Dynamic|ARM64.ActiveCfg = Release|ARM
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Dynamic|Win32.Build.0 = Debug|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Dynamic|x64.ActiveCfg = Debug|x64
@@ -1708,6 +2117,7 @@
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Static|Any CPU.Build.0 = Release|x64
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Static|ARM.ActiveCfg = Debug|ARM
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Static|ARM.Build.0 = Debug|ARM
+		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Static|ARM64.ActiveCfg = Release|ARM
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Static|Win32.ActiveCfg = Debug|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Static|Win32.Build.0 = Debug|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Debug-Static|x64.ActiveCfg = Debug|x64
@@ -1715,6 +2125,7 @@
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release|Any CPU.ActiveCfg = Release|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release|ARM.ActiveCfg = Release|ARM
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release|ARM.Build.0 = Release|ARM
+		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release|ARM64.ActiveCfg = Release|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release|Win32.ActiveCfg = Release|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release|Win32.Build.0 = Release|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release|x64.ActiveCfg = Release|x64
@@ -1723,6 +2134,7 @@
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Dynamic|Any CPU.Build.0 = Release|x64
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Dynamic|ARM.ActiveCfg = Release|ARM
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Dynamic|ARM.Build.0 = Release|ARM
+		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Dynamic|ARM64.ActiveCfg = Release|ARM
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Dynamic|Win32.ActiveCfg = Release|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Dynamic|Win32.Build.0 = Release|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Dynamic|x64.ActiveCfg = Release|x64
@@ -1731,6 +2143,7 @@
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Static|Any CPU.Build.0 = Release|x64
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Static|ARM.ActiveCfg = Release|ARM
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Static|ARM.Build.0 = Release|ARM
+		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Static|ARM64.ActiveCfg = Release|ARM
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Static|Win32.ActiveCfg = Release|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Static|Win32.Build.0 = Release|Win32
 		{FC9CBB95-624C-4CE8-86A8-3AB5A415AA65}.Release-Static|x64.ActiveCfg = Release|x64
@@ -1738,6 +2151,7 @@
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug|ARM.ActiveCfg = Debug|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug|ARM.Build.0 = Debug|ARM
+		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug|Win32.Build.0 = Debug|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug|x64.ActiveCfg = Debug|x64
@@ -1749,6 +2163,7 @@
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Dynamic|ARM.Build.0 = Debug|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Dynamic|ARM.Deploy.0 = Debug|ARM
+		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Dynamic|ARM64.ActiveCfg = Release|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Dynamic|Win32.Build.0 = Debug|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Dynamic|Win32.Deploy.0 = Debug|Win32
@@ -1761,6 +2176,7 @@
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Static|ARM.ActiveCfg = Debug|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Static|ARM.Build.0 = Debug|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Static|ARM.Deploy.0 = Debug|ARM
+		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Static|ARM64.ActiveCfg = Release|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Static|Win32.ActiveCfg = Debug|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Static|Win32.Build.0 = Debug|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Debug-Static|Win32.Deploy.0 = Debug|Win32
@@ -1771,6 +2187,7 @@
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release|ARM.ActiveCfg = Release|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release|ARM.Build.0 = Release|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release|ARM.Deploy.0 = Release|ARM
+		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release|ARM64.ActiveCfg = Release|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release|Win32.ActiveCfg = Release|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release|Win32.Build.0 = Release|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release|Win32.Deploy.0 = Release|Win32
@@ -1783,6 +2200,7 @@
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Dynamic|ARM.ActiveCfg = Release|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Dynamic|ARM.Build.0 = Release|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Dynamic|ARM.Deploy.0 = Release|ARM
+		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Dynamic|ARM64.ActiveCfg = Release|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Dynamic|Win32.ActiveCfg = Release|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Dynamic|Win32.Build.0 = Release|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Dynamic|Win32.Deploy.0 = Release|Win32
@@ -1795,6 +2213,7 @@
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Static|ARM.ActiveCfg = Release|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Static|ARM.Build.0 = Release|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Static|ARM.Deploy.0 = Release|ARM
+		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Static|ARM64.ActiveCfg = Release|ARM
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Static|Win32.ActiveCfg = Release|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Static|Win32.Build.0 = Release|Win32
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6}.Release-Static|Win32.Deploy.0 = Release|Win32
@@ -1805,6 +2224,7 @@
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug|ARM.ActiveCfg = Debug|ARM
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug|ARM.Build.0 = Debug|ARM
+		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug|ARM64.ActiveCfg = Debug|Any CPU
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug|Win32.ActiveCfg = Debug|x86
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug|Win32.Build.0 = Debug|x86
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug|x64.ActiveCfg = Debug|x64
@@ -1813,6 +2233,7 @@
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Dynamic|Any CPU.Build.0 = Debug|Any CPU
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Dynamic|ARM.ActiveCfg = Debug|ARM
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Dynamic|ARM.Build.0 = Debug|ARM
+		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Dynamic|ARM64.ActiveCfg = Debug|Any CPU
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Dynamic|Win32.ActiveCfg = Debug|x86
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Dynamic|Win32.Build.0 = Debug|x86
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Dynamic|x64.ActiveCfg = Debug|x64
@@ -1821,6 +2242,7 @@
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Static|Any CPU.Build.0 = Debug|Any CPU
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Static|ARM.ActiveCfg = Debug|ARM
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Static|ARM.Build.0 = Debug|ARM
+		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Static|ARM64.ActiveCfg = Debug|Any CPU
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Static|Win32.ActiveCfg = Debug|x86
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Static|Win32.Build.0 = Debug|x86
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Debug-Static|x64.ActiveCfg = Debug|x64
@@ -1829,6 +2251,7 @@
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release|ARM.ActiveCfg = Release|ARM
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release|ARM.Build.0 = Release|ARM
+		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release|ARM64.ActiveCfg = Release|Any CPU
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release|Win32.ActiveCfg = Release|x86
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release|Win32.Build.0 = Release|x86
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release|x64.ActiveCfg = Release|x64
@@ -1837,6 +2260,7 @@
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Dynamic|Any CPU.Build.0 = Release|Any CPU
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Dynamic|ARM.ActiveCfg = Release|ARM
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Dynamic|ARM.Build.0 = Release|ARM
+		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Dynamic|ARM64.ActiveCfg = Release|Any CPU
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Dynamic|Win32.ActiveCfg = Release|x86
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Dynamic|Win32.Build.0 = Release|x86
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Dynamic|x64.ActiveCfg = Release|x64
@@ -1845,6 +2269,7 @@
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Static|Any CPU.Build.0 = Release|Any CPU
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Static|ARM.ActiveCfg = Release|ARM
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Static|ARM.Build.0 = Release|ARM
+		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Static|ARM64.ActiveCfg = Release|Any CPU
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Static|Win32.ActiveCfg = Release|x86
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Static|Win32.Build.0 = Release|x86
 		{9FDF5E33-D15D-409F-876E-4E77727936B9}.Release-Static|x64.ActiveCfg = Release|x64
@@ -1852,6 +2277,8 @@
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|ARM.ActiveCfg = Debug|ARM
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|ARM.Build.0 = Debug|ARM
+		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|ARM64.Build.0 = Debug|ARM64
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Win32.Build.0 = Debug|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|x64.ActiveCfg = Debug|x64
@@ -1859,6 +2286,8 @@
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -1866,6 +2295,8 @@
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -1873,6 +2304,8 @@
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Any CPU.ActiveCfg = Release|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|ARM.ActiveCfg = Release|ARM
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|ARM.Build.0 = Release|ARM
+		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|ARM64.ActiveCfg = Release|ARM64
+		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|ARM64.Build.0 = Release|ARM64
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Win32.ActiveCfg = Release|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Win32.Build.0 = Release|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|x64.ActiveCfg = Release|x64
@@ -1880,6 +2313,8 @@
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -1887,6 +2322,8 @@
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|x64.ActiveCfg = Release-Static|x64
@@ -1894,6 +2331,8 @@
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|ARM.ActiveCfg = Debug|ARM
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|ARM.Build.0 = Debug|ARM
+		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|Win32.Build.0 = Debug|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug|x64.ActiveCfg = Debug|x64
@@ -1901,6 +2340,8 @@
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|ARM.Build.0 = Debug-Dynamic|ARM
+		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|ARM64.Build.0 = Debug-Dynamic|ARM64
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
@@ -1908,6 +2349,8 @@
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|ARM.Build.0 = Debug-Static|ARM
+		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|ARM64.Build.0 = Debug-Static|ARM64
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|Win32.Build.0 = Debug-Static|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
@@ -1915,6 +2358,8 @@
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|Any CPU.ActiveCfg = Release|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|ARM.ActiveCfg = Release|ARM
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|ARM.Build.0 = Release|ARM
+		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|ARM64.ActiveCfg = Release|ARM64
+		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|ARM64.Build.0 = Release|ARM64
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|Win32.ActiveCfg = Release|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|Win32.Build.0 = Release|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release|x64.ActiveCfg = Release|x64
@@ -1922,6 +2367,8 @@
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|ARM.Build.0 = Release-Dynamic|ARM
+		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|ARM64.Build.0 = Release-Dynamic|ARM64
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
@@ -1929,34 +2376,76 @@
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|ARM.Build.0 = Release-Static|ARM
+		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|ARM64.Build.0 = Release-Static|ARM64
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|Win32.Build.0 = Release-Static|Win32
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|x64.ActiveCfg = Release-Static|x64
 		{5BCF2773-3825-4D91-9D72-3E2F650DF1DB}.Release-Static|x64.Build.0 = Release-Static|x64
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|ARM.ActiveCfg = Debug|Win32
+		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug|x64.ActiveCfg = Debug|x64
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|Any CPU.ActiveCfg = Debug|Win32
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|ARM.ActiveCfg = Debug|Win32
+		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|ARM64.ActiveCfg = Debug|ARM64
+		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|ARM64.Build.0 = Debug|ARM64
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Dynamic|x64.ActiveCfg = Debug|x64
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|Any CPU.ActiveCfg = Debug|Win32
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|ARM.ActiveCfg = Debug|Win32
+		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|ARM64.ActiveCfg = Debug|ARM64
+		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|ARM64.Build.0 = Debug|ARM64
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|Win32.ActiveCfg = Debug|Win32
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Debug-Static|x64.ActiveCfg = Debug|x64
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|Any CPU.ActiveCfg = Release|Win32
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|ARM.ActiveCfg = Release|Win32
+		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|ARM64.ActiveCfg = Release|ARM64
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|Win32.ActiveCfg = Release|Win32
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release|x64.ActiveCfg = Release|x64
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|Any CPU.ActiveCfg = Release|Win32
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|ARM.ActiveCfg = Release|Win32
+		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|ARM64.ActiveCfg = Release|ARM64
+		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|ARM64.Build.0 = Release|ARM64
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|Win32.ActiveCfg = Release|Win32
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Dynamic|x64.ActiveCfg = Release|x64
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|Any CPU.ActiveCfg = Release|Win32
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|ARM.ActiveCfg = Release|Win32
+		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|ARM64.ActiveCfg = Release|ARM64
+		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|ARM64.Build.0 = Release|ARM64
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|Win32.ActiveCfg = Release|Win32
 		{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}.Release-Static|x64.ActiveCfg = Release|x64
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug|ARM.ActiveCfg = Debug|ARM
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug|x64.ActiveCfg = Debug|x64
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Dynamic|Any CPU.ActiveCfg = Debug-Dynamic|Win32
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|ARM
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Dynamic|ARM64.ActiveCfg = Debug-Dynamic|ARM64
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Static|Any CPU.ActiveCfg = Debug-Static|Win32
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Static|ARM.ActiveCfg = Debug-Static|ARM
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Static|ARM64.ActiveCfg = Debug-Static|ARM64
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release|Any CPU.ActiveCfg = Release|Win32
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release|ARM.ActiveCfg = Release|ARM
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release|Win32.ActiveCfg = Release|Win32
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release|x64.ActiveCfg = Release|x64
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Dynamic|Any CPU.ActiveCfg = Release-Dynamic|Win32
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|ARM
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Dynamic|ARM64.ActiveCfg = Release-Dynamic|ARM64
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Static|Any CPU.ActiveCfg = Release-Static|Win32
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Static|ARM.ActiveCfg = Release-Static|ARM
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Static|ARM64.ActiveCfg = Release-Static|ARM64
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Static|Win32.ActiveCfg = Release-Static|Win32
+		{D738A812-CE37-40A4-B2FA-D81488C12C87}.Release-Static|x64.ActiveCfg = Release-Static|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1973,4 +2462,7 @@
 		{016D497F-0EE0-449E-89F5-BD63F7F9A8A6} = {87D83489-039E-4123-BE01-CB62EE932A29}
 		{9FDF5E33-D15D-409F-876E-4E77727936B9} = {87D83489-039E-4123-BE01-CB62EE932A29}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {9D1363FE-B481-479E-82A2-290F6C4DB91B}
+	EndGlobalSection
 EndGlobal
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/Makefile asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/Makefile
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/Makefile	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/Makefile	2022-02-24 07:54:38.000000000 +0000
@@ -163,7 +163,7 @@
 export PJSUA2_TEST_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
 			   main.o
 export PJSUA2_TEST_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS)
-export PJSUA2_TEST_CXXFLAGS = $(_CXXFLAGS) $(PJSUA2_LIB_CFLAGS) 
+export PJSUA2_TEST_CXXFLAGS = $(_CXXFLAGS) $(PJSUA2_LIB_CFLAGS) $(PJ_VIDEO_CFLAGS)
 export PJSUA2_TEST_LDFLAGS += $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(LDFLAGS)
 ifeq ($(EXCLUDE_APP),0)
 export PJSUA2_TEST_EXE := pjsua2-test-$(TARGET_NAME)$(HOST_EXE)
@@ -182,7 +182,7 @@
 		    tsx_basic_test.o tsx_bench.o tsx_uac_test.o \
 		    tsx_uas_test.o txdata_test.o uri_test.o \
 		    inv_offer_answer_test.o
-export TEST_CFLAGS += $(_CFLAGS)
+export TEST_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS)
 export TEST_CXXFLAGS += $(_CXXFLAGS)
 export TEST_LDFLAGS += $(PJSIP_LDLIB) \
 		       $(PJSIP_UA_LDLIB) \
@@ -208,9 +208,13 @@
 TARGETS := $(PJSIP_LIB) $(PJSIP_SONAME) \
 	   $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) \
 	   $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) \
-	   $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) \
-	   $(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME)
-TARGETS_EXE := $(TEST_EXE) $(PJSUA2_TEST_EXE)
+	   $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME)
+TARGETS_EXE := $(TEST_EXE)
+
+ifeq ($(PJ_EXCLUDE_PJSUA2),)
+TARGETS += $(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME)
+TARGETS_EXE += $(PJSUA2_TEST_EXE)
+endif
 
 all: $(TARGETS) $(TARGETS_EXE)
 
@@ -262,7 +266,7 @@
 
 pjsua2-lib: $(PJSUA2_LIB_LIB)
 $(PJSUA2_LIB_SONAME): $(PJSUA2_LIB_LIB)
-$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB) $(PSJUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME)
+$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME)
 	$(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
 
 pjsip-test: $(TEST_EXE)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsip_core.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsip_core.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsip_core.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsip_core.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -78,7 +102,7 @@
   <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2BB84911-C1B4-4747-B93D-36AA82CC5031}</ProjectGuid>
-    <RootNamespace>pjsip_core</RootNamespace>    
+    <RootNamespace>pjsip_core</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -161,41 +185,78 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
-  </PropertyGroup>  
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -264,31 +325,61 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -334,6 +425,18 @@
       <OutputFile>..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -369,6 +472,19 @@
       <OutputFile>..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -404,6 +520,19 @@
       <OutputFile>..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -438,6 +567,18 @@
       <OutputFile>..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -473,6 +614,19 @@
       <OutputFile>..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -505,6 +659,18 @@
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-core-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsip_core.vcxproj.filters asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsip_core.vcxproj.filters
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsip_core.vcxproj.filters	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsip_core.vcxproj.filters	2022-02-24 07:54:38.000000000 +0000
@@ -223,6 +223,5 @@
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\INSTALL.txt" />
-    <Text Include="..\..\RELNOTES.txt" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsip_simple.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsip_simple.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsip_simple.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsip_simple.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -161,41 +185,78 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
-  </PropertyGroup>  
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -264,31 +325,61 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -335,6 +426,19 @@
       <OutputFile>..\lib\pjsip-simple-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib-util/include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-simple-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib-util/include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -369,6 +473,18 @@
       <OutputFile>..\lib\pjsip-simple-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib-util/include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-simple-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib-util/include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -404,6 +520,19 @@
       <OutputFile>..\lib\pjsip-simple-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib-util/include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-simple-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib-util/include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -438,6 +567,18 @@
       <OutputFile>..\lib\pjsip-simple-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib-util/include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-simple-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib-util/include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -473,6 +614,19 @@
       <OutputFile>..\lib\pjsip-simple-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib-util/include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-simple-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib-util/include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -505,6 +659,18 @@
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\pjsip-simple-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib-util/include;../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-simple-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsip_test.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsip_test.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsip_test.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsip_test.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -101,40 +125,77 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
     <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType>
     <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType>
   </PropertyGroup>
@@ -143,68 +204,98 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>	
-	  <TargetName>pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
+    <TargetName>pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
   </PropertyGroup>
   <!-- Compile and link option definition -->
   <ItemDefinitionGroup>
@@ -241,6 +332,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -268,6 +372,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -295,6 +413,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -321,6 +453,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -348,6 +493,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -374,6 +533,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\pjsip-test-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\test\dlg_core_test.c" />
     <ClCompile Include="..\src\test\dns_test.c" />
@@ -382,16 +554,22 @@
     <ClCompile Include="..\src\test\main_win32.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\test\msg_err_test.c" />
     <ClCompile Include="..\src\test\msg_logger.c" />
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsip_ua.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsip_ua.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsip_ua.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsip_ua.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -78,7 +102,7 @@
   <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B8719FD5-E8A6-4A36-943C-891D07F5DD21}</ProjectGuid>
-    <RootNamespace>pjsip_ua</RootNamespace>    
+    <RootNamespace>pjsip_ua</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -161,40 +185,77 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -264,35 +325,65 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
-    <TargetName>pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>    
+    <TargetName>pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
   </PropertyGroup>
   <!-- Compile and link option definition -->
   <ItemDefinitionGroup>
@@ -334,6 +425,18 @@
       <OutputFile>..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -369,6 +472,19 @@
       <OutputFile>..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -404,6 +520,19 @@
       <OutputFile>..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -438,6 +567,18 @@
       <OutputFile>..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -473,6 +614,19 @@
       <OutputFile>..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -505,6 +659,18 @@
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsip-ua-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsua2_lib.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsua2_lib.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsua2_lib.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsua2_lib.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -161,36 +185,72 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
@@ -265,31 +325,61 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -337,6 +427,19 @@
       <OutputFile>..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -371,6 +474,18 @@
       <OutputFile>..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -406,6 +521,19 @@
       <OutputFile>..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -440,6 +568,18 @@
       <OutputFile>..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -475,6 +615,19 @@
       <OutputFile>..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -507,6 +660,18 @@
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsua2-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsua_lib.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsua_lib.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/build/pjsua_lib.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/build/pjsua_lib.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -78,7 +102,7 @@
   <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}</ProjectGuid>
-    <RootNamespace>pjsua_lib</RootNamespace>    
+    <RootNamespace>pjsua_lib</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -161,40 +185,77 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -264,31 +325,61 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -335,6 +426,19 @@
       <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -369,6 +473,18 @@
       <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -404,6 +520,19 @@
       <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -438,6 +567,18 @@
       <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -473,6 +614,19 @@
       <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -505,6 +659,18 @@
     </ClCompile>
     <Lib>
       <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../include;../../pjmedia/include;../../pjlib-util/include;../../pjlib/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\lib\pjsua-lib-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_auth.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_auth.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_auth.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_auth.h	2022-02-24 07:54:38.000000000 +0000
@@ -43,8 +43,11 @@
  * @{
  */
 
-/** Length of digest string. */
-#define PJSIP_MD5STRLEN 32
+/** Length of digest MD5 string. */
+#define PJSIP_MD5STRLEN		32
+
+/** Length of digest SHA256 string. */
+#define PJSIP_SHA256STRLEN	64
 
 
 /** Type of data in the credential information in #pjsip_cred_info. */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_auth_parser.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_auth_parser.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_auth_parser.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_auth_parser.h	2022-02-24 07:54:38.000000000 +0000
@@ -44,7 +44,7 @@
 /**
  * DeInitialize authorization parser module.
  */
-PJ_DECL(void) pjsip_auth_deinit_parser();
+PJ_DECL(void) pjsip_auth_deinit_parser(void);
 
 
 
@@ -65,7 +65,8 @@
 			pjsip_DIGEST_STR,   /**< "digest" string const.	    */
 			pjsip_PGP_STR,	    /**< "pgp" string const.	    */
 			pjsip_BEARER_STR,   /**< "bearer" string const.     */
-			pjsip_MD5_STR,	    /**< "md5" string const.	    */
+			pjsip_MD5_STR,	    /**< "MD5" string const.	    */
+			pjsip_SHA256_STR,   /**< "SHA-256" string const.    */
 			pjsip_AUTH_STR;	    /**< "auth" string const.	    */
 
 PJ_END_DECL
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_config.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_config.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_config.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_config.h	2022-02-24 07:54:38.000000000 +0000
@@ -181,6 +181,14 @@
          */
         pj_bool_t accept_multiple_sdp_answers;
 
+	/**
+	 * Don't disconnect the INVITE session after an outgoing request
+	 * gets timed out or responded with 408 (request timeout).
+	 *
+	 * Default is PJ_FALSE.
+	 */
+	pj_bool_t keep_inv_after_tsx_timeout;
+
     } endpt;
 
     /** Transaction layer settings. */
@@ -208,6 +216,9 @@
 
 	/** Transaction completed timer for INVITE, in msec. Default value is
 	 *  PJSIP_TD_TIMEOUT.
+	 *
+	 *  This setting is also used for transaction timeout timer for both
+	 *  INVITE and non-INVITE.
 	 */
 	unsigned td;
 
@@ -937,8 +948,19 @@
 #   define PJSIP_POOL_RDATA_INC		4000
 #endif
 
-#define PJSIP_POOL_LEN_TRANSPORT	512
-#define PJSIP_POOL_INC_TRANSPORT	512
+/**
+ * Initial memory block for SIP transport.
+ */
+#ifndef PJSIP_POOL_LEN_TRANSPORT
+#   define PJSIP_POOL_LEN_TRANSPORT	512
+#endif
+
+/**
+ * Memory increment for SIP transport.
+ */
+#ifndef PJSIP_POOL_INC_TRANSPORT
+#   define PJSIP_POOL_INC_TRANSPORT	512
+#endif
 
 /**
  * Initial memory block size for tdata.
@@ -968,6 +990,21 @@
 #   define PJSIP_POOL_INC_UA		512
 #endif
 
+/**
+ * Initial memory block for event subscription module.
+ */
+#ifndef PJSIP_POOL_EVSUB_LEN
+#   define PJSIP_POOL_EVSUB_LEN		512
+#endif
+
+/**
+ * Memory increment for event subscription module.
+ */
+#ifndef PJSIP_POOL_EVSUB_INC
+#   define PJSIP_POOL_EVSUB_INC		512
+#endif
+
+
 #define PJSIP_MAX_FORWARDS_VALUE	70
 
 #define PJSIP_RFC3261_BRANCH_ID		"z9hG4bK"
@@ -1019,6 +1056,19 @@
 #   define PJSIP_TSX_1XX_RETRANS_DELAY	60
 #endif
 
+/**
+ * Setting to determine if certain SIP UAS transaction, such as
+ * INVITE UAS tsx that hasn't been confirmed, is allowed to continue
+ * upon transport error. If disabled, the transaction will always be
+ * terminated, which is the default behavior prior to the introduction
+ * of this setting.
+ *
+ * Default: 1 (transaction will continue)
+ */
+#ifndef PJSIP_TSX_UAS_CONTINUE_ON_TP_ERROR
+#   define PJSIP_TSX_UAS_CONTINUE_ON_TP_ERROR 1
+#endif
+
 #define PJSIP_MAX_TSX_KEY_LEN		(PJSIP_MAX_URL_SIZE*2)
 
 /* User agent. */
@@ -1060,7 +1110,12 @@
 #  define PJSIP_T4_TIMEOUT	5000
 #endif
 
-/** Transaction completed timer for INVITE */
+/**
+ * Transaction completed timer for INVITE.
+ *
+ * This setting is also used for transaction timeout timer for both
+ * INVITE and non-INVITE.
+ */
 #if !defined(PJSIP_TD_TIMEOUT)
 #  define PJSIP_TD_TIMEOUT	32000
 #endif
@@ -1187,6 +1242,19 @@
 #   define PJSIP_REGISTER_CLIENT_ADD_XUID_PARAM	0
 #endif
 
+
+/**
+ * Allow client to send refresh registration when the registrar sent a Contact
+ * header with expire parameter 0 in the 200/OK REGISTER response.
+ * Refer to https://github.com/pjsip/pjproject/pull/2809 for more info.
+ *
+ * Default is 1.
+ */
+#ifndef PJSIP_REGISTER_ALLOW_EXP_REFRESH
+#   define PJSIP_REGISTER_ALLOW_EXP_REFRESH	1
+#endif
+
+
 /**
  * Maximum size of pool allowed for auth client session in pjsip_regc.
  * After the size exceeds because of Digest authentication processing,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_dialog.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_dialog.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_dialog.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_dialog.h	2022-02-24 07:54:38.000000000 +0000
@@ -165,6 +165,7 @@
     pjsip_route_hdr	route_set;  /**< Route set.			    */
     pj_bool_t		route_set_frozen; /**< Route set has been set.	    */
     pjsip_auth_clt_sess	auth_sess;  /**< Client authentication session.	    */
+    pj_str_t		initial_dest;/**< Initial destination host.  	    */
 
     /** Session counter. */
     int			sess_count; /**< Number of sessions.		    */
@@ -301,7 +302,7 @@
  *
  * See \a pjsip_dlg_create_uac() for general info about this function.
  *
- * @param param		    The parameter, refer to
+ * @param create_param		    The parameter, refer to
  *			    \a pjsip_dlg_create_uac_param
  * @param p_dlg		    Pointer to receive the dialog.
  *
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_endpoint.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_endpoint.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_endpoint.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_endpoint.h	2022-02-24 07:54:38.000000000 +0000
@@ -437,7 +437,7 @@
  * PJLIB-UTIL DNS resolver if any (e.g: set using #pjsip_endpt_set_resolver()). 
  * Application that needs it, still be able create its own instance. 
  *
- * @param res       The SIP resolver engine.
+ * @param endpt       The SIP resolver engine.
  * @param ext_res   The external resolver implementation callback. This argument
  *		    can be NULL to reset the whole external implementation. 
  *		    However, it is prohibited to reset individual callback.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_msg.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_msg.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_msg.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_msg.h	2022-02-24 07:54:38.000000000 +0000
@@ -363,6 +363,59 @@
 PJ_DECL(int) pjsip_hdr_print_on( void *hdr, char *buf, pj_size_t len);
 
 /**
+ * Find a header in a header list by the header type.
+ *
+ * @param hdr_list  The "head" of the header list.
+ * @param type      The header type to find.
+ * @param start     The first header field where the search should begin.
+ *                  If NULL is specified, then the search will begin from the
+ *                  first header, otherwise the search will begin at the
+ *                  specified header.
+ *
+ * @return          The header field, or NULL if no header with the specified
+ *                  type is found.
+ */
+PJ_DECL(void*)  pjsip_hdr_find( const void *hdr_list,
+				pjsip_hdr_e type,
+				const void *start);
+
+/**
+ * Find a header in a header list by its name.
+ *
+ * @param hdr_list  The "head" of the header list.
+ * @param name      The header name to find.
+ * @param start     The first header field where the search should begin.
+ *                  If NULL is specified, then the search will begin from the
+ *                  first header, otherwise the search will begin at the
+ *                  specified header.
+ *
+ * @return          The header field, or NULL if no header with the specified
+ *                  type is found.
+ */
+PJ_DECL(void*)  pjsip_hdr_find_by_name( const void *hdr_list,
+					const pj_str_t *name,
+					const void *start);
+
+/**
+ * Find a header in a header list by its name and short name version.
+ *
+ * @param hdr_list  The "head" of the header list.
+ * @param name      The header name to find.
+ * @param sname     The short name version of the header name.
+ * @param start     The first header field where the search should begin.
+ *                  If NULL is specified, then the search will begin from the
+ *                  first header, otherwise the search will begin at the
+ *                  specified header.
+ *
+ * @return	    The header field, or NULL if no header with the specified
+ *		    type is found.
+ */
+PJ_DECL(void*)  pjsip_hdr_find_by_names( const void *hdr_list,
+					 const pj_str_t *name,
+					 const pj_str_t *sname,
+					 const void *start);
+
+/**
  * @}
  */
 
@@ -409,9 +462,11 @@
     PJSIP_SC_CALL_BEING_FORWARDED = 181,
     PJSIP_SC_QUEUED = 182,
     PJSIP_SC_PROGRESS = 183,
+    PJSIP_SC_EARLY_DIALOG_TERMINATED = 199,
 
     PJSIP_SC_OK = 200,
     PJSIP_SC_ACCEPTED = 202,
+    PJSIP_SC_NO_NOTIFICATION = 204,
 
     PJSIP_SC_MULTIPLE_CHOICES = 300,
     PJSIP_SC_MOVED_PERMANENTLY = 301,
@@ -428,15 +483,31 @@
     PJSIP_SC_NOT_ACCEPTABLE = 406,
     PJSIP_SC_PROXY_AUTHENTICATION_REQUIRED = 407,
     PJSIP_SC_REQUEST_TIMEOUT = 408,
+    PJSIP_SC_CONFLICT = 409,
     PJSIP_SC_GONE = 410,
+    PJSIP_SC_LENGTH_REQUIRED = 411,
+    PJSIP_SC_CONDITIONAL_REQUEST_FAILED = 412,
     PJSIP_SC_REQUEST_ENTITY_TOO_LARGE = 413,
     PJSIP_SC_REQUEST_URI_TOO_LONG = 414,
     PJSIP_SC_UNSUPPORTED_MEDIA_TYPE = 415,
     PJSIP_SC_UNSUPPORTED_URI_SCHEME = 416,
+    PJSIP_SC_UNKNOWN_RESOURCE_PRIORITY = 417,
     PJSIP_SC_BAD_EXTENSION = 420,
     PJSIP_SC_EXTENSION_REQUIRED = 421,
     PJSIP_SC_SESSION_TIMER_TOO_SMALL = 422,
     PJSIP_SC_INTERVAL_TOO_BRIEF = 423,
+    PJSIP_SC_BAD_LOCATION_INFORMATION = 424,
+    PJSIP_SC_USE_IDENTITY_HEADER = 428,
+    PJSIP_SC_PROVIDE_REFERRER_HEADER = 429,
+    PJSIP_SC_FLOW_FAILED = 430,
+    PJSIP_SC_ANONIMITY_DISALLOWED = 433,
+    PJSIP_SC_BAD_IDENTITY_INFO = 436,
+    PJSIP_SC_UNSUPPORTED_CERTIFICATE = 437,
+    PJSIP_SC_INVALID_IDENTITY_HEADER = 438,
+    PJSIP_SC_FIRST_HOP_LACKS_OUTBOUND_SUPPORT = 439,
+    PJSIP_SC_MAX_BREADTH_EXCEEDED = 440,
+    PJSIP_SC_BAD_INFO_PACKAGE = 469,
+    PJSIP_SC_CONSENT_NEEDED = 470,
     PJSIP_SC_TEMPORARILY_UNAVAILABLE = 480,
     PJSIP_SC_CALL_TSX_DOES_NOT_EXIST = 481,
     PJSIP_SC_LOOP_DETECTED = 482,
@@ -450,6 +521,7 @@
     PJSIP_SC_REQUEST_UPDATED = 490,
     PJSIP_SC_REQUEST_PENDING = 491,
     PJSIP_SC_UNDECIPHERABLE = 493,
+    PJSIP_SC_SECURITY_AGREEMENT_NEEDED = 494,
 
     PJSIP_SC_INTERNAL_SERVER_ERROR = 500,
     PJSIP_SC_NOT_IMPLEMENTED = 501,
@@ -458,12 +530,15 @@
     PJSIP_SC_SERVER_TIMEOUT = 504,
     PJSIP_SC_VERSION_NOT_SUPPORTED = 505,
     PJSIP_SC_MESSAGE_TOO_LARGE = 513,
+    PJSIP_SC_PUSH_NOTIFICATION_SERVICE_NOT_SUPPORTED = 555,
     PJSIP_SC_PRECONDITION_FAILURE = 580,
 
     PJSIP_SC_BUSY_EVERYWHERE = 600,
     PJSIP_SC_DECLINE = 603,
     PJSIP_SC_DOES_NOT_EXIST_ANYWHERE = 604,
     PJSIP_SC_NOT_ACCEPTABLE_ANYWHERE = 606,
+    PJSIP_SC_UNWANTED = 607,
+    PJSIP_SC_REJECTED = 608,
 
     PJSIP_SC_TSX_TIMEOUT = PJSIP_SC_REQUEST_TIMEOUT,
     /*PJSIP_SC_TSX_RESOLVE_ERROR = 702,*/
@@ -1053,7 +1128,6 @@
  *		    assign the header name with some string.
  * @param hvalue    Optional string to be assigned as the value.
  *
- * @return	    The header, or THROW exception.
  */
 PJ_DECL(void) pjsip_generic_string_hdr_init2(pjsip_generic_string_hdr *h,
 					     pj_str_t *hname,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_multipart.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_multipart.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_multipart.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_multipart.h	2022-02-24 07:54:38.000000000 +0000
@@ -154,6 +154,89 @@
 			   const pjsip_multipart_part *start);
 
 /**
+ * Find a body inside multipart bodies which has a header matching the
+ * supplied one. Most useful for finding a part with a specific Content-ID.
+ *
+ * @param pool		Memory pool to use for temp space.
+ * @param mp		The multipart body.
+ * @param search_hdr	Header to search for.
+ * @param start		If specified, the search will begin at
+ * 			start->next part. Otherwise it will begin at
+ * 			the first part in the multipart bodies.
+ *
+ * @return		The first part which has a header matching the
+ * 			specified one, or NULL if not found.
+ */
+PJ_DECL(pjsip_multipart_part*)
+pjsip_multipart_find_part_by_header(pj_pool_t *pool,
+				    const pjsip_msg_body *mp,
+				    void *search_hdr,
+				    const pjsip_multipart_part *start);
+
+/**
+ * Find a body inside multipart bodies which has a header matching the
+ * supplied name and value. Most useful for finding a part with a specific
+ * Content-ID.
+ *
+ * @param pool		Memory pool to use for temp space.
+ * @param mp		The multipart body.
+ * @param hdr_name	Header name to search for.
+ * @param hdr_value	Header value search for.
+ * @param start		If specified, the search will begin at
+ * 			start->next part. Otherwise it will begin at
+ * 			the first part in the multipart bodies.
+ *
+ * @return		The first part which has a header matching the
+ * 			specified one, or NULL if not found.
+ */
+PJ_DECL(pjsip_multipart_part*)
+pjsip_multipart_find_part_by_header_str(pj_pool_t *pool,
+				    const pjsip_msg_body *mp,
+				    const pj_str_t *hdr_name,
+				    const pj_str_t *hdr_value,
+				    const pjsip_multipart_part *start);
+
+
+
+/**
+ * Find a body inside multipart bodies which has a Content-ID value matching the
+ * supplied "cid" URI in pj_str form.  The "cid:" scheme will be assumed if the
+ * URL doesn't start with it.  Enclosing angle brackets will also be handled
+ * correctly if they exist.
+ *
+ * @see RFC2392 Content-ID and Message-ID Uniform Resource Locators
+ *
+ * @param pool	Memory pool to use for temp space.
+ * @param mp	The multipart body.
+ * @param cid	The "cid" URI to search for in pj_str form.
+ *
+ * @return		The first part which has a Content-ID header matching the
+ * 			specified "cid" URI. or NULL if not found.
+ */
+PJ_DECL(pjsip_multipart_part*)
+pjsip_multipart_find_part_by_cid_str(pj_pool_t *pool,
+				 const pjsip_msg_body *mp,
+				 pj_str_t *cid);
+
+/**
+ * Find a body inside multipart bodies which has a Content-ID value matching the
+ * supplied "cid" URI.
+ *
+ * @see RFC2392 Content-ID and Message-ID Uniform Resource Locators
+ *
+ * @param pool	Memory pool to use for temp space.
+ * @param mp	The multipart body.
+ * @param cid	The "cid" URI to search for.
+ *
+ * @return		The first part which had a Content-ID header matching the
+ * 			specified "cid" URI. or NULL if not found.
+ */
+PJ_DECL(pjsip_multipart_part*)
+pjsip_multipart_find_part_by_cid_uri(pj_pool_t *pool,
+				 const pjsip_msg_body *mp,
+				 pjsip_other_uri *cid_uri);
+
+/**
  * Parse multipart message.
  *
  * @param pool		Memory pool.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_transaction.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_transaction.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_transaction.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_transaction.h	2022-02-24 07:54:38.000000000 +0000
@@ -435,6 +435,22 @@
 PJ_DECL(pj_status_t) pjsip_tsx_set_timeout(pjsip_transaction *tsx,
 					   unsigned millisec);
 
+/*
+ * Change timer values used by transaction layer. Currently scheduled
+ * timers will not be changed. Any value set to 0 will be left
+ * unchanged.
+ *
+ * @param t1 - Transaction T1 timeout, in msec
+ * @param t2 - Transaction T2 timeout, in msec
+ * @param t4 - Transaction completed timer for non-INVITE, in msec
+ * @param td - Transaction completed timer for INVITE, in msec
+ */
+PJ_DECL(void) pjsip_tsx_set_timers(unsigned t1, unsigned t2, unsigned t4, unsigned td);
+
+/*
+ * (Re)Initializes timer values from `pjsip_cfg()`.
+ */
+PJ_DECL(void) pjsip_tsx_initialize_timer_values(void);
 
 /**
  * Get the transaction instance in the incoming message. If the message
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_transport.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_transport.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_transport.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_transport.h	2022-02-24 07:54:38.000000000 +0000
@@ -1247,7 +1247,7 @@
  *
  * @param tpmgr	    The transport manager.
  * @param pool	    Pool to allocate memory for the IP address.
- * @param param	    Function input and output parameters.
+ * @param prm	    Function input and output parameters.
  *
  * @return	    PJ_SUCCESS, or the appropriate error code.
  */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_transport_tls.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_transport_tls.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_transport_tls.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_transport_tls.h	2022-02-24 07:54:38.000000000 +0000
@@ -61,6 +61,7 @@
     PJSIP_TLSV1_METHOD		 = 31,	/**< Use TLSv1 method.		*/
     PJSIP_TLSV1_1_METHOD	 = 32,	/**< Use TLSv1_1 method.	*/
     PJSIP_TLSV1_2_METHOD	 = 33,	/**< Use TLSv1_2 method.	*/
+    PJSIP_TLSV1_3_METHOD	 = 34,	/**< Use TLSv1_3 method.	*/
     PJSIP_SSLV23_METHOD		 = 23,	/**< Use SSLv23 method.		*/
 } pjsip_ssl_method;
 
@@ -104,6 +105,38 @@
 
 
 /**
+ * This structure describe the parameter passed from #on_verify_cb().
+ */
+typedef struct pjsip_tls_on_verify_param {
+    /**
+     * Describes local address.
+     */
+    const pj_sockaddr_t *local_addr;
+
+    /**
+     * Describes remote address.
+     */
+    const pj_sockaddr_t *remote_addr;
+
+    /**
+     * Describes transport direction.
+     */
+    pjsip_transport_dir tp_dir;
+
+    /**
+     * Describes active local certificate info.
+     */
+    pj_ssl_cert_info *local_cert_info;
+   
+    /**
+     * Describes active remote certificate info.
+     */
+    pj_ssl_cert_info *remote_cert_info;
+
+} pjsip_tls_on_verify_param;
+
+
+/**
  * TLS transport settings.
  */
 typedef struct pjsip_tls_setting
@@ -343,6 +376,19 @@
      */
     void(*on_accept_fail_cb)(const pjsip_tls_on_accept_fail_param *param);
 
+    /**
+     * Callback to be called to verify a new connection.  Currently it's only 
+     * implemented for OpenSSL backend.
+     *
+     * @param param         The parameter to the callback.
+     * 
+     * @return              Return PJ_TRUE if succesfully verified. 
+     *			    If verification failed, connection will be dropped
+     *			    immediately.
+     *
+     */
+    pj_bool_t(*on_verify_cb)(const pjsip_tls_on_verify_param *param);
+
 } pjsip_tls_setting;
 
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_transport_udp.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_transport_udp.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_transport_udp.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_transport_udp.h	2022-02-24 07:54:38.000000000 +0000
@@ -294,6 +294,14 @@
  *    and set the \a local argument to NULL. In both cases, application
  *    may specify the published address of the socket in \a a_name
  *    argument.
+ * 
+ * Note that prior to calling this method, any locks acquired need to 
+ * be released temporarily to avoid any deadlock scenario.  
+ * This method will loop to wait for read operation to finish before actually 
+ * restart the transport. This might lead to deadlock if any other thread with 
+ * the read operation tries to acquire the same lock held by the thread calling
+ * this method. 
+ * Please see https://github.com/pjsip/pjproject/pull/2731 for more details. 
  *
  * @param transport	The UDP transport.
  * @param option	Restart option.
@@ -339,6 +347,14 @@
  *    may specify the published address of the socket in \a a_name
  *    argument. This is another version of pjsip_udp_transport_restart() 
  *    able to restart IPv6 transport.
+ * 
+ * Note that prior to calling this method, any locks acquired need to 
+ * be released temporarily to avoid any deadlock scenario.  
+ * This method will loop to wait for read operation to finish before actually 
+ * restart the transport. This might lead to deadlock if any other thread with 
+ * the read operation tries to acquire the same lock held by the thread calling
+ * this method. 
+ * Please see https://github.com/pjsip/pjproject/pull/2731 for more details.
  *
  * @param transport	The UDP transport.
  * @param option	Restart option.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_uri.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_uri.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_uri.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_uri.h	2022-02-24 07:54:38.000000000 +0000
@@ -27,6 +27,7 @@
 
 #include <pjsip/sip_types.h>
 #include <pjsip/sip_config.h>
+#include <pj/assert.h>
 #include <pj/list.h>
 #include <pjlib-util/scanner.h>
 
@@ -269,6 +270,7 @@
  */
 PJ_INLINE(void*) pjsip_uri_get_uri(const void *uri)
 {
+    PJ_ASSERT_RETURN(uri, NULL);
     return (*((pjsip_uri*)uri)->vptr->p_get_uri)((void*)uri);
 }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_util.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_util.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip/sip_util.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip/sip_util.h	2022-02-24 07:54:38.000000000 +0000
@@ -207,7 +207,7 @@
  *
  * @param target    The target.
  * @param pool	    The memory pool to be used to duplicate the reason phrase.
- * @param code	    The SIP status code to be set to the target.
+ * @param status_code	    The SIP status code to be set to the target.
  * @param reason    The reason phrase  to be set to the target.
  *
  * @return	    PJ_SUCCESS on successful operation or the appropriate
@@ -322,7 +322,7 @@
  * will construct all the Via, Record-Route, Call-ID, From, To, CSeq, and 
  * Call-ID headers from the request.
  *
- * Note: the txdata reference counter is set to ZERO!.
+ * Once a transmit data is created, the reference counter is initialized to 1.
  *
  * @param endpt	    The endpoint.
  * @param rdata	    The request receive data.
@@ -344,6 +344,8 @@
  * an ACK request to 3xx-6xx final response.
  * The generation of ACK message for 2xx final response is different than
  * this one.
+ *
+ * Once a transmit data is created, the reference counter is initialized to 1.
  * 
  * @param endpt	    The endpoint.
  * @param tdata	    This contains the original INVITE request
@@ -361,6 +363,8 @@
 /**
  * Construct CANCEL request for the previously sent request.
  *
+ * Once a transmit data is created, the reference counter is initialized to 1.
+ *
  * @param endpt	    The endpoint.
  * @param tdata	    The transmit buffer for the request being cancelled.
  * @param p_tdata   Pointer to receive the transmit data.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip.h	2022-02-24 07:54:38.000000000 +0000
@@ -48,6 +48,7 @@
 /* Authentication. */
 #include <pjsip/sip_auth.h>
 #include <pjsip/sip_auth_aka.h>
+#include <pjsip/sip_auth_parser.h>
 
 /* Transaction layer. */
 #include <pjsip/sip_transaction.h>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip-simple/rpid.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip-simple/rpid.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip-simple/rpid.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip-simple/rpid.h	2022-02-24 07:54:38.000000000 +0000
@@ -42,7 +42,7 @@
 
 /**
  * This enumeration describes subset of standard activities as 
- * described by RFC 4880, RPID: Rich Presence Extensions to the 
+ * described by RFC 4480, RPID: Rich Presence Extensions to the
  * Presence Information Data Format (PIDF). 
  */
 typedef enum pjrpid_activity
@@ -107,7 +107,8 @@
  * Add RPID element information into existing PIDF document. This will also
  * add the appropriate XML namespace attributes into the presence's XML
  * node, if the attributes are not already present, and also a <note> element
- * to the first <tuple> element of the PIDF document.
+ * to the first <tuple> element of the PIDF document, if a <note> element
+ * is not present.
  *
  * @param pres	    The PIDF presence document.
  * @param pool	    Pool.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip-ua/sip_inv.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip-ua/sip_inv.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip-ua/sip_inv.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip-ua/sip_inv.h	2022-02-24 07:54:38.000000000 +0000
@@ -131,7 +131,8 @@
      * This callback is called when the invite usage module has created 
      * a new dialog and invite because of forked outgoing request.
      *
-     * This callback is mandatory.
+     * Currently the invite session does not create a new dialog in
+     * forking scenario, so this callback will never be invoked.
      *
      * @param inv	The new invite session.
      * @param e		The event which has caused the dialog to fork.
@@ -255,7 +256,8 @@
      * sending of the ACK request (for example, when it needs to 
      * wait for answer from the other call leg, in 3PCC scenarios). 
      *
-     * Application creates the ACK request
+     * Application MUST create the ACK request using pjsip_inv_create_ack()
+     * and send it using pjsip_inv_send_msg().
      *
      * Once it has sent the ACK request, the framework will keep 
      * this ACK request in the cache. Subsequent receipt of 2xx response
@@ -375,7 +377,17 @@
      * Session timer extension will always be used even when peer doesn't
      * support/want session timer.
      */
-    PJSIP_INV_ALWAYS_USE_TIMER	= 128
+    PJSIP_INV_ALWAYS_USE_TIMER	= 128,
+
+    /**
+     * Indicate support for trickle ICE
+     */
+    PJSIP_INV_SUPPORT_TRICKLE_ICE = 256,
+
+    /**
+     * Require trickle ICE support.
+     */
+    PJSIP_INV_REQUIRE_TRICKLE_ICE = 512,
 
 };
 
@@ -451,11 +463,11 @@
 
 
 /**
- * This structure represents SDP information in a pjsip_rx_data. Application
- * retrieve this information by calling #pjsip_rdata_get_sdp_info(). This
+ * This structure represents SDP information in a pjsip_(rx|tx)_data. Application
+ * retrieve this information by calling #pjsip_get_sdp_info(). This
  * mechanism supports multipart message body.
  */
-typedef struct pjsip_rdata_sdp_info
+typedef struct pjsip_sdp_info
 {
     /**
      * Pointer and length of the text body in the incoming message. If
@@ -475,7 +487,15 @@
      */
     pjmedia_sdp_session *sdp;
 
-} pjsip_rdata_sdp_info;
+} pjsip_sdp_info;
+
+/**
+ * For backwards compatibility and completeness,
+ * pjsip_rdata_sdp_info and pjsip_tdata_sdp_info
+ * are typedef'd to pjsip_sdp_info.
+ */
+typedef pjsip_sdp_info pjsip_rdata_sdp_info;
+typedef pjsip_sdp_info pjsip_tdata_sdp_info;
 
 
 /**
@@ -965,7 +985,7 @@
  *
  * Note that if the invite session has a pending offer to be answered 
  * (for example when the last 2xx response to INVITE contains an offer), 
- * application MUST have set the SDP answer with #pjsip_create_sdp_body()
+ * application MUST have set the SDP answer with #pjsip_inv_set_sdp_answer()
  * prior to creating the ACK request. In this case, the ACK request
  * will be added with SDP message body.
  *
@@ -1046,6 +1066,44 @@
 					   pjsip_msg_body **p_body);
 
 /**
+ * This is a utility function to create a multipart body with the
+ * SIP body as the first part.
+ *
+ * @param pool		Pool to allocate memory.
+ * @param sdp		SDP session to be put in the SIP message body.
+ * @param p_body	Pointer to receive SIP message body containing
+ *			the SDP session.
+ *
+ * @return		PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsip_create_multipart_sdp_body( pj_pool_t *pool,
+                                           pjmedia_sdp_session *sdp,
+                                           pjsip_msg_body **p_body);
+
+/**
+ * Retrieve SDP information from a message body. Application should
+ * prefer to use this function rather than parsing the SDP manually since
+ * this function supports multipart message body.
+ *
+ * This function will only parse the SDP once, the first time it is called
+ * on the same message. Subsequent call on the same message will just pick
+ * up the already parsed SDP from the message.
+ *
+ * @param pool               Pool to allocate memory.
+ * @param body               The message body.
+ * @param msg_media_type     From the rdata or tdata Content-Type header, if available.
+ *                           If NULL, the content_type from the body will be used.
+ * @param search_media_type  The media type to search for.
+ *                           If NULL, "application/sdp" will be used.
+ *
+ * @return                   The SDP info.
+ */
+PJ_DECL(pjsip_sdp_info*) pjsip_get_sdp_info(pj_pool_t *pool,
+					   pjsip_msg_body *body,
+					   pjsip_media_type *msg_media_type,
+					   const pjsip_media_type *search_media_type);
+
+/**
  * Retrieve SDP information from an incoming message. Application should
  * prefer to use this function rather than parsing the SDP manually since
  * this function supports multipart message body.
@@ -1061,6 +1119,60 @@
 PJ_DECL(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info(pjsip_rx_data *rdata);
 
 
+/**
+ * Retrieve SDP information from an incoming message. Application should
+ * prefer to use this function rather than parsing the SDP manually since
+ * this function supports multipart message body.
+ *
+ * This function will only parse the SDP once, the first time it is called
+ * on the same message. Subsequent call on the same message will just pick
+ * up the already parsed SDP from the message.
+ *
+ * @param rdata               The incoming message.
+ * @param search_media_type   The SDP media type to search for.
+ *                            If NULL, "application/sdp" will be used.
+ *
+ * @return                    The SDP info.
+ */
+PJ_DECL(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info2(
+					    pjsip_rx_data *rdata,
+					    const pjsip_media_type *search_media_type);
+
+/**
+ * Retrieve SDP information from an outgoing message. Application should
+ * prefer to use this function rather than parsing the SDP manually since
+ * this function supports multipart message body.
+ *
+ * This function will only parse the SDP once, the first time it is called
+ * on the same message. Subsequent call on the same message will just pick
+ * up the already parsed SDP from the message.
+ *
+ * @param tdata    The outgoing message.
+ *
+ * @return         The SDP info.
+ */
+PJ_DECL(pjsip_tdata_sdp_info*) pjsip_tdata_get_sdp_info(pjsip_tx_data *tdata);
+
+/**
+ * Retrieve SDP information from an outgoing message. Application should
+ * prefer to use this function rather than parsing the SDP manually since
+ * this function supports multipart message body.
+ *
+ * This function will only parse the SDP once, the first time it is called
+ * on the same message. Subsequent call on the same message will just pick
+ * up the already parsed SDP from the message.
+ *
+ * @param tdata               The outgoing message.
+ * @param search_media_type   The SDP media type to search for.
+ *                            If NULL, "application/sdp" will be used.
+ *
+ * @return                    The SDP info.
+ */
+PJ_DECL(pjsip_tdata_sdp_info*) pjsip_tdata_get_sdp_info2(
+					    pjsip_tx_data *tdata,
+					    const pjsip_media_type *search_media_type);
+
+
 PJ_END_DECL
 
 /**
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip-ua/sip_regc.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip-ua/sip_regc.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip-ua/sip_regc.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip-ua/sip_regc.h	2022-02-24 07:54:38.000000000 +0000
@@ -156,6 +156,24 @@
  */
 PJ_DECL(pj_status_t) pjsip_regc_destroy(pjsip_regc *regc);
 
+
+/**
+ * Destroy client registration structure. If a registration transaction is
+ * in progress:
+ * - if force is PJ_TRUE, then the structure will be deleted only after
+ *   a final response has been received, and in this case, the callback
+ *   won't be called (this behavior is the same as calling
+ *   pjsip_regc_destroye()).
+ * - if force is PJ_FALSE, the function will return PJ_EBUSY
+ *
+ * @param regc	    The client registration structure.
+ * @param force	    Specify if the function must destroy the structure.
+ *
+ * @return	    PJ_SUCCESS on success, or PJ_EBUSY.
+ */
+PJ_DECL(pj_status_t) pjsip_regc_destroy2(pjsip_regc *regc, pj_bool_t force);
+
+
 /**
  * Get registration info.
  *
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip-ua/sip_replaces.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip-ua/sip_replaces.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsip-ua/sip_replaces.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsip-ua/sip_replaces.h	2022-02-24 07:54:38.000000000 +0000
@@ -128,11 +128,14 @@
     if (status != PJ_SUCCESS) {
 	// Something wrong with Replaces request.
 	//
+	pj_status_t status;
 	if (response) {
-	    pjsip_endpt_send_response(endpt, rdata, response, NULL, NULL);
+	    status = pjsip_endpt_send_response(endpt, rdata, response, NULL, NULL);
+	    if (status != PJ_SUCCESS) pjsip_tx_data_dec_ref(tdata);
 	} else {
 	    // Respond with 500 (Internal Server Error)
-	    pjsip_endpt_respond_stateless(endpt, rdata, 500, NULL, NULL, NULL);
+	    status = pjsip_endpt_respond_stateless(endpt, rdata, 500, NULL, NULL, NULL);
+	    if (status != PJ_SUCCESS) pjsip_tx_data_dec_ref(tdata);
 	}
     }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/account.hpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/account.hpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/account.hpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/account.hpp	2022-02-24 07:54:38.000000000 +0000
@@ -81,6 +81,17 @@
     string	    	contactParams;
 
     /**
+     * Additional parameters that will be appended in the Contact URI
+     * of the registration requests. This will be appended after
+     * \a AccountSipConfig.contactUriParams;
+     *
+     * The parameters should be preceeded by semicolon, and all strings must
+     * be properly escaped. Example:
+     *	 ";my-param=X;another-param=Hi%20there"
+     */
+    string	    	contactUriParams;
+
+    /**
      * Optional interval for registration, in seconds. If the value is zero,
      * default interval will be used (PJSUA_REG_INTERVAL, 300 seconds).
      */
@@ -491,6 +502,13 @@
     bool		iceEnabled;
 
     /**
+     * Set trickle ICE mode for ICE media transport.
+     *
+     * Default: PJ_ICE_SESS_TRICKLE_DISABLED
+     */
+    pj_ice_sess_trickle	iceTrickle;
+
+    /**
      * Set the maximum number of ICE host candidates.
      *
      * Default: -1 (maximum not set)
@@ -591,7 +609,7 @@
      *
      * See also contactRewriteMethod field.
      *
-     * Default: TRUE
+     * Default: 1 (PJ_TRUE / yes)
      */
     int			contactRewriteUse;
 
@@ -616,7 +634,7 @@
      * TCP socket when it is still connecting. In these cases, this
      * feature will also be turned off.
      *
-     * Default: 1 (yes).
+     * Default: 1 (PJ_TRUE / yes).
      */
     int			contactUseSrcPort;
 
@@ -626,7 +644,7 @@
      * the REGISTER request, as long as the request uses the same transport
      * instance as the previous REGISTER request.
      *
-     * Default: TRUE
+     * Default: 1 (PJ_TRUE / yes)
      */
     int			viaRewriteUse;
 
@@ -653,7 +671,7 @@
      * transports. If UDP is used for the registration, the SIP outbound
      * feature will be silently ignored for the account.
      *
-     * Default: TRUE
+     * Default: 1 (PJ_TRUE / yes)
      */
     int			sipOutboundUse;
 
@@ -699,9 +717,25 @@
      * Default constructor
      */
     AccountNatConfig() : sipStunUse(PJSUA_STUN_USE_DEFAULT),
-			 mediaStunUse(PJSUA_STUN_USE_DEFAULT),
-			 nat64Opt(PJSUA_NAT64_DISABLED),
-			 turnConnType(PJ_TURN_TP_UDP)
+      mediaStunUse(PJSUA_STUN_USE_DEFAULT),
+      nat64Opt(PJSUA_NAT64_DISABLED),
+      iceEnabled(false),
+      iceTrickle(PJ_ICE_SESS_TRICKLE_DISABLED),
+      iceMaxHostCands(-1),
+      iceAggressiveNomination(true),
+      iceNominatedCheckDelayMsec(PJ_ICE_NOMINATED_CHECK_DELAY),
+      iceWaitNominationTimeoutMsec(ICE_CONTROLLED_AGENT_WAIT_NOMINATION_TIMEOUT),
+      iceNoRtcp(false),
+      iceAlwaysUpdate(true),
+      turnConnType(PJ_TURN_TP_UDP),
+      contactRewriteUse(PJ_TRUE),
+      contactRewriteMethod(PJSUA_CONTACT_REWRITE_METHOD),
+      contactUseSrcPort(PJ_TRUE),
+      viaRewriteUse(PJ_TRUE),
+      sdpNatRewriteUse(PJ_FALSE),
+      sipOutboundUse(PJ_TRUE),
+      udpKaIntervalSec(15),
+      udpKaData("\r\n")
     {}
 
     /**
@@ -919,6 +953,12 @@
 {
     /**
      * Media transport (RTP) configuration.
+     * 
+     * For \a port and \a portRange settings, RTCP port is selected as 
+     * RTP port+1.
+     * Example: \a port=5000, \a portRange=4
+     * - Available ports: 5000, 5002, 5004 (Media/RTP transport)
+     *                    5001, 5003, 5005 (Media/RTCP transport)
      */
     TransportConfig	transportConfig;
 
@@ -982,6 +1022,24 @@
      */
     RtcpFbConfig	rtcpFbConfig;
 
+    /**
+     * Use loopback media transport. This may be useful if application
+     * doesn't want PJSUA2 to create real media transports/sockets, such as
+     * when using third party media.
+     *
+     * Default: false
+     */
+    bool		useLoopMedTp;
+
+    /**
+     * Enable local loopback when useLoopMedTp is set to TRUE.
+     * If enabled, packets sent to the transport will be sent back to
+     * the streams attached to the transport.
+     *
+     * Default: false
+     */
+    bool		enableLoopback;
+
 public:
     /**
      * Default constructor
@@ -1951,7 +2009,6 @@
     virtual void onMwiInfo(OnMwiInfoParam &prm)
     { PJ_UNUSED_ARG(prm); }
 
-
 private:
     friend class Endpoint;
     friend class Buddy;
@@ -1968,7 +2025,6 @@
      */
     void removeBuddy(Buddy *buddy);
 
-
 private:
     pjsua_acc_id 	 id;
     string		 tmpReason;	// for saving response's reason
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/call.hpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/call.hpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/call.hpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/call.hpp	2022-02-24 07:54:38.000000000 +0000
@@ -270,6 +270,10 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
+/** Array of media direction */
+typedef IntVector MediaDirVector;
+
+
 /**
  * Call settings.
  */
@@ -306,6 +310,30 @@
      * Default: 1 (if video feature is enabled, otherwise it is zero)
      */
     unsigned        videoCount;
+
+    /**
+     * Media direction. This setting will only be used if the flag
+     * PJSUA_CALL_SET_MEDIA_DIR is set, and it will persist for subsequent
+     * offers or answers.
+     * For example, a media that is set as PJMEDIA_DIR_ENCODING can only
+     * mark the stream in the SDP as sendonly or inactive, but will not
+     * become sendrecv in subsequent offers and answers.
+     * Application can update the media direction in any API or callback
+     * that accepts CallSetting as a parameter, such as via
+     * Call::reinvite/update() or in onCallRxOffer/Reinvite()
+     * callback.
+     *
+     * The index of the media dir will correspond to the provisional media
+     * in CallInfo.provMedia.
+     * For offers that involve adding new medias (such as initial offer),
+     * the index will correspond to all new audio media first, then video.
+     * For example, for a new call with 2 audios and 1 video, mediaDir[0]
+     * and mediaDir[1] will be for the audios, and mediaDir[2] video.
+     *
+     * Default: empty vector
+     */
+    MediaDirVector mediaDir;
+
     
 public:
     /**
@@ -589,6 +617,44 @@
      */
     VidCodecParam       vidCodecParam;
 
+    /**
+     * Jitter buffer init delay in msec.
+     */
+    int                 jbInit;
+
+    /**
+     * Jitter buffer minimum prefetch delay in msec.
+     */
+    int                 jbMinPre;
+
+    /**
+     * Jitter buffer maximum prefetch delay in msec.
+     */
+    int                 jbMaxPre;
+
+    /**
+     * Jitter buffer max delay in msec.
+     */
+    int                 jbMax;
+
+    /**
+     * Jitter buffer discard algorithm.
+     */
+    pjmedia_jb_discard_algo jbDiscardAlgo;
+
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
+    /**
+     * Stream keep-alive and NAT hole punch (see #PJMEDIA_STREAM_ENABLE_KA) is
+     * enabled?
+     */
+    bool                useKa;
+#endif
+
+    /**
+     * Disable automatic sending of RTCP SDES and BYE.
+     */
+    bool                rtcpSdesByeDisabled;
+
 public:
     /**
      * Default constructor
@@ -672,6 +738,23 @@
 };
 
 /**
+ * This structure contains parameters for Call::onStreamPreCreate()
+ * callback.
+ */
+struct OnStreamPreCreateParam
+{
+    /**
+     * Stream index in the media session, read-only.
+     */
+    unsigned    streamIdx;
+
+    /**
+     * Parameters that the stream will be created from.
+     */
+    StreamInfo streamInfo;
+};
+
+/**
  * This structure contains parameters for Call::onStreamCreated()
  * callback.
  */
@@ -739,13 +822,63 @@
     string		digit;
 
     /**
-     * DTMF signal duration which might be included when sending DTMF using 
-     * SIP INFO.
+     * DTMF signal duration. If the duration is unknown, this value is set to
+     * PJSUA_UNKNOWN_DTMF_DURATION.
      */
     unsigned		duration;
 };
 
 /**
+ * This structure contains parameters for Call::onDtmfEvent()
+ * callback.
+ */
+struct OnDtmfEventParam
+{
+    /**
+     * DTMF sending method.
+     */
+    pjsua_dtmf_method   method;
+
+    /**
+     * The timestamp identifying the begin of the event. Timestamp units are
+     * expressed in milliseconds.
+     * Note that this value should only be used to compare multiple events
+     * received via the same method relatively to each other, as the time-base
+     * is randomized.
+     */
+    unsigned            timestamp;
+
+    /**
+     * DTMF ASCII digit.
+     */
+    string              digit;
+
+    /**
+     * DTMF signal duration in milliseconds. Interpretation of the duration
+     * depends on the flag PJMEDIA_STREAM_DTMF_IS_END.
+     * depends on the method.
+     * If the method is PJSUA_DTMF_METHOD_SIP_INFO, this contains the total
+     * duration of the DTMF signal or PJSUA_UNKNOWN_DTMF_DURATION if no signal
+     * duration was indicated.
+     * If the method is PJSUA_DTMF_METHOD_RFC2833, this contains the total
+     * duration of the DTMF signal received up to this point in time.
+     */
+    unsigned            duration;
+
+    /**
+     * Flags indicating additional information about the DTMF event.
+     * If PJMEDIA_STREAM_DTMF_IS_UPDATE is set, the event was already
+     * indicated earlier. The new indication contains an updated event
+     * duration.
+     * If PJMEDIA_STREAM_DTMF_IS_END is set, the event has ended and this
+     * indication contains the final event duration. Note that end
+     * indications might get lost. Hence it is not guaranteed to receive
+     * an event with PJMEDIA_STREAM_DTMF_IS_END for every event.
+     */
+    unsigned            flags;
+};
+
+/**
  * This structure contains parameters for Call::onCallTransferRequest()
  * callback.
  */
@@ -1709,7 +1842,20 @@
      */
     virtual void onCallSdpCreated(OnCallSdpCreatedParam &prm)
     { PJ_UNUSED_ARG(prm); }
-    
+
+    /**
+     * Notify application when an audio media session is about to be created
+     * (as opposed to #on_stream_created() and #on_stream_created2() which are
+     * called *after* the session has been created). The application may change
+     * some stream info parameter values, i.e: jbInit, jbMinPre, jbMaxPre,
+     * jbMax, useKa, rtcpSdesByeDisabled, jbDiscardAlgo (audio),
+     * vidCodecParam.encFmt (video).
+     *
+     * @param prm       Callback parameter.
+     */
+    virtual void onStreamPreCreate(OnStreamPreCreateParam &prm)
+    { PJ_UNUSED_ARG(prm); }
+
     /**
      * Notify application when audio media session is created and before it is
      * registered to the conference bridge. Application may return different
@@ -1737,7 +1883,15 @@
      */
     virtual void onDtmfDigit(OnDtmfDigitParam &prm)
     { PJ_UNUSED_ARG(prm); }
-    
+
+    /**
+     * Notify application upon incoming DTMF events.
+     *
+     * @param prm	Callback parameter.
+     */
+    virtual void onDtmfEvent(OnDtmfEventParam &prm)
+    { PJ_UNUSED_ARG(prm); }
+
     /**
      * Notify application on call being transferred (i.e. REFER is received).
      * Application can decide to accept/reject transfer request by setting
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/endpoint.hpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/endpoint.hpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/endpoint.hpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/endpoint.hpp	2022-02-24 07:54:38.000000000 +0000
@@ -437,6 +437,150 @@
     MediaEvent      ev;
 };
 
+/**
+ * This structure describes authentication challenge used in Proxy-Authenticate
+ * or WWW-Authenticate for digest authentication scheme.
+ */
+struct DigestChallenge
+{
+    /**
+     * Realm for the challenge.
+     * */
+    std::string realm;
+
+    /*
+     * Other parameters.
+     * */
+    StringToStringMap otherParam;
+
+    /**
+     * Domain.
+     */
+    std::string domain;
+
+    /**
+     * Nonce challenge.
+     */
+    std::string nonce;
+
+    /**
+     * Opaque value.
+     */
+    std::string opaque;
+
+    /**
+     * Stale parameter.
+     */
+    int  stale;
+
+    /**
+     * Algorithm parameter.
+     */
+    std::string algorithm;
+
+    /**
+     * Quality of protection.
+     */
+    std::string qop;
+
+    /**
+     * Convert from pjsip
+     */
+    void fromPj(const pjsip_digest_challenge &prm);
+
+    /**
+     * Convert to pjsip
+     */
+    pjsip_digest_challenge toPj() const;
+};
+
+/**
+ * This structure describe credential used in Authorization and
+ * Proxy-Authorization header for digest authentication scheme.
+ */
+struct DigestCredential
+{
+    /**
+     *Realm of the credential
+     */
+    std::string realm;
+
+    /**
+     *Other parameters.
+     */
+    StringToStringMap otherParam;
+
+    /**
+     *Username parameter.
+     */
+    std::string username;
+
+    /**
+     *Nonce parameter.
+     */
+    std::string nonce;
+
+    /**
+     *URI parameter.
+     */
+    std::string uri;
+
+    /**
+     *Response digest.
+     */
+    std::string response;
+
+    /**
+     *Algorithm.
+     */
+    std::string algorithm;
+
+    /**
+     *Cnonce.
+     */
+    std::string cnonce;
+
+    /**
+     *Opaque value.
+     */
+    std::string opaque;
+
+    /**
+     *Quality of protection.
+     */
+    std::string qop;
+
+    /**
+     *Nonce count.
+     */
+    std::string nc;
+
+    /**
+     * Convert from pjsip
+     */
+    void fromPj(const pjsip_digest_credential &prm);
+
+    /**
+     * Convert to pjsip
+     */
+    pjsip_digest_credential toPj() const;
+};
+
+
+/**
+ * Parameters for onCredAuth account method.
+ */
+struct OnCredAuthParam
+{
+    DigestChallenge digestChallenge;
+
+    AuthCredInfo credentialInfo;
+
+    std::string method;
+
+    DigestCredential digestCredential;
+};
+
 //////////////////////////////////////////////////////////////////////////////
 /**
  * SIP User Agent related settings.
@@ -867,6 +1011,14 @@
     int			jbMax;
 
     /**
+     * Set the algorithm the jitter buffer uses to discard frames in order to
+     * adjust the latency.
+     *
+     * Default: PJMEDIA_JB_DISCARD_PROGRESSIVE
+     */
+    pjmedia_jb_discard_algo jbDiscardAlgo;
+
+    /**
      * Specify idle time of sound device before it is automatically closed,
      * in seconds. Use value -1 to disable the auto-close feature of sound
      * device
@@ -1598,8 +1750,6 @@
      *    (configurable via \a AccountConfig.ipChangeConfig.reinviteFlags).
      *
      * @param param	The IP change parameter, have a look at #IpChangeParam.
-     *
-     * @return		PJ_SUCCESS on success, other on error.
      */
     void handleIpChange(const IpChangeParam &param) PJSUA2_THROW(Error);
 
@@ -1688,6 +1838,39 @@
     virtual void onMediaEvent(OnMediaEventParam &prm)
     { PJ_UNUSED_ARG(prm); }
 
+    /**
+     * Callback for computation of the digest credential.
+     *
+     * Usually, an application does not need to implement (overload) this callback.
+     * Use it, if your application needs to support Digest AKA authentication without 
+     * the default digest computation back-end (i.e: using <b>libmilenage</b>).
+     *
+     * To use Digest AKA authentication, add \a PJSIP_CRED_DATA_EXT_AKA flag in the
+     * AuthCredInfo's \a dataType field of the AccountConfig, and fill up other
+     * AKA specific information in AuthCredInfo:
+     *  - If PJSIP_HAS_DIGEST_AKA_AUTH is disabled, you have to overload this callback
+     *    to provide your own digest computation back-end.
+     *  - If PJSIP_HAS_DIGEST_AKA_AUTH is enabled, <b>libmilenage</b> library from 
+     *    \a third_party directory is linked, and this callback returns PJ_ENOTSUP,
+     *    then the default digest computation back-end is used.
+     *
+     * @param prm.digestChallenge	The authentication challenge sent by server in 401
+     *		    or 401 response, as either Proxy-Authenticate or
+     *		    WWW-Authenticate header.
+     * @param prm.credentialInfo	    The credential to be used.
+     * @param method    The request method.
+     * @param prm.digestCredential	    The digest credential where the digest response
+     *		    will be placed to. Upon calling this function, the
+     *		    nonce, nc, cnonce, qop, uri, and realm fields of
+     *		    this structure must have been set by caller. Upon
+     *		    return, the \a response field will be initialized
+     *		    by this function.
+     *
+     * @return PJ_ENOTSUP is the default. If you overload this callback,
+     *		    return PJ_SUCCESS on success. 
+     */
+    virtual pj_status_t onCredAuth(OnCredAuthParam &prm);
+
 private:
     static Endpoint		*instance_;	// static instance
     LogWriter			*writer;	// Custom writer, if any
@@ -1787,6 +1970,8 @@
                                     pjmedia_sdp_session *sdp,
                                     pj_pool_t *pool,
                                     const pjmedia_sdp_session *rem_sdp);
+    static void on_stream_precreate(pjsua_call_id call_id,
+                                    pjsua_on_stream_precreate_param *param);
     static void on_stream_created2(pjsua_call_id call_id,
 				   pjsua_on_stream_created_param *param);
     static void on_stream_destroyed(pjsua_call_id call_id,
@@ -1795,6 +1980,8 @@
     static void on_dtmf_digit(pjsua_call_id call_id, int digit);
     static void on_dtmf_digit2(pjsua_call_id call_id, 
 			       const pjsua_dtmf_info *info);
+    static void on_dtmf_event(pjsua_call_id call_id,
+                              const pjsua_dtmf_event *event);
     static void on_call_transfer_request(pjsua_call_id call_id,
                                          const pj_str_t *dst,
                                          pjsip_status_code *code);
@@ -1858,6 +2045,15 @@
 			  pj_status_t status,
 			  const pjsua_ip_change_op_info *info);
 
+    static pj_status_t on_auth_create_aka_response_callback(
+					     pj_pool_t *pool,
+					     const pjsip_digest_challenge*chal,
+					     const pjsip_cred_info *cred,
+					     const pj_str_t *method,
+					     pjsip_digest_credential *auth);
+    friend class Account;
+
+
 private:
     void clearCodecInfoList(CodecInfoVector &codec_list);
     void updateCodecInfoList(pjsua_codec_info pj_codec[], unsigned count,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/media.hpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/media.hpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/media.hpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/media.hpp	2022-02-24 07:54:38.000000000 +0000
@@ -911,7 +911,6 @@
      * Select or change capture sound device. Application may call this
      * function at any time to replace current sound device. Calling this 
      * method will not change the state of the sound device (opened/closed).
-     * Note that this method will override the mode set by setSndDevMode().
      *
      * @param capture_dev   	Device ID of the capture device.
      */
@@ -921,7 +920,6 @@
      * Select or change playback sound device. Application may call this
      * function at any time to replace current sound device. Calling this 
      * method will not change the state of the sound device (opened/closed).
-     * Note that this method will override the mode set by setSndDevMode().
      *
      * @param playback_dev   	Device ID of the playback device.
      */
@@ -967,6 +965,10 @@
 
     /**
      * Set sound device mode.
+     *
+     * Note that this method will open the sound device, using current
+     * active IDs set via setCaptureDev() or setPlaybackDev(), if the flag
+     * PJSUA_SND_DEV_NO_IMMEDIATE_OPEN is not specified.
      * 
      * @param mode		The sound device mode, as bitmask combination 
      *				of #pjsua_snd_dev_mode
@@ -1682,6 +1684,16 @@
     void stopTransmit(const VideoMedia &sink) const PJSUA2_THROW(Error);
 
     /**
+     * Update or refresh port states from video port info. Some port may
+     * change its port info in the middle of a session, for example when
+     * a video stream decoder learns that incoming video size or frame rate
+     * has changed, video conference needs to be informed to update its
+     * internal states.
+     *
+     */
+    void update() const PJSUA2_THROW(Error);
+
+    /**
      * Default Constructor.
      *
      * Normally application will not create VideoMedia object directly,
@@ -1879,6 +1891,17 @@
      */
     void setFullScreen(bool enabled) PJSUA2_THROW(Error);
 
+    /**
+     * Set video window full-screen. This operation is valid only when the
+     * underlying video device supports PJMEDIA_VID_DEV_CAP_OUTPUT_FULLSCREEN
+     * capability. Currently it is only supported on SDL backend.
+     *
+     * @param mode		Fullscreen mode, see
+     *				pjmedia_vid_dev_fullscreen_flag.
+     */
+    void setFullScreen2(pjmedia_vid_dev_fullscreen_flag mode)
+							PJSUA2_THROW(Error);
+
 private:
     pjsua_vid_win_id		winId;
 };
@@ -1987,6 +2010,8 @@
 
 private:
     pjmedia_vid_dev_index devId;
+    pjsua_vid_win_id winId;
+    void updateDevId();
 };
 
 /**
@@ -2073,6 +2098,19 @@
  */
 class VidDevManager {
 public:
+
+    /**
+     * Initialize the video device subsystem. This will register all supported
+     * video device factories to the video device subsystem.
+     *
+     * By default, library will initialize video device subsystem automatically
+     * on library initialization, so application will never need to invoke this
+     * function. However, when PJSUA_DONT_INIT_VID_DEV_SUBSYS is set to
+     * non-zero, application should invoke this function before accessing
+     * video device.
+     */
+    void initSubsys() PJSUA2_THROW(Error);
+
     /**
      * Refresh the list of video devices installed in the system. This function
      * will only refresh the list of video device so all active video streams
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/presence.hpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/presence.hpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/presence.hpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/presence.hpp	2022-02-24 07:54:38.000000000 +0000
@@ -250,6 +250,13 @@
     bool isValid() const;
 
     /**
+     * Get PJSUA-LIB buddy ID or index associated with this buddy.
+     *
+     * @return			Integer greater than or equal to zero.
+     */
+    int getId() const;
+
+    /**
      * Get detailed buddy info.
      *
      * @return			Buddy info.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/siptypes.hpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/siptypes.hpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/siptypes.hpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/siptypes.hpp	2022-02-24 07:54:38.000000000 +0000
@@ -100,6 +100,16 @@
                  const string data);
 
     /**
+     * Convert from pjsip
+     */
+    void fromPj(const pjsip_cred_info &prm);
+
+    /**
+     * Convert to pjsip
+     */
+    pjsip_cred_info toPj() const;
+
+    /**
      * Read this object from a container node.
      *
      * @param node		Container to read values from.
@@ -315,6 +325,11 @@
      * Specify the port range for socket binding, relative to the start
      * port number specified in \a port. Note that this setting is only
      * applicable when the start port number is non zero.
+     * 
+     * Example: \a port=5000, \a portRange=4
+     * - Available ports: 5000, 5001, 5002, 5003, 5004 (SIP transport)
+     * 
+     * Available ports are in the range of [\a port, \a port + \a portRange]. 
      *
      * Default value is zero.
      */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/types.hpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/types.hpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua2/types.hpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua2/types.hpp	2022-02-24 07:54:38.000000000 +0000
@@ -32,6 +32,7 @@
 
 #include <string>
 #include <vector>
+#include <map>
 
 /** PJSUA2 API is inside pj namespace */
 namespace pj
@@ -52,6 +53,9 @@
 /** Array of integers */
 typedef std::vector<int> IntVector;
 
+/** Map string to string */
+typedef std::map<std::string, std::string> StringToStringMap;
+
 /**
  * Type of token, i.e. arbitrary application user data
  */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua-lib/pjsua.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua-lib/pjsua.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua-lib/pjsua.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua-lib/pjsua.h	2022-02-24 07:54:38.000000000 +0000
@@ -286,6 +286,33 @@
 /** Forward declaration for pj_stun_resolve_result */
 typedef struct pj_stun_resolve_result pj_stun_resolve_result;
 
+/**
+ * Initial memory block for PJSUA.
+ */
+#ifndef PJSUA_POOL_LEN
+#   define PJSUA_POOL_LEN		1000
+#endif
+
+/**
+ * Memory increment for PJSUA.
+ */
+#ifndef PJSUA_POOL_INC
+#   define PJSUA_POOL_INC		1000
+#endif
+
+/**
+ * Initial memory block for PJSUA account.
+ */
+#ifndef PJSUA_POOL_LEN_ACC
+#   define PJSUA_POOL_LEN_ACC	512
+#endif
+
+/**
+ * Memory increment for PJSUA account.
+ */
+#ifndef PJSUA_POOL_INC_ACC
+#   define PJSUA_POOL_INC_ACC	256
+#endif
 
 /**
  * Maximum proxies in account.
@@ -368,6 +395,40 @@
 
 
 /**
+ * Specify whether pjsua should disable automatically sending initial
+ * answer 100/Trying for incoming calls. If disabled, application can
+ * later send 100/Trying if it wishes using pjsua_call_answer().
+ *
+ * Default: 0 (automatic sending enabled)
+ */
+#ifndef PJSUA_DISABLE_AUTO_SEND_100
+#   define PJSUA_DISABLE_AUTO_SEND_100	0
+#endif
+
+
+/**
+ * Default options that will be passed when creating ice transport.
+ * See #pjmedia_transport_ice_options.
+ */
+#ifndef PJSUA_ICE_TRANSPORT_OPTION
+#   define PJSUA_ICE_TRANSPORT_OPTION	0
+#endif
+
+/**
+ * Interval of checking for any new ICE candidate when trickle ICE is active.
+ * Trickle ICE gathers local ICE candidates, such as STUN and TURN candidates,
+ * in the background, while SDP offer/answer negotiation is being performed.
+ * Later, when any new ICE candidate is found, the endpoint will convey
+ * the candidate to the remote endpoint via SIP INFO.
+ *
+ * Default: 100 ms
+ */
+#ifndef PJSUA_TRICKLE_ICE_NEW_CAND_CHECK_INTERVAL
+#   define PJSUA_TRICKLE_ICE_NEW_CAND_CHECK_INTERVAL	100
+#endif
+
+
+/**
  * This enumeration represents pjsua state.
  */
 typedef enum pjsua_state
@@ -504,6 +565,58 @@
 
 
 /**
+ * Media stream info.
+ */
+typedef struct pjsua_stream_info
+{
+    /** Media type of this stream. */
+    pjmedia_type type;
+
+    /** Stream info (union). */
+    union {
+	/** Audio stream info */
+	pjmedia_stream_info	aud;
+
+	/** Video stream info */
+	pjmedia_vid_stream_info	vid;
+    } info;
+
+} pjsua_stream_info;
+
+
+/**
+ * Media stream statistic.
+ */
+typedef struct pjsua_stream_stat
+{
+    /** RTCP statistic. */
+    pjmedia_rtcp_stat	rtcp;
+
+    /** Jitter buffer statistic. */
+    pjmedia_jb_state	jbuf;
+
+} pjsua_stream_stat;
+
+
+/**
+ * Structure to be passed to on stream precreate callback.
+ * See #on_stream_precreate().
+ */
+typedef struct pjsua_on_stream_precreate_param
+{
+    /**
+     * Stream index in the media session, read-only.
+     */
+    unsigned            stream_idx;
+
+    /**
+     * Parameters that the stream will be created from.
+     */
+    pjsua_stream_info   stream_info;
+} pjsua_on_stream_precreate_param;
+
+
+/**
  * Structure to be passed to on stream created callback.
  * See #on_stream_created2().
  */
@@ -827,6 +940,13 @@
 
 
 /**
+ * Constant to specify unknown duration in \a pjsua_dtmf_info and
+ * \a pjsua_dtmf_event.
+ */
+#define PJSUA_UNKNOWN_DTMF_DURATION     ((unsigned)-1)
+
+
+/**
  * This will contain the information of the callback \a on_dtmf_digit2.
  */
 typedef struct pjsua_dtmf_info {
@@ -836,13 +956,13 @@
     pjsua_dtmf_method method;
 
     /**
-     * DTMF ASCII digit
+     * DTMF ASCII digit.
      */    
     unsigned digit;
 
     /**
-     * DTMF signal duration which might be included when sending DTMF using 
-     * SIP INFO.
+     * DTMF signal duration. If the duration is unknown, this value is set to
+     * PJSUA_UNKNOWN_DTMF_DURATION.
      */
     unsigned duration;
 
@@ -850,6 +970,55 @@
 
 
 /**
+ * This will contain the information of the callback \a on_dtmf_event.
+ */
+typedef struct pjsua_dtmf_event {
+    /**
+     * The method used to send DTMF.
+     */
+    pjsua_dtmf_method method;
+
+    /**
+     * The timestamp identifying the begin of the event. Timestamp units are
+     * expressed in milliseconds.
+     * Note that this value should only be used to compare multiple events
+     * received via the same method relatively to each other, as the time-base
+     * is randomized.
+     */
+    unsigned timestamp;
+
+    /**
+     * DTMF ASCII digit.
+     */
+    unsigned digit;
+
+    /**
+     * DTMF signal duration in milliseconds. Interpretation of the duration
+     * depends on the flag PJMEDIA_STREAM_DTMF_IS_END.
+     * If PJMEDIA_STREAM_DTMF_IS_END is set, this contains the total duration
+     * of the DTMF signal or PJSUA_UNKNOWN_DTMF_DURATION if the duration is
+     * unknown.
+     * If PJMEDIA_STREAM_DTMF_IS_END is not set, this contains the duration
+     * of the DTMF signal received up to this point in time.
+     * A duration of "0" indicates an infinitely long duration.
+     */
+    unsigned duration;
+
+    /**
+     * Flags indicating additional information about the DTMF event.
+     * If PJMEDIA_STREAM_DTMF_IS_UPDATE is set, the event was already
+     * indicated earlier. The new indication contains an updated event
+     * duration.
+     * If PJMEDIA_STREAM_DTMF_IS_END is set, the event has ended and this
+     * indication contains the final event duration. Note that end
+     * indications might get lost. Hence it is not guaranteed to receive
+     * an event with PJMEDIA_STREAM_DTMF_IS_END for every event.
+     */
+    unsigned flags;
+} pjsua_dtmf_event;
+
+
+/**
  * Call settings.
  */
 typedef struct pjsua_call_setting
@@ -886,6 +1055,29 @@
      */
     unsigned         vid_cnt;
 
+    /**
+     * Media direction. This setting will only be used if the flag
+     * PJSUA_CALL_SET_MEDIA_DIR is set, and it will persist for subsequent
+     * offers or answers. 
+     * For example, a media that is set as PJMEDIA_DIR_ENCODING can only
+     * mark the stream in the SDP as sendonly or inactive, but will not
+     * become sendrecv in subsequent offers and answers.
+     * Application can update the media direction in any API or callback
+     * that accepts pjsua_call_setting as a parameter, such as via
+     * pjsua_call_reinvite/update() or in on_call_rx_offer/reinvite()
+     * callback.
+     *
+     * The index of the media dir will correspond to the provisional media
+     * in pjsua_call_info.prov_media.
+     * For offers that involve adding new medias (such as initial offer),
+     * the index will correspond to all new audio media first, then video.
+     * For example, for a new call with 2 audios and 1 video, media_dir[0]
+     * and media_dir[1] will be for the audios, and media_dir[2] video.
+     *
+     * Default: PJMEDIA_DIR_ENCODING_DECODING
+     */
+    pjmedia_dir	     media_dir[PJMEDIA_MAX_SDP_MEDIA];
+
 } pjsua_call_setting;
 
 
@@ -964,6 +1156,19 @@
 			        pj_pool_t *pool,
 			        const pjmedia_sdp_session *rem_sdp);
 
+    /**
+     * Notify application when an audio media session is about to be created
+     * (as opposed to #on_stream_created() and #on_stream_created2() which are
+     * called *after* the session has been created). The application may change
+     * some stream info parameter values, i.e: jb_init, jb_min_pre, jb_max_pre,
+     * jb_max, use_ka, rtcp_sdes_bye_disabled, jb_discard_algo (audio),
+     * codec_param->enc_fmt (video).
+     *
+     * @param call_id       Call identification.
+     * @param param         The on stream precreate callback parameter.
+     */
+    void (*on_stream_precreate)(pjsua_call_id call_id,
+                                pjsua_on_stream_precreate_param *param);
 
     /**
      * Notify application when audio media session is created and before it is
@@ -1014,7 +1219,7 @@
     /**
      * Notify application upon incoming DTMF digits using RFC 2833 payload 
      * formats. This callback will not be called if app implements \a
-     * on_dtmf_digit2().
+     * on_dtmf_digit2() or \a on_dtmf_event().
      *
      * @param call_id	The call index.
      * @param digit	DTMF ASCII digit.
@@ -1023,7 +1228,8 @@
 
     /**
      * Notify application upon incoming DTMF digits using the method specified 
-     * in \a pjsua_dtmf_method.
+     * in \a pjsua_dtmf_method. This callback will not be called if app
+     * implements \a on_dtmf_event().
      *
      * @param call_id	The call index.
      * @param info	The DTMF info.
@@ -1031,6 +1237,17 @@
     void (*on_dtmf_digit2)(pjsua_call_id call_id, const pjsua_dtmf_info *info);
 
     /**
+     * Notify application upon incoming DTMF digits using the method specified 
+     * in \a pjsua_dtmf_method. Includes additional information about events
+     * received via RTP.
+     *
+     * @param call_id	The call index.
+     * @param event	The DTMF event.
+     */
+    void (*on_dtmf_event)(pjsua_call_id call_id,
+                          const pjsua_dtmf_event *event);
+
+    /**
      * Notify application on call being transferred (i.e. REFER is received).
      * Application can decide to accept/reject transfer request
      * by setting the code (default is 202). When this callback
@@ -1825,10 +2042,9 @@
 
     /** 
      * Maximum calls to support (default: 4). The value specified here
-     * must be smaller than the compile time maximum settings 
-     * PJSUA_MAX_CALLS, which by default is 32. To increase this 
-     * limit, the library must be recompiled with new PJSUA_MAX_CALLS
-     * value.
+     * must be smaller than or equal to the compile time maximum settings
+     * PJSUA_MAX_CALLS. To increase this limit, the library must be
+     * recompiled with new PJSUA_MAX_CALLS value.
      */
     unsigned	    max_calls;
 
@@ -2785,6 +3001,11 @@
      * port number specified in \a port. Note that this setting is only
      * applicable when the start port number is non zero.
      *
+     * Example: \a port=5000, \a port_range=4
+     * - Available ports: 5000, 5001, 5002, 5003, 5004 (SIP transport)
+     * 
+     * Available ports are in the range of [\a port, \a port + \a port_range]. 
+     * 
      * Default value is zero.
      */
     unsigned		port_range;
@@ -2962,7 +3183,7 @@
  *
  * @return		PJ_SUCCESS on success, or the appropriate error code.
  */
-PJ_DEF(pj_status_t) pjsua_tpfactory_register( pjsip_tpfactory *tf,
+PJ_DECL(pj_status_t) pjsua_tpfactory_register( pjsip_tpfactory *tf,
 					      pjsua_transport_id *p_id);
 
 /**
@@ -3009,16 +3230,18 @@
 
 
 /**
- * Close the transport. If transport is forcefully closed, it will be
- * immediately closed, and any pending transactions that are using the
- * transport may not terminate properly (it may even crash). Otherwise, 
- * the system will wait until all transactions are closed while preventing 
- * new users from using the transport, and will close the transport when 
- * it is safe to do so.
+ * Close the transport. The system will wait until all transactions are
+ * closed while preventing new users from using the transport, and will
+ * close the transport when it is safe to do so.
+ *
+ * NOTE: Forcefully closing transport (force = PJ_TRUE) is deprecated,
+ * since any pending transactions that are using the transport may not
+ * terminate properly and can even crash. Application wishing to immediately
+ * close the transport for the purpose of restarting it should use
+ * #pjsua_handle_ip_change() instead.
  *
  * @param id		Transport ID.
- * @param force		Non-zero to immediately close the transport. This
- *			is not recommended!
+ * @param force		Must be PJ_FALSE. force = PJ_TRUE is deprecated.
  *
  * @return		PJ_SUCCESS on success, or the appropriate error code.
  */
@@ -3162,6 +3385,19 @@
 #   define PJSUA_REG_RETRY_INTERVAL	300
 #endif
 
+/**
+ * When the registration is successfull, the auto registration refresh will
+ * be sent before it expires. Setting this to 0 will disable it.
+ * This is useful for app that uses Push Notification and doesn't require auto
+ * registration refresh. App can periodically send refresh registration or
+ * send it before making a call.=
+ * See https://github.com/pjsip/pjproject/pull/2652 for more info.
+ *
+ * Default: 1 (enabled)
+ */
+#ifndef PJSUA_REG_AUTO_REG_REFRESH
+#   define PJSUA_REG_AUTO_REG_REFRESH     1
+#endif
 
 /**
  * This macro specifies the default value for \a contact_rewrite_method
@@ -3462,6 +3698,17 @@
      */
     pj_str_t	    reg_contact_params;
 
+    /**
+     * Additional URI parameters that will be appended in the Contact URI
+     * for this account. This will only affect REGISTER requests and
+     * will be appended after \a contact_uri_params;
+     *
+     * The parameters should be preceeded by semicolon, and all strings must
+     * be properly escaped. Example:
+     *	 ";my-param=X;another-param=Hi%20there"
+     */
+    pj_str_t	    reg_contact_uri_params;
+
     /** 
      * The optional custom SIP headers to be put in the presence
      * subscription request.
@@ -3840,6 +4087,12 @@
 
     /**
      * Media transport config.
+     * 
+     * For \a port and \a port_range settings, RTCP port is selected as 
+     * RTP port+1.
+     * Example: \a port=5000, \a port_range=4
+     * - Available ports: 5000, 5002, 5004 (Media/RTP transport)
+     *                    5001, 5003, 5005 (Media/RTCP transport)
      */
     pjsua_transport_config rtp_cfg;
 
@@ -4023,6 +4276,13 @@
      * Default: PJ_FALSE (disabled)
      */
     pj_bool_t	     use_stream_ka;
+
+    /**
+     * Specify the keepalive configuration for stream.
+     *
+     * Default: see #pjmedia_stream_ka_config
+     */
+    pjmedia_stream_ka_config stream_ka_cfg;
 #endif
 
     /**
@@ -4605,7 +4865,7 @@
  * Maximum simultaneous calls.
  */
 #ifndef PJSUA_MAX_CALLS
-#   define PJSUA_MAX_CALLS	    32
+#   define PJSUA_MAX_CALLS	    4
 #endif
 
 /**
@@ -4670,7 +4930,6 @@
 
     /**
      * Requesting keyframe via Picture Loss Indication of RTCP feedback.
-     * This is currently not supported.
      */
     PJSUA_VID_REQ_KEYFRAME_RTCP_PLI	= 2
 
@@ -4917,43 +5176,14 @@
      * useful in IP address change scenario where IP version has been changed
      * and application needs to update target IP address.
      */
-    PJSUA_CALL_UPDATE_TARGET = 64
-
-} pjsua_call_flag;
-
-
-/**
- * Media stream info.
- */
-typedef struct pjsua_stream_info
-{
-    /** Media type of this stream. */
-    pjmedia_type type;
-
-    /** Stream info (union). */
-    union {
-	/** Audio stream info */
-	pjmedia_stream_info	aud;
+    PJSUA_CALL_UPDATE_TARGET = 64,
 
-	/** Video stream info */
-	pjmedia_vid_stream_info	vid;
-    } info;
-
-} pjsua_stream_info;
-
-
-/**
- * Media stream statistic.
- */
-typedef struct pjsua_stream_stat
-{
-    /** RTCP statistic. */
-    pjmedia_rtcp_stat	rtcp;
-
-    /** Jitter buffer statistic. */
-    pjmedia_jb_state	jbuf;
+    /**
+     * Set media direction as specified in pjsua_call_setting.media_dir.
+     */
+    PJSUA_CALL_SET_MEDIA_DIR = 128
 
-} pjsua_stream_stat;
+} pjsua_call_flag;
 
 /**
  * This enumeration represents video stream operation on a call.
@@ -5137,9 +5367,11 @@
 PJ_DECL(unsigned) pjsua_call_get_max_count(void);
 
 /**
- * Get number of currently active calls.
+ * Get the number of current calls. The number includes active calls
+ * (pjsua_call_is_active(call_id) == PJ_TRUE), as well as calls that
+ * are no longer active but still in the process of hanging up.
  *
- * @return		Number of currently active calls.
+ * @return		Number of current calls.
  */
 PJ_DECL(unsigned) pjsua_call_get_count(void);
 
@@ -5417,6 +5649,19 @@
  * while #pjsua_call_answer() only works with incoming calls on EARLY
  * state.
  *
+ * After calling this function, media will be deinitialized (call media
+ * callbacks, if any, will still be received) and then, on_call_state()
+ * will be immediately called with state DISCONNECTED. No further
+ * call callbacks will be received after this. The call hangup process
+ * itself (sending BYE, waiting for the response, and resource cleanup)
+ * will continue in the background and the call slot can be reused only
+ * after this process is completed. If application has limited call slots
+ * and would like to check if there are any free slots remaining, it can
+ * query the number of free slots using the APIs:
+ * pjsua_call_get_max_count()-pjsua_call_get_count()
+ *
+ * Note that on_call_tsx_state() will not be called when using this API.
+ *
  * @param call_id	Call identification.
  * @param code		Optional status code to be sent when we're rejecting
  *			incoming call. If the value is zero, "603/Decline"
@@ -5664,10 +5909,11 @@
  * @param call_id	Call identification.
  * @param mime_type	Optional MIME type. If NULL, then "text/plain" is 
  *			assumed.
- * @param content	The message content.
+ * @param content	The message content. Can be NULL if msg_data specifies
+ *			body and/or multipart.
  * @param msg_data	Optional list of headers etc to be included in outgoing
  *			request. The body descriptor in the msg_data is 
- *			ignored.
+ *			ignored if parameter 'content' is set.
  * @param user_data	Optional user data, which will be given back when
  *			the IM callback is called.
  *
@@ -5806,7 +6052,7 @@
  *
  * @param call_id	The call identification.
  * @param med_idx	Media stream index.
- * @param psi		To be filled with the stream statistic.
+ * @param stat		To be filled with the stream statistic.
  *
  * @return		PJ_SUCCESS on success or the appropriate error.
  */
@@ -6214,10 +6460,11 @@
  * @param to		Remote URI.
  * @param mime_type	Optional MIME type. If NULL, then "text/plain" is 
  *			assumed.
- * @param content	The message content.
+ * @param content	The message content. Can be NULL if msg_data specifies
+ *			body and/or multipart.
  * @param msg_data	Optional list of headers etc to be included in outgoing
  *			request. The body descriptor in the msg_data is 
- *			ignored.
+ *			ignored if parameter 'content' is set.
  * @param user_data	Optional user data, which will be given back when
  *			the IM callback is called.
  *
@@ -6606,11 +6853,19 @@
     /**
      * Set maximum delay that can be accomodated by the jitter buffer msec.
      *
-     * Default: -1 (to use default stream settings, currently 360 msec)
+     * Default: -1 (to use default stream settings, currently 500 msec)
      */
     int			jb_max;
 
     /**
+     * Set the algorithm the jitter buffer uses to discard frames in order to
+     * adjust the latency.
+     *
+     * Default: PJMEDIA_JB_DISCARD_PROGRESSIVE
+     */
+    pjmedia_jb_discard_algo jb_discard_algo;
+
+    /**
      * Enable ICE
      */
     pj_bool_t		enable_ice;
@@ -7157,6 +7412,7 @@
  *			WAV files are supported, and the WAV file MUST be
  *			formatted as 16bit PCM mono/single channel (any
  *			clock rate is supported).
+ *			Filename's length must be smaller than PJ_MAXPATH.
  * @param options	Optional option flag. Application may specify
  *			PJMEDIA_FILE_NO_LOOP to prevent playback loop.
  * @param p_id		Pointer to receive player ID.
@@ -7175,6 +7431,8 @@
  * @param file_names	Array of file names to be added to the play list.
  *			Note that the files must have the same clock rate,
  *			number of channels, and number of bits per sample.
+ *			Each filename's length must be smaller than
+ * 			PJ_MAXPATH.
  * @param file_count	Number of files in the array.
  * @param label		Optional label to be set for the media port.
  * @param options	Optional option flag. Application may specify
@@ -7214,7 +7472,7 @@
  * Get additional info about the file player. This operation is not valid
  * for playlist.
  *
- * @param port		The file player ID.
+ * @param id		The file player ID.
  * @param info		The info.
  *
  * @return		PJ_SUCCESS on success or the appropriate error code.
@@ -7269,6 +7527,7 @@
  * @param filename	Output file name. The function will determine the
  *			default format to be used based on the file extension.
  *			Currently ".wav" is supported on all platforms.
+ *			Filename's length must be smaller than PJ_MAXPATH.
  * @param enc_type	Optionally specify the type of encoder to be used to
  *			compress the media, if the file can support different
  *			encodings. This value must be zero for now.
@@ -7373,6 +7632,10 @@
  * Select or change sound device. Application may call this function at
  * any time to replace current sound device.
  *
+ * Note that this function will always try to open the sound device
+ * immediately. If immediate open is not preferred, use pjsua_set_snd_dev2()
+ * with PJSUA_SND_DEV_NO_IMMEDIATE_OPEN flag.
+ *
  * @param capture_dev   Device ID of the capture device.
  * @param playback_dev	Device ID of the playback device.
  *
@@ -7382,13 +7645,23 @@
 				       int playback_dev);
 
 /**
+ * Get sound device parameters such as playback & capture device IDs and mode.
+ *
+ * @param snd_param	On return, it is set with sound device param.
+ *
+ * @return		PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pjsua_get_snd_dev2(pjsua_snd_dev_param *snd_param);
+
+
+/**
  * Select or change sound device according to the specified param.
  *
  * @param snd_param	Sound device param. 
  *
  * @return		PJ_SUCCESS on success, or the appropriate error code.
  */
-PJ_DECL(pj_status_t) pjsua_set_snd_dev2(pjsua_snd_dev_param *snd_param);
+PJ_DECL(pj_status_t) pjsua_set_snd_dev2(const pjsua_snd_dev_param *snd_param);
 
 
 /**
@@ -7551,7 +7824,7 @@
 /**
  * Create an extra sound device and register it to conference bridge.
  *
- * @param snd_param	Sound device port param. Currently this only supports
+ * @param param	Sound device port param. Currently this only supports
  *			mono channel, so channel count must be set to 1.
  * @param p_snd		The extra sound device instance.
  *
@@ -7564,7 +7837,7 @@
 /**
  * Destroy an extra sound device and unregister it from conference bridge.
  *
- * @param p_snd		The extra sound device instance.
+ * @param snd		The extra sound device instance.
  *
  * @return		PJ_SUCCESS on success or the appropriate error code.
  */
@@ -7707,6 +7980,31 @@
  * Video devices API
  */
 
+
+/**
+ * Controls whether PJSUA-LIB should not initialize video device subsystem
+ * in the PJSUA initialization. The video device subsystem initialization
+ * may need to open cameras to enumerates available cameras and their
+ * capabilities, which may not be preferable for some applications because
+ * it may trigger privacy-alert/permission notification on application startup
+ * (e.g: on Android app).
+ *
+ * If this is set, later application should manually initialize video device
+ * subsystem when it needs to use any video devices (camera and renderer),
+ * i.e: by invoking pjmedia_vid_dev_subsys_init() for PJSUA or
+ * VidDevManager::initSubsys() for PJSUA2.
+ *
+ * Note that pjmedia_vid_dev_subsys_init() should not be called multiple
+ * times (unless each has corresponding pjmedia_vid_dev_subsys_shutdown()),
+ * while VidDevManager::initSubsys() is safe to be called multiple times.
+ *
+ * Default: 0 (no)
+ */
+#ifndef PJSUA_DONT_INIT_VID_DEV_SUBSYS
+#   define PJSUA_DONT_INIT_VID_DEV_SUBSYS	0
+#endif
+
+
 /**
  * Get the number of video devices installed in the system.
  *
@@ -7977,7 +8275,7 @@
 /**
  * Enumerates all video windows.
  *
- * @param id		Array of window ID to be initialized.
+ * @param wids		Array of window ID to be initialized.
  * @param count		On input, specifies max elements in the array.
  *			On return, it contains actual number of elements
  *			that have been initialized.
@@ -8076,13 +8374,14 @@
  * capability. Currently it is only supported on SDL backend.
  *
  * @param wid		The video window ID.
- * @param enabled   	Set to PJ_TRUE if full screen is desired, PJ_FALSE 
- *			otherwise.
+ * @param mode   	Fullscreen mode, see pjmedia_vid_dev_fullscreen_flag.
  *
  * @return		PJ_SUCCESS on success, or the appropriate error code.
  */
-PJ_DECL(pj_status_t) pjsua_vid_win_set_fullscreen(pjsua_vid_win_id wid,
-                                                  pj_bool_t enabled);
+PJ_DECL(pj_status_t) pjsua_vid_win_set_fullscreen(
+					pjsua_vid_win_id wid,
+					pjmedia_vid_dev_fullscreen_flag mode);
+
 
 /*
  * Video codecs API
@@ -8285,6 +8584,20 @@
 					       pjsua_conf_port_id sink);
 
 
+/**
+ * Update or refresh port states from video port info. Some port may
+ * change its port info in the middle of a session, for example when
+ * a video stream decoder learns that incoming video size or frame rate
+ * has changed, video conference needs to be informed to update its
+ * internal states.
+ *
+ * @param port_id	The slot id of the port to be updated.
+ *
+ * @return		PJ_SUCCESS on success, or the appropriate error
+ *			code.
+ */
+PJ_DECL(pj_status_t) pjsua_vid_conf_update_port(pjsua_conf_port_id port_id);
+
 
 /* end of VIDEO API */
 /**
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua-lib/pjsua_internal.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua-lib/pjsua_internal.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/include/pjsua-lib/pjsua_internal.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/include/pjsua-lib/pjsua_internal.h	2022-02-24 07:54:38.000000000 +0000
@@ -42,9 +42,11 @@
     pjsua_call		*call;	    /**< Parent call.			    */
     pjmedia_type	 type;	    /**< Media type.			    */
     unsigned		 idx;       /**< This media index in parent call.   */
+    pj_str_t		 rem_mid;   /**< Remote SDP "a=mid" attribute.	    */
     pjsua_call_media_status state;  /**< Media state.			    */
     pjsua_call_media_status prev_state;/**< Previous media state.           */
-    pjmedia_dir		 dir;       /**< Media direction.		    */
+    pjmedia_dir		 def_dir;   /**< Default media direction.	    */
+    pjmedia_dir		 dir;       /**< Current media direction.	    */
 
     /** The stream */
     struct {
@@ -78,6 +80,14 @@
 					 bit 0/LSB : sequence flag
 					 bit 1     : timestamp flag 	    */
 
+    pjmedia_type	    	prev_type;     /**< Previous media type     */
+    pjmedia_stream_info	    	prev_aud_si;   /**< Prev audio stream info  */
+    pjmedia_vid_stream_info 	prev_vid_si;   /**< Prev video stream info  */
+    pj_bool_t	    	    	prev_srtp_use; /**< Prev SRTP use 	    */
+    pjmedia_srtp_info	    	prev_srtp_info;/**< Prev SRTP transport info*/
+    pj_bool_t	    	    	prev_ice_use;  /**< Prev ICE use            */
+    pjmedia_ice_transport_info 	prev_ice_info; /**< Prev ICE transport info */
+
     pjmedia_transport	*tp;        /**< Current media transport (can be 0) */
     pj_status_t		 tp_ready;  /**< Media transport status.	    */
     pj_status_t		 tp_result; /**< Media transport creation result.   */
@@ -117,6 +127,14 @@
 } call_answer;
 
 
+/* Generic states */
+typedef enum pjsua_op_state {
+    PJSUA_OP_STATE_NULL,
+    PJSUA_OP_STATE_READY,
+    PJSUA_OP_STATE_RUNNING,
+    PJSUA_OP_STATE_DONE,
+} pjsua_op_state;
+
 /** 
  * Structure to be attached to invite dialog. 
  * Given a dialog "dlg", application can retrieve this structure
@@ -205,6 +223,22 @@
 					    created yet. This temporary 
 					    variable is used to handle such 
 					    case, see ticket #1916.	    */
+
+    struct {
+	pj_bool_t	 enabled;
+	pj_bool_t	 remote_sup;
+	pj_bool_t	 remote_dlg_est;
+	pjsua_op_state	 trickling;
+	int		 retrans18x_count;
+	pj_bool_t	 pending_info;
+	pj_timer_entry	 timer;
+    } trickle_ice;
+
+    pj_timer_entry	 hangup_timer;	/**< Hangup retry timer.	    */
+    unsigned		 hangup_retry;	/**< Number of hangup retries.	    */
+    unsigned		 hangup_code;	/**< Hangup code.	    	    */
+    pj_str_t		 hangup_reason;	/**< Hangup reason.	    	    */
+    pjsua_msg_data	*hangup_msg_data;/**< Hangup message data.	    */
 };
 
 
@@ -279,6 +313,7 @@
                                            2: acknowledged by servers   */
     pj_str_t	     rfc5626_instprm;/**< SIP outbound instance param.  */
     pj_str_t         rfc5626_regprm;/**< SIP outbound reg param.        */
+    unsigned         rfc5626_flowtmr;/**< SIP outbound flow timer.      */
 
     unsigned	     cred_cnt;	    /**< Number of credentials.		*/
     pjsip_cred_info  cred[PJSUA_ACC_MAX_PROXIES]; /**< Complete creds.	*/
@@ -425,6 +460,15 @@
 } pjsua_timer_list;
 
 
+typedef struct pjsua_event_list 
+{
+    PJ_DECL_LIST_MEMBER(struct pjsua_event_list);
+    pjmedia_event       event;
+    pjsua_call_id	call_id;
+    unsigned           	med_idx;
+} pjsua_event_list;
+
+
 /**
  * Global pjsua application data.
  */
@@ -434,6 +478,7 @@
     /* Control: */
     pj_caching_pool	 cp;	    /**< Global pool factory.		*/
     pj_pool_t		*pool;	    /**< pjsua's private pool.		*/
+    pj_pool_t		*timer_pool;/**< pjsua's timer pool.		*/
     pj_mutex_t		*mutex;	    /**< Mutex protection for this data	*/
     unsigned		 mutex_nesting_level; /**< Mutex nesting level.	*/
     pj_thread_t		*mutex_owner; /**< Mutex owner.			*/
@@ -536,8 +581,10 @@
     pjsua_vid_win	 win[PJSUA_MAX_VID_WINS]; /**< Array of windows	*/
 #endif
 
-    /* Timer entry list */
+    /* Timer entry and event list */
+    pjsua_timer_list	 active_timer_list;
     pjsua_timer_list	 timer_list;
+    pjsua_event_list	 event_list;
     pj_mutex_t          *timer_mutex;
 };
 
@@ -618,6 +665,24 @@
     return pjsua_var.mutex_owner == pj_thread_this();
 }
 
+/* Release all locks currently held by this thread. */
+PJ_INLINE(unsigned) PJSUA_RELEASE_LOCK()
+{
+    unsigned num_locks = 0;
+    while (PJSUA_LOCK_IS_LOCKED()) {
+        num_locks++;
+        PJSUA_UNLOCK();
+    }
+    return num_locks;
+}
+
+/* Re-acquire all the locks released by PJSUA_RELEASE_LOCK(). */
+PJ_INLINE(void) PJSUA_RELOCK(unsigned num_locks)
+{
+    for (; num_locks > 0; num_locks--)
+        PJSUA_LOCK();
+}
+
 #else
 #define PJSUA_LOCK()
 #define PJSUA_TRY_LOCK()	PJ_SUCCESS
@@ -685,6 +750,10 @@
 				       const pjmedia_sdp_session *remote_sdp);
 pj_status_t pjsua_media_channel_deinit(pjsua_call_id call_id);
 
+void pjsua_ice_check_start_trickling(pjsua_call *call,
+				     pj_bool_t forceful,
+				     pjsip_event *e);
+
 /*
  * Error message when media operation is requested while another is in progress
  */
@@ -702,16 +771,18 @@
 void pjsua_set_media_tp_state(pjsua_call_media *call_med, pjsua_med_tp_st tp_st);
 
 void pjsua_media_prov_clean_up(pjsua_call_id call_id);
+void pjsua_media_prov_revert(pjsua_call_id call_id);
 
 /* Callback to receive media events */
 pj_status_t on_media_event(pjmedia_event *event, void *user_data);
+void call_med_event_cb(void *user_data);
 pj_status_t call_media_on_event(pjmedia_event *event,
                                 void *user_data);
 
 /**
  * Init presence.
  */
-pj_status_t pjsua_pres_init();
+pj_status_t pjsua_pres_init(void);
 
 /*
  * Start presence subsystem.
@@ -860,7 +931,7 @@
                                      pjmedia_stream_info *si,
 				     const pjmedia_sdp_session *local_sdp,
 				     const pjmedia_sdp_session *remote_sdp);
-void pjsua_check_snd_dev_idle();
+void pjsua_check_snd_dev_idle(void);
 
 /*
  * Video
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_auth_aka.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_auth_aka.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_auth_aka.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_auth_aka.c	2022-02-24 07:54:38.000000000 +0000
@@ -36,7 +36,7 @@
  */
 PJ_DEF(pj_status_t) pjsip_auth_create_aka_response( 
 					     pj_pool_t *pool,
-					     const pjsip_digest_challenge*chal,
+					     const pjsip_digest_challenge *chal,
 					     const pjsip_cred_info *cred,
 					     const pj_str_t *method,
 					     pjsip_digest_credential *auth)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_auth_client.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_auth_client.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_auth_client.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_auth_client.c	2022-02-24 07:54:38.000000000 +0000
@@ -34,6 +34,27 @@
 #include <pj/ctype.h>
 
 
+#if PJ_HAS_SSL_SOCK && PJ_SSL_SOCK_IMP==PJ_SSL_SOCK_IMP_OPENSSL
+#  if !defined(PJSIP_AUTH_HAS_DIGEST_SHA256)
+#    define PJSIP_AUTH_HAS_DIGEST_SHA256    1
+#  endif
+#else
+#  undef  PJSIP_AUTH_HAS_DIGEST_SHA256
+#  define PJSIP_AUTH_HAS_DIGEST_SHA256	    0
+#endif
+
+#if PJSIP_AUTH_HAS_DIGEST_SHA256
+#  include <openssl/sha.h>
+#  ifdef _MSC_VER
+#    include <openssl/opensslv.h>
+#    if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#      pragma comment(lib, "libcrypto")
+#    else
+#      pragma comment(lib, "libeay32")
+#      pragma comment(lib, "ssleay32")
+#    endif
+#  endif
+#endif
 
 /* A macro just to get rid of type mismatch between char and unsigned char */
 #define MD5_APPEND(pms,buf,len)	pj_md5_update(pms, (const pj_uint8_t*)buf, \
@@ -125,12 +146,12 @@
  *
  * NOTE: THE OUTPUT STRING IS NOT NULL TERMINATED!
  */
-static void digest2str(const unsigned char digest[], char *output)
+static void digestNtoStr(const unsigned char digest[], int n, char *output)
 {
     int i;
-    for (i = 0; i<16; ++i) {
-	pj_val_to_hex_digit(digest[i], output);
-	output += 2;
+    for (i = 0; i<n; ++i) {
+        pj_val_to_hex_digit(digest[i], output);
+        output += 2;
     }
 }
 
@@ -170,7 +191,7 @@
 	MD5_APPEND( &pms, cred_info->data.ptr, cred_info->data.slen);
 	pj_md5_final(&pms, digest);
 
-	digest2str(digest, ha1);
+	digestNtoStr(digest, 16, ha1);
 
     } else if ((cred_info->data_type & PASSWD_MASK) == PJSIP_CRED_DATA_DIGEST) {
 	pj_assert(cred_info->data.slen == 32);
@@ -189,7 +210,7 @@
     MD5_APPEND( &pms, ":", 1);
     MD5_APPEND( &pms, uri->ptr, uri->slen);
     pj_md5_final(&pms, digest);
-    digest2str(digest, ha2);
+    digestNtoStr(digest, 16, ha2);
 
     AUTH_TRACE_((THIS_FILE, "  ha2=%.32s", ha2));
 
@@ -220,12 +241,122 @@
 
     /* Convert digest to string and store in chal->response. */
     result->slen = PJSIP_MD5STRLEN;
-    digest2str(digest, result->ptr);
+    digestNtoStr(digest, 16, result->ptr);
 
     AUTH_TRACE_((THIS_FILE, "  digest=%.32s", result->ptr));
     AUTH_TRACE_((THIS_FILE, "Digest created"));
 }
 
+
+/*
+ * Create response SHA-256 digest based on the parameters and store the
+ * digest ASCII in 'result'.
+ */
+PJ_DEF(void) pjsip_auth_create_digestSHA256(pj_str_t *result,
+					    const pj_str_t *nonce,
+					    const pj_str_t *nc,
+					    const pj_str_t *cnonce,
+					    const pj_str_t *qop,
+					    const pj_str_t *uri,
+					    const pj_str_t *realm,
+					    const pjsip_cred_info *cred_info,
+					    const pj_str_t *method)
+{
+#if PJSIP_AUTH_HAS_DIGEST_SHA256
+
+    char ha1[PJSIP_SHA256STRLEN];
+    char ha2[PJSIP_SHA256STRLEN];
+    unsigned char digest[32];
+    SHA256_CTX pms;
+
+    pj_assert(result->slen >= PJSIP_SHA256STRLEN);
+
+    AUTH_TRACE_((THIS_FILE, "Begin creating digest"));
+
+    if ((cred_info->data_type & PASSWD_MASK) == PJSIP_CRED_DATA_PLAIN_PASSWD)
+    {
+	/***
+	 *** ha1 = SHA256(username ":" realm ":" password)
+	 ***/
+	SHA256_Init(&pms);
+	SHA256_Update( &pms, cred_info->username.ptr,
+		       cred_info->username.slen);
+	SHA256_Update( &pms, ":", 1);
+	SHA256_Update( &pms, realm->ptr, realm->slen);
+	SHA256_Update( &pms, ":", 1);
+	SHA256_Update( &pms, cred_info->data.ptr, cred_info->data.slen);
+	SHA256_Final(digest, &pms);
+
+	digestNtoStr(digest, 32, ha1);
+
+    } else if ((cred_info->data_type & PASSWD_MASK) == PJSIP_CRED_DATA_DIGEST)
+    {
+	pj_assert(cred_info->data.slen == 32);
+	pj_memcpy( ha1, cred_info->data.ptr, cred_info->data.slen );
+    } else {
+	pj_assert(!"Invalid data_type");
+    }
+
+    AUTH_TRACE_((THIS_FILE, " ha1=%.64s", ha1));
+
+    /***
+     *** ha2 = SHA256(method ":" req_uri)
+     ***/
+    SHA256_Init(&pms);
+    SHA256_Update( &pms, method->ptr, method->slen);
+    SHA256_Update( &pms, ":", 1);
+    SHA256_Update( &pms, uri->ptr, uri->slen);
+    SHA256_Final( digest, &pms);
+    digestNtoStr(digest, 32, ha2);
+
+    AUTH_TRACE_((THIS_FILE, " ha2=%.64s", ha2));
+
+    /***
+     *** When qop is not used:
+     ***   response = SHA256(ha1 ":" nonce ":" ha2)
+     ***
+     *** When qop=auth is used:
+     ***   response = SHA256(ha1 ":" nonce ":" nc ":" cnonce ":" qop ":" ha2)
+     ***/
+    SHA256_Init(&pms);
+    SHA256_Update( &pms, ha1, PJSIP_SHA256STRLEN);
+    SHA256_Update( &pms, ":", 1);
+    SHA256_Update( &pms, nonce->ptr, nonce->slen);
+    if (qop && qop->slen != 0) {
+	SHA256_Update( &pms, ":", 1);
+	SHA256_Update( &pms, nc->ptr, nc->slen);
+	SHA256_Update( &pms, ":", 1);
+	SHA256_Update( &pms, cnonce->ptr, cnonce->slen);
+	SHA256_Update( &pms, ":", 1);
+	SHA256_Update( &pms, qop->ptr, qop->slen);
+    }
+    SHA256_Update( &pms, ":", 1);
+    SHA256_Update( &pms, ha2, PJSIP_SHA256STRLEN);
+
+    /* This is the final response digest. */
+    SHA256_Final(digest, &pms);
+
+    /* Convert digest to string and store in chal->response. */
+    result->slen = PJSIP_SHA256STRLEN;
+    digestNtoStr(digest, 32, result->ptr);
+
+    AUTH_TRACE_((THIS_FILE, " digest=%.64s", result->ptr));
+    AUTH_TRACE_((THIS_FILE, "Digest created"));
+
+#else
+    PJ_UNUSED_ARG(result);
+    PJ_UNUSED_ARG(nonce);
+    PJ_UNUSED_ARG(nc);
+    PJ_UNUSED_ARG(cnonce);
+    PJ_UNUSED_ARG(qop);
+    PJ_UNUSED_ARG(uri);
+    PJ_UNUSED_ARG(realm);
+    PJ_UNUSED_ARG(cred_info);
+    PJ_UNUSED_ARG(method);
+#endif
+}
+
+
 /*
  * Finds out if qop offer contains "auth" token.
  */
@@ -276,13 +407,21 @@
 				   const pj_str_t *method)
 {
     const pj_str_t pjsip_AKAv1_MD5_STR = { "AKAv1-MD5", 9 };
+    pj_bool_t algo_sha256 = PJ_FALSE;
+
+    /* Check if algo is sha256 */
+#if PJSIP_AUTH_HAS_DIGEST_SHA256
+    algo_sha256 = (pj_stricmp(&chal->algorithm, &pjsip_SHA256_STR)==0);
+#endif
 
-    /* Check algorithm is supported. We support MD5 and AKAv1-MD5. */
+    /* Check algorithm is supported. We support MD5, AKAv1-MD5, and SHA256. */
     if (chal->algorithm.slen==0 ||
-	(pj_stricmp(&chal->algorithm, &pjsip_MD5_STR)==0 ||
-	 pj_stricmp(&chal->algorithm, &pjsip_AKAv1_MD5_STR)==0))
+        (algo_sha256 ||
+	 pj_stricmp(&chal->algorithm, &pjsip_MD5_STR)==0 ||
+         pj_stricmp(&chal->algorithm, &pjsip_AKAv1_MD5_STR)==0))
     {
-	;
+	PJ_LOG(4,(THIS_FILE, "Digest algorithm is \"%.*s\"",
+		  chal->algorithm.slen, chal->algorithm.ptr));
     }
     else {
 	PJ_LOG(4,(THIS_FILE, "Unsupported digest algorithm \"%.*s\"",
@@ -299,8 +438,8 @@
     pj_strdup(pool, &cred->opaque, &chal->opaque);
 
     /* Allocate memory. */
-    cred->response.ptr = (char*) pj_pool_alloc(pool, PJSIP_MD5STRLEN);
-    cred->response.slen = PJSIP_MD5STRLEN;
+    cred->response.slen = algo_sha256? PJSIP_SHA256STRLEN : PJSIP_MD5STRLEN;
+    cred->response.ptr = (char*) pj_pool_alloc(pool, cred->response.slen);
 
     if (chal->qop.slen == 0) {
 	/* Server doesn't require quality of protection. */
@@ -312,9 +451,16 @@
 	}
 	else {
 	    /* Convert digest to string and store in chal->response. */
-	    pjsip_auth_create_digest( &cred->response, &cred->nonce, NULL,
-				      NULL,  NULL, uri, &chal->realm,
-				      cred_info, method);
+	    if (algo_sha256) {
+		pjsip_auth_create_digestSHA256(
+					  &cred->response, &cred->nonce, NULL,
+					  NULL,  NULL, uri, &chal->realm,
+					  cred_info, method);
+	    } else {
+		pjsip_auth_create_digest( &cred->response, &cred->nonce, NULL,
+					  NULL,  NULL, uri, &chal->realm,
+					  cred_info, method);
+	    }
 	}
 
     } else if (has_auth_qop(pool, &chal->qop)) {
@@ -338,9 +484,21 @@
 					    method, cred);
 	}
 	else {
-	    pjsip_auth_create_digest( &cred->response, &cred->nonce,
-				      &cred->nc, &cred->cnonce, &pjsip_AUTH_STR,
-				      uri, &chal->realm, cred_info, method );
+	    /* Convert digest to string and store in chal->response. */
+	    if (algo_sha256) {
+		pjsip_auth_create_digestSHA256(
+					  &cred->response, &cred->nonce,
+					  &cred->nc, &cred->cnonce,
+					  &pjsip_AUTH_STR, uri,
+					  &chal->realm, cred_info,
+					  method);
+	    } else {
+		pjsip_auth_create_digest( &cred->response, &cred->nonce,
+					  &cred->nc, &cred->cnonce,
+					  &pjsip_AUTH_STR, uri,
+					  &chal->realm, cred_info,
+					  method);
+	    }
 	}
 
     } else {
@@ -400,7 +558,7 @@
     PJSIP_AUTH_CNONCE_USE_DIGITS_ONLY!=0
 	if (pj_strchr(&cached_auth->cnonce, '-')) {
 	    /* remove hyphen character. */
-	    int w, r, len = pj_strlen(&cached_auth->cnonce);
+	    pj_size_t w, r, len = pj_strlen(&cached_auth->cnonce);
 	    char *s = cached_auth->cnonce.ptr;
 
 	    w = r = 0;
@@ -644,7 +802,7 @@
     pj_memcpy(&sess->pref, p, sizeof(*p));
     pj_strdup(sess->pool, &sess->pref.algorithm, &p->algorithm);
     //if (sess->pref.algorithm.slen == 0)
-    //	sess->pref.algorithm = pj_str("md5");
+    //	sess->pref.algorithm = pj_str("MD5");
 
     return PJ_SUCCESS;
 }
@@ -1042,7 +1200,7 @@
     pjsip_hdr *hdr;
     pj_status_t status;
 
-    /* See if we have sent authorization header for this realm */
+    /* See if we have sent authorization header for this realm (and scheme) */
     hdr = tdata->msg->hdr.next;
     while (hdr != &tdata->msg->hdr) {
 	if ((hchal->type == PJSIP_H_WWW_AUTHENTICATE &&
@@ -1052,7 +1210,8 @@
 	{
 	    sent_auth = (pjsip_authorization_hdr*) hdr;
 	    if (pj_stricmp(&hchal->challenge.common.realm,
-			   &sent_auth->credential.common.realm )==0)
+			   &sent_auth->credential.common.realm)==0 &&
+		pj_stricmp(&hchal->scheme, &sent_auth->scheme)==0)
 	    {
 		/* If this authorization has empty response, remove it. */
 		if (pj_stricmp(&sent_auth->scheme, &pjsip_DIGEST_STR)==0 &&
@@ -1062,6 +1221,14 @@
 		    hdr = hdr->next;
 		    pj_list_erase(sent_auth);
 		    continue;
+		} else
+		if (pj_stricmp(&sent_auth->scheme, &pjsip_DIGEST_STR)==0 &&
+		    pj_stricmp(&sent_auth->credential.digest.algorithm,
+		               &hchal->challenge.digest.algorithm)!=0)
+		{
+		    /* Same 'digest' scheme but different algo */
+		    hdr = hdr->next;
+		    continue;
 		} else {
 		    /* Found previous authorization attempt */
 		    break;
@@ -1155,9 +1322,10 @@
 {
     pjsip_tx_data *tdata;
     const pjsip_hdr *hdr;
-    unsigned chal_cnt;
+    unsigned chal_cnt, auth_cnt;
     pjsip_via_hdr *via;
     pj_status_t status;
+    pj_status_t last_auth_err;
 
     PJ_ASSERT_RETURN(sess && rdata && old_request && new_request,
 		     PJ_EINVAL);
@@ -1178,7 +1346,9 @@
      */
     hdr = rdata->msg_info.msg->hdr.next;
     chal_cnt = 0;
-    while (hdr != &rdata->msg_info.msg->hdr) {
+    auth_cnt = 0;
+    last_auth_err = PJSIP_EAUTHNOAUTH;
+    while (hdr != &rdata->msg_info.msg->hdr && auth_cnt == 0) {
 	pjsip_cached_auth *cached_auth;
 	const pjsip_www_authenticate_hdr *hchal;
 	pjsip_authorization_hdr *hauth;
@@ -1222,8 +1392,13 @@
 	 */
 	status = process_auth(tdata->pool, hchal, tdata->msg->line.req.uri,
 			      tdata, sess, cached_auth, &hauth);
-	if (status != PJ_SUCCESS)
-	    return status;
+	if (status != PJ_SUCCESS) {
+	    last_auth_err = status;
+
+	    /* Process next header. */
+	    hdr = hdr->next;
+	    continue;
+	}
 
 	if (pj_pool_get_used_size(cached_auth->pool) >
 	    PJSIP_AUTH_CACHED_POOL_MAX_SIZE) 
@@ -1236,12 +1411,17 @@
 
 	/* Process next header. */
 	hdr = hdr->next;
+	auth_cnt++;
     }
 
     /* Check if challenge is present */
     if (chal_cnt == 0)
 	return PJSIP_EAUTHNOCHAL;
 
+    /* Check if any authorization header has been created */
+    if (auth_cnt == 0)
+	return last_auth_err;
+
     /* Remove branch param in Via header. */
     via = (pjsip_via_hdr*) pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL);
     via->branch_param.slen = 0;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_auth_parser.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_auth_parser.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_auth_parser.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_auth_parser.c	2022-02-24 07:54:38.000000000 +0000
@@ -60,8 +60,10 @@
 		pjsip_PGP_STR =		    { "PGP", 3 },
 		pjsip_QUOTED_PGP_STR =	    { "\"PGP\"", 5 },
 		pjsip_BEARER_STR =          { "Bearer", 6 },
-		pjsip_MD5_STR =		    { "md5", 3 },
-		pjsip_QUOTED_MD5_STR =	    { "\"md5\"", 5},
+		pjsip_MD5_STR =		    { "MD5", 3 },
+		pjsip_QUOTED_MD5_STR =	    { "\"MD5\"", 5},
+		pjsip_SHA256_STR =	    { "SHA-256", 7 },
+		pjsip_QUOTED_SHA256_STR =   { "\"SHA-256\"", 9},
 		pjsip_AUTH_STR =	    { "auth", 4},
 		pjsip_QUOTED_AUTH_STR =	    { "\"auth\"", 6 };
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_config.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_config.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_config.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_config.c	2022-02-24 07:54:38.000000000 +0000
@@ -36,7 +36,8 @@
        PJSIP_RESOLVE_HOSTNAME_TO_GET_INTERFACE,
        0,
        PJSIP_ENCODE_SHORT_HNAME,
-       PJSIP_ACCEPT_MULTIPLE_SDP_ANSWERS
+       PJSIP_ACCEPT_MULTIPLE_SDP_ANSWERS,
+       0
     },
 
     /* Transaction settings */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_dialog.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_dialog.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_dialog.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_dialog.c	2022-02-24 07:54:38.000000000 +0000
@@ -467,6 +467,10 @@
 
     /* Save the remote info. */
     pj_strdup(dlg->pool, &dlg->remote.info_str, &tmp);
+    
+    /* Save initial destination host from transport's info */
+    pj_strdup(dlg->pool, &dlg->initial_dest,
+    	      &rdata->tp_info.transport->remote_name.host);
 
 
     /* Init remote's contact from Contact header.
@@ -1192,6 +1196,12 @@
 	    return status;
     }
 
+    /* Copy the initial destination host to tdata. This information can be
+     * used later by transport for transport selection.
+     */
+    if (dlg->initial_dest.slen)
+    	pj_strdup(tdata->pool, &tdata->dest_info.name, &dlg->initial_dest);
+
     /* Done. */
     *p_tdata = tdata;
 
@@ -1217,9 +1227,9 @@
     /* Lock dialog. */
     pjsip_dlg_inc_lock(dlg);
 
-    /* Use outgoing CSeq and increment it by one. */
+    /* Use outgoing CSeq, if set to -1 (other than ACK/CANCEL). */
     if (cseq < 0)
-	cseq = dlg->local.cseq + 1;
+	cseq = dlg->local.cseq;
 
     /* Keep compiler happy */
     status = PJ_EBUG;
@@ -1822,6 +1832,11 @@
      * transaction as the initial transaction that establishes dialog.
      */
     if (dlg->role == PJSIP_ROLE_UAC) {
+    	/* Save initial destination host from transport's info. */
+    	if (!dlg->initial_dest.slen) {
+    	    pj_strdup(dlg->pool, &dlg->initial_dest,
+    	      	      &rdata->tp_info.transport->remote_name.host);
+    	}
 
 	/* Ignore subsequent request from remote */
 	if (msg->type != PJSIP_RESPONSE_MSG)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_msg.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_msg.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_msg.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_msg.c	2022-02-24 07:54:38.000000000 +0000
@@ -162,9 +162,11 @@
     pj_strset2( &status_phrase[181], "Call Is Being Forwarded");
     pj_strset2( &status_phrase[182], "Queued");
     pj_strset2( &status_phrase[183], "Session Progress");
+    pj_strset2( &status_phrase[199], "Early Dialog Terminated");
 
     pj_strset2( &status_phrase[200], "OK");
     pj_strset2( &status_phrase[202], "Accepted");
+    pj_strset2( &status_phrase[204], "No Notification");
 
     pj_strset2( &status_phrase[300], "Multiple Choices");
     pj_strset2( &status_phrase[301], "Moved Permanently");
@@ -181,15 +183,31 @@
     pj_strset2( &status_phrase[406], "Not Acceptable");
     pj_strset2( &status_phrase[407], "Proxy Authentication Required");
     pj_strset2( &status_phrase[408], "Request Timeout");
+    pj_strset2( &status_phrase[409], "Conflict");
     pj_strset2( &status_phrase[410], "Gone");
+    pj_strset2( &status_phrase[411], "Length Required");
+    pj_strset2( &status_phrase[412], "Conditional Request Failed");
     pj_strset2( &status_phrase[413], "Request Entity Too Large");
-    pj_strset2( &status_phrase[414], "Request URI Too Long");
+    pj_strset2( &status_phrase[414], "Request-URI Too Long");
     pj_strset2( &status_phrase[415], "Unsupported Media Type");
     pj_strset2( &status_phrase[416], "Unsupported URI Scheme");
+    pj_strset2( &status_phrase[417], "Unknown Resource-Priority");
     pj_strset2( &status_phrase[420], "Bad Extension");
     pj_strset2( &status_phrase[421], "Extension Required");
-    pj_strset2( &status_phrase[422], "Session Timer Too Small");
+    pj_strset2( &status_phrase[422], "Session Interval Too Small");
     pj_strset2( &status_phrase[423], "Interval Too Brief");
+    pj_strset2( &status_phrase[424], "Bad Location Information");
+    pj_strset2( &status_phrase[428], "Use Identity Header");
+    pj_strset2( &status_phrase[429], "Provide Referrer Identity");
+    pj_strset2( &status_phrase[430], "Flow Failed");
+    pj_strset2( &status_phrase[433], "Anonymity Disallowed");
+    pj_strset2( &status_phrase[436], "Bad Identity-Info");
+    pj_strset2( &status_phrase[437], "Unsupported Certificate");
+    pj_strset2( &status_phrase[438], "Invalid Identity Header");
+    pj_strset2( &status_phrase[439], "First Hop Lacks Outbound Support");
+    pj_strset2( &status_phrase[440], "Max-Breadth Exceeded");
+    pj_strset2( &status_phrase[469], "Bad Info Package");
+    pj_strset2( &status_phrase[470], "Consent Needed");
     pj_strset2( &status_phrase[480], "Temporarily Unavailable");
     pj_strset2( &status_phrase[481], "Call/Transaction Does Not Exist");
     pj_strset2( &status_phrase[482], "Loop Detected");
@@ -203,20 +221,24 @@
     pj_strset2( &status_phrase[490], "Request Updated");
     pj_strset2( &status_phrase[491], "Request Pending");
     pj_strset2( &status_phrase[493], "Undecipherable");
+    pj_strset2( &status_phrase[494], "Security Agreement Required");
 
-    pj_strset2( &status_phrase[500], "Internal Server Error");
+    pj_strset2( &status_phrase[500], "Server Internal Error");
     pj_strset2( &status_phrase[501], "Not Implemented");
     pj_strset2( &status_phrase[502], "Bad Gateway");
     pj_strset2( &status_phrase[503], "Service Unavailable");
-    pj_strset2( &status_phrase[504], "Server Timeout");
+    pj_strset2( &status_phrase[504], "Server Time-out");
     pj_strset2( &status_phrase[505], "Version Not Supported");
     pj_strset2( &status_phrase[513], "Message Too Large");
+    pj_strset2( &status_phrase[555], "Push Notification Service Not Supported");
     pj_strset2( &status_phrase[580], "Precondition Failure");
 
     pj_strset2( &status_phrase[600], "Busy Everywhere");
     pj_strset2( &status_phrase[603], "Decline");
     pj_strset2( &status_phrase[604], "Does Not Exist Anywhere");
     pj_strset2( &status_phrase[606], "Not Acceptable");
+    pj_strset2( &status_phrase[607], "Unwanted");
+    pj_strset2( &status_phrase[608], "Rejected");
 
     pj_strset2( &status_phrase[701], "No response from destination server");
     pj_strset2( &status_phrase[702], "Unable to resolve destination server");
@@ -334,13 +356,13 @@
     return dst;
 }
 
-PJ_DEF(void*)  pjsip_msg_find_hdr( const pjsip_msg *msg, 
-				   pjsip_hdr_e hdr_type, const void *start)
+PJ_DEF(void*)  pjsip_hdr_find( const void *hdr_list,
+			       pjsip_hdr_e hdr_type, const void *start)
 {
-    const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=&msg->hdr;
+    const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=hdr_list;
 
     if (hdr == NULL) {
-	hdr = msg->hdr.next;
+	hdr = end->next;
     }
     for (; hdr!=end; hdr = hdr->next) {
 	if (hdr->type == hdr_type)
@@ -349,14 +371,14 @@
     return NULL;
 }
 
-PJ_DEF(void*)  pjsip_msg_find_hdr_by_name( const pjsip_msg *msg, 
-					   const pj_str_t *name, 
-					   const void *start)
+PJ_DEF(void*)  pjsip_hdr_find_by_name( const void *hdr_list,
+				       const pj_str_t *name,
+				       const void *start)
 {
-    const pjsip_hdr *hdr=(const pjsip_hdr*)start, *end=&msg->hdr;
+    const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=hdr_list;
 
     if (hdr == NULL) {
-	hdr = msg->hdr.next;
+	hdr = end->next;
     }
     for (; hdr!=end; hdr = hdr->next) {
 	if (pj_stricmp(&hdr->name, name) == 0)
@@ -365,15 +387,15 @@
     return NULL;
 }
 
-PJ_DEF(void*)  pjsip_msg_find_hdr_by_names( const pjsip_msg *msg, 
-					    const pj_str_t *name, 
-					    const pj_str_t *sname,
-					    const void *start)
+PJ_DEF(void*)  pjsip_hdr_find_by_names( const void *hdr_list,
+					const pj_str_t *name,
+					const pj_str_t *sname,
+					const void *start)
 {
-    const pjsip_hdr *hdr=(const pjsip_hdr*)start, *end=&msg->hdr;
+    const pjsip_hdr *hdr=(const pjsip_hdr*) start, *end=hdr_list;
 
     if (hdr == NULL) {
-	hdr = msg->hdr.next;
+	hdr = end->next;
     }
     for (; hdr!=end; hdr = hdr->next) {
 	if (pj_stricmp(&hdr->name, name) == 0)
@@ -384,6 +406,27 @@
     return NULL;
 }
 
+PJ_DEF(void*)  pjsip_msg_find_hdr( const pjsip_msg *msg,
+				   pjsip_hdr_e hdr_type, const void *start)
+{
+    return pjsip_hdr_find(&msg->hdr, hdr_type, start);
+}
+
+PJ_DEF(void*)  pjsip_msg_find_hdr_by_name( const pjsip_msg *msg,
+					   const pj_str_t *name,
+					   const void *start)
+{
+    return pjsip_hdr_find_by_name(&msg->hdr, name, start);
+}
+
+PJ_DEF(void*)  pjsip_msg_find_hdr_by_names( const pjsip_msg *msg,
+					    const pj_str_t *name,
+					    const pj_str_t *sname,
+					    const void *start)
+{
+    return pjsip_hdr_find_by_names(&msg->hdr, name, sname, start);
+}
+
 PJ_DEF(void*) pjsip_msg_find_remove_hdr( pjsip_msg *msg, 
 				         pjsip_hdr_e hdr_type, void *start)
 {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_multipart.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_multipart.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_multipart.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_multipart.c	2022-02-24 07:54:38.000000000 +0000
@@ -19,6 +19,7 @@
 #include <pjsip/sip_multipart.h>
 #include <pjsip/sip_parser.h>
 #include <pjlib-util/scanner.h>
+#include <pjlib-util/string.h>
 #include <pj/assert.h>
 #include <pj/ctype.h>
 #include <pj/errno.h>
@@ -416,6 +417,218 @@
     return NULL;
 }
 
+/*
+ * Find a body inside multipart bodies which has the header and value.
+ */
+PJ_DEF(pjsip_multipart_part*)
+pjsip_multipart_find_part_by_header_str(pj_pool_t *pool,
+				    const pjsip_msg_body *mp,
+				    const pj_str_t *hdr_name,
+				    const pj_str_t *hdr_value,
+				    const pjsip_multipart_part *start)
+{
+    struct multipart_data *m_data;
+    pjsip_multipart_part *part;
+    pjsip_hdr *found_hdr;
+    pj_str_t found_hdr_str;
+    pj_str_t found_hdr_value;
+    pj_size_t expected_hdr_slen;
+    pj_size_t buf_size;
+    pj_ssize_t hdr_name_len;
+#define REASONABLE_PADDING 32
+#define SEPARATOR_LEN 2
+    /* Must specify mandatory params */
+    PJ_ASSERT_RETURN(mp && hdr_name && hdr_value, NULL);
+
+    /* mp must really point to an actual multipart msg body */
+    PJ_ASSERT_RETURN(mp->print_body==&multipart_print_body, NULL);
+
+    /*
+     * We'll need to "print" each header we find to test it but
+     * allocating a buffer of PJSIP_MAX_URL_SIZE is overkill.
+     * Instead, we'll allocate one large enough to hold the search
+     * header name, the ": " separator, the search hdr value, and
+     * the NULL terminator.  If we can't print the found header
+     * into that buffer then it can't be a match.
+     *
+     * Some header print functions such as generic_int require enough
+     * space to print the maximum possible header length so we'll
+     * add a reasonable amount to the print buffer size.
+     */
+    expected_hdr_slen = hdr_name->slen + SEPARATOR_LEN + hdr_value->slen;
+    buf_size = expected_hdr_slen + REASONABLE_PADDING;
+    found_hdr_str.ptr = pj_pool_alloc(pool, buf_size);
+    found_hdr_str.slen = 0;
+    hdr_name_len = hdr_name->slen + SEPARATOR_LEN;
+
+    m_data = (struct multipart_data*)mp->data;
+
+    if (start)
+	part = start->next;
+    else
+	part = m_data->part_head.next;
+
+    while (part != &m_data->part_head) {
+	found_hdr = NULL;
+	while ((found_hdr = pjsip_hdr_find_by_name(&part->hdr, hdr_name,
+	    (found_hdr ? found_hdr->next : NULL))) != NULL) {
+
+	    found_hdr_str.slen = pjsip_hdr_print_on((void*) found_hdr, found_hdr_str.ptr, buf_size);
+	    /*
+	     * If the buffer was too small (slen = -1) or the result wasn't
+	     * the same length as the search header, it can't be a match.
+	     */
+	    if (found_hdr_str.slen != (pj_ssize_t)expected_hdr_slen) {
+		continue;
+	    }
+	    /*
+	     * Set the value overlay to start at the found header value...
+	     */
+	    found_hdr_value.ptr = found_hdr_str.ptr + hdr_name_len;
+	    found_hdr_value.slen = found_hdr_str.slen - hdr_name_len;
+	    /* ...and compare it to the supplied header value. */
+	    if (pj_strcmp(hdr_value, &found_hdr_value) == 0) {
+		return part;
+	    }
+	}
+	part = part->next;
+    }
+    return NULL;
+#undef SEPARATOR_LEN
+#undef REASONABLE_PADDING
+}
+
+PJ_DEF(pjsip_multipart_part*)
+pjsip_multipart_find_part_by_header(pj_pool_t *pool,
+				    const pjsip_msg_body *mp,
+				    void *search_for,
+				    const pjsip_multipart_part *start)
+{
+    pjsip_hdr *search_hdr = search_for;
+    pj_str_t search_buf;
+
+    /* Must specify mandatory params */
+    PJ_ASSERT_RETURN(mp && search_hdr, NULL);
+
+    /* mp must really point to an actual multipart msg body */
+    PJ_ASSERT_RETURN(mp->print_body==&multipart_print_body, NULL);
+
+    /*
+     * Unfortunately, there isn't enough information to determine
+     * the maximum printed size of search_hdr at this point so we
+     * have to allocate a reasonable max.
+     */
+    search_buf.ptr = pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
+    search_buf.slen = pjsip_hdr_print_on(search_hdr, search_buf.ptr, PJSIP_MAX_URL_SIZE - 1);
+    if (search_buf.slen <= 0) {
+	return NULL;
+    }
+    /*
+     * Set the header value to start after the header name plus the ":", then
+     * strip leading and trailing whitespace.
+     */
+    search_buf.ptr += (search_hdr->name.slen + 1);
+    search_buf.slen -= (search_hdr->name.slen + 1);
+    pj_strtrim(&search_buf);
+
+    return pjsip_multipart_find_part_by_header_str(pool, mp, &search_hdr->name, &search_buf, start);
+}
+
+/*
+ * Convert a Content-ID URI to it's corresponding header value.
+ * RFC2392 says...
+ * A "cid" URL is converted to the corresponding Content-ID message
+ * header by removing the "cid:" prefix, converting the % encoded
+ * character(s) to their equivalent US-ASCII characters, and enclosing
+ * the remaining parts with an angle bracket pair, "<" and ">".
+ *
+ * This implementation will accept URIs with or without the "cid:"
+ * scheme and optional angle brackets.
+ */
+static pj_str_t cid_uri_to_hdr_value(pj_pool_t *pool, pj_str_t *cid_uri)
+{
+    pj_size_t cid_len = pj_strlen(cid_uri);
+    pj_size_t alloc_len = cid_len + 2 /* for the leading and trailing angle brackets */;
+    pj_str_t uri_overlay;
+    pj_str_t cid_hdr;
+    pj_str_t hdr_overlay;
+
+    pj_strassign(&uri_overlay, cid_uri);
+    /* If the URI is already enclosed in angle brackets, remove them. */
+    if (uri_overlay.ptr[0] == '<') {
+	uri_overlay.ptr++;
+	uri_overlay.slen -= 2;
+    }
+    /* If the URI starts with the "cid:" scheme, skip over it. */
+    if (pj_strncmp2(&uri_overlay, "cid:", 4) == 0) {
+	uri_overlay.ptr += 4;
+	uri_overlay.slen -= 4;
+    }
+    /* Start building */
+    cid_hdr.ptr = pj_pool_alloc(pool, alloc_len);
+    cid_hdr.ptr[0] = '<';
+    cid_hdr.slen = 1;
+    hdr_overlay.ptr = cid_hdr.ptr + 1;
+    hdr_overlay.slen = 0;
+    pj_strcpy_unescape(&hdr_overlay, &uri_overlay);
+    cid_hdr.slen += hdr_overlay.slen;
+    cid_hdr.ptr[cid_hdr.slen] = '>';
+    cid_hdr.slen++;
+
+    return cid_hdr;
+}
+
+PJ_DEF(pjsip_multipart_part*)
+pjsip_multipart_find_part_by_cid_str(pj_pool_t *pool,
+				 const pjsip_msg_body *mp,
+				 pj_str_t *cid)
+{
+    struct multipart_data *m_data;
+    pjsip_multipart_part *part;
+    pjsip_generic_string_hdr *found_hdr;
+    static pj_str_t hdr_name = { "Content-ID", 10};
+    pj_str_t hdr_value;
+
+    PJ_ASSERT_RETURN(pool && mp && cid && (pj_strlen(cid) > 0), NULL);
+
+    hdr_value = cid_uri_to_hdr_value(pool, cid);
+    if (pj_strlen(&hdr_value) == 0) {
+	return NULL;
+    }
+
+    m_data = (struct multipart_data*)mp->data;
+    part = m_data->part_head.next;
+
+    while (part != &m_data->part_head) {
+	found_hdr = NULL;
+	while ((found_hdr = pjsip_hdr_find_by_name(&part->hdr, &hdr_name,
+	    (found_hdr ? found_hdr->next : NULL))) != NULL) {
+	    if (pj_strcmp(&hdr_value, &found_hdr->hvalue) == 0) {
+		return part;
+	    }
+	}
+	part = part->next;
+    }
+    return NULL;
+}
+
+PJ_DEF(pjsip_multipart_part*)
+pjsip_multipart_find_part_by_cid_uri(pj_pool_t *pool,
+				 const pjsip_msg_body *mp,
+				 pjsip_other_uri *cid_uri)
+{
+    PJ_ASSERT_RETURN(pool && mp && cid_uri, NULL);
+
+    if (pj_strcmp2(&cid_uri->scheme, "cid") != 0) {
+	return NULL;
+    }
+    /*
+     * We only need to pass the URI content so we
+     * can do that directly.
+     */
+    return pjsip_multipart_find_part_by_cid_str(pool, mp, &cid_uri->content);
+}
+
 /* Parse a multipart part. "pct" is parent content-type  */
 static pjsip_multipart_part *parse_multipart_part(pj_pool_t *pool,
 						  char *start,
@@ -584,6 +797,7 @@
 		(int)boundary.slen, boundary.ptr));
     }
 
+
     /* Build the delimiter:
      *   delimiter = "--" boundary
      */
@@ -630,6 +844,8 @@
 	if (*curptr=='\r') ++curptr;
 	if (*curptr!='\n') {
 	    /* Expecting a newline here */
+	    PJ_LOG(2, (THIS_FILE, "Failed to find newline"));
+
 	    return NULL;
 	}
 	++curptr;
@@ -645,6 +861,7 @@
 	    curptr = pj_strstr(&subbody, &delim);
 	    if (!curptr) {
 		/* We're really expecting end delimiter to be found. */
+		PJ_LOG(2, (THIS_FILE, "Failed to find end-delimiter"));
 		return NULL;
 	    }
 	}
@@ -670,9 +887,13 @@
 	part = parse_multipart_part(pool, start_body, end_body - start_body,
 				    ctype);
 	if (part) {
+	    TRACE_((THIS_FILE, "Adding part"));
 	    pjsip_multipart_add_part(pool, body, part);
+	} else {
+	    PJ_LOG(2, (THIS_FILE, "Failed to add part"));
 	}
     }
+    TRACE_((THIS_FILE, "pjsip_multipart_parse finished: %p", body));
 
     return body;
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_parser.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_parser.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_parser.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_parser.c	2022-02-24 07:54:38.000000000 +0000
@@ -378,17 +378,23 @@
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
     pj_cis_add_str( &pconst.pjsip_TOKEN_SPEC, TOKEN);
 
+    /* Token is allowed to have '%' so we do not need this. */
+    /*
     status = pj_cis_dup(&pconst.pjsip_TOKEN_SPEC_ESC, &pconst.pjsip_TOKEN_SPEC);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
     pj_cis_del_str(&pconst.pjsip_TOKEN_SPEC_ESC, "%");
+    */
 
     status = pj_cis_dup(&pconst.pjsip_VIA_PARAM_SPEC, &pconst.pjsip_TOKEN_SPEC);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
     pj_cis_add_str(&pconst.pjsip_VIA_PARAM_SPEC, "[:]");
 
+    /* Token is allowed to have '%' */
+    /*
     status = pj_cis_dup(&pconst.pjsip_VIA_PARAM_SPEC_ESC, &pconst.pjsip_TOKEN_SPEC_ESC);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
     pj_cis_add_str(&pconst.pjsip_VIA_PARAM_SPEC_ESC, "[:]");
+    */
 
     status = pj_cis_dup(&pconst.pjsip_HOST_SPEC, &pconst.pjsip_ALNUM_SPEC);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
@@ -1210,7 +1216,11 @@
 			     unsigned option)
 {
     /* pname */
-    parser_get_and_unescape(scanner, pool, spec, esc_spec, pname);
+    if (!esc_spec) {
+    	pj_scan_get(scanner, spec, pname);
+    } else {
+	parser_get_and_unescape(scanner, pool, spec, esc_spec, pname);
+    }
 
     /* init pvalue */
     pvalue->ptr = NULL;
@@ -1240,7 +1250,12 @@
 		// pj_scan_get_until_ch(scanner, ']', pvalue);
 		// pj_scan_get_char(scanner);
 	    } else if(pj_cis_match(spec, *scanner->curptr)) {
-		parser_get_and_unescape(scanner, pool, spec, esc_spec, pvalue);
+	    	if (!esc_spec) {
+    		    pj_scan_get(scanner, spec, pvalue);
+    		} else {
+		    parser_get_and_unescape(scanner, pool, spec, esc_spec,
+		    			    pvalue);
+		}
 	    }
 	}
     }
@@ -1252,7 +1267,10 @@
 			     	   unsigned option)
 {
     parse_param_imp(scanner, pool, pname, pvalue, &pconst.pjsip_TOKEN_SPEC,
-		    &pconst.pjsip_TOKEN_SPEC_ESC, option);
+		    // Token does not need to be unescaped.
+		    // Refer to PR #2933.
+		    // &pconst.pjsip_TOKEN_SPEC_ESC,
+		    NULL, option);
 }
 
 
@@ -2168,7 +2186,10 @@
 	pj_scan_get_char(scanner);
 	parse_param_imp(scanner, pool, &pname, &pvalue,
 			&pconst.pjsip_VIA_PARAM_SPEC,
-			&pconst.pjsip_VIA_PARAM_SPEC_ESC,
+		    	// Token does not need to be unescaped.
+		     	// Refer to PR #2933.
+		    	// &pconst.pjsip_VIA_PARAM_SPEC_ESC,
+			NULL,
 			0);
 
 	if (!parser_stricmp(pname, pconst.pjsip_BRANCH_STR) && pvalue.slen) {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_transaction.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_transaction.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_transaction.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_transaction.c	2022-02-24 07:54:38.000000000 +0000
@@ -137,6 +137,7 @@
 #define RETRANSMIT_TIMER	1
 #define TIMEOUT_TIMER		2
 #define TRANSPORT_ERR_TIMER	3
+#define TRANSPORT_DISC_TIMER	4
 
 /* Flags for tsx_set_state() */
 enum
@@ -420,6 +421,58 @@
     }
 }
 
+/*
+ * Change timer values used by transaction layer. Currently scheduled
+ * timers will not be changed. Any value set to 0 will be left
+ * unchanged.
+ * t1 - Transaction T1 timeout, in msec. Default value is PJSIP_T1_TIMEOUT
+ * t2 - Transaction T2 timeout, in msec. Default value is PJSIP_T2_TIMEOUT
+ * t4 - Transaction completed timer for non-INVITE, in msec.
+ *      Default value is PJSIP_T4_TIMEOUT
+ * td - Transaction completed timer for INVITE, in msec.
+ *      Default value is PJSIP_TD_TIMEOUT
+ */
+PJ_DEF(void) pjsip_tsx_set_timers(unsigned t1, unsigned t2, unsigned t4, unsigned td)
+{
+    if(t1!=0) {
+	t1_timer_val.sec  = t1 / 1000;
+	t1_timer_val.msec = t1 % 1000;
+	pjsip_cfg()->tsx.t1=t1;
+    }
+    if(t2!=0) {
+	t2_timer_val.sec  = t2 / 1000;
+	t2_timer_val.msec = t2 % 1000;
+	pjsip_cfg()->tsx.t2=t2;
+    }
+    if(t4!=0) {
+	t4_timer_val.sec  = t4 / 1000;
+	t4_timer_val.msec = t4 % 1000;
+	pjsip_cfg()->tsx.t4=t4;
+    }
+    if(td!=0) {
+	td_timer_val.sec  = td / 1000;
+	td_timer_val.msec = td % 1000;
+	timeout_timer_val = td_timer_val;
+	pjsip_cfg()->tsx.td=td;
+    }
+}
+
+/*
+ * (Re)Initializes timer values from `pjsip_cfg()`.
+ */
+PJ_DEF(void) pjsip_tsx_initialize_timer_values(void)
+{
+    t1_timer_val.sec  = pjsip_cfg()->tsx.t1 / 1000;
+    t1_timer_val.msec = pjsip_cfg()->tsx.t1 % 1000;
+    t2_timer_val.sec  = pjsip_cfg()->tsx.t2 / 1000;
+    t2_timer_val.msec = pjsip_cfg()->tsx.t2 % 1000;
+    t4_timer_val.sec  = pjsip_cfg()->tsx.t4 / 1000;
+    t4_timer_val.msec = pjsip_cfg()->tsx.t4 % 1000;
+    td_timer_val.sec  = pjsip_cfg()->tsx.td / 1000;
+    td_timer_val.msec = pjsip_cfg()->tsx.td % 1000;
+    timeout_timer_val = td_timer_val;
+}
+
 /*****************************************************************************
  **
  ** Transaction layer module
@@ -438,20 +491,7 @@
     PJ_ASSERT_RETURN(mod_tsx_layer.endpt==NULL, PJ_EINVALIDOP);
 
     /* Initialize timer values */
-    t1_timer_val.sec  = pjsip_cfg()->tsx.t1 / 1000;
-    t1_timer_val.msec = pjsip_cfg()->tsx.t1 % 1000;
-    t2_timer_val.sec  = pjsip_cfg()->tsx.t2 / 1000;
-    t2_timer_val.msec = pjsip_cfg()->tsx.t2 % 1000;
-    t4_timer_val.sec  = pjsip_cfg()->tsx.t4 / 1000;
-    t4_timer_val.msec = pjsip_cfg()->tsx.t4 % 1000;
-    td_timer_val.sec  = pjsip_cfg()->tsx.td / 1000;
-    td_timer_val.msec = pjsip_cfg()->tsx.td % 1000;
-    /* Changed the initialization below to use td_timer_val instead, to enable
-     * customization to the timeout value.
-     */
-    //timeout_timer_val.sec  = (64 * pjsip_cfg()->tsx.t1) / 1000;
-    //timeout_timer_val.msec = (64 * pjsip_cfg()->tsx.t1) % 1000;
-    timeout_timer_val = td_timer_val;
+    pjsip_tsx_initialize_timer_values();
 
     /*
      * Initialize transaction layer structure.
@@ -1124,8 +1164,11 @@
         return;
     }
 
-    if (entry->id == TRANSPORT_ERR_TIMER) {
-	/* Posted transport error event */
+    if (entry->id == TRANSPORT_ERR_TIMER || entry->id == TRANSPORT_DISC_TIMER)
+    {
+	/* Posted transport error/disconnection event */
+	pj_bool_t tp_disc = (entry->id == TRANSPORT_DISC_TIMER);
+
 	entry->id = 0;
 	if (tsx->state < PJSIP_TSX_STATE_TERMINATED) {
 	    pjsip_tsx_state_e prev_state;
@@ -1137,6 +1180,31 @@
 	    /* Release transport as it's no longer working. */
 	    tsx_update_transport(tsx, NULL);
 
+#if PJSIP_TSX_UAS_CONTINUE_ON_TP_ERROR
+	    if (tp_disc && tsx->method.id == PJSIP_INVITE_METHOD &&
+	    	tsx->role == PJSIP_ROLE_UAS && tsx->status_code < 200 &&
+	    	!(tsx->transport_flag & TSX_HAS_PENDING_TRANSPORT) &&
+        	!(tsx->transport_flag & TSX_HAS_PENDING_DESTROY))
+#else
+	    PJ_UNUSED_ARG(tp_disc);
+	    if (0)
+#endif
+	    {
+	    	/* Upon transport disconnection event, if we receive
+	    	 * incoming INVITE and haven't responded with a final answer,
+	    	 * just return here and don't terminate the transaction,
+	    	 * in case that the library can switch to another working
+	    	 * transport.
+	     	 */
+	    	tsx->transport_flag = 0;
+           	tsx->addr_len = 0;
+            	tsx->res_addr.transport = NULL;
+            	tsx->res_addr.addr_len = 0;
+	    	
+	    	pj_grp_lock_release(tsx->grp_lock);
+	    	return;
+	    }
+
 	    if (tsx->status_code < 200) {
 		pj_str_t err;
 		char errmsg[PJ_ERR_MSG_SIZE];
@@ -1295,6 +1363,9 @@
 	    if (tsx->pending_tx) {
 		tsx->pending_tx->mod_data[mod_tsx_layer.mod.id] = NULL;
 		tsx->pending_tx = NULL;
+
+		/* Decrease pending send counter */
+		pj_grp_lock_dec_ref(tsx->grp_lock);
 	    }
 	    tsx->transport_flag &= ~(TSX_HAS_PENDING_TRANSPORT);
 	}
@@ -1856,8 +1927,10 @@
 	/* Decrease pending send counter, but only if the transaction layer
 	 * hasn't been shutdown.
 	 */
-	if (mod_tsx_layer.mod.id >= 0)
-	    pj_grp_lock_dec_ref(tsx->grp_lock);
+	// If tsx has cancelled itself from this transmit notification
+	// it should have also decreased pending send counter.
+	//if (mod_tsx_layer.mod.id >= 0)
+	//    pj_grp_lock_dec_ref(tsx->grp_lock);
 
 	return;
     }
@@ -2025,6 +2098,10 @@
 {
     pjsip_transaction *tsx = (pjsip_transaction*) token;
 
+    /* Check if the transaction layer has been shutdown. */
+    if (mod_tsx_layer.mod.id < 0)
+	return;
+
     /* In other circumstances, locking tsx->grp_lock AFTER transport mutex
      * will introduce deadlock if another thread is currently sending a
      * SIP message to the transport. But this should be safe as there should
@@ -2033,6 +2110,38 @@
      */
     pj_grp_lock_acquire(tsx->grp_lock);
     tsx->transport_flag &= ~(TSX_HAS_PENDING_TRANSPORT);
+
+    if (sent > 0) {
+	/* Pending destroy? */
+	if (tsx->transport_flag & TSX_HAS_PENDING_DESTROY) {
+	    tsx_set_state( tsx, PJSIP_TSX_STATE_DESTROYED,
+			   PJSIP_EVENT_UNKNOWN, NULL, 0 );
+	    pj_grp_lock_release(tsx->grp_lock);
+	    return;
+	}
+
+	/* Need to transmit a message? */
+	if (tsx->transport_flag & TSX_HAS_PENDING_SEND) {
+	    tsx->transport_flag &= ~(TSX_HAS_PENDING_SEND);
+	    tsx_send_msg(tsx, tsx->last_tx);
+	}
+
+	/* Need to reschedule retransmission?
+	 * Note that when sending a pending message above, tsx_send_msg()
+	 * may set the flag TSX_HAS_PENDING_TRANSPORT.
+	 * Please refer to ticket #1875.
+	 */
+	if (tsx->transport_flag & TSX_HAS_PENDING_RESCHED &&
+	    !(tsx->transport_flag & TSX_HAS_PENDING_TRANSPORT))
+	{
+	    tsx->transport_flag &= ~(TSX_HAS_PENDING_RESCHED);
+
+	    /* Only update when transport turns out to be unreliable. */
+	    if (!tsx->is_reliable) {
+		tsx_resched_retransmission(tsx);
+	    }
+	}
+    }
     pj_grp_lock_release(tsx->grp_lock);
 
     if (sent < 0) {
@@ -2091,7 +2200,7 @@
 	if (tsx->state < PJSIP_TSX_STATE_COMPLETED) {
 	    tsx_cancel_timer(tsx, &tsx->timeout_timer);
 	    tsx_schedule_timer(tsx, &tsx->timeout_timer, &delay,
-			       TRANSPORT_ERR_TIMER);
+			       TRANSPORT_DISC_TIMER);
 	}
 	unlock_timer(tsx);
     }
@@ -2224,6 +2333,7 @@
 	if (status == PJ_EPENDING)
 	    status = PJ_SUCCESS;
 	if (status != PJ_SUCCESS) {
+	    tsx->transport_flag &= ~(TSX_HAS_PENDING_TRANSPORT);
 	    pj_grp_lock_dec_ref(tsx->grp_lock);
 	    pjsip_tx_data_dec_ref(tdata);
 	    tdata->mod_data[mod_tsx_layer.mod.id] = NULL;
@@ -2243,6 +2353,8 @@
 	if (status == PJ_EPENDING)
 	    status = PJ_SUCCESS;
 	if (status != PJ_SUCCESS) {
+	    tsx->transport_flag &= ~(TSX_HAS_PENDING_TRANSPORT);
+	    pj_grp_lock_dec_ref(tsx->grp_lock);
 	    pjsip_tx_data_dec_ref(tdata);
 	    tdata->mod_data[mod_tsx_layer.mod.id] = NULL;
 	    tsx->pending_tx = NULL;
@@ -2399,7 +2511,7 @@
 	pjsip_transport_add_ref(tp);
 	pjsip_transport_add_state_listener(tp, &tsx_tp_state_callback, tsx,
 					    &tsx->tp_st_key);
-        if (tp->is_shutdown) {
+	if (tp->is_shutdown || tp->is_destroying) {
 	    pjsip_transport_state_info info;
 
 	    pj_bzero(&info, sizeof(info));
@@ -3261,10 +3373,11 @@
 	}
 
     } else {
-	/* Ignore request to transmit. */
-	PJ_ASSERT_RETURN(event->type == PJSIP_EVENT_TX_MSG && 
-			 event->body.tx_msg.tdata == tsx->last_tx, 
+	PJ_ASSERT_RETURN(event->type == PJSIP_EVENT_TX_MSG, 
 			 PJ_EINVALIDOP);
+	/* Ignore request to transmit a new message. */
+	if (event->body.tx_msg.tdata != tsx->last_tx)
+	    return PJ_EINVALIDOP;
     }
 
     return PJ_SUCCESS;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_transport.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_transport.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_transport.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_transport.c	2022-02-24 07:54:38.000000000 +0000
@@ -358,7 +358,8 @@
 	}
     }
 
-    pj_assert(!"Invalid transport name");
+    /* Just return instead of raising assertion. */
+    //pj_assert(!"Invalid transport name");
     return PJSIP_TRANSPORT_UNSPECIFIED;
 }
 
@@ -732,7 +733,11 @@
     if (src->msg->body)
 	msg->body = pjsip_msg_body_clone(dst->pool, src->msg->body);
 
-    dst->is_pending = src->is_pending;
+    /* We shouldn't copy is_pending since it's src's internal state,
+     * indicating that it's currently being sent by the transport.
+     * While the cloned tdata is of course not.
+     */
+    //dst->is_pending = src->is_pending;
 
     PJ_LOG(5,(THIS_FILE,
 	     "Tx data %s cloned",
@@ -1067,6 +1072,19 @@
 	return;
 
     entry->id = PJ_FALSE;
+
+    /* Set is_destroying flag under transport manager mutex to avoid
+     * race condition with pjsip_tpmgr_acquire_transport2().
+     */
+    pj_lock_acquire(tp->tpmgr->lock);
+    if (pj_atomic_get(tp->ref_cnt) == 0) {
+	tp->is_destroying = PJ_TRUE;
+    } else {
+	pj_lock_release(tp->tpmgr->lock);
+	return;
+    }
+    pj_lock_release(tp->tpmgr->lock);
+
     pjsip_transport_destroy(tp);
 }
 
@@ -1388,8 +1406,8 @@
     mgr = tp->tpmgr;
     pj_lock_acquire(mgr->lock);
 
-    /* Do nothing if transport is being shutdown already */
-    if (tp->is_shutdown) {
+    /* Do nothing if transport is being shutdown/destroyed already */
+    if (tp->is_shutdown || tp->is_destroying) {
 	pj_lock_release(mgr->lock);
 	pj_lock_release(tp->lock);
 	return PJ_SUCCESS;
@@ -1825,7 +1843,7 @@
     itr = pj_hash_first(mgr->table, &itr_val);
     while (itr) {
 	transport *tp_entry = (transport *)pj_hash_this(mgr->table, itr);
-	nr_of_transports += pj_list_size(tp_entry);
+	nr_of_transports += (int)pj_list_size(tp_entry);
 	itr = pj_hash_next(mgr->table, itr);
     }
 
@@ -2057,8 +2075,8 @@
 				       pj_exception_id_name(err->except_code),
 				       (int)err->hname.slen, err->hname.ptr,
 				       err->line, err->col);
-		if (len >= (int)sizeof(buf)-tmp.slen) {
-		    len = (int)sizeof(buf)-tmp.slen;
+		if (len >= (int)sizeof(buf)-(int)tmp.slen) {
+		    len = (int)sizeof(buf)-(int)tmp.slen;
 		}
 		if (len > 0) {
 		    tmp.slen += len;
@@ -2252,6 +2270,13 @@
 	    return PJSIP_ETPNOTSUITABLE;
 	}
 
+	/* Make sure the transport is not being destroyed */
+	if (seltp->is_destroying) {
+	    pj_lock_release(mgr->lock);
+	    TRACE_((THIS_FILE,"Transport to be acquired is being destroyed"));
+	    return PJ_ENOTFOUND;
+	}
+
 	/* We could also verify that the destination address is reachable
 	 * from this transport (i.e. both are equal), but if application
 	 * has requested a specific transport to be used, assume that
@@ -2280,7 +2305,7 @@
 	int key_len;
 	pjsip_transport *tp_ref = NULL;
 	transport *tp_entry = NULL;
-
+	unsigned flag = pjsip_transport_get_flag_from_type(type);
 
 	/* If listener is specified, verify that the listener type matches
 	 * the destination type.
@@ -2307,8 +2332,23 @@
 	    if (tp_entry) {
 		transport *tp_iter = tp_entry;
 		do {
-		    /* Don't use transport being shutdown */
-		    if (!tp_iter->tp->is_shutdown) {
+		    /* Don't use transport being shutdown/destroyed */
+		    if (!tp_iter->tp->is_shutdown &&
+			!tp_iter->tp->is_destroying)
+		    {
+			if ((flag & PJSIP_TRANSPORT_SECURE) && tdata) {
+			    /* For secure transport, make sure tdata's
+			     * destination host matches the transport's
+			     * remote host.
+			     */
+			    if (pj_stricmp(&tdata->dest_info.name,
+				  	   &tp_iter->tp->remote_name.host))
+			    {
+			    	tp_iter = tp_iter->next;
+			    	continue;
+			    }
+			}
+
 			if (sel && sel->type == PJSIP_TPSELECTOR_LISTENER &&
 			    sel->u.listener)
 			{
@@ -2330,7 +2370,6 @@
 	if (tp_ref == NULL &&
 	    (!sel || sel->disable_connection_reuse == PJ_FALSE))
 	{
-	    unsigned flag = pjsip_transport_get_flag_from_type(type);
 	    const pj_sockaddr *remote_addr = (const pj_sockaddr*)remote;
 
 
@@ -2378,7 +2417,7 @@
 	    TRACE_((THIS_FILE, "Transport found but from different listener"));
 	}
 
-	if (tp_ref!=NULL && !tp_ref->is_shutdown) {
+	if (tp_ref!=NULL && !tp_ref->is_shutdown && !tp_ref->is_destroying) {
 	    /*
 	     * Transport found!
 	     */
@@ -2620,7 +2659,7 @@
 
     PJ_ASSERT_RETURN(tp && cb && key, PJ_EINVAL);
 
-    if (tp->is_shutdown) {
+    if (tp->is_shutdown || tp->is_destroying) {
 	*key = NULL;
 	return PJ_EINVALIDOP;
     }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_transport_tcp.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_transport_tcp.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_transport_tcp.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_transport_tcp.c	2022-02-24 07:54:38.000000000 +0000
@@ -330,6 +330,7 @@
     enum { INFO_LEN = 100 };
     char local_addr[PJ_INET6_ADDRSTRLEN + 10];
     char pub_addr[PJ_INET6_ADDRSTRLEN + 10];
+    int len;
     pj_sockaddr *listener_addr = &listener->factory.local_addr;
 
     /* Set transport info. */
@@ -341,9 +342,10 @@
     pj_addr_str_print(&listener->factory.addr_name.host, 
 		      listener->factory.addr_name.port, pub_addr, 
 		      sizeof(pub_addr), 1);
-    pj_ansi_snprintf(
+    len = pj_ansi_snprintf(
 	    listener->factory.info, INFO_LEN, "tcp %s [published as %s]",
 	    local_addr, pub_addr);
+    PJ_CHECK_TRUNC_STR(len, listener->factory.info, INFO_LEN);
 
     if (listener->asock) {	
 	char addr[PJ_INET6_ADDRSTRLEN+10];
@@ -776,6 +778,9 @@
         if (pending_tx->timeout.sec > 0 &&
             PJ_TIME_VAL_GT(now, pending_tx->timeout))
         {
+            pj_lock_release(tcp->base.lock);
+	    on_data_sent(tcp->asock, op_key, -PJ_ETIMEDOUT);
+            pj_lock_acquire(tcp->base.lock);
             continue;
         }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_transport_tls.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_transport_tls.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_transport_tls.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_transport_tls.c	2022-02-24 07:54:38.000000000 +0000
@@ -113,6 +113,9 @@
 
     /* Group lock to be used by TLS transport and ioqueue key */
     pj_grp_lock_t	    *grp_lock;
+
+    /* Verify callback. */
+    pj_bool_t(*on_verify_cb)(const pjsip_tls_on_verify_param *param);
 };
 
 
@@ -139,6 +142,8 @@
 			      pj_ioqueue_op_key_t *send_key,
 			      pj_ssize_t sent);
 
+static pj_bool_t on_verify_cb(pj_ssl_sock_t *ssock, pj_bool_t is_server);
+
 /* This callback is called by transport manager to destroy listener */
 static pj_status_t lis_destroy(pjsip_tpfactory *factory);
 
@@ -218,6 +223,9 @@
     case PJSIP_TLSV1_2_METHOD:
 	out_proto = PJ_SSL_SOCK_PROTO_TLS1_2;
 	break;
+    case PJSIP_TLSV1_3_METHOD:
+	out_proto = PJ_SSL_SOCK_PROTO_TLS1_3;
+	break;
     case PJSIP_SSLV23_METHOD:
 	out_proto = PJ_SSL_SOCK_PROTO_SSL23;
 	break;
@@ -301,6 +309,9 @@
     pj_ssl_sock_param_default(ssock_param);
     ssock_param->sock_af = af;
     ssock_param->cb.on_accept_complete2 = &on_accept_complete2;
+    if (listener->tls_setting.on_verify_cb)
+	ssock_param->cb.on_verify_cb = &on_verify_cb;
+
     ssock_param->async_cnt = listener->async_cnt;
     ssock_param->ioqueue = pjsip_endpt_get_ioqueue(listener->endpt);
     ssock_param->timer_heap = pjsip_endpt_get_timer_heap(listener->endpt);
@@ -419,6 +430,7 @@
     enum { INFO_LEN = 100 };
     char local_addr[PJ_INET6_ADDRSTRLEN + 10];
     char pub_addr[PJ_INET6_ADDRSTRLEN + 10];
+    int len;
     pj_sockaddr *listener_addr = &listener->factory.local_addr;
 
     if (listener->factory.info == NULL) {
@@ -429,9 +441,10 @@
     pj_addr_str_print(&listener->factory.addr_name.host, 
 		      listener->factory.addr_name.port, pub_addr, 
 		      sizeof(pub_addr), 1);
-    pj_ansi_snprintf(
+    len = pj_ansi_snprintf(
 	    listener->factory.info, INFO_LEN, "tls %s [published as %s]",
 	    local_addr, pub_addr);
+    PJ_CHECK_TRUNC_STR(len, listener->factory.info, INFO_LEN);
 
     if (listener->ssock) {
 	char addr[PJ_INET6_ADDRSTRLEN+10];
@@ -880,6 +893,7 @@
     tls->base.factory = &listener->factory;
 
     tls->ssock = ssock;
+    tls->on_verify_cb = listener->tls_setting.on_verify_cb;
 
     /* Set up the group lock */
     tls->grp_lock = tls->base.grp_lock = glock;
@@ -941,6 +955,9 @@
         if (pending_tx->timeout.sec > 0 &&
             PJ_TIME_VAL_GT(now, pending_tx->timeout))
         {
+            pj_lock_release(tls->base.lock);
+	    on_data_sent(tls->ssock, op_key, -PJ_ETIMEDOUT);
+            pj_lock_acquire(tls->base.lock);
             continue;
         }
 
@@ -1174,6 +1191,8 @@
     ssock_param.cb.on_connect_complete = &on_connect_complete;
     ssock_param.cb.on_data_read = &on_data_read;
     ssock_param.cb.on_data_sent = &on_data_sent;
+    if (listener->tls_setting.on_verify_cb)
+	ssock_param.cb.on_verify_cb = &on_verify_cb;
     ssock_param.async_cnt = 1;
     ssock_param.ioqueue = pjsip_endpt_get_ioqueue(listener->endpt);
     ssock_param.timer_heap = pjsip_endpt_get_timer_heap(listener->endpt);
@@ -1325,9 +1344,26 @@
     PJ_UNUSED_ARG(src_addr_len);
 
     listener = (struct tls_listener*) pj_ssl_sock_get_user_data(ssock);
+    if (!listener) {
+	/* Listener already destroyed, e.g: after TCP accept but before SSL
+	 * handshake is completed.
+	 */
+	if (new_ssock && accept_status == PJ_SUCCESS) {
+	    /* Close the SSL socket if the accept op is successful */
+	    PJ_LOG(4,(THIS_FILE,
+		      "Incoming TLS connection from %s (sock=%d) is discarded "
+		      "because listener is already destroyed",
+		      pj_sockaddr_print(src_addr, addr, sizeof(addr), 3),
+		      new_ssock));
+
+	    pj_ssl_sock_close(new_ssock);
+	}
+
+	return PJ_FALSE;
+    }
 
     if (accept_status != PJ_SUCCESS) {
-	if (listener && listener->tls_setting.on_accept_fail_cb) {
+	if (listener->tls_setting.on_accept_fail_cb) {
 	    pjsip_tls_on_accept_fail_param param;
 	    pj_ssl_sock_info ssi;
 
@@ -1350,6 +1386,8 @@
     PJ_ASSERT_RETURN(new_ssock, PJ_TRUE);
 
     if (!listener->is_registered) {
+	pj_ssl_sock_close(new_ssock);
+
 	if (listener->tls_setting.on_accept_fail_cb) {
 	    pjsip_tls_on_accept_fail_param param;
 	    pj_bzero(&param, sizeof(param));
@@ -1401,6 +1439,8 @@
 			 ssl_info.grp_lock, &tls);
     
     if (status != PJ_SUCCESS) {
+	pj_ssl_sock_close(new_ssock);
+
 	if (listener->tls_setting.on_accept_fail_cb) {
 	    pjsip_tls_on_accept_fail_param param;
 	    pj_bzero(&param, sizeof(param));
@@ -1546,6 +1586,40 @@
     return PJ_TRUE;
 }
 
+static pj_bool_t on_verify_cb(pj_ssl_sock_t* ssock, pj_bool_t is_server)
+{
+    pj_bool_t(*verify_cb)(const pjsip_tls_on_verify_param * param) = NULL;
+
+    if (is_server) {
+	struct tls_listener* tls;
+
+	tls = (struct tls_listener*)pj_ssl_sock_get_user_data(ssock);
+	verify_cb = tls->tls_setting.on_verify_cb;
+    } else {
+	struct tls_transport* tls;
+
+	tls = (struct tls_transport*)pj_ssl_sock_get_user_data(ssock);
+	verify_cb = tls->on_verify_cb;
+    }
+
+    if (verify_cb) {
+	pjsip_tls_on_verify_param param;
+	pj_ssl_sock_info info;
+
+	pj_bzero(&param, sizeof(param));
+	pj_ssl_sock_get_info(ssock, &info);
+
+	param.local_addr = &info.local_addr;
+	param.remote_addr = &info.remote_addr;
+	param.local_cert_info = info.local_cert_info;
+	param.remote_cert_info = info.remote_cert_info;
+	param.tp_dir = is_server?PJSIP_TP_DIR_INCOMING:PJSIP_TP_DIR_OUTGOING;
+	
+	return (*verify_cb)(&param);
+    }
+    return PJ_TRUE;
+}
+
 
 /* 
  * This callback is called by transport manager to send SIP message 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_transport_udp.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_transport_udp.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_transport_udp.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_transport_udp.c	2022-02-24 07:54:38.000000000 +0000
@@ -143,6 +143,8 @@
 	goto on_return;
 
     if (-bytes_read == PJ_ESOCKETSTOP) {
+#if 0
+	/* Auto restart is disabled, see #2881 */
 	--tp->read_loop_spin;
 	/* Try to recover by restarting the transport. */
 	PJ_LOG(4,(tp->base.obj_name, "Restarting SIP UDP transport"));
@@ -158,6 +160,9 @@
 			 "Error restarting SIP UDP transport"));
 	}
         return;
+#else
+	goto on_return;
+#endif
     }
 
     /*
@@ -321,6 +326,8 @@
 
     tdata_op_key->tdata = NULL;
 
+#if 0
+    /* Auto restart is disabled, see #2881 */
     if (-bytes_sent == PJ_ESOCKETSTOP) {
 	pj_status_t status;
 	/* Try to recover by restarting the transport. */
@@ -338,6 +345,7 @@
 	}
         return;
     }
+#endif
 
     if (tdata_op_key->callback) {
 	tdata_op_key->callback(&tp->base, tdata_op_key->token, bytes_sent);
@@ -380,6 +388,8 @@
 			       rem_addr, addr_len);
 
     if (status != PJ_EPENDING) {
+#if 0
+	/* Auto restart is disabled, see #2881 */
 	if (status == PJ_ESOCKETSTOP) {
 	    /* Try to recover by restarting the transport. */
 	    PJ_LOG(4,(tp->base.obj_name, "Restarting SIP UDP transport"));
@@ -395,6 +405,7 @@
 			     "Error restarting SIP UDP transport"));
 	    }
 	}
+#endif
 	tdata->op_key.tdata = NULL;
     }
 
@@ -621,6 +632,7 @@
     enum { INFO_LEN = 80 };
     char local_addr[PJ_INET6_ADDRSTRLEN+10];
     char pub_addr[PJ_INET6_ADDRSTRLEN+10];
+    int len;
 
     pj_assert(a_name->host.slen != 0);
     
@@ -644,8 +656,9 @@
 		      tp->base.local_name.port, 
 		      pub_addr, sizeof(pub_addr), 1),
 
-    pj_ansi_snprintf( tp->base.info, INFO_LEN, "udp %s [published as %s]",
+    len = pj_ansi_snprintf( tp->base.info, INFO_LEN, "udp %s [published as %s]",
 		      local_addr, pub_addr);
+    PJ_CHECK_TRUNC_STR(len, tp->base.info, INFO_LEN);
 }
 
 /* Set the socket handle of the transport */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_ua_layer.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_ua_layer.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_ua_layer.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_ua_layer.c	2022-02-24 07:54:38.000000000 +0000
@@ -65,6 +65,9 @@
     /* This is the buffer to store this entry in the hash table. */
     pj_hash_entry_buf ht_entry;
 
+    /* Entry key in the hash table */
+    pj_str_t ht_key;
+
     /* List of dialog in this dialog set. */
     struct dlg_set_head  dlg_list;
 };
@@ -165,6 +168,12 @@
 {
     pjsip_dialog *dlg;
 
+    /* If the module id is -1, it could mean that the module has been
+     * destroyed.
+     */
+    if (mod_ua.mod.id == -1)
+	return;
+
     /* Get the dialog where this transaction belongs. */
     dlg = (pjsip_dialog*) tsx->mod_data[mod_ua.mod.id];
     
@@ -321,6 +330,7 @@
 	     * Create the dialog set and add this dialog to it.
 	     */
 	    dlg_set = alloc_dlgset_node();
+	    dlg_set->ht_key = dlg->local.info->tag;
 	    pj_list_init(&dlg_set->dlg_list);
 	    pj_list_push_back(&dlg_set->dlg_list, dlg);
 
@@ -328,8 +338,8 @@
 
 	    /* Register the dialog set in the hash table. */
 	    pj_hash_set_np_lower(mod_ua.dlg_table, 
-			         dlg->local.info->tag.ptr,
-                                 (unsigned)dlg->local.info->tag.slen,
+			         dlg_set->ht_key.ptr,
+                                 (unsigned)dlg_set->ht_key.slen,
 			         dlg->local.tag_hval, dlg_set->ht_entry,
                                  dlg_set);
 	}
@@ -339,14 +349,15 @@
 	struct dlg_set *dlg_set;
 
 	dlg_set = alloc_dlgset_node();
+	dlg_set->ht_key = dlg->local.info->tag;
 	pj_list_init(&dlg_set->dlg_list);
 	pj_list_push_back(&dlg_set->dlg_list, dlg);
 
 	dlg->dlg_set = dlg_set;
 
 	pj_hash_set_np_lower(mod_ua.dlg_table, 
-		             dlg->local.info->tag.ptr,
-                             (unsigned)dlg->local.info->tag.slen,
+		             dlg_set->ht_key.ptr,
+                             (unsigned)dlg_set->ht_key.slen,
 		             dlg->local.tag_hval, dlg_set->ht_entry, dlg_set);
     }
 
@@ -391,12 +402,43 @@
 
     /* If dialog list is empty, remove the dialog set from the hash table. */
     if (pj_list_empty(&dlg_set->dlg_list)) {
-	pj_hash_set_lower(NULL, mod_ua.dlg_table, dlg->local.info->tag.ptr,
-		          (unsigned)dlg->local.info->tag.slen, 
+
+	/* Verify that the dialog set is valid */
+	pj_assert(pj_hash_get_lower(mod_ua.dlg_table, dlg_set->ht_key.ptr,
+				    (unsigned)dlg_set->ht_key.slen,
+				    &dlg->local.tag_hval) == dlg_set);
+
+	pj_hash_set_lower(NULL, mod_ua.dlg_table, dlg_set->ht_key.ptr,
+		          (unsigned)dlg_set->ht_key.slen,
 			  dlg->local.tag_hval, NULL);
 
 	/* Return dlg_set to free nodes. */
 	pj_list_push_back(&mod_ua.free_dlgset_nodes, dlg_set);
+    } else {
+	/* If the just unregistered dialog is being used as hash key,
+	 * reset the dlg_set entry with a new key (i.e: from the first dialog
+	 * in dlg_set).
+	 */
+	if (dlg_set->ht_key.ptr  == dlg->local.info->tag.ptr &&
+	    dlg_set->ht_key.slen == dlg->local.info->tag.slen)
+	{
+	    pjsip_dialog* key_dlg = dlg_set->dlg_list.next;
+
+	    /* Verify that the old & new keys share the hash value */
+	    pj_assert(key_dlg->local.tag_hval == dlg->local.tag_hval);
+
+	    pj_hash_set_lower(NULL, mod_ua.dlg_table, dlg_set->ht_key.ptr,
+			      (unsigned)dlg_set->ht_key.slen,
+			      dlg->local.tag_hval, NULL);
+
+	    dlg_set->ht_key = key_dlg->local.info->tag;
+
+	    pj_hash_set_np_lower(mod_ua.dlg_table,
+				 dlg_set->ht_key.ptr,
+				 (unsigned)dlg_set->ht_key.slen,
+				 key_dlg->local.tag_hval, dlg_set->ht_entry,
+				 dlg_set);
+	}
     }
 
     /* Unlock user agent. */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_util.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_util.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip/sip_util.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip/sip_util.c	2022-02-24 07:54:38.000000000 +0000
@@ -779,14 +779,14 @@
 	    pjsip_hdr_clone(cancel_tdata->pool, req_tdata->saved_strict_route);
     }
 
-    /* Copy the destination host name from the original request */
-    pj_strdup(cancel_tdata->pool, &cancel_tdata->dest_info.name,
-	      &req_tdata->dest_info.name);
-
-    /* Finally copy the destination info from the original request */
+    /* Copy the destination info from the original request */
     pj_memcpy(&cancel_tdata->dest_info, &req_tdata->dest_info,
 	      sizeof(req_tdata->dest_info));
 
+    /* Finally, copy the destination host name from the original request */
+    pj_strdup(cancel_tdata->pool, &cancel_tdata->dest_info.name,
+	      &req_tdata->dest_info.name);
+
     /* Done.
      * Return the transmit buffer containing the CANCEL request.
      */
@@ -1417,7 +1417,10 @@
      */
     if (tdata->dest_info.addr.count == 0) {
 	/* Copy the destination host name to TX data */
-	pj_strdup(tdata->pool, &tdata->dest_info.name, &dest_info.addr.host);
+	if (!tdata->dest_info.name.slen) {
+	    pj_strdup(tdata->pool, &tdata->dest_info.name,
+	    	      &dest_info.addr.host);
+	}
 
 	pjsip_endpt_resolve( endpt, tdata->pool, &dest_info, stateless_data,
 			     &stateless_send_resolver_callback);
@@ -1810,8 +1813,10 @@
 	}
     } else {
 	/* Copy the destination host name to TX data */
-	pj_strdup(tdata->pool, &tdata->dest_info.name, 
-		  &res_addr->dst_host.addr.host);
+	if (!tdata->dest_info.name.slen) {
+	    pj_strdup(tdata->pool, &tdata->dest_info.name, 
+		      &res_addr->dst_host.addr.host);
+	}
 
 	pjsip_endpt_resolve(endpt, tdata->pool, &res_addr->dst_host, 
 			    send_state, &send_response_resolver_cb);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-simple/evsub.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-simple/evsub.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-simple/evsub.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-simple/evsub.c	2022-02-24 07:54:38.000000000 +0000
@@ -306,7 +306,9 @@
     pj_list_init(&mod_evsub.pkg_list);
 
     /* Create pool: */
-    mod_evsub.pool = pjsip_endpt_create_pool(endpt, "evsub", 512, 512);
+    mod_evsub.pool = pjsip_endpt_create_pool(endpt, "evsub",
+                                        PJSIP_POOL_EVSUB_LEN,
+                                        PJSIP_POOL_EVSUB_INC);
     if (!mod_evsub.pool)
 	return PJ_ENOMEM;
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-simple/presence_body.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-simple/presence_body.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-simple/presence_body.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-simple/presence_body.c	2022-02-24 07:54:38.000000000 +0000
@@ -117,9 +117,18 @@
 	  int tslen = 0;
 	  pj_time_val tv;
 	  pj_parsed_time pt;
+	  pj_status_t s;
 
 	  pj_gettimeofday(&tv);
-	  /* TODO: convert time to GMT! (unsupported by pjlib) */
+
+	  /* Convert time to GMT (some platforms may not support it
+	   * such as WinCE).
+	   */
+	  s = pj_time_local_to_gmt(&tv);
+	  if (s != PJ_SUCCESS) {
+	      PJ_PERROR(4,(THIS_FILE,s,
+			   "Warning: failed to convert PIDF time to GMT"));
+	  }
 	  pj_time_decode( &tv, &pt);
 
 	  tslen = pj_ansi_snprintf(buf, sizeof(buf),
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-simple/rpid.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-simple/rpid.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-simple/rpid.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-simple/rpid.c	2022-02-24 07:54:38.000000000 +0000
@@ -115,22 +115,13 @@
 
     PJ_UNUSED_ARG(options);
 
-    /* Check if we need to add RPID information into the PIDF document. */
-    if (elem->id.slen==0 && 
-	elem->activity==PJRPID_ACTIVITY_UNKNOWN &&
-	elem->note.slen==0)
-    {
-	/* No RPID information to be added. */
-	return PJ_SUCCESS;
-    }
-
-    /* Add <note> to <tuple> */
+    /* Add <note> to <tuple>, if none */
     if (elem->note.slen != 0) {
 	pj_xml_node *nd_tuple;
 
 	nd_tuple = find_node(pres, "tuple");
-
-	if (nd_tuple) {
+	nd_note = nd_tuple? find_node(nd_tuple, "note"):NULL;
+	if (!nd_note) {
 	    nd_note = pj_xml_node_new(pool, &NOTE);
 	    pj_strdup(pool, &nd_note->content, &elem->note);
 	    pj_xml_add_node(nd_tuple, nd_note);
@@ -138,6 +129,14 @@
 	}
     }
 
+    /* Check if we need to add RPID information into the PIDF document. */
+    if (elem->id.slen==0 &&
+	elem->activity==PJRPID_ACTIVITY_UNKNOWN)
+    {
+	/* No RPID information to be added. */
+	return PJ_SUCCESS;
+    }
+
     /* Update namespace */
     update_namespaces(pres, pool);
 
@@ -204,7 +203,11 @@
     if (!nd_tuple)
 	return PJSIP_SIMPLE_EBADRPID;
 
-    nd_note = find_node(pres, "note");
+    nd_note = find_node(nd_tuple, "note");
+    /* If we cannot find <note> inside <tuple>, try to get it from root. */
+    if (!nd_note)
+    	nd_note = find_node(pres, "note");
+
     if (nd_note) {
 	pj_strdup(pool, &elem->note, &nd_note->content);
 	return PJ_SUCCESS;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_100rel.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_100rel.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_100rel.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_100rel.c	2022-02-24 07:54:38.000000000 +0000
@@ -584,7 +584,7 @@
 
 	/* Send 500 response */
 	status = pjsip_inv_end_session(dd->inv, 500, &reason, &tdata);
-	if (status == PJ_SUCCESS) {
+	if (status == PJ_SUCCESS && tdata) {
 	    pjsip_dlg_send_response(dd->inv->dlg, 
 				    dd->inv->invite_tsx,
 				    tdata);
@@ -600,7 +600,14 @@
     final = tdata->msg->line.status.code >= 200;
 
     if (dd->uas_state->retransmit_count == 1) {
-	pjsip_tsx_send_msg(dd->inv->invite_tsx, tdata);
+	pj_status_t status;
+	
+	status = pjsip_tsx_send_msg(dd->inv->invite_tsx, tdata);
+	if (status != PJ_SUCCESS) {
+	    PJ_PERROR(3, (THIS_FILE, status,
+			 "Failed to send message"));
+	    return;
+	}
     } else {
 	pjsip_tsx_retransmit_no_state(dd->inv->invite_tsx, tdata);
     }
@@ -618,7 +625,7 @@
     if (dd->uas_state->retransmit_count < 6) {
 	delay.sec = 0;
 	delay.msec = (1 << dd->uas_state->retransmit_count) * 
-		     pjsip_cfg()->tsx.t1;
+		     (long)pjsip_cfg()->tsx.t1;
 	pj_time_val_normalize(&delay);
     } else {
 	delay.sec = 1;
@@ -809,7 +816,7 @@
 	char rseq_str[32];
 	pj_str_t rseq;
 	tx_data_list_t *tl;
-	
+
 	/* Create UAS state if we don't have one */
 	if (dd->uas_state == NULL) {
 	    dd->uas_state = PJ_POOL_ZALLOC_T(inv->dlg->pool,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_inv.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_inv.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_inv.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_inv.c	2022-02-24 07:54:38.000000000 +0000
@@ -118,6 +118,8 @@
 static pj_bool_t inv_check_secure_dlg(pjsip_inv_session *inv,
 				      pjsip_event *e);
 
+static int print_sdp(pjsip_msg_body *body, char *buf, pj_size_t len);
+
 static void (*inv_state_handler[])( pjsip_inv_session *inv, pjsip_event *e) = 
 {
     &inv_on_state_null,
@@ -323,9 +325,19 @@
 	(*mod_inv.cb.on_state_changed)(inv, e);
     pjsip_inv_dec_ref(inv);
 
-    /* Only decrement when previous state is not already DISCONNECTED */
+    /* The above callback may change the state, so we need to be careful here
+     * and only decrement inv under the following conditions:
+     * 1. If the state parameter is DISCONNECTED, and previous state is not
+     *    already DISCONNECTED.
+     *    This is to make sure that dec_ref() is not called more than once.
+     * 2. If current state is PJSIP_INV_STATE_DISCONNECTED.
+     *    This is to make sure that dec_ref() is not called if user restarts
+     *    inv within the callback. Note that this check must be last since
+     *    inv may have already been destroyed.
+     */
     if (state == PJSIP_INV_STATE_DISCONNECTED &&
-	prev_state != PJSIP_INV_STATE_DISCONNECTED) 
+	prev_state != PJSIP_INV_STATE_DISCONNECTED &&
+	inv->state == PJSIP_INV_STATE_DISCONNECTED) 
     {
 	pjsip_inv_dec_ref(inv);
     }
@@ -502,6 +514,13 @@
      */
     if (inv->state < PJSIP_INV_STATE_CONFIRMED) {
 	inv_set_state(inv, PJSIP_INV_STATE_CONFIRMED, &ack_e);
+    } else if (inv->state == PJSIP_INV_STATE_DISCONNECTED && inv->last_ack) {
+        /* Avoid possible leaked tdata when invite session is already
+         * destroyed.
+         * https://github.com/pjsip/pjproject/pull/2432
+         */
+        pjsip_tx_data_dec_ref(inv->last_ack);
+        inv->last_ack = NULL;
     }
 
     return PJ_SUCCESS;
@@ -810,7 +829,7 @@
     PJ_ASSERT_RETURN(endpt && cb, PJ_EINVAL);
 
     /* Some callbacks are mandatory */
-    PJ_ASSERT_RETURN(cb->on_state_changed && cb->on_new_session, PJ_EINVAL);
+    PJ_ASSERT_RETURN(cb->on_state_changed, PJ_EINVAL);
 
     /* Check if module already registered. */
     PJ_ASSERT_RETURN(mod_inv.mod.id == -1, PJ_EINVALIDOP);
@@ -881,6 +900,8 @@
 	options |= PJSIP_INV_SUPPORT_100REL;
     if (options & PJSIP_INV_REQUIRE_TIMER)
 	options |= PJSIP_INV_SUPPORT_TIMER;
+    if (options & PJSIP_INV_REQUIRE_TRICKLE_ICE)
+	options |= PJSIP_INV_SUPPORT_TRICKLE_ICE;
 
     /* Create the session */
     inv = PJ_POOL_ZALLOC_T(dlg->pool, pjsip_inv_session);
@@ -946,66 +967,170 @@
     return PJ_SUCCESS;
 }
 
-PJ_DEF(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info(pjsip_rx_data *rdata)
-{
-    pjsip_rdata_sdp_info *sdp_info;
-    pjsip_msg_body *body = rdata->msg_info.msg->body;
-    pjsip_ctype_hdr *ctype_hdr = rdata->msg_info.ctype;
-    pjsip_media_type app_sdp;
+PJ_DEF(pjsip_sdp_info*) pjsip_get_sdp_info(pj_pool_t *pool,
+                                           pjsip_msg_body *body,
+                                           pjsip_media_type *msg_media_type,
+                                           const pjsip_media_type *search_media_type)
+{
+    pjsip_sdp_info *sdp_info;
+    pjsip_media_type search_type;
+    pjsip_media_type multipart_mixed;
+    pjsip_media_type multipart_alternative;
+    pjsip_media_type *msg_type;
+    pj_status_t status;
 
-    sdp_info = (pjsip_rdata_sdp_info*)
-	       rdata->endpt_info.mod_data[mod_inv.mod.id];
-    if (sdp_info)
-	return sdp_info;
+    sdp_info = PJ_POOL_ZALLOC_T(pool,
+                                pjsip_sdp_info);
 
-    sdp_info = PJ_POOL_ZALLOC_T(rdata->tp_info.pool,
-				pjsip_rdata_sdp_info);
     PJ_ASSERT_RETURN(mod_inv.mod.id >= 0, sdp_info);
-    rdata->endpt_info.mod_data[mod_inv.mod.id] = sdp_info;
 
-    pjsip_media_type_init2(&app_sdp, "application", "sdp");
+    if (!body) {
+        return sdp_info;
+    }
+
+    if (msg_media_type) {
+	msg_type = msg_media_type;
+    } else {
+	if (body->content_type.type.slen == 0) {
+	    return sdp_info;
+	}
+	msg_type = &body->content_type;
+    }
 
-    if (body && ctype_hdr &&
-	pj_stricmp(&ctype_hdr->media.type, &app_sdp.type)==0 &&
-	pj_stricmp(&ctype_hdr->media.subtype, &app_sdp.subtype)==0)
-    {
-	sdp_info->body.ptr = (char*)body->data;
-	sdp_info->body.slen = body->len;
-    } else if  (body && ctype_hdr &&
-	    	pj_stricmp2(&ctype_hdr->media.type, "multipart")==0 &&
-	    	(pj_stricmp2(&ctype_hdr->media.subtype, "mixed")==0 ||
-	    	 pj_stricmp2(&ctype_hdr->media.subtype, "alternative")==0))
+    if (!search_media_type) {
+        pjsip_media_type_init2(&search_type, "application", "sdp");
+    } else {
+        pj_memcpy(&search_type, search_media_type, sizeof(search_type));
+    }
+
+    pjsip_media_type_init2(&multipart_mixed, "multipart", "mixed");
+    pjsip_media_type_init2(&multipart_alternative, "multipart", "alternative");
+
+    if (pjsip_media_type_cmp(msg_type, &search_type, PJ_FALSE) == 0)
     {
-	pjsip_multipart_part *part;
+	/*
+	 * If the print_body function is print_sdp, we know that
+	 * body->data is a pjmedia_sdp_session object and came from
+	 * a tx_data.  If not, it's the text representation of the
+	 * sdp from an rx_data.
+	 */
+        if (body->print_body == print_sdp) {
+            sdp_info->sdp = body->data;
+        } else {
+            sdp_info->body.ptr = (char*)body->data;
+            sdp_info->body.slen = body->len;
+        }
+    } else if (pjsip_media_type_cmp(&multipart_mixed, msg_type, PJ_FALSE) == 0 ||
+	pjsip_media_type_cmp(&multipart_alternative, msg_type, PJ_FALSE) == 0)
+    {
+        pjsip_multipart_part *part;
+        part = pjsip_multipart_find_part(body, &search_type, NULL);
+        if (part) {
+            if (part->body->print_body == print_sdp) {
+                sdp_info->sdp = part->body->data;
+            } else {
+                sdp_info->body.ptr = (char*)part->body->data;
+                sdp_info->body.slen = part->body->len;
+            }
+        }
+    }
 
-	part = pjsip_multipart_find_part(body, &app_sdp, NULL);
-	if (part) {
-	    sdp_info->body.ptr = (char*)part->body->data;
-	    sdp_info->body.slen = part->body->len;
-	}
+    /*
+     * If the body was already a pjmedia_sdp_session, we can just
+     * return it.  If not and there wasn't a text representation
+     * of the sdp either, we can also just return.
+     */
+    if (sdp_info->sdp || !sdp_info->body.ptr) {
+	return sdp_info;
     }
 
-    if (sdp_info->body.ptr) {
-	pj_status_t status;
-	status = pjmedia_sdp_parse(rdata->tp_info.pool,
-				   sdp_info->body.ptr,
-				   sdp_info->body.slen,
-				   &sdp_info->sdp);
-	if (status == PJ_SUCCESS)
-	    status = pjmedia_sdp_validate2(sdp_info->sdp, PJ_FALSE);
+    /*
+     * If the body was the text representation of teh SDP, we need
+     * to parse it to create a pjmedia_sdp_session object.
+     */
+    status = pjmedia_sdp_parse(pool,
+				sdp_info->body.ptr,
+				sdp_info->body.slen,
+				&sdp_info->sdp);
+    if (status == PJ_SUCCESS)
+	status = pjmedia_sdp_validate2(sdp_info->sdp, PJ_FALSE);
 
-	if (status != PJ_SUCCESS) {
-	    sdp_info->sdp = NULL;
-	    PJ_PERROR(1,(THIS_FILE, status,
-			 "Error parsing/validating SDP body"));
-	}
+    if (status != PJ_SUCCESS) {
+	sdp_info->sdp = NULL;
+	PJ_PERROR(1, (THIS_FILE, status,
+	    "Error parsing/validating SDP body"));
+    }
 
-	sdp_info->sdp_err = status;
+    sdp_info->sdp_err = status;
+
+    return sdp_info;
+}
+
+PJ_DEF(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info2(
+                                            pjsip_rx_data *rdata,
+                                            const pjsip_media_type *search_media_type)
+{
+    pjsip_media_type *msg_media_type = NULL;
+    pjsip_rdata_sdp_info *sdp_info;
+
+    if (rdata->endpt_info.mod_data[mod_inv.mod.id]) {
+	return (pjsip_rdata_sdp_info *)rdata->endpt_info.mod_data[mod_inv.mod.id];
     }
 
+    /*
+     * rdata should have a Content-Type header at this point but we'll
+     * make sure.
+     */
+    if (rdata->msg_info.ctype) {
+	msg_media_type = &rdata->msg_info.ctype->media;
+    }
+    sdp_info = pjsip_get_sdp_info(rdata->tp_info.pool,
+				   rdata->msg_info.msg->body,
+				   msg_media_type,
+				   search_media_type);
+    rdata->endpt_info.mod_data[mod_inv.mod.id] = sdp_info;
+
     return sdp_info;
 }
 
+PJ_DEF(pjsip_rdata_sdp_info*) pjsip_rdata_get_sdp_info(pjsip_rx_data *rdata)
+{
+    return pjsip_rdata_get_sdp_info2(rdata, NULL);
+}
+
+PJ_DEF(pjsip_tdata_sdp_info*) pjsip_tdata_get_sdp_info2(
+                                            pjsip_tx_data *tdata,
+                                            const pjsip_media_type *search_media_type)
+{
+    pjsip_ctype_hdr *ctype_hdr = NULL;
+    pjsip_media_type *msg_media_type = NULL;
+    pjsip_tdata_sdp_info *sdp_info;
+
+    if (tdata->mod_data[mod_inv.mod.id]) {
+	return (pjsip_tdata_sdp_info *)tdata->mod_data[mod_inv.mod.id];
+    }
+    /*
+     * tdata won't usually have a Content-Type header at this point
+     * but we'll check just the same,
+     */
+    ctype_hdr = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_CONTENT_TYPE, NULL);
+    if (ctype_hdr) {
+	msg_media_type = &ctype_hdr->media;
+    }
+
+    sdp_info = pjsip_get_sdp_info(tdata->pool,
+				   tdata->msg->body,
+				   msg_media_type,
+				   search_media_type);
+    tdata->mod_data[mod_inv.mod.id] = sdp_info;
+
+    return sdp_info;
+}
+
+PJ_DEF(pjsip_tdata_sdp_info*) pjsip_tdata_get_sdp_info(pjsip_tx_data *tdata)
+{
+    return pjsip_tdata_get_sdp_info2(tdata, NULL);
+}
 
 /*
  * Verify incoming INVITE request.
@@ -1043,6 +1168,8 @@
 	*options |= PJSIP_INV_SUPPORT_TIMER;
     if (*options & PJSIP_INV_REQUIRE_ICE)
 	*options |= PJSIP_INV_SUPPORT_ICE;
+    if (*options & PJSIP_INV_REQUIRE_TRICKLE_ICE)
+	*options |= PJSIP_INV_SUPPORT_TRICKLE_ICE;
 
     if (rdata) {
         /* Get the message in rdata */
@@ -1269,6 +1396,7 @@
 	const pj_str_t STR_100REL = { "100rel", 6};
 	const pj_str_t STR_TIMER = { "timer", 5};
 	const pj_str_t STR_ICE = { "ice", 3 };
+	const pj_str_t STR_TRICKLE_ICE = { "trickle-ice", 11 };
 
 	for (i=0; i<sup_hdr->count; ++i) {
 	    if (pj_stricmp(&sup_hdr->values[i], &STR_100REL)==0)
@@ -1277,6 +1405,8 @@
 		rem_option |= PJSIP_INV_SUPPORT_TIMER;
 	    else if (pj_stricmp(&sup_hdr->values[i], &STR_ICE)==0)
 		rem_option |= PJSIP_INV_SUPPORT_ICE;
+	    else if (pj_stricmp(&sup_hdr->values[i], &STR_TRICKLE_ICE)==0)
+		rem_option |= PJSIP_INV_SUPPORT_TRICKLE_ICE;
 	}
     }
 
@@ -1291,6 +1421,7 @@
 	const pj_str_t STR_REPLACES = { "replaces", 8 };
 	const pj_str_t STR_TIMER = { "timer", 5 };
 	const pj_str_t STR_ICE = { "ice", 3 };
+	const pj_str_t STR_TRICKLE_ICE = { "trickle-ice", 11 };
 	unsigned unsupp_cnt = 0;
 	pj_str_t unsupp_tags[PJSIP_GENERIC_ARRAY_MAX_COUNT];
 	
@@ -1317,6 +1448,11 @@
 	    {
 		rem_option |= PJSIP_INV_REQUIRE_ICE;
 
+	    } else if ((*options & PJSIP_INV_SUPPORT_TRICKLE_ICE) &&
+		pj_stricmp(&req_hdr->values[i], &STR_TRICKLE_ICE)==0)
+	    {
+		rem_option |= PJSIP_INV_REQUIRE_TRICKLE_ICE;
+
 	    } else if (!pjsip_endpt_has_capability(endpt, PJSIP_H_SUPPORTED,
 						   NULL, &req_hdr->values[i]))
 	    {
@@ -1364,9 +1500,11 @@
      * by peer.
      */
     if ( msg && (((*options & PJSIP_INV_REQUIRE_100REL)!=0 && 
-	  (rem_option & PJSIP_INV_SUPPORT_100REL)==0) ||
-	 ((*options & PJSIP_INV_REQUIRE_TIMER)!=0 && 
-	  (rem_option & PJSIP_INV_SUPPORT_TIMER)==0)))
+                  (rem_option & PJSIP_INV_SUPPORT_100REL)==0) ||
+                 ((*options & PJSIP_INV_REQUIRE_TIMER)!=0 && 
+                  (rem_option & PJSIP_INV_SUPPORT_TIMER)==0) ||
+                 ((*options & PJSIP_INV_REQUIRE_TRICKLE_ICE)!=0 && 
+                  (rem_option & PJSIP_INV_SUPPORT_TRICKLE_ICE)==0)))
     {
 	code = PJSIP_SC_EXTENSION_REQUIRED;
 	status = PJSIP_ERRNO_FROM_SIP_STATUS(code);
@@ -1382,6 +1520,8 @@
 		req_hdr->values[req_hdr->count++] = pj_str("100rel");
 	    if (*options & PJSIP_INV_REQUIRE_TIMER)
 		req_hdr->values[req_hdr->count++] = pj_str("timer");
+	    if (*options & PJSIP_INV_REQUIRE_TRICKLE_ICE)
+		req_hdr->values[req_hdr->count++] = pj_str("trickle-ice");
 
 	    pj_list_push_back(&res_hdr_list, req_hdr);
 
@@ -1411,6 +1551,10 @@
 	    pj_assert(*options & PJSIP_INV_SUPPORT_TIMER);
 	    *options |= PJSIP_INV_REQUIRE_TIMER;
     }
+    if (rem_option & PJSIP_INV_REQUIRE_TRICKLE_ICE) {
+	    pj_assert(*options & PJSIP_INV_SUPPORT_TRICKLE_ICE);
+	    *options |= PJSIP_INV_REQUIRE_TRICKLE_ICE;
+    }
 
 on_return:
 
@@ -1730,13 +1874,55 @@
     return PJ_SUCCESS;
 }
 
+static pjsip_multipart_part* create_sdp_part(pj_pool_t *pool, pjmedia_sdp_session *sdp)
+{
+    pjsip_multipart_part *sdp_part;
+    pjsip_media_type media_type;
+
+    pjsip_media_type_init2(&media_type, "application", "sdp");
+
+    sdp_part = pjsip_multipart_create_part(pool);
+    PJ_ASSERT_RETURN(sdp_part != NULL, NULL);
+
+    sdp_part->body = PJ_POOL_ZALLOC_T(pool, pjsip_msg_body);
+    PJ_ASSERT_RETURN(sdp_part->body != NULL, NULL);
+
+    pjsip_media_type_cp(pool, &sdp_part->body->content_type, &media_type);
+
+    sdp_part->body->data = sdp;
+    sdp_part->body->clone_data = clone_sdp;
+    sdp_part->body->print_body = print_sdp;
+
+    return sdp_part;
+}
+
+PJ_DEF(pj_status_t) pjsip_create_multipart_sdp_body(pj_pool_t *pool,
+						     pjmedia_sdp_session *sdp,
+						     pjsip_msg_body **p_body)
+{
+    pjsip_media_type media_type;
+    pjsip_msg_body *multipart;
+    pjsip_multipart_part *sdp_part;
+
+    pjsip_media_type_init2(&media_type, "multipart", "mixed");
+    multipart = pjsip_multipart_create(pool, &media_type, NULL);
+    PJ_ASSERT_RETURN(multipart != NULL, PJ_ENOMEM);
+
+    sdp_part = create_sdp_part(pool, sdp);
+    PJ_ASSERT_RETURN(sdp_part != NULL, PJ_ENOMEM);
+    pjsip_multipart_add_part(pool, multipart, sdp_part);
+    *p_body = multipart;
+
+    return PJ_SUCCESS;
+}
+
 static pjsip_msg_body *create_sdp_body(pj_pool_t *pool,
 				       const pjmedia_sdp_session *c_sdp)
 {
     pjsip_msg_body *body;
     pj_status_t status;
 
-    status = pjsip_create_sdp_body(pool, 
+    status = pjsip_create_sdp_body(pool,
 				   pjmedia_sdp_session_clone(pool, c_sdp),
 				   &body);
 
@@ -1772,7 +1958,8 @@
 {
     /* If all extensions are enabled, nothing to do */
     if ((inv_option & PJSIP_INV_SUPPORT_100REL) &&
-	(inv_option & PJSIP_INV_SUPPORT_TIMER))
+	(inv_option & PJSIP_INV_SUPPORT_TIMER) &&
+	(inv_option & PJSIP_INV_SUPPORT_TRICKLE_ICE))
     {
 	return;
     }
@@ -1796,6 +1983,11 @@
 	remove_val_from_array_hdr(sup_hdr, &STR_TIMER);
     }
 
+    if ((inv_option & PJSIP_INV_SUPPORT_TRICKLE_ICE) == 0 && sup_hdr) {
+	const pj_str_t STR_TRICKLE_ICE = { "trickle-ice", 11 };
+	remove_val_from_array_hdr(sup_hdr, &STR_TRICKLE_ICE);
+    }
+
     if ((inv_option & PJSIP_INV_SUPPORT_100REL) == 0) {
 	const pj_str_t STR_PRACK  = { "PRACK", 5 };
 	const pj_str_t STR_100REL = { "100rel", 6 };
@@ -1903,7 +2095,8 @@
 
     /* Add Require header. */
     if ((inv->options & PJSIP_INV_REQUIRE_100REL) ||
-	(inv->options & PJSIP_INV_REQUIRE_TIMER)) 
+	(inv->options & PJSIP_INV_REQUIRE_TIMER) ||
+	(inv->options & PJSIP_INV_REQUIRE_TRICKLE_ICE))
     {
 	pjsip_require_hdr *hreq;
 
@@ -1913,6 +2106,8 @@
 	    hreq->values[hreq->count++] = pj_str("100rel");
 	if (inv->options & PJSIP_INV_REQUIRE_TIMER)
 	    hreq->values[hreq->count++] = pj_str("timer");
+	if (inv->options & PJSIP_INV_REQUIRE_TRICKLE_ICE)
+	    hreq->values[hreq->count++] = pj_str("trickle-ice");
 
 	pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*) hreq);
     }
@@ -2006,6 +2201,14 @@
 	return PJMEDIA_SDP_EINSDP;
     }
 
+    /* Process the SDP body. */
+    if (sdp_info->sdp_err) {
+        PJ_PERROR(4,(THIS_FILE, sdp_info->sdp_err,
+             "Error parsing SDP in %s",
+             pjsip_rx_data_get_info(rdata)));
+        return PJMEDIA_SDP_EINSDP;
+    }
+
     /* Get/attach invite session's transaction data */
     tsx_inv_data = (struct tsx_inv_data*) tsx->mod_data[mod_inv.mod.id];
     if (tsx_inv_data == NULL) {
@@ -2059,22 +2262,33 @@
 	       )
 	   )
 	{
+	    pjsip_sdp_info *tdata_sdp_info;
 	    const pjmedia_sdp_session *reoffer_sdp = NULL;
 
+	    if (pjmedia_sdp_neg_get_state(inv->neg) !=
+	    	PJMEDIA_SDP_NEG_STATE_DONE)
+	    {
+	    	PJ_LOG(4,(inv->obj_name, "SDP negotiation in progress, "
+	    		  "message body in %s response is ignored",
+		          (st_code/10==18? "early" : "final" )));
+	    	return PJ_SUCCESS;
+	    }
+
 	    PJ_LOG(4,(inv->obj_name, "Received %s response "
 		      "after SDP negotiation has been done in early "
 		      "media. Renegotiating SDP..",
 		      (st_code/10==18? "early" : "final" )));
 
 	    /* Retrieve original SDP offer from INVITE request */
-	    reoffer_sdp = (const pjmedia_sdp_session*) 
-			  tsx->last_tx->msg->body->data;
+	    tdata_sdp_info = pjsip_tdata_get_sdp_info(tsx->last_tx);
+	    reoffer_sdp = tdata_sdp_info->sdp;
 
 	    /* Feed the original offer to negotiator */
 	    status = pjmedia_sdp_neg_modify_local_offer2(inv->pool_prov, 
 							 inv->neg,
                                                          inv->sdp_neg_flags,
 						         reoffer_sdp);
+
 	    if (status != PJ_SUCCESS) {
 		PJ_LOG(1,(inv->obj_name, "Error updating local offer for "
 			  "forked 2xx/18x response (err=%d)", status));
@@ -2095,14 +2309,6 @@
 	}
     }
 
-    /* Process the SDP body. */
-    if (sdp_info->sdp_err) {
-	PJ_PERROR(4,(THIS_FILE, sdp_info->sdp_err,
-		     "Error parsing SDP in %s",
-		     pjsip_rx_data_get_info(rdata)));
-	return PJMEDIA_SDP_EINSDP;
-    }
-
     pj_assert(sdp_info->sdp != NULL);
 
     /* The SDP can be an offer or answer, depending on negotiator's state */
@@ -2422,14 +2628,13 @@
     status = pjsip_tx_data_clone(inv->last_answer, 0, &last_res);
     if (status != PJ_SUCCESS)
 	goto on_return;
-    old_res = inv->last_answer;
-    inv->last_answer = last_res;
-    pjsip_tx_data_dec_ref(old_res);
 
     /* Modify last response. */
     status = pjsip_dlg_modify_response(inv->dlg, last_res, st_code, st_text);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+	pjsip_tx_data_dec_ref(last_res);
 	goto on_return;
+    }
 
     /* For non-2xx final response, strip message body */
     if (st_code >= 300) {
@@ -2449,6 +2654,13 @@
     /* Cleanup Allow & Supported headers from disabled extensions */
     cleanup_allow_sup_hdr(inv->options, last_res, NULL, NULL);
 
+    /* Update last_answer */
+    old_res = inv->last_answer;
+    inv->last_answer = last_res;
+
+    /* Release old answer */
+    pjsip_tx_data_dec_ref(old_res);
+
     *p_tdata = last_res;
 
 on_return:
@@ -2535,6 +2747,7 @@
 
     /* Create appropriate message. */
     switch (inv->state) {
+    case PJSIP_INV_STATE_NULL:
     case PJSIP_INV_STATE_CALLING:
     case PJSIP_INV_STATE_EARLY:
     case PJSIP_INV_STATE_INCOMING:
@@ -2586,6 +2799,9 @@
 
 	    /* For UAS, send a final response. */
 	    tdata = inv->invite_tsx->last_tx;
+	    if (tdata == NULL)
+		tdata = inv->last_answer;
+
 	    PJ_ASSERT_RETURN(tdata != NULL, PJ_EINVALIDOP);
 
 	    //status = pjsip_dlg_modify_response(inv->dlg, tdata, st_code,
@@ -3257,6 +3473,33 @@
 	    goto on_error;
 	}
 
+	/* Check if this is delayed manual ACK (see #416) */
+	if (mod_inv.cb.on_send_ack &&
+	    tdata->msg->line.req.method.id == PJSIP_ACK_METHOD &&
+	    tdata == inv->last_ack)
+	{
+	    pjsip_dlg_inc_lock(inv->dlg);
+
+	    /* Set state to CONFIRMED (if we're not in CONFIRMED yet).
+	     * But don't set it to CONFIRMED if we're already DISCONNECTED
+	     * (this may have been a late 200/OK response.
+	     */
+	    if (inv->state < PJSIP_INV_STATE_CONFIRMED) {
+		pjsip_event ack_e;
+		PJSIP_EVENT_INIT_TX_MSG(ack_e, inv->last_ack);
+		inv_set_state(inv, PJSIP_INV_STATE_CONFIRMED, &ack_e);
+	    } else if (inv->state == PJSIP_INV_STATE_DISCONNECTED) {
+		/* Avoid possible leaked tdata when invite session is
+		 * already destroyed.
+		 * https://github.com/pjsip/pjproject/pull/2432
+		 */
+		pjsip_tx_data_dec_ref(inv->last_ack);
+		inv->last_ack = NULL;
+	    }
+
+	    pjsip_dlg_dec_lock(inv->dlg);
+	}
+
     } else {
 	pjsip_cseq_hdr *cseq;
 
@@ -3976,8 +4219,8 @@
     if (inv->state != PJSIP_INV_STATE_DISCONNECTED &&
 	((tsx->status_code == PJSIP_SC_CALL_TSX_DOES_NOT_EXIST &&
 	    tsx->method.id != PJSIP_CANCEL_METHOD) ||
-	 tsx->status_code == PJSIP_SC_REQUEST_TIMEOUT ||
-	 tsx->status_code == PJSIP_SC_TSX_TIMEOUT))
+	 (tsx->status_code == PJSIP_SC_REQUEST_TIMEOUT &&
+	  !pjsip_cfg()->endpt.keep_inv_after_tsx_timeout)))
     {
 	pjsip_tx_data *bye;
 	pj_status_t status;
@@ -4044,14 +4287,7 @@
 	return PJ_TRUE;	/* Handled */
 
     } 
-    /* Process 502/503 error */
-    else if ((tsx->state == PJSIP_TSX_STATE_TERMINATED) &&
-	     (tsx->status_code == 503 || tsx->status_code == 502))
-    {
-	pjsip_timer_handle_refresh_error(inv, e);
 
-	return PJ_TRUE;
-    }    
     else {
 	return PJ_FALSE; /* Unhandled */
     }
@@ -5207,6 +5443,11 @@
 
 	    if (tsx == inv->invite_tsx)
 		inv->invite_tsx = NULL;
+
+	    /* Process 502/503 error for session timer refresh */
+	    if (tsx->status_code == 503 || tsx->status_code == 502) {
+		pjsip_timer_handle_refresh_error(inv, e);
+	    }
 	}
 
     } else if (tsx->role == PJSIP_ROLE_UAS &&
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_reg.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_reg.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_reg.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_reg.c	2022-02-24 07:54:38.000000000 +0000
@@ -165,12 +165,21 @@
     return PJ_SUCCESS;
 }
 
-
 PJ_DEF(pj_status_t) pjsip_regc_destroy(pjsip_regc *regc)
 {
+    return pjsip_regc_destroy2(regc, PJ_TRUE);
+}
+
+PJ_DEF(pj_status_t) pjsip_regc_destroy2(pjsip_regc *regc, pj_bool_t force)
+{
     PJ_ASSERT_RETURN(regc, PJ_EINVAL);
 
     pj_lock_acquire(regc->lock);
+    if (!force && regc->has_tsx) {
+    	pj_lock_release(regc->lock);
+    	return PJ_EBUSY;
+    }
+
     if (regc->has_tsx || pj_atomic_get(regc->busy_ctr) != 0) {
 	regc->_delete_flag = 1;
 	regc->cb = NULL;
@@ -1350,6 +1359,28 @@
 						       PJSIP_REGC_MAX_CONTACT,
 						       contact);
 
+#if PJSIP_REGISTER_ALLOW_EXP_REFRESH
+	    if (expiration == 0 && regc->current_op != REGC_UNREGISTERING) {
+		/* Response contain expires contact param 0, allow client to
+		 * continue refresh registration.
+		 * Refer to: https://github.com/pjsip/pjproject/pull/2809
+		 */
+		const pjsip_msg *msg = rdata->msg_info.msg;
+		const pjsip_expires_hdr *expires;
+		expires = (const pjsip_expires_hdr*) pjsip_msg_find_hdr(msg, 
+							PJSIP_H_EXPIRES, NULL);
+
+		if (expires) {
+		    expiration = expires->ivalue;
+		} else if (regc->expires_hdr && regc->expires_hdr->ivalue) {
+		    expiration = regc->expires_hdr->ivalue;
+		} else {
+		    expiration = 3600;
+		}
+		PJ_LOG(4, (THIS_FILE, "Modify response's expiration from 0 "
+			   "to %d", expiration));
+	    }
+#endif
 	    /* Schedule next registration */
             schedule_registration(regc, expiration);
 
@@ -1390,7 +1421,7 @@
     pj_status_t status;
     pjsip_cseq_hdr *cseq_hdr;
     pjsip_expires_hdr *expires_hdr;
-    pj_uint32_t cseq;
+    pj_int32_t cseq;
 
     pjsip_regc_add_ref(regc);
     pj_lock_acquire(regc->lock);
@@ -1460,18 +1491,23 @@
     /* Now send the message */
     status = pjsip_endpt_send_request(regc->endpt, tdata, REGC_TSX_TIMEOUT,
 				      regc, &regc_tsx_callback);
+ 
+     /* Reacquire the lock */
+    pj_lock_acquire(regc->lock);
+
     if (status!=PJ_SUCCESS) {
 	/* On failure, regc_tsx_callback() may not be called, so we need
 	 * to reset regc->has_tsx here (see also ticket #1936).
+	 * But note that we are releasing the lock when sending the request
+	 * above, so there can be a race with another registration send.
 	 */
-	regc->has_tsx = PJ_FALSE;
+	if (cseq == regc->cseq_hdr->cseq) {
+	    regc->has_tsx = PJ_FALSE;
+	}
 
 	PJ_PERROR(4,(THIS_FILE, status, "Error sending request"));
     }
 
-    /* Reacquire the lock */
-    pj_lock_acquire(regc->lock);
-
     /* Get last transport used and add reference to it */
     if (tdata->tp_info.transport != regc->last_transport &&
 	status==PJ_SUCCESS)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_timer.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_timer.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_timer.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsip-ua/sip_timer.c	2022-02-24 07:54:38.000000000 +0000
@@ -385,6 +385,11 @@
 	    pjsip_endpt_schedule_timer(inv->dlg->endpt, &inv->timer->timer,
 				       &delay);
 	    pjsip_dlg_dec_lock(inv->dlg);
+
+	    PJ_LOG(3, (obj_name,
+		       "Reschedule refresh request after %d seconds as "
+		       "there is another SDP negotiation in progress",
+		       delay.sec));
 	    return;
 	}
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2/account.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2/account.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2/account.cpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2/account.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -76,7 +76,7 @@
 
     pj_bzero(&setting, sizeof(setting));
     setting.dont_use_avpf   = this->dontUseAvpf;
-    setting.cap_count	    = this->caps.size();
+    setting.cap_count	    = (unsigned)this->caps.size();
     for (unsigned i = 0; i < setting.cap_count; ++i) {
 	setting.caps[i] = this->caps[i].toPj();
     }
@@ -166,12 +166,12 @@
 
     pj_bzero(&opt, sizeof(opt));
 
-    opt.crypto_count = this->cryptos.size();
+    opt.crypto_count = (unsigned)this->cryptos.size();
     for (unsigned i = 0; i < opt.crypto_count; ++i) {
 	opt.crypto[i] = this->cryptos[i].toPj();
     }
 
-    opt.keying_count = this->keyings.size();
+    opt.keying_count = (unsigned)this->keyings.size();
     for (unsigned i = 0; i < opt.keying_count; ++i) {
 	opt.keying[i] = (pjmedia_srtp_keying_method)this->keyings[i];
     }
@@ -389,6 +389,7 @@
     NODE_READ_NUM_T   ( this_node, pjsua_stun_use, mediaStunUse);
     NODE_READ_NUM_T   ( this_node, pjsua_nat64_opt, nat64Opt);
     NODE_READ_BOOL    ( this_node, iceEnabled);
+    NODE_READ_NUM_T   ( this_node, pj_ice_sess_trickle, iceTrickle);
     NODE_READ_INT     ( this_node, iceMaxHostCands);
     NODE_READ_BOOL    ( this_node, iceAggressiveNomination);
     NODE_READ_UNSIGNED( this_node, iceNominatedCheckDelayMsec);
@@ -422,6 +423,7 @@
     NODE_WRITE_NUM_T   ( this_node, pjsua_stun_use, mediaStunUse);
     NODE_WRITE_NUM_T   ( this_node, pjsua_nat64_opt, nat64Opt);
     NODE_WRITE_BOOL    ( this_node, iceEnabled);
+    NODE_WRITE_NUM_T   ( this_node, pj_ice_sess_trickle, iceTrickle);
     NODE_WRITE_INT     ( this_node, iceMaxHostCands);
     NODE_WRITE_BOOL    ( this_node, iceAggressiveNomination);
     NODE_WRITE_UNSIGNED( this_node, iceNominatedCheckDelayMsec);
@@ -461,6 +463,8 @@
     NODE_READ_NUM_T   ( this_node, pjsua_ipv6_use, ipv6Use);
     NODE_READ_OBJ     ( this_node, transportConfig);
     NODE_READ_BOOL    ( this_node, rtcpMuxEnabled);
+    NODE_READ_BOOL    ( this_node, useLoopMedTp);
+    NODE_READ_BOOL    ( this_node, enableLoopback);
 }
 
 void AccountMediaConfig::writeObject(ContainerNode &node) const
@@ -476,6 +480,8 @@
     NODE_WRITE_NUM_T   ( this_node, pjsua_ipv6_use, ipv6Use);
     NODE_WRITE_OBJ     ( this_node, transportConfig);
     NODE_WRITE_BOOL    ( this_node, rtcpMuxEnabled);
+    NODE_WRITE_BOOL    ( this_node, useLoopMedTp);
+    NODE_WRITE_BOOL    ( this_node, enableLoopback);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -573,6 +579,7 @@
     ret.unreg_timeout		= regConfig.unregWaitMsec;
     ret.reg_use_proxy		= regConfig.proxyUse;
     ret.reg_contact_params	= str2Pj(regConfig.contactParams);
+    ret.reg_contact_uri_params	= str2Pj(regConfig.contactUriParams);
     for (i=0; i<regConfig.headers.size(); ++i) {
 	pj_list_push_back(&ret.reg_hdr_list, &regConfig.headers[i].toPj());
     }
@@ -635,6 +642,7 @@
     ret.nat64_opt		= natConfig.nat64Opt;
     ret.ice_cfg_use		= PJSUA_ICE_CONFIG_USE_CUSTOM;
     ret.ice_cfg.enable_ice	= natConfig.iceEnabled;
+    ret.ice_cfg.ice_opt.trickle	= natConfig.iceTrickle;
     ret.ice_cfg.ice_max_host_cands = natConfig.iceMaxHostCands;
     ret.ice_cfg.ice_opt.aggressive = natConfig.iceAggressiveNomination;
     ret.ice_cfg.ice_opt.nominated_check_delay =
@@ -681,6 +689,8 @@
     ret.ipv6_media_use		= mediaConfig.ipv6Use;
     ret.enable_rtcp_mux		= mediaConfig.rtcpMuxEnabled;
     ret.rtcp_fb_cfg		= mediaConfig.rtcpFbConfig.toPj();
+    ret.use_loop_med_tp		= mediaConfig.useLoopMedTp;
+    ret.enable_loopback		= mediaConfig.enableLoopback;
 
     // AccountVideoConfig
     ret.vid_in_auto_show	= videoConfig.autoShowIncoming;
@@ -722,6 +732,7 @@
     regConfig.unregWaitMsec	= prm.unreg_timeout;
     regConfig.proxyUse		= prm.reg_use_proxy;
     regConfig.contactParams	= pj2Str(prm.reg_contact_params);
+    regConfig.contactUriParams	= pj2Str(prm.reg_contact_uri_params);
     regConfig.headers.clear();
     hdr = prm.reg_hdr_list.next;
     while (hdr != &prm.reg_hdr_list) {
@@ -792,6 +803,7 @@
     natConfig.nat64Opt		= prm.nat64_opt;
     if (prm.ice_cfg_use == PJSUA_ICE_CONFIG_USE_CUSTOM) {
 	natConfig.iceEnabled = PJ2BOOL(prm.ice_cfg.enable_ice);
+	natConfig.iceTrickle = prm.ice_cfg.ice_opt.trickle;
 	natConfig.iceMaxHostCands = prm.ice_cfg.ice_max_host_cands;
 	natConfig.iceAggressiveNomination =
 			PJ2BOOL(prm.ice_cfg.ice_opt.aggressive);
@@ -869,6 +881,8 @@
     mediaConfig.ipv6Use		= prm.ipv6_media_use;
     mediaConfig.rtcpMuxEnabled	= PJ2BOOL(prm.enable_rtcp_mux);
     mediaConfig.rtcpFbConfig.fromPj(prm.rtcp_fb_cfg);
+    mediaConfig.useLoopMedTp	= PJ2BOOL(prm.use_loop_med_tp);
+    mediaConfig.enableLoopback	= PJ2BOOL(prm.enable_loopback);
 
     // AccountVideoConfig
     videoConfig.autoShowIncoming 	= PJ2BOOL(prm.vid_in_auto_show);
@@ -960,6 +974,11 @@
     pjsua_acc_config pj_acc_cfg;
     
     acc_cfg.toPj(pj_acc_cfg);
+
+    for (unsigned i = 0; i < pj_acc_cfg.cred_count; ++i) {
+	    pjsip_cred_info *dst = &pj_acc_cfg.cred_info[i];
+	    dst->ext.aka.cb = (pjsip_cred_cb)Endpoint::on_auth_create_aka_response_callback;
+    }
     pj_acc_cfg.user_data = (void*)this;
     PJSUA2_CHECK_EXPR( pjsua_acc_add(&pj_acc_cfg, make_default, &id) );
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2/call.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2/call.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2/call.cpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2/call.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -31,6 +31,9 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
+/* Avoid conflict with predefined standard macros. */
+#undef max
+#undef min
 
 MathStat::MathStat()
 : n(0), max(0), min(0), last(0), mean(0)
@@ -225,20 +228,39 @@
 
 void CallSetting::fromPj(const pjsua_call_setting &prm)
 {
+    int i, mi;
+
     this->flag              = prm.flag;
     this->reqKeyframeMethod = prm.req_keyframe_method;
     this->audioCount        = prm.aud_cnt;
     this->videoCount        = prm.vid_cnt;
+    this->mediaDir.clear();
+    /* Since we don't know the size of media_dir array, we populate
+     * mediaDir vector up to the element with non-default value.
+     */
+    for (mi = PJMEDIA_MAX_SDP_MEDIA - 1; mi >= 0; mi--) {
+    	if (prm.media_dir[mi] != PJMEDIA_DIR_ENCODING_DECODING) break;
+    }
+    for (i = 0; i <= mi; i++) {
+    	this->mediaDir.push_back(prm.media_dir[i]);
+    }
 }
 
 pjsua_call_setting CallSetting::toPj() const
 {
     pjsua_call_setting setting;
+    unsigned mi;
+
+    /* This is important to initialize media_dir array. */
+    pjsua_call_setting_default(&setting);
 
     setting.flag                = this->flag;
     setting.req_keyframe_method = this->reqKeyframeMethod;
     setting.aud_cnt             = this->audioCount;
     setting.vid_cnt             = this->videoCount;
+    for (mi = 0; mi < this->mediaDir.size(); mi++) {
+	setting.media_dir[mi] = (pjmedia_dir)this->mediaDir[mi];
+    }
     
     return setting;
 }
@@ -324,6 +346,15 @@
         codecName = pj2Str(info.info.aud.fmt.encoding_name);
         codecClockRate = info.info.aud.fmt.clock_rate;
         audCodecParam.fromPj(*info.info.aud.param);
+        jbInit = info.info.aud.jb_init;
+        jbMinPre = info.info.aud.jb_min_pre;
+        jbMaxPre = info.info.aud.jb_max_pre;
+        jbMax = info.info.aud.jb_max;
+        jbDiscardAlgo = info.info.aud.jb_discard_algo;
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && (PJMEDIA_STREAM_ENABLE_KA != 0)
+        useKa = PJ2BOOL(info.info.aud.use_ka);
+#endif
+        rtcpSdesByeDisabled = PJ2BOOL(info.info.aud.rtcp_sdes_bye_disabled);
     } else if (type == PJMEDIA_TYPE_VIDEO) {
         proto = info.info.vid.proto;
         dir = info.info.vid.dir;
@@ -334,8 +365,17 @@
         txPt = info.info.vid.tx_pt;
         rxPt = info.info.vid.rx_pt;
         codecName = pj2Str(info.info.vid.codec_info.encoding_name);
-        codecClockRate = info.info.vid.codec_info.clock_rate;        
-	vidCodecParam.fromPj(*info.info.vid.codec_param);
+        codecClockRate = info.info.vid.codec_info.clock_rate;
+        vidCodecParam.fromPj(*info.info.vid.codec_param);
+        jbInit = info.info.vid.jb_init;
+        jbMinPre = info.info.vid.jb_min_pre;
+        jbMaxPre = info.info.vid.jb_max_pre;
+        jbMax = info.info.vid.jb_max;
+        jbDiscardAlgo = PJMEDIA_JB_DISCARD_NONE;
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && (PJMEDIA_STREAM_ENABLE_KA != 0)
+        useKa = PJ2BOOL(info.info.vid.use_ka);
+#endif
+        rtcpSdesByeDisabled = PJ2BOOL(info.info.vid.rtcp_sdes_bye_disabled);
     }
 }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2/endpoint.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2/endpoint.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2/endpoint.cpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2/endpoint.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -60,13 +60,21 @@
     pj_ssl_sock_info *ssock_info = info.ssl_sock_info;
     char straddr[PJ_INET6_ADDRSTRLEN+10];
     const char *verif_msgs[32];
+    const char *cipher_name;
     unsigned verif_msg_cnt;
     
     empty	= false;
     established = PJ2BOOL(ssock_info->established);
     protocol 	= ssock_info->proto;
     cipher 	= ssock_info->cipher;
-    cipherName	= pj_ssl_cipher_name(ssock_info->cipher);
+    cipher_name = pj_ssl_cipher_name(ssock_info->cipher);
+    if (cipher_name) {
+	cipherName = cipher_name;
+    } else {
+	char tmp[32];
+	pj_ansi_snprintf(tmp, sizeof(tmp), "Cipher 0x%x", cipher);
+	cipherName = tmp;
+    }
     pj_sockaddr_print(&ssock_info->local_addr, straddr, sizeof(straddr), 3);
     localAddr 	= straddr;
     pj_sockaddr_print(&ssock_info->remote_addr, straddr, sizeof(straddr),3);
@@ -121,6 +129,86 @@
     }
 }
 
+void DigestCredential::fromPj(const pjsip_digest_credential &prm)
+{
+    realm = pj2Str(prm.realm);
+    pjsip_param *p = (pjsip_param*)prm.other_param.next;
+    while (p != &prm.other_param) {
+       otherParam[pj2Str(p->name)] = pj2Str(p->value);
+    p = p->next;
+    }
+    username = pj2Str(prm.username);
+    nonce = pj2Str(prm.nonce);
+    uri = pj2Str(prm.uri);
+    response = pj2Str(prm.response);
+    algorithm = pj2Str(prm.algorithm);
+    cnonce = pj2Str(prm.cnonce);
+    opaque = pj2Str(prm.opaque);
+    qop = pj2Str(prm.qop);
+    nc = pj2Str(prm.nc);
+}
+
+pjsip_digest_credential DigestCredential::toPj() const
+{
+    pjsip_digest_credential credentials;
+    pj_list_init(&credentials.other_param);
+    credentials.realm = str2Pj(realm);
+    credentials.username = str2Pj(username);
+    for (std::map<std::string, std::string>::const_iterator it = otherParam.begin(); 
+           it != otherParam.end(); ++it) {
+        pjsip_param other_param;
+        other_param.name = str2Pj(it->first);
+        other_param.value = str2Pj(it->second);
+        pj_list_push_back(&credentials.other_param, &other_param);
+    }
+    credentials.nonce = str2Pj(nonce);
+    credentials.uri = str2Pj(uri);
+    credentials.response = str2Pj(response);
+    credentials.algorithm = str2Pj(algorithm);
+    credentials.cnonce = str2Pj(cnonce);
+    credentials.opaque = str2Pj(opaque);
+    credentials.qop = str2Pj(qop);
+    credentials.nc = str2Pj(nc);
+    return credentials;
+}
+
+void DigestChallenge::fromPj(const pjsip_digest_challenge &prm)
+{
+    realm = pj2Str(prm.realm);
+    pjsip_param *p = (pjsip_param*)prm.other_param.next;
+    while (p != &prm.other_param) {
+        otherParam[pj2Str(p->name)] = pj2Str(p->value);
+        p = p->next;
+    }
+    domain = pj2Str(prm.domain);
+    nonce = pj2Str(prm.nonce);
+    opaque = pj2Str(prm.opaque);
+    stale = prm.stale;
+    algorithm = pj2Str(prm.algorithm);
+    qop = pj2Str(prm.qop);
+}
+
+pjsip_digest_challenge DigestChallenge::toPj() const
+{
+    pjsip_digest_challenge challenge;
+    pj_list_init(&challenge.other_param);
+    challenge.realm = str2Pj(realm);
+    challenge.domain = str2Pj(domain);
+    for (std::map<std::string, std::string>::const_iterator it = otherParam.begin(); 
+           it != otherParam.end(); ++it) {
+        pjsip_param other_param;
+        other_param.name = str2Pj(it->first);
+        other_param.value = str2Pj(it->second);
+        pj_list_push_back(&challenge.other_param, &other_param);
+    }
+    challenge.nonce = str2Pj(nonce);
+    challenge.opaque = str2Pj(opaque);
+    challenge.stale = stale;
+    challenge.algorithm = str2Pj(algorithm);
+    challenge.qop = str2Pj(qop);
+    return challenge;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 IpChangeParam::IpChangeParam()
 {
@@ -349,6 +437,7 @@
     this->jbMinPre = mc.jb_min_pre;
     this->jbMaxPre = mc.jb_max_pre;
     this->jbMax = mc.jb_max;
+    this->jbDiscardAlgo = mc.jb_discard_algo;
     this->sndAutoCloseTime = mc.snd_auto_close_time;
     this->vidPreviewEnableNative = PJ2BOOL(mc.vid_preview_enable_native);
 }
@@ -380,6 +469,7 @@
     mcfg.jb_min_pre = this->jbMinPre;
     mcfg.jb_max_pre = this->jbMaxPre;
     mcfg.jb_max = this->jbMax;
+    mcfg.jb_discard_algo = this->jbDiscardAlgo;
     mcfg.snd_auto_close_time = this->sndAutoCloseTime;
     mcfg.vid_preview_enable_native = this->vidPreviewEnableNative;
 
@@ -411,6 +501,7 @@
     NODE_READ_INT     ( this_node, jbMinPre);
     NODE_READ_INT     ( this_node, jbMaxPre);
     NODE_READ_INT     ( this_node, jbMax);
+    NODE_READ_NUM_T   ( this_node, pjmedia_jb_discard_algo, jbDiscardAlgo);
     NODE_READ_INT     ( this_node, sndAutoCloseTime);
     NODE_READ_BOOL    ( this_node, vidPreviewEnableNative);
 }
@@ -440,6 +531,7 @@
     NODE_WRITE_INT     ( this_node, jbMinPre);
     NODE_WRITE_INT     ( this_node, jbMaxPre);
     NODE_WRITE_INT     ( this_node, jbMax);
+    NODE_WRITE_NUM_T   ( this_node, pjmedia_jb_discard_algo, jbDiscardAlgo);
     NODE_WRITE_INT     ( this_node, sndAutoCloseTime);
     NODE_WRITE_BOOL    ( this_node, vidPreviewEnableNative);
 }
@@ -571,6 +663,12 @@
     }
 }
 
+pj_status_t Endpoint::onCredAuth(OnCredAuthParam &prm)
+{
+    PJ_UNUSED_ARG(prm);
+    return PJ_ENOTSUP;
+}
+
 /* Run pending jobs only in main thread */
 void Endpoint::performPendingJobs()
 {
@@ -1094,6 +1192,45 @@
     }
 }
 
+void Endpoint::on_stream_precreate(pjsua_call_id call_id,
+                                   pjsua_on_stream_precreate_param *param)
+{
+    Call *call = Call::lookup(call_id);
+    if (!call) {
+        return;
+    }
+
+    OnStreamPreCreateParam prm;
+    prm.streamIdx = param->stream_idx;
+    prm.streamInfo.fromPj(param->stream_info);
+
+    call->onStreamPreCreate(prm);
+
+    /* Copy back only the fields which are allowed to be changed. */
+    if (param->stream_info.type == PJMEDIA_TYPE_AUDIO) {
+	param->stream_info.info.aud.jb_init = prm.streamInfo.jbInit;
+	param->stream_info.info.aud.jb_min_pre = prm.streamInfo.jbMinPre;
+	param->stream_info.info.aud.jb_max_pre = prm.streamInfo.jbMaxPre;
+	param->stream_info.info.aud.jb_max = prm.streamInfo.jbMax;
+	param->stream_info.info.aud.jb_discard_algo = prm.streamInfo.jbDiscardAlgo;
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && (PJMEDIA_STREAM_ENABLE_KA != 0)
+	param->stream_info.info.aud.use_ka = prm.streamInfo.useKa;
+#endif
+	param->stream_info.info.aud.rtcp_sdes_bye_disabled = prm.streamInfo.rtcpSdesByeDisabled;
+    } else if (param->stream_info.type == PJMEDIA_TYPE_VIDEO) {
+	param->stream_info.info.vid.jb_init = prm.streamInfo.jbInit;
+	param->stream_info.info.vid.jb_min_pre = prm.streamInfo.jbMinPre;
+	param->stream_info.info.vid.jb_max_pre = prm.streamInfo.jbMaxPre;
+	param->stream_info.info.vid.jb_max = prm.streamInfo.jbMax;
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && (PJMEDIA_STREAM_ENABLE_KA != 0)
+	param->stream_info.info.vid.use_ka = prm.streamInfo.useKa;
+#endif
+	param->stream_info.info.vid.rtcp_sdes_bye_disabled = prm.streamInfo.rtcpSdesByeDisabled;
+	param->stream_info.info.vid.codec_param->enc_fmt = prm.streamInfo.vidCodecParam.encFmt.toPj();
+
+    }
+}
+
 void Endpoint::on_stream_created2(pjsua_call_id call_id,
 				  pjsua_on_stream_created_param *param)
 {
@@ -1185,6 +1322,60 @@
     Endpoint::instance().utilAddPendingJob(job);
 }
 
+struct PendingOnDtmfEventCallback : public PendingJob
+{
+    int call_id;
+    OnDtmfEventParam prm;
+
+    virtual void execute(bool is_pending)
+    {
+        PJ_UNUSED_ARG(is_pending);
+
+        Call *call = Call::lookup(call_id);
+        if (!call)
+            return;
+
+        call->onDtmfEvent(prm);
+
+        /* If this event indicates a new DTMF digit, invoke onDtmfDigit
+         * as well.
+         * Note that the duration is pretty much useless in this context as it
+         * will most likely equal the ptime of one frame received via RTP in
+         * milliseconds. Since the application can't receive updates to the
+         * duration via this interface and the total duration of the event is
+         * not known yet, just indicate an unknown duration.
+         */
+        if (!(prm.flags & PJMEDIA_STREAM_DTMF_IS_UPDATE)) {
+            OnDtmfDigitParam prmBasic;
+            prmBasic.method = prm.method;
+            prmBasic.digit = prm.digit;
+            prmBasic.duration = PJSUA_UNKNOWN_DTMF_DURATION;
+            call->onDtmfDigit(prmBasic);
+        }
+    }
+};
+
+void Endpoint::on_dtmf_event(pjsua_call_id call_id,
+                             const pjsua_dtmf_event* event)
+{
+    Call *call = Call::lookup(call_id);
+    if (!call) {
+        return;
+    }
+
+    PendingOnDtmfEventCallback *job = new PendingOnDtmfEventCallback;
+    job->call_id = call_id;
+    char buf[10];
+    pj_ansi_sprintf(buf, "%c", event->digit);
+    job->prm.method = event->method;
+    job->prm.timestamp = event->timestamp;
+    job->prm.digit = string(buf);
+    job->prm.duration = event->duration;
+    job->prm.flags = event->flags;
+
+    Endpoint::instance().utilAddPendingJob(job);
+}
+
 void Endpoint::on_call_transfer_request2(pjsua_call_id call_id,
                                          const pj_str_t *dst,
                                          pjsip_status_code *code,
@@ -1677,10 +1868,12 @@
     ua_cfg.cb.on_call_tsx_state         = &Endpoint::on_call_tsx_state;
     ua_cfg.cb.on_call_media_state       = &Endpoint::on_call_media_state;
     ua_cfg.cb.on_call_sdp_created       = &Endpoint::on_call_sdp_created;
+    ua_cfg.cb.on_stream_precreate       = &Endpoint::on_stream_precreate;
     ua_cfg.cb.on_stream_created2        = &Endpoint::on_stream_created2;
     ua_cfg.cb.on_stream_destroyed       = &Endpoint::on_stream_destroyed;
     //ua_cfg.cb.on_dtmf_digit             = &Endpoint::on_dtmf_digit;
-    ua_cfg.cb.on_dtmf_digit2            = &Endpoint::on_dtmf_digit2;
+    //ua_cfg.cb.on_dtmf_digit2            = &Endpoint::on_dtmf_digit2;
+    ua_cfg.cb.on_dtmf_event             = &Endpoint::on_dtmf_event;
     ua_cfg.cb.on_call_transfer_request2 = &Endpoint::on_call_transfer_request2;
     ua_cfg.cb.on_call_transfer_status   = &Endpoint::on_call_transfer_status;
     ua_cfg.cb.on_call_replace_request2  = &Endpoint::on_call_replace_request2;
@@ -2236,7 +2429,7 @@
 void Endpoint::setCodecOpusConfig(const CodecOpusConfig &opus_cfg)
 				  PJSUA2_THROW(Error)
 {
-   const pj_str_t codec_id = {"opus", 4};
+   const pj_str_t codec_id = {(char *)"opus", 4};
    pjmedia_codec_param param;
    pjmedia_codec_opus_config new_opus_cfg;
 
@@ -2358,7 +2551,7 @@
     
     PJSUA2_CHECK_EXPR(pjsua_vid_codec_set_param(&codec_str, NULL));
 #else
-    PJ_UNUSED_ARG(codec_id);    
+    PJ_UNUSED_ARG(codec_id);
 #endif	
 }
 
@@ -2386,3 +2579,41 @@
     pjsua_ip_change_param ip_change_param = param.toPj();
     PJSUA2_CHECK_EXPR(pjsua_handle_ip_change(&ip_change_param));
 }
+
+pj_status_t Endpoint::on_auth_create_aka_response_callback(pj_pool_t *pool,
+                                           const pjsip_digest_challenge *chal,
+                                           const pjsip_cred_info *cred,
+                                           const pj_str_t *method,
+                                           pjsip_digest_credential *auth)
+{
+    OnCredAuthParam prm;
+    prm.digestChallenge.fromPj(*chal);
+    prm.credentialInfo.fromPj(*cred);
+    prm.method = pj2Str(*method);
+    prm.digestCredential.fromPj(*auth);
+
+    pj_status_t status = Endpoint::instance().onCredAuth(prm);
+
+   if (status == PJ_SUCCESS) {
+	    pjsip_digest_credential auth_new = prm.digestCredential.toPj();
+	    // Duplicate in the pool, so that digestCredential
+	    // is allowed to be destructed at the end of the method.
+	    pj_strdup(pool, &auth->realm, &auth_new.realm);
+	    pj_strdup(pool, &auth->username, &auth_new.username);
+	    pj_strdup(pool, &auth->nonce, &auth_new.nonce);
+	    pj_strdup(pool, &auth->uri, &auth_new.uri);
+	    pj_strdup(pool, &auth->response, &auth_new.response);
+	    pj_strdup(pool, &auth->algorithm, &auth_new.algorithm);
+	    pj_strdup(pool, &auth->cnonce, &auth_new.cnonce);
+	    pj_strdup(pool, &auth->opaque, &auth_new.opaque);
+	    pj_strdup(pool, &auth->qop, &auth_new.qop);
+	    pj_strdup(pool, &auth->nc, &auth_new.nc);
+	    pjsip_param_clone(pool, &auth->other_param, &auth_new.other_param);
+    }
+#if PJSIP_HAS_DIGEST_AKA_AUTH
+   else if (status == PJ_ENOTSUP) {
+	    status = pjsip_auth_create_aka_response(pool, chal, cred, method, auth);
+    }
+#endif
+    return status;
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2/media.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2/media.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2/media.cpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2/media.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -25,6 +25,8 @@
 using namespace pj;
 using namespace std;
 
+#include <pjsua-lib/pjsua_internal.h>
+
 #define THIS_FILE		"media.cpp"
 #define MAX_FILE_NAMES 		64
 #define MAX_DEV_COUNT		64
@@ -712,10 +714,9 @@
 void AudDevManager::setCaptureDev(int capture_dev) const PJSUA2_THROW(Error)
 {    
     pjsua_snd_dev_param param;
-    pjsua_snd_dev_param_default(&param);    
 
+    PJSUA2_CHECK_EXPR(pjsua_get_snd_dev2(&param));
     param.capture_dev = capture_dev;
-    param.playback_dev = getPlaybackDev();
     
     /* Normalize invalid ID or null device to default device */
     if (param.playback_dev == PJMEDIA_AUD_INVALID_DEV ||
@@ -724,7 +725,7 @@
         param.playback_dev = PJMEDIA_AUD_DEFAULT_PLAYBACK_DEV;
     }
 
-    param.mode = PJSUA_SND_DEV_NO_IMMEDIATE_OPEN;    
+    param.mode |= PJSUA_SND_DEV_NO_IMMEDIATE_OPEN;
 
     PJSUA2_CHECK_EXPR( pjsua_set_snd_dev2(&param) );
 }
@@ -732,10 +733,9 @@
 void AudDevManager::setPlaybackDev(int playback_dev) const PJSUA2_THROW(Error)
 {
     pjsua_snd_dev_param param;
-    pjsua_snd_dev_param_default(&param);    
 
+    PJSUA2_CHECK_EXPR(pjsua_get_snd_dev2(&param));
     param.playback_dev = playback_dev;
-    param.capture_dev = getCaptureDev();
 
     /* Normalize invalid ID or null device to default device */
     if (param.capture_dev == PJMEDIA_AUD_INVALID_DEV ||
@@ -744,7 +744,7 @@
         param.capture_dev = PJMEDIA_AUD_DEFAULT_CAPTURE_DEV;
     }
 
-    param.mode = PJSUA_SND_DEV_NO_IMMEDIATE_OPEN;    
+    param.mode |= PJSUA_SND_DEV_NO_IMMEDIATE_OPEN;
 
     PJSUA2_CHECK_EXPR( pjsua_set_snd_dev2(&param) );    
 }
@@ -798,15 +798,9 @@
 
 void AudDevManager::setSndDevMode(unsigned mode) const PJSUA2_THROW(Error)
 {    
-    int capture_dev = 0, playback_dev = 0;
     pjsua_snd_dev_param param;
-    pj_status_t status = pjsua_get_snd_dev(&capture_dev, &playback_dev);    
-    if (status != PJ_SUCCESS) {
-	PJSUA2_RAISE_ERROR2(status, "AudDevManager::setSndDevMode()");	
-    }
-    pjsua_snd_dev_param_default(&param);
-    param.capture_dev = capture_dev;
-    param.playback_dev = playback_dev;
+
+    PJSUA2_CHECK_EXPR(pjsua_get_snd_dev2(&param));
     param.mode = mode;
     PJSUA2_CHECK_EXPR( pjsua_set_snd_dev2(&param) );
 }
@@ -1284,12 +1278,24 @@
 void VideoWindow::setFullScreen(bool enabled) PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
-    PJSUA2_CHECK_EXPR( pjsua_vid_win_set_fullscreen(winId, enabled) );
+    pjmedia_vid_dev_fullscreen_flag mode;
+    mode = enabled? PJMEDIA_VID_DEV_FULLSCREEN : PJMEDIA_VID_DEV_WINDOWED;
+    PJSUA2_CHECK_EXPR( pjsua_vid_win_set_fullscreen(winId, mode) );
 #else
     PJ_UNUSED_ARG(enabled);
 #endif
 }
 
+void VideoWindow::setFullScreen2(pjmedia_vid_dev_fullscreen_flag mode)
+							PJSUA2_THROW(Error)
+{
+#if PJSUA_HAS_VIDEO
+    PJSUA2_CHECK_EXPR( pjsua_vid_win_set_fullscreen(winId, mode) );
+#else
+    PJ_UNUSED_ARG(mode);
+#endif
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 VideoPreviewOpParam::VideoPreviewOpParam()
 {
@@ -1333,9 +1339,12 @@
 }
 
 VideoPreview::VideoPreview(int dev_id) 
-: devId(dev_id)
+: devId(dev_id), winId(PJSUA_INVALID_ID)
 {
-
+#if !PJSUA_HAS_VIDEO
+    /* Suppress warning of unused field when video is disabled */
+    PJ_UNUSED_ARG(winId);
+#endif
 }
 
 bool VideoPreview::hasNative()
@@ -1352,6 +1361,11 @@
 #if PJSUA_HAS_VIDEO
     pjsua_vid_preview_param prm = param.toPj();
     PJSUA2_CHECK_EXPR(pjsua_vid_preview_start(devId, &prm));
+
+    /* Device may be fast-switched and VideoPreview will not aware of that,
+     * so better keep win ID too.
+     */
+    winId = pjsua_vid_preview_get_win(devId);
 #else
     PJ_UNUSED_ARG(param);
     PJ_UNUSED_ARG(devId);
@@ -1361,14 +1375,15 @@
 void VideoPreview::stop() PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
-    pjsua_vid_preview_stop(devId);
+    updateDevId();
+    PJSUA2_CHECK_EXPR(pjsua_vid_preview_stop(devId));
 #endif
 }
 
 VideoWindow VideoPreview::getVideoWindow()
 {
 #if PJSUA_HAS_VIDEO
-    return (VideoWindow(pjsua_vid_preview_get_win(devId)));
+    return (VideoWindow(winId));
 #else
     return (VideoWindow(PJSUA_INVALID_ID));
 #endif
@@ -1377,6 +1392,7 @@
 VideoMedia VideoPreview::getVideoMedia() PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
+    updateDevId();
     pjsua_conf_port_id id = pjsua_vid_preview_get_vid_conf_port(devId);
     if (id != PJSUA_INVALID_ID) {
 	VideoMediaHelper vm;
@@ -1390,6 +1406,22 @@
 #endif
 }
 
+/* Device may be fastswitched and VideoPreview will not aware of that,
+ * this function will update the VideoPreview device ID.
+ */
+void VideoPreview::updateDevId()
+{
+#if PJSUA_HAS_VIDEO
+    if (winId != PJSUA_INVALID_ID) {
+	PJSUA_LOCK();
+	pjsua_vid_win *w = &pjsua_var.win[winId];
+	pj_assert(w->type == PJSUA_WND_TYPE_PREVIEW);
+	devId = w->preview_cap_id;
+	PJSUA_UNLOCK();
+    }
+#endif
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 void MediaFormatVideo::fromPj(const pjmedia_format &format)
 {
@@ -1464,6 +1496,17 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+void VidDevManager::initSubsys() PJSUA2_THROW(Error)
+{
+#if PJSUA_HAS_VIDEO && PJSUA_DONT_INIT_VID_DEV_SUBSYS
+    /* Should init once only! */
+    if (pjmedia_get_vid_subsys()->init_count > 0)
+	return;
+
+    PJSUA2_CHECK_EXPR(pjmedia_vid_dev_subsys_init(pjsua_get_pool_factory()));
+#endif
+}
+
 void VidDevManager::refreshDevs() PJSUA2_THROW(Error)
 {
 #if PJSUA_HAS_VIDEO
@@ -2005,3 +2048,12 @@
     PJSUA2_RAISE_ERROR(PJ_EINVALIDOP);
 #endif
 }
+
+void VideoMedia::update() const PJSUA2_THROW(Error)
+{
+#if PJSUA_HAS_VIDEO
+    PJSUA2_CHECK_EXPR( pjsua_vid_conf_update_port(id) );
+#else
+    PJSUA2_RAISE_ERROR(PJ_EINVALIDOP);
+#endif
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2/presence.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2/presence.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2/presence.cpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2/presence.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -143,6 +143,11 @@
     
     account.addBuddy(this);
 }
+
+int Buddy::getId() const
+{
+    return id;
+}
     
 /*
  * Check if this buddy is valid.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2/siptypes.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2/siptypes.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2/siptypes.cpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2/siptypes.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -145,6 +145,32 @@
     NODE_WRITE_STRING( this_node, akaAmf);
 }
 
+void AuthCredInfo::fromPj(const pjsip_cred_info &prm)
+{
+    realm	= pj2Str(prm.realm);
+    scheme	= pj2Str(prm.scheme);
+    username	= pj2Str(prm.username);
+    dataType	= prm.data_type;
+    data	= pj2Str(prm.data);
+    akaK	= pj2Str(prm.ext.aka.k);
+    akaOp	= pj2Str(prm.ext.aka.op);
+    akaAmf	= pj2Str(prm.ext.aka.amf);
+}
+
+pjsip_cred_info AuthCredInfo::toPj() const
+{
+    pjsip_cred_info ret;
+    ret.realm	= str2Pj(realm);
+    ret.scheme	= str2Pj(scheme);
+    ret.username	= str2Pj(username);
+    ret.data_type	= dataType;
+    ret.data	= str2Pj(data);
+    ret.ext.aka.k	= str2Pj(akaK);
+    ret.ext.aka.op	= str2Pj(akaOp);
+    ret.ext.aka.amf	= str2Pj(akaAmf);
+    return ret;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 TlsConfig::TlsConfig() : method(PJSIP_SSL_UNSPECIFIED_METHOD),
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2-test/main.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2-test/main.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua2-test/main.cpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua2-test/main.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -20,6 +20,7 @@
 
 using namespace pj;
 
+extern "C"
 int main(int argc, char *argv[])
 {
     Endpoint ep;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_acc.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_acc.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_acc.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_acc.c	2022-02-24 07:54:38.000000000 +0000
@@ -90,6 +90,8 @@
     pj_strdup_with_null(pool, &dst->force_contact, &src->force_contact);
     pj_strdup_with_null(pool, &dst->reg_contact_params,
 			&src->reg_contact_params);
+    pj_strdup_with_null(pool, &dst->reg_contact_uri_params,
+			&src->reg_contact_uri_params);
     pj_strdup_with_null(pool, &dst->contact_params, &src->contact_params);
     pj_strdup_with_null(pool, &dst->contact_uri_params,
                         &src->contact_uri_params);
@@ -460,7 +462,8 @@
     if (acc->pool)
 	pj_pool_reset(acc->pool);
     else
-	acc->pool = pjsua_pool_create("acc%p", 512, 256);
+	acc->pool = pjsua_pool_create("acc%p", PJSUA_POOL_LEN_ACC,
+                                  PJSUA_POOL_INC_ACC);
 
     /* Copy config */
     pjsua_acc_config_dup(acc->pool, &pjsua_var.acc[id].cfg, cfg);
@@ -1029,6 +1032,16 @@
 	unreg_first = PJ_TRUE;
     }
 
+    /* Register contact URI params */
+    if (pj_strcmp(&acc->cfg.reg_contact_uri_params,
+		  &cfg->reg_contact_uri_params))
+    {
+	pj_strdup_with_null(acc->pool, &acc->cfg.reg_contact_uri_params,
+			    &cfg->reg_contact_uri_params);
+	update_reg = PJ_TRUE;
+	unreg_first = PJ_TRUE;
+    }
+
     /* Contact param */
     if (pj_strcmp(&acc->cfg.contact_params, &cfg->contact_params)) {
 	pj_strdup_with_null(acc->pool, &acc->cfg.contact_params,
@@ -1526,7 +1539,9 @@
     return PJ_SUCCESS;
 }
 
-/* Create reg_contact, mainly for SIP outbound */
+/* Create reg_contact, adding SIP outbound params and other REGISTER specific
+ * Contact params, i.e: reg_contact_params, reg_contact_uri_params.
+ */
 static void update_regc_contact(pjsua_acc *acc)
 {
     pjsua_acc_config *acc_cfg = &acc->cfg;
@@ -1559,7 +1574,10 @@
 	pj_str_t reg_contact;
 
 	acc->rfc5626_status = OUTBOUND_WANTED;
-	len = acc->contact.slen + acc->cfg.reg_contact_params.slen +
+	len = acc->contact.slen +
+	      acc->cfg.contact_params.slen +
+	      acc->cfg.reg_contact_params.slen +
+	      acc->cfg.reg_contact_uri_params.slen +
 	      (need_outbound?
 	       (acc->rfc5626_instprm.slen + acc->rfc5626_regprm.slen): 0);
 	if (len > acc->contact.slen) {
@@ -1567,6 +1585,44 @@
 
 	    pj_strcpy(&reg_contact, &acc->contact);
 	
+	    /* Contact URI params */
+	    if (acc->cfg.reg_contact_uri_params.slen) {
+		pj_pool_t *pool;
+		pjsip_contact_hdr *contact_hdr;
+		pjsip_sip_uri *uri;
+		pj_str_t uri_param = acc->cfg.reg_contact_uri_params;
+		const pj_str_t STR_CONTACT = { "Contact", 7 };
+		char tmp_uri[PJSIP_MAX_URL_SIZE];
+		pj_ssize_t tmp_len;
+
+		/* Get the URI string */
+		pool = pjsua_pool_create("tmp", 512, 512);
+		contact_hdr = (pjsip_contact_hdr*)
+			      pjsip_parse_hdr(pool, &STR_CONTACT,
+					      reg_contact.ptr,
+					      reg_contact.slen, NULL);
+		pj_assert(contact_hdr != NULL);
+		uri = (pjsip_sip_uri*) contact_hdr->uri;
+		pj_assert(uri != NULL);
+		uri = (pjsip_sip_uri*) pjsip_uri_get_uri(uri);
+		tmp_len = pjsip_uri_print(PJSIP_URI_IN_CONTACT_HDR,
+					  uri, tmp_uri,
+					  sizeof(tmp_uri));
+		pj_assert(tmp_len > 0);
+		pj_pool_release(pool);
+
+		/* Regenerate Contact */
+		reg_contact.slen = pj_ansi_snprintf(
+					    reg_contact.ptr, len,
+					    "<%.*s%.*s>%.*s",
+					    (int)tmp_len, tmp_uri,
+					    (int)uri_param.slen, uri_param.ptr,
+					    (int)acc->cfg.contact_params.slen,
+					    acc->cfg.contact_params.ptr);
+		pj_assert(reg_contact.slen > 0);
+	    }
+
+	    /* Outbound */
     	    if (need_outbound) {
     	    	acc->rfc5626_status = OUTBOUND_WANTED;
 
@@ -1579,6 +1635,7 @@
 	    	acc->rfc5626_status = OUTBOUND_NA;
 	    }
 
+	    /* Contact params */
 	    pj_strcat(&reg_contact, &acc->cfg.reg_contact_params);
 	    
 	    acc->reg_contact = reg_contact;
@@ -2019,7 +2076,6 @@
 	      acc->index, uri_cnt));
 }
 
-
 /* Keep alive timer callback */
 static void keep_alive_timer_cb(pj_timer_heap_t *th, pj_timer_entry *te)
 {
@@ -2028,6 +2084,8 @@
     pj_time_val delay;
     char addrtxt[PJ_INET6_ADDRSTRLEN];
     pj_status_t status;
+    unsigned ka_timer;
+    unsigned lower_bound;
 
     PJ_UNUSED_ARG(th);
 
@@ -2068,13 +2126,20 @@
     /* Check just in case keep-alive has been disabled. This shouldn't happen
      * though as when ka_interval is changed this timer should have been
      * cancelled.
+     *
+     * Also check if Flow Timer (rfc5626) is not set.
      */
-    if (acc->cfg.ka_interval == 0)
+    if (acc->cfg.ka_interval == 0 && acc->rfc5626_flowtmr == 0)
 	goto on_return;
 
-    /* Reschedule next timer */
-    delay.sec = acc->cfg.ka_interval;
+    ka_timer = acc->rfc5626_flowtmr ? acc->rfc5626_flowtmr :
+				      acc->cfg.ka_interval;
+
+    lower_bound = (unsigned)((float)ka_timer * 0.8f);
+    delay.sec = pj_rand() % (ka_timer - lower_bound) + lower_bound;
     delay.msec = 0;
+
+    /* Reschedule next timer */
     status = pjsip_endpt_schedule_timer(pjsua_var.endpt, te, &delay);
     if (status == PJ_SUCCESS) {
 	te->id = PJ_TRUE;
@@ -2105,8 +2170,22 @@
     if (start) {
 	pj_time_val delay;
 	pj_status_t status;
+	pjsip_generic_string_hdr *hsr = NULL;
+	unsigned ka_timer;
+	unsigned lower_bound;
+
+	static const pj_str_t STR_FLOW_TIMER  = { "Flow-Timer", 10 };
+
+	hsr = (pjsip_generic_string_hdr*)
+	      pjsip_msg_find_hdr_by_name(param->rdata->msg_info.msg,
+					 &STR_FLOW_TIMER, hsr);
+
+	if (hsr) {	    
+	    acc->rfc5626_flowtmr = pj_strtoul(&hsr->hvalue);
+	}
 
 	/* Only do keep-alive if:
+	 *  - REGISTER response contain Flow-Timer header, otherwise
 	 *  - ka_interval is not zero in the account, and
 	 *  - transport is UDP.
 	 *
@@ -2121,9 +2200,9 @@
 	 * is done by the transport layer.
 	 */
 	if (/*pjsua_var.stun_srv.ipv4.sin_family == 0 ||*/
-	    acc->cfg.ka_interval == 0 ||
-	    (param->rdata->tp_info.transport->key.type &  
-	     ~PJSIP_TRANSPORT_IPV6)!= PJSIP_TRANSPORT_UDP)
+	    ((acc->cfg.ka_interval == 0) && (acc->rfc5626_flowtmr == 0)) ||
+	    (!hsr && ((param->rdata->tp_info.transport->key.type &
+		       ~PJSIP_TRANSPORT_IPV6) != PJSIP_TRANSPORT_UDP)))
 	{
 	    /* Keep alive is not necessary */
 	    return;
@@ -2157,7 +2236,11 @@
 	acc->ka_timer.cb = &keep_alive_timer_cb;
 	acc->ka_timer.user_data = (void*)acc;
 
-	delay.sec = acc->cfg.ka_interval;
+	ka_timer = acc->rfc5626_flowtmr ? acc->rfc5626_flowtmr :
+					  acc->cfg.ka_interval;
+
+	lower_bound = (unsigned)((float)ka_timer * 0.8f);
+	delay.sec = pj_rand() % (ka_timer - lower_bound) + lower_bound;
 	delay.msec = 0;
 	status = pjsip_endpt_schedule_timer(pjsua_var.endpt, &acc->ka_timer, 
 					    &delay);
@@ -2170,7 +2253,7 @@
 			      addr, sizeof(addr), 1);
 	    PJ_LOG(4,(THIS_FILE, "Keep-alive timer started for acc %d, "
 				 "destination:%s, interval:%ds",
-				 acc->index, addr, acc->cfg.ka_interval));
+				 acc->index, addr, delay.sec));
 	} else {
 	    acc->ka_timer.id = PJ_FALSE;
 	    pjsip_transport_dec_ref(acc->ka_transport);
@@ -2288,16 +2371,38 @@
      * Print registration status.
      */
     if (param->status!=PJ_SUCCESS) {
+    	pj_status_t status;
+
 	pjsua_perror(THIS_FILE, "SIP registration error", 
 		     param->status);
-	pjsip_regc_destroy(acc->regc);
-	acc->regc = NULL;
-	acc->contact.slen = 0;
-	acc->reg_mapped_addr.slen = 0;
-	acc->rfc5626_status = OUTBOUND_UNKNOWN;
+
+	if (param->status == PJSIP_EBUSY) {
+	    pj_log_pop_indent();
+            PJSUA_UNLOCK();
+	    return;
+	}
+
+	/* This callback is called without holding the registration's lock,
+	 * so there can be a race condition with another registration
+	 * process. Therefore, we must not forcefully try to destroy
+	 * the registration here.
+	 */
+	status = pjsip_regc_destroy2(acc->regc, PJ_FALSE);
+	if (status == PJ_SUCCESS) {
+	    acc->regc = NULL;
+	    acc->contact.slen = 0;
+	    acc->reg_mapped_addr.slen = 0;
+	    acc->rfc5626_status = OUTBOUND_UNKNOWN;
+	    acc->rfc5626_flowtmr = 0;
 	
-	/* Stop keep-alive timer if any. */
-	update_keep_alive(acc, PJ_FALSE, NULL);
+	    /* Stop keep-alive timer if any. */
+	    update_keep_alive(acc, PJ_FALSE, NULL);
+	} else {
+	    /* Another registration is in progress. */
+	    pj_assert(status == PJ_EBUSY);
+	    pjsua_perror(THIS_FILE, "Deleting registration failed", 
+		     	 status);	    
+	}
 
     } else if (param->code < 0 || param->code >= 300) {
 	PJ_LOG(2, (THIS_FILE, "SIP registration failed, status=%d (%.*s)", 
@@ -2308,6 +2413,7 @@
 	acc->contact.slen = 0;
 	acc->reg_mapped_addr.slen = 0;
 	acc->rfc5626_status = OUTBOUND_UNKNOWN;
+	acc->rfc5626_flowtmr = 0;
 
 	/* Stop keep-alive timer if any. */
 	update_keep_alive(acc, PJ_FALSE, NULL);
@@ -2324,6 +2430,7 @@
 	    acc->contact.slen = 0;
 	    acc->reg_mapped_addr.slen = 0;
 	    acc->rfc5626_status = OUTBOUND_UNKNOWN;
+	    acc->rfc5626_flowtmr = 0;
 
 	    /* Reset pointer to registration transport */
 	    //acc->auto_rereg.reg_tp = NULL;
@@ -2356,14 +2463,26 @@
 	    /* Check and update Service-Route header */
 	    update_service_route(acc, param->rdata);
 
-	    PJ_LOG(3, (THIS_FILE, 
-		       "%s: registration success, status=%d (%.*s), "
-		       "will re-register in %d seconds", 
-		       pjsua_var.acc[acc->index].cfg.id.ptr,
-		       param->code,
-		       (int)param->reason.slen, param->reason.ptr,
-		       param->expiration));
+#if         PJSUA_REG_AUTO_REG_REFRESH
 
+            PJ_LOG(3, (THIS_FILE,
+                        "%s: registration success, status=%d (%.*s), "
+                        "will re-register in %d seconds",
+                        pjsua_var.acc[acc->index].cfg.id.ptr,
+                        param->code,
+                        (int)param->reason.slen, param->reason.ptr,
+                        param->expiration));
+
+#else
+
+            PJ_LOG(3, (THIS_FILE,
+                        "%s: registration success, status=%d (%.*s), "
+                        "auto re-register disabled",
+                        pjsua_var.acc[acc->index].cfg.id.ptr,
+                        param->code,
+                        (int)param->reason.slen, param->reason.ptr));
+
+#endif
 	    /* Start keep-alive timer if necessary. */
 	    update_keep_alive(acc, PJ_TRUE, param);
 
@@ -2724,7 +2843,8 @@
 	    goto on_return;
 	}
 
-	status = pjsip_regc_register(pjsua_var.acc[acc_id].regc, 1, 
+	status = pjsip_regc_register(pjsua_var.acc[acc_id].regc,
+                                     PJSUA_REG_AUTO_REG_REFRESH,
 				     &tdata);
 
 	if (0 && status == PJ_SUCCESS && pjsua_var.acc[acc_id].cred_cnt) {
@@ -2739,11 +2859,11 @@
 	    PJ_UNUSED_ARG(d);
 
 	    h = pjsip_authorization_hdr_create(tdata->pool);
-	    h->scheme = pj_str("Digest");
+	    h->scheme = pjsip_DIGEST_STR;
 	    h->credential.digest.username = acc->cred[0].username;
 	    h->credential.digest.realm = acc->srv_domain;
 	    h->credential.digest.uri = pj_str(uri);
-	    h->credential.digest.algorithm = pj_str("md5");
+	    h->credential.digest.algorithm = pjsip_MD5_STR;
 
 	    pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)h);
 	}
@@ -3346,7 +3466,7 @@
     	for (i = 0; i < sizeof(pjsua_var.tpdata); i++) {
     	    if (tfla2_prm.ret_tp==(const void *)pjsua_var.tpdata[i].data.tp) {
     	    	if (pjsua_var.tpdata[i].has_bound_addr) {
-		    pj_strdup(acc->pool, &addr->host,
+		    pj_strdup(pool, &addr->host,
 		    	      &pjsua_var.tpdata[i].data.tp->local_name.host);
 	    	    addr->port = (pj_uint16_t)
 	    	    		 pjsua_var.tpdata[i].data.tp->local_name.port;
@@ -3784,6 +3904,42 @@
 
     /* Start re-registration */
     acc->auto_rereg.attempt_cnt++;
+
+    /* Generate new contact as the current contact may use a disconnected
+     * transport. Only do this when outbound is not active and contact is not
+     * rewritten (where the contact address may really be used by server to
+     * contact the UA).
+     */
+    if (acc->rfc5626_status != OUTBOUND_ACTIVE && !acc->contact_rewritten) {
+	pj_str_t tmp_contact;
+	pj_pool_t *pool;
+
+	pool = pjsua_pool_create("tmpregc", 512, 512);
+
+	status = pjsua_acc_create_uac_contact(pool, &tmp_contact, acc->index,
+					      &acc->cfg.reg_uri);
+	if (status != PJ_SUCCESS) {
+	    pjsua_perror(THIS_FILE,
+			 "Unable to generate suitable Contact header"
+			 " for re-registration", status);
+	    pj_pool_release(pool);
+	    schedule_reregistration(acc);
+	    goto on_return;
+	}
+
+	if (pj_strcmp(&tmp_contact, &acc->contact)) {
+	    if (acc->contact.slen < tmp_contact.slen) {
+		pj_strdup_with_null(acc->pool, &acc->contact, &tmp_contact);
+	    } else {
+		pj_strcpy(&acc->contact, &tmp_contact);
+	    }
+	    update_regc_contact(acc);
+	    if (acc->regc)
+		pjsip_regc_update_contact(acc->regc, 1, &acc->reg_contact);
+	}
+	pj_pool_release(pool);
+    }
+
     status = pjsua_acc_set_registration(acc->index, PJ_TRUE);
     if (status != PJ_SUCCESS)
 	schedule_reregistration(acc);
@@ -3909,6 +4065,10 @@
 	if (acc->via_tp == (void*)tp) {
 	    pj_bzero(&acc->via_addr, sizeof(acc->via_addr));
 	    acc->via_tp = NULL;
+
+	    /* Also reset regc's Via addr */
+	    if (acc->regc)
+		pjsip_regc_set_via_sent_by(acc->regc, NULL, NULL);
 	}
 
 	/* Release transport immediately if regc is using it
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_aud.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_aud.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_aud.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_aud.c	2022-02-24 07:54:38.000000000 +0000
@@ -467,32 +467,33 @@
 
     close_snd_dev();
 
-    if (pjsua_var.mconf) {
-	pjmedia_conf_destroy(pjsua_var.mconf);
-	pjsua_var.mconf = NULL;
-    }
-
-    if (pjsua_var.null_port) {
-	pjmedia_port_destroy(pjsua_var.null_port);
-	pjsua_var.null_port = NULL;
-    }
-
     /* Destroy file players */
     for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.player); ++i) {
 	if (pjsua_var.player[i].port) {
-	    pjmedia_port_destroy(pjsua_var.player[i].port);
-	    pjsua_var.player[i].port = NULL;
+	    PJ_LOG(2,(THIS_FILE, "Destructor for player id=%d is not called"));
+	    pjsua_player_destroy(i);
 	}
     }
 
     /* Destroy file recorders */
     for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.recorder); ++i) {
 	if (pjsua_var.recorder[i].port) {
-	    pjmedia_port_destroy(pjsua_var.recorder[i].port);
-	    pjsua_var.recorder[i].port = NULL;
+	    PJ_LOG(2,(THIS_FILE, "Destructor for recorder id=%d "
+		      "is not called"));
+	    pjsua_recorder_destroy(i);
 	}
     }
 
+    if (pjsua_var.mconf) {
+	pjmedia_conf_destroy(pjsua_var.mconf);
+	pjsua_var.mconf = NULL;
+    }
+
+    if (pjsua_var.null_port) {
+	pjmedia_port_destroy(pjsua_var.null_port);
+	pjsua_var.null_port = NULL;
+    }
+
     return PJ_SUCCESS;
 }
 
@@ -502,6 +503,8 @@
     pjmedia_rtcp_stat stat;
 
     if (strm) {
+	pjmedia_stream_get_info(strm, &call_med->prev_aud_si);
+
 	/* Unsubscribe from stream events */
 	pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med, strm);
 
@@ -514,9 +517,14 @@
 	    call_med->strm.a.conf_slot = PJSUA_INVALID_ID;
 	}
 
-	if ((call_med->dir & PJMEDIA_DIR_ENCODING) &&
-	    (pjmedia_stream_get_stat(strm, &stat) == PJ_SUCCESS) &&
-	    stat.tx.pkt)
+	/* Don't check for direction and transmitted packets count as we
+	 * assume that RTP timestamp remains increasing when outgoing
+	 * direction is disabled/paused.
+	 */
+	//if ((call_med->dir & PJMEDIA_DIR_ENCODING) &&
+	//    (pjmedia_stream_get_stat(strm, &stat) == PJ_SUCCESS) &&
+	//    stat.tx.pkt)
+	if (pjmedia_stream_get_stat(strm, &stat) == PJ_SUCCESS)
 	{
 	    /* Save RTP timestamp & sequence, so when media session is
 	     * restarted, those values will be restored as the initial
@@ -529,7 +537,9 @@
 	    call_med->rtp_tx_ts = stat.rtp_tx_last_ts;
 	}
 
-	if (pjsua_var.ua_cfg.cb.on_stream_destroyed) {
+	if (!call_med->call->hanging_up &&
+	    pjsua_var.ua_cfg.cb.on_stream_destroyed)
+	{
 	    pjsua_var.ua_cfg.cb.on_stream_destroyed(call_med->call->index,
 	                                            strm, call_med->idx);
 	}
@@ -553,32 +563,63 @@
 static void dtmf_callback(pjmedia_stream *strm, void *user_data,
 			  int digit)
 {
+    pjsua_call_id call_id;
+
     PJ_UNUSED_ARG(strm);
 
+    call_id = (pjsua_call_id)(pj_ssize_t)user_data;
+    if (pjsua_var.calls[call_id].hanging_up)
+    	return;
+
     pj_log_push_indent();
 
     if (pjsua_var.ua_cfg.cb.on_dtmf_digit2) {
-	pjsua_call_id call_id;
 	pjsua_dtmf_info info;
 
-	call_id = (pjsua_call_id)(pj_ssize_t)user_data;
 	info.method = PJSUA_DTMF_METHOD_RFC2833;
 	info.digit = digit;
+        info.duration = PJSUA_UNKNOWN_DTMF_DURATION;
 	(*pjsua_var.ua_cfg.cb.on_dtmf_digit2)(call_id, &info);
     } else if (pjsua_var.ua_cfg.cb.on_dtmf_digit) {
 	/* For discussions about call mutex protection related to this
 	 * callback, please see ticket #460:
 	 *	http://trac.pjsip.org/repos/ticket/460#comment:4
 	 */    
-	pjsua_call_id call_id;
-
-	call_id = (pjsua_call_id)(pj_ssize_t)user_data;
 	(*pjsua_var.ua_cfg.cb.on_dtmf_digit)(call_id, digit);
     }
 
     pj_log_pop_indent();
 }
 
+/*
+ * DTMF callback from the stream.
+ */
+static void dtmf_event_callback(pjmedia_stream *strm, void *user_data,
+                                const pjmedia_stream_dtmf_event *event)
+{
+    pjsua_call_id call_id;
+    pjsua_dtmf_event evt;
+
+    PJ_UNUSED_ARG(strm);
+
+    call_id = (pjsua_call_id)(pj_ssize_t)user_data;
+    if (pjsua_var.calls[call_id].hanging_up)
+    	return;
+
+    pj_log_push_indent();
+
+    if (pjsua_var.ua_cfg.cb.on_dtmf_event) {
+        evt.method = PJSUA_DTMF_METHOD_RFC2833;
+        evt.timestamp = event->timestamp;
+        evt.digit = event->digit;
+        evt.duration = event->duration;
+        evt.flags = event->flags;
+        (*pjsua_var.ua_cfg.cb.on_dtmf_event)(call_id, &evt);
+    }
+
+    pj_log_pop_indent();
+}
+
 /* Internal function: update audio channel after SDP negotiation.
  * Warning: do not use temporary/flip-flop pool, e.g: inv->pool_prov,
  *          for creating stream, etc, as after SDP negotiation and when
@@ -614,6 +655,7 @@
 	si->jb_min_pre = pjsua_var.media_cfg.jb_min_pre;
 	si->jb_max_pre = pjsua_var.media_cfg.jb_max_pre;
 	si->jb_max = pjsua_var.media_cfg.jb_max;
+        si->jb_discard_algo = pjsua_var.media_cfg.jb_discard_algo;
 
 	/* Set SSRC and CNAME */
 	si->ssrc = call_med->ssrc;
@@ -631,7 +673,28 @@
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
 	/* Enable/disable stream keep-alive and NAT hole punch. */
 	si->use_ka = pjsua_var.acc[call->acc_id].cfg.use_stream_ka;
+
+        si->ka_cfg = pjsua_var.acc[call->acc_id].cfg.stream_ka_cfg;
+#endif
+
+        if (!call->hanging_up && pjsua_var.ua_cfg.cb.on_stream_precreate) {
+            pjsua_on_stream_precreate_param prm;
+            prm.stream_idx = strm_idx;
+            prm.stream_info.type = PJMEDIA_TYPE_AUDIO;
+            prm.stream_info.info.aud = *si;
+            (*pjsua_var.ua_cfg.cb.on_stream_precreate)(call->index, &prm);
+
+            /* Copy back only the fields which are allowed to be changed. */
+            si->jb_init = prm.stream_info.info.aud.jb_init;
+            si->jb_min_pre = prm.stream_info.info.aud.jb_min_pre;
+            si->jb_max_pre = prm.stream_info.info.aud.jb_max_pre;
+            si->jb_max = prm.stream_info.info.aud.jb_max;
+            si->jb_discard_algo = prm.stream_info.info.aud.jb_discard_algo;
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && (PJMEDIA_STREAM_ENABLE_KA != 0)
+            si->use_ka = prm.stream_info.info.aud.use_ka;
 #endif
+            si->rtcp_sdes_bye_disabled = prm.stream_info.info.aud.rtcp_sdes_bye_disabled;
+        }
 
 	/* Create session based on session info. */
 	status = pjmedia_stream_create(pjsua_var.med_endpt, NULL, si,
@@ -653,8 +716,13 @@
 	/* If DTMF callback is installed by application, install our
 	 * callback to the session.
 	 */
-	if (pjsua_var.ua_cfg.cb.on_dtmf_digit || 
-	    pjsua_var.ua_cfg.cb.on_dtmf_digit2) 
+        if (!call->hanging_up && pjsua_var.ua_cfg.cb.on_dtmf_event) {
+            pjmedia_stream_set_dtmf_event_callback(call_med->strm.a.stream,
+                                              &dtmf_event_callback,
+                                              (void*)(pj_ssize_t)(call->index));
+        } else if (!call->hanging_up &&
+        	   (pjsua_var.ua_cfg.cb.on_dtmf_digit || 
+	            pjsua_var.ua_cfg.cb.on_dtmf_digit2))
 	{
 	    pjmedia_stream_set_dtmf_callback(call_med->strm.a.stream,
 					     &dtmf_callback,
@@ -671,7 +739,7 @@
 	 * Note: application may modify media_port to point to different
 	 * media port
 	 */
-	if (pjsua_var.ua_cfg.cb.on_stream_created2) {
+	if (!call->hanging_up && pjsua_var.ua_cfg.cb.on_stream_created2) {
 	    pjsua_on_stream_created_param prm;
 	    
 	    prm.stream = call_med->strm.a.stream;
@@ -683,7 +751,8 @@
 	    call_med->strm.a.destroy_port = prm.destroy_port;
 	    call_med->strm.a.media_port = prm.port;
 
-	} else if (pjsua_var.ua_cfg.cb.on_stream_created) {
+	} else if (!call->hanging_up && pjsua_var.ua_cfg.cb.on_stream_created)
+	{
 	    (*pjsua_var.ua_cfg.cb.on_stream_created)(call->index,
 						  call_med->strm.a.stream,
 						  strm_idx,
@@ -1099,6 +1168,9 @@
     if (pjsua_var.player_cnt >= PJ_ARRAY_SIZE(pjsua_var.player))
 	return PJ_ETOOMANY;
 
+    if (filename->slen >= PJ_MAXPATH)
+    	return PJ_ENAMETOOLONG;
+
     PJ_LOG(4,(THIS_FILE, "Creating file player: %.*s..",
 	      (int)filename->slen, filename->ptr));
     pj_log_push_indent();
@@ -1416,6 +1488,11 @@
     /* Don't support encoding type at present */
     PJ_ASSERT_RETURN(enc_type == 0, PJ_EINVAL);
 
+    if (filename->slen >= PJ_MAXPATH)
+    	return PJ_ENAMETOOLONG;
+    if (filename->slen < 4)
+    	return PJ_EINVALIDOP;
+
     PJ_LOG(4,(THIS_FILE, "Creating recorder %.*s..",
 	      (int)filename->slen, filename->ptr));
     pj_log_push_indent();
@@ -1642,13 +1719,15 @@
 				    unsigned bits_per_sample)
 {
     pj_status_t status;
+    pj_bool_t speaker_only = (pjsua_var.snd_mode & PJSUA_SND_DEV_SPEAKER_ONLY);
 
     /* Normalize device ID with new convention about default device ID */
     if (playback_dev == PJMEDIA_AUD_DEFAULT_CAPTURE_DEV)
 	playback_dev = PJMEDIA_AUD_DEFAULT_PLAYBACK_DEV;
 
     /* Create default parameters for the device */
-    status = pjmedia_aud_dev_default_param(capture_dev, param);
+    status = pjmedia_aud_dev_default_param((speaker_only? playback_dev:
+    					    capture_dev), param);
     if (status != PJ_SUCCESS) {
 	pjsua_perror(THIS_FILE, "Error retrieving default audio "
 				"device parameters", status);
@@ -1809,14 +1888,20 @@
     pj_log_push_indent();
 
     if (speaker_only) {
-	status = pjmedia_snd_port_create_player(pjsua_var.snd_pool,
-						-1,
-						param->base.clock_rate,
-						param->base.channel_count,
-						param->base.samples_per_frame,
-						param->base.bits_per_sample, 
-						0,
-						&pjsua_var.snd_port);
+	pjmedia_snd_port_param cp_param;
+	int dev_id = param->base.play_id;
+
+	/* Normalize dev_id */
+	if (dev_id < 0)
+	    dev_id = PJMEDIA_AUD_DEFAULT_PLAYBACK_DEV;
+
+	pjmedia_snd_port_param_default(&cp_param);
+	pj_memcpy(&cp_param.base, &param->base, sizeof(cp_param.base));
+	cp_param.base.dir = PJMEDIA_DIR_PLAYBACK;
+	cp_param.base.play_id = dev_id;
+
+	status = pjmedia_snd_port_create2(pjsua_var.snd_pool, &cp_param,
+					  &pjsua_var.snd_port);
 
     } else {
 	status = pjmedia_snd_port_create2(pjsua_var.snd_pool,
@@ -1902,7 +1987,7 @@
     }
 
     /* Update sound device name. */
-    {
+    if (!speaker_only) {
 	pjmedia_aud_dev_info rec_info;
 	pjmedia_aud_stream *strm;
 	pjmedia_aud_param si;
@@ -1979,8 +2064,11 @@
 	strm = pjmedia_snd_port_get_snd_stream(pjsua_var.snd_port);
 	pjmedia_aud_stream_get_param(strm, &param);
 
-	if (pjmedia_aud_dev_get_info(param.rec_id, &cap_info) != PJ_SUCCESS)
+	if (param.rec_id == PJSUA_SND_NO_DEV ||
+	    pjmedia_aud_dev_get_info(param.rec_id, &cap_info) != PJ_SUCCESS)
+	{
 	    cap_info.name[0] = '\0';
+	}
 	if (pjmedia_aud_dev_get_info(param.play_id, &play_info) != PJ_SUCCESS)
 	    play_info.name[0] = '\0';
 
@@ -2017,54 +2105,89 @@
 				      int playback_dev)
 {
     pjsua_snd_dev_param param;
-
-    pjsua_snd_dev_param_default(&param);
-
+    pjsua_get_snd_dev2(&param);
     param.capture_dev = capture_dev;
     param.playback_dev = playback_dev;
+
     /* Always open the sound device. */
-    param.mode = 0;
+    param.mode &= ~PJSUA_SND_DEV_NO_IMMEDIATE_OPEN;
 
     return pjsua_set_snd_dev2(&param);
 }
 
+
+PJ_DEF(pj_status_t) pjsua_get_snd_dev2(pjsua_snd_dev_param *snd_param)
+{
+    PJ_ASSERT_RETURN(snd_param, PJ_EINVAL);
+
+    PJSUA_LOCK();
+    snd_param->capture_dev = pjsua_var.cap_dev;
+    snd_param->playback_dev = pjsua_var.play_dev;
+    snd_param->mode = pjsua_var.snd_mode;
+    PJSUA_UNLOCK();
+
+    return PJ_SUCCESS;
+}
+
+
 /*
  * Select or change sound device. Application may call this function at
  * any time to replace current sound device.
  */
-PJ_DEF(pj_status_t) pjsua_set_snd_dev2(pjsua_snd_dev_param *snd_param)
+PJ_DEF(pj_status_t) pjsua_set_snd_dev2(const pjsua_snd_dev_param *snd_param)
 {
     unsigned alt_cr_cnt = 1;
     unsigned alt_cr[] = {0, 44100, 48000, 32000, 16000, 8000};
     unsigned i;
     pj_status_t status = -1;
     unsigned orig_snd_dev_mode = pjsua_var.snd_mode;
-    pj_bool_t no_change = (pjsua_var.snd_is_on || (!pjsua_var.snd_is_on &&
-			   (snd_param->mode & 
-			    PJSUA_SND_DEV_NO_IMMEDIATE_OPEN)));
 
-    PJ_LOG(4,(THIS_FILE, "Set sound device: capture=%d, playback=%d",
-	      snd_param->capture_dev, snd_param->playback_dev));
+    PJ_ASSERT_RETURN(snd_param, PJ_EINVAL);
+
+    PJ_LOG(4,(THIS_FILE, "Set sound device: capture=%d, playback=%d, mode=%d",
+	      snd_param->capture_dev, snd_param->playback_dev,
+	      snd_param->mode));
+
     pj_log_push_indent();
 
     PJSUA_LOCK();
 
+    /* Check if there are no changes in sound device settings */
     if (pjsua_var.cap_dev == snd_param->capture_dev &&
 	pjsua_var.play_dev == snd_param->playback_dev &&
-	pjsua_var.snd_mode == snd_param->mode &&
-	!pjsua_var.no_snd && no_change)
+	pjsua_var.snd_mode == snd_param->mode)
     {
-	PJ_LOG(4, (THIS_FILE, "No changes in capture and playback devices"));
-        PJSUA_UNLOCK();
-        pj_log_pop_indent();
-	return PJ_SUCCESS;
+	/* If sound device is already opened, just print log and return.
+	 * Also if PJSUA_SND_DEV_NO_IMMEDIATE_OPEN is set.
+	 */
+	if (pjsua_var.snd_is_on || (snd_param->mode &
+				    PJSUA_SND_DEV_NO_IMMEDIATE_OPEN))
+	{
+	    PJ_LOG(4,(THIS_FILE,"No changes in capture and playback devices"));
+	    PJSUA_UNLOCK();
+	    pj_log_pop_indent();
+	    return PJ_SUCCESS;
+	}
     }
     
+    /* No sound */
+    if (snd_param->capture_dev == PJSUA_SND_NO_DEV &&
+	snd_param->playback_dev == PJSUA_SND_NO_DEV)
+    {
+	PJSUA_UNLOCK();
+	PJ_LOG(4, (THIS_FILE, "No sound device, mode setting is ignored"));
+	if (!pjsua_var.no_snd)
+	    pjsua_set_no_snd_dev();
+	pj_log_pop_indent();
+	return status;
+    }
+
     /* Null-sound */
     if (snd_param->capture_dev == PJSUA_SND_NULL_DEV && 
 	snd_param->playback_dev == PJSUA_SND_NULL_DEV) 
     {
 	PJSUA_UNLOCK();
+	PJ_LOG(4, (THIS_FILE, "Null sound device, mode setting is ignored"));
 	status = pjsua_set_null_snd_dev();
 	pj_log_pop_indent();
 	return status;
@@ -2072,11 +2195,15 @@
 
     pjsua_var.snd_mode = snd_param->mode;
 
-    if (!pjsua_var.no_snd && !pjsua_var.snd_is_on &&
+    /* Just update the IDs if app does not want to open now and currently
+     * audio is off.
+     */
+    if (!pjsua_var.snd_is_on &&
 	(snd_param->mode & PJSUA_SND_DEV_NO_IMMEDIATE_OPEN))
     {
 	pjsua_var.cap_dev = snd_param->capture_dev;
 	pjsua_var.play_dev = snd_param->playback_dev;
+	pjsua_var.no_snd = PJ_FALSE;
 
 	PJSUA_UNLOCK();	
 	pj_log_pop_indent();
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_call.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_call.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_call.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_call.c	2022-02-24 07:54:38.000000000 +0000
@@ -39,6 +39,12 @@
  */
 #define RESTART_ICE_ON_REINVITE      1
 
+/* Retry interval of trying to hangup a call. */
+#define CALL_HANGUP_RETRY_INTERVAL   5000
+
+/* Max number of hangup retries. */
+#define CALL_HANGUP_MAX_RETRY	     4
+
 /*
  * The INFO method.
  */
@@ -126,9 +132,18 @@
 /* Timer callback to send re-INVITE/UPDATE to lock codec or ICE update */
 static void reinv_timer_cb(pj_timer_heap_t *th, pj_timer_entry *entry);
 
+/* Timer callback to hangup the call */
+static void hangup_timer_cb(pj_timer_heap_t *th, pj_timer_entry *entry);
+
 /* Check and send reinvite for lock codec and ICE update */
 static pj_status_t process_pending_reinvite(pjsua_call *call);
 
+/* Timer callbacks for trickle ICE */
+static void trickle_ice_send_sip_info(pj_timer_heap_t *th,
+				      struct pj_timer_entry *te);
+static void trickle_ice_retrans_18x(pj_timer_heap_t *th,
+				    struct pj_timer_entry *te);
+
 /*
  * Reset call descriptor.
  */
@@ -161,6 +176,9 @@
     pjsua_call_setting_default(&call->opt);
     pj_timer_entry_init(&call->reinv_timer, PJ_FALSE,
 			(void*)(pj_size_t)id, &reinv_timer_cb);
+    pj_bzero(&call->trickle_ice, sizeof(call->trickle_ice));
+    pj_timer_entry_init(&call->trickle_ice.timer, 0, call,
+			&trickle_ice_send_sip_info);
 }
 
 /* Get DTMF method type name */
@@ -183,6 +201,7 @@
     pjsip_inv_callback inv_cb;
     unsigned i;
     const pj_str_t str_norefersub = { "norefersub", 10 };
+    const pj_str_t str_trickle_ice = { "trickle-ice", 11 };
     pj_status_t status;
 
     /* Init calls array. */
@@ -230,6 +249,10 @@
     pjsip_endpt_add_capability(pjsua_var.endpt, NULL, PJSIP_H_ALLOW,
 			       NULL, 1, &pjsip_info_method.name);
 
+    /* Add "trickle-ice" in Supported header */
+    pjsip_endpt_add_capability(pjsua_var.endpt, NULL, PJSIP_H_SUPPORTED,
+			       NULL, 1, &str_trickle_ice);
+
     return status;
 }
 
@@ -471,6 +494,11 @@
 	else if (acc->cfg.use_timer == PJSUA_SIP_TIMER_ALWAYS)
 	    options |= PJSIP_INV_ALWAYS_USE_TIMER;
     }
+    if (acc->cfg.ice_cfg.enable_ice &&
+	acc->cfg.ice_cfg.ice_opt.trickle != PJ_ICE_SESS_TRICKLE_DISABLED)
+    {
+	options |= PJSIP_INV_SUPPORT_TRICKLE_ICE;
+    }
 
     status = pjsip_inv_create_uac( dlg, offer, options, &inv);
     if (status != PJ_SUCCESS) {
@@ -542,7 +570,7 @@
 	/* Upon failure to send first request, the invite
 	 * session would have been cleared.
 	 */
-	inv = NULL;
+	call->inv = inv = NULL;
 	goto on_error;
     }
 
@@ -556,6 +584,7 @@
 
 on_error:
     if (inv == NULL && call_id != -1 && !cb_called &&
+    	!call->hanging_up &&
 	pjsua_var.ua_cfg.cb.on_call_state)
     {
 	/* Use user event rather than NULL to avoid crash in
@@ -570,10 +599,12 @@
     if (dlg) {
 	/* This may destroy the dialog */
 	pjsip_dlg_dec_lock(dlg);
+	call->async_call.dlg = NULL;
     }
 
     if (inv != NULL) {
 	pjsip_inv_terminate(inv, PJSIP_SC_OK, PJ_FALSE);
+	call->inv = NULL;
     }
 
     if (call_id != -1) {
@@ -599,7 +630,7 @@
 {
     opt->flag &= ~(PJSUA_CALL_UNHOLD | PJSUA_CALL_UPDATE_CONTACT |
 		   PJSUA_CALL_NO_SDP_OFFER | PJSUA_CALL_REINIT_MEDIA |
-		   PJSUA_CALL_UPDATE_VIA);
+		   PJSUA_CALL_UPDATE_VIA | PJSUA_CALL_SET_MEDIA_DIR);
 }
 
 
@@ -608,6 +639,8 @@
  */
 PJ_DEF(void) pjsua_call_setting_default(pjsua_call_setting *opt)
 {
+    unsigned i;
+
     pj_assert(opt);
 
     pj_bzero(opt, sizeof(*opt));
@@ -619,6 +652,10 @@
     opt->req_keyframe_method = PJSUA_VID_REQ_KEYFRAME_SIP_INFO |
 			       PJSUA_VID_REQ_KEYFRAME_RTCP_PLI;
 #endif
+
+    for (i = 0; i < PJMEDIA_MAX_SDP_MEDIA; i++) {
+    	opt->media_dir[i] = PJMEDIA_DIR_ENCODING_DECODING;
+    }
 }
 
 /* 
@@ -639,16 +676,16 @@
 
     if (!opt) {
 	pjsua_call_cleanup_flag(&call->opt);
-	return PJ_SUCCESS;
+    } else {
+    	call->opt = *opt;
     }
 
 #if !PJMEDIA_HAS_VIDEO
-    pj_assert(opt->vid_cnt == 0);
+    pj_assert(call->opt.vid_cnt == 0);
 #endif
 
-    call->opt = *opt;
-
     if (call->opt.flag & PJSUA_CALL_REINIT_MEDIA) {
+    	PJ_LOG(4, (THIS_FILE, "PJSUA_CALL_REINIT_MEDIA"));
     	pjsua_media_channel_deinit(call->index);
     }
 
@@ -790,13 +827,13 @@
     pj_pool_t *tmp_pool = NULL;
     pjsip_dialog *dlg = NULL;
     pjsua_acc *acc;
-    pjsua_call *call;
+    pjsua_call *call = NULL;
     int call_id = -1;
     pj_str_t contact;
     pj_status_t status;
 
     /* Check that account is valid */
-    PJ_ASSERT_RETURN(acc_id>=0 || acc_id<(int)PJ_ARRAY_SIZE(pjsua_var.acc),
+    PJ_ASSERT_RETURN(acc_id>=0 && acc_id<(int)PJ_ARRAY_SIZE(pjsua_var.acc),
 		     PJ_EINVAL);
 
     /* Check arguments */
@@ -974,9 +1011,10 @@
 
 
 on_error:
-    if (dlg) {
+    if (dlg && call) {
 	/* This may destroy the dialog */
 	pjsip_dlg_dec_lock(dlg);
+	call->async_call.dlg = NULL;
     }
 
     if (call_id != -1) {
@@ -1028,7 +1066,7 @@
     replaced_call = (pjsua_call*) replaced_dlg->mod_data[pjsua_var.mod.id];
 
     /* Notify application */
-    if (pjsua_var.ua_cfg.cb.on_call_replaced)
+    if (!replaced_call->hanging_up && pjsua_var.ua_cfg.cb.on_call_replaced)
 	pjsua_var.ua_cfg.cb.on_call_replaced(replaced_call->index,
 					     call->index);
 
@@ -1195,6 +1233,12 @@
 	    }
 	}
 
+	/* Disable media if it has zero format/codec */
+	if (m->desc.fmt_count == 0) {
+	    m->desc.fmt[m->desc.fmt_count++] = pj_str("0");
+	    pjmedia_sdp_media_deactivate(pool, m);
+	}
+
 	sdp->media[sdp->media_count++] = m;
     }	   
 
@@ -1458,9 +1502,9 @@
 	    pjsip_response_addr res_addr;
 
 	    pjsip_get_response_addr(response->pool, rdata, &res_addr);
-	    pjsip_endpt_send_response(pjsua_var.endpt, &res_addr, response,
+	    status = pjsip_endpt_send_response(pjsua_var.endpt, &res_addr, response,
 				      NULL, NULL);
-
+	    if (status != PJ_SUCCESS) pjsip_tx_data_dec_ref(response);
 	} else {
 
 	    /* Respond with 500 (Internal Server Error) */
@@ -1491,13 +1535,17 @@
 	pjsua_call_cleanup_flag(&call->opt);
 
 	/* Notify application */
-	if (pjsua_var.ua_cfg.cb.on_call_replace_request) {
+	if (!replaced_call->hanging_up &&
+	    pjsua_var.ua_cfg.cb.on_call_replace_request)
+	{
 	    pjsua_var.ua_cfg.cb.on_call_replace_request(replaced_call->index,
 							rdata,
 							&st_code, &st_text);
 	}
 
-	if (pjsua_var.ua_cfg.cb.on_call_replace_request2) {
+	if (!replaced_call->hanging_up &&
+	    pjsua_var.ua_cfg.cb.on_call_replace_request2)
+	{
 	    pjsua_var.ua_cfg.cb.on_call_replace_request2(replaced_call->index,
 							 rdata,
 							 &st_code, &st_text,
@@ -1628,8 +1676,14 @@
     options |= PJSIP_INV_SUPPORT_TIMER;
     if (pjsua_var.acc[acc_id].cfg.require_100rel == PJSUA_100REL_MANDATORY)
 	options |= PJSIP_INV_REQUIRE_100REL;
-    if (pjsua_var.acc[acc_id].cfg.ice_cfg.enable_ice)
+    if (pjsua_var.acc[acc_id].cfg.ice_cfg.enable_ice) {
 	options |= PJSIP_INV_SUPPORT_ICE;
+	if (pjsua_var.acc[acc_id].cfg.ice_cfg.ice_opt.trickle !=
+	    PJ_ICE_SESS_TRICKLE_DISABLED)
+	{
+	    options |= PJSIP_INV_SUPPORT_TRICKLE_ICE;
+	}
+    }
     if (pjsua_var.acc[acc_id].cfg.use_timer == PJSUA_SIP_TIMER_REQUIRED)
 	options |= PJSIP_INV_REQUIRE_TIMER;
     else if (pjsua_var.acc[acc_id].cfg.use_timer == PJSUA_SIP_TIMER_ALWAYS)
@@ -1646,8 +1700,9 @@
 	    pjsip_response_addr res_addr;
 
 	    pjsip_get_response_addr(response->pool, rdata, &res_addr);
-	    pjsip_endpt_send_response(pjsua_var.endpt, &res_addr, response,
-				      NULL, NULL);
+	    status = pjsip_endpt_send_response(pjsua_var.endpt, &res_addr, response,
+				                           NULL, NULL);
+	    if (status != PJ_SUCCESS) pjsip_tx_data_dec_ref(response);
 
 	} else {
 	    /* Respond with 500 (Internal Server Error) */
@@ -1945,6 +2000,7 @@
 	goto on_return;
 
     } else {
+#if !PJSUA_DISABLE_AUTO_SEND_100
 	status = pjsip_inv_send_msg(inv, response);
 	if (status != PJ_SUCCESS) {
 	    pjsua_perror(THIS_FILE, "Unable to send 100 response", status);
@@ -1953,6 +2009,7 @@
 	    call->async_call.dlg = NULL;
 	    goto on_return;
 	}
+#endif
     }
 
     /* Only do this after sending 100/Trying (really! see the long comment
@@ -2039,7 +2096,8 @@
 {
     PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
 		     PJ_EINVAL);
-    return pjsua_var.calls[call_id].inv != NULL &&
+    return !pjsua_var.calls[call_id].hanging_up &&
+    	   pjsua_var.calls[call_id].inv != NULL &&
 	   pjsua_var.calls[call_id].inv->state != PJSIP_INV_STATE_DISCONNECTED;
 }
 
@@ -2199,7 +2257,9 @@
     pj_memcpy(&info->setting, &call->opt, sizeof(call->opt));
 
     /* state, state_text */
-    if (call->inv) {
+    if (call->hanging_up) {
+        info->state = PJSIP_INV_STATE_DISCONNECTED;
+    } else if (call->inv) {
         info->state = call->inv->state;
         if (call->inv->role == PJSIP_ROLE_UAS &&
             info->state == PJSIP_INV_STATE_NULL)
@@ -2553,6 +2613,15 @@
     if (status != PJ_SUCCESS)
 	goto on_return;
 
+    if (!call->inv->invite_tsx ||
+    	call->inv->invite_tsx->state >= PJSIP_TSX_STATE_COMPLETED)
+    {
+	PJ_LOG(3,(THIS_FILE, "Unable to answer call (no incoming INVITE or "
+			     "already answered)"));
+	status = PJ_EINVALIDOP;
+	goto on_return;
+    }
+
     /* Apply call setting, only if status code is 1xx or 2xx. */
     if (opt && code < 300) {
 	/* Check if it has not been set previously or it is different to
@@ -2714,63 +2783,13 @@
 }
 
 
-/*
- * Hangup call by using method that is appropriate according to the
- * call state.
- */
-PJ_DEF(pj_status_t) pjsua_call_hangup(pjsua_call_id call_id,
-				      unsigned code,
-				      const pj_str_t *reason,
-				      const pjsua_msg_data *msg_data)
+static pj_status_t call_inv_end_session(pjsua_call *call,
+					unsigned code,
+				        const pj_str_t *reason,
+				        const pjsua_msg_data *msg_data)
 {
-    pjsua_call *call;
-    pjsip_dialog *dlg = NULL;
-    pj_status_t status;
     pjsip_tx_data *tdata;
-
-
-    if (call_id<0 || call_id>=(int)pjsua_var.ua_cfg.max_calls) {
-	PJ_LOG(1,(THIS_FILE, "pjsua_call_hangup(): invalid call id %d",
-			     call_id));
-    }
-
-    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
-		     PJ_EINVAL);
-
-    PJ_LOG(4,(THIS_FILE, "Call %d hanging up: code=%d..", call_id, code));
-    pj_log_push_indent();
-
-    status = acquire_call("pjsua_call_hangup()", call_id, &call, &dlg);
-    if (status != PJ_SUCCESS)
-	goto on_return;
-
-    call->hanging_up = PJ_TRUE;
-
-    /* If media transport creation is not yet completed, we will hangup
-     * the call in the media transport creation callback instead.
-     */
-    if ((call->med_ch_cb && !call->inv) ||
-	((call->inv != NULL) && (call->inv->state == PJSIP_INV_STATE_NULL)))
-    {
-        PJ_LOG(4,(THIS_FILE, "Pending call %d hangup upon completion "
-                             "of media transport", call_id));
-
-	if (call->inv && call->inv->role == PJSIP_ROLE_UAS)
-	    call->async_call.call_var.inc_call.hangup = PJ_TRUE;
-	else
-	    call->async_call.call_var.out_call.hangup = PJ_TRUE;
-
-        if (code == 0)
-            call->last_code = PJSIP_SC_REQUEST_TERMINATED;
-        else
-            call->last_code = (pjsip_status_code)code;
-        if (reason) {
-            pj_strncpy(&call->last_text, reason,
-		       sizeof(call->last_text_buf_));
-        }
-
-        goto on_return;
-    }
+    pj_status_t status;
 
     if (code==0) {
 	if (call->inv->state == PJSIP_INV_STATE_CONFIRMED)
@@ -2781,12 +2800,17 @@
 	    code = PJSIP_SC_REQUEST_TERMINATED;
     }
 
+    /* Stop hangup timer, if it is active. */
+    if (call->hangup_timer.id) {
+	pjsua_cancel_timer(&call->hangup_timer);
+	call->hangup_timer.id = PJ_FALSE;
+    }
+
     status = pjsip_inv_end_session(call->inv, code, reason, &tdata);
     if (status != PJ_SUCCESS) {
 	pjsua_perror(THIS_FILE,
 		     "Failed to create end session message",
 		     status);
-	call->hanging_up = PJ_FALSE;
 	goto on_return;
     }
 
@@ -2794,8 +2818,9 @@
      * as p_tdata when INVITE transaction has not been answered
      * with any provisional responses.
      */
-    if (tdata == NULL)
+    if (tdata == NULL) {
 	goto on_return;
+    }
 
     /* Add additional headers etc */
     pjsua_process_msg_data( tdata, msg_data);
@@ -2806,14 +2831,182 @@
 	pjsua_perror(THIS_FILE,
 		     "Failed to send end session message",
 		     status);
-	call->hanging_up = PJ_FALSE;
 	goto on_return;
     }
+    
+on_return:
+    /* Failure in pjsip_inv_send_msg() can cause
+     * pjsua_call_on_state_changed() to be called and call to be reset,
+     * so we need to check for call->inv as well.
+     */
+    if (status != PJ_SUCCESS && call->inv) {
+    	pj_time_val delay;
+
+    	/* Schedule a retry */
+    	if (call->hangup_retry >= CALL_HANGUP_MAX_RETRY) {
+    	    /* Forcefully terminate the invite session. */
+	    PJ_LOG(1,(THIS_FILE,"Call %d: failed to hangup after %d retries, "
+				"terminating the session forcefully now!",
+				call->index, call->hangup_retry));
+    	    pjsip_inv_terminate(call->inv, call->hangup_code, PJ_TRUE);
+    	    return PJ_SUCCESS;
+    	}
+    	    
+    	if (call->hangup_retry == 0) {
+    	    pj_timer_entry_init(&call->hangup_timer, PJ_FALSE,
+				(void*)call, &hangup_timer_cb);
+
+    	    call->hangup_code = code;
+    	    if (reason) {
+    	    	pj_strdup(call->inv->pool_prov, &call->hangup_reason,
+    	    	    	  reason);
+    	    }
+    	    if (msg_data) {
+    	     	call->hangup_msg_data = pjsua_msg_data_clone(
+    	     				    call->inv->pool_prov,
+    	     				    msg_data);
+    	    }
+    	}
 
-    /* Stop reinvite timer, if it is active */
-    if (call->reinv_timer.id) {
-	pjsua_cancel_timer(&call->reinv_timer);
-	call->reinv_timer.id = PJ_FALSE;
+	delay.sec = 0;
+    	delay.msec = CALL_HANGUP_RETRY_INTERVAL;
+    	pj_time_val_normalize(&delay);
+    	call->hangup_timer.id = PJ_TRUE;
+    	pjsua_schedule_timer(&call->hangup_timer, &delay);
+    	call->hangup_retry++;
+
+       	PJ_LOG(4, (THIS_FILE, "Will retry call %d hangup in %d msec",
+                              call->index, CALL_HANGUP_RETRY_INTERVAL));
+    }
+
+    return PJ_SUCCESS;
+}
+
+/* Timer callback to hangup call */
+static void hangup_timer_cb(pj_timer_heap_t *th, pj_timer_entry *entry)
+{
+    pjsua_call* call = (pjsua_call *)entry->user_data;
+    pjsip_dialog *dlg;
+    pj_status_t status;
+
+    PJ_UNUSED_ARG(th);
+
+    pj_log_push_indent();
+
+    status = acquire_call("hangup_timer_cb()", call->index, &call, &dlg);
+    if (status != PJ_SUCCESS) {
+	pj_log_pop_indent();
+	return;
+    }
+
+    call->hangup_timer.id = PJ_FALSE;
+    call_inv_end_session(call, call->hangup_code, &call->hangup_reason,
+    			 call->hangup_msg_data);
+
+    pjsip_dlg_dec_lock(dlg);
+
+    pj_log_pop_indent();
+}
+
+/*
+ * Hangup call by using method that is appropriate according to the
+ * call state.
+ */
+PJ_DEF(pj_status_t) pjsua_call_hangup(pjsua_call_id call_id,
+				      unsigned code,
+				      const pj_str_t *reason,
+				      const pjsua_msg_data *msg_data)
+{
+    pjsua_call *call;
+    pjsip_dialog *dlg = NULL;
+    pj_status_t status;
+
+    if (call_id<0 || call_id>=(int)pjsua_var.ua_cfg.max_calls) {
+	PJ_LOG(1,(THIS_FILE, "pjsua_call_hangup(): invalid call id %d",
+			     call_id));
+    }
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+		     PJ_EINVAL);
+
+    PJ_LOG(4,(THIS_FILE, "Call %d hanging up: code=%d..", call_id, code));
+    pj_log_push_indent();
+
+    status = acquire_call("pjsua_call_hangup()", call_id, &call, &dlg);
+    if (status != PJ_SUCCESS)
+	goto on_return;
+
+    if (!call->hanging_up) {
+	pjsip_event user_event;
+
+	pj_gettimeofday(&call->dis_time);
+	if (call->res_time.sec == 0)
+	    pj_gettimeofday(&call->res_time);
+
+    	if (code==0) {
+	    if (call->inv && call->inv->state == PJSIP_INV_STATE_CONFIRMED)
+	        code = PJSIP_SC_OK;
+	    else if (call->inv && call->inv->role == PJSIP_ROLE_UAS)
+	    	code = PJSIP_SC_DECLINE;
+	    else
+	    	code = PJSIP_SC_REQUEST_TERMINATED;
+    	}
+    	
+	call->last_code = code;
+	pj_strncpy(&call->last_text,
+	    	   pjsip_get_status_text(call->last_code),
+		   sizeof(call->last_text_buf_));
+
+    	/* Stop reinvite timer, if it is active. */
+    	if (call->reinv_timer.id) {
+	    pjsua_cancel_timer(&call->reinv_timer);
+	    call->reinv_timer.id = PJ_FALSE;
+    	}
+
+    	/* If media transport creation is not yet completed, we will continue
+    	 * from the media transport creation callback instead.
+         */
+    	if ((call->med_ch_cb && !call->inv) ||
+	    ((call->inv != NULL) &&
+	     (call->inv->state == PJSIP_INV_STATE_NULL)))
+    	{
+            PJ_LOG(4,(THIS_FILE, "Will continue call %d hangup upon "
+                             	 "completion of media transport", call_id));
+
+	    if (call->inv && call->inv->role == PJSIP_ROLE_UAS)
+	    	call->async_call.call_var.inc_call.hangup = PJ_TRUE;
+	    else
+	    	call->async_call.call_var.out_call.hangup = PJ_TRUE;
+
+            if (reason) {
+            	pj_strncpy(&call->last_text, reason,
+		       	   sizeof(call->last_text_buf_));
+            }
+
+	    call->hanging_up = PJ_TRUE;
+    	} else {
+    	    /* Destroy media session. */
+    	    pjsua_media_channel_deinit(call_id);
+	    call->hanging_up = PJ_TRUE;
+	    pjsua_check_snd_dev_idle();
+	}
+
+    	/* Call callback which will report DISCONNECTED state.
+    	 * Use user event rather than NULL to avoid crash in
+	 * unsuspecting app.
+	 */
+	PJSIP_EVENT_INIT_USER(user_event, 0, 0, 0, 0);
+    	if (pjsua_var.ua_cfg.cb.on_call_state) {
+	    (*pjsua_var.ua_cfg.cb.on_call_state)(call->index,
+	    					 &user_event);
+	}
+
+	if (call->inv)
+	    call_inv_end_session(call, code, reason, msg_data);
+    } else {
+	/* Already requested and on progress */
+        PJ_LOG(4,(THIS_FILE, "Call %d hangup request ignored as "
+			     "it is on progress", call_id));
     }
 
 on_return:
@@ -3467,24 +3660,32 @@
     pjsip_media_type ctype;
     pjsua_im_data *im_data;
     pjsip_tx_data *tdata;
+    pj_bool_t content_in_msg_data;
     pj_status_t status;
 
+    content_in_msg_data = msg_data && (msg_data->msg_body.slen ||
+				       msg_data->multipart_ctype.type.slen);
+
     PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
 		     PJ_EINVAL);
+    
+    /* Message body must be specified. */
+    PJ_ASSERT_RETURN(content || content_in_msg_data, PJ_EINVAL);
+
+    if (content) {
+	PJ_LOG(4,(THIS_FILE, "Call %d sending %d bytes MESSAGE..",
+        		      call_id, (int)content->slen));
+    } else {
+	PJ_LOG(4,(THIS_FILE, "Call %d sending MESSAGE..",
+        		      call_id));
+    }
 
-    PJ_LOG(4,(THIS_FILE, "Call %d sending %d bytes MESSAGE..",
-        	          call_id, (int)content->slen));
     pj_log_push_indent();
 
     status = acquire_call("pjsua_call_send_im()", call_id, &call, &dlg);
     if (status != PJ_SUCCESS)
 	goto on_return;
 
-    /* Set default media type if none is specified */
-    if (mime_type == NULL) {
-	mime_type = &mime_text_plain;
-    }
-
     /* Create request message. */
     status = pjsip_dlg_create_request( call->inv->dlg, &pjsip_message_method,
 				       -1, &tdata);
@@ -3497,16 +3698,24 @@
     pjsip_msg_add_hdr( tdata->msg,
 		       (pjsip_hdr*)pjsua_im_create_accept(tdata->pool));
 
-    /* Parse MIME type */
-    pjsua_parse_media_type(tdata->pool, mime_type, &ctype);
-
-    /* Create "text/plain" message body. */
-    tdata->msg->body = pjsip_msg_body_create( tdata->pool, &ctype.type,
-					      &ctype.subtype, content);
-    if (tdata->msg->body == NULL) {
-	pjsua_perror(THIS_FILE, "Unable to create msg body", PJ_ENOMEM);
-	pjsip_tx_data_dec_ref(tdata);
-	goto on_return;
+    /* Add message body, if content is set */
+    if (content) {
+	/* Set default media type if none is specified */
+	if (mime_type == NULL) {
+	    mime_type = &mime_text_plain;
+	}
+
+	/* Parse MIME type */
+	pjsua_parse_media_type(tdata->pool, mime_type, &ctype);
+
+	/* Create "text/plain" message body. */
+	tdata->msg->body = pjsip_msg_body_create( tdata->pool, &ctype.type,
+						  &ctype.subtype, content);
+	if (tdata->msg->body == NULL) {
+	    pjsua_perror(THIS_FILE, "Unable to create msg body", PJ_ENOMEM);
+	    pjsip_tx_data_dec_ref(tdata);
+	    goto on_return;
+	}
     }
 
     /* Add additional headers etc */
@@ -3517,7 +3726,8 @@
     im_data->acc_id = call->acc_id;
     im_data->call_id = call_id;
     im_data->to = call->inv->dlg->remote.info_str;
-    pj_strdup_with_null(tdata->pool, &im_data->body, content);
+    if (content)
+	pj_strdup_with_null(tdata->pool, &im_data->body, content);
     im_data->user_data = user_data;
 
 
@@ -3945,6 +4155,9 @@
 		  ));
     }
 
+    /* Clear reinit media flag. Should we also cleanup other flags here? */
+    call->opt.flag &= ~PJSUA_CALL_REINIT_MEDIA;
+
     /* Generate SDP re-offer */
     status = pjsua_media_channel_create_sdp(call->index, pool, NULL,
 					    &new_offer, NULL);
@@ -4125,6 +4338,478 @@
 }
 
 
+static void trickle_ice_retrans_18x(pj_timer_heap_t *th,
+				    struct pj_timer_entry *te)
+{
+    pjsua_call *call = (pjsua_call*)te->user_data;
+    pjsip_tx_data *tdata = NULL;
+    pj_time_val delay;
+
+    PJ_UNUSED_ARG(th);
+
+    /* If trickling has been started or dialog has been established on
+     * both sides, stop 18x retransmission.
+     */
+    if (call->trickle_ice.trickling >= PJSUA_OP_STATE_RUNNING ||
+	call->trickle_ice.remote_dlg_est)
+    {
+	return;
+    }
+
+    /* Make sure last tdata is 18x response */
+    if (call->inv->invite_tsx)
+	tdata = call->inv->invite_tsx->last_tx;
+    if (!tdata || tdata->msg->type != PJSIP_RESPONSE_MSG ||
+	tdata->msg->line.status.code/10 != 18)
+    {
+	return;
+    }
+
+    /* Retransmit 18x */
+    ++call->trickle_ice.retrans18x_count;
+    PJ_LOG(4,(THIS_FILE,
+	      "Call %d: ICE trickle retransmitting 18x (retrans #%d)",
+	      call->index, call->trickle_ice.retrans18x_count));
+
+    pjsip_tx_data_add_ref(tdata);
+    pjsip_tsx_retransmit_no_state(call->inv->invite_tsx, tdata);
+
+    /* Schedule next retransmission */
+    if (call->trickle_ice.retrans18x_count < 6) {
+	pj_uint32_t tmp;
+	tmp = (1 << call->trickle_ice.retrans18x_count) * pjsip_cfg()->tsx.t1;
+	delay.sec = 0;
+	delay.msec = tmp;
+	pj_time_val_normalize(&delay);
+    } else {
+	delay.sec = 1;
+	delay.msec = 500;
+    }
+    pjsua_schedule_timer(te, &delay);
+}
+
+
+static void trickle_ice_recv_sip_info(pjsua_call *call, pjsip_rx_data *rdata)
+{
+    pjsip_media_type med_type;
+    pjsip_rdata_sdp_info *sdp_info;
+    pj_status_t status;
+    unsigned i, j, med_cnt;
+    pj_bool_t use_med_prov;
+
+    pjsip_media_type_init2(&med_type, "application", "trickle-ice-sdpfrag");
+
+    /* Parse the SDP */
+    sdp_info = pjsip_rdata_get_sdp_info2(rdata, &med_type);
+    if (!sdp_info->sdp) {
+	pj_status_t err = sdp_info->body.ptr? sdp_info->sdp_err:PJ_ENOTFOUND;
+	pjsua_perror(THIS_FILE, "Failed to parse trickle ICE SDP in "
+				"incoming INFO", err);
+	return;
+    }
+
+    PJSUA_LOCK();
+
+    /* Retrieve the candidates from the SDP */
+    use_med_prov = call->med_prov_cnt > call->med_cnt;
+    med_cnt = use_med_prov? call->med_prov_cnt : call->med_cnt;
+    for (i = 0; i < sdp_info->sdp->media_count; ++i) {
+	pjmedia_transport *tp = NULL;
+	pj_str_t mid, ufrag, pwd;
+	unsigned cand_cnt = PJ_ICE_ST_MAX_CAND;
+	pj_ice_sess_cand cand[PJ_ICE_ST_MAX_CAND];
+	pj_bool_t end_of_cand;
+
+	status = pjmedia_ice_trickle_decode_sdp(sdp_info->sdp, i, &mid,
+						&ufrag, &pwd,
+						&cand_cnt, cand,
+						&end_of_cand);
+	if (status != PJ_SUCCESS) {
+	    pjsua_perror(THIS_FILE, "Failed to retrive ICE candidates from "
+				    "SDP in incoming INFO", status);
+	    continue;
+	}
+
+	for (j = 0; j < med_cnt; ++j) {
+	    pjsua_call_media *cm = use_med_prov? &call->media_prov[j] :
+						 &call->media[j];
+	    tp = cm->tp_orig;
+
+	    if (tp && tp->type == PJMEDIA_TRANSPORT_TYPE_ICE &&
+		pj_strcmp(&cm->rem_mid, &mid) == 0)
+	    {
+		break;
+	    }
+	}
+
+	if (j == med_cnt) {
+	    pjsua_perror(THIS_FILE, "Cannot add remote candidates from SDP in "
+			 "incoming INFO because media ID (SDP a=mid) is not "
+			 "recognized",
+			 PJ_EIGNORED);
+	    continue;
+	}
+
+	/* Update ICE checklist */
+	status = pjmedia_ice_trickle_update(tp, &ufrag, &pwd, cand_cnt, cand,
+					    end_of_cand);
+	if (status != PJ_SUCCESS) {
+	    pjsua_perror(THIS_FILE, "Failed to update ICE checklist from "
+				    "incoming INFO", status);
+	}
+    }
+
+    PJSUA_UNLOCK();
+}
+
+
+static void trickle_ice_send_sip_info(pj_timer_heap_t *th,
+				      struct pj_timer_entry *te)
+{
+    pjsua_call *call = (pjsua_call*)te->user_data;
+    pj_pool_t *tmp_pool = NULL;
+    pj_bool_t all_end_of_cand, use_med_prov;
+    pjmedia_sdp_session *sdp;
+    unsigned i, med_cnt;
+    pjsua_msg_data msg_data;
+    pjsip_generic_string_hdr hdr1, hdr2;
+    pj_status_t status = PJ_SUCCESS;
+    pj_bool_t forced, need_send = PJ_FALSE;
+    pj_sockaddr orig_addr;
+
+    pj_str_t SIP_INFO		= {"INFO", 4};
+    pj_str_t CONTENT_DISP_STR	= {"Content-Disposition", 19};
+    pj_str_t INFO_PKG_STR	= {"Info-Package", 12};
+    pj_str_t TRICKLE_ICE_STR	= {"trickle-ice", 11};
+
+    PJ_UNUSED_ARG(th);
+
+    PJSUA_LOCK();
+
+    /* Check provisional media or active media to use */
+    use_med_prov = call->med_prov_cnt > call->med_cnt;
+    med_cnt = use_med_prov? call->med_prov_cnt : call->med_cnt;
+
+    /* Check if any pending INFO already */
+    if (call->trickle_ice.pending_info)
+	goto on_return;
+
+    /* Check if any new candidate, if not forced */
+    forced = (te->id == 2);
+    if (!forced) {
+	for (i = 0; i < med_cnt; ++i) {
+	    pjsua_call_media *cm = use_med_prov? &call->media_prov[i] :
+						 &call->media[i];
+	    pjmedia_transport *tp = cm->tp_orig;
+
+	    if (!tp || tp->type != PJMEDIA_TRANSPORT_TYPE_ICE)
+		continue;
+
+	    if (pjmedia_ice_trickle_has_new_cand(tp))
+		break;
+	}
+
+	/* No new local candidate */
+	if (i == med_cnt)
+	    goto on_return;
+    }
+
+    PJ_LOG(4,(THIS_FILE, "Call %d: ICE trickle sending SIP INFO%s",
+	      call->index, (forced? " (forced)":"")));
+
+    /* Create temporary pool */
+    tmp_pool = pjsua_pool_create("tmp_ice", 128, 128);
+
+    /* Create empty SDP */
+    pj_sockaddr_init(pj_AF_INET(), &orig_addr, NULL, 0);
+    status = pjmedia_endpt_create_base_sdp(pjsua_var.med_endpt, tmp_pool,
+					   NULL, &orig_addr, &sdp);
+    if (status != PJ_SUCCESS)
+	goto on_return;
+
+    /* Generate SDP for SIP INFO */
+    all_end_of_cand = PJ_TRUE;
+    for (i = 0; i < med_cnt; ++i) {
+	pjsua_call_media *cm = use_med_prov? &call->media_prov[i] :
+					     &call->media[i];
+	pjmedia_transport *tp = cm->tp_orig;
+	pj_bool_t end_of_cand = PJ_FALSE;
+
+	if (!tp || tp->type != PJMEDIA_TRANSPORT_TYPE_ICE)
+	    continue;
+
+	status = pjmedia_ice_trickle_send_local_cand(tp, tmp_pool, sdp,
+						     &end_of_cand);
+	if (status != PJ_SUCCESS || !end_of_cand)
+	    all_end_of_cand = PJ_FALSE;
+
+	need_send |= (status==PJ_SUCCESS);
+    }
+
+    if (!need_send)
+	goto on_return;
+
+    /* Generate and send SIP INFO */
+    pjsua_msg_data_init(&msg_data);
+
+    pjsip_generic_string_hdr_init2(&hdr1, &INFO_PKG_STR, &TRICKLE_ICE_STR);
+    pj_list_push_back(&msg_data.hdr_list, &hdr1);
+    pjsip_generic_string_hdr_init2(&hdr2, &CONTENT_DISP_STR, &INFO_PKG_STR);
+    pj_list_push_back(&msg_data.hdr_list, &hdr2);
+
+    msg_data.content_type = pj_str("application/trickle-ice-sdpfrag");
+    msg_data.msg_body.ptr = pj_pool_alloc(tmp_pool, PJSIP_MAX_PKT_LEN);
+    msg_data.msg_body.slen = pjmedia_sdp_print(sdp, msg_data.msg_body.ptr,
+					       PJSIP_MAX_PKT_LEN);
+    if (msg_data.msg_body.slen == -1) {
+	PJ_LOG(3,(THIS_FILE,
+		  "Warning! Call %d: ICE trickle failed to print SDP for "
+		  "SIP INFO due to insufficient buffer", call->index));
+	goto on_return;
+    }
+
+    status = pjsua_call_send_request(call->index, &SIP_INFO, &msg_data);
+    if (status != PJ_SUCCESS)
+	goto on_return;
+
+    /* Set flag for pending SIP INFO */
+    call->trickle_ice.pending_info = PJ_TRUE;
+
+    /* Stop trickling if local candidate gathering for all media is done */
+    if (all_end_of_cand) {
+	PJ_LOG(4,(THIS_FILE, "Call %d: ICE trickle stopped trickling "
+			     "as local candidate gathering completed",
+			     call->index));
+	call->trickle_ice.trickling = PJSUA_OP_STATE_DONE;
+    }
+
+    /* Update ICE checklist after conveying local candidates. */
+    for (i = 0; i < med_cnt; ++i) {
+	pjsua_call_media *cm = use_med_prov? &call->media_prov[i] :
+					     &call->media[i];
+	pjmedia_transport *tp = cm->tp_orig;
+	if (!tp || tp->type != PJMEDIA_TRANSPORT_TYPE_ICE)
+	    continue;
+
+	pjmedia_ice_trickle_update(tp, NULL, NULL, 0, NULL, PJ_FALSE);
+    }
+
+on_return:
+    if (tmp_pool)
+	pj_pool_release(tmp_pool);
+
+    /* Reschedule if we are trickling */
+    if (call->trickle_ice.trickling == PJSUA_OP_STATE_RUNNING) {
+	pj_time_val delay = {0, PJSUA_TRICKLE_ICE_NEW_CAND_CHECK_INTERVAL};
+
+	/* Reset forced mode after successfully sending forced SIP INFO */
+	te->id = (status==PJ_SUCCESS? 0 : 2);
+
+	pj_time_val_normalize(&delay);
+	pjsua_schedule_timer(te, &delay);
+    }
+
+    PJSUA_UNLOCK();
+}
+
+
+/* Before sending INFO can be started, UA needs to confirm these:
+ * 1. dialog is established (perhaps early) at both sides,
+ * 2. trickle ICE is supported by peer.
+ *
+ * This function needs to be called when:
+ * - UAS sending 18x, to start 18x retrans
+ * - UAC receiving 18x, to forcefully send SIP INFO & start trickling
+ * - UAS receiving INFO, to cease 18x retrans & start trickling
+ * - UAS receiving PRACK, to start trickling
+ * - UAC/UAS receiving remote SDP (and check for trickle ICE support),
+ *   to start trickling.
+ */
+void pjsua_ice_check_start_trickling(pjsua_call *call,
+				     pj_bool_t forceful,
+				     pjsip_event *e)
+{
+    pjsip_inv_session *inv = call->inv;
+
+    /* Make sure trickling/sending-INFO has not been started */
+    if (!forceful && call->trickle_ice.trickling >= PJSUA_OP_STATE_RUNNING)
+	return;
+
+    /* Make sure trickle ICE is enabled */
+    if (!call->trickle_ice.enabled)
+	return;
+
+    /* Make sure the dialog state is established */
+    if (!inv || inv->dlg->state != PJSIP_DIALOG_STATE_ESTABLISHED)
+	return;
+
+    /* First, make sure remote dialog is also established. */
+    if (inv->state == PJSIP_INV_STATE_CONFIRMED) {
+	/* Set flag indicating remote dialog is established */
+	call->trickle_ice.remote_dlg_est = PJ_TRUE;
+    } else if (inv->state > PJSIP_INV_STATE_CONFIRMED) {
+	/* Call is terminating/terminated (just trying to be safe) */
+	call->trickle_ice.remote_dlg_est = PJ_FALSE;
+    } else if (!call->trickle_ice.remote_dlg_est && e) {
+	/* Call is being initialized */
+	pjsip_msg *msg = NULL;
+	pjsip_rx_data *rdata = NULL;
+	pjsip_tx_data *tdata = NULL;
+	pj_bool_t has_100rel = (inv->options & PJSIP_INV_REQUIRE_100REL);
+	pj_timer_entry *te = &call->trickle_ice.timer;
+
+	if (e->type == PJSIP_EVENT_TSX_STATE &&
+	    e->body.tsx_state.type == PJSIP_EVENT_RX_MSG)
+	{
+	    rdata = e->body.tsx_state.src.rdata;
+	} else if (e->type == PJSIP_EVENT_TSX_STATE &&
+		   e->body.tsx_state.type == PJSIP_EVENT_TX_MSG)
+	{
+	    tdata = e->body.tsx_state.src.tdata;
+	} else {
+	    return;
+	}
+
+	/* UAC must have received 18x at this point, so dialog must have been
+	 * established at the remote side.
+	 */
+	if (inv->role == PJSIP_ROLE_UAC) {
+	    /* UAC needs to send SIP INFO when receiving 18x and 100rel is not
+	     * active.
+	     * Note that 18x may not have SDP (so we don't know if remote
+	     * supports trickle ICE), but we should send INFO anyway, as the
+	     * draft allows start trickling without answer.
+	     */
+	    if (!has_100rel && rdata &&
+		rdata->msg_info.msg->type == PJSIP_RESPONSE_MSG &&
+		rdata->msg_info.msg->line.status.code/10 == 18)
+	    {
+		pjsip_rdata_sdp_info *sdp_info;
+		sdp_info = pjsip_rdata_get_sdp_info(rdata);
+		if (sdp_info->sdp) {
+		    unsigned i;
+		    for (i = 0; i < sdp_info->sdp->media_count; ++i) {
+			if (pjmedia_ice_sdp_has_trickle(sdp_info->sdp, i)) {
+			    call->trickle_ice.remote_sup = PJ_TRUE;
+			    break;
+			}
+		    }
+		} else {
+		    /* Start sending SIP INFO forcefully */
+		    forceful = PJ_TRUE;
+		}
+
+		if (forceful || call->trickle_ice.remote_sup) {
+		    PJ_LOG(4,(THIS_FILE,
+			      "Call %d: ICE trickle started after UAC "
+			      "receiving 18x (with%s SDP)",
+			      call->index, sdp_info->sdp?"":"out"));
+		}
+	    }
+	}
+
+	/* But if we are the UAS, we need to wait for SIP PRACK or INFO to
+	 * confirm dialog state at remote. And while waiting, 18x needs to be
+	 * retransmitted.
+	 */
+	else {
+
+	    if (tdata && e->body.tsx_state.tsx == inv->invite_tsx &&
+		call->trickle_ice.retrans18x_count == 0)
+	    {
+		/* Ignite 18x retransmission */
+		msg = tdata->msg;
+		if (msg->type == PJSIP_RESPONSE_MSG &&
+		    msg->line.status.code/10 == 18)
+		{
+		    pj_time_val delay;
+		    delay.sec = pjsip_cfg()->tsx.t1 / 1000;
+		    delay.msec = pjsip_cfg()->tsx.t1 % 1000;
+		    pj_assert(!pj_timer_entry_running(te));
+		    te->cb = &trickle_ice_retrans_18x;
+		    pjsua_schedule_timer(te, &delay);
+
+		    PJ_LOG(4,(THIS_FILE,
+			      "Call %d: ICE trickle start retransmitting 18x",
+			      call->index));
+		}
+		return;
+	    }
+
+	    /* Check for incoming PRACK or INFO to stop 18x retransmission */
+	    if (!rdata)
+		return;
+
+	    msg = rdata->msg_info.msg;
+	    if (has_100rel) {
+		/* With 100rel, has received PRACK? */
+		if (msg->type != PJSIP_REQUEST_MSG ||
+		    pjsip_method_cmp(&msg->line.req.method,
+				     pjsip_get_prack_method()))
+		{
+		    return;
+		}
+	    } else {
+		pj_str_t INFO_PKG_STR = {"Info-Package", 12};
+		pjsip_generic_string_hdr *hdr;
+
+		/* Without 100rel, has received INFO? */
+		if (msg->type != PJSIP_REQUEST_MSG ||
+		    pjsip_method_cmp(&msg->line.req.method,
+				     &pjsip_info_method))
+		{
+		    return;
+		}
+
+		/* With Info-Package header containing 'trickle-ice' */
+		hdr = (pjsip_generic_string_hdr*)
+		      pjsip_msg_find_hdr_by_name(msg, &INFO_PKG_STR, NULL);
+		if (!hdr || pj_strcmp2(&hdr->hvalue, "trickle-ice"))
+		    return;
+
+		/* Set the flag indicating remote supports trickle ICE */
+		call->trickle_ice.remote_sup = PJ_TRUE;
+	    }
+	    PJ_LOG(4,(THIS_FILE,
+		      "Call %d: ICE trickle stop retransmitting 18x after "
+		      "receiving %s",
+		      call->index, (has_100rel?"PRACK":"INFO")));
+	}
+
+	/* Set flag indicating remote dialog is established.
+	 * Any 18x retransmission should be ceased automatically.
+	 */
+	call->trickle_ice.remote_dlg_est = PJ_TRUE;
+    }
+
+    /* Check if ICE trickling can be started */
+    if (!forceful &&
+	(!call->trickle_ice.remote_dlg_est || !call->trickle_ice.remote_sup))
+    {
+	return;
+    }
+
+    /* Let's start trickling (or sending SIP INFO) */
+    if (forceful || call->trickle_ice.trickling < PJSUA_OP_STATE_RUNNING)
+    {
+	pj_timer_entry *te = &call->trickle_ice.timer;
+	pj_time_val delay = {0,0};
+
+	if (call->trickle_ice.trickling < PJSUA_OP_STATE_RUNNING)
+	    call->trickle_ice.trickling = PJSUA_OP_STATE_RUNNING;
+
+	pjsua_cancel_timer(te);
+	te->id = forceful? 2 : 0;
+	te->cb = &trickle_ice_send_sip_info;
+	pjsua_schedule_timer(te, &delay);
+
+	PJ_LOG(4,(THIS_FILE,
+		  "Call %d: ICE trickle start trickling",
+		  call->index));
+    }
+}
+
+
 /*
  * This callback receives notification from invite session when the
  * session state has changed.
@@ -4158,8 +4843,21 @@
 		       sizeof(call->last_text_buf_));
 	    break;
 	case PJSIP_INV_STATE_CONFIRMED:
+	    if (call->hanging_up) {
+	    	/* This can happen if there is a crossover between
+	    	 * our CANCEL request and the remote's 200 response.
+	    	 * So we send BYE here.
+	    	 */
+	    	call_inv_end_session(call, 200, NULL, NULL);
+	    	return;
+	    }
 	    pj_gettimeofday(&call->conn_time);
 
+	    if (call->trickle_ice.enabled) {
+		call->trickle_ice.remote_dlg_est = PJ_TRUE;
+		pjsua_ice_check_start_trickling(call, PJ_FALSE, NULL);
+	    }
+
             /* See if auto reinvite was pended as media update was done in the
              * EARLY state and remote does not support UPDATE.
              */
@@ -4268,6 +4966,16 @@
 	}
     }
 
+    /* Destroy media session when invite session is disconnected. */
+    if (inv->state == PJSIP_INV_STATE_DISCONNECTED) {
+	PJSUA_LOCK();
+
+	if (!call->hanging_up)
+	    pjsua_media_channel_deinit(call->index);
+	
+	PJSUA_UNLOCK();
+    }
+
     /* Release locks before calling callbacks, to avoid deadlock. */
     while (PJSUA_LOCK_IS_LOCKED()) {
     	num_locks++;
@@ -4277,14 +4985,14 @@
     /* Ticket #1627: Invoke on_call_tsx_state() when call is disconnected. */
     if (inv->state == PJSIP_INV_STATE_DISCONNECTED &&
 	e->type == PJSIP_EVENT_TSX_STATE &&
-	call->inv &&
+	!call->hanging_up && call->inv &&
 	pjsua_var.ua_cfg.cb.on_call_tsx_state)
     {
 	(*pjsua_var.ua_cfg.cb.on_call_tsx_state)(call->index,
 						 e->body.tsx_state.tsx, e);
     }
 
-    if (pjsua_var.ua_cfg.cb.on_call_state)
+    if (!call->hanging_up && pjsua_var.ua_cfg.cb.on_call_state)
 	(*pjsua_var.ua_cfg.cb.on_call_state)(call->index, e);
 
     /* Re-acquire the locks. */
@@ -4293,13 +5001,11 @@
 
     /* call->inv may be NULL now */
 
-    /* Destroy media session when invite session is disconnected. */
+    /* Finally, free call when invite session is disconnected. */
     if (inv->state == PJSIP_INV_STATE_DISCONNECTED) {
 
 	PJSUA_LOCK();
 
-	pjsua_media_channel_deinit(call->index);
-
 	/* Free call */
 	call->inv = NULL;
 
@@ -4381,7 +5087,7 @@
     pj_status_t status;
 
     status = pjsip_inv_end_session(inv, code, NULL, &tdata);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS || !tdata)
 	return;
 
 #if DISABLED_FOR_TICKET_1185
@@ -4434,8 +5140,8 @@
 
 	pjsua_perror(THIS_FILE, "SDP negotiation has failed", status);
 
-	/* Clean up provisional media */
-	pjsua_media_prov_clean_up(call->index);
+	/* Revert back provisional media. */
+	pjsua_media_prov_revert(call->index);
 
 	/* Do not deinitialize media since this may be a re-INVITE or
 	 * UPDATE (which in this case the media should not get affected
@@ -4479,6 +5185,20 @@
 
     call->med_update_success = (status == PJ_SUCCESS);
 
+    /* Trickle ICE tasks:
+     * - Check remote SDP for trickle ICE support & start sending SIP INFO.
+     */
+    {
+	unsigned i;
+	for (i = 0; i < remote_sdp->media_count; ++i) {
+	    if (pjmedia_ice_sdp_has_trickle(remote_sdp, i))
+		break;
+	}
+	call->trickle_ice.remote_sup = (i < remote_sdp->media_count);
+	if (call->trickle_ice.remote_sup)
+	    pjsua_ice_check_start_trickling(call, PJ_FALSE, NULL);
+    }
+
     /* Update remote's NAT type */
     if (pjsua_var.ua_cfg.nat_type_in_sdp) {
 	update_remote_nat_type(call, remote_sdp);
@@ -4512,7 +5232,7 @@
     pjsua_call_schedule_reinvite_check(call, 0);
 
     /* Call application callback, if any */
-    if (pjsua_var.ua_cfg.cb.on_call_media_state)
+    if (!call->hanging_up && pjsua_var.ua_cfg.cb.on_call_media_state)
 	pjsua_var.ua_cfg.cb.on_call_media_state(call->index);
 
 on_return:
@@ -4637,6 +5357,8 @@
     pj_bool_t async = PJ_FALSE;
 
     call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
+    if (call->hanging_up)
+     	return;
 
     /* Supply candidate answer */
     PJ_LOG(4,(THIS_FILE, "Call %d: received updated media offer",
@@ -4811,9 +5533,11 @@
     pj_log_push_indent();
 
     call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
-    if (pjsua_call_media_is_changing(call)) {
+    if (call->hanging_up || pjsua_call_media_is_changing(call)) {
 	*offer = NULL;
-	PJ_LOG(1,(THIS_FILE, "Unable to create offer" ERR_MEDIA_CHANGING));
+	PJ_LOG(1,(THIS_FILE, "Unable to create offer%s",
+ 		  call->hanging_up? ", call hanging up":
+ 		  ERR_MEDIA_CHANGING));
 	goto on_return;
     }
     
@@ -4930,7 +5654,9 @@
 	    /* Since no subscription is desired, assume that call has been
 	     * transferred successfully.
 	     */
-	    if (call && pjsua_var.ua_cfg.cb.on_call_transfer_status) {
+	    if (call && !call->hanging_up &&
+	        pjsua_var.ua_cfg.cb.on_call_transfer_status)
+	    {
 		const pj_str_t ACCEPTED = { "Accepted", 8 };
 		pj_bool_t cont = PJ_FALSE;
 		(*pjsua_var.ua_cfg.cb.on_call_transfer_status)(call->index,
@@ -4951,7 +5677,9 @@
 	    /* Notify application about call transfer progress.
 	     * Initially notify with 100/Accepted status.
 	     */
-	    if (call && pjsua_var.ua_cfg.cb.on_call_transfer_status) {
+	    if (call && !call->hanging_up &&
+	        pjsua_var.ua_cfg.cb.on_call_transfer_status)
+	    {
 		const pj_str_t ACCEPTED = { "Accepted", 8 };
 		pj_bool_t cont = PJ_FALSE;
 		(*pjsua_var.ua_cfg.cb.on_call_transfer_status)(call->index,
@@ -4988,7 +5716,9 @@
 
 	}
 
-	if (!call || !event || !pjsua_var.ua_cfg.cb.on_call_transfer_status) {
+	if (!call || call->hanging_up || !event ||
+	    !pjsua_var.ua_cfg.cb.on_call_transfer_status)
+	{
 	    /* Application is not interested with call progress status */
 	    goto on_return;
 	}
@@ -5131,6 +5861,10 @@
     pj_log_push_indent();
 
     existing_call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
+    if (existing_call->hanging_up) {
+	pjsip_dlg_respond( inv->dlg, rdata, 487, NULL, NULL, NULL);
+    	goto on_return;
+    }
 
     /* Find the Refer-To header */
     refer_to = (pjsip_generic_string_hdr*)
@@ -5355,6 +6089,12 @@
 					    pjsip_transaction *tsx,
 					    pjsip_event *e)
 {
+    /* Incoming INFO request for media control, DTMF, trickle ICE, etc. */
+    const pj_str_t STR_APPLICATION	 = { "application", 11};
+    const pj_str_t STR_MEDIA_CONTROL_XML = { "media_control+xml", 17 };
+    const pj_str_t STR_DTMF_RELAY	 = { "dtmf-relay", 10 };
+    const pj_str_t STR_TRICKLE_ICE_SDP	 = { "trickle-ice-sdpfrag", 19 };
+
     pjsua_call *call;
 
     pj_log_push_indent();
@@ -5364,7 +6104,7 @@
     if (call == NULL)
 	goto on_return;
 
-    if (call->inv == NULL) {
+    if (call->inv == NULL || call->hanging_up) {
 	/* Call has been disconnected. */
 	goto on_return;
     }
@@ -5432,26 +6172,57 @@
 			       &inv->dlg->local.info_str, rdata);
 
     }
-    else if (tsx->role == PJSIP_ROLE_UAC &&
-	     pjsip_method_cmp(&tsx->method, &pjsip_message_method)==0)
-    {
-	/* Handle outgoing pager status */
-	if (tsx->status_code >= 200) {
-	    pjsua_im_data *im_data;
-
-	    im_data = (pjsua_im_data*) tsx->mod_data[pjsua_var.mod.id];
-	    /* im_data can be NULL if this is typing indication */
-
-	    if (im_data && pjsua_var.ua_cfg.cb.on_pager_status) {
-		pjsua_var.ua_cfg.cb.on_pager_status(im_data->call_id,
-						    &im_data->to,
-						    &im_data->body,
-						    im_data->user_data,
-						    (pjsip_status_code)
-						    	tsx->status_code,
-						    &tsx->status_text);
-	    }
-	}
+    else if (e->type == PJSIP_EVENT_TSX_STATE &&
+            tsx->role == PJSIP_ROLE_UAC &&
+            pjsip_method_cmp(&tsx->method, &pjsip_message_method)==0 &&
+            (tsx->state == PJSIP_TSX_STATE_COMPLETED ||
+            (tsx->state == PJSIP_TSX_STATE_TERMINATED &&
+            e->body.tsx_state.prev_state != PJSIP_TSX_STATE_COMPLETED)))
+    {
+        /* Handle outgoing pager status */
+        if (tsx->status_code >= 200) {
+            pjsua_im_data *im_data;
+
+            im_data = (pjsua_im_data*) tsx->mod_data[pjsua_var.mod.id];
+            /* im_data can be NULL if this is typing indication */
+
+            if (im_data) {
+                pj_str_t im_body = im_data->body;
+                if (im_body.slen==0) {
+                    pjsip_msg_body *body = tsx->last_tx->msg->body;
+                    pj_strset(&im_body, body->data, body->len);
+                }
+
+                if (pjsua_var.ua_cfg.cb.on_pager_status) {
+                        pjsua_var.ua_cfg.cb.on_pager_status(im_data->call_id,
+                                                            &im_data->to,
+                                                            &im_body,
+                                                            im_data->user_data,
+                                                            (pjsip_status_code)
+                                                            tsx->status_code,
+                                                            &tsx->status_text);
+                }
+
+                if (pjsua_var.ua_cfg.cb.on_pager_status2) {
+                    pjsip_rx_data* rdata;
+
+                    if (e->body.tsx_state.type == PJSIP_EVENT_RX_MSG)
+                    rdata = e->body.tsx_state.src.rdata;
+                    else
+                    rdata = NULL;
+
+                    pjsua_var.ua_cfg.cb.on_pager_status2(im_data->call_id,
+                                                        &im_data->to,
+                                                        &im_body,
+                                                        im_data->user_data,
+                                                        (pjsip_status_code)
+                                                            tsx->status_code,
+                                                        &tsx->status_text,
+                                                        tsx->last_tx,
+                                                        rdata, im_data->acc_id);
+                }
+            }
+        }
     } else if (tsx->role == PJSIP_ROLE_UAC &&
                pjsip_method_cmp(&tsx->method, pjsip_get_invite_method())==0 &&
                tsx->state >= PJSIP_TSX_STATE_COMPLETED &&
@@ -5493,9 +6264,9 @@
             (tsx->status_code/100 != 2 || !call->med_update_success))
         {
             /* Either we get non-2xx or media update failed,
-             * clean up provisional media.
+             * revert back provisional media.
              */
-	    pjsua_media_prov_clean_up(call->index);
+	    pjsua_media_prov_revert(call->index);
         }
     } else if (tsx->role == PJSIP_ROLE_UAC &&
                pjsip_method_cmp(&tsx->method, &pjsip_update_method)==0 &&
@@ -5509,27 +6280,18 @@
             (tsx->status_code/100 != 2 || !call->med_update_success))
         {
             /* Either we get non-2xx or media update failed,
-             * clean up provisional media.
+             * revert back provisional media.
              */
-	    pjsua_media_prov_clean_up(call->index);
+	    pjsua_media_prov_revert(call->index);
         }
     } else if (tsx->role==PJSIP_ROLE_UAS &&
-	tsx->state==PJSIP_TSX_STATE_TRYING &&
-	pjsip_method_cmp(&tsx->method, &pjsip_info_method)==0)
+	       tsx->state==PJSIP_TSX_STATE_TRYING &&
+	       pjsip_method_cmp(&tsx->method, &pjsip_info_method)==0)
     {
-	/*
-	 * Incoming INFO request for media control.
-	 */
-	const pj_str_t STR_APPLICATION	     = { "application", 11};
-	const pj_str_t STR_MEDIA_CONTROL_XML = { "media_control+xml", 17 };
-	/*
-	 * Incoming INFO request for DTMF.
-	 */	
-	const pj_str_t STR_DTMF_RELAY  = { "dtmf-relay", 10 };
-
 	pjsip_rx_data *rdata = e->body.tsx_state.src.rdata;
 	pjsip_msg_body *body = rdata->msg_info.msg->body;
 
+	/* Check Media Control content in the INFO message */
 	if (body && body->len &&
 	    pj_stricmp(&body->content_type.type, &STR_APPLICATION)==0 &&
 	    pj_stricmp(&body->content_type.subtype, &STR_MEDIA_CONTROL_XML)==0)
@@ -5552,16 +6314,21 @@
 		if (status == PJ_SUCCESS)
 		    status = pjsip_tsx_send_msg(tsx, tdata);
 	    }
-	} else if (body && body->len &&
-	    pj_stricmp(&body->content_type.type, &STR_APPLICATION)==0 &&
-	    pj_stricmp(&body->content_type.subtype, &STR_DTMF_RELAY)==0)
+	}
+
+	/* Check DTMF content in the INFO message */
+	else if (body && body->len &&
+		 pj_stricmp(&body->content_type.type, &STR_APPLICATION)==0 &&
+		 pj_stricmp(&body->content_type.subtype, &STR_DTMF_RELAY)==0)
 	{
 	    pjsip_tx_data *tdata;
 	    pj_status_t status;
 	    pj_bool_t is_handled = PJ_FALSE;
 
-	    if (pjsua_var.ua_cfg.cb.on_dtmf_digit2) {
-		pjsua_dtmf_info info;
+	    if (pjsua_var.ua_cfg.cb.on_dtmf_digit2 ||
+                pjsua_var.ua_cfg.cb.on_dtmf_event)
+            {
+		pjsua_dtmf_info info = {0};
 		pj_str_t delim, token, input;
 		pj_ssize_t found_idx;
 
@@ -5570,35 +6337,90 @@
 		found_idx = pj_strtok(&input, &delim, &token, 0);
 		if (found_idx != input.slen) {
 		    /* Get signal/digit */
-		    const pj_str_t STR_SIGNAL = { "Signal=", 7 };
-		    const pj_str_t STR_DURATION = { "Duration=", 9 };
+		    const pj_str_t STR_SIGNAL = { "Signal", 6 };
+		    const pj_str_t STR_DURATION = { "Duration", 8 };
 		    char *val;
+		    pj_ssize_t count_equal_sign;
 
 		    val = pj_strstr(&input, &STR_SIGNAL);
 		    if (val) {
-			info.digit = *(val+STR_SIGNAL.slen);
-			is_handled = PJ_TRUE;
+			char* p = val + STR_SIGNAL.slen;
+			count_equal_sign = 0;
+			while ((p - input.ptr < input.slen) && (*p == ' ' || *p == '=')) {
+			    if(*p == '=')
+				count_equal_sign++;
+			    ++p;
+			}
+
+			if (count_equal_sign == 1 && (p - input.ptr < input.slen)) {
+			    info.digit = *p;
+			    is_handled = PJ_TRUE;
+			} else {
+			    PJ_LOG(2, (THIS_FILE, "Invalid dtmf-relay format"));
+			}
 
 			/* Get duration */
 			input.ptr += token.slen + 2;
 			input.slen -= (token.slen + 2);
 
 			val = pj_strstr(&input, &STR_DURATION);
-			if (val) {
+			if (val && is_handled) {
 			    pj_str_t val_str;
+			    char* ptr = val + STR_DURATION.slen;
+			    count_equal_sign = 0;
+			    while ((ptr - input.ptr < input.slen) &&
+                                   (*ptr == ' ' || *ptr == '='))
+                            {
+				if (*ptr == '=')
+				    count_equal_sign++;
+			        ++ptr;
+			    }
+
+			    if ((count_equal_sign == 1) &&
+                                (ptr - input.ptr < input.slen))
+                            {
+			        val_str.ptr = ptr;
+			        val_str.slen = input.slen - (ptr - input.ptr);
+			        info.duration = pj_strtoul(&val_str);
+			    } else {
+                                info.duration = PJSUA_UNKNOWN_DTMF_DURATION;
+				is_handled = PJ_FALSE;
+				PJ_LOG(2, (THIS_FILE,
+                                           "Invalid dtmf-relay format"));
+			    }
+			}
 
-			    val_str.ptr = val + STR_DURATION.slen;
-			    val_str.slen = input.slen - STR_DURATION.slen;
-			    info.duration = pj_strtoul(&val_str);
+			if (is_handled) {
+			    info.method = PJSUA_DTMF_METHOD_SIP_INFO;
+                            if (pjsua_var.ua_cfg.cb.on_dtmf_event) {
+		                pjsua_dtmf_event evt;
+                                pj_timestamp begin_of_time, timestamp;
+                                /* Use the current instant as the events start
+                                 * time.
+                                 */
+                                begin_of_time.u64 = 0;
+                                pj_get_timestamp(&timestamp);
+                                evt.method = info.method;
+                                evt.timestamp = pj_elapsed_msec(&begin_of_time,
+                                                                &timestamp);
+                                evt.digit = info.digit;
+                                evt.duration = info.duration;
+                                /* There is only one message indicating the full
+                                 * duration of the digit.
+                                 */
+                                evt.flags = PJMEDIA_STREAM_DTMF_IS_END;
+                                (*pjsua_var.ua_cfg.cb.on_dtmf_event)(call->index,
+                                                                     &evt);
+                            } else {
+			        (*pjsua_var.ua_cfg.cb.on_dtmf_digit2)(call->index,
+							              &info);
+                            }
+
+			    status = pjsip_endpt_create_response(tsx->endpt, rdata,
+				200, NULL, &tdata);
+			    if (status == PJ_SUCCESS)
+				status = pjsip_tsx_send_msg(tsx, tdata);
 			}
-		    	info.method = PJSUA_DTMF_METHOD_SIP_INFO;
-			(*pjsua_var.ua_cfg.cb.on_dtmf_digit2)(call->index, 
-							      &info);
-
-			status = pjsip_endpt_create_response(tsx->endpt, rdata,
-							    200, NULL, &tdata);
-			if (status == PJ_SUCCESS)
-			    status = pjsip_tsx_send_msg(tsx, tdata);
 		    }
 		}
 	    } 
@@ -5610,16 +6432,44 @@
 		    status = pjsip_tsx_send_msg(tsx, tdata);
 	    }
 	}
+
+	/* Check Trickle ICE content in the INFO message */
+	else if (body && body->len &&
+		 pj_stricmp(&body->content_type.type, &STR_APPLICATION)==0 &&
+		 pj_stricmp(&body->content_type.subtype,
+			    &STR_TRICKLE_ICE_SDP)==0)
+	{
+	    pjsip_tx_data *tdata;
+	    pj_status_t status;
+
+	    /* Trickle ICE tasks:
+	     * - UAS receiving INFO, cease 18x retrans & start trickling
+	     */
+	    if (call->trickle_ice.enabled) {
+		pjsua_ice_check_start_trickling(call, PJ_FALSE, e);
+
+		/* Process the SIP INFO content */
+		trickle_ice_recv_sip_info(call, rdata);
+
+		/* Send 200 response, regardless */
+		status = pjsip_endpt_create_response(tsx->endpt, rdata,
+						     200, NULL, &tdata);
+	    } else {
+		/* Trickle ICE not enabled, send 400 response */
+		status = pjsip_endpt_create_response(tsx->endpt, rdata,
+						     400, NULL, &tdata);
+	    }
+	    if (status == PJ_SUCCESS)
+		status = pjsip_tsx_send_msg(tsx, tdata);
+	}
+
     } else if (tsx->role == PJSIP_ROLE_UAC && 
 	       pjsip_method_cmp(&tsx->method, &pjsip_info_method)==0 &&
 	       (tsx->state == PJSIP_TSX_STATE_COMPLETED ||
 	       (tsx->state == PJSIP_TSX_STATE_TERMINATED &&
 	        e->body.tsx_state.prev_state != PJSIP_TSX_STATE_COMPLETED)))
     {
-	const pj_str_t STR_APPLICATION = { "application", 11};
-	const pj_str_t STR_DTMF_RELAY  = { "dtmf-relay", 10 };
 	pjsip_msg_body *body = NULL;
-	pj_bool_t dtmf_info = PJ_FALSE;
 	
 	if (e->body.tsx_state.type == PJSIP_EVENT_TX_MSG)
 	    body = e->body.tsx_state.src.tdata->msg->body;
@@ -5631,13 +6481,6 @@
 	    pj_stricmp(&body->content_type.type, &STR_APPLICATION)==0 &&
 	    pj_stricmp(&body->content_type.subtype, &STR_DTMF_RELAY)==0)
 	{
-	    dtmf_info = PJ_TRUE;
-	}
-
-	if (dtmf_info && (tsx->state == PJSIP_TSX_STATE_COMPLETED ||
-			 (tsx->state == PJSIP_TSX_STATE_TERMINATED &&
-	           e->body.tsx_state.prev_state != PJSIP_TSX_STATE_COMPLETED))) 
-	{
 	    /* Status of outgoing INFO request */
 	    if (tsx->status_code >= 200 && tsx->status_code < 300) {
 		PJ_LOG(4,(THIS_FILE, 
@@ -5652,6 +6495,35 @@
 			  tsx->status_text.ptr));
 	    }
 	}
+
+	/* Check Trickle ICE content in the INFO message */
+	else if (body && body->len &&
+		 pj_stricmp(&body->content_type.type, &STR_APPLICATION)==0 &&
+		 pj_stricmp(&body->content_type.subtype,
+			    &STR_TRICKLE_ICE_SDP)==0)
+	{
+	    /* Reset pending SIP INFO for Trickle ICE */
+	    call->trickle_ice.pending_info = PJ_FALSE;
+	}
+    } else if (inv->state < PJSIP_INV_STATE_CONFIRMED &&
+	       pjsip_method_cmp(&tsx->method, pjsip_get_invite_method())==0 &&
+	       tsx->state == PJSIP_TSX_STATE_PROCEEDING &&
+	       tsx->status_code/10 == 18)
+    {
+	/* Trickle ICE tasks:
+	 * - UAS sending 18x, start 18x retrans
+	 * - UAC receiving 18x, forcefully send SIP INFO & start trickling
+	 */
+	pj_bool_t force = call->trickle_ice.trickling<PJSUA_OP_STATE_RUNNING;
+	pjsua_ice_check_start_trickling(call, force, e);
+    } else if (tsx->role == PJSIP_ROLE_UAS &&
+	       pjsip_method_cmp(&tsx->method, pjsip_get_prack_method())==0 &&
+	       tsx->state==PJSIP_TSX_STATE_TRYING)
+    {
+	/* Trickle ICE tasks:
+	 * - UAS receiving PRACK, start trickling
+	 */
+	pjsua_ice_check_start_trickling(call, PJ_FALSE, e);
     }
 
 on_return:
@@ -5669,14 +6541,16 @@
 
     pj_log_push_indent();
 
-    if (pjsua_var.ua_cfg.cb.on_call_redirected) {
+    if (!call->hanging_up && pjsua_var.ua_cfg.cb.on_call_redirected) {
 	op = (*pjsua_var.ua_cfg.cb.on_call_redirected)(call->index,
 							 target, e);
     } else {
-	PJ_LOG(4,(THIS_FILE, "Unhandled redirection for call %d "
-		  "(callback not implemented by application). Disconnecting "
-		  "call.",
-		  call->index));
+	if (!call->hanging_up) {
+	    PJ_LOG(4,(THIS_FILE, "Unhandled redirection for call %d "
+		      "(callback not implemented by application). "
+		      "Disconnecting call.",
+		      call->index));
+	}
 	op = PJSIP_REDIRECT_STOP;
     }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_core.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_core.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_core.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_core.c	2022-02-24 07:54:38.000000000 +0000
@@ -104,7 +104,7 @@
 {
     pj_bzero(cfg, sizeof(*cfg));
 
-    cfg->max_calls = ((PJSUA_MAX_CALLS) < 4) ? (PJSUA_MAX_CALLS) : 4;
+    cfg->max_calls = PJSUA_MAX_CALLS;
     cfg->thread_cnt = PJSUA_SEPARATE_WORKER_FOR_TIMER? 2 : 1;
     cfg->nat_type_in_sdp = 1;
     cfg->stun_ignore_failure = PJ_TRUE;
@@ -365,6 +365,7 @@
 			 PJSUA_REG_USE_ACC_PROXY;
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
     cfg->use_stream_ka = (PJMEDIA_STREAM_ENABLE_KA != 0);
+    pjmedia_stream_ka_config_default(&cfg->stream_ka_cfg);
 #endif
     pj_list_init(&cfg->reg_hdr_list);
     pj_list_init(&cfg->sub_hdr_list);
@@ -415,6 +416,7 @@
     cfg->snd_rec_latency = PJMEDIA_SND_DEFAULT_REC_LATENCY;
     cfg->snd_play_latency = PJMEDIA_SND_DEFAULT_PLAY_LATENCY;
     cfg->jb_init = cfg->jb_min_pre = cfg->jb_max_pre = cfg->jb_max = -1;
+    cfg->jb_discard_algo = PJMEDIA_JB_DISCARD_PROGRESSIVE;
     cfg->snd_auto_close_time = 1;
 
     cfg->ice_max_host_cands = -1;
@@ -936,12 +938,13 @@
     /* Init caching pool. */
     pj_caching_pool_init(&pjsua_var.cp, NULL, 0);
 
-    /* Create memory pool for application. */
-    pjsua_var.pool = pjsua_pool_create("pjsua", 1000, 1000);
-    if (pjsua_var.pool == NULL) {
+    /* Create memory pools for application and internal use. */
+    pjsua_var.pool = pjsua_pool_create("pjsua", PJSUA_POOL_LEN, PJSUA_POOL_INC);
+    pjsua_var.timer_pool = pjsua_pool_create("pjsua_timer", 500, 500);
+    if (pjsua_var.pool == NULL || pjsua_var.timer_pool == NULL) {
 	pj_log_pop_indent();
 	status = PJ_ENOMEM;
-	pjsua_perror(THIS_FILE, "Unable to create pjsua pool", status);
+	pjsua_perror(THIS_FILE, "Unable to create pjsua/timer pool", status);
 	pj_shutdown();
 	return status;
     }
@@ -969,8 +972,10 @@
 	return status;
     }
 
-    /* Init timer entry list */
+    /* Init timer entry and event list */
+    pj_list_init(&pjsua_var.active_timer_list);
     pj_list_init(&pjsua_var.timer_list);
+    pj_list_init(&pjsua_var.event_list);
 
     /* Create timer mutex */
     status = pj_mutex_create_recursive(pjsua_var.pool, "pjsua_timer", 
@@ -2041,7 +2046,11 @@
         pjsua_var.timer_mutex = NULL;
     }
 
-    /* Destroy pool and pool factory. */
+    /* Destroy pools and pool factory. */
+    if (pjsua_var.timer_pool) {
+	pj_pool_release(pjsua_var.timer_pool);
+	pjsua_var.timer_pool = NULL;
+    }
     if (pjsua_var.pool) {
 	pj_pool_release(pjsua_var.pool);
 	pjsua_var.pool = NULL;
@@ -2872,20 +2881,27 @@
 
     tp_type = pjsua_var.tpdata[id].type & ~PJSIP_TRANSPORT_IPV6;
 
-    /* Note: destroy() may not work if there are objects still referencing
-     *	     the transport.
-     */
     if (force) {
-	switch (tp_type) {
+    	/* Forcefully closing transport is deprecated, since any pending
+    	 * transactions that are using the transport may not terminate
+    	 * properly and can even crash.
+    	 */
+	PJ_LOG(1, (THIS_FILE, "pjsua_transport_close(force=PJ_TRUE) is "
+			      "deprecated."));
+    	
+    	/* To minimize the effect to users, we shouldn't hard-deprecate this
+    	 * and let it continue as if force is false.
+    	 */
+    	// return PJ_EINVAL;
+    }
+
+    /* If force is not specified, transports will be closed at their
+     * convenient time.
+     */
+    switch (tp_type) {
 	case PJSIP_TRANSPORT_UDP:
 	    status = pjsip_transport_shutdown(pjsua_var.tpdata[id].data.tp);
-	    if (status  != PJ_SUCCESS)
-		return status;
-	    status = pjsip_transport_destroy(pjsua_var.tpdata[id].data.tp);
-	    if (status != PJ_SUCCESS)
-		return status;
 	    break;
-
 	case PJSIP_TRANSPORT_TLS:
 	case PJSIP_TRANSPORT_TCP:
 	    /* This will close the TCP listener, but existing TCP/TLS
@@ -2893,41 +2909,21 @@
 	     */
 	    status = (*pjsua_var.tpdata[id].data.factory->destroy)
 			(pjsua_var.tpdata[id].data.factory);
-	    if (status != PJ_SUCCESS)
-		return status;
-
 	    break;
-
 	default:
 	    return PJ_EINVAL;
-	}
-	
-    } else {
-	/* If force is not specified, transports will be closed at their
-	 * convenient time. However this will leak PJSUA-API transport
-	 * descriptors as PJSUA-API wouldn't know when exactly the
-	 * transport is closed thus it can't cleanup PJSUA transport
-	 * descriptor.
-	 */
-	switch (tp_type) {
-	case PJSIP_TRANSPORT_UDP:
-	    return pjsip_transport_shutdown(pjsua_var.tpdata[id].data.tp);
-	case PJSIP_TRANSPORT_TLS:
-	case PJSIP_TRANSPORT_TCP:
-	    return (*pjsua_var.tpdata[id].data.factory->destroy)
-			(pjsua_var.tpdata[id].data.factory);
-	default:
-	    return PJ_EINVAL;
-	}
     }
 
-    /* Cleanup pjsua data when force is applied */
-    if (force) {
-	pjsua_var.tpdata[id].type = PJSIP_TRANSPORT_UNSPECIFIED;
-	pjsua_var.tpdata[id].data.ptr = NULL;
+    /* Cleanup pjsua data. We don't need to keep the transport
+     * descriptor, the transport will be destroyed later by the last user
+     * which decrements the transport's reference.
+     */
+    if (status == PJ_SUCCESS) {
+    	pjsua_var.tpdata[id].type = PJSIP_TRANSPORT_UNSPECIFIED;
+    	pjsua_var.tpdata[id].data.ptr = NULL;
     }
 
-    return PJ_SUCCESS;
+    return status;
 }
 
 
@@ -3301,12 +3297,13 @@
 
     PJ_UNUSED_ARG(th);
 
+    if (cb)
+        (*cb)(user_data);
+
     pj_mutex_lock(pjsua_var.timer_mutex);
+    pj_list_erase(tmr);
     pj_list_push_back(&pjsua_var.timer_list, tmr);
     pj_mutex_unlock(pjsua_var.timer_mutex);
-
-    if (cb)
-        (*cb)(user_data);
 }
 
 /*
@@ -3331,7 +3328,7 @@
     pj_mutex_lock(pjsua_var.timer_mutex);
 
     if (pj_list_empty(&pjsua_var.timer_list)) {
-        tmr = PJ_POOL_ALLOC_T(pjsua_var.pool, pjsua_timer_list);
+        tmr = PJ_POOL_ALLOC_T(pjsua_var.timer_pool, pjsua_timer_list);
     } else {
         tmr = pjsua_var.timer_list.next;
         pj_list_erase(tmr);
@@ -3348,7 +3345,9 @@
 #else
     status = pjsip_endpt_schedule_timer(pjsua_var.endpt, &tmr->entry, &delay);
 #endif
-    if (status != PJ_SUCCESS) {
+    if (status == PJ_SUCCESS) {
+    	pj_list_push_back(&pjsua_var.active_timer_list, tmr);
+    } else {
         pj_list_push_back(&pjsua_var.timer_list, tmr);
     }
 
@@ -3735,13 +3734,28 @@
 
     switch (tp_info.type) {
     case PJSIP_TRANSPORT_UDP:
-    case PJSIP_TRANSPORT_UDP6:
+    case PJSIP_TRANSPORT_UDP6:    
+    {
+	unsigned num_locks = 0;
+
+	/* Release locks before restarting the transport, to avoid deadlock. */
+	while (PJSUA_LOCK_IS_LOCKED()) {
+    	    num_locks++;
+    	    PJSUA_UNLOCK();
+	}
+
 	status = pjsip_udp_transport_restart2(
 				       pjsua_var.tpdata[id].data.tp,
 				       PJSIP_UDP_TRANSPORT_DESTROY_SOCKET,
 				       PJ_INVALID_SOCKET,
 				       &bind_addr,
 				       NULL);
+
+	/* Re-acquire the locks. */
+	for (;num_locks > 0; num_locks--)
+    	    PJSUA_LOCK();
+
+    }
 	break;
 
 #if defined(PJSIP_HAS_TLS_TRANSPORT) && PJSIP_HAS_TLS_TRANSPORT!=0
@@ -3818,6 +3832,15 @@
 }
 
 
+static void ip_change_put_back_inv_config(void *user_data)
+{
+    PJ_UNUSED_ARG(user_data);
+
+    PJ_LOG(4,(THIS_FILE,"IP change stops ignoring request timeout"));
+    pjsip_cfg()->endpt.keep_inv_after_tsx_timeout = PJ_FALSE;
+}
+
+
 PJ_DEF(pj_status_t) pjsua_handle_ip_change(const pjsua_ip_change_param *param)
 {
     pj_status_t status = PJ_SUCCESS;
@@ -3836,6 +3859,21 @@
     }
 
     PJ_LOG(3, (THIS_FILE, "Start handling IP address change"));
+
+    /* Avoid call disconnection due to request timeout. Some requests may
+     * be in progress when network is changing, they may eventually get
+     * timed out and cause call disconnection.
+     */
+    if (!pjsip_cfg()->endpt.keep_inv_after_tsx_timeout) {
+	pjsip_cfg()->endpt.keep_inv_after_tsx_timeout = PJ_TRUE;
+
+	/* Put it back after some time (transaction timeout setting value) */
+	pjsua_schedule_timer2(&ip_change_put_back_inv_config, NULL,
+			      pjsip_cfg()->tsx.td);
+
+	PJ_LOG(4,(THIS_FILE,"IP change temporarily ignores request timeout"));
+    }
+
     if (param->restart_listener) {
 	PJSUA_LOCK();
 	/* Restart listener/transport, handle_ip_change_on_acc() will
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_dump.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_dump.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_dump.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_dump.c	2022-02-24 07:54:38.000000000 +0000
@@ -907,13 +907,14 @@
 	        char *buf, pj_size_t size)
 {
     int len;
-    pjsip_inv_session *inv = pjsua_var.calls[call_id].inv;
+    pjsua_call *call = &pjsua_var.calls[call_id];
+    pjsip_inv_session *inv = call->inv;
     pjsip_dialog *dlg;
     char userinfo[PJSIP_MAX_URL_SIZE];
 
     /* Dump invite sesion info. */
 
-    dlg = (inv? inv->dlg: pjsua_var.calls[call_id].async_call.dlg);
+    dlg = (inv? inv->dlg: call->async_call.dlg);
     len = pjsip_hdr_print_on(dlg->remote.info, userinfo, sizeof(userinfo));
     if (len < 0)
 	pj_ansi_strcpy(userinfo, "<--uri too long-->");
@@ -922,8 +923,9 @@
 
     len = pj_ansi_snprintf(buf, size, "%s[%s] %s",
 			   title,
-                           pjsip_inv_state_name(inv? inv->state:
-                                                PJSIP_INV_STATE_DISCONNECTED),
+                           pjsip_inv_state_name((call->hanging_up || !inv)?
+                                                PJSIP_INV_STATE_DISCONNECTED:
+                                                inv->state),
 			   userinfo);
     if (len < 1 || len >= (int)size) {
 	pj_ansi_strcpy(buf, "<--uri too long-->");
@@ -952,6 +954,7 @@
 
     PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
 		     PJ_EINVAL);
+    PJ_ASSERT_RETURN(maxlen > 3, PJ_ETOOSMALL);
 
     status = acquire_call("pjsua_call_dump()", call_id, &call, &dlg);
     if (status != PJ_SUCCESS)
@@ -965,11 +968,13 @@
     print_call(indent, call_id, tmp, sizeof(tmp));
 
     len = (int)pj_ansi_strlen(tmp);
-    pj_ansi_strcpy(buffer, tmp);
+    if (len + 3 > (int)maxlen) len = maxlen - 3;
+    pj_ansi_strncpy(buffer, tmp, len);
 
     p += len;
     *p++ = '\r';
     *p++ = '\n';
+    *p = '\0';
 
     /* Calculate call duration */
     if (call->conn_time.sec != 0) {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_im.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_im.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_im.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_im.c	2022-02-24 07:54:38.000000000 +0000
@@ -394,6 +394,12 @@
 		    return;
 		}
 		pjsip_auth_clt_deinit(&auth);
+
+		/* Don't invoke callback if another callback (with auth,
+		 * different tsx) has been called.
+		 */
+                if (im_data2->acc_id == PJSUA_INVALID_ID)
+                    return;
 	    }
 	}
 
@@ -411,9 +417,15 @@
 	}
 
 	if (pjsua_var.ua_cfg.cb.on_pager_status) {
+	    pj_str_t im_body = im_data->body;
+	    if (im_body.slen==0) {
+		pjsip_msg_body *body = tsx->last_tx->msg->body;
+		pj_strset(&im_body, body->data, body->len);
+	    }
+
 	    pjsua_var.ua_cfg.cb.on_pager_status(im_data->call_id, 
 					        &im_data->to,
-						&im_data->body,
+						&im_body,
 						im_data->user_data,
 						(pjsip_status_code) 
 						    tsx->status_code,
@@ -422,15 +434,21 @@
 
 	if (pjsua_var.ua_cfg.cb.on_pager_status2) {
 	    pjsip_rx_data *rdata;
+	    pj_str_t im_body = im_data->body;
 
 	    if (e->body.tsx_state.type == PJSIP_EVENT_RX_MSG)
 		rdata = e->body.tsx_state.src.rdata;
 	    else
 		rdata = NULL;
 
+	    if (im_body.slen==0) {
+		pjsip_msg_body *body = tsx->last_tx->msg->body;
+		pj_strset(&im_body, body->data, body->len);
+	    }
+
 	    pjsua_var.ua_cfg.cb.on_pager_status2(im_data->call_id, 
 					         &im_data->to,
-					 	 &im_data->body,
+					 	 &im_body,
 						 im_data->user_data,
 						 (pjsip_status_code) 
 						    tsx->status_code,
@@ -438,6 +456,9 @@
 						 tsx->last_tx,
 						 rdata, im_data->acc_id);
 	}
+
+	/* Reset acc_id after invoking callback */
+	im_data->acc_id = PJSUA_INVALID_ID;
     }
 }
 
@@ -521,10 +542,14 @@
     pjsip_media_type media_type;
     pjsua_im_data *im_data;
     pjsua_acc *acc;
+    pj_bool_t content_in_msg_data;
     pj_status_t status;
 
+    content_in_msg_data = msg_data && (msg_data->msg_body.slen ||
+				       msg_data->multipart_ctype.type.slen);
+
     /* To and message body must be specified. */
-    PJ_ASSERT_RETURN(to && content, PJ_EINVAL);
+    PJ_ASSERT_RETURN(to && (content || content_in_msg_data), PJ_EINVAL);
 
     acc = &pjsua_var.acc[acc_id];
 
@@ -585,26 +610,30 @@
     im_data->acc_id = acc_id;
     im_data->call_id = PJSUA_INVALID_ID;
     pj_strdup_with_null(tdata->pool, &im_data->to, to);
-    pj_strdup_with_null(tdata->pool, &im_data->body, content);
     im_data->user_data = user_data;
 
 
-    /* Set default media type if none is specified */
-    if (mime_type == NULL) {
-	mime_type = &mime_text_plain;
-    }
-
-    /* Parse MIME type */
-    pjsua_parse_media_type(tdata->pool, mime_type, &media_type);
-
-    /* Add message body */
-    tdata->msg->body = pjsip_msg_body_create( tdata->pool, &media_type.type,
-					      &media_type.subtype, 
-					      &im_data->body);
-    if (tdata->msg->body == NULL) {
-	pjsua_perror(THIS_FILE, "Unable to create msg body", PJ_ENOMEM);
-	pjsip_tx_data_dec_ref(tdata);
-	return PJ_ENOMEM;
+    /* Add message body, if content is set */
+    if (content) {
+	pj_strdup_with_null(tdata->pool, &im_data->body, content);
+
+	/* Set default media type if none is specified */
+	if (mime_type == NULL) {
+	    mime_type = &mime_text_plain;
+	}
+
+	/* Parse MIME type */
+	pjsua_parse_media_type(tdata->pool, mime_type, &media_type);
+
+	/* Add message body */
+	tdata->msg->body = pjsip_msg_body_create( tdata->pool, &media_type.type,
+						  &media_type.subtype, 
+						  &im_data->body);
+	if (tdata->msg->body == NULL) {
+	    pjsua_perror(THIS_FILE, "Unable to create msg body", PJ_ENOMEM);
+	    pjsip_tx_data_dec_ref(tdata);
+	    return PJ_ENOMEM;
+	}
     }
 
     /* Add additional headers etc. */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_media.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_media.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_media.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_media.c	2022-02-24 07:54:38.000000000 +0000
@@ -27,6 +27,10 @@
 #   define PJSUA_REQUIRE_CONSECUTIVE_RTCP_PORT	0
 #endif
 
+#ifndef PJSUA_RESET_SRTP_ROC_ON_REM_ADDRESS_CHANGE
+#   define PJSUA_RESET_SRTP_ROC_ON_REM_ADDRESS_CHANGE	0
+#endif
+
 static void stop_media_stream(pjsua_call *call, unsigned med_idx);
 
 static void pjsua_media_config_dup(pj_pool_t *pool,
@@ -673,7 +677,19 @@
     opt.af = af;
     if (cfg->bound_addr.slen)
         opt.addr = cfg->bound_addr;
-    opt.port = cfg->port;
+
+    if (acc->next_rtp_port == 0 || cfg->port == 0)
+	acc->next_rtp_port = (pj_uint16_t)cfg->port;
+
+    if (cfg->port > 0 && cfg->port_range > 0 &&
+        (acc->next_rtp_port > cfg->port + cfg->port_range ||
+         acc->next_rtp_port < cfg->port))
+    {
+        acc->next_rtp_port = (pj_uint16_t)cfg->port;
+    }
+    opt.port = acc->next_rtp_port;
+    acc->next_rtp_port += 2;
+
     opt.disable_rx=!pjsua_var.acc[call_med->call->acc_id].cfg.enable_loopback;
     status = pjmedia_transport_loop_create2(pjsua_var.med_endpt, &opt,
     					    &call_med->tp);
@@ -745,7 +761,7 @@
 {
     pjsua_call_media *call_med = (pjsua_call_media*)user_data;
 
-    if (call_med->call == NULL)
+    if (call_med->call == NULL || call_med->tp_ready == PJ_SUCCESS)
 	return;
 
     /* No need to acquire_call() if we only change the tp_ready flag
@@ -758,11 +774,15 @@
     if (call_med->med_create_cb) {
 	pjsua_call *call = NULL;
 	pjsip_dialog *dlg = NULL;
+	pj_status_t status;
 
-	if (acquire_call("ice_init_complete_cb", call_med->call->index,
-	                 &call, &dlg) != PJ_SUCCESS)
-	{
-	    /* Call have been terminated */
+	status = acquire_call("ice_init_complete_cb", call_med->call->index,
+			      &call, &dlg);
+	if (status != PJ_SUCCESS) {
+	    if (status != PJSIP_ESESSIONTERMINATED) {
+		/* Retry, if call is still active */
+		pjsua_schedule_timer2(&ice_init_complete_cb, call_med, 10);
+	    }
 	    return;
 	}
 
@@ -780,15 +800,20 @@
     int call_id = (int)(pj_ssize_t)user_data;
     pjsua_call *call = NULL;
     pjsip_dialog *dlg = NULL;
+    pj_status_t status;
 
-    if (acquire_call("ice_failed_nego_cb", call_id,
-                     &call, &dlg) != PJ_SUCCESS)
-    {
-	/* Call have been terminated */
+    status = acquire_call("ice_failed_nego_cb", call_id, &call, &dlg);
+    if (status != PJ_SUCCESS) {
+	if (status != PJSIP_ESESSIONTERMINATED) {
+	    /* Retry, if call is still active */
+	    pjsua_schedule_timer2(&ice_failed_nego_cb,
+				  (void*)(pj_ssize_t)call_id, 10);
+	}
 	return;
     }
 
-    pjsua_var.ua_cfg.cb.on_call_media_state(call_id);
+    if (!call->hanging_up)
+    	pjsua_var.ua_cfg.cb.on_call_media_state(call_id);
 
     if (dlg)
         pjsip_dlg_dec_lock(dlg);
@@ -823,12 +848,24 @@
         } else {
 	    call_med->state = PJSUA_CALL_MEDIA_ERROR;
 	    call_med->dir = PJMEDIA_DIR_NONE;
-	    if (call && pjsua_var.ua_cfg.cb.on_call_media_state) {
+	    if (call && !call->hanging_up &&
+	        pjsua_var.ua_cfg.cb.on_call_media_state)
+	    {
 		/* Defer the callback to a timer */
 		pjsua_schedule_timer2(&ice_failed_nego_cb,
 				      (void*)(pj_ssize_t)call->index, 1);
 	    }
         }
+
+	/* Stop trickling */
+	if (call->trickle_ice.trickling < PJSUA_OP_STATE_DONE) {
+	    call->trickle_ice.trickling = PJSUA_OP_STATE_DONE;
+	    pjsua_cancel_timer(&call->trickle_ice.timer);
+	    PJ_LOG(4,(THIS_FILE, "Call %d: ICE trickle stopped trickling as "
+		      "ICE nego completed",
+		      call->index));
+	}
+
 	/* Check if default ICE transport address is changed */
         call->reinv_ice_sent = PJ_FALSE;
 	pjsua_call_schedule_reinvite_check(call, 0);
@@ -840,7 +877,9 @@
 		         "ICE keep alive failure for transport %d:%d",
 		         call->index, call_med->idx));
 	}
-        if (pjsua_var.ua_cfg.cb.on_call_media_transport_state) {
+        if (!call->hanging_up &&
+            pjsua_var.ua_cfg.cb.on_call_media_transport_state)
+        {
             pjsua_med_tp_state_info info;
 
             pj_bzero(&info, sizeof(info));
@@ -903,6 +942,8 @@
     unsigned comp_cnt;
     pj_status_t status;
     pj_bool_t use_ipv6, use_nat64;
+    pj_bool_t trickle = PJ_FALSE;
+    pjmedia_sdp_session *rem_sdp;
 
     acc_cfg = &pjsua_var.acc[call_med->call->acc_id].cfg;
     use_ipv6 = (acc_cfg->ipv6_media_use != PJSUA_IPV6_DISABLED);
@@ -932,15 +973,16 @@
     ice_cfg.resolver = pjsua_var.resolver;
     
     ice_cfg.opt = acc_cfg->ice_cfg.ice_opt;
+    rem_sdp = call_med->call->async_call.rem_sdp;
 
-    if (call_med->call->async_call.rem_sdp) {
+    if (rem_sdp) {
     	/* Match the default address family according to the offer */
         const pj_str_t ID_IP6 = { "IP6", 3};
     	const pjmedia_sdp_media *m;
 	const pjmedia_sdp_conn *c;
 
-    	m = call_med->call->async_call.rem_sdp->media[call_med->idx];
-	c = m->conn? m->conn : call_med->call->async_call.rem_sdp->conn;
+	m = rem_sdp->media[call_med->idx];
+	c = m->conn? m->conn : rem_sdp->conn;
 
 	if (pj_stricmp(&c->addr_type, &ID_IP6) == 0)
 	    ice_cfg.af = pj_AF_INET6();
@@ -948,6 +990,31 @@
     	ice_cfg.af = pj_AF_INET6();
     }
 
+    /* Should not wait for ICE STUN/TURN ready when trickle ICE is enabled */
+    if (ice_cfg.opt.trickle != PJ_ICE_SESS_TRICKLE_DISABLED &&
+	(call_med->call->inv == NULL || 
+	 call_med->call->inv->state < PJSIP_INV_STATE_CONFIRMED))
+    {
+	if (rem_sdp) {
+	    /* As answerer: and when remote signals trickle ICE in SDP */
+	    trickle = pjmedia_ice_sdp_has_trickle(rem_sdp, call_med->idx);
+	    if (trickle) {
+		call_med->call->trickle_ice.remote_sup = PJ_TRUE;
+		call_med->call->trickle_ice.enabled = PJ_TRUE;
+	    }
+	} else {
+	    /* As offerer: and when trickle ICE mode is full */
+	    trickle = (ice_cfg.opt.trickle==PJ_ICE_SESS_TRICKLE_FULL);
+	    call_med->call->trickle_ice.enabled = PJ_TRUE;
+	}
+
+	/* Check if trickle ICE can start trickling/sending SIP INFO */
+	pjsua_ice_check_start_trickling(call_med->call, PJ_FALSE, NULL);
+    } else {
+	/* For non-initial INVITE, always use regular ICE */
+	ice_cfg.opt.trickle = PJ_ICE_SESS_TRICKLE_DISABLED;
+    }
+
     /* If STUN transport is configured, initialize STUN transport settings */
     if ((pj_sockaddr_has_addr(&pjsua_var.stun_srv) &&
 	 pjsua_media_acc_is_using_stun(call_med->call->acc_id)) ||
@@ -1092,15 +1159,15 @@
     pj_bzero(&ice_cb, sizeof(pjmedia_ice_cb));
     ice_cb.on_ice_complete = &on_ice_complete;
     pj_ansi_snprintf(name, sizeof(name), "icetp%02d", call_med->idx);
-    call_med->tp_ready = PJ_EPENDING;
+    call_med->tp_ready = trickle? PJ_SUCCESS : PJ_EPENDING;
 
     comp_cnt = 1;
     if (PJMEDIA_ADVERTISE_RTCP && !acc_cfg->ice_cfg.ice_no_rtcp)
 	++comp_cnt;
 
     status = pjmedia_ice_create3(pjsua_var.med_endpt, name, comp_cnt,
-				 &ice_cfg, &ice_cb, 0, call_med,
-				 &call_med->tp);
+				 &ice_cfg, &ice_cb, PJSUA_ICE_TRANSPORT_OPTION,
+                                 call_med, &call_med->tp);
     if (status != PJ_SUCCESS) {
 	pjsua_perror(THIS_FILE, "Unable to create ICE media transport",
 		     status);
@@ -1108,7 +1175,7 @@
     }
 
     /* Wait until transport is initialized, or time out */
-    if (!async) {
+    if (!async && !trickle) {
 	pj_bool_t has_pjsua_lock = PJSUA_LOCK_IS_LOCKED();
 	pjsip_dialog *dlg = call_med->call->inv ?
 				call_med->call->inv->dlg : NULL;
@@ -1501,6 +1568,20 @@
     return status;
 }
 
+/* Call on_call_media_event() callback using timer */
+void call_med_event_cb(void *user_data)
+{
+    pjsua_event_list *eve = (pjsua_event_list *)user_data;
+    
+    (*pjsua_var.ua_cfg.cb.on_call_media_event)(eve->call_id,
+					       eve->med_idx,
+					       &eve->event);
+
+    pj_mutex_lock(pjsua_var.timer_mutex);
+    pj_list_push_back(&pjsua_var.event_list, eve);
+    pj_mutex_unlock(pjsua_var.timer_mutex);
+}
+
 /* Callback to receive media events of a call */
 pj_status_t call_media_on_event(pjmedia_event *event,
                                 void *user_data)
@@ -1510,7 +1591,6 @@
     char ev_name[5];
     pj_status_t status = PJ_SUCCESS;
 
-    pj_assert(call && call_med);
     pjmedia_fourcc_name(event->type, ev_name);
     PJ_LOG(5,(THIS_FILE, "Call %d: Media %d: Received media event, type=%s, "
 			 "src=%p, epub=%p",
@@ -1559,11 +1639,10 @@
 	    if (call_med->strm.v.rdr_win_id != PJSUA_INVALID_ID) {
 		pjsua_vid_win *w = &pjsua_var.win[call_med->strm.v.rdr_win_id];
 		if (event->epub == w->vp_rend) {
-		    /* Renderer just changed format, reconnect stream */
-		    pjsua_vid_conf_disconnect(call_med->strm.v.strm_dec_slot,
-					      w->rend_slot);
-		    pjsua_vid_conf_connect(call_med->strm.v.strm_dec_slot,
-					   w->rend_slot, NULL);
+		    /* Renderer just changed format, update its
+		     * conference bridge port.
+		     */
+		    pjsua_vid_conf_update_port(w->rend_slot);
 		}
 	    }
 
@@ -1571,10 +1650,7 @@
 		/* Stream decoder changed format, update all conf listeners
 		 * by reconnecting.
 		 */
-		pjsua_conf_port_id dec_pid = call_med->strm.v.strm_dec_slot;
 		pjmedia_port *strm_dec;
-		pjsua_vid_conf_port_info pi;
-		unsigned i;
 
 		status = pjmedia_vid_stream_get_port(call_med->strm.v.stream,
 						     PJMEDIA_DIR_DECODING,
@@ -1586,14 +1662,10 @@
 		if (event->epub != strm_dec)
 		    break;
 
-		status = pjsua_vid_conf_get_port_info(dec_pid, &pi);
-		if (status != PJ_SUCCESS)
-		    break;
-
-		for (i = 0; i < pi.listener_cnt; i++) {
-		    pjsua_vid_conf_disconnect(dec_pid, pi.listeners[i]);
-		    pjsua_vid_conf_connect(dec_pid, pi.listeners[i], NULL);
-		}
+		/* Stream decoder just changed format, update its
+		 * conference bridge port.
+		 */
+		pjsua_vid_conf_update_port(call_med->strm.v.strm_dec_slot);
 	    }
 	    break;
 
@@ -1612,14 +1684,32 @@
     }
 
     if (pjsua_var.ua_cfg.cb.on_call_media_event) {
-	if (call) {
-	    (*pjsua_var.ua_cfg.cb.on_call_media_event)(call->index,
-						       call_med->idx, event);
-	} else {
+	pjsua_event_list *eve = NULL;
+ 
+    	pj_mutex_lock(pjsua_var.timer_mutex);
+
+    	if (pj_list_empty(&pjsua_var.event_list)) {
+            eve = PJ_POOL_ALLOC_T(pjsua_var.timer_pool, pjsua_event_list);
+    	} else {
+            eve = pjsua_var.event_list.next;
+            pj_list_erase(eve);
+    	}
+
+    	pj_mutex_unlock(pjsua_var.timer_mutex);
+    	
+    	if (call) {
+    	    if (call->hanging_up)
+    	    	return status;
+
+    	    eve->call_id = call->index;
+    	    eve->med_idx = call_med->idx;
+    	} else {
 	    /* Also deliver non call events such as audio device error */
-	    (*pjsua_var.ua_cfg.cb.on_call_media_event)(PJSUA_INVALID_ID,
-						       0, event);
-	}
+    	    eve->call_id = PJSUA_INVALID_ID;
+    	    eve->med_idx = 0;
+    	}
+    	pj_memcpy(&eve->event, event, sizeof(pjmedia_event));
+    	pjsua_schedule_timer2(&call_med_event_cb, eve, 1);
     }
 
     return status;
@@ -1629,7 +1719,8 @@
 void pjsua_set_media_tp_state(pjsua_call_media *call_med,
                               pjsua_med_tp_st tp_st)
 {
-    if (pjsua_var.ua_cfg.cb.on_call_media_transport_state &&
+    if (!call_med->call->hanging_up &&
+        pjsua_var.ua_cfg.cb.on_call_media_transport_state &&
         call_med->tp_st != tp_st)
     {
         pjsua_med_tp_state_info info;
@@ -1664,7 +1755,9 @@
     if (result != PJ_SUCCESS) {
 	call_med->state = PJSUA_CALL_MEDIA_ERROR;
 	call_med->dir = PJMEDIA_DIR_NONE;
-	if (call && pjsua_var.ua_cfg.cb.on_call_media_state) {
+	if (call && !call->hanging_up &&
+	    pjsua_var.ua_cfg.cb.on_call_media_state)
+	{
 	    /* Defer the callback to a timer */
 	    pjsua_schedule_timer2(&ice_failed_nego_cb,
 				  (void*)(pj_ssize_t)call->index, 1);
@@ -1978,8 +2071,11 @@
 	    call->med_ch_info.status = status;
 	    call->med_ch_info.sip_err_code = PJSIP_SC_TEMPORARILY_UNAVAILABLE;
 	}
-	pjsua_media_prov_clean_up(call_id);
-        goto on_return;
+
+	/* Revert back provisional media. */
+	pjsua_media_prov_revert(call_id);
+
+	goto on_return;
     }
 
     /* Tell the media transport of a new offer/answer session */
@@ -2021,7 +2117,10 @@
                 call->med_ch_info.med_idx = mi;
                 call->med_ch_info.state = call_med->tp_st;
                 call->med_ch_info.sip_err_code = PJSIP_SC_TEMPORARILY_UNAVAILABLE;
-		pjsua_media_prov_clean_up(call_id);
+
+		/* Revert back provisional media. */
+		pjsua_media_prov_revert(call_id);
+
 		goto on_return;
 	    }
 
@@ -2079,7 +2178,24 @@
 	}
     }
     
-    call->med_prov_cnt = 0;
+    // Cleaning up unused media transports should not change provisional
+    // media count.
+    //call->med_prov_cnt = 0;
+}
+
+
+/* Revert back provisional media. */
+void pjsua_media_prov_revert(pjsua_call_id call_id)
+{
+    pjsua_call *call = &pjsua_var.calls[call_id];
+
+    /* Clean up unused media transport */
+    pjsua_media_prov_clean_up(call_id);
+
+    /* Copy provisional media from active media */
+    pj_memcpy(call->media_prov, call->media,
+	      sizeof(call->media[0]) * call->med_cnt);
+    call->med_prov_cnt = call->med_cnt;
 }
 
 
@@ -2347,6 +2463,16 @@
 	    }
 	}
 
+	if (call->opt.flag & PJSUA_CALL_SET_MEDIA_DIR) {
+	    call_med->def_dir = call->opt.media_dir[mi];
+    	    PJ_LOG(4,(THIS_FILE, "Call %d: setting media direction "
+    	    			 "#%d to %d.", call_id, mi,
+    	    			 call_med->def_dir));
+	} else if (!reinit) {
+	    /* Initialize default initial media direction as bidirectional */
+	    call_med->def_dir = PJMEDIA_DIR_ENCODING_DECODING;
+	}
+
 	if (enabled) {
 	    call_med->enable_rtcp_mux = acc->cfg.enable_rtcp_mux;
 
@@ -2373,9 +2499,26 @@
                     return PJ_EPENDING;
                 }
 
-                pjsua_media_prov_clean_up(call_id);
+		/* Revert back provisional media. */
+		pjsua_media_prov_revert(call_id);
+
 		goto on_error;
 	    }
+
+	    /* Find and save "a=mid". Currently this is for trickle ICE.
+	     * Trickle ICE match media in SDP of SIP INFO by comparing this
+	     * attribute, so remote SDP must be received first before remote
+	     * SDP in SIP INFO can be processed.
+	     */
+	    if (rem_sdp && call_med->rem_mid.slen == 0) {
+		const pjmedia_sdp_media *m = rem_sdp->media[mi];
+		pjmedia_sdp_attr *a;
+
+		a = pjmedia_sdp_media_find_attr2(m, "mid", NULL);
+		if (a)
+		    call_med->rem_mid = a->value;
+	    }
+
 	} else {
 	    /* By convention, the media is disabled if transport is NULL 
 	     * or transport state is PJSUA_MED_TP_DISABLED.
@@ -2541,6 +2684,7 @@
 	pjsua_call_media *call_med = &call->media_prov[mi];
 	pjmedia_sdp_media *m = NULL;
 	pjmedia_transport_info tpinfo;
+	pjmedia_endpt_create_sdp_param param;
 	unsigned i;
 
 	if (rem_sdp && mi >= rem_sdp->media_count) {
@@ -2636,15 +2780,19 @@
 	pjmedia_transport_get_info(call_med->tp, &tpinfo);
 
 	/* Ask pjmedia endpoint to create SDP media line */
+	pjmedia_endpt_create_sdp_param_default(&param);
+	param.dir = call_med->def_dir;
 	switch (call_med->type) {
 	case PJMEDIA_TYPE_AUDIO:
 	    status = pjmedia_endpt_create_audio_sdp(pjsua_var.med_endpt, pool,
-                                                    &tpinfo.sock_info, 0, &m);
+                                                    &tpinfo.sock_info,
+                                                    &param, &m);
 	    break;
 #if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
 	case PJMEDIA_TYPE_VIDEO:
 	    status = pjmedia_endpt_create_video_sdp(pjsua_var.med_endpt, pool,
-	                                            &tpinfo.sock_info, 0, &m);
+	                                            &tpinfo.sock_info,
+	                                            &param, &m);
 	    break;
 #endif
 	default:
@@ -2655,13 +2803,24 @@
 	if (status != PJ_SUCCESS)
 	    goto on_error;
 
+	/* Add generated media to SDP session */
+	sdp->media[sdp->media_count++] = m;
+
+	/* Disable media if it has zero format/codec */
+	if (m->desc.fmt_count == 0) {
+	    m->desc.fmt[m->desc.fmt_count++] = pj_str("0");
+	    pjmedia_sdp_media_deactivate(pool, m);
+	    PJ_LOG(3,(THIS_FILE,
+		      "Call %d media %d: Disabled due to no active codec",
+		      call_id, mi));
+	    continue;
+	}
+
     	/* Add ssrc and cname attribute */
     	m->attr[m->attr_count++] = pjmedia_sdp_attr_create_ssrc(pool,
     								call_med->ssrc,
     								&call->cname);
 
-	sdp->media[sdp->media_count++] = m;
-
 	/* Give to transport */
 	status = pjmedia_transport_encode_sdp(call_med->tp, pool,
 					      sdp, rem_sdp, mi);
@@ -2748,6 +2907,19 @@
 		}
 	    }
 	}
+
+	/* Find and save "a=mid". Currently this is for trickle ICE. Trickle
+	 * ICE match media in SDP of SIP INFO by comparing this attribute,
+	 * so remote SDP must be received first before remote SDP in SIP INFO
+	 * can be processed.
+	 */
+	if (call_med->rem_mid.slen == 0) {
+	    pjmedia_sdp_attr *a;
+
+	    a = pjmedia_sdp_media_find_attr2(m, "mid", NULL);
+	    if (a)
+		call_med->rem_mid = a->value;
+	}
     }
 
     /* Add NAT info in the SDP */
@@ -2850,7 +3022,7 @@
     call->rem_offerer = (rem_sdp != NULL);
 
     /* Notify application */
-    if (pjsua_var.ua_cfg.cb.on_call_sdp_created) {
+    if (!call->hanging_up && pjsua_var.ua_cfg.cb.on_call_sdp_created) {
 	(*pjsua_var.ua_cfg.cb.on_call_sdp_created)(call_id, sdp,
 						   pool, rem_sdp);
     }
@@ -2882,6 +3054,7 @@
 
     pj_log_push_indent();
 
+    call_med->prev_type = call_med->type;
     if (call_med->type == PJMEDIA_TYPE_AUDIO) {
 	pjsua_aud_stop_stream(call_med);
     }
@@ -2912,6 +3085,11 @@
 	prov_med->rtp_tx_seq	    = call_med->rtp_tx_seq;
 	prov_med->rtp_tx_ts	    = call_med->rtp_tx_ts;
 
+	/* Saved media type and stream info */
+	prov_med->prev_type = call_med->prev_type;
+	prov_med->prev_aud_si = call_med->prev_aud_si;
+	prov_med->prev_vid_si = call_med->prev_vid_si;
+
 	/* Stream */
 	if (call_med->type == PJMEDIA_TYPE_AUDIO) {
 	    prov_med->strm.a.conf_slot = call_med->strm.a.conf_slot;
@@ -2939,9 +3117,63 @@
     }
 }
 
+
+/*
+ * Print log of call states. Since call states may be too long for logger,
+ * printing it is a bit tricky, it should be printed part by part as long 
+ * as the logger can accept.
+ */
+static void log_call_dump(int call_id) 
+{
+    pj_pool_t *pool;
+    unsigned call_dump_len;
+    unsigned part_len;
+    unsigned part_idx;
+    unsigned log_decor;
+    char *buf;
+    enum { BUF_LEN = 10*1024 };
+    pj_status_t status;
+
+    pool = pjsua_pool_create("tmp", 1024, 1024);
+    buf = pj_pool_alloc(pool, sizeof(char) * BUF_LEN);
+
+    status = pjsua_call_dump(call_id, PJ_TRUE, buf, BUF_LEN, "  ");
+    if (status != PJ_SUCCESS)
+	goto on_return;
+
+    call_dump_len = (unsigned)pj_ansi_strlen(buf);
+
+    log_decor = pj_log_get_decor();
+    pj_log_set_decor(log_decor & ~(PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_CR));
+    PJ_LOG(3,(THIS_FILE, "\n"));
+    pj_log_set_decor(0);
+
+    part_idx = 0;
+    part_len = PJ_LOG_MAX_SIZE-80;
+    while (part_idx < call_dump_len) {
+	char p_orig, *p;
+
+	p = buf + part_idx;
+	if (part_idx + part_len > call_dump_len)
+	    part_len = call_dump_len - part_idx;
+	p_orig = p[part_len];
+	p[part_len] = '\0';
+	PJ_LOG(3,(THIS_FILE, "%s", p));
+	p[part_len] = p_orig;
+	part_idx += part_len;
+    }
+    pj_log_set_decor(log_decor);
+
+on_return:
+    if (pool)
+	pj_pool_release(pool);
+}
+
+
 pj_status_t pjsua_media_channel_deinit(pjsua_call_id call_id)
 {
     pjsua_call *call = &pjsua_var.calls[call_id];
+    pjsip_dialog *dlg;
     unsigned mi;
 
     for (mi=0; mi<call->med_cnt; ++mi) {
@@ -2959,8 +3191,23 @@
     PJ_LOG(4,(THIS_FILE, "Call %d: deinitializing media..", call_id));
     pj_log_push_indent();
 
+    /* Print call dump first */
+    dlg = (call->inv? call->inv->dlg : call->async_call.dlg);
+    if (dlg)
+    	log_call_dump(call_id);
+
     stop_media_session(call_id);
 
+    /* Stop trickle ICE timer */
+    if (call->trickle_ice.trickling > PJSUA_OP_STATE_NULL) {
+	call->trickle_ice.trickling = PJSUA_OP_STATE_NULL;
+	pjsua_cancel_timer(&call->trickle_ice.timer);
+    }
+    call->trickle_ice.enabled = PJ_FALSE;
+    call->trickle_ice.pending_info = PJ_FALSE;
+    call->trickle_ice.remote_sup = PJ_FALSE;
+    call->trickle_ice.retrans18x_count = 0;
+
     /* Clean up media transports */
     pjsua_media_prov_clean_up(call_id);
     call->med_prov_cnt = 0;
@@ -2968,6 +3215,40 @@
 	pjsua_call_media *call_med = &call->media[mi];
 
         if (call_med->tp_st > PJSUA_MED_TP_IDLE) {
+    	    pjmedia_transport_info tpinfo;
+    	    pjmedia_srtp_info *srtp_info;
+    	    pjmedia_ice_transport_info *ice_info;
+
+    	    pjmedia_transport_info_init(&tpinfo);
+    	    pjmedia_transport_get_info(call_med->tp, &tpinfo);
+    	    srtp_info = (pjmedia_srtp_info *)
+    	    		pjmedia_transport_info_get_spc_info(
+	            	    &tpinfo, PJMEDIA_TRANSPORT_TYPE_SRTP);
+    	    ice_info = (pjmedia_ice_transport_info *)
+    	    	       pjmedia_transport_info_get_spc_info(
+	            	   &tpinfo, PJMEDIA_TRANSPORT_TYPE_ICE);
+
+	    call_med->prev_srtp_use = (srtp_info && srtp_info->active)?
+	    			      PJ_TRUE: PJ_FALSE;
+	    if (call_med->prev_srtp_use)
+	    	call_med->prev_srtp_info = *srtp_info;
+	    call_med->prev_ice_use = (ice_info && ice_info->active)?
+	    			     PJ_TRUE: PJ_FALSE;
+	    if (call_med->prev_ice_use)
+	    	call_med->prev_ice_info = *ice_info;
+
+    	    /* Try to sync recent changes to provisional media */
+    	    if (mi < call->med_prov_cnt && 
+		call->media_prov[mi].tp == call_med->tp)
+    	    {
+		pjsua_call_media *prov_med = &call->media_prov[mi];
+
+		prov_med->prev_ice_use = call_med->prev_ice_use;
+		prov_med->prev_ice_info = call_med->prev_ice_info;
+		prov_med->prev_srtp_use = call_med->prev_srtp_use;
+		prov_med->prev_srtp_info = call_med->prev_srtp_info;
+	    }
+
 	    pjsua_set_media_tp_state(call_med, PJSUA_MED_TP_IDLE);
 	    pjmedia_transport_media_stop(call_med->tp);
 	}
@@ -2978,6 +3259,7 @@
 	    call_med->tp = call_med->tp_orig = NULL;
 	}
         call_med->tp_orig = NULL;
+        call_med->rem_srtp_use = PJMEDIA_SRTP_UNKNOWN;
     }
 
     pj_log_pop_indent();
@@ -3021,6 +3303,195 @@
 }
 
 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+
+static void check_srtp_roc(pjsua_call *call,
+			   unsigned med_idx,
+			   const pjsua_stream_info *new_si_,
+    			   const pjmedia_sdp_media *local_sdp,
+    			   const pjmedia_sdp_media *remote_sdp)
+{
+    pjsua_call_media *call_med = &call->media[med_idx];
+    pjmedia_transport_info tpinfo;
+    pjmedia_srtp_info *srtp_info;
+    pjmedia_ice_transport_info *ice_info;
+    const pjmedia_stream_info *prev_aud_si = NULL;
+    pjmedia_stream_info aud_si;
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+    const pjmedia_vid_stream_info *prev_vid_si = NULL;
+    pjmedia_vid_stream_info vid_si;
+#endif
+    pj_bool_t local_change = PJ_FALSE, rem_change = PJ_FALSE;
+    pjmedia_srtp_setting setting;
+
+    pjmedia_transport_info_init(&tpinfo);
+    pjmedia_transport_get_info(call_med->tp, &tpinfo);
+    srtp_info = (pjmedia_srtp_info *) pjmedia_transport_info_get_spc_info(
+	            &tpinfo, PJMEDIA_TRANSPORT_TYPE_SRTP);
+    /* We are not using SRTP. */
+    if (!srtp_info)
+    	return;
+
+    ice_info = (pjmedia_ice_transport_info*)
+	       pjmedia_transport_info_get_spc_info(&tpinfo,
+	           PJMEDIA_TRANSPORT_TYPE_ICE);
+
+    /* RFC 3711 section 3.3.1: 
+     * After a re-keying occurs (changing to a new master key), the rollover
+     * counter always maintains its sequence of values, i.e., it MUST NOT be
+     * reset to zero. 
+     *
+     * RFC 4568 section 7.1.4:
+     * If the offerer includes an IP address and/or port that differs from
+     * that used previously for a media stream (or FEC stream), the offerer
+     * MUST include a new master key with the offer (and in so doing, it
+     * will be creating a new crypto context where the ROC is set to zero).
+     * Similarly, if the answerer includes an IP address and/or port that
+     * differs from that used previously for a media stream (or FEC stream),
+     * the answerer MUST include a new master key with the answer (and hence
+     * create a new crypto context with the ROC set to zero).
+     */
+    if (call->opt.flag & PJSUA_CALL_REINIT_MEDIA) {
+    	if (!call_med->prev_srtp_use) return;
+    	
+    	/* The stream has been deinitialized by now, so we need to retrieve
+    	 * the previous stream info from the stored data.
+    	 */
+        if (call_med->prev_type == PJMEDIA_TYPE_AUDIO)
+            prev_aud_si = &call_med->prev_aud_si;
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+	else if (call_med->prev_type == PJMEDIA_TYPE_VIDEO)
+	    prev_vid_si = &call_med->prev_vid_si;
+#endif
+    } else {
+    	call_med->prev_srtp_use = PJ_TRUE;
+	call_med->prev_srtp_info = *srtp_info;
+	call_med->prev_ice_use = (ice_info && ice_info->active)?
+	    			 PJ_TRUE: PJ_FALSE;
+	if (call_med->prev_ice_use)
+	    call_med->prev_ice_info = *ice_info;
+
+    	if (call_med->type == PJMEDIA_TYPE_AUDIO) {
+	    /* Get current active audio stream info */
+	    if (call_med->strm.a.stream) {
+	        pjmedia_stream_get_info(call_med->strm.a.stream, &aud_si);
+	        prev_aud_si = &aud_si;
+	    }
+    	} 
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+    	else if (call_med->type == PJMEDIA_TYPE_VIDEO) {
+	    /* Get current active video stream info */
+	    if (call_med->strm.v.stream) {
+	        pjmedia_vid_stream_get_info(call_med->strm.v.stream, &vid_si);
+	        prev_vid_si = &vid_si;
+	    }
+	}
+#endif
+    }
+    
+#if 0
+    PJ_LOG(4, (THIS_FILE, "SRTP TX ROC %d %d",
+    			  call_med->prev_srtp_info.tx_roc.ssrc,
+    			  call_med->prev_srtp_info.tx_roc.roc));
+    PJ_LOG(4, (THIS_FILE, "SRTP RX ROC %d %d",
+    			  call_med->prev_srtp_info.rx_roc.ssrc,
+    			  call_med->prev_srtp_info.rx_roc.roc));
+#endif
+    
+    if (prev_aud_si) {
+	const pjmedia_stream_info *new_si = &new_si_->info.aud;
+
+	/* Local IP address changes */
+	if (pj_sockaddr_cmp(&prev_aud_si->local_addr, &new_si->local_addr))
+	    local_change = PJ_TRUE;
+	/* Remote IP address changes */
+	if (pj_sockaddr_cmp(&prev_aud_si->rem_addr, &new_si->rem_addr))
+	    rem_change = PJ_TRUE;
+    }
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
+    if (prev_vid_si) {
+	const pjmedia_vid_stream_info *new_si = &new_si_->info.vid;
+	
+	/* Local IP address changes */
+	if (pj_sockaddr_cmp(&prev_vid_si->local_addr, &new_si->local_addr))
+	    local_change = PJ_TRUE;
+	/* Remote IP address changes */
+	if (pj_sockaddr_cmp(&prev_vid_si->rem_addr, &new_si->rem_addr))
+	    rem_change = PJ_TRUE;
+    }
+#endif
+
+    /* There are some complications if we are using ICE, because default
+     * IP address can change after negotiation. In this case, we'll consider
+     * this as a change of IP address only if ICE is restarted as well
+     * (i.e. if ufrag changes).
+     */
+    if (ice_info && call_med->prev_ice_use) {
+	const pj_str_t STR_ICE_UFRAG = { "ice-ufrag", 9 };
+	pjmedia_sdp_attr *attr;
+
+	if (local_change) {
+	    attr = pjmedia_sdp_attr_find(local_sdp->attr_count,
+	    				 local_sdp->attr, &STR_ICE_UFRAG,
+	    				 NULL);
+	    if (!pj_strcmp(&call_med->prev_ice_info.loc_ufrag,
+	    		   &attr->value))
+	    {
+	    	PJ_LOG(4, (THIS_FILE, "ICE unchanged, SRTP TX ROC "
+	    	    		      "maintained"));
+	    	local_change = PJ_FALSE;
+	    }
+	}
+
+	if (rem_change) {
+	    attr = pjmedia_sdp_attr_find(remote_sdp->attr_count,
+	    				 remote_sdp->attr, &STR_ICE_UFRAG,
+	    				 NULL);
+	    if (!pj_strcmp(&call_med->prev_ice_info.rem_ufrag,
+	    		   &attr->value))
+	    {
+	    	PJ_LOG(4, (THIS_FILE, "ICE unchanged, SRTP RX ROC "
+	    	    		      "maintained"));
+	    	rem_change = PJ_FALSE;
+	    }
+	 }	    
+    }
+
+    pjmedia_transport_srtp_get_setting(call_med->tp, &setting);
+    setting.tx_roc = call_med->prev_srtp_info.tx_roc;
+    setting.rx_roc = call_med->prev_srtp_info.rx_roc;
+    if (local_change) {
+	PJ_LOG(4, (THIS_FILE, "Local address change detected, "
+			      "resetting SRTP TX ROC"));
+    	setting.tx_roc.roc = 0;
+    	/* Depending on the interpretation of the RFC, remote
+    	 * may or may not reset its ROC as well. So we anticipate both.
+    	 */
+    	setting.prev_rx_roc = call_med->prev_srtp_info.rx_roc;
+    	setting.prev_rx_roc.roc = 0;
+    }
+    if (rem_change) {
+	PJ_LOG(4, (THIS_FILE, "Remote address change detected, "
+			      "resetting SRTP RX ROC"));
+    	setting.rx_roc.roc = 0;
+    	/* There is a possibility that remote's IP address in the SDP
+    	 * changes, but its actual IP address actually doesn't change,
+    	 * such as when using ICE. So the only thing we can do here
+    	 * is to anticipate if remote doesn't reset the ROC.
+    	 */
+    	setting.prev_rx_roc = call_med->prev_srtp_info.rx_roc;
+#if PJSUA_RESET_SRTP_ROC_ON_REM_ADDRESS_CHANGE
+ 	if (!local_change) {
+	    PJ_LOG(4, (THIS_FILE, "Remote address change detected, "
+			      	  "resetting SRTP TX ROC"));
+ 	    setting.tx_roc.roc = 0;
+ 	}
+#endif 
+    }
+    pjmedia_transport_srtp_modify_setting(call_med->tp, &setting);
+}
+#endif
+
 static pj_bool_t is_media_changed(const pjsua_call *call,
 				  unsigned med_idx,
 				  const pjsua_stream_info *new_si_)
@@ -3060,12 +3531,13 @@
 	    return (new_si->dir != PJMEDIA_DIR_NONE);
 	}
 
+	if (old_si->rtcp_mux != new_si->rtcp_mux)
+	    return PJ_TRUE;
+
 	/* Compare remote RTP address. If ICE is running, change in default
 	 * address can happen after negotiation, this can be handled
 	 * internally by ICE and does not need to cause media restart.
 	 */
-	if (old_si->rtcp_mux != new_si->rtcp_mux)
-	    return PJ_TRUE;
 	if (!is_ice_running(call_med->tp) &&
 	    pj_sockaddr_cmp(&old_si->rem_addr, &new_si->rem_addr))
 	{
@@ -3293,7 +3765,11 @@
 
     /* Process each media stream */
     for (mi=0; mi < call->med_cnt; ++mi) {
-	pjsua_call_media *call_med = &call->media[mi];
+    	const char *STR_SENDRECV = "sendrecv";
+    	const char *STR_SENDONLY = "sendonly";
+     	const char *STR_RECVONLY = "recvonly";
+     	const char *STR_INACTIVE = "inactive";
+     	pjsua_call_media *call_med = &call->media[mi];
 	pj_bool_t media_changed = PJ_FALSE;
 
 	if (mi >= local_sdp->media_count ||
@@ -3361,9 +3837,73 @@
 	        si->param->setting.vad = 0;
 	    }
 
-	    /* Check if this media is changed */
+	    if (!pjmedia_sdp_neg_was_answer_remote(call->inv->neg) &&
+	    	si->dir != PJMEDIA_DIR_NONE)
+	    {
+    		pjmedia_dir dir = si->dir;
+    		
+    		if (call->opt.flag & PJSUA_CALL_SET_MEDIA_DIR) {
+    		    call_med->def_dir = call->opt.media_dir[mi];
+    		    PJ_LOG(4,(THIS_FILE, "Call %d: setting audio media "
+    		    			 "direction #%d to %d.",
+			  		 call_id, mi, call_med->def_dir));
+    		}
+
+ 		/* If the default direction specifies we do not wish
+ 		 * encoding/decoding, clear that direction.
+ 		 */
+     		if ((call_med->def_dir & PJMEDIA_DIR_ENCODING) == 0) {
+ 		    dir &= ~PJMEDIA_DIR_ENCODING;
+     		}
+     		if ((call_med->def_dir & PJMEDIA_DIR_DECODING) == 0) {
+ 		    dir &= ~PJMEDIA_DIR_DECODING;
+     		}
+
+     		if (dir != si->dir) {
+     		    const char *str_attr = NULL;
+ 	    	    pjmedia_sdp_attr *attr;
+ 	    	    pjmedia_sdp_media *m;
+
+     		    if (!need_renego_sdp) {
+ 			pjmedia_sdp_session *local_sdp_renego;
+ 			local_sdp_renego =
+ 			    pjmedia_sdp_session_clone(tmp_pool, local_sdp);
+ 			local_sdp = local_sdp_renego;
+ 			need_renego_sdp = PJ_TRUE;
+     		    }
+
+     		    si->dir = dir;
+     		    m = local_sdp->media[mi];
+
+ 	    	    /* Remove existing directions attributes */
+ 	    	    pjmedia_sdp_media_remove_all_attr(m, STR_SENDRECV);
+ 	    	    pjmedia_sdp_media_remove_all_attr(m, STR_SENDONLY);
+ 	    	    pjmedia_sdp_media_remove_all_attr(m, STR_RECVONLY);
+
+ 		    if (si->dir == PJMEDIA_DIR_ENCODING_DECODING) {
+ 		    	str_attr = STR_SENDRECV;
+ 		    } else if (si->dir == PJMEDIA_DIR_ENCODING) {
+ 		    	str_attr = STR_SENDONLY;
+ 		    } else if (si->dir == PJMEDIA_DIR_DECODING) {
+ 		    	str_attr = STR_RECVONLY;
+ 		    } else {
+ 		    	str_attr = STR_INACTIVE;
+ 		    }
+ 		    attr = pjmedia_sdp_attr_create(tmp_pool, str_attr, NULL);
+ 		    pjmedia_sdp_media_add_attr(m, attr);
+ 		}
+     	    }
+
 	    stream_info.type = PJMEDIA_TYPE_AUDIO;
 	    stream_info.info.aud = the_si;
+
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+	    /* Check if we need to reset or maintain SRTP ROC */
+	    check_srtp_roc(call, mi, &stream_info,
+	    		   local_sdp->media[mi], remote_sdp->media[mi]);
+#endif
+
+	    /* Check if this media is changed */
 	    if (pjsua_var.media_cfg.no_smart_media_update ||
 		is_media_changed(call, mi, &stream_info))
 	    {
@@ -3538,6 +4078,63 @@
 	        si->rtcp_mux = PJ_FALSE;
 	    }
 
+	    if (!pjmedia_sdp_neg_was_answer_remote(call->inv->neg) &&
+	    	si->dir != PJMEDIA_DIR_NONE)
+	    {
+    		pjmedia_dir dir = si->dir;
+    		
+    		if (call->opt.flag & PJSUA_CALL_SET_MEDIA_DIR) {
+    		    call_med->def_dir = call->opt.media_dir[mi];
+    		    PJ_LOG(4,(THIS_FILE, "Call %d: setting video media "
+    		    			 "direction #%d to %d.",
+			  		 call_id, mi, call_med->def_dir));
+    		}
+
+ 		/* If the default direction specifies we do not wish
+ 		 * encoding/decoding, clear that direction.
+ 		 */
+     		if ((call_med->def_dir & PJMEDIA_DIR_ENCODING) == 0) {
+ 		    dir &= ~PJMEDIA_DIR_ENCODING;
+     		}
+     		if ((call_med->def_dir & PJMEDIA_DIR_DECODING) == 0) {
+ 		    dir &= ~PJMEDIA_DIR_DECODING;
+     		}
+
+     		if (dir != si->dir) {
+     		    const char *str_attr = NULL;
+ 	    	    pjmedia_sdp_attr *attr;
+ 	    	    pjmedia_sdp_media *m;
+
+     		    if (!need_renego_sdp) {
+ 			pjmedia_sdp_session *local_sdp_renego;
+ 			local_sdp_renego =
+ 			    pjmedia_sdp_session_clone(tmp_pool, local_sdp);
+ 			local_sdp = local_sdp_renego;
+ 			need_renego_sdp = PJ_TRUE;
+     		    }
+
+     		    si->dir = dir;
+     		    m = local_sdp->media[mi];
+
+ 	    	    /* Remove existing directions attributes */
+ 	    	    pjmedia_sdp_media_remove_all_attr(m, STR_SENDRECV);
+ 	    	    pjmedia_sdp_media_remove_all_attr(m, STR_SENDONLY);
+ 	    	    pjmedia_sdp_media_remove_all_attr(m, STR_RECVONLY);
+
+ 		    if (si->dir == PJMEDIA_DIR_ENCODING_DECODING) {
+ 		    	str_attr = STR_SENDRECV;
+ 		    } else if (si->dir == PJMEDIA_DIR_ENCODING) {
+ 		    	str_attr = STR_SENDONLY;
+ 		    } else if (si->dir == PJMEDIA_DIR_DECODING) {
+ 		    	str_attr = STR_RECVONLY;
+ 		    } else {
+ 		    	str_attr = STR_INACTIVE;
+ 		    }
+ 		    attr = pjmedia_sdp_attr_create(tmp_pool, str_attr, NULL);
+ 		    pjmedia_sdp_media_add_attr(m, attr);
+ 		}
+     	    }
+
 	    /* Check if this media is changed */
 	    stream_info.type = PJMEDIA_TYPE_VIDEO;
 	    stream_info.info.vid = the_si;
@@ -3596,7 +4193,7 @@
 		    call_med->rem_srtp_use = srtp_info->peer_use;
 		}
 
-		/* Update audio channel */
+		/* Update video channel */
 		if (media_changed) {
 		    status = pjsua_vid_channel_update(call_med,
 						      call->inv->pool, si,
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_vid.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_vid.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_vid.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/pjsua-lib/pjsua_vid.c	2022-02-24 07:54:38.000000000 +0000
@@ -34,6 +34,10 @@
 static pjsua_vid_win_id vid_preview_get_win(pjmedia_vid_dev_index id,
                                             pj_bool_t running_only);
 static void free_vid_win(pjsua_vid_win_id wid);
+static pj_status_t media_event_unsubscribe(pjmedia_event_mgr* mgr,
+					   pjmedia_event_cb* cb,
+					   void* user_data,
+					   void* epub);
 
 /*****************************************************************************
  * pjsua video subsystem.
@@ -85,6 +89,15 @@
     }
 #endif
 
+#if PJMEDIA_HAS_VIDEO && PJMEDIA_HAS_ANDROID_MEDIACODEC
+    status = pjmedia_codec_and_media_vid_init(NULL, &pjsua_var.cp.factory);
+    if (status != PJ_SUCCESS) {
+	pjsua_perror(THIS_FILE, "Error initializing AMediaCodec library",
+		     status);
+	goto on_error;
+    }
+#endif
+
 #if PJMEDIA_HAS_VIDEO && PJMEDIA_HAS_OPENH264_CODEC
     status = pjmedia_codec_openh264_vid_init(NULL, &pjsua_var.cp.factory);
     if (status != PJ_SUCCESS) {
@@ -111,12 +124,15 @@
     }
 #endif
 
+#if !defined(PJSUA_DONT_INIT_VID_DEV_SUBSYS) || \
+             PJSUA_DONT_INIT_VID_DEV_SUBSYS==0
     status = pjmedia_vid_dev_subsys_init(&pjsua_var.cp.factory);
     if (status != PJ_SUCCESS) {
 	pjsua_perror(THIS_FILE, "Error creating PJMEDIA video subsystem",
 		     status);
 	goto on_error;
     }
+#endif
 
     for (i=0; i<PJSUA_MAX_VID_WINS; ++i) {
 	if (pjsua_var.win[i].pool == NULL) {
@@ -171,6 +187,11 @@
     pjmedia_codec_vid_toolbox_deinit();
 #endif
 
+#if defined(PJMEDIA_HAS_ANDROID_MEDIACODEC) && \
+    PJMEDIA_HAS_ANDROID_MEDIACODEC != 0
+    pjmedia_codec_and_media_vid_deinit();
+#endif
+
 #if defined(PJMEDIA_HAS_OPENH264_CODEC) && PJMEDIA_HAS_OPENH264_CODEC != 0
     pjmedia_codec_openh264_vid_deinit();
 #endif
@@ -221,6 +242,24 @@
     pj_bzero(&p->wnd, sizeof(p->wnd));
 }
 
+static pj_status_t media_event_unsubscribe(pjmedia_event_mgr* mgr,
+					   pjmedia_event_cb* cb,
+					   void* user_data,
+					   void* epub)
+{
+    unsigned num_locks = 0;
+    pj_status_t status;
+
+    /* Release locks before unsubscribing, to avoid deadlock. */
+    num_locks = PJSUA_RELEASE_LOCK();
+
+    status = pjmedia_event_unsubscribe(mgr, cb, user_data, epub);
+
+    /* Re-acquire the locks. */
+    PJSUA_RELOCK(num_locks);
+
+    return status;
+}
 
 /*****************************************************************************
  * Devices.
@@ -861,24 +900,31 @@
 static void free_vid_win(pjsua_vid_win_id wid)
 {
     pjsua_vid_win *w = &pjsua_var.win[wid];
+    unsigned num_locks = 0;
     
     PJ_LOG(4,(THIS_FILE, "Window %d: destroying..", wid));
     pj_log_push_indent();
 
+    /* Release locks before unsubscribing/destroying, to avoid deadlock. */
+    num_locks = PJSUA_RELEASE_LOCK();
+
     if (w->vp_cap) {
 	pjsua_vid_conf_remove_port(w->cap_slot);
         pjmedia_event_unsubscribe(NULL, &call_media_on_event, NULL,
-                                  w->vp_cap);
+				  w->vp_cap);
 	pjmedia_vid_port_stop(w->vp_cap);
 	pjmedia_vid_port_destroy(w->vp_cap);
     }
     if (w->vp_rend) {
 	pjsua_vid_conf_remove_port(w->rend_slot);
         pjmedia_event_unsubscribe(NULL, &call_media_on_event, NULL,
-                                  w->vp_rend);
+				  w->vp_rend);
 	pjmedia_vid_port_stop(w->vp_rend);
 	pjmedia_vid_port_destroy(w->vp_rend);
     }
+    /* Re-acquire the locks. */
+    PJSUA_RELOCK(num_locks);
+
     pjsua_vid_win_reset(wid);
 
     pj_log_pop_indent();
@@ -917,6 +963,12 @@
     call_med->strm.v.cap_dev = acc->cfg.vid_cap_dev;
     call_med->strm.v.strm_dec_slot = PJSUA_INVALID_ID;
     call_med->strm.v.strm_enc_slot = PJSUA_INVALID_ID;
+    /*
+     * pjmedia_vid_dev_get_info() will raise assertion when video device
+     * subsys initialization is delayed (see PJSUA_DONT_INIT_VID_DEV_SUBSYS
+     * or #2777). While normalizing default device IDs is not urgent
+     * at this point.
+
     if (call_med->strm.v.rdr_dev == PJMEDIA_VID_DEFAULT_RENDER_DEV) {
 	pjmedia_vid_dev_info info;
 	pjmedia_vid_dev_get_info(call_med->strm.v.rdr_dev, &info);
@@ -927,6 +979,7 @@
 	pjmedia_vid_dev_get_info(call_med->strm.v.cap_dev, &info);
 	call_med->strm.v.cap_dev = info.id;
     }
+    */
 
     return PJ_SUCCESS;
 }
@@ -994,6 +1047,9 @@
     /* Done */
     inc_vid_win(wid);
     call_med->strm.v.cap_win_id = wid;
+    PJ_LOG(4,(THIS_FILE, "Call %d media %d: video capture set up with "
+    			 "dev %d, wid=%d", call_med->call->index,
+    			 call_med->idx, call_med->strm.v.cap_dev, wid));
 
     PJSUA_UNLOCK();
 
@@ -1061,7 +1117,9 @@
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
 	/* Enable/disable stream keep-alive and NAT hole punch. */
-	si->use_ka = pjsua_var.acc[call->acc_id].cfg.use_stream_ka;
+	si->use_ka = acc->cfg.use_stream_ka;
+
+        si->ka_cfg = acc->cfg.stream_ka_cfg;
 #endif
 
 	/* Try to get shared format ID between the capture device and 
@@ -1095,6 +1153,25 @@
 	    }
 	}
 
+        if (!call->hanging_up && pjsua_var.ua_cfg.cb.on_stream_precreate) {
+            pjsua_on_stream_precreate_param prm;
+            prm.stream_idx = call_med->idx;
+            prm.stream_info.type = PJMEDIA_TYPE_VIDEO;
+            prm.stream_info.info.vid = *si;
+            (*pjsua_var.ua_cfg.cb.on_stream_precreate)(call->index, &prm);
+
+            /* Copy back only the fields which are allowed to be changed. */
+            si->jb_init = prm.stream_info.info.vid.jb_init;
+            si->jb_min_pre = prm.stream_info.info.vid.jb_min_pre;
+            si->jb_max_pre = prm.stream_info.info.vid.jb_max_pre;
+            si->jb_max = prm.stream_info.info.vid.jb_max;
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && (PJMEDIA_STREAM_ENABLE_KA != 0)
+            si->use_ka = prm.stream_info.info.vid.use_ka;
+#endif
+            si->rtcp_sdes_bye_disabled = prm.stream_info.info.vid.rtcp_sdes_bye_disabled;
+	    si->codec_param->enc_fmt = prm.stream_info.info.vid.codec_param->enc_fmt;
+        }
+
 	/* Create session based on session info. */
 	status = pjmedia_vid_stream_create(pjsua_var.med_endpt, NULL, si,
 					   call_med->tp, NULL,
@@ -1197,26 +1274,26 @@
 	    pj_log_pop_indent();
 	}
 
+        /* Retrieve stream encoding port */
+        status = pjmedia_vid_stream_get_port(call_med->strm.v.stream,
+                                             PJMEDIA_DIR_ENCODING,
+                                             &media_port);
+        if (status != PJ_SUCCESS)
+            goto on_error;
+
+        /* Register stream encoding to conf, using tmp_pool should be fine
+         * as bridge will create its own pool (using tmp_pool factory).
+         */
+        status = pjsua_vid_conf_add_port(tmp_pool, media_port, NULL,
+                                         &call_med->strm.v.strm_enc_slot);
+        if (status != PJ_SUCCESS)
+            goto on_error;
+
 	/* Setup encoding direction */
 	if (si->dir & PJMEDIA_DIR_ENCODING) {
 	    PJ_LOG(4,(THIS_FILE, "Setting up TX.."));
 	    pj_log_push_indent();
 
-	    /* Retrieve stream encoding port */
-	    status = pjmedia_vid_stream_get_port(call_med->strm.v.stream,
-						 PJMEDIA_DIR_ENCODING,
-						 &media_port);
-	    if (status != PJ_SUCCESS)
-		goto on_error;
-
-	    /* Register stream encoding to conf, using tmp_pool should be fine
-	     * as bridge will create its own pool (using tmp_pool factory).
-	     */
-	    status = pjsua_vid_conf_add_port(tmp_pool, media_port, NULL,
-					     &call_med->strm.v.strm_enc_slot);
-	    if (status != PJ_SUCCESS)
-		goto on_error;
-
 	    if (!call->local_hold && acc->cfg.vid_out_auto_transmit) {
 	    	status = setup_vid_capture(call_med);
 	    	if (status != PJ_SUCCESS)
@@ -1248,6 +1325,7 @@
 {
     pjmedia_vid_stream *strm = call_med->strm.v.stream;
     pjmedia_rtcp_stat stat;
+    unsigned num_locks = 0;
 
     pj_assert(call_med->type == PJMEDIA_TYPE_VIDEO);
 
@@ -1257,32 +1335,29 @@
     PJ_LOG(4,(THIS_FILE, "Stopping video stream.."));
     pj_log_push_indent();
     
-    /* Unregister video stream ports (encode+decode) from conference */
-    if (call_med->strm.v.strm_enc_slot != PJSUA_INVALID_ID) {
-	pjsua_vid_conf_remove_port(call_med->strm.v.strm_enc_slot);
-	call_med->strm.v.strm_enc_slot = PJSUA_INVALID_ID;
-    }
-    if (call_med->strm.v.strm_dec_slot != PJSUA_INVALID_ID) {
-	pjsua_vid_conf_remove_port(call_med->strm.v.strm_dec_slot);
-	call_med->strm.v.strm_dec_slot = PJSUA_INVALID_ID;
-    }
+    pjmedia_vid_stream_get_info(strm, &call_med->prev_vid_si);
 
     pjmedia_vid_stream_send_rtcp_bye(strm);
 
-    PJSUA_LOCK();
+    /* Release locks before unsubscribing, to avoid deadlock. */
+    while (PJSUA_LOCK_IS_LOCKED()) {
+        num_locks++;
+        PJSUA_UNLOCK();
+    }
+
+    /* Unsubscribe events first, otherwise the event callbacks
+     * can be called and access already destroyed objects.
+     */
     if (call_med->strm.v.cap_win_id != PJSUA_INVALID_ID) {
 	pjsua_vid_win *w = &pjsua_var.win[call_med->strm.v.cap_win_id];
 
 	/* Unsubscribe event */
 	pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med,
-                                  w->vp_cap);
-
-	/* Decrement ref count of preview video window */
-	dec_vid_win(call_med->strm.v.cap_win_id);
-	call_med->strm.v.cap_win_id = PJSUA_INVALID_ID;
+				  w->vp_cap);
     }
-
     if (call_med->strm.v.rdr_win_id != PJSUA_INVALID_ID) {
+    	pj_status_t status;
+    	pjmedia_port *media_port;
 	pjsua_vid_win *w = &pjsua_var.win[call_med->strm.v.rdr_win_id];
 
 	/* Unsubscribe event, but stop the render first */
@@ -1290,15 +1365,116 @@
 	pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med,
                                   w->vp_rend);
 
+	/* Retrieve stream decoding port */
+	status = pjmedia_vid_stream_get_port(strm, PJMEDIA_DIR_DECODING,
+					     &media_port);
+	if (status == PJ_SUCCESS) {
+	    pjmedia_event_unsubscribe(NULL, &call_media_on_event,
+                                    call_med, media_port);
+
+	    pjmedia_vid_port_unsubscribe_event(w->vp_rend, media_port);
+        }
+    }
+    /* Unsubscribe from video stream events */
+    pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med, strm);
+
+    /* Re-acquire the locks. */
+    for (; num_locks > 0; num_locks--)
+        PJSUA_LOCK();
+
+    PJSUA_LOCK();
+
+    /* Now that we have unsubscribed from all events, we no longer
+     * receive future events. But we may have scheduled some timers
+     * to call media event callbacks, so we need to wait until those
+     * complete. Note that we can't cancel those timers since timer
+     * implementation doesn't guarantee there's no race between
+     * entry cancellation and the callback being called from poll.
+     */
+    while (1) {
+    	pjsua_timer_list *act_timer;
+
+    	act_timer = pjsua_var.active_timer_list.next;
+    	while (act_timer != &pjsua_var.active_timer_list) {
+    	    if (act_timer->cb == &call_med_event_cb) {
+    	    	pjsua_event_list *eve;
+    	    	
+    	    	eve = (pjsua_event_list *)act_timer->user_data;
+
+		if (eve->call_id == (int)call_med->call->index &&
+    	    	    eve->med_idx == call_med->idx)
+    	    	{
+		    pjsip_dialog *dlg = call_med->call->inv ?
+					    call_med->call->inv->dlg : NULL;
+
+		    /* The function may be called from worker thread, we have
+		     * to handle the events instead of simple sleep here
+		     * and must not hold any lock while handling the events:
+		     * https://trac.pjsip.org/repos/ticket/1737
+		     */
+		    num_locks = PJSUA_RELEASE_LOCK();
+
+		    if (dlg) {
+			pjsip_dlg_inc_session(dlg, &pjsua_var.mod);
+			pjsip_dlg_dec_lock(dlg);
+		    }
+
+		    pjsua_handle_events(10);
+
+		    if (dlg) {
+			pjsip_dlg_inc_lock(dlg);
+			pjsip_dlg_dec_session(dlg, &pjsua_var.mod);
+		    }
+
+		    PJSUA_RELOCK(num_locks);
+    	    	    break;
+    	    	}
+    	    }
+    	    act_timer = act_timer->next;    	    
+    	}
+    	if (act_timer == &pjsua_var.active_timer_list)
+    	    break;
+    }
+
+    if (call_med->strm.v.cap_win_id != PJSUA_INVALID_ID) {
+	/* Decrement ref count of preview video window */
+	dec_vid_win(call_med->strm.v.cap_win_id);
+	call_med->strm.v.cap_win_id = PJSUA_INVALID_ID;
+	
+	PJ_LOG(4,(THIS_FILE, "Call %d media %d: Preview video window "
+			     "released", call_med->call->index,
+    			     call_med->idx));
+    }
+
+    if (call_med->strm.v.rdr_win_id != PJSUA_INVALID_ID) {
 	/* Decrement ref count of stream video window */
 	dec_vid_win(call_med->strm.v.rdr_win_id);
 	call_med->strm.v.rdr_win_id = PJSUA_INVALID_ID;
+
+	PJ_LOG(4,(THIS_FILE, "Call %d media %d: Stream video window "
+			     "released", call_med->call->index,
+    			     call_med->idx));
     }
     PJSUA_UNLOCK();
 
-    if ((call_med->dir & PJMEDIA_DIR_ENCODING) &&
-	(pjmedia_vid_stream_get_stat(strm, &stat) == PJ_SUCCESS) &&
-	stat.tx.pkt)
+    /* Unregister video stream ports (encode+decode) from conference */
+    if (call_med->strm.v.strm_enc_slot != PJSUA_INVALID_ID) {
+	pjsua_vid_conf_remove_port(call_med->strm.v.strm_enc_slot);
+	call_med->strm.v.strm_enc_slot = PJSUA_INVALID_ID;
+    }
+    if (call_med->strm.v.strm_dec_slot != PJSUA_INVALID_ID) {
+	pjsua_vid_conf_remove_port(call_med->strm.v.strm_dec_slot);
+	call_med->strm.v.strm_dec_slot = PJSUA_INVALID_ID;
+    }
+
+    /* Don't check for direction and transmitted packets count as we
+     * assume that RTP timestamp remains increasing when outgoing
+     * direction is disabled/paused.
+     */
+     //if ((call_med->dir & PJMEDIA_DIR_ENCODING) &&
+     //    (pjmedia_vid_stream_get_stat(strm, &stat) == PJ_SUCCESS) &&
+     //    stat.tx.pkt)
+    if (pjmedia_vid_stream_get_stat(strm, &stat) == PJ_SUCCESS)
     {
 	/* Save RTP timestamp & sequence, so when media session is
 	 * restarted, those values will be restored as the initial
@@ -1311,9 +1487,6 @@
 	call_med->rtp_tx_ts = stat.rtp_tx_last_ts;
     }
 
-    /* Unsubscribe from video stream events */
-    pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med, strm);
-
     pjmedia_vid_stream_destroy(strm);
     call_med->strm.v.stream = NULL;
 
@@ -1433,7 +1606,6 @@
     wid = pjsua_vid_preview_get_win(id);
     if (wid == PJSUA_INVALID_ID) {
 	PJSUA_UNLOCK();
-	pj_log_pop_indent();
 	return PJ_ENOTFOUND;
     }
 
@@ -1755,8 +1927,9 @@
 /*
  * Set video window fullscreen.
  */
-PJ_DEF(pj_status_t) pjsua_vid_win_set_fullscreen( pjsua_vid_win_id wid,
-                                                  pj_bool_t enabled)
+PJ_DEF(pj_status_t) pjsua_vid_win_set_fullscreen(
+					pjsua_vid_win_id wid,
+					pjmedia_vid_dev_fullscreen_flag mode)
 {
     pjsua_vid_win *w;
     pjmedia_vid_dev_stream *s;
@@ -1774,7 +1947,7 @@
     }
 
     status = pjmedia_vid_dev_stream_set_cap(s,
-			    PJMEDIA_VID_DEV_CAP_OUTPUT_FULLSCREEN, &enabled);
+			    PJMEDIA_VID_DEV_CAP_OUTPUT_FULLSCREEN, &mode);
 
     PJSUA_UNLOCK();
 
@@ -1821,7 +1994,7 @@
 
 /* Send SDP reoffer. */
 static pj_status_t call_reoffer_sdp(pjsua_call_id call_id,
-				    const pjmedia_sdp_session *sdp)
+				    pjmedia_sdp_session *sdp)
 {
     pjsua_call *call;
     pjsip_tx_data *tdata;
@@ -1838,6 +2011,13 @@
 	return PJSIP_ESESSIONSTATE;
     }
 
+    /* Notify application */
+    if (!call->hanging_up && pjsua_var.ua_cfg.cb.on_call_sdp_created) {
+	(*pjsua_var.ua_cfg.cb.on_call_sdp_created)(call_id, sdp,
+						   call->inv->pool_prov,
+						   NULL);
+    }
+
     /* Create re-INVITE with new offer */
     status = pjsip_inv_reinvite( call->inv, NULL, sdp, &tdata);
     if (status != PJ_SUCCESS) {
@@ -1890,13 +2070,8 @@
 
     sdp = pjmedia_sdp_session_clone(call->inv->pool_prov, current_sdp);
 
-    /* Clean up provisional media before using it */
-    pjsua_media_prov_clean_up(call->index);
-
-    /* Update provisional media from call media */
-    call->med_prov_cnt = call->med_cnt;
-    pj_memcpy(call->media_prov, call->media,
-	      sizeof(call->media[0]) * call->med_cnt);
+    /* Clean up & sync provisional media before using it */
+    pjsua_media_prov_revert(call->index);
 
     /* Initialize call media */
     call_med = &call->media_prov[call->med_prov_cnt++];
@@ -2002,13 +2177,8 @@
 	med_idx = first_active;
     }
 
-    /* Clean up provisional media before using it */
-    pjsua_media_prov_clean_up(call->index);
-
-    /* Update provisional media from call media */
-    call->med_prov_cnt = call->med_cnt;
-    pj_memcpy(call->media_prov, call->media,
-	      sizeof(call->media[0]) * call->med_cnt);
+    /* Clean up & sync provisional media before using it */
+    pjsua_media_prov_revert(call->index);
 
     call_med = &call->media_prov[med_idx];
 
@@ -2121,7 +2291,9 @@
 
 on_error:
 	if (status != PJ_SUCCESS) {
-	    pjsua_media_prov_clean_up(call->index);
+	    /* Revert back provisional media. */
+	    pjsua_media_prov_revert(call->index);
+
 	    return status;
 	}
     
@@ -2181,7 +2353,7 @@
 
     /* Verify the capture device */
     status = pjmedia_vid_dev_get_info(cap_dev, &info);
-    if (status != PJ_SUCCESS || info.dir != PJMEDIA_DIR_CAPTURE)
+    if (status != PJ_SUCCESS || (info.dir & PJMEDIA_DIR_CAPTURE) == 0)
 	return PJ_EINVAL;
 
     /* The specified capture device is being used already */
@@ -2190,6 +2362,15 @@
 
     /* == Apply the new capture device == */
     PJSUA_LOCK();
+
+    /* If media does not have active preview, simply set capture device ID */
+    if (call_med->strm.v.cap_win_id == PJSUA_INVALID_ID) {
+	call_med->strm.v.cap_dev = cap_dev;
+
+	/* That's it */
+	goto on_sync_and_return;
+    }
+
     wid = call_med->strm.v.cap_win_id;
     w = &pjsua_var.win[wid];
     pj_assert(w->type == PJSUA_WND_TYPE_PREVIEW && w->vp_cap);
@@ -2205,9 +2386,8 @@
 	w->preview_cap_id = cap_dev;
 	call_med->strm.v.cap_dev = cap_dev;
 
-	PJSUA_UNLOCK();
-	/* Yay, change capturer done! */
-	return PJ_SUCCESS;
+	/* Yay, change capturer done! Now return */
+	goto on_sync_and_return;
     }
 
     /* Oh no, it doesn't support fast switching. Do normal change then,
@@ -2220,8 +2400,7 @@
 	return status;
     }
 
-    pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med,
-                              w->vp_cap);
+    media_event_unsubscribe(NULL, &call_media_on_event, call_med, w->vp_cap);
     
     /* Disconnect the old capture device to stream encoding port */
     status = pjsua_vid_conf_disconnect(w->cap_slot,
@@ -2289,7 +2468,12 @@
     call_med->strm.v.cap_dev = cap_dev;
     call_med->strm.v.cap_win_id = new_wid;
     dec_vid_win(wid);
-    
+
+on_sync_and_return:
+
+    /* Sync provisional media from call media */
+    pj_memcpy(&call->media_prov[med_idx], call_med, sizeof(call->media[0]));
+
     PJSUA_UNLOCK();
 
     return PJ_SUCCESS;
@@ -2301,8 +2485,8 @@
 
     if (new_w) {
 	/* Unsubscribe, just in case */
-        pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med,
-                                  new_w->vp_cap);
+        media_event_unsubscribe(NULL, &call_media_on_event, call_med,
+				new_w->vp_cap);
 
 	/* Release the new capturer */
 	dec_vid_win(new_wid);
@@ -2382,8 +2566,8 @@
     	    w = &pjsua_var.win[wid];
 
 	    /* Unsubscribe event */
-	    pjmedia_event_unsubscribe(NULL, &call_media_on_event, call_med,
-                                      w->vp_cap);
+	    media_event_unsubscribe(NULL, &call_media_on_event, call_med,
+                                    w->vp_cap);
 
 	    /* Disconnect from video conference */
     	    pjsua_vid_conf_disconnect(w->cap_slot,
@@ -2397,6 +2581,9 @@
     	PJSUA_UNLOCK();
     }
 
+    /* Sync provisional media from call media */
+    pj_memcpy(&call->media_prov[med_idx], call_med, sizeof(call->media[0]));
+
     return status;
 }
 
@@ -2686,6 +2873,16 @@
     return pjmedia_vid_conf_disconnect_port(pjsua_var.vid_conf, source, sink);
 }
 
+
+/*
+ * Update or refresh port states from video port info.
+ */
+PJ_DEF(pj_status_t) pjsua_vid_conf_update_port(pjsua_conf_port_id id)
+{
+    return pjmedia_vid_conf_update_port(pjsua_var.vid_conf, id);
+}
+
+
 /*
  * Get the video window associated with the call.
  */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/dns_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/dns_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/dns_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/dns_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -398,7 +398,7 @@
  */
 static int round_robin_test(pj_pool_t *pool)
 {
-    enum { COUNT = 400, PCT_ALLOWANCE = 5 };
+    enum { COUNT = 400, PCT_ALLOWANCE = 10 };
     unsigned i;
     struct server_hit
     {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/inv_offer_answer_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/inv_offer_answer_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/inv_offer_answer_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/inv_offer_answer_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -137,6 +137,7 @@
     pj_bool_t	need_established;
     unsigned	count;
     oa_t	oa[4];
+    pj_bool_t	multipart_body;
 } inv_test_param_t;
 
 typedef struct inv_test_t
@@ -257,6 +258,17 @@
 	    }
 	}
 
+	/* Special handling for standard offer/answer */
+	if (inv_test.param.count == 1 &&
+	    inv_test.param.oa[0] == OFFERER_UAC &&
+	    inv_test.param.need_established)
+	{
+	    jobs[job_cnt].type = ESTABLISH_CALL;
+	    jobs[job_cnt].who = PJSIP_ROLE_UAS;
+	    job_cnt++;
+	    TRACE_((THIS_FILE, "      C+++"));
+	}
+
 	pj_assert(job_cnt <= PJ_ARRAY_SIZE(jobs));
     }
 }
@@ -333,6 +345,15 @@
 					  NULL, &tdata);
 	pj_assert(status == PJ_SUCCESS);
 
+	/* Use multipart body, if configured */
+	if (sdp && inv_test.param.multipart_body) {
+	     status = pjsip_create_multipart_sdp_body(
+				tdata->pool,
+				pjmedia_sdp_session_clone(tdata->pool, sdp),
+				&tdata->msg->body);
+	}
+	pj_assert(status == PJ_SUCCESS);
+
 	status = pjsip_inv_send_msg(inv_test.uas, tdata);
 	pj_assert(status == PJ_SUCCESS);
 
@@ -426,6 +447,7 @@
 	sdp = NULL;
 
     status = pjsip_inv_create_uac(dlg, sdp, inv_test.param.inv_option, &inv_test.uac);
+    //inv_test.uac->create_multipart = param->multipart_body;
     PJ_ASSERT_RETURN(status==PJ_SUCCESS, -20);
 
     TRACE_((THIS_FILE, "    Sending INVITE %s offer", (sdp ? "with" : "without")));
@@ -436,8 +458,17 @@
     status = pjsip_inv_invite(inv_test.uac, &tdata);
     PJ_ASSERT_RETURN(status==PJ_SUCCESS, -30);
 
+    /* Use multipart body, if configured */
+    if (sdp && param->multipart_body) {
+	 status = pjsip_create_multipart_sdp_body(
+			    tdata->pool,
+			    pjmedia_sdp_session_clone(tdata->pool, sdp),
+			    &tdata->msg->body);
+    }
+    PJ_ASSERT_RETURN(status==PJ_SUCCESS, -40);
+
     status = pjsip_inv_send_msg(inv_test.uac, tdata);
-    PJ_ASSERT_RETURN(status==PJ_SUCCESS, -30);
+    PJ_ASSERT_RETURN(status==PJ_SUCCESS, -50);
 
     /*
      * Wait until test completes
@@ -467,8 +498,10 @@
     status = pjsip_inv_end_session(inv_test.uas, PJSIP_SC_DECLINE, 0, &tdata);
     pj_assert(status == PJ_SUCCESS);
 
-    status = pjsip_inv_send_msg(inv_test.uas, tdata);
-    pj_assert(status == PJ_SUCCESS);
+    if (tdata) {
+    	status = pjsip_inv_send_msg(inv_test.uas, tdata);
+    	pj_assert(status == PJ_SUCCESS);
+    }
 
     flush_events(500);
 
@@ -525,13 +558,14 @@
     200/INVITE (answer)	<--
     ACK    		-->
  */
-#if 0
+#if 1
     {
 	"Standard INVITE with offer",
 	0,
 	PJ_TRUE,
 	1,
-	{ OFFERER_UAC }
+	{ OFFERER_UAC },
+	PJ_FALSE
     },
 
     {
@@ -539,7 +573,25 @@
 	PJSIP_INV_REQUIRE_100REL,
 	PJ_TRUE,
 	1,
-	{ OFFERER_UAC }
+	{ OFFERER_UAC },
+	PJ_FALSE
+    },
+    {
+	"Standard INVITE with offer, with Multipart",
+	0,
+	PJ_TRUE,
+	1,
+	{ OFFERER_UAC },
+	PJ_TRUE
+    },
+
+    {
+	"Standard INVITE with offer, with 100rel, with Multipart",
+	PJSIP_INV_REQUIRE_100REL,
+	PJ_TRUE,
+	1,
+	{ OFFERER_UAC },
+	PJ_TRUE
     },
 #endif
 
@@ -555,7 +607,8 @@
 	0,
 	PJ_TRUE,
 	1,
-	{ OFFERER_UAS }
+	{ OFFERER_UAS },
+	PJ_FALSE
     },
 
     {
@@ -563,7 +616,25 @@
 	PJSIP_INV_REQUIRE_100REL,
 	PJ_TRUE,
 	1,
-	{ OFFERER_UAS }
+	{ OFFERER_UAS },
+	PJ_FALSE
+    },
+    {
+	"INVITE with no offer, with Multipart",
+	0,
+	PJ_TRUE,
+	1,
+	{ OFFERER_UAS },
+	PJ_TRUE
+    },
+
+    {
+	"INVITE with no offer, with 100rel, with Multipart",
+	PJSIP_INV_REQUIRE_100REL,
+	PJ_TRUE,
+	1,
+	{ OFFERER_UAS },
+	PJ_TRUE
     },
 #endif
 
@@ -584,14 +655,24 @@
 	0,
 	PJ_TRUE,
 	2,
-	{ OFFERER_UAC, OFFERER_UAC }
+	{ OFFERER_UAC, OFFERER_UAC },
+	PJ_FALSE
+    },
+    {
+	"INVITE and UPDATE by UAC, with Multipart",
+	0,
+	PJ_TRUE,
+	2,
+	{ OFFERER_UAC, OFFERER_UAC },
+	PJ_TRUE
     },
     {
 	"INVITE and UPDATE by UAC, with 100rel",
 	PJSIP_INV_REQUIRE_100REL,
 	PJ_TRUE,
 	2,
-	{ OFFERER_UAC, OFFERER_UAC }
+	{ OFFERER_UAC, OFFERER_UAC },
+	PJ_FALSE
     },
 #endif
 
@@ -617,6 +698,14 @@
 	4,
 	{ OFFERER_UAC, OFFERER_UAS, OFFERER_UAC, OFFERER_UAS }
     },
+    {
+	"INVITE and many UPDATE by UAC and UAS, with Multipart",
+	0,
+	PJ_TRUE,
+	4,
+	{ OFFERER_UAC, OFFERER_UAS, OFFERER_UAC, OFFERER_UAS },
+	PJ_TRUE
+    },
 
 };
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/main.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/main.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/main.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/main.c	2022-02-24 07:54:38.000000000 +0000
@@ -24,20 +24,53 @@
 
 extern const char *system_name;
 
-static void usage()
+static void usage(void)
 {
     puts("Usage: test-pjsip");
     puts("Options:");
-    puts(" -i,--interractive   Key input at the end.");
-    puts(" -h,--help           Show this screen");
-    puts(" -l,--log-level N    Set log level (0-6)");
+    puts(" -i,--interractive        Key input at the end.");
+    puts(" -h,--help                Show this screen");
+    puts(" -l,--log-level N         Set log level (0-6)");
+    puts(" -n,--no-trap             Let signals be handled by the OS");
+    puts(" -t,--tests testname,...  Comma separated list of test to run");
+    list_tests();
 }
 
+#if PJ_LINUX || PJ_DARWINOS
+
+#include <execinfo.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+static void print_stack(int sig)
+{
+    void *array[16];
+    size_t size;
+
+    size = backtrace(array, 16);
+    fprintf(stderr, "Error: signal %d:\n", sig);
+    backtrace_symbols_fd(array, size, STDERR_FILENO);
+    exit(1);
+}
+
+static void init_signals(void)
+{
+    signal(SIGSEGV, &print_stack);
+    signal(SIGABRT, &print_stack);
+}
+
+#else
+#define init_signals()
+#endif
+
 int main(int argc, char *argv[])
 {
     int interractive = 0;
     int retval;
     char **opt_arg;
+    int no_trap = 0;
+    char *testlist = NULL;
 
     PJ_UNUSED_ARG(argc);
 
@@ -48,6 +81,10 @@
 	    strcmp(*opt_arg, "--interractive") == 0)
 	{
 	    interractive = 1;
+	} else if (strcmp(*opt_arg, "-n") == 0 ||
+		   strcmp(*opt_arg, "--no-trap") == 0)
+	{
+	    no_trap = 1;
 	} else if (strcmp(*opt_arg, "-h") == 0 ||
 		   strcmp(*opt_arg, "--help") == 0) 
 	{
@@ -71,6 +108,15 @@
 		return 1;
 	    }
 	    system_name = *opt_arg;
+	} else 	if (strcmp(*opt_arg, "-t") == 0 ||
+	    strcmp(*opt_arg, "--tests") == 0)
+	{
+	    ++opt_arg;
+	    if (!opt_arg) {
+		usage();
+		return 1;
+	    }
+	    testlist = *opt_arg;
 	} else {
 	    usage();
 	    return 1;
@@ -79,7 +125,11 @@
 	++opt_arg;
     }
 
-    retval = test_main();
+    if (!no_trap) {
+	init_signals();
+    }
+
+    retval = test_main(testlist);
 
     if (interractive) {
 	char s[10];
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/msg_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/msg_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/msg_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/msg_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -953,7 +953,7 @@
 
 
 #define GENERIC_PARAM	     "p0=a;p1=\"ab:;cd\";p2=ab%3acd;p3"
-#define GENERIC_PARAM_PARSED "p0=a;p1=\"ab:;cd\";p2=ab:cd;p3"
+#define GENERIC_PARAM_PARSED "p0=a;p1=\"ab:;cd\";p2=ab%3acd;p3"
 #define PARAM_CHAR	     "][/:&+$"
 #define SIMPLE_ADDR_SPEC     "sip:host"
 #define ADDR_SPEC	     SIMPLE_ADDR_SPEC ";"PARAM_CHAR"="PARAM_CHAR ";p1=\";\""
@@ -1401,7 +1401,7 @@
     param = param->next;
     if (pj_strcmp2(&param->name, "p2"))
 	return -956;
-    if (pj_strcmp2(&param->value, "ab:cd"))
+    if (pj_strcmp2(&param->value, "ab%3acd"))
 	return -957;
 
     param = param->next;
@@ -1621,7 +1621,7 @@
     prm = prm->next;
     if (prm == &hdr->media.param) return -1960;
     if (pj_strcmp2(&prm->name, "p2")) return -1961;
-    if (pj_strcmp2(&prm->value, "ab:cd")) return -1962;
+    if (pj_strcmp2(&prm->value, "ab%3acd")) return -1962;
 
     prm = prm->next;
     if (prm == &hdr->media.param) return -1970;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/multipart_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/multipart_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/multipart_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/multipart_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -28,6 +28,7 @@
 typedef pj_status_t (*verify_ptr)(pj_pool_t*,pjsip_msg_body*);
 
 static pj_status_t verify1(pj_pool_t *pool, pjsip_msg_body *body);
+static pj_status_t verify2(pj_pool_t *pool, pjsip_msg_body *body);
 
 static struct test_t
 {
@@ -68,7 +69,41 @@
 		"This is epilogue, which should be ignored too",
 
 		&verify1
+	},
+	{
+		/* Content-type */
+		"multipart", "mixed", "12345",
+
+		/* Body: */
+		"This is the prolog, which should be ignored.\r\n"
+		"--12345\r\n"
+		"Content-Type: text/plain\r\n"
+		"Content-ID: <header1@example.org>\r\n"
+		"Content-ID: <\"header1\"@example.org>\r\n"
+		"Content-Length: 13\r\n"
+		"\r\n"
+		"has header1\r\n"
+		"--12345 \t\r\n"
+		"Content-Type: application/pidf+xml\r\n"
+		"Content-ID: <my header2@example.org>\r\n"
+		"Content-ID: <my\xffheader2@example.org>\r\n"
+		"Content-Length: 13\r\n"
+		"\r\n"
+		"has header2\r\n"
+		"--12345\r\n"
+		"Content-Type: text/plain\r\n"
+		"Content-ID: <my header3@example.org>\r\n"
+		"Content-ID: <header1@example.org>\r\n"
+		"Content-ID: <my header4@example.org>\r\n"
+		"Content-Length: 13\r\n"
+		"\r\n"
+		"has header4\r\n"
+		"--12345--\r\n"
+		"This is epilogue, which should be ignored too",
+
+		&verify2
 	}
+
 };
 
 static void init_media_type(pjsip_media_type *mt,
@@ -87,6 +122,192 @@
     }
 }
 
+static int verify_hdr(pj_pool_t *pool, pjsip_msg_body *multipart_body,
+    void *hdr, char *part_body)
+{
+    pjsip_multipart_part *part;
+    pj_str_t the_body;
+
+
+    part = pjsip_multipart_find_part_by_header(pool, multipart_body, hdr, NULL);
+    if (!part) {
+	return -1;
+    }
+
+    the_body.ptr = (char*)part->body->data;
+    the_body.slen = part->body->len;
+
+    if (pj_strcmp2(&the_body, part_body) != 0) {
+	return -2;
+    }
+
+    return 0;
+}
+
+static int verify_cid_str(pj_pool_t *pool, pjsip_msg_body *multipart_body,
+    pj_str_t cid_url, char *part_body)
+{
+    pjsip_multipart_part *part;
+    pj_str_t the_body;
+
+    part = pjsip_multipart_find_part_by_cid_str(pool, multipart_body, &cid_url);
+    if (!part) {
+	return -3;
+    }
+
+    the_body.ptr = (char*)part->body->data;
+    the_body.slen = part->body->len;
+
+    if (pj_strcmp2(&the_body, part_body) != 0) {
+	return -4;
+    }
+
+    return 0;
+}
+
+static int verify_cid_uri(pj_pool_t *pool, pjsip_msg_body *multipart_body,
+    pjsip_other_uri *cid_uri, char *part_body)
+{
+    pjsip_multipart_part *part;
+    pj_str_t the_body;
+
+    part = pjsip_multipart_find_part_by_cid_uri(pool, multipart_body, cid_uri);
+    if (!part) {
+	return -5;
+    }
+
+    the_body.ptr = (char*)part->body->data;
+    the_body.slen = part->body->len;
+
+    if (pj_strcmp2(&the_body, part_body) != 0) {
+	return -6;
+    }
+
+    return 0;
+}
+
+static pj_status_t verify2(pj_pool_t *pool, pjsip_msg_body *body)
+{
+    int rc = 0;
+    int rcbase = 300;
+    pjsip_other_uri *cid_uri;
+    pjsip_ctype_hdr *ctype_hdr = pjsip_ctype_hdr_create(pool);
+
+    ctype_hdr->media.type = pj_str("application");
+    ctype_hdr->media.subtype = pj_str("pidf+xml");
+
+    rc = verify_hdr(pool, body, ctype_hdr, "has header2");
+    if (rc) {
+	return (rc - rcbase);
+    }
+
+    rcbase += 10;
+    rc = verify_cid_str(pool, body, pj_str("cid:header1@example.org"), "has header1");
+    if (rc) {
+	return (rc - rcbase);
+    }
+
+    rcbase += 10;
+    rc = verify_cid_str(pool, body, pj_str("%22header1%22@example.org"), "has header1");
+    if (rc) {
+	return (rc - rcbase);
+    }
+
+    cid_uri = pjsip_uri_get_uri(pjsip_parse_uri(pool, "<cid:%22header1%22@example.org>",
+	strlen("<cid:%22header1%22@example.org>"), 0));
+    rcbase += 10;
+    rc = verify_cid_uri(pool, body, cid_uri, "has header1");
+    if (rc) {
+	return (rc - rcbase);
+    }
+
+    rcbase += 10;
+    rc = verify_cid_str(pool, body, pj_str("<cid:my%20header2@example.org>"), "has header2");
+    if (rc) {
+	return (rc - rcbase);
+    }
+
+    rcbase += 10;
+    rc = verify_cid_str(pool, body, pj_str("cid:my%ffheader2@example.org"), "has header2");
+    if (rc) {
+	return (rc - rcbase);
+    }
+
+    cid_uri = pjsip_uri_get_uri(pjsip_parse_uri(pool, "<cid:my%ffheader2@example.org>",
+	strlen("<cid:my%ffheader2@example.org>"), 0));
+    rcbase += 10;
+    rc = verify_cid_uri(pool, body, cid_uri, "has header2");
+    if (rc) {
+	return (rc - rcbase);
+    }
+
+    rcbase += 10;
+    rc = verify_cid_str(pool, body, pj_str("cid:my%20header3@example.org"), "has header4");
+    if (rc) {
+	return (rc - rcbase);
+    }
+
+    rcbase += 10;
+    rc = verify_cid_str(pool, body, pj_str("<cid:my%20header4@example.org>"), "has header4");
+    if (rc) {
+	return (rc - rcbase);
+    }
+
+    cid_uri = pjsip_uri_get_uri(pjsip_parse_uri(pool, "<cid:my%20header4@example.org>",
+	strlen("<cid:my%20header4@example.org>"), 0));
+    rcbase += 10;
+    rc = verify_cid_uri(pool, body, cid_uri, "has header4");
+    if (rc) {
+	return (rc - rcbase);
+    }
+
+    rcbase += 10;
+    rc = verify_cid_str(pool, body, pj_str("<my%20header3@example.org>"), "has header4");
+    if (rc) {
+	return (rc - rcbase);
+    }
+
+    /* These should all fail for malformed or missing URI */
+    rcbase += 10;
+    rc = verify_cid_str(pool, body, pj_str("cid:"), "has header4");
+    if (!rc) {
+	return (rc - rcbase);
+    }
+
+    /* This will trigger assertion. */
+    /*
+    rcbase += 10;
+    rc = verify_cid_str(pool, body, pj_str(""), "has header4");
+    if (!rc) {
+	return (rc - rcbase);
+    }
+    */
+
+    rcbase += 10;
+    rc = verify_cid_str(pool, body, pj_str("<>"), "has header4");
+    if (!rc) {
+	return (rc - rcbase);
+    }
+
+    rcbase += 10;
+    rc = verify_cid_str(pool, body, pj_str("<cid>"), "has header4");
+    if (!rc) {
+	return (rc - rcbase);
+    }
+
+    /*
+     * This is going to pass but the ' ' in the uri is un-encoded which is invalid
+     * so we should never see it.
+     */
+    rcbase += 10;
+    rc = verify_cid_str(pool, body, pj_str("cid:my header3@example.org"), "has header4");
+    if (rc) {
+	return (rc - rcbase);
+    }
+
+    return 0;
+}
+
 static int verify_part(pjsip_multipart_part *part,
 		       char *h_content_type,
 		       char *h_content_subtype,
@@ -236,8 +457,10 @@
 
 	pj_strdup2_with_null(pool, &str, p_tests[i].msg);
 	body = pjsip_multipart_parse(pool, str.ptr, str.slen, &ctype, 0);
-	if (!body)
+	if (!body) {
+	    pj_pool_release(pool);
 	    return -100;
+	}
 
 	if (p_tests[i].verify) {
 	    rc = p_tests[i].verify(pool, body);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/test.c	2022-02-24 07:54:38.000000000 +0000
@@ -45,17 +45,99 @@
 			    if (rc!=0) goto on_return; \
 			} while (0)
 
+#ifdef _MSC_VER
+# define strtok_r strtok_s
+#endif
 
 pjsip_endpoint *endpt;
 pj_caching_pool caching_pool;
 int log_level = 3;
-int param_log_decor = PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME | 
+int param_log_decor = PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME | PJ_LOG_HAS_SENDER |
 		      PJ_LOG_HAS_MICRO_SEC | PJ_LOG_HAS_INDENT;
 
 static pj_oshandle_t fd_report;
 const char *system_name = "Unknown";
 static char buf[1024];
 
+static struct {
+    const char *name;
+    int run_test;
+} test_list[] = {
+    { "uri", 0},
+    { "msg", 0},
+    { "multipart", 0},
+    { "txdata", 0},
+    { "tsx_bench", 0},
+    { "udp", 0},
+    { "loop", 0},
+    { "tcp", 0},
+    { "resolve", 0},
+    { "tsx", 0},
+    { "tsx_destroy", 0},
+    { "inv_oa", 0},
+    { "regc", 0},
+};
+enum tests_to_run {
+    include_uri_test = 0,
+    include_msg_test,
+    include_multipart_test,
+    include_txdata_test,
+    include_tsx_bench,
+    include_udp_test,
+    include_loop_test,
+    include_tcp_test,
+    include_resolve_test,
+    include_tsx_test,
+    include_tsx_destroy_test,
+    include_inv_oa_test,
+    include_regc_test,
+};
+static int run_all_tests = 1;
+
+static pj_status_t select_tests(char *testlist)
+{
+    char *token;
+    char *saveptr;
+    int maxtok = PJ_ARRAY_SIZE(test_list);
+    int j;
+
+    if (!testlist) {
+	return PJ_SUCCESS;
+    }
+    run_all_tests = 0;
+
+    for (token = strtok_r(testlist, ",", &saveptr); token != NULL;
+	token = strtok_r(NULL, ",", &saveptr)) {
+
+	int found = 0;
+	for (j = 0; j < maxtok; j++) {
+	    if (strcmp(token, test_list[j].name) == 0) {
+		test_list[j].run_test = 1;
+		found = 1;
+	    }
+	}
+	if (!found) {
+	    fprintf(stderr, "Test '%s' is not valid\n", token);
+	    return PJ_ENOTFOUND;
+	}
+    }
+
+    return PJ_SUCCESS;
+}
+
+void list_tests(void) {
+    int maxtok = PJ_ARRAY_SIZE(test_list);
+    int j;
+
+    fprintf(stderr, "Valid tests:\n");
+
+    for (j = 0; j < maxtok; j++) {
+	fprintf(stderr, "   %s\n", test_list[j].name);
+    }
+}
+
+#define SHOULD_RUN_TEST(ix) (run_all_tests || test_list[ix].run_test)
+
 void app_perror(const char *msg, pj_status_t rc)
 {
     char errbuf[256];
@@ -221,7 +303,7 @@
 }
 
 
-int test_main(void)
+int test_main(char *testlist)
 {
     pj_status_t rc;
     const char *filename;
@@ -237,6 +319,12 @@
 #endif	/* INCLUDE_TSX_TEST */
     int line;
 
+    rc = select_tests(testlist);
+    if (rc != PJ_SUCCESS) {
+	list_tests();
+	return rc;
+    }
+
     pj_log_set_level(log_level);
     pj_log_set_decor(param_log_decor);
 
@@ -293,87 +381,112 @@
 
 
 #if INCLUDE_URI_TEST
-    DO_TEST(uri_test());
+    if (SHOULD_RUN_TEST(include_uri_test)) {
+	DO_TEST(uri_test());
+    }
 #endif
 
 #if INCLUDE_MSG_TEST
-    DO_TEST(msg_test());
-    DO_TEST(msg_err_test());
+    if (SHOULD_RUN_TEST(include_msg_test)) {
+	DO_TEST(msg_test());
+	DO_TEST(msg_err_test());
+    }
 #endif
 
 #if INCLUDE_MULTIPART_TEST
-    DO_TEST(multipart_test());
+    if (SHOULD_RUN_TEST(include_multipart_test)) {
+	DO_TEST(multipart_test());
+    }
 #endif
 
 #if INCLUDE_TXDATA_TEST
-    DO_TEST(txdata_test());
+    if (SHOULD_RUN_TEST(include_txdata_test)) {
+	DO_TEST(txdata_test());
+    }
 #endif
 
 #if INCLUDE_TSX_BENCH
-    DO_TEST(tsx_bench());
+    if (SHOULD_RUN_TEST(include_tsx_bench)) {
+	DO_TEST(tsx_bench());
+    }
 #endif
 
 #if INCLUDE_UDP_TEST
-    DO_TEST(transport_udp_test());
+    if (SHOULD_RUN_TEST(include_udp_test)) {
+	DO_TEST(transport_udp_test());
+    }
 #endif
 
 #if INCLUDE_LOOP_TEST
-    DO_TEST(transport_loop_test());
+    if (SHOULD_RUN_TEST(include_loop_test)) {
+	DO_TEST(transport_loop_test());
+    }
 #endif
 
 #if INCLUDE_TCP_TEST
-    DO_TEST(transport_tcp_test());
+    if (SHOULD_RUN_TEST(include_tcp_test)) {
+	DO_TEST(transport_tcp_test());
+    }
 #endif
 
 #if INCLUDE_RESOLVE_TEST
-    DO_TEST(resolve_test());
+    if (SHOULD_RUN_TEST(include_resolve_test)) {
+	DO_TEST(resolve_test());
+    }
 #endif
 
 
 #if INCLUDE_TSX_TEST
-    status = pjsip_udp_transport_start(endpt, NULL, NULL, 1,  &tp);
-    if (status == PJ_SUCCESS) {
-	tsx_test[tsx_test_cnt].port = tp->local_name.port;
-	tsx_test[tsx_test_cnt].tp_type = "udp";
-	tsx_test[tsx_test_cnt].type = PJSIP_TRANSPORT_UDP;
-	++tsx_test_cnt;
-    }
+    if (SHOULD_RUN_TEST(include_tsx_test)) {
+	status = pjsip_udp_transport_start(endpt, NULL, NULL, 1, &tp);
+	if (status == PJ_SUCCESS) {
+	    tsx_test[tsx_test_cnt].port = tp->local_name.port;
+	    tsx_test[tsx_test_cnt].tp_type = "udp";
+	    tsx_test[tsx_test_cnt].type = PJSIP_TRANSPORT_UDP;
+	    ++tsx_test_cnt;
+	}
 
 #if PJ_HAS_TCP
-    status = pjsip_tcp_transport_start(endpt, NULL, 1, &tpfactory);
-    if (status == PJ_SUCCESS) {
-	tsx_test[tsx_test_cnt].port = tpfactory->addr_name.port;
-	tsx_test[tsx_test_cnt].tp_type = "tcp";
-	tsx_test[tsx_test_cnt].type = PJSIP_TRANSPORT_TCP;
-	++tsx_test_cnt;
-    } else {
-	app_perror("Unable to create TCP", status);
-	rc = -4;
-	goto on_return;
-    }
-#endif
-
-
-    for (i=0; i<tsx_test_cnt; ++i) {
-	DO_TSX_TEST(tsx_basic_test, &tsx_test[i]);
-	DO_TSX_TEST(tsx_uac_test, &tsx_test[i]);
-	DO_TSX_TEST(tsx_uas_test, &tsx_test[i]);
+	status = pjsip_tcp_transport_start(endpt, NULL, 1, &tpfactory);
+	if (status == PJ_SUCCESS) {
+	    tsx_test[tsx_test_cnt].port = tpfactory->addr_name.port;
+	    tsx_test[tsx_test_cnt].tp_type = "tcp";
+	    tsx_test[tsx_test_cnt].type = PJSIP_TRANSPORT_TCP;
+	    ++tsx_test_cnt;
+	} else {
+	    app_perror("Unable to create TCP", status);
+	    rc = -4;
+	    goto on_return;
+	}
+#endif
+
+	for (i = 0; i < tsx_test_cnt; ++i) {
+	    DO_TSX_TEST(tsx_basic_test, &tsx_test[i]);
+	    DO_TSX_TEST(tsx_uac_test, &tsx_test[i]);
+	    DO_TSX_TEST(tsx_uas_test, &tsx_test[i]);
+	}
     }
 #endif
 
 #if INCLUDE_INV_OA_TEST
-    DO_TEST(inv_offer_answer_test());
+    if (SHOULD_RUN_TEST(include_inv_oa_test)) {
+	DO_TEST(inv_offer_answer_test());
+    }
 #endif
 
 #if INCLUDE_REGC_TEST
-    DO_TEST(regc_test());
+    if (SHOULD_RUN_TEST(include_regc_test)) {
+	DO_TEST(regc_test());
+    }
 #endif
 
     /*
      * Better be last because it recreates the endpt
      */
 #if INCLUDE_TSX_DESTROY_TEST
-    DO_TEST(tsx_destroy_test());
+    if (SHOULD_RUN_TEST(include_tsx_destroy_test)) {
+	DO_TEST(tsx_destroy_test());
+    }
 #endif
 
 on_return:
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/test.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/test.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/test.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/test.h	2022-02-24 07:54:38.000000000 +0000
@@ -36,8 +36,6 @@
 #  define PJSIP_TEST_MEM_SIZE	    (2*1024*1024)
 #endif
 
-
-
 #define INCLUDE_MESSAGING_GROUP	    1
 #define INCLUDE_TRANSPORT_GROUP	    1
 #define INCLUDE_TSX_GROUP	    1
@@ -55,11 +53,17 @@
 #endif
 
 
+#if defined(PJ_EXCLUDE_BENCHMARK_TESTS) && (PJ_EXCLUDE_BENCHMARK_TESTS==1)
+#   define WITH_BENCHMARK	    0
+#else
+#   define WITH_BENCHMARK	    1
+#endif
+
 #define INCLUDE_URI_TEST	INCLUDE_MESSAGING_GROUP
 #define INCLUDE_MSG_TEST	INCLUDE_MESSAGING_GROUP
 #define INCLUDE_MULTIPART_TEST	INCLUDE_MESSAGING_GROUP
 #define INCLUDE_TXDATA_TEST	INCLUDE_MESSAGING_GROUP
-#define INCLUDE_TSX_BENCH	INCLUDE_MESSAGING_GROUP
+#define INCLUDE_TSX_BENCH	(INCLUDE_MESSAGING_GROUP && WITH_BENCHMARK)
 #define INCLUDE_UDP_TEST	INCLUDE_TRANSPORT_GROUP
 #define INCLUDE_LOOP_TEST	INCLUDE_TRANSPORT_GROUP
 #define INCLUDE_TCP_TEST	INCLUDE_TRANSPORT_GROUP
@@ -111,9 +115,10 @@
 int inv_offer_answer_test(void);
 
 /* Test main entry */
-int  test_main(void);
+int  test_main(char *testlist);
 
 /* Test utilities. */
+void list_tests(void);
 void app_perror(const char *msg, pj_status_t status);
 int  init_msg_logger(void);
 int  msg_logger_set_enabled(pj_bool_t enabled);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/transport_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/transport_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/transport_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/transport_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -35,7 +35,7 @@
 
     /* Check that local address name is valid. */
     {
-	struct pj_in_addr addr;
+	pj_in_addr addr;
 
 	if (pj_inet_pton(pj_AF_INET(), &tp->local_name.host,
 			 &addr) == PJ_SUCCESS)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/transport_udp_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/transport_udp_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/transport_udp_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/transport_udp_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -27,7 +27,7 @@
 static pj_status_t multi_transport_test(pjsip_transport *tp[], unsigned num_tp)
 {
     pj_status_t status;
-    pj_uint16_t i = 0;
+    unsigned i = 0;
     pj_str_t s;
     pjsip_transport *udp_tp;
     pj_sockaddr_in rem_addr;    
@@ -37,7 +37,7 @@
     {
 	pj_sockaddr_in addr;
 
-	pj_sockaddr_in_init(&addr, NULL, TEST_UDP_PORT+i);
+	pj_sockaddr_in_init(&addr, NULL, (pj_uint16_t)(TEST_UDP_PORT+i));
 
 	/* Start UDP transport. */
 	status = pjsip_udp_transport_start( endpt, &addr, NULL, 1, &udp_tp);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/tsx_basic_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/tsx_basic_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/tsx_basic_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/tsx_basic_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -267,20 +267,16 @@
 	    "normal unable to resolve",
 	    &tsx_create_and_send_req,
 	    "sip:user@somehost",
-	    15000,
+	    20000,
 	    1
 	},
 	{
 	    "resolve and destroy, wait",
 	    &tsx_create_and_send_req,
 	    "sip:user@somehost",
-	    3000, /* Wait for DNS timeout, dec ref to the group lock is done in DNS+send callback */
-	    15000
+	    1,
+	    20000
 	},
-#if 0
-	/* These tests rely on TCP connect timeout (so group lock reference count becomes 0 and group lock objects destroys are initiated).
-	 * Unfortunately TCP connect timeout may take longer in some OS, e.g: Linux, MacOS, so let's disable this test for now.
-	 */
 	{
 	    "tcp connect and destroy",
 	    &tsx_create_and_send_req,
@@ -289,13 +285,12 @@
 	    1000
 	},
 	{
-	    "tcp connect and destroy",
+	    "tcp connect and destroy 2",
 	    &tsx_create_and_send_req,
 	    "sip:user@10.125.36.63:58517;transport=tcp",
-	    22000, /* Wait for TCP connect timeout, dec ref to the group lock is done in send callback */
+	    1,
 	    60000
 	},
-#endif
     };
     int rc;
     unsigned i;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/tsx_uac_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/tsx_uac_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/tsx_uac_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/tsx_uac_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -88,7 +88,8 @@
 static char *TEST8_BRANCH_ID = PJSIP_RFC3261_BRANCH_ID "-UAC-Test8";
 static char *TEST9_BRANCH_ID = PJSIP_RFC3261_BRANCH_ID "-UAC-Test9";
 
-#define      TEST1_ALLOWED_DIFF	    (150)
+// An effort to accommodate CPU load spike on some test machines.
+#define      TEST1_ALLOWED_DIFF	    500 //(150)
 #define      TEST4_RETRANSMIT_CNT   3
 #define	     TEST5_RETRANSMIT_CNT   3
 
@@ -189,16 +190,22 @@
 		    test_complete = -715;
 		}
 	    } else {
-		/* Check the number of transmissions, which must be
-		 * 6 for INVITE and 10 for non-INVITE 
+		/* Check the number of (re)transmissions, which must be
+		 * 6 or 7 for INVITE and 10 or 11 for non-INVITE.
+		 * Theoretically the total (re)transmission time is 31,500ms
+		 * (plus 300ms for delayed transport), and tsx timeout is 32s.
+		 * In some test machines (e.g: MacOS), sometime the tsx timeout
+		 * fires first which causes recv_count fall short (by one).
 		 */
-		if (tsx->method.id==PJSIP_INVITE_METHOD && recv_count != 7) {
+		//if (tsx->method.id==PJSIP_INVITE_METHOD && recv_count != 7) {
+		if (tsx->method.id==PJSIP_INVITE_METHOD && recv_count < 6) {
 		    PJ_LOG(3,(THIS_FILE, 
 			   "    error: there were %d (re)transmissions",
 			   recv_count));
 		    test_complete = -716;
 		} else
-		if (tsx->method.id==PJSIP_OPTIONS_METHOD && recv_count != 11) {
+		//if (tsx->method.id==PJSIP_OPTIONS_METHOD && recv_count != 11) {
+		if (tsx->method.id==PJSIP_OPTIONS_METHOD && recv_count < 10) {
 		    PJ_LOG(3,(THIS_FILE, 
 			   "    error: there were %d (re)transmissions",
 			   recv_count));
@@ -556,7 +563,8 @@
 
     PJ_UNUSED_ARG(timer_heap);
 
-    pjsip_endpt_send_response(endpt, &r->res_addr, r->tdata, NULL, NULL);
+    pj_status_t status = pjsip_endpt_send_response(endpt, &r->res_addr, r->tdata, NULL, NULL);
+    if (status != PJ_SUCCESS) pjsip_tx_data_dec_ref(r->tdata);
     if (tp)
 	pjsip_transport_dec_ref(tp);
 }
@@ -1093,9 +1101,12 @@
     } sub_test[] = 
     {
 	{ &pjsip_invite_method, 0},
-	{ &pjsip_invite_method, TEST1_ALLOWED_DIFF*2},
+	//{ &pjsip_invite_method, TEST1_ALLOWED_DIFF*2},
+	{ &pjsip_invite_method, 300},
+
 	{ &pjsip_options_method, 0},
-	{ &pjsip_options_method, TEST1_ALLOWED_DIFF*2}
+	//{ &pjsip_options_method, TEST1_ALLOWED_DIFF*2}
+	{ &pjsip_options_method, 300}
     };
 
     PJ_LOG(3,(THIS_FILE, "  test1: basic uac retransmit and timeout test"));
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/tsx_uas_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/tsx_uas_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip/src/test/tsx_uas_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip/src/test/tsx_uas_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -140,7 +140,9 @@
 
 
 #define TEST_TIMEOUT_ERROR	-30
-#define MAX_ALLOWED_DIFF	150
+
+// An effort to accommodate CPU load spike on some test machines.
+#define MAX_ALLOWED_DIFF	500 //150
 
 static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e);
 static pj_bool_t on_rx_message(pjsip_rx_data *rdata);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/libpjproject.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/libpjproject.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/libpjproject.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/libpjproject.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -161,36 +185,72 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
@@ -265,31 +325,61 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -344,6 +434,21 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -385,6 +490,20 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -427,6 +546,21 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -468,6 +602,20 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -510,6 +658,21 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -546,6 +709,20 @@
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
     </ProjectReference>
     <Lib>
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/Makefile asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/Makefile
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/Makefile	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/Makefile	2022-02-24 07:54:38.000000000 +0000
@@ -70,10 +70,14 @@
 $(PJSUA_EXE):
 	$(MAKE) -f $(RULES_MAK) APP=PJSUA app=pjsua $(subst /,$(HOST_PSEP),$(BINDIR)/$@)
 	@if echo "$(TARGET_NAME)" | grep -q "apple-darwin_ios$$"; then \
+	  mkdir ../src/pjsua/ios-swift/Libraries ; \
+	  mkdir ../src/pjsua2/ios-swift-pjsua2/Libraries ; \
 	  for F in $(filter %$(TARGET_NAME).a,$(PJ_LIBXX_FILES)); do \
 	    if test -f $$F; then \
 	      tmp=`echo $${F##*/} | sed -e "s/\-$(TARGET_NAME)\.a/.a/"`; \
 	      ln -sf $$F ../src/pjsua/ios/$$tmp; \
+	      ln -sf $$F ../src/pjsua/ios-swift/Libraries/$$tmp; \
+	      ln -sf $$F ../src/pjsua2/ios-swift-pjsua2/Libraries/$$tmp; \
 	    fi; \
 	  done; \
 	fi;
@@ -101,5 +105,6 @@
 	  for F in $(filter %$(TARGET_NAME).a,$(PJ_LIBXX_FILES)); do \
 	    tmp=`echo $${F##*/} | sed -e "s/\-$(TARGET_NAME)\.a/.a/"`; \
 	    rm -f ../src/pjsua/ios/$$tmp; \
+	    rm -f ../src/pjsua/ios-swift/Libraries/$$tmp; \
 	  done; \
 	fi;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/pjsua.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/pjsua.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/pjsua.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/pjsua.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -161,36 +185,72 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
@@ -267,31 +327,61 @@
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -334,6 +424,18 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies Condition="'$(API_Family)'=='WinDesktop'">Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -369,6 +471,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies Condition="'$(API_Family)'=='WinDesktop'">Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -402,6 +518,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies Condition="'$(API_Family)'=='WinDesktop'">Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -434,6 +563,18 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies Condition="'$(API_Family)'=='WinDesktop'">Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -467,6 +608,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies Condition="'$(API_Family)'=='WinDesktop'">Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -499,6 +653,18 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies Condition="'$(API_Family)'=='WinDesktop'">Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\pjsua\main.c">
       <ExcludedFromBuild Condition="'$(API_Family)'!='WinDesktop'">true</ExcludedFromBuild>
@@ -542,21 +708,27 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/pjsystest.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/pjsystest.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/pjsystest.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/pjsystest.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -19,11 +27,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <!-- Import common config -->
-  <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />  
+  <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{5E507EA2-CB39-47CA-BD39-49EB58D7A0BB}</ProjectGuid>
     <RootNamespace>pjsystest</RootNamespace>
-    <Keyword>Win32Proj</Keyword>    
+    <Keyword>Win32Proj</Keyword>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -40,39 +48,58 @@
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
     <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType>
     <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType>
-  </PropertyGroup>  
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -107,6 +134,17 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -129,13 +167,25 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\pjsystest\main_console.c" />
     <ClCompile Include="..\src\pjsystest\main_wm.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\pjsystest\systest.c" />
   </ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/pjsystest.vcxproj.filters asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/pjsystest.vcxproj.filters
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/pjsystest.vcxproj.filters	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/pjsystest.vcxproj.filters	2022-02-24 07:54:38.000000000 +0000
@@ -33,9 +33,4 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\src\pjsystest\pjsystest_wince.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/python_pjsua.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/python_pjsua.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/python_pjsua.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/python_pjsua.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -20,12 +28,24 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -33,10 +53,18 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -46,11 +74,17 @@
     <IntDir>$(OutDir)</IntDir>
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>.\output\python_pjsua-i386-win32-vc8-release\</OutDir>
     <IntDir>$(OutDir)</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -96,6 +130,50 @@
       <OutputFile>.\output\python_pjsua-i386-win32-vc6-debug/python_pjsua.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\output\python_pjsua-i386-win32-vc6-debug/python_pjsua.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\pjlib\include;..\..\pjlib-util\include;..\..\pjmedia\include;..\..\pjsip\include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_PJSUA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(OutDir)python_pjsua.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0421</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>python24_d.lib;odbc32.lib;odbccp32.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib\_pjsua_d.pyd</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../pjlib/lib;../../pjlib-util/lib;../../pjmedia/lib;../../pjsip/lib;F:\incoming\projects\divusi\Python-2.4\Python-2.4\PCbuild;F:\incoming\projects\divusi\Python-2.4\Python-2.4\PC\VC6;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\src\python\_pjsua.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)_pjsua_d.pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(OutDir)_pjsua_d.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\output\python_pjsua-i386-win32-vc6-debug/python_pjsua.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -140,6 +218,52 @@
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\output\python_pjsua-i386-win32-vc6-release/python_pjsua.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\output\python_pjsua-i386-win32-vc6-release/python_pjsua.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\pjlib\include;..\..\pjlib-util\include;..\..\pjmedia\include;..\..\pjsip\include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PY_PJSUA_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(OutDir)python_pjsua.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0421</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>python24.lib;odbc32.lib;odbccp32.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib\_pjsua.pyd</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../pjlib/lib;../../pjlib-util/lib;../../pjmedia/lib;../../pjsip/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ModuleDefinitionFile>..\src\python\_pjsua.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(OutDir)_pjsua.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(OutDir)_pjsua.map</MapFileName>
+      <ImportLibrary>$(OutDir)_pjsua.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>.\output\python_pjsua-i386-win32-vc6-release/python_pjsua.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/sample_debug.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/sample_debug.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/sample_debug.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/sample_debug.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -51,10 +75,10 @@
     </ProjectConfiguration>
   </ItemGroup>
   <!-- Import common config -->
-  <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />  
+  <Import Project="..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A0F1AA62-0F6F-420D-B09A-AC04B6862821}</ProjectGuid>
-    <RootNamespace>sample_debug</RootNamespace>    
+    <RootNamespace>sample_debug</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -101,110 +125,177 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <!-- Override the PlatformToolset -->  
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
     <ConfigurationType Condition="'$(API_Family)'=='WinDesktop'">Application</ConfigurationType>
     <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-	<Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
-    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />    
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
-	  <TargetName>sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
+    <TargetName>sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
   </PropertyGroup>
   <!-- Compile and link option definition -->
   <ItemDefinitionGroup>
@@ -244,6 +335,21 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -270,6 +376,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -299,6 +418,21 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -325,6 +459,19 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -354,6 +501,21 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -382,6 +544,20 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;oleaut32.lib;uuid.lib;ole32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\bin\sample-debug-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).exe</OutputFile>
+      <IgnoreSpecificDefaultLibraries>MSVCRT.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\samples\debug.cpp" />
   </ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/Samples.mak asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/Samples.mak
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/Samples.mak	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/Samples.mak	2022-02-24 07:54:38.000000000 +0000
@@ -7,8 +7,8 @@
 ###############################################################################
 # Gather all flags.
 #
-export _CFLAGS 	:= $(PJ_CFLAGS) $(CFLAGS)
-export _CXXFLAGS:= $(PJ_CXXFLAGS) $(CFLAGS)
+export _CFLAGS 	:= $(PJ_CFLAGS) $(CFLAGS) $(PJ_VIDEO_CFLAGS)
+export _CXXFLAGS:= $(PJ_CXXFLAGS) $(CFLAGS) $(PJ_VIDEO_CFLAGS)
 export _LDFLAGS := $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS)
 export _LDXXFLAGS := $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(LDFLAGS)
 
@@ -55,6 +55,10 @@
 PJSUA2_EXES := $(foreach file, $(PJSUA2_SAMPLES), $(file)$(HOST_EXE))
 endif
 
+ifeq ($(PJ_EXCLUDE_PJSUA2),1)
+PJSUA2_EXES :=
+endif
+
 .PHONY: $(EXES)
 .PHONY: $(PJSUA2_EXES)
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/Samples-vc.mak asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/Samples-vc.mak
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/Samples-vc.mak	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/Samples-vc.mak	2022-02-24 07:54:38.000000000 +0000
@@ -4,10 +4,13 @@
 !if "$(ARCH)" == "win64"
 TARGET = x86_64-x64-vc$(VC_VER)-$(BUILD_MODE)
 TARGET_FLAGS = /DPJ_WIN64=1 /DPJ_M_X86_64=1 
-!else
+!elseif "$(ARCH)" == "win32"
 
 TARGET = i386-win32-vc$(VC_VER)-$(BUILD_MODE)
-TARGET_FLAGS = /DPJ_WIN32=1 /DPJ_M_I386=1 
+TARGET_FLAGS = /DPJ_WIN32=1 /DPJ_M_I386=1
+!elseif "$(ARCH)" == "ARM64"
+
+TARGET = ARM64-ARM64-vc$(VC_VER)-$(BUILD_MODE)
 !endif
 
 !if "$(BUILD_MODE)" == "debug"
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/samples.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/samples.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/samples.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/samples.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +25,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -25,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -33,6 +49,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +61,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -55,7 +79,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}</ProjectGuid>
     <RootNamespace>samples</RootNamespace>
-    <Keyword>MakeFileProj</Keyword>    
+    <Keyword>MakeFileProj</Keyword>
     <!-- Specific windows store/UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -95,91 +119,164 @@
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
     <ConfigurationType Condition="'$(API_Family)'=='UWP' Or '$(API_Family)'=='WinPhone8'">StaticLibrary</ConfigurationType>
-  </PropertyGroup>  
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />  
+  <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>        
+    <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
   </PropertyGroup>
   <!-- Compile and link option definition -->
   <ItemDefinitionGroup>
@@ -187,108 +284,120 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary>      
+      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <Lib>
       <AdditionalOptions>/Ignore:4006 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
-  </ItemDefinitionGroup>    
+  </ItemDefinitionGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\output\$(ProjectName)-i386-$(Platform)-vs8-$(Configuration)\</OutDir>
-    <IntDir>$(OutDir)</IntDir>
-    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 /a</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 clean</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win32</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win32 /a</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win32 clean</NMakeCleanCommandLine>
     <NMakeOutput>All samples</NMakeOutput>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>.\output\$(ProjectName)-x86_64-$(Platform)-vs8-$(Configuration)\</OutDir>
-    <IntDir>$(OutDir)</IntDir>
     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win64</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win64 /a</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=win64 clean</NMakeCleanCommandLine>
     <NMakeOutput>All samples</NMakeOutput>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=ARM64</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=ARM64 /a</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release VC_VER=14 ARCH=ARM64 clean</NMakeCleanCommandLine>
+    <NMakeOutput>All samples</NMakeOutput>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\output\$(ProjectName)-i386-$(Platform)-vs8-$(Configuration)\</OutDir>
-    <IntDir>$(OutDir)</IntDir>
     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win32</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win32 /a</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win32 clean</NMakeCleanCommandLine>
     <NMakeOutput>All samples</NMakeOutput>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>.\output\$(ProjectName)-x86_64-$(Platform)-vs8-$(Configuration)\</OutDir>
-    <IntDir>$(OutDir)</IntDir>
     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win64</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win64 /a </NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=win64 clean</NMakeCleanCommandLine>
     <NMakeOutput>All samples</NMakeOutput>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=ARM64</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=ARM64 /a </NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug VC_VER=14 ARCH=ARM64 clean</NMakeCleanCommandLine>
+    <NMakeOutput>All samples</NMakeOutput>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
-    <OutDir>.\output\$(ProjectName)-i386-$(Platform)-vs8-$(Configuration)\</OutDir>
-    <IntDir>$(OutDir)</IntDir>
     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win32s</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win32 /a</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win32 clean</NMakeCleanCommandLine>
     <NMakeOutput>All samples</NMakeOutput>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">
-    <OutDir>.\output\$(ProjectName)-x86_64-$(Platform)-vs8-$(Configuration)\</OutDir>
-    <IntDir>$(OutDir)</IntDir>
     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win64</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win64 /a</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=win64 clean</NMakeCleanCommandLine>
     <NMakeOutput>All samples</NMakeOutput>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=ARM64</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=ARM64 /a</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-static VC_VER=14 ARCH=ARM64 clean</NMakeCleanCommandLine>
+    <NMakeOutput>All samples</NMakeOutput>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
-    <OutDir>.\output\$(ProjectName)-i386-$(Platform)-vs8-$(Configuration)\</OutDir>
-    <IntDir>$(OutDir)</IntDir>
     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win32</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win32 /a</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win32 clean</NMakeCleanCommandLine>
     <NMakeOutput>All samples</NMakeOutput>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">
-    <OutDir>.\output\$(ProjectName)-x86_64-$(Platform)-vs8-$(Configuration)\</OutDir>
-    <IntDir>$(OutDir)</IntDir>
     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win64</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win64 /a</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=win64 clean</NMakeCleanCommandLine>
     <NMakeOutput>All samples</NMakeOutput>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=ARM64</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=ARM64 /a</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-dynamic VC_VER=14 ARCH=ARM64 clean</NMakeCleanCommandLine>
+    <NMakeOutput>All samples</NMakeOutput>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
-    <OutDir>.\output\$(ProjectName)-i386-$(Platform)-vs8-$(Configuration)\</OutDir>
-    <IntDir>$(OutDir)</IntDir>
     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win32</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win32 /a</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win32 clean</NMakeCleanCommandLine>
     <NMakeOutput>All samples</NMakeOutput>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">
-    <OutDir>.\output\$(ProjectName)-x86_64-$(Platform)-vs8-$(Configuration)\</OutDir>
-    <IntDir>$(OutDir)</IntDir>
     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win64</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win64 /a</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=win64 clean</NMakeCleanCommandLine>
     <NMakeOutput>All samples</NMakeOutput>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=ARM64</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=ARM64 /a</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=debug-dynamic VC_VER=14 ARCH=ARM64 clean</NMakeCleanCommandLine>
+    <NMakeOutput>All samples</NMakeOutput>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
-    <OutDir>.\output\$(ProjectName)-i386-$(Platform)-vs8-$(Configuration)\</OutDir>
-    <IntDir>$(OutDir)</IntDir>
     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win32</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win32 /a</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win32 clean</NMakeCleanCommandLine>
     <NMakeOutput>All samples</NMakeOutput>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
-    <OutDir>.\output\$(ProjectName)-x86_64-$(Platform)-vs8-$(Configuration)\</OutDir>
-    <IntDir>$(OutDir)</IntDir>
     <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win64</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win64 /a</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=win64 clean</NMakeCleanCommandLine>
     <NMakeOutput>All samples</NMakeOutput>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <NMakeBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=ARM64</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=ARM64 /a</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>nmake /NOLOGO /S /f Samples-vc.mak BUILD_MODE=release-static VC_VER=14 ARCH=ARM64 clean</NMakeCleanCommandLine>
+    <NMakeOutput>All samples</NMakeOutput>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <BuildLog>
       <Path />
@@ -299,6 +408,12 @@
       <Path />
     </BuildLog>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <BuildLog>
+      <Path>
+      </Path>
+    </BuildLog>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <BuildLog>
       <Path />
@@ -309,6 +424,12 @@
       <Path />
     </BuildLog>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <BuildLog>
+      <Path>
+      </Path>
+    </BuildLog>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <BuildLog>
       <Path />
@@ -319,6 +440,12 @@
       <Path />
     </BuildLog>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <BuildLog>
+      <Path>
+      </Path>
+    </BuildLog>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <BuildLog>
       <Path />
@@ -329,6 +456,12 @@
       <Path />
     </BuildLog>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <BuildLog>
+      <Path>
+      </Path>
+    </BuildLog>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <BuildLog>
       <Path />
@@ -339,6 +472,12 @@
       <Path />
     </BuildLog>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <BuildLog>
+      <Path>
+      </Path>
+    </BuildLog>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <BuildLog>
       <Path />
@@ -349,6 +488,12 @@
       <Path />
     </BuildLog>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <BuildLog>
+      <Path>
+      </Path>
+    </BuildLog>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\samples\aectest.c" />
     <ClCompile Include="..\src\samples\auddemo.c" />
@@ -375,8 +520,8 @@
     <ClCompile Include="..\src\samples\sipecho.c" />
     <ClCompile Include="..\src\samples\siprtp.c">
       <ExcludedFromBuild Condition="'$(API_Family)'!='WinDesktop'">true</ExcludedFromBuild>
-    </ClCompile>  
-    <ClCompile Include="..\src\samples\siprtp_report.c">    
+    </ClCompile>
+    <ClCompile Include="..\src\samples\siprtp_report.c">
       <ExcludedFromBuild Condition="'$(API_Family)'!='WinDesktop'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\src\samples\sipstateless.c" />
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/samples.vcxproj.filters asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/samples.vcxproj.filters
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/samples.vcxproj.filters	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/samples.vcxproj.filters	2022-02-24 07:54:38.000000000 +0000
@@ -93,12 +93,6 @@
     <ClCompile Include="..\src\samples\sipstateless.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\samples\sndinfo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\samples\sndtest.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\samples\stateful_proxy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/swig_java_pjsua2.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/swig_java_pjsua2.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/build/swig_java_pjsua2.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/build/swig_java_pjsua2.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -9,6 +13,10 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -23,7 +31,6 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{63AC6D7A-5D97-40C2-9AF2-E13AA1F9567C}</ProjectGuid>
     <TargetName>pjsua2</TargetName>
-    <OutDir>..\src\swig\java\output\</OutDir>
     <RootNamespace>swig_java_pjsua2</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -44,44 +51,81 @@
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>    
+    <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
+    <OutDir>..\src\swig\java\output\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
     <CodeAnalysisRuleAssemblies />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IntDir>$(Configuration)\</IntDir>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
     <CodeAnalysisRuleAssemblies />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
     <CodeAnalysisRuleAssemblies />
@@ -130,6 +174,24 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\src\swig\java\output\pjsua2.dll</OutputFile>
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -167,6 +229,23 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../pjsip/include;../../pjlib/include;../../pjlib-util/include;../../pjmedia/include;../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\src\swig\java\output\pjsua2.dll</OutputFile>
+      <IgnoreSpecificDefaultLibraries>msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\swig\java\output\pjsua2_wrap.cpp" />
   </ItemGroup>
@@ -186,7 +265,7 @@
 %40echo on
 %40echo Building pjsua2.dll to $(OutputDir)
 mkdir $(OutDir)org\pjsip\pjsua2
-swig -c++ -java  -package org.pjsip.pjsua2 -I$(SolutionDir)pjsip\include -outdir $(OutDir)org\pjsip\pjsua2 -o $(OutDir)pjsua2_wrap.cpp %(FullPath)
+swig -c++ -java  -package org.pjsip.pjsua2 -I$(ProjectDir)..\..\pjsip\include -I$(ProjectDir)..\..\pjlib\include -outdir $(OutDir)org\pjsip\pjsua2 -o $(OutDir)pjsua2_wrap.cpp %(FullPath)
 javac -d $(OutDir) $(OutDir)org\pjsip\pjsua2\*.java
 %40echo Building sample app
 javac -d $(OutDir) -classpath $(OutDir) ..\src\swig\java\android\app\src\main\java\org\pjsip\pjsua2\app\MyApp.java
@@ -211,7 +290,31 @@
 %40echo on
 %40echo Building pjsua2.dll to $(OutDir)
 mkdir $(OutDir)org\pjsip\pjsua2
-swig -c++ -java  -package org.pjsip.pjsua2 -I$(SolutionDir)pjsip\include -outdir $(OutDir)org\pjsip\pjsua2 -o $(OutDir)pjsua2_wrap.cpp %(FullPath)
+swig -c++ -java  -package org.pjsip.pjsua2 -I$(ProjectDir)..\..\pjsip\include -I$(ProjectDir)..\..\pjlib\include -outdir $(OutDir)org\pjsip\pjsua2 -o $(OutDir)pjsua2_wrap.cpp %(FullPath)
+javac -d $(OutDir) $(OutDir)org\pjsip\pjsua2\*.java
+%40echo Building sample app
+javac -d $(OutDir) -classpath $(OutDir) ..\src\swig\java\android\app\src\main\java\org\pjsip\pjsua2\app\MyApp.java
+javac -d $(OutDir) -classpath $(OutDir) $(OutDir)..\test.java
+javac -d $(OutDir) -classpath $(OutDir) $(OutDir)..\sample.java
+
+%40echo **************************************************************
+%40echo  After the build completed succesfully, try to run the test app, e.g:
+%40echo  java -cp D:\projects\pjproject\pjsip-apps\src\swig\java\output -Djava.library.path="D:\projects\pjproject\pjsip-apps\src\swig\java\output" org.pjsip.pjsua2.app.sample
+%40echo **************************************************************
+%40echo off
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">%40echo off
+%40echo **************************************************************
+%40echo  - Make sure %27swig%27 and %27javac%27 locations are in your PATH environment vars.
+%40echo  - Make sure Java SDK header file directories
+%40echo    (e.g: C:\Program Files (x86)\Java\jdk1.7.0_79\include and C:\Program Files (x86)\Java\jdk1.7.0_79\include\win32)
+%40echo    are in your MSVC header search path
+%40echo **************************************************************
+
+%40echo on
+%40echo Building pjsua2.dll to $(OutDir)
+mkdir $(OutDir)org\pjsip\pjsua2
+swig -c++ -java  -package org.pjsip.pjsua2 -I$(ProjectDir)..\..\pjsip\include -I$(ProjectDir)..\..\pjlib\include -outdir $(OutDir)org\pjsip\pjsua2 -o $(OutDir)pjsua2_wrap.cpp %(FullPath)
 javac -d $(OutDir) $(OutDir)org\pjsip\pjsua2\*.java
 %40echo Building sample app
 javac -d $(OutDir) -classpath $(OutDir) ..\src\swig\java\android\app\src\main\java\org\pjsip\pjsua2\app\MyApp.java
@@ -225,6 +328,7 @@
 %40echo off
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(Filename)_wrap.cxx;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">%(Filename)_wrap.cxx;%(Outputs)</Outputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%40echo off
 %40echo **************************************************************
 %40echo  - Make sure %27swig%27 and %27javac%27 locations are in your PATH environment vars.
@@ -236,7 +340,7 @@
 %40echo on
 %40echo Building pjsua2.dll to $(OutDir)
 mkdir $(OutDir)org\pjsip\pjsua2
-swig -c++ -java  -package org.pjsip.pjsua2 -I$(SolutionDir)pjsip\include -outdir $(OutDir)org\pjsip\pjsua2 -o $(OutDir)pjsua2_wrap.cpp %(FullPath)
+swig -c++ -java  -package org.pjsip.pjsua2 -I$(ProjectDir)..\..\pjsip\include -I$(ProjectDir)..\..\pjlib\include -outdir $(OutDir)org\pjsip\pjsua2 -o $(OutDir)pjsua2_wrap.cpp %(FullPath)
 javac -d $(OutDir) $(OutDir)org\pjsip\pjsua2\*.java
 %40echo Building sample app
 javac -d $(OutDir) -classpath $(OutDir) ..\src\swig\java\android\app\src\main\java\org\pjsip\pjsua2\app\MyApp.java
@@ -261,7 +365,31 @@
 %40echo on
 %40echo Building pjsua2.dll to $(OutDir)
 mkdir $(OutDir)org\pjsip\pjsua2
-swig -c++ -java  -package org.pjsip.pjsua2 -I$(SolutionDir)pjsip\include -outdir $(OutDir)org\pjsip\pjsua2 -o $(OutDir)pjsua2_wrap.cpp %(FullPath)
+swig -c++ -java  -package org.pjsip.pjsua2 -I$(ProjectDir)..\..\pjsip\include -I$(ProjectDir)..\..\pjlib\include -outdir $(OutDir)org\pjsip\pjsua2 -o $(OutDir)pjsua2_wrap.cpp %(FullPath)
+javac -d $(OutDir) $(OutDir)org\pjsip\pjsua2\*.java
+%40echo Building sample app
+javac -d $(OutDir) -classpath $(OutDir) ..\src\swig\java\android\app\src\main\java\org\pjsip\pjsua2\app\MyApp.java
+javac -d $(OutDir) -classpath $(OutDir) $(OutDir)..\test.java
+javac -d $(OutDir) -classpath $(OutDir) $(OutDir)..\sample.java
+
+%40echo **************************************************************
+%40echo  After the build completed succesfully, try to run the test app, e.g:
+%40echo  java -cp D:\projects\pjproject\pjsip-apps\src\swig\java\output -Djava.library.path="D:\projects\pjproject\pjsip-apps\src\swig\java\output" org.pjsip.pjsua2.app.sample
+%40echo **************************************************************
+%40echo off
+</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">%40echo off
+%40echo **************************************************************
+%40echo  - Make sure %27swig%27 and %27javac%27 locations are in your PATH environment vars.
+%40echo  - Make sure Java SDK header file directories
+%40echo    (e.g: C:\Program Files (x86)\Java\jdk1.7.0_79\include and C:\Program Files (x86)\Java\jdk1.7.0_79\include\win32)
+%40echo    are in your MSVC header search path
+%40echo **************************************************************
+
+%40echo on
+%40echo Building pjsua2.dll to $(OutDir)
+mkdir $(OutDir)org\pjsip\pjsua2
+swig -c++ -java  -package org.pjsip.pjsua2 -I$(ProjectDir)..\..\pjsip\include -I$(ProjectDir)..\..\pjlib\include -outdir $(OutDir)org\pjsip\pjsua2 -o $(OutDir)pjsua2_wrap.cpp %(FullPath)
 javac -d $(OutDir) $(OutDir)org\pjsip\pjsua2\*.java
 %40echo Building sample app
 javac -d $(OutDir) -classpath $(OutDir) ..\src\swig\java\android\app\src\main\java\org\pjsip\pjsua2\app\MyApp.java
@@ -275,6 +403,7 @@
 %40echo off
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)pjsua2_wrap.cpp;$(OutDir)pjsua2_wrap.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(OutDir)pjsua2_wrap.cpp;$(OutDir)pjsua2_wrap.h;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/3rdparty_media_sample/Makefile asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/3rdparty_media_sample/Makefile
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/3rdparty_media_sample/Makefile	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/3rdparty_media_sample/Makefile	2022-02-24 07:54:38.000000000 +0000
@@ -9,7 +9,7 @@
 export _CXXFLAGS:= $(PJ_CXXFLAGS)
 export _LDFLAGS := $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS)
 
-OBJS = alt_pjsua_aud.o alt_pjsua_vid.o pjsua_app.o main.o
+OBJS = alt_pjsua_aud.o alt_pjsua_vid.o pjsua_app.o main.o pjsua_app_cli.o pjsua_app_common.o pjsua_app_config.o pjsua_app_legacy.o
 
 all: alt_pjsua
 
@@ -22,6 +22,21 @@
 main.o: ../pjsua/main.c
 	$(PJ_CC) $(_CFLAGS) -c -o $@ $<
 
+#main_rtems.o: ../pjsua/main_rtems.c
+#	$(PJ_CC) $(_CFLAGS) -c -o $@ $<
+
+pjsua_app_cli.o: ../pjsua/pjsua_app_cli.c
+	$(PJ_CC) $(_CFLAGS) -c -o $@ $<
+
+pjsua_app_common.o: ../pjsua/pjsua_app_common.c
+	$(PJ_CC) $(_CFLAGS) -c -o $@ $<
+
+pjsua_app_config.o: ../pjsua/pjsua_app_config.c
+	$(PJ_CC) $(_CFLAGS) -c -o $@ $<
+
+pjsua_app_legacy.o: ../pjsua/pjsua_app_legacy.c
+	$(PJ_CC) $(_CFLAGS) -c -o $@ $<
+
 %.o: %.c
 	$(PJ_CC) $(_CFLAGS) -c -o $@ $<
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/android/app/build.gradle asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/android/app/build.gradle
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/android/app/build.gradle	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/android/app/build.gradle	2022-02-24 07:54:38.000000000 +0000
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 15
+    compileSdkVersion 26
     buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "org.pjsip.pjsua"
-        minSdkVersion 15
-        targetSdkVersion 15
+        minSdkVersion 23
+        targetSdkVersion 26
 
         ndk {
             moduleName "libpjsua"
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/android/app/src/main/java/MainActivity.java asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/android/app/src/main/java/MainActivity.java
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/android/app/src/main/java/MainActivity.java	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/android/app/src/main/java/MainActivity.java	2022-02-24 07:54:38.000000000 +0000
@@ -23,6 +23,8 @@
 
 import android.app.Activity;
 import android.content.pm.ApplicationInfo;
+import android.hardware.camera2.CameraManager;
+import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.SurfaceHolder;
@@ -30,6 +32,7 @@
 import android.os.Handler;
 import android.os.Message;
 import android.widget.TextView;
+import org.pjsip.PjCameraInfo2;
 
 class CONST {
     public static final String LIB_FILENAME = "pjsua";
@@ -160,6 +163,8 @@
     protected void onCreate(Bundle savedInstanceState) {
 	LOG.DEBUG(ui_handler, "=== Activity::onCreate() ===");
 	super.onCreate(savedInstanceState);
+	CameraManager cm = (CameraManager)getSystemService(Context.CAMERA_SERVICE);
+	PjCameraInfo2.SetCameraManager(cm);
 
 	init_view();
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/android/build.gradle asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/android/build.gradle
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/android/build.gradle	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/android/build.gradle	2022-02-24 07:54:38.000000000 +0000
@@ -2,14 +2,16 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.5.2'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/android/gradle/wrapper/gradle-wrapper.properties asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/android/gradle/wrapper/gradle-wrapper.properties
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/android/gradle/wrapper/gradle-wrapper.properties	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/android/gradle/wrapper/gradle-wrapper.properties	2022-02-24 07:54:38.000000000 +0000
@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m	2022-02-24 07:54:38.000000000 +0000
@@ -162,11 +162,14 @@
         }
     
         /* Setup device orientation change notification */
-        [[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
-        [[NSNotificationCenter defaultCenter] addObserver:app
-            selector:@selector(orientationChanged:)
-            name:UIDeviceOrientationDidChangeNotification
-            object:[UIDevice currentDevice]];
+        dispatch_async(dispatch_get_main_queue(),
+        ^{
+            [[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
+            [[NSNotificationCenter defaultCenter] addObserver:app
+                selector:@selector(orientationChanged:)
+                name:UIDeviceOrientationDidChangeNotification
+                object:[UIDevice currentDevice]];
+        });
         
         status = pjsua_app_run(PJ_TRUE);
         if (status != PJ_SUCCESS) {
@@ -288,9 +291,13 @@
     // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
     // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
     [self performSelectorOnMainThread:@selector(keepAlive) withObject:nil waitUntilDone:YES];
+
+#if 0
+    /* setKeepAliveTimeout is deprecated. Use PushKit instead. */
     [application setKeepAliveTimeout:KEEP_ALIVE_INTERVAL handler: ^{
 	[self performSelectorOnMainThread:@selector(keepAlive) withObject:nil waitUntilDone:YES];
     }];
+#endif
 }
 
 - (void)applicationWillEnterForeground:(UIApplication *)application
@@ -343,11 +350,11 @@
 	pjsua_vid_win_info wi;
         
         if (pjsua_vid_win_get_info(i, &wi) == PJ_SUCCESS) {
-            UIView *parent = app.viewController.view;
-            UIView *view = (__bridge UIView *)wi.hwnd.info.ios.window;
+            dispatch_async(dispatch_get_main_queue(), ^{
+                UIView *parent = app.viewController.view;
+                UIView *view = (__bridge UIView *)wi.hwnd.info.ios.window;
             
-            if (view) {
-                dispatch_async(dispatch_get_main_queue(), ^{
+                if (view) {
                     /* Add the video window as subview */
                     if (![view isDescendantOfView:parent])
                         [parent addSubview:view];
@@ -367,8 +374,8 @@
                                                   parent.bounds.size.height-
                                                   view.bounds.size.height/2.0);
                     }
-                });
-            }
+                }
+            });
         }
     }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj	2022-02-24 07:54:38.000000000 +0000
@@ -22,7 +22,6 @@
 		3AA3200018F3FB4C00112C3D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF318F3FB4C00112C3D /* Foundation.framework */; };
 		3AA3200118F3FB4C00112C3D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF418F3FB4C00112C3D /* CoreGraphics.framework */; };
 		3AA3200218F3FB4C00112C3D /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF518F3FB4C00112C3D /* UIKit.framework */; };
-		3AB0EC581DA76B39008A0F62 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AB0EC571DA76B39008A0F62 /* libc++.tbd */; };
 		3ADCCD171715338D0007BE8E /* pjsua.png in Resources */ = {isa = PBXBuildFile; fileRef = 3ADCCD161715338D0007BE8E /* pjsua.png */; };
 		3ADCCD2D172E40120007BE8E /* pjsua_app_cli.c in Sources */ = {isa = PBXBuildFile; fileRef = 3ADCCD28172E40120007BE8E /* pjsua_app_cli.c */; };
 		3ADCCD2E172E40120007BE8E /* pjsua_app_common.c in Sources */ = {isa = PBXBuildFile; fileRef = 3ADCCD29172E40120007BE8E /* pjsua_app_common.c */; };
@@ -78,7 +77,6 @@
 		3AA31FF318F3FB4C00112C3D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		3AA31FF418F3FB4C00112C3D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		3AA31FF518F3FB4C00112C3D /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		3AB0EC571DA76B39008A0F62 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		3ADCCD161715338D0007BE8E /* pjsua.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pjsua.png; sourceTree = "<group>"; };
 		3ADCCD28172E40120007BE8E /* pjsua_app_cli.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pjsua_app_cli.c; path = ../../pjsua_app_cli.c; sourceTree = "<group>"; };
 		3ADCCD29172E40120007BE8E /* pjsua_app_common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pjsua_app_common.c; path = ../../pjsua_app_common.c; sourceTree = "<group>"; };
@@ -101,7 +99,6 @@
 		3AF0582716F050780046B835 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ipjsuaViewController_iPad.xib; sourceTree = "<group>"; };
 		3AF252FF1EFBD15E00213893 /* libyuv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libyuv.a; sourceTree = "<group>"; };
 		3AF253011EFBD36E00213893 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
-		741C73BA1F0E64AF00887FB6 /* libopenh264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopenh264.a; path = "../../../../../../../../../../openh264-1.6.0/lib_armv7/lib/libopenh264.a"; sourceTree = "<group>"; };
 		7485A6AD1F09AAE500122F1A /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
 		7485A6AE1F09AAE500122F1A /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
 		7485A6B01F09B2D500122F1A /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
@@ -133,7 +130,6 @@
 				3A6FDEF0223B3BEC001726FD /* Security.framework in Frameworks */,
 				7485A6B11F09B2D500122F1A /* SystemConfiguration.framework in Frameworks */,
 				3AF253021EFBD36E00213893 /* VideoToolbox.framework in Frameworks */,
-				3AB0EC581DA76B39008A0F62 /* libc++.tbd in Frameworks */,
 				E5E991EC1B67A45500017E67 /* libpjmedia-codec.a in Frameworks */,
 				3AA31FF818F3FB4C00112C3D /* CFNetwork.framework in Frameworks */,
 				E5E991E61B67A45500017E67 /* libg7221codec.a in Frameworks */,
@@ -207,10 +203,8 @@
 			isa = PBXGroup;
 			children = (
 				3A6FDEEF223B3BEC001726FD /* Security.framework */,
-				741C73BA1F0E64AF00887FB6 /* libopenh264.a */,
 				7485A6B01F09B2D500122F1A /* SystemConfiguration.framework */,
 				3AF253011EFBD36E00213893 /* VideoToolbox.framework */,
-				3AB0EC571DA76B39008A0F62 /* libc++.tbd */,
 				3AA31FE918F3FB4C00112C3D /* AudioToolbox.framework */,
 				3AA31FEA18F3FB4C00112C3D /* AVFoundation.framework */,
 				3AA31FEB18F3FB4C00112C3D /* CFNetwork.framework */,
@@ -314,7 +308,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = ipjsua;
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1240;
 				ORGANIZATIONNAME = Teluu;
 				TargetAttributes = {
 					3AF0580316F050770046B835 = {
@@ -424,6 +418,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -449,7 +444,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -476,6 +471,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -493,7 +489,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/xcshareddata/xcschemes/ipjsua.xcscheme asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/xcshareddata/xcschemes/ipjsua.xcscheme
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/xcshareddata/xcschemes/ipjsua.xcscheme	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/xcshareddata/xcschemes/ipjsua.xcscheme	2022-02-24 07:54:38.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/AccentColor.colorset/Contents.json asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/AccentColor.colorset/Contents.json
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/AccentColor.colorset/Contents.json	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/AccentColor.colorset/Contents.json	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/AppIcon.appiconset/Contents.json asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/AppIcon.appiconset/Contents.json
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/AppIcon.appiconset/Contents.json	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/AppIcon.appiconset/Contents.json	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,98 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/Contents.json asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/Contents.json
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/Contents.json	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Assets.xcassets/Contents.json	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ContentView.swift asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ContentView.swift
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ContentView.swift	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ContentView.swift	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2021-2021 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+import SwiftUI
+
+struct VidView: UIViewRepresentable {
+    @Binding var vidWin: UIView?
+
+    func makeUIView(context: Context) -> UIView {
+        let view = UIView();
+        view.backgroundColor = UIColor.black;
+        return view;
+    }
+
+    func updateUIView(_ uiView: UIView, context: Context) {
+        if let vid_win = vidWin {
+            /* Add the video window as subview */
+            if (!vid_win.isDescendant(of: uiView)) {
+                uiView.addSubview(vid_win)
+                /* Resize it to fit width */
+                vid_win.bounds = CGRect(x:0, y:0, width:uiView.bounds.size.width,
+                                        height:(uiView.bounds.size.height *
+                                                1.0 * uiView.bounds.size.width /
+                                                vid_win.bounds.size.width));
+                /* Center it horizontally */
+                vid_win.center = CGPoint(x:uiView.bounds.size.width / 2.0,
+                                         y:vid_win.bounds.size.height / 2.0);
+            }
+        }
+    }
+}
+
+class PjsipVars: ObservableObject {
+    @Published var calling = false
+    var dest: String = "sip:test@pjsip.org"
+    var call_id: pjsua_call_id = PJSUA_INVALID_ID.rawValue
+}
+
+private func call_func(user_data: UnsafeMutableRawPointer?) {
+    let pjsip_vars = Unmanaged<PjsipVars>.fromOpaque(user_data!).takeUnretainedValue()
+    if (!pjsip_vars.calling) {
+        var status: pj_status_t;
+        var opt = pjsua_call_setting();
+
+        pjsua_call_setting_default(&opt);
+        opt.aud_cnt = 1;
+        opt.vid_cnt = 1;
+
+        let dest_str = strdup(pjsip_vars.dest);
+        var dest:pj_str_t = pj_str(dest_str);
+        status = pjsua_call_make_call(0, &dest, &opt, nil, nil, &pjsip_vars.call_id);
+        DispatchQueue.main.sync {
+            pjsip_vars.calling = (status == PJ_SUCCESS.rawValue);
+        }
+        free(dest_str);
+    } else {
+        if (pjsip_vars.call_id != PJSUA_INVALID_ID.rawValue) {
+            DispatchQueue.main.sync {
+                pjsip_vars.calling = false;
+            }
+            pjsua_call_hangup(pjsip_vars.call_id, 200, nil, nil);
+            pjsip_vars.call_id = PJSUA_INVALID_ID.rawValue;
+        }
+    }
+
+}
+
+struct ContentView: View {
+    @StateObject var pjsip_vars = PjsipVars()
+    @EnvironmentObject var vinfo: VidInfo;
+
+    var body: some View {
+        VStack(alignment: .center) {
+            HStack(alignment: .center) {
+                if (!pjsip_vars.calling) {
+                    Text("Destination:")
+                    TextField(pjsip_vars.dest, text: $pjsip_vars.dest)
+                        .frame(minWidth:0, maxWidth:200)
+                }
+            }
+
+            Button(action: {
+                let user_data =
+                    UnsafeMutableRawPointer(Unmanaged.passUnretained(pjsip_vars).toOpaque())
+
+                /* IMPORTANT:
+                 * We need to call PJSIP API from a separate thread since
+                 * PJSIP API can potentially block the main/GUI thread.
+                 * And make sure we don't use Apple's Dispatch / gcd since
+                 * it's incompatible with POSIX threads.
+                 * In this example, we take advantage of PJSUA's timer thread
+                 * to make and hangup call. For a more complex application,
+                 * it is recommended to create your own separate thread
+                 * instead for this purpose.
+                 */
+                pjsua_schedule_timer2_dbg(call_func, user_data, 0, "swift", 0);
+            }) {
+                if (!pjsip_vars.calling) {
+                    Text("Make call")
+                        .foregroundColor(Color.black)
+                } else {
+                    Text("Hangup call")
+                        .foregroundColor(Color.black)
+                }
+            }
+                .padding(.all, 8.0)
+                .background(Color.green);
+
+            VidView(vidWin: $vinfo.vid_win)
+        }
+    }
+}
+
+struct ContentView_Previews: PreviewProvider {
+    static var previews: some View {
+        ContentView()
+    }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Info.plist asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Info.plist
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Info.plist	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Info.plist	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>Audio call permission</string>
+	<key>NSCameraUsageDescription</key>
+	<string>Video call permission</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<true/>
+	</dict>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+	<key>UILaunchScreen</key>
+	<dict/>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>video-camera</string>
+		<string>wifi</string>
+		<string>microphone</string>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ipjsua_swiftApp.swift asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ipjsua_swiftApp.swift
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ipjsua_swiftApp.swift	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ipjsua_swiftApp.swift	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2021-2021 Teluu Inc. (http://www.teluu.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/* This is a simple Swift demo app that shows an example of how to use
+ * PJSUA API to make one audio+video call to another user.
+ */
+
+import SwiftUI
+
+class VidInfo: ObservableObject {
+    /* Video window */
+    @Published var vid_win:UIView? = nil
+}
+
+class AppDelegate: NSObject, UIApplicationDelegate {
+    static let Shared = AppDelegate()
+    var vinfo = VidInfo()
+}
+
+@main
+struct ipjsua_swiftApp: App {
+    init() {
+        /* Create pjsua */
+        var status: pj_status_t;
+        status = pjsua_create();
+        if (status != PJ_SUCCESS.rawValue) {
+            NSLog("Failed creating pjsua");
+        }
+
+        /* Init configs */
+        var cfg = pjsua_config();
+        var log_cfg = pjsua_logging_config();
+        var media_cfg = pjsua_media_config();
+        pjsua_config_default(&cfg);
+        pjsua_logging_config_default(&log_cfg);
+        pjsua_media_config_default(&media_cfg);
+
+        /* Initialize application callbacks */
+        cfg.cb.on_call_state = on_call_state;
+        cfg.cb.on_call_media_state = on_call_media_state;
+
+        /* Init pjsua */
+        status = pjsua_init(&cfg, &log_cfg, &media_cfg);
+        
+        /* Create transport */
+        var transport_id = pjsua_transport_id();
+        var tcp_cfg = pjsua_transport_config();
+        pjsua_transport_config_default(&tcp_cfg);
+        tcp_cfg.port = 5060;
+        status = pjsua_transport_create(PJSIP_TRANSPORT_TCP,
+                                        &tcp_cfg, &transport_id);
+
+        /* Init account config */
+        let id = strdup("Test<sip:test@pjsip.org>");
+        let username = strdup("test");
+        let passwd = strdup("pwd");
+        let realm = strdup("*");
+        let registrar = strdup("sip:pjsip.org");
+        let proxy = strdup("sip:sip.pjsip.org;transport=tcp");
+
+        var acc_cfg = pjsua_acc_config();
+        pjsua_acc_config_default(&acc_cfg);
+        acc_cfg.id = pj_str(id);
+        acc_cfg.cred_count = 1;
+        acc_cfg.cred_info.0.username = pj_str(username);
+        acc_cfg.cred_info.0.realm = pj_str(realm);
+        acc_cfg.cred_info.0.data = pj_str(passwd);
+        acc_cfg.reg_uri = pj_str(registrar);
+        acc_cfg.proxy_cnt = 1;
+        acc_cfg.proxy.0 = pj_str(proxy);
+        acc_cfg.vid_out_auto_transmit = pj_bool_t(PJ_TRUE.rawValue);
+        acc_cfg.vid_in_auto_show = pj_bool_t(PJ_TRUE.rawValue);
+
+        /* Add account */
+        pjsua_acc_add(&acc_cfg, pj_bool_t(PJ_TRUE.rawValue), nil);
+
+        /* Free strings */
+        free(id); free(username); free(passwd); free(realm);
+        free(registrar); free(proxy);
+        
+        /* Start pjsua */
+        status = pjsua_start();
+    }
+
+    var body: some Scene {
+        WindowGroup {
+            ContentView()
+                .environmentObject(AppDelegate.Shared.vinfo)
+                .preferredColorScheme(.light)
+        }
+    }
+}
+
+private func on_call_state(call_id: pjsua_call_id, e: UnsafeMutablePointer<pjsip_event>?) {
+    var ci = pjsua_call_info();
+    pjsua_call_get_info(call_id, &ci);
+    if (ci.state == PJSIP_INV_STATE_DISCONNECTED) {
+        /* UIView update must be done in the main thread */
+        DispatchQueue.main.sync {
+            AppDelegate.Shared.vinfo.vid_win = nil;
+        }
+    }
+}
+
+private func tupleToArray<Tuple, Value>(tuple: Tuple) -> [Value] {
+    let tupleMirror = Mirror(reflecting: tuple)
+    return tupleMirror.children.compactMap { (child: Mirror.Child) -> Value? in
+        return child.value as? Value
+    }
+}
+
+private func on_call_media_state(call_id: pjsua_call_id) {
+    var ci = pjsua_call_info();
+    pjsua_call_get_info(call_id, &ci);
+
+    for mi in 0...ci.media_cnt {
+        let media: [pjsua_call_media_info] = tupleToArray(tuple: ci.media);
+
+        if (media[Int(mi)].status == PJSUA_CALL_MEDIA_ACTIVE ||
+            media[Int(mi)].status == PJSUA_CALL_MEDIA_REMOTE_HOLD)
+        {
+            switch (media[Int(mi)].type) {
+            case PJMEDIA_TYPE_AUDIO:
+                var call_conf_slot: pjsua_conf_port_id;
+
+                call_conf_slot = media[Int(mi)].stream.aud.conf_slot;
+                pjsua_conf_connect(call_conf_slot, 0);
+                pjsua_conf_connect(0, call_conf_slot);
+                break;
+        
+            case PJMEDIA_TYPE_VIDEO:
+                let wid = media[Int(mi)].stream.vid.win_in;
+                var wi = pjsua_vid_win_info();
+                    
+                if (pjsua_vid_win_get_info(wid, &wi) == PJ_SUCCESS.rawValue) {
+                    let vid_win:UIView =
+                        Unmanaged<UIView>.fromOpaque(wi.hwnd.info.ios.window).takeUnretainedValue();
+
+                    /* UIView update must be done in the main thread */
+                    DispatchQueue.main.sync {
+                        AppDelegate.Shared.vinfo.vid_win = vid_win;
+                    }
+                }
+                break;
+            
+            default:
+                break;
+            }
+        }
+    }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ipjsua-swift-Bridging-Header.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ipjsua-swift-Bridging-Header.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ipjsua-swift-Bridging-Header.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/ipjsua-swift-Bridging-Header.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,6 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#define PJ_AUTOCONF 1
+#import "pjsua.h"
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/pjsip.m asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/pjsip.m
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/pjsip.m	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/pjsip.m	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,8 @@
+//
+//  pjsip.m
+//  ipjsua-swift
+//
+//  Created by Ming on 4/2/21.
+//
+
+#import <Foundation/Foundation.h>
diff -Nru "/tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Preview Content/Preview Assets.xcassets/Contents.json" "/tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Preview Content/Preview Assets.xcassets/Contents.json"
--- "/tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Preview Content/Preview Assets.xcassets/Contents.json"	1970-01-01 00:00:00.000000000 +0000
+++ "/tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift/Preview Content/Preview Assets.xcassets/Contents.json"	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.pbxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.pbxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.pbxproj	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.pbxproj	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,551 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		3A6FC61C25CBD4540065F472 /* ipjsua_swiftApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A6FC61B25CBD4540065F472 /* ipjsua_swiftApp.swift */; };
+		3A6FC61E25CBD4540065F472 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A6FC61D25CBD4540065F472 /* ContentView.swift */; };
+		3A6FC62025CBD4550065F472 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3A6FC61F25CBD4550065F472 /* Assets.xcassets */; };
+		3A6FC62325CBD4550065F472 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3A6FC62225CBD4550065F472 /* Preview Assets.xcassets */; };
+		3A6FC77125CBDB620065F472 /* pjsip.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A6FC77025CBDB620065F472 /* pjsip.m */; };
+		3A6FC77625CBE3700065F472 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC75B25CBD6E10065F472 /* AudioToolbox.framework */; };
+		3A6FC77725CBE3700065F472 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC76B25CBD6E10065F472 /* AVFoundation.framework */; };
+		3A6FC77825CBE3700065F472 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC76925CBD6E10065F472 /* CFNetwork.framework */; };
+		3A6FC77925CBE3700065F472 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC76525CBD6E10065F472 /* CoreAudio.framework */; };
+		3A6FC77A25CBE3700065F472 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC76725CBD6E10065F472 /* CoreFoundation.framework */; };
+		3A6FC77B25CBE3700065F472 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC75C25CBD6E10065F472 /* CoreGraphics.framework */; };
+		3A6FC77C25CBE3700065F472 /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC75E25CBD6E10065F472 /* CoreImage.framework */; };
+		3A6FC77D25CBE3700065F472 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC76025CBD6E10065F472 /* CoreMedia.framework */; };
+		3A6FC77E25CBE3700065F472 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC76225CBD6E10065F472 /* CoreVideo.framework */; };
+		3A6FC77F25CBE3700065F472 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC75F25CBD6E10065F472 /* Foundation.framework */; };
+		3A6FC78025CBE3700065F472 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC75D25CBD6E10065F472 /* libc++.tbd */; };
+		3A6FC78125CBE3700065F472 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC76825CBD6E10065F472 /* OpenGLES.framework */; };
+		3A6FC78225CBE3700065F472 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC76625CBD6E10065F472 /* QuartzCore.framework */; };
+		3A6FC78325CBE3700065F472 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC76425CBD6E10065F472 /* Security.framework */; };
+		3A6FC78425CBE3700065F472 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC76325CBD6E10065F472 /* SystemConfiguration.framework */; };
+		3A6FC78525CBE3700065F472 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC76A25CBD6E10065F472 /* UIKit.framework */; };
+		3A6FC78625CBE3700065F472 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC76125CBD6E10065F472 /* VideoToolbox.framework */; };
+		3A6FC7E125CD1A3D0065F472 /* libpjsip-simple.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7CD25CD1A3D0065F472 /* libpjsip-simple.a */; };
+		3A6FC7E225CD1A3D0065F472 /* libgsmcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7CE25CD1A3D0065F472 /* libgsmcodec.a */; };
+		3A6FC7E325CD1A3D0065F472 /* libpj.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7CF25CD1A3D0065F472 /* libpj.a */; };
+		3A6FC7E425CD1A3D0065F472 /* libpjsip-ua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7D025CD1A3D0065F472 /* libpjsip-ua.a */; };
+		3A6FC7E525CD1A3E0065F472 /* libresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7D125CD1A3D0065F472 /* libresample.a */; };
+		3A6FC7E625CD1A3E0065F472 /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7D225CD1A3D0065F472 /* libsrtp.a */; };
+		3A6FC7E725CD1A3E0065F472 /* libyuv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7D325CD1A3D0065F472 /* libyuv.a */; };
+		3A6FC7E825CD1A3E0065F472 /* libpjmedia-videodev.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7D425CD1A3D0065F472 /* libpjmedia-videodev.a */; };
+		3A6FC7E925CD1A3E0065F472 /* libpjlib-util.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7D525CD1A3D0065F472 /* libpjlib-util.a */; };
+		3A6FC7EA25CD1A3E0065F472 /* libpjnath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7D625CD1A3D0065F472 /* libpjnath.a */; };
+		3A6FC7EB25CD1A3E0065F472 /* libpjsua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7D725CD1A3D0065F472 /* libpjsua.a */; };
+		3A6FC7EC25CD1A3E0065F472 /* libpjmedia.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7D825CD1A3D0065F472 /* libpjmedia.a */; };
+		3A6FC7ED25CD1A3E0065F472 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7D925CD1A3D0065F472 /* libspeex.a */; };
+		3A6FC7EE25CD1A3E0065F472 /* libg7221codec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7DA25CD1A3D0065F472 /* libg7221codec.a */; };
+		3A6FC7EF25CD1A3E0065F472 /* libpjsip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7DB25CD1A3D0065F472 /* libpjsip.a */; };
+		3A6FC7F025CD1A3E0065F472 /* libpjsua2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7DC25CD1A3D0065F472 /* libpjsua2.a */; };
+		3A6FC7F125CD1A3E0065F472 /* libilbccodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7DD25CD1A3D0065F472 /* libilbccodec.a */; };
+		3A6FC7F225CD1A3E0065F472 /* libwebrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7DE25CD1A3D0065F472 /* libwebrtc.a */; };
+		3A6FC7F325CD1A3E0065F472 /* libpjmedia-codec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7DF25CD1A3D0065F472 /* libpjmedia-codec.a */; };
+		3A6FC7F425CD1A3E0065F472 /* libpjmedia-audiodev.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A6FC7E025CD1A3D0065F472 /* libpjmedia-audiodev.a */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		3A6FC61825CBD4540065F472 /* ipjsua-swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ipjsua-swift.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		3A6FC61B25CBD4540065F472 /* ipjsua_swiftApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ipjsua_swiftApp.swift; sourceTree = "<group>"; };
+		3A6FC61D25CBD4540065F472 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
+		3A6FC61F25CBD4550065F472 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		3A6FC62225CBD4550065F472 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
+		3A6FC62425CBD4550065F472 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		3A6FC75B25CBD6E10065F472 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+		3A6FC75C25CBD6E10065F472 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		3A6FC75D25CBD6E10065F472 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
+		3A6FC75E25CBD6E10065F472 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; };
+		3A6FC75F25CBD6E10065F472 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		3A6FC76025CBD6E10065F472 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
+		3A6FC76125CBD6E10065F472 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
+		3A6FC76225CBD6E10065F472 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
+		3A6FC76325CBD6E10065F472 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
+		3A6FC76425CBD6E10065F472 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+		3A6FC76525CBD6E10065F472 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
+		3A6FC76625CBD6E10065F472 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+		3A6FC76725CBD6E10065F472 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
+		3A6FC76825CBD6E10065F472 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
+		3A6FC76925CBD6E10065F472 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
+		3A6FC76A25CBD6E10065F472 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		3A6FC76B25CBD6E10065F472 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
+		3A6FC76F25CBDB620065F472 /* ipjsua-swift-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ipjsua-swift-Bridging-Header.h"; sourceTree = "<group>"; };
+		3A6FC77025CBDB620065F472 /* pjsip.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = pjsip.m; sourceTree = "<group>"; };
+		3A6FC7CD25CD1A3D0065F472 /* libpjsip-simple.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libpjsip-simple.a"; sourceTree = "<group>"; };
+		3A6FC7CE25CD1A3D0065F472 /* libgsmcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgsmcodec.a; sourceTree = "<group>"; };
+		3A6FC7CF25CD1A3D0065F472 /* libpj.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpj.a; sourceTree = "<group>"; };
+		3A6FC7D025CD1A3D0065F472 /* libpjsip-ua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libpjsip-ua.a"; sourceTree = "<group>"; };
+		3A6FC7D125CD1A3D0065F472 /* libresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libresample.a; sourceTree = "<group>"; };
+		3A6FC7D225CD1A3D0065F472 /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libsrtp.a; sourceTree = "<group>"; };
+		3A6FC7D325CD1A3D0065F472 /* libyuv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libyuv.a; sourceTree = "<group>"; };
+		3A6FC7D425CD1A3D0065F472 /* libpjmedia-videodev.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libpjmedia-videodev.a"; sourceTree = "<group>"; };
+		3A6FC7D525CD1A3D0065F472 /* libpjlib-util.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libpjlib-util.a"; sourceTree = "<group>"; };
+		3A6FC7D625CD1A3D0065F472 /* libpjnath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpjnath.a; sourceTree = "<group>"; };
+		3A6FC7D725CD1A3D0065F472 /* libpjsua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpjsua.a; sourceTree = "<group>"; };
+		3A6FC7D825CD1A3D0065F472 /* libpjmedia.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpjmedia.a; sourceTree = "<group>"; };
+		3A6FC7D925CD1A3D0065F472 /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libspeex.a; sourceTree = "<group>"; };
+		3A6FC7DA25CD1A3D0065F472 /* libg7221codec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libg7221codec.a; sourceTree = "<group>"; };
+		3A6FC7DB25CD1A3D0065F472 /* libpjsip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpjsip.a; sourceTree = "<group>"; };
+		3A6FC7DC25CD1A3D0065F472 /* libpjsua2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libpjsua2.a; sourceTree = "<group>"; };
+		3A6FC7DD25CD1A3D0065F472 /* libilbccodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libilbccodec.a; sourceTree = "<group>"; };
+		3A6FC7DE25CD1A3D0065F472 /* libwebrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libwebrtc.a; sourceTree = "<group>"; };
+		3A6FC7DF25CD1A3D0065F472 /* libpjmedia-codec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libpjmedia-codec.a"; sourceTree = "<group>"; };
+		3A6FC7E025CD1A3D0065F472 /* libpjmedia-audiodev.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libpjmedia-audiodev.a"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		3A6FC61525CBD4540065F472 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3A6FC7EE25CD1A3E0065F472 /* libg7221codec.a in Frameworks */,
+				3A6FC7F025CD1A3E0065F472 /* libpjsua2.a in Frameworks */,
+				3A6FC77625CBE3700065F472 /* AudioToolbox.framework in Frameworks */,
+				3A6FC7ED25CD1A3E0065F472 /* libspeex.a in Frameworks */,
+				3A6FC7E425CD1A3D0065F472 /* libpjsip-ua.a in Frameworks */,
+				3A6FC77725CBE3700065F472 /* AVFoundation.framework in Frameworks */,
+				3A6FC77825CBE3700065F472 /* CFNetwork.framework in Frameworks */,
+				3A6FC77925CBE3700065F472 /* CoreAudio.framework in Frameworks */,
+				3A6FC77A25CBE3700065F472 /* CoreFoundation.framework in Frameworks */,
+				3A6FC77B25CBE3700065F472 /* CoreGraphics.framework in Frameworks */,
+				3A6FC77C25CBE3700065F472 /* CoreImage.framework in Frameworks */,
+				3A6FC77D25CBE3700065F472 /* CoreMedia.framework in Frameworks */,
+				3A6FC77E25CBE3700065F472 /* CoreVideo.framework in Frameworks */,
+				3A6FC7F225CD1A3E0065F472 /* libwebrtc.a in Frameworks */,
+				3A6FC77F25CBE3700065F472 /* Foundation.framework in Frameworks */,
+				3A6FC7EB25CD1A3E0065F472 /* libpjsua.a in Frameworks */,
+				3A6FC78025CBE3700065F472 /* libc++.tbd in Frameworks */,
+				3A6FC7EC25CD1A3E0065F472 /* libpjmedia.a in Frameworks */,
+				3A6FC7E525CD1A3E0065F472 /* libresample.a in Frameworks */,
+				3A6FC7E325CD1A3D0065F472 /* libpj.a in Frameworks */,
+				3A6FC7E225CD1A3D0065F472 /* libgsmcodec.a in Frameworks */,
+				3A6FC78125CBE3700065F472 /* OpenGLES.framework in Frameworks */,
+				3A6FC7E825CD1A3E0065F472 /* libpjmedia-videodev.a in Frameworks */,
+				3A6FC7E925CD1A3E0065F472 /* libpjlib-util.a in Frameworks */,
+				3A6FC7EF25CD1A3E0065F472 /* libpjsip.a in Frameworks */,
+				3A6FC78225CBE3700065F472 /* QuartzCore.framework in Frameworks */,
+				3A6FC7E625CD1A3E0065F472 /* libsrtp.a in Frameworks */,
+				3A6FC7F125CD1A3E0065F472 /* libilbccodec.a in Frameworks */,
+				3A6FC7E725CD1A3E0065F472 /* libyuv.a in Frameworks */,
+				3A6FC78325CBE3700065F472 /* Security.framework in Frameworks */,
+				3A6FC7F425CD1A3E0065F472 /* libpjmedia-audiodev.a in Frameworks */,
+				3A6FC7EA25CD1A3E0065F472 /* libpjnath.a in Frameworks */,
+				3A6FC7E125CD1A3D0065F472 /* libpjsip-simple.a in Frameworks */,
+				3A6FC78425CBE3700065F472 /* SystemConfiguration.framework in Frameworks */,
+				3A6FC7F325CD1A3E0065F472 /* libpjmedia-codec.a in Frameworks */,
+				3A6FC78525CBE3700065F472 /* UIKit.framework in Frameworks */,
+				3A6FC78625CBE3700065F472 /* VideoToolbox.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		3A6FC60F25CBD4540065F472 = {
+			isa = PBXGroup;
+			children = (
+				3A6FC75A25CBD6CF0065F472 /* Frameworks */,
+				3A6FC6AF25CBD5790065F472 /* Libraries */,
+				3A6FC61A25CBD4540065F472 /* ipjsua-swift */,
+				3A6FC61925CBD4540065F472 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		3A6FC61925CBD4540065F472 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				3A6FC61825CBD4540065F472 /* ipjsua-swift.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		3A6FC61A25CBD4540065F472 /* ipjsua-swift */ = {
+			isa = PBXGroup;
+			children = (
+				3A6FC61B25CBD4540065F472 /* ipjsua_swiftApp.swift */,
+				3A6FC61D25CBD4540065F472 /* ContentView.swift */,
+				3A6FC61F25CBD4550065F472 /* Assets.xcassets */,
+				3A6FC62425CBD4550065F472 /* Info.plist */,
+				3A6FC62125CBD4550065F472 /* Preview Content */,
+				3A6FC77025CBDB620065F472 /* pjsip.m */,
+				3A6FC76F25CBDB620065F472 /* ipjsua-swift-Bridging-Header.h */,
+			);
+			path = "ipjsua-swift";
+			sourceTree = "<group>";
+		};
+		3A6FC62125CBD4550065F472 /* Preview Content */ = {
+			isa = PBXGroup;
+			children = (
+				3A6FC62225CBD4550065F472 /* Preview Assets.xcassets */,
+			);
+			path = "Preview Content";
+			sourceTree = "<group>";
+		};
+		3A6FC6AF25CBD5790065F472 /* Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				3A6FC7DA25CD1A3D0065F472 /* libg7221codec.a */,
+				3A6FC7CE25CD1A3D0065F472 /* libgsmcodec.a */,
+				3A6FC7DD25CD1A3D0065F472 /* libilbccodec.a */,
+				3A6FC7CF25CD1A3D0065F472 /* libpj.a */,
+				3A6FC7D525CD1A3D0065F472 /* libpjlib-util.a */,
+				3A6FC7E025CD1A3D0065F472 /* libpjmedia-audiodev.a */,
+				3A6FC7DF25CD1A3D0065F472 /* libpjmedia-codec.a */,
+				3A6FC7D425CD1A3D0065F472 /* libpjmedia-videodev.a */,
+				3A6FC7D825CD1A3D0065F472 /* libpjmedia.a */,
+				3A6FC7D625CD1A3D0065F472 /* libpjnath.a */,
+				3A6FC7CD25CD1A3D0065F472 /* libpjsip-simple.a */,
+				3A6FC7D025CD1A3D0065F472 /* libpjsip-ua.a */,
+				3A6FC7DB25CD1A3D0065F472 /* libpjsip.a */,
+				3A6FC7D725CD1A3D0065F472 /* libpjsua.a */,
+				3A6FC7DC25CD1A3D0065F472 /* libpjsua2.a */,
+				3A6FC7D125CD1A3D0065F472 /* libresample.a */,
+				3A6FC7D925CD1A3D0065F472 /* libspeex.a */,
+				3A6FC7D225CD1A3D0065F472 /* libsrtp.a */,
+				3A6FC7DE25CD1A3D0065F472 /* libwebrtc.a */,
+				3A6FC7D325CD1A3D0065F472 /* libyuv.a */,
+			);
+			path = Libraries;
+			sourceTree = "<group>";
+		};
+		3A6FC75A25CBD6CF0065F472 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				3A6FC75B25CBD6E10065F472 /* AudioToolbox.framework */,
+				3A6FC76B25CBD6E10065F472 /* AVFoundation.framework */,
+				3A6FC76925CBD6E10065F472 /* CFNetwork.framework */,
+				3A6FC76525CBD6E10065F472 /* CoreAudio.framework */,
+				3A6FC76725CBD6E10065F472 /* CoreFoundation.framework */,
+				3A6FC75C25CBD6E10065F472 /* CoreGraphics.framework */,
+				3A6FC75E25CBD6E10065F472 /* CoreImage.framework */,
+				3A6FC76025CBD6E10065F472 /* CoreMedia.framework */,
+				3A6FC76225CBD6E10065F472 /* CoreVideo.framework */,
+				3A6FC75F25CBD6E10065F472 /* Foundation.framework */,
+				3A6FC75D25CBD6E10065F472 /* libc++.tbd */,
+				3A6FC76825CBD6E10065F472 /* OpenGLES.framework */,
+				3A6FC76625CBD6E10065F472 /* QuartzCore.framework */,
+				3A6FC76425CBD6E10065F472 /* Security.framework */,
+				3A6FC76325CBD6E10065F472 /* SystemConfiguration.framework */,
+				3A6FC76A25CBD6E10065F472 /* UIKit.framework */,
+				3A6FC76125CBD6E10065F472 /* VideoToolbox.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		3A6FC61725CBD4540065F472 /* ipjsua-swift */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 3A6FC62725CBD4550065F472 /* Build configuration list for PBXNativeTarget "ipjsua-swift" */;
+			buildPhases = (
+				3A6FC61425CBD4540065F472 /* Sources */,
+				3A6FC61525CBD4540065F472 /* Frameworks */,
+				3A6FC61625CBD4540065F472 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "ipjsua-swift";
+			productName = "ipjsua-swift";
+			productReference = 3A6FC61825CBD4540065F472 /* ipjsua-swift.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		3A6FC61025CBD4540065F472 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 1240;
+				LastUpgradeCheck = 1240;
+				TargetAttributes = {
+					3A6FC61725CBD4540065F472 = {
+						CreatedOnToolsVersion = 12.4;
+						LastSwiftMigration = 1240;
+					};
+				};
+			};
+			buildConfigurationList = 3A6FC61325CBD4540065F472 /* Build configuration list for PBXProject "ipjsua-swift" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 3A6FC60F25CBD4540065F472;
+			productRefGroup = 3A6FC61925CBD4540065F472 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				3A6FC61725CBD4540065F472 /* ipjsua-swift */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		3A6FC61625CBD4540065F472 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3A6FC62325CBD4550065F472 /* Preview Assets.xcassets in Resources */,
+				3A6FC62025CBD4550065F472 /* Assets.xcassets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		3A6FC61425CBD4540065F472 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3A6FC77125CBDB620065F472 /* pjsip.m in Sources */,
+				3A6FC61E25CBD4540065F472 /* ContentView.swift in Sources */,
+				3A6FC61C25CBD4540065F472 /* ipjsua_swiftApp.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		3A6FC62525CBD4550065F472 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_BITCODE = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../../../pjsip/include,
+					../../../../pjlib/include,
+					"../../../../pjlib-util/include",
+					../../../../pjnath/include,
+					../../../../pjmedia/include,
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		3A6FC62625CBD4550065F472 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_BITCODE = NO;
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../../../pjsip/include,
+					../../../../pjlib/include,
+					"../../../../pjlib-util/include",
+					../../../../pjnath/include,
+					../../../../pjmedia/include,
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		3A6FC62825CBD4550065F472 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_ASSET_PATHS = "\"ipjsua-swift/Preview Content\"";
+				DEVELOPMENT_TEAM = 93NHJQ455P;
+				ENABLE_PREVIEWS = YES;
+				INFOPLIST_FILE = "ipjsua-swift/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)",
+					"$(SRCROOT)/Libraries",
+					"\"$(SRCROOT)/../../../../pjlib/lib\"",
+					"\"$(SRCROOT)/../../../../pjlib-util/lib\"",
+					"\"$(SRCROOT)/../../../../pjmedia/lib\"",
+					"\"$(SRCROOT)/../../../../pjnath/lib\"",
+					"\"$(SRCROOT)/../../../../pjsip/lib\"",
+					"\"$(SRCROOT)/../../../../third_party/lib\"",
+					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/Libraries",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.teluu.ipjsua-swift";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "ipjsua-swift/ipjsua-swift-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		3A6FC62925CBD4550065F472 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_ASSET_PATHS = "\"ipjsua-swift/Preview Content\"";
+				DEVELOPMENT_TEAM = 93NHJQ455P;
+				ENABLE_PREVIEWS = YES;
+				INFOPLIST_FILE = "ipjsua-swift/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)",
+					"$(SRCROOT)/Libraries",
+					"\"$(SRCROOT)/../../../../pjlib/lib\"",
+					"\"$(SRCROOT)/../../../../pjlib-util/lib\"",
+					"\"$(SRCROOT)/../../../../pjmedia/lib\"",
+					"\"$(SRCROOT)/../../../../pjnath/lib\"",
+					"\"$(SRCROOT)/../../../../pjsip/lib\"",
+					"\"$(SRCROOT)/../../../../third_party/lib\"",
+					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/Libraries",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "com.teluu.ipjsua-swift";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "ipjsua-swift/ipjsua-swift-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		3A6FC61325CBD4540065F472 /* Build configuration list for PBXProject "ipjsua-swift" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				3A6FC62525CBD4550065F472 /* Debug */,
+				3A6FC62625CBD4550065F472 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		3A6FC62725CBD4550065F472 /* Build configuration list for PBXNativeTarget "ipjsua-swift" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				3A6FC62825CBD4550065F472 /* Debug */,
+				3A6FC62925CBD4550065F472 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 3A6FC61025CBD4540065F472 /* Project object */;
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/ios-swift/ipjsua-swift.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/main.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/main.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/main.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/main.c	2022-02-24 07:54:38.000000000 +0000
@@ -80,7 +80,37 @@
     SetConsoleCtrlHandler(&CtrlHandler, TRUE);
 }
 
+#elif PJ_LINUX || PJ_DARWINOS
+
+#include <execinfo.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+static void print_stack(int sig)
+{
+    void *array[16];
+    size_t size;
+
+    size = backtrace(array, 16);
+    fprintf(stderr, "Error: signal %d:\n", sig);
+    backtrace_symbols_fd(array, size, STDERR_FILENO);
+    exit(1);
+}
+
+static void setup_socket_signal()
+{
+    signal(SIGPIPE, SIG_IGN);
+}
+
+static void setup_signal_handler(void)
+{
+    signal(SIGSEGV, &print_stack);
+    signal(SIGABRT, &print_stack);
+}
+
 #else
+
 #include <signal.h>
 
 static void setup_socket_signal()
@@ -89,6 +119,7 @@
 }
 
 static void setup_signal_handler(void) {}
+
 #endif
 
 int main_func(int argc, char *argv[])
@@ -126,5 +157,7 @@
 
 int main(int argc, char *argv[])
 {
+    pj_log_set_level(1);
+
     return pj_run_app(&main_func, argc, argv, 0);
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app.c	2022-02-24 07:54:38.000000000 +0000
@@ -205,8 +205,10 @@
 	    find_next_call();
 	}
 
-	/* Dump media state upon disconnected */
-	if (1) {
+	/* Dump media state upon disconnected.
+	 * Now pjsua_media_channel_deinit() automatically log the call dump.
+	 */
+	if (0) {
 	    PJ_LOG(5,(THIS_FILE, 
 		      "Call %d disconnected, dumping media stats..", 
 		      call_id));
@@ -271,6 +273,24 @@
     }
 }
 
+/*
+ * Handler when audio stream is destroyed.
+ */
+static void on_stream_destroyed(pjsua_call_id call_id,
+                                pjmedia_stream *strm,
+				unsigned stream_idx)
+{
+    PJ_UNUSED_ARG(strm);
+
+    /* Now pjsua_media_channel_deinit() automatically log the call dump. */
+    if (0) {
+	PJ_LOG(5,(THIS_FILE, 
+		  "Call %d stream %d destroyed, dumping media stats..", 
+		  call_id, stream_idx));
+	log_call_dump(call_id);
+    }
+}
+
 /**
  * Handler when there is incoming call.
  */
@@ -288,8 +308,7 @@
 	current_call = call_id;
 
 #ifdef USE_GUI
-    if (!showNotification(call_id))
-	return;
+    showNotification(call_id);
 #endif
 
     /* Start ringback */
@@ -383,6 +402,10 @@
 
 	call_conf_slot = ci->media[mi].stream.aud.conf_slot;
 
+	/* Make sure conf slot is valid (e.g: media dir is not "inactive") */
+	if (call_conf_slot == PJSUA_INVALID_ID)
+	    return;
+
 	/* Loopback sound, if desired */
 	if (app_config.auto_loop) {
 	    pjsua_conf_connect(call_conf_slot, call_conf_slot);
@@ -822,9 +845,11 @@
     case PJSIP_TP_STATE_DISCONNECTED:
 	{
 	    char buf[100];
+	    int len;
 
-	    snprintf(buf, sizeof(buf), "SIP %s transport is disconnected "
-		    "from %s", tp->type_name, host_port);
+	    len = pj_ansi_snprintf(buf, sizeof(buf), "SIP %s transport is "
+	    	      "disconnected from %s", tp->type_name, host_port);
+	    PJ_CHECK_TRUNC_STR(len, buf, sizeof(buf));
 	    pjsua_perror(THIS_FILE, buf, info->status);
 	}
 	break;
@@ -1152,8 +1177,12 @@
     srv->hvalue = pj_str("pjsua simple registrar");
     pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)srv);
 
-    pjsip_endpt_send_response2(pjsua_get_pjsip_endpt(),
+    status = pjsip_endpt_send_response2(pjsua_get_pjsip_endpt(),
 		       rdata, tdata, NULL, NULL);
+	if (status != PJ_SUCCESS) {
+	    pjsip_tx_data_dec_ref(tdata);
+	}
+
 }
 
 /*****************************************************************************
@@ -1227,8 +1256,9 @@
 	pjsip_msg_add_hdr(tdata->msg, h);
     }
 
-    pjsip_endpt_send_response2(pjsua_get_pjsip_endpt(), rdata, tdata, 
+    status = pjsip_endpt_send_response2(pjsua_get_pjsip_endpt(), rdata, tdata, 
 			       NULL, NULL);
+	    if (status != PJ_SUCCESS) pjsip_tx_data_dec_ref(tdata);
 
     return PJ_TRUE;
 }
@@ -1315,6 +1345,7 @@
     return 0;
 }
 
+
 static pj_status_t app_init(void)
 {
     pjsua_transport_id transport_id = -1;
@@ -1349,6 +1380,7 @@
 
     /* Initialize application callbacks */
     app_config.cfg.cb.on_call_state = &on_call_state;
+    app_config.cfg.cb.on_stream_destroyed = &on_stream_destroyed;
     app_config.cfg.cb.on_call_media_state = &on_call_media_state;
     app_config.cfg.cb.on_incoming_call = &on_incoming_call;
     app_config.cfg.cb.on_dtmf_digit2 = &call_on_dtmf_callback2;
@@ -2013,11 +2045,15 @@
 
     /* Close avi devs and ports */
     for (i=0; i<app_config.avi_cnt; ++i) {
-	if (app_config.avi[i].slot != PJSUA_INVALID_ID)
+	if (app_config.avi[i].slot != PJSUA_INVALID_ID) {
 	    pjsua_conf_remove_port(app_config.avi[i].slot);
+	    app_config.avi[i].slot = PJSUA_INVALID_ID;
+	}
 #if PJMEDIA_HAS_VIDEO && PJMEDIA_VIDEO_DEV_HAS_AVI
-	if (app_config.avi[i].dev_id != PJMEDIA_VID_INVALID_DEV)
+	if (app_config.avi[i].dev_id != PJMEDIA_VID_INVALID_DEV) {
 	    pjmedia_avi_dev_free(app_config.avi[i].dev_id);
+	    app_config.avi[i].dev_id = PJMEDIA_VID_INVALID_DEV;
+	}
 #endif
     }
 
@@ -2039,9 +2075,26 @@
 	app_config.ring_port = NULL;
     }
 
+    /* Close wav player */
+    if (app_config.wav_id != PJSUA_INVALID_ID) {
+	pjsua_player_destroy(app_config.wav_id);
+	app_config.wav_id = PJSUA_INVALID_ID;
+	app_config.wav_port = PJSUA_INVALID_ID;
+    }
+
+    /* Close wav recorder */
+    if (app_config.rec_id != PJSUA_INVALID_ID) {
+	pjsua_recorder_destroy(app_config.rec_id);
+	app_config.rec_id = PJSUA_INVALID_ID;
+	app_config.rec_port = PJSUA_INVALID_ID;
+    }
+
     /* Close tone generators */
     for (i=0; i<app_config.tone_count; ++i) {
-	pjsua_conf_remove_port(app_config.tone_slots[i]);
+	if (app_config.tone_slots[i] != PJSUA_INVALID_ID) {
+	    pjsua_conf_remove_port(app_config.tone_slots[i]);
+	    app_config.tone_slots[i] = PJSUA_INVALID_ID;
+	}
     }
 
     pj_pool_safe_release(&app_config.pool);
@@ -2061,6 +2114,8 @@
 
     /* Reset config */
     pj_bzero(&app_config, sizeof(app_config));
+    app_config.wav_id = PJSUA_INVALID_ID;
+    app_config.rec_id = PJSUA_INVALID_ID;
 
     if (use_cli) {    
 	app_config.use_cli = use_cli;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_cli.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_cli.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_cli.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_cli.c	2022-02-24 07:54:38.000000000 +0000
@@ -452,9 +452,10 @@
 
     for (i=0; i<count; ++i) {
 	char slot_id[8];
-	char desc[256];
+	char desc[512];
 	char txlist[256];
 	unsigned j;
+	int len;
 	pjsua_conf_port_info info;
 
 	pjsua_conf_get_port_info(id[i], &info);
@@ -470,7 +471,7 @@
 	    pj_ansi_strcat(txlist, s);
 	}
 
-	pj_ansi_snprintf(desc,
+	len = pj_ansi_snprintf(desc,
 	       sizeof(desc),
 	       "[%2dKHz/%dms/%d] %20.*s  transmitting to: %s",
 	       info.clock_rate/1000,
@@ -479,6 +480,7 @@
 	       (int)info.name.slen,
 	       info.name.ptr,
 	       txlist);
+	PJ_CHECK_TRUNC_STR(len, desc, sizeof(desc));
 
 	pj_strdup2(param->pool, &param->choice[param->cnt].desc, desc);
 	if (++param->cnt >= param->max_cnt)
@@ -493,22 +495,28 @@
 	unsigned i, count = PJ_ARRAY_SIZE(c);
 	char codec_id[64];
 	char desc[128];
+	pj_str_t all_codec_id = pj_str("*");
 
 	pjsua_enum_codecs(c, &count);
-	for (i=0; i<count; ++i) {
-	    pj_ansi_snprintf(codec_id, sizeof(codec_id),
-			     "%.*s", (int)c[i].codec_id.slen,
-			     c[i].codec_id.ptr);
+	for (i=0; i<=count; ++i) {
+	    pj_str_t cid;
+	    cid = (i==count?all_codec_id : c[i].codec_id);
 
-	    pj_strdup2(param->pool, &param->choice[param->cnt].value, codec_id);
-
-	    pj_ansi_snprintf(desc, sizeof(desc),
-			     "Audio, prio: %d%s%.*s",
-			     c[i].priority,
-			     c[i].desc.slen? " - ":"",
-			     (int)c[i].desc.slen,
-			     c[i].desc.ptr);
+	    pj_ansi_snprintf(codec_id, sizeof(codec_id),
+			     "%.*s", (int)cid.slen, cid.ptr);
 
+	    if (i < count) {
+		pj_ansi_snprintf(desc, sizeof(desc),
+				 "Audio, prio: %d%s%.*s",
+				 c[i].priority,
+				 c[i].desc.slen ? " - " : "",
+				 (int)c[i].desc.slen,
+				 c[i].desc.ptr);
+	    } else {
+		pj_ansi_snprintf(desc, sizeof(desc), "Audio (All)");
+	    }
+	    pj_strdup2(param->pool, &param->choice[param->cnt].value,
+		       codec_id);
 	    pj_strdup2(param->pool, &param->choice[param->cnt].desc, desc);
 	    if (++param->cnt >= param->max_cnt)
 		break;
@@ -617,32 +625,45 @@
 	unsigned i, count = PJ_ARRAY_SIZE(ci);
 	char codec_id[64];
 	char desc[128];
+	pj_str_t all_codec_id = pj_str("*");
 
 	pjsua_vid_enum_codecs(ci, &count);
-	for (i=0; i<count; ++i) {
+	for (i = 0; i <= count; ++i) {
 	    pjmedia_vid_codec_param cp;
 	    pjmedia_video_format_detail *vfd;
 	    pj_status_t status = PJ_SUCCESS;
+	    pj_str_t cur_ci;
 
-	    status = pjsua_vid_codec_get_param(&ci[i].codec_id, &cp);
-	    if (status != PJ_SUCCESS)
-		continue;
+	    pj_bzero(&cur_ci, sizeof(cur_ci));
+	    if (i < count) {
+		status = pjsua_vid_codec_get_param(&ci[i].codec_id, &cp);
+		if (status != PJ_SUCCESS)
+		    continue;
+
+		cur_ci = ci[i].codec_id;
 
+	    } else {
+		cur_ci = all_codec_id;
+	    }
 	    vfd = pjmedia_format_get_video_format_detail(&cp.enc_fmt, PJ_TRUE);
 
 	    pj_ansi_snprintf(codec_id, sizeof(codec_id),
-			     "%.*s", (int)ci[i].codec_id.slen,
-			     ci[i].codec_id.ptr);
+			     "%.*s", (int)cur_ci.slen,
+			     cur_ci.ptr);
 
-	    pj_strdup2(param->pool, &param->choice[param->cnt].value, codec_id);
-
-	    pj_ansi_snprintf(desc, sizeof(desc),
-	    		     "Video, p[%d], f[%.2f], b[%d/%d], s[%dx%d]",
-	    		     ci[i].priority,
-			     (vfd->fps.num*1.0/vfd->fps.denum),
-			     vfd->avg_bps/1000, vfd->max_bps/1000,
-			     vfd->size.w, vfd->size.h);
+	    if (i < count) {
+		pj_ansi_snprintf(desc, sizeof(desc),
+				 "Video, p[%d], f[%.2f], b[%d/%d], s[%dx%d]",
+				 ci[i].priority,
+				 (vfd->fps.num*1.0 / vfd->fps.denum),
+				 vfd->avg_bps / 1000, vfd->max_bps / 1000,
+				 vfd->size.w, vfd->size.h);
+	    } else {
+		pj_ansi_snprintf(desc, sizeof(desc), "Video (All)");
+	    }
 
+	    pj_strdup2(param->pool, &param->choice[param->cnt].value,
+		       codec_id);
 	    pj_strdup2(param->pool, &param->choice[param->cnt].desc, desc);
 	    if (++param->cnt >= param->max_cnt)
 		break;
@@ -775,7 +796,7 @@
     acc_cfg.id = cval->argv[1];
     acc_cfg.reg_uri = cval->argv[2];
     acc_cfg.cred_count = 1;
-    acc_cfg.cred_info[0].scheme = pj_str("Digest");
+    acc_cfg.cred_info[0].scheme = pjsip_DIGEST_STR;
     acc_cfg.cred_info[0].realm = cval->argv[3];
     acc_cfg.cred_info[0].username = cval->argv[4];
     acc_cfg.cred_info[0].data_type = 0;
@@ -798,7 +819,7 @@
     char out_str[64];
     unsigned str_len;
 
-    int i = my_atoi(cval->argv[1].ptr);
+    int i = my_atoi2(&cval->argv[1]);
 
     if (!pjsua_acc_is_valid(i)) {
 	pj_ansi_snprintf(out_str, sizeof(out_str),
@@ -839,7 +860,7 @@
 /* Select account to be used for sending outgoing request */
 static pj_status_t cmd_next_account(pj_cli_cmd_val *cval)
 {
-    int i = my_atoi(cval->argv[1].ptr);
+    int i = my_atoi2(&cval->argv[1]);
     if (pjsua_acc_is_valid(i)) {
 	pjsua_acc_set_default(i);
 	PJ_LOG(3,(THIS_FILE, "Current account changed to %d", i));
@@ -967,7 +988,7 @@
 /* Delete buddy */
 static pj_status_t cmd_del_buddy(pj_cli_cmd_val *cval)
 {
-    int i = my_atoi(cval->argv[1].ptr) - 1;
+    int i = my_atoi2(&cval->argv[1]) - 1;
     char out_str[80];
 
     if (!pjsua_buddy_is_valid(i)) {
@@ -1777,8 +1798,6 @@
 	pj_str_t STR_FALSE = { "false", 5 };
 	pjsua_call_id ids[PJSUA_MAX_CALLS];
 	pjsua_msg_data msg_data_;
-	char buf[8] = {0};
-	pj_str_t tmp = pj_str(buf);
 	unsigned count;
 	static const pj_str_t err_invalid_num =
 				    {"Invalid destination call number\n", 32 };
@@ -1794,8 +1813,7 @@
 	    return PJ_SUCCESS;
 	}
 
-	pj_strncpy_with_null(&tmp, &cval->argv[1], sizeof(buf));
-	dst_call = my_atoi(tmp.ptr);
+	dst_call = my_atoi2(&cval->argv[1]);
 
 	/* Check if call is still there. */
 	if (call != current_call) {
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_common.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_common.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_common.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_common.c	2022-02-24 07:54:38.000000000 +0000
@@ -45,8 +45,15 @@
 int my_atoi(const char *cs)
 {
     pj_str_t s;
-
     pj_cstr(&s, cs);
+    return my_atoi2(&s);
+}
+
+int my_atoi2(const pj_str_t *str)
+{
+    const char *cs = str->ptr;
+    pj_str_t s = *str;
+
     if (cs[0] == '-') {
 	s.ptr++; s.slen--;
 	return 0 - (int)pj_strtoul(&s);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_common.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_common.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_common.h	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_common.h	2022-02-24 07:54:38.000000000 +0000
@@ -169,6 +169,7 @@
 extern pj_bool_t	    app_running;
 
 int my_atoi(const char *cs);
+int my_atoi2(const pj_str_t *s);
 pj_bool_t find_next_call(void);
 pj_bool_t find_prev_call(void);
 void send_request(char *cstr_method, const pj_str_t *dst_uri);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_config.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_config.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_config.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_config.c	2022-02-24 07:54:38.000000000 +0000
@@ -152,7 +152,7 @@
     puts  ("  --ec-tail=MSEC      Set echo canceller tail length (default="
 	   			  xstr(PJSUA_DEFAULT_EC_TAIL_LEN) ")");
     puts  ("  --ec-opt=OPT        Select echo canceller algorithm (0=default, ");
-    puts  ("                        1=speex, 2=suppressor, 3=WebRtc)");
+    puts  ("                        1=speex, 2=suppressor, 3=WebRtc, 4=WebRtc AEC3)");
     puts  ("  --ilbc-mode=MODE    Set iLBC codec mode (20 or 30, default is "
     				  xstr(PJSUA_DEFAULT_ILBC_MODE) ")");
     puts  ("  --capture-dev=id    Audio capture device ID (default=-1)");
@@ -182,6 +182,7 @@
     puts  ("Media Transport Options:");
     puts  ("  --use-ice           Enable ICE (default:no)");
     puts  ("  --ice-regular       Use ICE regular nomination (default: aggressive)");
+    puts  ("  --ice-trickle=N     Use trickle ICE? 0:disabled, 1:half, 2:full (default=0)");
     puts  ("  --ice-max-hosts=N   Set maximum number of ICE host candidates");
     puts  ("  --ice-no-rtcp       Disable RTCP component in ICE (default: no)");
     puts  ("  --rtp-port=N        Base port to try for RTP (default=4000)");
@@ -370,7 +371,8 @@
 	   OPT_ADD_BUDDY, OPT_OFFER_X_MS_MSG, OPT_NO_PRESENCE,
 	   OPT_AUTO_ANSWER, OPT_AUTO_PLAY, OPT_AUTO_PLAY_HANGUP, OPT_AUTO_LOOP,
 	   OPT_AUTO_CONF, OPT_CLOCK_RATE, OPT_SND_CLOCK_RATE, OPT_STEREO,
-	   OPT_USE_ICE, OPT_ICE_REGULAR, OPT_USE_SRTP, OPT_SRTP_SECURE,
+	   OPT_USE_ICE, OPT_ICE_REGULAR, OPT_ICE_TRICKLE,
+	   OPT_USE_SRTP, OPT_SRTP_SECURE,
 	   OPT_USE_TURN, OPT_ICE_MAX_HOSTS, OPT_ICE_NO_RTCP, OPT_TURN_SRV,
 	   OPT_TURN_TCP, OPT_TURN_USER, OPT_TURN_PASSWD, OPT_TURN_TLS, 
 	   OPT_TURN_TLS_CA_FILE, OPT_TURN_TLS_CERT_FILE, 
@@ -462,9 +464,10 @@
 
 	{ "use-ice",    0, 0, OPT_USE_ICE},
 	{ "ice-regular",0, 0, OPT_ICE_REGULAR},
-	{ "use-turn",	0, 0, OPT_USE_TURN},
+	{ "ice-trickle",1, 0, OPT_ICE_TRICKLE},
 	{ "ice-max-hosts",1, 0, OPT_ICE_MAX_HOSTS},
 	{ "ice-no-rtcp",0, 0, OPT_ICE_NO_RTCP},
+	{ "use-turn",	0, 0, OPT_USE_TURN},
 	{ "turn-srv",	1, 0, OPT_TURN_SRV},
 	{ "turn-tcp",	0, 0, OPT_TURN_TCP},
 #if PJ_HAS_SSL_SOCK
@@ -635,7 +638,9 @@
 
 	case OPT_NO_STDERR:
 #if !defined(PJ_WIN32_WINCE) || PJ_WIN32_WINCE==0
-	    freopen("/dev/null", "w", stderr);
+	    if (!freopen("/dev/null", "w", stderr)) {
+		PJ_LOG(4,(THIS_FILE, "Failed reopening dev/null"));
+	    }
 #endif
 	    break;
 
@@ -883,7 +888,7 @@
 
 	case OPT_USERNAME:   /* Default authentication user */
 	    cur_acc->cred_info[cur_acc->cred_count].username = pj_str(pj_optarg);
-	    cur_acc->cred_info[cur_acc->cred_count].scheme = pj_str("Digest");
+	    cur_acc->cred_info[cur_acc->cred_count].scheme = pjsip_DIGEST_STR;
 	    break;
 
 	case OPT_REALM:	    /* Default authentication realm. */
@@ -1007,6 +1012,22 @@
 		    cur_acc->ice_cfg.ice_opt.aggressive = PJ_FALSE;
 	    break;
 
+	case OPT_ICE_TRICKLE:
+	    cfg->media_cfg.ice_opt.trickle =
+		    cur_acc->ice_cfg.ice_opt.trickle = my_atoi(pj_optarg);
+
+	    if (!pj_isdigit(*pj_optarg) || cfg->media_cfg.ice_opt.trickle>2) {
+		PJ_LOG(1,(THIS_FILE, "Invalid value for --ice-trickle option"));
+		return -1;
+	    }
+
+	    /* Automatically disable ICE aggressive mode */
+	    if (cfg->media_cfg.ice_opt.trickle > 0) {
+		cfg->media_cfg.ice_opt.aggressive =
+			cur_acc->ice_cfg.ice_opt.aggressive = PJ_FALSE;
+	    }
+	    break;
+
 	case OPT_USE_TURN:
 	    cfg->media_cfg.enable_turn =
 		    cur_acc->turn_cfg.enable_turn = PJ_TRUE;
@@ -1249,6 +1270,8 @@
 
 	case OPT_EC_OPT:
 	    cfg->media_cfg.ec_options = my_atoi(pj_optarg);
+	    if (cfg->media_cfg.ec_options > 0)
+	    	cfg->media_cfg.ec_options |= PJMEDIA_ECHO_USE_SW_ECHO;
 	    break;
 
 	case OPT_QUALITY:
@@ -1830,6 +1853,12 @@
     if (acc_cfg->ice_cfg.ice_opt.aggressive == PJ_FALSE)
 	pj_strcat2(result, "--ice-regular\n");
 
+    if (acc_cfg->ice_cfg.ice_opt.trickle > 0) {
+	pj_ansi_sprintf(line, "--ice-trickle %d\n",
+			acc_cfg->ice_cfg.ice_opt.trickle);
+	pj_strcat2(result, line);
+    }
+
     if (acc_cfg->turn_cfg.enable_turn)
 	pj_strcat2(result, "--use-turn\n");
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_legacy.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_legacy.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_legacy.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/pjsua_app_legacy.c	2022-02-24 07:54:38.000000000 +0000
@@ -296,7 +296,7 @@
     puts("| vid win show|hide ID      Show/hide the specified video window ID           |");
     puts("| vid win move ID X Y       Move window ID to position X,Y                    |");
     puts("| vid win resize ID w h     Resize window ID to the specified width, height   |");
-    puts("| vid win full on|off ID    Set fullscreen on/off for window ID               |");
+    puts("| vid win full off|on|dt ID Set fullscreen off/on/desktop for window ID	|");
     puts("| vid conf list             List all video ports in video conference bridge   |");
     puts("| vid conf cc P Q           Connect port P to Q in the video conf bridge      |");
     puts("| vid conf cd P Q           Disconnect port P to Q in the video conf bridge   |");
@@ -308,7 +308,7 @@
 
 static void vid_handle_menu(char *menuin)
 {
-    char *argv[8];
+    char *argv[8] = {NULL};
     int argc = 0;
 
     /* Tokenize */
@@ -503,8 +503,12 @@
 	} else if (argc==5 && (strcmp(argv[2], "full")==0))
 	{
 	    pjsua_vid_win_id wid = atoi(argv[4]);
-	    pj_bool_t fullscreen = (strcmp(argv[3], "on")==0);
-	    status = pjsua_vid_win_set_fullscreen(wid, fullscreen);
+	    pjmedia_vid_dev_fullscreen_flag mode = PJMEDIA_VID_DEV_WINDOWED;
+	    if (strcmp(argv[3], "on")==0)
+		mode = PJMEDIA_VID_DEV_FULLSCREEN;
+	    else if (strcmp(argv[3], "dt")==0)
+		mode = PJMEDIA_VID_DEV_FULLSCREEN_DESKTOP;
+	    status = pjsua_vid_win_set_fullscreen(wid, mode);
 	} else
 	    goto on_error;
 
@@ -1002,7 +1006,7 @@
     acc_cfg.id = pj_str(id);
     acc_cfg.reg_uri = pj_str(registrar);
     acc_cfg.cred_count = 1;
-    acc_cfg.cred_info[0].scheme = pj_str("Digest");
+    acc_cfg.cred_info[0].scheme = pjsip_DIGEST_STR;
     acc_cfg.cred_info[0].realm = pj_str(realm);
     acc_cfg.cred_info[0].username = pj_str(uname);
     acc_cfg.cred_info[0].data_type = 0;
@@ -1591,7 +1595,7 @@
 static void ui_conf_list()
 {
     unsigned i, count;
-    pjsua_conf_port_id id[PJSUA_MAX_CALLS];
+    pjsua_conf_port_id id[PJSUA_MAX_CONF_PORTS];
 
     printf("Conference ports:\n");
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/cli/uwp/pjsua_cli_uwp.csproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/cli/uwp/pjsua_cli_uwp.csproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/cli/uwp/pjsua_cli_uwp.csproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/cli/uwp/pjsua_cli_uwp.csproj	2022-02-24 07:54:38.000000000 +0000
@@ -146,7 +146,7 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Condition="'$(API_Family)'=='UWP'" Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/cli/wp8/pjsua_cli_wp8.csproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/cli/wp8/pjsua_cli_wp8.csproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/cli/wp8/pjsua_cli_wp8.csproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/cli/wp8/pjsua_cli_wp8.csproj	2022-02-24 07:54:38.000000000 +0000
@@ -154,8 +154,8 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
+  <Import Condition="'$(API_Family)'=='WinPhone8'" Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
+  <Import Condition="'$(API_Family)'=='WinPhone8'" Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/gui/uwp/Voip/Voip.csproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/gui/uwp/Voip/Voip.csproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/gui/uwp/Voip/Voip.csproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/gui/uwp/Voip/Voip.csproj	2022-02-24 07:54:38.000000000 +0000
@@ -153,7 +153,7 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Condition="'$(API_Family)'=='UWP'" Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipTasks/VoipTasks.csproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipTasks/VoipTasks.csproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipTasks/VoipTasks.csproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua/winrt/gui/uwp/VoipTasks/VoipTasks.csproj	2022-02-24 07:54:38.000000000 +0000
@@ -133,7 +133,7 @@
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Condition="'$(API_Family)'=='UWP'" Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/AppDelegate.swift asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/AppDelegate.swift
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/AppDelegate.swift	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/AppDelegate.swift	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2012-2012 Teluu Inc. (http://www.teluu.com)
+ * Contributed by Emre Tufekci (github.com/emretufekci)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+import UIKit
+
+@main
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+
+
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
+
+    // MARK: UISceneSession Lifecycle
+
+    func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
+        // Called when a new scene session is being created.
+        // Use this method to select a configuration to create the new scene with.
+        return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
+    }
+
+    func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
+        // Called when the user discards a scene session.
+        // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.
+        // Use this method to release any resources that were specific to the discarded scenes, as they will not return.
+    }
+}
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/AccentColor.colorset/Contents.json asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/AccentColor.colorset/Contents.json
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/AccentColor.colorset/Contents.json	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/AccentColor.colorset/Contents.json	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/AppIcon.appiconset/Contents.json asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/AppIcon.appiconset/Contents.json
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/AppIcon.appiconset/Contents.json	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/AppIcon.appiconset/Contents.json	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,98 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/Contents.json asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/Contents.json
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/Contents.json	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Assets.xcassets/Contents.json	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/ActiveViewController.swift asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/ActiveViewController.swift
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/ActiveViewController.swift	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/ActiveViewController.swift	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2012-2012 Teluu Inc. (http://www.teluu.com)
+ * Contributed by Emre Tufekci (github.com/emretufekci)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+import UIKit
+
+
+class ActiveViewController: UIViewController {
+
+    var activeCallId : String = ""
+    @IBOutlet weak var holdButton: UIButton!
+    
+    var holdFlag : Bool = false
+    @IBOutlet weak var activeCallTitle: UILabel!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        activeCallTitle.text = activeCallId
+    }
+    
+    override func viewDidDisappear(_ animated: Bool) {
+        CPPWrapper().hangupCall();
+        call_status_listener_swift(call_answer_code: 1);
+    }
+    
+    @IBAction func hangupClick(_ sender: UIButton) {
+        CPPWrapper().hangupCall()
+        self.view.window!.rootViewController?.dismiss(animated: true, completion: nil)
+    }
+    
+    @IBAction func holdClick(_ sender: Any) {
+        
+        if(holdFlag == false){
+            CPPWrapper().holdCall()
+            holdButton.setTitle("Unhold", for: .normal)
+        } else if (holdFlag == true) {
+            CPPWrapper().unholdCall()
+            holdButton.setTitle("Hold", for: .normal)
+        }
+        
+        //switch hold flag
+        holdFlag = !holdFlag
+    
+    }
+    
+ 
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/IncomingViewController.swift asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/IncomingViewController.swift
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/IncomingViewController.swift	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/IncomingViewController.swift	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2012-2012 Teluu Inc. (http://www.teluu.com)
+ * Contributed by Emre Tufekci (github.com/emretufekci)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+import UIKit
+
+
+
+class IncomingViewController: UIViewController {
+
+    var incomingCallId : String = ""
+    @IBOutlet weak var callTitle: UILabel!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        title = "Gelen Arama"
+        callTitle.text = incomingCallId
+        
+        CPPWrapper().call_listener_wrapper(call_status_listener_swift)
+    }
+    
+    override func viewDidDisappear(_ animated: Bool) {
+        CPPWrapper().hangupCall();
+    }
+    
+    
+    @IBAction func hangupClick(_ sender: UIButton) {
+        CPPWrapper().hangupCall();
+        self.dismiss(animated: true, completion: nil)
+    }
+    
+    
+    @IBAction func answerClick(_ sender: UIButton) {
+        CPPWrapper().answerCall();
+    }
+
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/OutgoingViewController.swift asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/OutgoingViewController.swift
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/OutgoingViewController.swift	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/OutgoingViewController.swift	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2012-2012 Teluu Inc. (http://www.teluu.com)
+ * Contributed by Emre Tufekci (github.com/emretufekci)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+import UIKit
+
+
+class OutgoingViewController: UIViewController {
+    
+    var outgoingCallId : String = ""
+    
+    @IBOutlet weak var outgoingCallTitle: UILabel!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        title = "Outgoing Call"
+        outgoingCallTitle.text = outgoingCallId
+        CPPWrapper().outgoingCall(outgoingCallId)
+        CPPWrapper().call_listener_wrapper(call_status_listener_swift)
+    }
+    
+    override func viewDidDisappear(_ animated: Bool) {
+        CPPWrapper().hangupCall();
+    }
+    
+    @IBAction func hangupClick(_ sender: UIButton) {
+        CPPWrapper().hangupCall();
+        self.dismiss(animated: true, completion: nil)
+    }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/ViewController.swift asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/ViewController.swift
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/ViewController.swift	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Controller/ViewController.swift	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2012-2012 Teluu Inc. (http://www.teluu.com)
+ * Contributed by Emre Tufekci (github.com/emretufekci)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+import UIKit
+
+
+
+class ViewController: UIViewController {
+    
+    // Status Label
+    @IBOutlet weak var statusLabel: UILabel!
+    
+    // Sip settings Text Fields
+    @IBOutlet weak var sipIpTField: UITextField!
+    @IBOutlet weak var sipPortTField: UITextField!
+    @IBOutlet weak var sipUsernameTField: UITextField!
+    @IBOutlet weak var sipPasswordTField: UITextField!
+    
+    //Destination Uri to Making outgoing call
+    @IBOutlet weak var sipDestinationUriTField: UITextField!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        
+        //Create Lib
+        CPPWrapper().createLibWrapper()
+        
+        //Listen incoming call via function pointer
+        CPPWrapper().incoming_call_wrapper(incoming_call_swift)
+     
+        //Done button to the keyboard
+        sipIpTField.addDoneButtonOnKeyboard()
+        sipPortTField.addDoneButtonOnKeyboard()
+        sipUsernameTField.addDoneButtonOnKeyboard()
+        sipPasswordTField.addDoneButtonOnKeyboard()
+        sipDestinationUriTField.addDoneButtonOnKeyboard()
+    }
+    
+    
+    //Refresh Button
+    @IBAction func refreshStatus(_ sender: UIButton) {
+        if (CPPWrapper().registerStateInfoWrapper()){
+            statusLabel.text = "Sip Status: REGISTERED"
+        }else {
+            statusLabel.text = "Sip Status: NOT REGISTERED"
+        }
+    }
+    
+    
+    //Login Button
+    @IBAction func loginClick(_ sender: UIButton) {
+        
+        //Check user already logged in. && Form is filled
+        if (CPPWrapper().registerStateInfoWrapper() == false
+                && !sipUsernameTField.text!.isEmpty
+                && !sipPasswordTField.text!.isEmpty
+                && !sipIpTField.text!.isEmpty
+                && !sipPortTField.text!.isEmpty){
+            
+            //Register to the user
+            CPPWrapper().createAccountWrapper(
+                sipUsernameTField.text,
+                sipPasswordTField.text,
+                sipIpTField.text,
+                sipPortTField.text)
+
+            
+        } else {
+            let alert = UIAlertController(title: "SIP SETTINGS ERROR", message: "Please fill the form / Logout", preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { action in
+                switch action.style{
+                    case .default:
+                    print("default")
+                    
+                    case .cancel:
+                    print("cancel")
+                    
+                    case .destructive:
+                    print("destructive")
+                    
+                @unknown default:
+                    fatalError()
+                }
+            }))
+            self.present(alert, animated: true, completion: nil)
+        }
+        
+        //Wait until register/unregister
+        sleep(2)
+        if (CPPWrapper().registerStateInfoWrapper()){
+            statusLabel.text = "Sip Status: REGISTERED"
+        } else {
+            statusLabel.text = "Sip Status: NOT REGISTERED"
+        }
+
+    }
+    
+    //Logout Button
+    @IBAction func logoutClick(_ sender: UIButton) {
+        
+        /**
+        Only unregister from an account.
+         */
+        //Unregister
+        CPPWrapper().unregisterAccountWrapper()
+        
+        //Wait until register/unregister
+        sleep(2)
+        if (CPPWrapper().registerStateInfoWrapper()){
+            statusLabel.text = "Sip Status: REGISTERED"
+        } else {
+            statusLabel.text = "Sip Status: NOT REGISTERED"
+        }
+    }
+
+    //Call Button
+    @IBAction func callClick(_ sender: UIButton) {
+        
+        if(CPPWrapper().registerStateInfoWrapper() != false){            
+            let vcToPresent = self.storyboard!.instantiateViewController(withIdentifier: "outgoingCallVC") as! OutgoingViewController
+            vcToPresent.outgoingCallId = sipDestinationUriTField.text ?? "<SIP-NUMBER>"
+            self.present(vcToPresent, animated: true, completion: nil)
+        }else {
+            let alert = UIAlertController(title: "Outgoing Call Error", message: "Please register to be able to make call", preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { action in
+                switch action.style{
+                    case .default:
+                    print("default")
+                    
+                    case .cancel:
+                    print("cancel")
+                    
+                    case .destructive:
+                    print("destructive")
+                    
+                @unknown default:
+                    fatalError()
+                }
+            }))
+            self.present(alert, animated: true, completion: nil)
+        }
+
+    }
+    
+    
+}
+extension UITextField{
+    @IBInspectable var doneAccessory: Bool{
+        get{
+            return self.doneAccessory
+        }
+        set (hasDone) {
+            if hasDone{
+                addDoneButtonOnKeyboard()
+            }
+        }
+    }
+
+    func addDoneButtonOnKeyboard()
+    {
+        let doneToolbar: UIToolbar = UIToolbar(frame: CGRect.init(x: 0, y: 0, width: UIScreen.main.bounds.width, height: 50))
+        doneToolbar.barStyle = .default
+
+        let flexSpace = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
+        let done: UIBarButtonItem = UIBarButtonItem(title: "Done", style: .done, target: self, action: #selector(self.doneButtonAction))
+
+        let items = [flexSpace, done]
+        doneToolbar.items = items
+        doneToolbar.sizeToFit()
+
+        self.inputAccessoryView = doneToolbar
+    }
+
+    @objc func doneButtonAction()
+    {
+        self.resignFirstResponder()
+    }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Info.plist asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Info.plist
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Info.plist	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Info.plist	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneConfigurationName</key>
+					<string>Default Configuration</string>
+					<key>UISceneDelegateClassName</key>
+					<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/ios-swift-pjsua2-Bridging-Header.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/ios-swift-pjsua2-Bridging-Header.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/ios-swift-pjsua2-Bridging-Header.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/ios-swift-pjsua2-Bridging-Header.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2012-2012 Teluu Inc. (http://www.teluu.com)
+ * Contributed by Emre Tufekci (github.com/emretufekci)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#import "wrapper.h"
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Model/Model.swift asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Model/Model.swift
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Model/Model.swift	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/Model/Model.swift	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2012-2012 Teluu Inc. (http://www.teluu.com)
+ * Contributed by Emre Tufekci (github.com/emretufekci)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+import UIKit
+
+func topMostController() -> UIViewController {
+    var topController: UIViewController = (UIApplication.shared.windows.first { $0.isKeyWindow }?.rootViewController!)!
+        while (topController.presentedViewController != nil) {
+            topController = topController.presentedViewController!
+        }
+        return topController
+    }
+
+
+    func incoming_call_swift() {
+        DispatchQueue.main.async () {
+            let storyboard = UIStoryboard(name: "Main", bundle: nil)
+            let vc = storyboard.instantiateViewController(withIdentifier: "viewController")
+            let topVC = topMostController()
+            let vcToPresent = vc.storyboard!.instantiateViewController(withIdentifier: "incomingCallVC") as! IncomingViewController
+            vcToPresent.incomingCallId = CPPWrapper().incomingCallInfoWrapper()
+            topVC.present(vcToPresent, animated: true, completion: nil)
+        }
+    }
+
+
+    func call_status_listener_swift ( call_answer_code: Int32) {
+        if (call_answer_code == 0){
+                    DispatchQueue.main.async () {
+                        UIApplication.shared.windows.first { $0.isKeyWindow}?.rootViewController?.dismiss(animated: true, completion: nil)
+                    }
+        }
+        else if (call_answer_code == 1) {
+                    DispatchQueue.main.async () {
+                        let storyboard = UIStoryboard(name: "Main", bundle: nil)
+                        let vc = storyboard.instantiateViewController(withIdentifier: "viewController")
+                        let topVC = topMostController()
+                        let vcToPresent = vc.storyboard!.instantiateViewController(withIdentifier: "activeCallVC") as! ActiveViewController
+                        vcToPresent.activeCallId = CPPWrapper().incomingCallInfoWrapper()
+                        topVC.present(vcToPresent, animated: true, completion: nil)
+                    }
+                }
+        else {
+                print("ERROR CODE:")
+            }
+        }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/CustomPJSUA2.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/CustomPJSUA2.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/CustomPJSUA2.cpp	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/CustomPJSUA2.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,351 @@
+/*
+ * Copyright (C) 2012-2012 Teluu Inc. (http://www.teluu.com)
+ * Contributed by Emre Tufekci (github.com/emretufekci)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "CustomPJSUA2.hpp"
+#include <iostream>
+#include <list>
+
+using namespace pj;
+
+// Listen swift code via function pointers
+void (*incomingCallPtr)() = 0;
+void (*callStatusListenerPtr)(int) = 0;
+
+/**
+ Dispatch queue to manage ios thread serially or concurrently on app's main thread
+ for more information please visit:
+ https://developer.apple.com/documentation/dispatch/dispatchqueue
+ */
+dispatch_queue_t queue;
+
+//Getter & Setter function
+std::string callerId;
+bool registerState = false;
+
+void setCallerId(std::string callerIdStr){
+    callerId = callerIdStr;
+}
+
+std::string getCallerId(){
+    return callerId;
+}
+
+void setRegisterState(bool registerStateBool){
+    registerState = registerStateBool;
+}
+
+bool getRegisterState(){
+    return registerState;
+}
+
+
+//Call object to manage call operations.
+Call *call = NULL;
+
+
+// Subclass to extend the Call and get notifications etc.
+class MyCall : public Call
+{
+public:
+    MyCall(Account &acc, int call_id = PJSUA_INVALID_ID) : Call(acc, call_id)
+    { }
+    ~MyCall()
+    { }
+
+    // Notification when call's state has changed.
+    virtual void onCallState(OnCallStateParam &prm){
+        CallInfo ci = getInfo();
+           if (ci.state == PJSIP_INV_STATE_DISCONNECTED) {
+               callStatusListenerPtr(0);
+               
+               /* Delete the call */
+               delete call;
+               call = NULL;
+           }
+        if (ci.state == PJSIP_INV_STATE_CONFIRMED) {
+            callStatusListenerPtr(1);
+        }
+        
+        setCallerId(ci.remoteUri);
+        
+        //Notify caller ID:
+        PJSua2 pjsua2;
+        pjsua2.incomingCallInfo();
+        
+    }
+
+    // Notification when call's media state has changed.
+    virtual void onCallMediaState(OnCallMediaStateParam &prm){
+        CallInfo ci = getInfo();
+        // Iterate all the call medias
+        for (unsigned i = 0; i < ci.media.size(); i++) {
+            if (ci.media[i].type==PJMEDIA_TYPE_AUDIO && getMedia(i)) {
+                AudioMedia *aud_med = (AudioMedia *)getMedia(i);
+                
+                // Connect the call audio media to sound device
+                AudDevManager& mgr = Endpoint::instance().audDevManager();
+                aud_med->startTransmit(mgr.getPlaybackDevMedia());
+                mgr.getCaptureDevMedia().startTransmit(*aud_med);
+            }
+        }
+    }
+};
+
+
+// Subclass to extend the Account and get notifications etc.
+class MyAccount : public Account {
+    public:
+    MyAccount() {}
+    ~MyAccount()
+    {
+    // Invoke shutdown() first..
+    shutdown();
+    // ..before deleting any member objects.
+    }
+    
+    
+    // This is getting for register status!
+    virtual void onRegState(OnRegStateParam &prm);
+    
+    // This is getting for incoming call (We can either answer or hangup the incoming call)
+    virtual void onIncomingCall(OnIncomingCallParam &iprm);
+};
+
+
+//Creating objects
+Endpoint *ep = new Endpoint;
+MyAccount *acc = new MyAccount;
+
+void MyAccount::onRegState(OnRegStateParam &prm){
+    AccountInfo ai = getInfo();
+    std::cout << (ai.regIsActive? "*** Register: code=" : "*** Unregister: code=") << prm.code << std::endl;
+    PJSua2 pjsua2;
+    setRegisterState(ai.regIsActive);
+    pjsua2.registerStateInfo();
+
+}
+
+void MyAccount::onIncomingCall(OnIncomingCallParam &iprm) {
+    incomingCallPtr();
+    call = new MyCall(*this, iprm.callId);
+}
+
+
+/**
+ Create Lib with EpConfig
+ */
+void PJSua2::createLib() {
+    try {
+        ep->libCreate();
+    } catch (Error& err){
+        std::cout << "Startup error: " << err.info() << std::endl;
+    }
+    
+    //LibInit
+    try {
+        EpConfig ep_cfg;
+        ep->libInit( ep_cfg );
+    
+    } catch(Error& err) {
+        std::cout << "Initialization error: " << err.info() << std::endl;
+    }
+    
+    // Create SIP transport. Error handling sample is shown
+    try {
+    TransportConfig tcfg;
+    tcfg.port = 5060;
+    TransportId tid = ep->transportCreate(PJSIP_TRANSPORT_UDP, tcfg);
+        
+    } catch(Error& err) {
+    std::cout << "Transport creation error: " << err.info() << std::endl;
+    }
+
+    // Start the library (worker threads etc)
+    try { ep->libStart();
+    } catch(Error& err) {
+    std::cout << "Startup error: " << err.info() << std::endl;
+    }
+}
+
+
+/**
+ Delete lib
+ */
+void PJSua2::deleteLib() {
+    
+    // Here we don't have anything else to do..
+    pj_thread_sleep(500);
+    
+    // Delete the account. This will unregister from server
+    delete acc;
+    
+    ep->libDestroy();
+    delete ep;
+}
+
+
+/**
+ Create Account via following config(string username, string password, string ip, string port)
+ */
+void PJSua2::createAccount(std::string username, std::string password, std::string ip, std::string port) {
+    
+    // Configure an AccountConfig
+    AccountConfig acfg;
+    acfg.idUri = "sip:" + username + "@" + ip + ":" + port;
+    acfg.regConfig.registrarUri = "sip:" + ip + ":" + port;
+    AuthCredInfo cred("digest", "*", username, 0, password);
+    acfg.sipConfig.authCreds.push_back(cred);
+    
+    
+    //  TODO:: GET ID -1 IS EXPERIMENTAL, NOT SURE THAT, IT IS GOOD WAY TO CHECK ACC IS CREATED. FIX IT!
+    if(acc->getId() == -1){
+        // Create the account
+        try {
+            acc->create(acfg);
+        } catch(Error& err) {
+            std::cout << "Account creation error: " << err.info() << std::endl;
+        }
+    }else {
+        // Modify the account
+        try {
+            //Update the registration
+            acc->modify(acfg);
+            acc->setRegistration(true);
+        } catch(Error& err) {
+            std::cout << "Account modify error: " << err.info() << std::endl;
+        }
+    }
+    
+}
+
+
+/**
+ Unregister account
+ */
+void PJSua2::unregisterAccount() {
+    acc->setRegistration(false);
+}
+
+
+/**
+ Get register state true / false
+ */
+bool PJSua2::registerStateInfo(){
+    return getRegisterState();
+}
+
+
+/**
+ Get caller id for incoming call, checks account currently registered (ai.regIsActive)
+ */
+std::string PJSua2::incomingCallInfo() {
+    return getCallerId();
+}
+
+
+/**
+ Listener (When we have incoming call, this function pointer will notify swift.)
+ */
+void PJSua2::incoming_call(void (* funcpntr)()){
+    incomingCallPtr = funcpntr;
+}
+
+
+/**
+ Listener (When we have changes on the call state, this function pointer will notify swift.)
+ */
+void PJSua2::call_listener(void (* funcpntr)(int)){
+    callStatusListenerPtr = funcpntr;
+}
+
+
+/**
+ Answer incoming call
+ */
+void PJSua2::answerCall(){
+    CallOpParam op;
+    op.statusCode = PJSIP_SC_OK;
+    call->answer(op);
+}
+
+
+/**
+ Hangup active call (Incoming/Outgoing/Active)
+ */
+void PJSua2::hangupCall(){
+    
+    if (call != NULL) {
+        CallOpParam op;
+        op.statusCode = PJSIP_SC_DECLINE;
+        call->hangup(op);
+        delete call;
+        call = NULL;
+    }
+}
+
+/**
+ Hold the call
+ */
+void PJSua2::holdCall(){
+    
+    if (call != NULL) {
+        CallOpParam op;
+        
+        try {
+            call->setHold(op);
+        } catch(Error& err) {
+            std::cout << "Hold error: " << err.info() << std::endl;
+        }
+    }
+    
+}
+
+/**
+ Unhold the call
+ */
+void PJSua2::unholdCall(){
+
+    if (call != NULL) {
+        
+        CallOpParam op;
+        op.opt.flag=PJSUA_CALL_UNHOLD;
+        
+        try {
+            call->reinvite(op);
+        } catch(Error& err) {
+            std::cout << "Unhold/Reinvite error: " << err.info() << std::endl;
+        }
+    }
+    
+}
+/**
+ Make outgoing call (string dest_uri) -> e.g. makeCall(sip:<SIP_USERNAME@SIP_IP:SIP_PORT>)
+ */
+void PJSua2::outgoingCall(std::string dest_uri) {
+    CallOpParam prm(true); // Use default call settings
+    try {
+    call = new MyCall(*acc);
+    call->makeCall(dest_uri, prm);
+    } catch(Error& err) {
+    std::cout << err.info() << std::endl;
+    }
+}
+
+
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/CustomPJSUA2.hpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/CustomPJSUA2.hpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/CustomPJSUA2.hpp	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/CustomPJSUA2.hpp	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2012-2012 Teluu Inc. (http://www.teluu.com)
+ * Contributed by Emre Tufekci (github.com/emretufekci)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <string>
+#include <pjsua2.hpp>
+#include <dispatch/dispatch.h>
+
+/**
+ Create a class to be able to use it from objective-c++
+ */
+class PJSua2{
+public:
+    
+    //Lib
+    /**
+     Create Lib with EpConfig
+     */
+    void createLib();
+    
+    /**
+     Delete lib
+     */
+    void deleteLib();
+    
+    
+    
+    //Account
+    /**
+     Create Account via following config(string username, string password, string ip, string port)
+     */
+    void createAccount(std::string username, std::string password, std::string ip, std::string port);
+    
+    /**
+     Unregister account
+     */
+    void unregisterAccount();
+    
+    
+    
+    //Register State Info
+    /**
+     Get register state true / false
+     */
+    bool registerStateInfo();
+    
+    
+    
+    //Call Info
+    /**
+     Get caller id for incoming call, checks account currently registered (ai.regIsActive)
+     */
+    std::string incomingCallInfo();
+
+    /**
+     Listener (When we have incoming call, this function pointer will notify swift.)
+     */
+    void incoming_call(void(*function)());
+
+    /**
+     Listener (When we have changes on the call state, this function pointer will notify swift.)
+     */
+    void call_listener(void(*function)(int));
+    
+    /**
+     Answer incoming call
+     */
+    void answerCall();
+    
+    /**
+     Hangup active call (Incoming/Outgoing/Active)
+     */
+    void hangupCall();
+
+    /**
+     Hold the call
+     */
+    void holdCall();
+    
+    /**
+     unhold the call
+     */
+    void unholdCall();
+    
+    /**
+     Make outgoing call (string dest_uri) -> e.g. makeCall(sip:<SIP_USERNAME@SIP_IP:SIP_PORT>)
+     */
+    void outgoingCall(std::string dest_uri);
+
+};
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/wrapper.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/wrapper.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/wrapper.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/wrapper.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2012-2012 Teluu Inc. (http://www.teluu.com)
+ * Contributed by Emre Tufekci (github.com/emretufekci)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#import <Foundation/Foundation.h>
+
+/**
+ Create a object to be able to use it from C++
+ */
+@interface CPPWrapper : NSObject
+
+//Lib
+/**
+ Create Lib with EpConfig
+ */
+-(void) createLibWrapper;
+
+/**
+ Delete lib
+ */
+-(void) deleteLibWrapper;
+
+
+//Account
+/**
+ Create Account via following config(string username, string password, string ip, string port)
+ */
+-(void) createAccountWrapper :(NSString*) username :(NSString*) password :(NSString*) ip :(NSString*) port;
+
+/**
+ Unregister account
+ */
+-(void) unregisterAccountWrapper;
+
+
+
+//Register State Info
+
+-(bool) registerStateInfoWrapper;
+
+
+
+//Call
+/**
+ Get caller id for incoming call, checks account currently registered (ai.regIsActive)
+ */
+-(NSString*) incomingCallInfoWrapper;
+
+
+/**
+ Listener (When we have incoming call, this function pointer will notify swift.)
+ (Runs swift code from C++)
+ */
+-(void) incoming_call_wrapper: (void(*)())function;
+
+/**
+ Listener (When we have changes on the call state, this function pointer will notify swift.)
+ (Runs swift code from C++)
+ */
+-(void) call_listener_wrapper: (void(*)(int))function;
+
+/**
+ Answer incoming call
+ */
+-(void) answerCallWrapper;
+
+/**
+ Hangup active call (Incoming/Outgoing/Active)
+ */
+-(void) hangupCallWrapper;
+
+/**
+ Hold the call
+ */
+-(void) holdCallWrapper;
+
+/**
+ unhold the call
+ */
+-(void) unholdCallWrapper;
+
+/**
+ Make outgoing call (string dest_uri) -> e.g. makeCall(sip:<SIP_USERNAME@SIP_IP:SIP_PORT>)
+ */
+-(void) outgoingCallWrapper :(NSString*) dest_uri;
+@end
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/wrapper.mm asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/wrapper.mm
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/wrapper.mm	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/PJSua2/wrapper.mm	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2012-2012 Teluu Inc. (http://www.teluu.com)
+ * Contributed by Emre Tufekci (github.com/emretufekci)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#import "wrapper.h"
+#import "CustomPJSUA2.hpp"
+
+
+/**
+ Create a object from .hpp class & wrapper to be able to use it via Swift
+ */
+@implementation CPPWrapper
+PJSua2 pjsua2;
+
+
+
+//Lib
+/**
+ Create Lib with EpConfig
+ */
+-(void) createLibWrapper
+{
+    return pjsua2.createLib();
+};
+
+/**
+ Delete lib
+ */
+-(void) deleteLibWrapper {
+    pjsua2.deleteLib();
+}
+
+
+
+//Account
+/**
+ Create Account via following config(string username, string password, string ip, string port)
+ */
+-(void) createAccountWrapper :(NSString*) usernameNS :(NSString*) passwordNS :(NSString*) ipNS :(NSString*) portNS
+{
+    std::string username = std::string([[usernameNS componentsSeparatedByString:@"*"][0] UTF8String]);
+    std::string password = std::string([[passwordNS componentsSeparatedByString:@"*"][0] UTF8String]);
+    std::string ip = std::string([[ipNS componentsSeparatedByString:@"*"][0] UTF8String]);
+    std::string port = std::string([[portNS componentsSeparatedByString:@"*"][0] UTF8String]);
+    
+    pjsua2.createAccount(username, password, ip, port);
+}
+
+/**
+ Unregister account
+ */
+-(void) unregisterAccountWrapper {
+    return pjsua2.unregisterAccount();
+}
+
+
+
+//Register State Info
+/**
+ Get register state true / false
+ */
+-(bool) registerStateInfoWrapper {
+    return pjsua2.registerStateInfo();
+}
+
+
+
+// Factory method to create NSString from C++ string
+/**
+ Get caller id for incoming call, checks account currently registered (ai.regIsActive)
+ */
+- (NSString*) incomingCallInfoWrapper {
+    NSString* result = [NSString stringWithUTF8String:pjsua2.incomingCallInfo().c_str()];
+    return result;
+}
+
+/**
+ Listener (When we have incoming call, this function pointer will notify swift.)
+ */
+- (void)incoming_call_wrapper: (void(*)())function {
+    pjsua2.incoming_call(function);
+}
+
+/**
+ Listener (When we have changes on the call state, this function pointer will notify swift.)
+ */
+- (void)call_listener_wrapper: (void(*)(int))function {
+    pjsua2.call_listener(function);
+}
+
+/**
+ Answer incoming call
+ */
+- (void) answerCallWrapper {
+    pjsua2.answerCall();
+}
+
+/**
+ Hangup active call (Incoming/Outgoing/Active)
+ */
+- (void) hangupCallWrapper {
+    pjsua2.hangupCall();
+}
+
+/**
+ Hold the call
+ */
+- (void) holdCallWrapper{
+    pjsua2.holdCall();
+}
+
+/**
+ unhold the call
+ */
+- (void) unholdCallWrapper{
+    pjsua2.unholdCall();
+}
+
+/**
+ Make outgoing call (string dest_uri) -> e.g. makeCall(sip:<SIP_USERNAME@SIP_IP:SIP_PORT>)
+ */
+-(void) outgoingCallWrapper :(NSString*) dest_uriNS
+{
+    std::string dest_uri = std::string([[dest_uriNS componentsSeparatedByString:@"*"][0] UTF8String]);
+    pjsua2.outgoingCall(dest_uri);
+}
+
+@end
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/SceneDelegate.swift asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/SceneDelegate.swift
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/SceneDelegate.swift	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/SceneDelegate.swift	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2012-2012 Teluu Inc. (http://www.teluu.com)
+ * Contributed by Emre Tufekci (github.com/emretufekci)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+import UIKit
+
+class SceneDelegate: UIResponder, UIWindowSceneDelegate {
+
+    var window: UIWindow?
+
+
+    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
+        // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
+        // If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
+        // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
+        guard let _ = (scene as? UIWindowScene) else { return }
+    }
+
+    func sceneDidDisconnect(_ scene: UIScene) {
+        // Called as the scene is being released by the system.
+        // This occurs shortly after the scene enters the background, or when its session is discarded.
+        // Release any resources associated with this scene that can be re-created the next time the scene connects.
+        // The scene may re-connect later, as its session was not necessarily discarded (see `application:didDiscardSceneSessions` instead).
+    }
+
+    func sceneDidBecomeActive(_ scene: UIScene) {
+        // Called when the scene has moved from an inactive state to an active state.
+        // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
+    }
+
+    func sceneWillResignActive(_ scene: UIScene) {
+        // Called when the scene will move from an active state to an inactive state.
+        // This may occur due to temporary interruptions (ex. an incoming phone call).
+    }
+
+    func sceneWillEnterForeground(_ scene: UIScene) {
+        // Called as the scene transitions from the background to the foreground.
+        // Use this method to undo the changes made on entering the background.
+    }
+
+    func sceneDidEnterBackground(_ scene: UIScene) {
+        // Called as the scene transitions from the foreground to the background.
+        // Use this method to save data, release shared resources, and store enough scene-specific state information
+        // to restore the scene back to its current state.
+    }
+
+
+}
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/View/Base.lproj/LaunchScreen.storyboard asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/View/Base.lproj/LaunchScreen.storyboard
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/View/Base.lproj/LaunchScreen.storyboard	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/View/Base.lproj/LaunchScreen.storyboard	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/View/Base.lproj/Main.storyboard asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/View/Base.lproj/Main.storyboard
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/View/Base.lproj/Main.storyboard	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2/View/Base.lproj/Main.storyboard	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="fVJ-p9-Fi7">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController storyboardIdentifier="viewController" id="BYZ-38-t0r" customClass="ViewController" customModule="ios_swift_pjsua2" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="57q-5b-Ya8" userLabel="SipStatusGroup">
+                                <rect key="frame" x="26" y="110" width="363" height="70"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b5x-8m-NDr">
+                                        <rect key="frame" x="290" y="20" width="53" height="30"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <state key="normal" title="Refresh"/>
+                                        <connections>
+                                            <action selector="refreshStatus:" destination="BYZ-38-t0r" eventType="touchUpInside" id="64M-2u-3lc"/>
+                                        </connections>
+                                    </button>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Sip Status:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wLb-VB-5NR">
+                                        <rect key="frame" x="20" y="25" width="268" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            </view>
+                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="POI-9i-vv9" userLabel="SipSettingsGroup">
+                                <rect key="frame" x="87" y="210" width="240" height="362"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="SIP IP" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s7i-bt-Jrk">
+                                        <rect key="frame" x="98" y="20" width="44" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="SIP PORT" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ree-fg-OJK">
+                                        <rect key="frame" x="83" y="91" width="74" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="SIP USERNAME" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8HW-on-jQe">
+                                        <rect key="frame" x="60" y="157" width="120" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="SIP PASSWORD" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gih-48-7i7">
+                                        <rect key="frame" x="59" y="224" width="122" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="192.168.0.1" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="2cU-Pd-2ZH" userLabel="sipIpTField">
+                                        <rect key="frame" x="20" y="49" width="200" height="34"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                        <textInputTraits key="textInputTraits"/>
+                                    </textField>
+                                    <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="5060" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="aay-xR-JdH" userLabel="sipPortTField">
+                                        <rect key="frame" x="20" y="115" width="200" height="34"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                        <textInputTraits key="textInputTraits"/>
+                                    </textField>
+                                    <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="testuser" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="9XE-8e-FeE" userLabel="sipUsernameTField">
+                                        <rect key="frame" x="20" y="182" width="200" height="34"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                        <textInputTraits key="textInputTraits"/>
+                                    </textField>
+                                    <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="testpassword" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BUj-Ci-DYV" userLabel="sipPasswordTField">
+                                        <rect key="frame" x="20" y="253" width="200" height="34"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                        <textInputTraits key="textInputTraits"/>
+                                    </textField>
+                                    <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="41z-sM-oRY" userLabel="Login/Logout Button Group">
+                                        <rect key="frame" x="12" y="287" width="217" height="80"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <subviews>
+                                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OMa-w9-ow2">
+                                                <rect key="frame" x="130" y="21" width="67" height="39"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="22"/>
+                                                <state key="normal" title="Logout"/>
+                                                <connections>
+                                                    <action selector="logoutClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="mWa-WQ-D38"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Cfq-kG-Jak">
+                                                <rect key="frame" x="20" y="20" width="70" height="38"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="22"/>
+                                                <state key="normal" title="Login"/>
+                                                <connections>
+                                                    <action selector="loginClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="gef-m5-L75"/>
+                                                </connections>
+                                            </button>
+                                        </subviews>
+                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            </view>
+                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rAs-Dr-ncP" userLabel="CallGroup">
+                                <rect key="frame" x="87" y="653" width="240" height="177"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="K2j-Oo-NX4">
+                                        <rect key="frame" x="65" y="85" width="111" height="72"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="41"/>
+                                        <state key="normal" title="Call"/>
+                                        <connections>
+                                            <action selector="callClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Is1-ac-zxa"/>
+                                        </connections>
+                                    </button>
+                                    <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="sip:test2@192.168.0.1:5060" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Iif-XD-gnd" userLabel="sipPasswordTField">
+                                        <rect key="frame" x="20" y="49" width="200" height="34"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                        <textInputTraits key="textInputTraits"/>
+                                    </textField>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="DESTINATION URI" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fxq-Hh-rPg">
+                                        <rect key="frame" x="54" y="20" width="139" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            </view>
+                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Lza-Rz-cDS" userLabel="SeperatorLine">
+                                <rect key="frame" x="57" y="188" width="300" height="1"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" systemColor="opaqueSeparatorColor"/>
+                            </view>
+                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1zp-1B-ngP" userLabel="SeperatorLine2">
+                                <rect key="frame" x="57" y="620" width="300" height="1"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" systemColor="opaqueSeparatorColor"/>
+                            </view>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="8R4-AR-gY3"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="AVV-o2-o1h"/>
+                    <connections>
+                        <outlet property="sipDestinationUriTField" destination="Iif-XD-gnd" id="4y1-OJ-hbe"/>
+                        <outlet property="sipIpTField" destination="2cU-Pd-2ZH" id="0xo-bn-Z9f"/>
+                        <outlet property="sipPasswordTField" destination="BUj-Ci-DYV" id="egM-FH-aGk"/>
+                        <outlet property="sipPortTField" destination="aay-xR-JdH" id="byZ-ef-slU"/>
+                        <outlet property="sipUsernameTField" destination="9XE-8e-FeE" id="l7y-hv-lnB"/>
+                        <outlet property="statusLabel" destination="wLb-VB-5NR" id="dQ1-4l-GxK"/>
+                        <segue destination="xXY-qV-BM3" kind="presentation" identifier="myPresentSegue" id="cnw-am-tFA"/>
+                        <segue destination="BLu-p3-asb" kind="presentation" id="NZD-jz-Haa"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="713.04347826086962" y="81.696428571428569"/>
+        </scene>
+        <!--Incoming View Controller-->
+        <scene sceneID="dzb-KI-aHf">
+            <objects>
+                <viewController storyboardIdentifier="incomingCallVC" id="xXY-qV-BM3" customClass="IncomingViewController" customModule="ios_swift_pjsua2" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="kbi-bX-ASB">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" highlighted="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2k0-6g-aDk">
+                                <rect key="frame" x="20" y="424" width="374" height="49"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="26"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lTr-ZR-zlH">
+                                <rect key="frame" x="50" y="625" width="97" height="55"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="36"/>
+                                <state key="normal" title="Reject">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </state>
+                                <connections>
+                                    <action selector="hangupClick:" destination="xXY-qV-BM3" eventType="touchUpInside" id="432-8O-YIe"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xN3-Sr-p0z">
+                                <rect key="frame" x="240" y="625" width="117" height="55"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="36"/>
+                                <state key="normal" title="Answer">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </state>
+                                <connections>
+                                    <action selector="answerClick:" destination="xXY-qV-BM3" eventType="touchUpInside" id="3fc-eN-7ew"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Incoming Call" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" highlighted="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tBy-cS-DNh">
+                                <rect key="frame" x="20" y="305" width="374" height="63"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="52"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="Ssm-16-vu2"/>
+                        <color key="backgroundColor" systemColor="systemGreenColor"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="49K-N8-tn7"/>
+                    <connections>
+                        <outlet property="callTitle" destination="2k0-6g-aDk" id="sSF-Mb-6fU"/>
+                        <segue destination="z2I-6e-Vm1" kind="presentation" id="GNU-B0-pSi"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="4jv-4g-9dn" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2136" y="534"/>
+        </scene>
+        <!--Outgoing View Controller-->
+        <scene sceneID="hEd-FP-RS0">
+            <objects>
+                <viewController storyboardIdentifier="outgoingCallVC" id="BLu-p3-asb" customClass="OutgoingViewController" customModule="ios_swift_pjsua2" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="gy0-MV-fnT">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Calling..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" highlighted="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TII-aj-jjo">
+                                <rect key="frame" x="114" y="242" width="187" height="63"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="52"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="highlightedColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" highlighted="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hgy-LA-6c3" userLabel="Call Title">
+                                <rect key="frame" x="20" y="363" width="374" height="49"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="26"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zyJ-Sd-PPc">
+                                <rect key="frame" x="177" y="669" width="60" height="55"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="36"/>
+                                <state key="normal" title="End">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </state>
+                                <connections>
+                                    <action selector="hangupClick:" destination="BLu-p3-asb" eventType="touchUpInside" id="pjY-xR-Uiw"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="sHN-OC-56g"/>
+                        <color key="backgroundColor" systemColor="systemIndigoColor"/>
+                    </view>
+                    <connections>
+                        <outlet property="outgoingCallTitle" destination="hgy-LA-6c3" id="Ynb-LX-Zzw"/>
+                        <segue destination="z2I-6e-Vm1" kind="presentation" id="IE2-4K-09d"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="AAF-MM-kcv" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2135" y="-469"/>
+        </scene>
+        <!--Active View Controller-->
+        <scene sceneID="EFo-eE-eID">
+            <objects>
+                <viewController storyboardIdentifier="activeCallVC" id="z2I-6e-Vm1" customClass="ActiveViewController" customModule="ios_swift_pjsua2" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="5ty-VG-ajT">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="agD-a1-OOe">
+                                <rect key="frame" x="184" y="730" width="47" height="46"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="28"/>
+                                <state key="normal" title="End"/>
+                                <connections>
+                                    <action selector="hangupClick:" destination="z2I-6e-Vm1" eventType="touchUpInside" id="Rls-7Y-dVO"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" highlighted="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E2s-Rw-WKn" userLabel="Call Title">
+                                <rect key="frame" x="20" y="396" width="374" height="49"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="26"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Active Call" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" highlighted="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Myx-Us-jse">
+                                <rect key="frame" x="122" y="239" width="176" height="47"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="39"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="highlightedColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e4l-ky-CQw">
+                                <rect key="frame" x="152" y="655" width="110" height="49"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="24"/>
+                                <state key="normal" title="Hold"/>
+                                <connections>
+                                    <action selector="holdClick:" destination="z2I-6e-Vm1" eventType="touchUpInside" id="i8l-Pb-B6r"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="4CJ-Jw-YsB"/>
+                        <color key="backgroundColor" systemColor="systemGray2Color"/>
+                    </view>
+                    <connections>
+                        <outlet property="activeCallTitle" destination="E2s-Rw-WKn" id="I5F-i4-Cs3"/>
+                        <outlet property="holdButton" destination="e4l-ky-CQw" id="wpD-8X-He5"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="h3o-BI-GoE" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3357.971014492754" y="81.696428571428569"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="ZIj-Vu-EJQ">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="fVJ-p9-Fi7" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="agb-uY-Cnt">
+                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="BYZ-38-t0r" kind="relationship" relationship="rootViewController" id="kYm-zF-nTg"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iDp-gw-xVE" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-197.10144927536234" y="81.696428571428569"/>
+        </scene>
+    </scenes>
+    <inferredMetricsTieBreakers>
+        <segue reference="GNU-B0-pSi"/>
+    </inferredMetricsTieBreakers>
+    <resources>
+        <systemColor name="opaqueSeparatorColor">
+            <color red="0.77647058823529413" green="0.77647058823529413" blue="0.78431372549019607" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemGray2Color">
+            <color red="0.68235294117647061" green="0.68235294117647061" blue="0.69803921568627447" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="systemGreenColor">
+            <color red="0.20392156862745098" green="0.7803921568627451" blue="0.34901960784313724" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+        <systemColor name="systemIndigoColor">
+            <color red="0.34509803921568627" green="0.33725490196078434" blue="0.83921568627450982" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
+</document>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.pbxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.pbxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.pbxproj	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.pbxproj	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,577 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		C337417325BADEEE007785D7 /* Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = C337417225BADEEE007785D7 /* Model.swift */; };
+		C351398125A5F70D00A090AA /* libg7221codec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8521F25A5EC380037A8AB /* libg7221codec.a */; };
+		C351398225A5F70D00A090AA /* libgsmcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8521A25A5EC380037A8AB /* libgsmcodec.a */; };
+		C351398325A5F70D00A090AA /* libilbccodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522825A5EC380037A8AB /* libilbccodec.a */; };
+		C351398425A5F70D00A090AA /* libpj.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522225A5EC380037A8AB /* libpj.a */; };
+		C351398525A5F70D00A090AA /* libpjlib-util.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522625A5EC380037A8AB /* libpjlib-util.a */; };
+		C351398625A5F70D00A090AA /* libpjmedia-audiodev.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522425A5EC380037A8AB /* libpjmedia-audiodev.a */; };
+		C351398725A5F70D00A090AA /* libpjmedia-codec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522125A5EC380037A8AB /* libpjmedia-codec.a */; };
+		C351398825A5F70D00A090AA /* libpjmedia-videodev.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8521825A5EC380037A8AB /* libpjmedia-videodev.a */; };
+		C351398925A5F70D00A090AA /* libpjmedia.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8521E25A5EC380037A8AB /* libpjmedia.a */; };
+		C351398A25A5F70D00A090AA /* libpjnath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522025A5EC380037A8AB /* libpjnath.a */; };
+		C351398B25A5F70D00A090AA /* libpjsip-simple.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522725A5EC380037A8AB /* libpjsip-simple.a */; };
+		C351398C25A5F70D00A090AA /* libpjsip-ua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8521D25A5EC380037A8AB /* libpjsip-ua.a */; };
+		C351398D25A5F70D00A090AA /* libpjsip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522325A5EC380037A8AB /* libpjsip.a */; };
+		C351398E25A5F70D00A090AA /* libpjsua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8521925A5EC380037A8AB /* libpjsua.a */; };
+		C351398F25A5F70D00A090AA /* libpjsua2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8521C25A5EC380037A8AB /* libpjsua2.a */; };
+		C351399025A5F70D00A090AA /* libresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522925A5EC380037A8AB /* libresample.a */; };
+		C351399125A5F70D00A090AA /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8521B25A5EC380037A8AB /* libspeex.a */; };
+		C351399225A5F70D00A090AA /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522525A5EC380037A8AB /* libsrtp.a */; };
+		C351399325A5F70D00A090AA /* libwebrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522A25A5EC380037A8AB /* libwebrtc.a */; };
+		C351399425A5F70D00A090AA /* libyuv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8522B25A5EC380037A8AB /* libyuv.a */; };
+		C374860825B84FA100FBE972 /* OutgoingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C374860725B84FA100FBE972 /* OutgoingViewController.swift */; };
+		C399A57125AF2721000F742A /* IncomingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C399A57025AF2721000F742A /* IncomingViewController.swift */; };
+		C3AB889B25A734B400224276 /* wrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = C3AB889A25A734B400224276 /* wrapper.mm */; };
+		C3AB88A025A7358700224276 /* CustomPJSUA2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3AB889E25A7358700224276 /* CustomPJSUA2.cpp */; };
+		C3B851FF25A5EA6C0037A8AB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B851FE25A5EA6C0037A8AB /* AppDelegate.swift */; };
+		C3B8520125A5EA6C0037A8AB /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B8520025A5EA6C0037A8AB /* SceneDelegate.swift */; };
+		C3B8520325A5EA6C0037A8AB /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B8520225A5EA6C0037A8AB /* ViewController.swift */; };
+		C3B8520625A5EA6C0037A8AB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C3B8520425A5EA6C0037A8AB /* Main.storyboard */; };
+		C3B8520825A5EA6D0037A8AB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3B8520725A5EA6D0037A8AB /* Assets.xcassets */; };
+		C3B8520B25A5EA6D0037A8AB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C3B8520925A5EA6D0037A8AB /* LaunchScreen.storyboard */; };
+		C3B8524325A5EC940037A8AB /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8524125A5EC940037A8AB /* AVFoundation.framework */; };
+		C3B8524425A5EC940037A8AB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8524225A5EC940037A8AB /* Foundation.framework */; };
+		C3B8524725A5ED6D0037A8AB /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B8524625A5ED6D0037A8AB /* AudioToolbox.framework */; };
+		C3C4082E25B9A547002C19EB /* ActiveViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3C4082D25B9A547002C19EB /* ActiveViewController.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		C337417225BADEEE007785D7 /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = "<group>"; };
+		C374860725B84FA100FBE972 /* OutgoingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutgoingViewController.swift; sourceTree = "<group>"; };
+		C399A57025AF2721000F742A /* IncomingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncomingViewController.swift; sourceTree = "<group>"; };
+		C3AB889A25A734B400224276 /* wrapper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = wrapper.mm; sourceTree = "<group>"; };
+		C3AB889E25A7358700224276 /* CustomPJSUA2.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CustomPJSUA2.cpp; sourceTree = "<group>"; };
+		C3AB889F25A7358700224276 /* CustomPJSUA2.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CustomPJSUA2.hpp; sourceTree = "<group>"; };
+		C3AB88AA25A73F3100224276 /* wrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = wrapper.h; sourceTree = "<group>"; };
+		C3B851FB25A5EA6C0037A8AB /* ios-swift-pjsua2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ios-swift-pjsua2.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		C3B851FE25A5EA6C0037A8AB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		C3B8520025A5EA6C0037A8AB /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
+		C3B8520225A5EA6C0037A8AB /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		C3B8520525A5EA6C0037A8AB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		C3B8520725A5EA6D0037A8AB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		C3B8520A25A5EA6D0037A8AB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		C3B8520C25A5EA6D0037A8AB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		C3B8521325A5EBF00037A8AB /* ios-swift-pjsua2-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ios-swift-pjsua2-Bridging-Header.h"; sourceTree = "<group>"; };
+		C3B8521825A5EC380037A8AB /* libpjmedia-videodev.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-videodev.a"; path = "../PJSip-Build/pjproject/pjmedia/lib/libpjmedia-videodev.a"; sourceTree = "<group>"; };
+		C3B8521925A5EC380037A8AB /* libpjsua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpjsua.a; path = "../PJSip-Build/pjproject/pjsip/lib/libpjsua.a"; sourceTree = "<group>"; };
+		C3B8521A25A5EC380037A8AB /* libgsmcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsmcodec.a; path = "../PJSip-Build/pjproject/third_party/lib/libgsmcodec.a"; sourceTree = "<group>"; };
+		C3B8521B25A5EC380037A8AB /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../PJSip-Build/pjproject/third_party/lib/libspeex.a"; sourceTree = "<group>"; };
+		C3B8521C25A5EC380037A8AB /* libpjsua2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpjsua2.a; path = "../PJSip-Build/pjproject/pjsip/lib/libpjsua2.a"; sourceTree = "<group>"; };
+		C3B8521D25A5EC380037A8AB /* libpjsip-ua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-ua.a"; path = "../PJSip-Build/pjproject/pjsip/lib/libpjsip-ua.a"; sourceTree = "<group>"; };
+		C3B8521E25A5EC380037A8AB /* libpjmedia.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpjmedia.a; path = "../PJSip-Build/pjproject/pjmedia/lib/libpjmedia.a"; sourceTree = "<group>"; };
+		C3B8521F25A5EC380037A8AB /* libg7221codec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libg7221codec.a; path = "../PJSip-Build/pjproject/third_party/lib/libg7221codec.a"; sourceTree = "<group>"; };
+		C3B8522025A5EC380037A8AB /* libpjnath.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpjnath.a; path = "../PJSip-Build/pjproject/pjnath/lib/libpjnath.a"; sourceTree = "<group>"; };
+		C3B8522125A5EC380037A8AB /* libpjmedia-codec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-codec.a"; path = "../PJSip-Build/pjproject/pjmedia/lib/libpjmedia-codec.a"; sourceTree = "<group>"; };
+		C3B8522225A5EC380037A8AB /* libpj.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpj.a; path = "../PJSip-Build/pjproject/pjlib/lib/libpj.a"; sourceTree = "<group>"; };
+		C3B8522325A5EC380037A8AB /* libpjsip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpjsip.a; path = "../PJSip-Build/pjproject/pjsip/lib/libpjsip.a"; sourceTree = "<group>"; };
+		C3B8522425A5EC380037A8AB /* libpjmedia-audiodev.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-audiodev.a"; path = "../PJSip-Build/pjproject/pjmedia/lib/libpjmedia-audiodev.a"; sourceTree = "<group>"; };
+		C3B8522525A5EC380037A8AB /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsrtp.a; path = "../PJSip-Build/pjproject/third_party/lib/libsrtp.a"; sourceTree = "<group>"; };
+		C3B8522625A5EC380037A8AB /* libpjlib-util.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjlib-util.a"; path = "../PJSip-Build/pjproject/pjlib-util/lib/libpjlib-util.a"; sourceTree = "<group>"; };
+		C3B8522725A5EC380037A8AB /* libpjsip-simple.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-simple.a"; path = "../PJSip-Build/pjproject/pjsip/lib/libpjsip-simple.a"; sourceTree = "<group>"; };
+		C3B8522825A5EC380037A8AB /* libilbccodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbccodec.a; path = "../PJSip-Build/pjproject/third_party/lib/libilbccodec.a"; sourceTree = "<group>"; };
+		C3B8522925A5EC380037A8AB /* libresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libresample.a; path = "../PJSip-Build/pjproject/third_party/lib/libresample.a"; sourceTree = "<group>"; };
+		C3B8522A25A5EC380037A8AB /* libwebrtc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebrtc.a; path = "../PJSip-Build/pjproject/third_party/lib/libwebrtc.a"; sourceTree = "<group>"; };
+		C3B8522B25A5EC380037A8AB /* libyuv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libyuv.a; path = "../PJSip-Build/pjproject/third_party/lib/libyuv.a"; sourceTree = "<group>"; };
+		C3B8524125A5EC940037A8AB /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
+		C3B8524225A5EC940037A8AB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		C3B8524625A5ED6D0037A8AB /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+		C3C4082D25B9A547002C19EB /* ActiveViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActiveViewController.swift; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		C3B851F825A5EA6C0037A8AB /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C351398125A5F70D00A090AA /* libg7221codec.a in Frameworks */,
+				C351398225A5F70D00A090AA /* libgsmcodec.a in Frameworks */,
+				C351398325A5F70D00A090AA /* libilbccodec.a in Frameworks */,
+				C351398425A5F70D00A090AA /* libpj.a in Frameworks */,
+				C351398525A5F70D00A090AA /* libpjlib-util.a in Frameworks */,
+				C351398625A5F70D00A090AA /* libpjmedia-audiodev.a in Frameworks */,
+				C351398725A5F70D00A090AA /* libpjmedia-codec.a in Frameworks */,
+				C351398825A5F70D00A090AA /* libpjmedia-videodev.a in Frameworks */,
+				C351398925A5F70D00A090AA /* libpjmedia.a in Frameworks */,
+				C351398A25A5F70D00A090AA /* libpjnath.a in Frameworks */,
+				C351398B25A5F70D00A090AA /* libpjsip-simple.a in Frameworks */,
+				C351398C25A5F70D00A090AA /* libpjsip-ua.a in Frameworks */,
+				C351398D25A5F70D00A090AA /* libpjsip.a in Frameworks */,
+				C351398E25A5F70D00A090AA /* libpjsua.a in Frameworks */,
+				C351398F25A5F70D00A090AA /* libpjsua2.a in Frameworks */,
+				C351399025A5F70D00A090AA /* libresample.a in Frameworks */,
+				C351399125A5F70D00A090AA /* libspeex.a in Frameworks */,
+				C351399225A5F70D00A090AA /* libsrtp.a in Frameworks */,
+				C351399325A5F70D00A090AA /* libwebrtc.a in Frameworks */,
+				C351399425A5F70D00A090AA /* libyuv.a in Frameworks */,
+				C3B8524725A5ED6D0037A8AB /* AudioToolbox.framework in Frameworks */,
+				C3B8524325A5EC940037A8AB /* AVFoundation.framework in Frameworks */,
+				C3B8524425A5EC940037A8AB /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		C337417125BADEB3007785D7 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				C337417225BADEEE007785D7 /* Model.swift */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		C337417625BADF12007785D7 /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+				C3B8520225A5EA6C0037A8AB /* ViewController.swift */,
+				C399A57025AF2721000F742A /* IncomingViewController.swift */,
+				C374860725B84FA100FBE972 /* OutgoingViewController.swift */,
+				C3C4082D25B9A547002C19EB /* ActiveViewController.swift */,
+			);
+			path = Controller;
+			sourceTree = "<group>";
+		};
+		C337417725BADF22007785D7 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				C3B8520425A5EA6C0037A8AB /* Main.storyboard */,
+				C3B8520925A5EA6D0037A8AB /* LaunchScreen.storyboard */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		C3B851F225A5EA6C0037A8AB = {
+			isa = PBXGroup;
+			children = (
+				C3B851FD25A5EA6C0037A8AB /* ios-swift-pjsua2 */,
+				C3B851FC25A5EA6C0037A8AB /* Products */,
+				C3B8521725A5EC380037A8AB /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		C3B851FC25A5EA6C0037A8AB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				C3B851FB25A5EA6C0037A8AB /* ios-swift-pjsua2.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		C3B851FD25A5EA6C0037A8AB /* ios-swift-pjsua2 */ = {
+			isa = PBXGroup;
+			children = (
+				C3C1F63A25AC26A300E5E080 /* PJSua2 */,
+				C337417725BADF22007785D7 /* View */,
+				C337417125BADEB3007785D7 /* Model */,
+				C337417625BADF12007785D7 /* Controller */,
+				C3B851FE25A5EA6C0037A8AB /* AppDelegate.swift */,
+				C3B8520025A5EA6C0037A8AB /* SceneDelegate.swift */,
+				C3B8520725A5EA6D0037A8AB /* Assets.xcassets */,
+				C3B8520C25A5EA6D0037A8AB /* Info.plist */,
+				C3B8521325A5EBF00037A8AB /* ios-swift-pjsua2-Bridging-Header.h */,
+			);
+			path = "ios-swift-pjsua2";
+			sourceTree = "<group>";
+		};
+		C3B8521725A5EC380037A8AB /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				C3B8524625A5ED6D0037A8AB /* AudioToolbox.framework */,
+				C3B8524125A5EC940037A8AB /* AVFoundation.framework */,
+				C3B8524225A5EC940037A8AB /* Foundation.framework */,
+				C3B8521F25A5EC380037A8AB /* libg7221codec.a */,
+				C3B8521A25A5EC380037A8AB /* libgsmcodec.a */,
+				C3B8522825A5EC380037A8AB /* libilbccodec.a */,
+				C3B8522225A5EC380037A8AB /* libpj.a */,
+				C3B8522625A5EC380037A8AB /* libpjlib-util.a */,
+				C3B8522425A5EC380037A8AB /* libpjmedia-audiodev.a */,
+				C3B8522125A5EC380037A8AB /* libpjmedia-codec.a */,
+				C3B8521825A5EC380037A8AB /* libpjmedia-videodev.a */,
+				C3B8521E25A5EC380037A8AB /* libpjmedia.a */,
+				C3B8522025A5EC380037A8AB /* libpjnath.a */,
+				C3B8522725A5EC380037A8AB /* libpjsip-simple.a */,
+				C3B8521D25A5EC380037A8AB /* libpjsip-ua.a */,
+				C3B8522325A5EC380037A8AB /* libpjsip.a */,
+				C3B8521925A5EC380037A8AB /* libpjsua.a */,
+				C3B8521C25A5EC380037A8AB /* libpjsua2.a */,
+				C3B8522925A5EC380037A8AB /* libresample.a */,
+				C3B8521B25A5EC380037A8AB /* libspeex.a */,
+				C3B8522525A5EC380037A8AB /* libsrtp.a */,
+				C3B8522A25A5EC380037A8AB /* libwebrtc.a */,
+				C3B8522B25A5EC380037A8AB /* libyuv.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		C3C1F63A25AC26A300E5E080 /* PJSua2 */ = {
+			isa = PBXGroup;
+			children = (
+				C3AB889E25A7358700224276 /* CustomPJSUA2.cpp */,
+				C3AB889F25A7358700224276 /* CustomPJSUA2.hpp */,
+				C3AB889A25A734B400224276 /* wrapper.mm */,
+				C3AB88AA25A73F3100224276 /* wrapper.h */,
+			);
+			path = PJSua2;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		C3B851FA25A5EA6C0037A8AB /* ios-swift-pjsua2 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C3B8520F25A5EA6D0037A8AB /* Build configuration list for PBXNativeTarget "ios-swift-pjsua2" */;
+			buildPhases = (
+				C3B851F725A5EA6C0037A8AB /* Sources */,
+				C3B851F825A5EA6C0037A8AB /* Frameworks */,
+				C3B851F925A5EA6C0037A8AB /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "ios-swift-pjsua2";
+			productName = "NEW-Swift-NoBuild";
+			productReference = C3B851FB25A5EA6C0037A8AB /* ios-swift-pjsua2.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		C3B851F325A5EA6C0037A8AB /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 1210;
+				LastUpgradeCheck = 1210;
+				TargetAttributes = {
+					C3B851FA25A5EA6C0037A8AB = {
+						CreatedOnToolsVersion = 12.1;
+						LastSwiftMigration = 1210;
+					};
+				};
+			};
+			buildConfigurationList = C3B851F625A5EA6C0037A8AB /* Build configuration list for PBXProject "ios-swift-pjsua2" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = C3B851F225A5EA6C0037A8AB;
+			productRefGroup = C3B851FC25A5EA6C0037A8AB /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				C3B851FA25A5EA6C0037A8AB /* ios-swift-pjsua2 */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		C3B851F925A5EA6C0037A8AB /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C3B8520B25A5EA6D0037A8AB /* LaunchScreen.storyboard in Resources */,
+				C3B8520825A5EA6D0037A8AB /* Assets.xcassets in Resources */,
+				C3B8520625A5EA6C0037A8AB /* Main.storyboard in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		C3B851F725A5EA6C0037A8AB /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C337417325BADEEE007785D7 /* Model.swift in Sources */,
+				C3C4082E25B9A547002C19EB /* ActiveViewController.swift in Sources */,
+				C399A57125AF2721000F742A /* IncomingViewController.swift in Sources */,
+				C3AB889B25A734B400224276 /* wrapper.mm in Sources */,
+				C374860825B84FA100FBE972 /* OutgoingViewController.swift in Sources */,
+				C3B8520325A5EA6C0037A8AB /* ViewController.swift in Sources */,
+				C3B851FF25A5EA6C0037A8AB /* AppDelegate.swift in Sources */,
+				C3B8520125A5EA6C0037A8AB /* SceneDelegate.swift in Sources */,
+				C3AB88A025A7358700224276 /* CustomPJSUA2.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		C3B8520425A5EA6C0037A8AB /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				C3B8520525A5EA6C0037A8AB /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		C3B8520925A5EA6D0037A8AB /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				C3B8520A25A5EA6D0037A8AB /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		C3B8520D25A5EA6D0037A8AB /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		C3B8520E25A5EA6D0037A8AB /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		C3B8521025A5EA6D0037A8AB /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = PZ7LKWA782;
+				ENABLE_BITCODE = NO;
+				ENABLE_TESTABILITY = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PJ_AUTOCONF=1",
+					"$(inherited)",
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)",
+					"$(SRCROOT)/Libraries",
+					"\"$(SRCROOT)/../../../../pjlib/include\"",
+					"\"$(SRCROOT)/../../../../pjlib-util/include\"",
+					"\"$(SRCROOT)/../../../../pjmedia/include\"",
+					"\"$(SRCROOT)/../../../../pjnath/include\"",
+					"\"$(SRCROOT)/../../../../pjsip/include\"",
+					"\"$(SRCROOT)/../../../../third_party/include\"",
+					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/Libraries",
+				);
+				INFOPLIST_FILE = "$(SRCROOT)/ios-swift-pjsua2/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)",
+					"$(SRCROOT)/Libraries",
+					"\"$(SRCROOT)/../../../../pjlib/lib\"",
+					"\"$(SRCROOT)/../../../../pjlib-util/lib\"",
+					"\"$(SRCROOT)/../../../../pjmedia/lib\"",
+					"\"$(SRCROOT)/../../../../pjnath/lib\"",
+					"\"$(SRCROOT)/../../../../pjsip/lib\"",
+					"\"$(SRCROOT)/../../../../third_party/lib\"",
+					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/Libraries",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "tbtk.ios-swift-pjsua2";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "ios-swift-pjsua2/ios-swift-pjsua2-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		C3B8521125A5EA6D0037A8AB /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = PZ7LKWA782;
+				ENABLE_BITCODE = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = "PJ_AUTOCONF=1";
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)",
+					"$(SRCROOT)/Libraries",
+					"\"$(SRCROOT)/../../../../pjlib/include\"",
+					"\"$(SRCROOT)/../../../../pjlib-util/include\"",
+					"\"$(SRCROOT)/../../../../pjmedia/include\"",
+					"\"$(SRCROOT)/../../../../pjnath/include\"",
+					"\"$(SRCROOT)/../../../../pjsip/include\"",
+					"\"$(SRCROOT)/../../../../third_party/include\"",
+					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/Libraries",
+				);
+				INFOPLIST_FILE = "$(SRCROOT)/ios-swift-pjsua2/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(SRCROOT)",
+					"$(SRCROOT)/Libraries",
+					"\"$(SRCROOT)/../../../../pjlib/lib\"",
+					"\"$(SRCROOT)/../../../../pjlib-util/lib\"",
+					"\"$(SRCROOT)/../../../../pjmedia/lib\"",
+					"\"$(SRCROOT)/../../../../pjnath/lib\"",
+					"\"$(SRCROOT)/../../../../pjsip/lib\"",
+					"\"$(SRCROOT)/../../../../third_party/lib\"",
+					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/Libraries",
+				);
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = "tbtk.ios-swift-pjsua2";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "ios-swift-pjsua2/ios-swift-pjsua2-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		C3B851F625A5EA6C0037A8AB /* Build configuration list for PBXProject "ios-swift-pjsua2" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C3B8520D25A5EA6D0037A8AB /* Debug */,
+				C3B8520E25A5EA6D0037A8AB /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C3B8520F25A5EA6D0037A8AB /* Build configuration list for PBXNativeTarget "ios-swift-pjsua2" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C3B8521025A5EA6D0037A8AB /* Debug */,
+				C3B8521125A5EA6D0037A8AB /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = C3B851F325A5EA6C0037A8AB /* Project object */;
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/contents.xcworkspacedata asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/contents.xcworkspacedata
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/contents.xcworkspacedata	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/contents.xcworkspacedata	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:/Users/emre/Desktop/SWIFT-PJSUA2/SIMULATOR/ios-swift-pjsua2.xcodeproj">
+   </FileRef>
+</Workspace>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/xcshareddata/xcschemes/ios-swift-pjsua2.xcscheme asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/xcshareddata/xcschemes/ios-swift-pjsua2.xcscheme
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/xcshareddata/xcschemes/ios-swift-pjsua2.xcscheme	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsua2/ios-swift-pjsua2/ios-swift-pjsua2.xcodeproj/xcshareddata/xcschemes/ios-swift-pjsua2.xcscheme	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1240"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C3B851FA25A5EA6C0037A8AB"
+               BuildableName = "ios-swift-pjsua2.app"
+               BlueprintName = "ios-swift-pjsua2"
+               ReferencedContainer = "container:ios-swift-pjsua2.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C3B851FA25A5EA6C0037A8AB"
+            BuildableName = "ios-swift-pjsua2.app"
+            BlueprintName = "ios-swift-pjsua2"
+            ReferencedContainer = "container:ios-swift-pjsua2.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C3B851FA25A5EA6C0037A8AB"
+            BuildableName = "ios-swift-pjsua2.app"
+            BlueprintName = "ios-swift-pjsua2"
+            ReferencedContainer = "container:ios-swift-pjsua2.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsystest/main_console.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsystest/main_console.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsystest/main_console.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsystest/main_console.c	2022-02-24 07:54:38.000000000 +0000
@@ -85,7 +85,7 @@
 	puts("M E N U :");
 	puts("---------");
 	for (i=0; i<menu->submenu_cnt; ++i) {
-	    char menu_id[4];
+	    char menu_id[11];
 	    pj_ansi_sprintf(menu_id, "%u", i);
 	    print_menu("", menu_id, menu->submenus[i]);
 	}
@@ -133,6 +133,8 @@
 
 int main()
 {
+    pj_log_set_level(1);
+
     if (systest_init() != PJ_SUCCESS)
 	return 1;
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsystest/systest.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsystest/systest.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/pjsystest/systest.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/pjsystest/systest.c	2022-02-24 07:54:38.000000000 +0000
@@ -1340,11 +1340,14 @@
     pj_file_write(fd, textbuf, &size);
 
     for (i=0; i<test_item_count; ++i) {
+        int len;
 	test_item_t *ti = &test_items[i];
-	pj_ansi_snprintf(textbuf, sizeof(textbuf),
+
+	len = pj_ansi_snprintf(textbuf, sizeof(textbuf),
 			 "\r\nTEST %d: %s %s\r\n",
 			 i, ti->title,
 			 (ti->skipped? "Skipped" : (ti->success ? "Success" : "Failed")));
+	PJ_CHECK_TRUNC_STR(len, textbuf, sizeof(textbuf));
 	size = strlen(textbuf);
 	pj_file_write(fd, textbuf, &size);
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/python/_pjsua.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/python/_pjsua.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/python/_pjsua.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/python/_pjsua.c	2022-02-24 07:54:38.000000000 +0000
@@ -4434,7 +4434,8 @@
     PyObject* m = NULL;
 #define ADD_CONSTANT(mod,name)	PyModule_AddIntConstant(mod,#name,name)
 
-    
+    pj_log_set_level(1);
+
     PyEval_InitThreads();
 
     if (PyType_Ready(&PyTyp_pjsua_callback) < 0)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/aviplay.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/aviplay.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/aviplay.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/aviplay.c	2022-02-24 07:54:38.000000000 +0000
@@ -25,7 +25,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "util.h"
+#ifndef _MSC_VER
+#include <signal.h>
+#endif
 
 /**
  * \page page_pjmedia_samples_aviplay_c Samples: Playing AVI File to
@@ -56,6 +58,7 @@
 
 #if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
 
+#include "util.h"
 
 /* For logging purpose. */
 #define THIS_FILE   "aviplay.c"
@@ -220,6 +223,8 @@
         /* Create renderer, set it to active  */
         param.active = PJ_TRUE;
         param.vidparam.dir = PJMEDIA_DIR_RENDER;
+        param.vidparam.flags |= PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS;
+        param.vidparam.window_flags = PJMEDIA_VID_DEV_WND_BORDER | PJMEDIA_VID_DEV_WND_RESIZABLE;
         vfd = pjmedia_format_get_video_format_detail(&vid_port->info.fmt,
                                                      PJ_TRUE);
         pjmedia_format_init_video(&param.vidparam.fmt, 
@@ -306,9 +311,14 @@
 	    
             /* Alloc encoding buffer */
             enc_buf_size =  codec_param.dec_fmt.det.vid.size.w *
-	    codec_param.dec_fmt.det.vid.size.h * 4
-	    + 16; /*< padding, just in case */
-            enc_buf = pj_pool_alloc(pool,enc_buf_size);
+	    codec_param.dec_fmt.det.vid.size.h * 4;
+            enc_buf = pj_pool_alloc(pool, enc_buf_size +
+            			    128 /*< padding, required for vid codecs
+            			    	    such as ffmpeg. Must be >=
+            			    	    AV_INPUT_BUFFER_PADDING_SIZE.
+            			    	    And must not be included in
+            			    	    the enc_buf_size calculation
+            			    	    above. */);
 	    
             /* Init codec port */
             pj_bzero(&codec_port, sizeof(codec_port));
@@ -456,6 +466,19 @@
     return rc;
 }
 
+#ifndef _MSC_VER
+static void sig_handler(int sig)
+{
+    switch (sig)
+    {
+    case SIGINT:
+    case SIGTERM:
+        break;
+    }
+    puts("exit..");
+    exit(1);
+}
+#endif
 
 static int main_func(int argc, char *argv[])
 {
@@ -470,6 +493,10 @@
 	return 110;
     }
 
+#ifndef _MSC_VER
+    signal(SIGINT, sig_handler);
+    signal(SIGTERM, sig_handler);
+#endif
 
     /* Must init PJLIB first: */
     status = pj_init();
@@ -493,6 +520,7 @@
     
     status = pjmedia_vid_dev_subsys_init(&cp.factory);
     if (status != PJ_SUCCESS) {
+        app_perror(THIS_FILE, "Video init failed", status);
 	rc = 130;
         goto on_return;
     }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/clidemo.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/clidemo.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/clidemo.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/clidemo.c	2022-02-24 07:54:38.000000000 +0000
@@ -114,13 +114,13 @@
      "    <ARG name='whom' type='text' desc='Whom to say to'/>"
      "</CMD>",
      &say},
-    {"<CMD name='vid' id='1' desc='Video Command'>"
-     "   <CMD name='help' id='2' desc='Show Help' />"
-     "   <CMD name='enable' id='3' desc='Enable Video' />"
-     "   <CMD name='disable' id='4' desc='Disable Video' />"
-     "   <CMD name='call' id='5' desc='Video call' >"
-     "            <CMD name='add' id='6' desc='Add Call' />"
-     "            <CMD name='cap' id='7' desc='Capture Call' >"
+    {"<CMD name='vid' id='7' desc='Video Command'>"
+     "   <CMD name='help' id='72' desc='Show Help' />"
+     "   <CMD name='enable' id='73' desc='Enable Video' />"
+     "   <CMD name='disable' id='74' desc='Disable Video' />"
+     "   <CMD name='call' id='75' desc='Video call' >"
+     "            <CMD name='add' id='756' desc='Add Call' />"
+     "            <CMD name='cap' id='757' desc='Capture Call' >"
      "               <ARG name='streamno' type='int' desc='Stream No' id='1'/>"
      "               <ARG name='devid' type='int' desc='Device Id' id='2'/>"
      "            </CMD>"
@@ -128,7 +128,7 @@
      "</CMD>",
      NULL},
     {"<CMD name='disable_codec' id='8' desc='Disable codec'>"
-     "	<ARG name='codec_list' type='choice' id='3' desc='Codec list'>"
+     "	<ARG name='codec_list' type='choice' id='38' desc='Codec list'>"
      "	    <CHOICE value='g711' desc='G711 Codec'/>"
      "	    <CHOICE value='g722' desc='G722 Codec'/>"
      "	</ARG>"
@@ -176,9 +176,13 @@
     for (i = 0; i < sizeof(cmd_xmls)/sizeof(cmd_xmls[0]); i++) {
         xml = pj_str(cmd_xmls[i].xml);	
         status = pj_cli_add_cmd_from_xml(cli, NULL, &xml, 
-	    cmd_xmls[i].handler, NULL, get_codec_list);
-        if (status != PJ_SUCCESS)
+					 cmd_xmls[i].handler, NULL,
+					 get_codec_list);
+        if (status != PJ_SUCCESS) {
+	    PJ_PERROR(1,(THIS_FILE, status,
+			 "Failed adding command from XML #%d", i));
 	    goto on_return;
+	}
     }
 
     /*
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/jbsim.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/jbsim.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/jbsim.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/jbsim.c	2022-02-24 07:54:38.000000000 +0000
@@ -28,6 +28,7 @@
 
 /* Include PJMEDIA and PJLIB */
 #include <pjmedia.h>
+#include <pjmedia/event.h>
 #include <pjmedia-codec.h>
 #include <pjlib.h>
 #include <pjlib-util.h>
@@ -333,6 +334,7 @@
 	si.jb_min_pre = g_app.cfg.rx_jb_min_pre;
 	si.jb_max_pre = g_app.cfg.rx_jb_max_pre;
 	si.jb_max = g_app.cfg.rx_jb_max;
+        si.jb_discard_algo = PJMEDIA_JB_DISCARD_PROGRESSIVE;
     }
 
     /* Get the codec info and param */
@@ -427,6 +429,7 @@
     }
     if (g_app.pool)
 	pj_pool_release(g_app.pool);
+    pjmedia_event_mgr_destroy(NULL);
     pj_caching_pool_destroy( &g_app.cp );
     pj_shutdown();
 }
@@ -481,6 +484,13 @@
 	goto on_error;
     }
 
+    /* Create event manager */
+    status = pjmedia_event_mgr_create(g_app.pool, 0, NULL);
+    if (status != PJ_SUCCESS) {
+	jbsim_perror("Error creating event manager", status);
+	goto on_error;
+    }
+
     /* Create transmitter stream */
     pj_bzero(&strm_cfg, sizeof(strm_cfg));
     strm_cfg.name = "tx";
@@ -755,7 +765,7 @@
 
     pkt_interval = PJMEDIA_PIA_SPF(&port->info) * 1000 /
 		   PJMEDIA_PIA_SRATE(&port->info) *
-		   g_app.cfg.rx_snd_burst;
+		   (long)g_app.cfg.rx_snd_burst;
 
     if (PJ_TIME_VAL_GTE(*t, strm->state.rx.next_schedule)) {
 	unsigned i;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/pcaputil.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/pcaputil.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/pcaputil.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/pcaputil.c	2022-02-24 07:54:38.000000000 +0000
@@ -269,7 +269,7 @@
     const pj_str_t WAV = {".wav", 4};
     struct pkt
     {
-	pj_uint8_t	 buffer[320];
+	pj_uint8_t	 buffer[PJMEDIA_MAX_MTU];
 	pjmedia_rtp_hdr	*rtp;
 	pj_uint8_t	*payload;
 	unsigned	 payload_len;
@@ -358,7 +358,7 @@
 	struct pkt pkt1;
 	pj_timestamp ts;
 	pjmedia_frame frames[16], pcm_frame;
-	short pcm[320];
+	short pcm[PJMEDIA_MAX_MTU];
 	unsigned i, frame_cnt;
 	long samples_cnt, ts_gap;
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/pjsip-perf.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/pjsip-perf.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/pjsip-perf.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/pjsip-perf.c	2022-02-24 07:54:38.000000000 +0000
@@ -460,11 +460,10 @@
 		pjsip_response_addr res_addr;
 
 		pjsip_get_response_addr(tdata->pool, rdata, &res_addr);
-		pjsip_endpt_send_response(app.sip_endpt, &res_addr, tdata, 
+		status = pjsip_endpt_send_response(app.sip_endpt, &res_addr, tdata, 
 					  NULL, NULL);
-
+		if (status != PJ_SUCCESS) pjsip_tx_data_dec_ref(tdata);
 	    } else {
-
 		/* Respond with 500 (Internal Server Error) */
 		pjsip_endpt_respond_stateless(app.sip_endpt, rdata, 500, NULL,
 					      NULL, NULL);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/pjsua2_demo.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/pjsua2_demo.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/pjsua2_demo.cpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/pjsua2_demo.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -24,6 +24,30 @@
 
 using namespace pj;
 
+/* Valid test number:
+ * 0: JSON account config test
+ * 1: call test
+ * 2: JSON endpoint config test
+ * 3: media player and recorder test
+ * 4: simple registration test
+ */
+#define USE_TEST 1
+
+class MyEndpoint : public Endpoint
+{
+public:
+    MyEndpoint() : Endpoint() {};
+    virtual pj_status_t onCredAuth(OnCredAuthParam &prm)
+    {
+        std::cout << "*** Callback onCredAuth called ***" << std::endl;
+        /* Return PJ_ENOTSUP to use
+         * pjsip_auth_create_aka_response()/<b>libmilenage</b> (default),
+         * if PJSIP_HAS_DIGEST_AKA_AUTH is defined.
+         */
+        return PJ_ENOTSUP;
+    }
+};
+
 class MyAccount;
 
 class MyCall : public Call
@@ -127,11 +151,10 @@
 {
     PJ_UNUSED_ARG(prm);
 
-    unsigned i;
     CallInfo ci = getInfo();
     AudioMedia aud_med;
     AudioMedia& play_dev_med =
-    	Endpoint::instance().audDevManager().getPlaybackDevMedia();
+    	MyEndpoint::instance().audDevManager().getPlaybackDevMedia();
 
     try {
     	// Get the first audio media
@@ -174,7 +197,8 @@
 }
 
 
-static void mainProg1(Endpoint &ep)
+#if USE_TEST == 1
+static void mainProg1(MyEndpoint &ep)
 {
     // Init library
     EpConfig ep_cfg;
@@ -194,8 +218,15 @@
     AccountConfig acc_cfg;
     acc_cfg.idUri = "sip:test1@pjsip.org";
     acc_cfg.regConfig.registrarUri = "sip:sip.pjsip.org";
-    acc_cfg.sipConfig.authCreds.push_back( AuthCredInfo("digest", "*",
-                                                        "test1", 0, "test1") );
+
+#if PJSIP_HAS_DIGEST_AKA_AUTH
+    AuthCredInfo aci("Digest", "*", "test", PJSIP_CRED_DATA_EXT_AKA | PJSIP_CRED_DATA_PLAIN_PASSWD, "passwd");
+    aci.akaK = "passwd";
+#else
+    AuthCredInfo aci("digest", "*", "test1", 0, "test1");
+#endif
+
+    acc_cfg.sipConfig.authCreds.push_back(aci);
     MyAccount *acc(new MyAccount);
     try {
 	acc->create(acc_cfg);
@@ -222,7 +253,10 @@
     std::cout << "*** PJSUA2 SHUTTING DOWN ***" << std::endl;
     delete acc; /* Will delete all calls too */
 }
+#endif
+
 
+#if USE_TEST == 2
 static void mainProg2()
 {
     string json_str;
@@ -267,9 +301,11 @@
 	pj_file_delete("jsontest.js");
     }
 }
+#endif
 
 
-static void mainProg3(Endpoint &ep)
+#if USE_TEST == 3
+static void mainProg3(MyEndpoint &ep)
 {
     const char *paths[] = { "../../../../tests/pjsua/wavs/input.16.wav",
 			    "../../tests/pjsua/wavs/input.16.wav",
@@ -326,9 +362,11 @@
 	pj_thread_sleep(5000);
     }
 }
+#endif
 
 
-static void mainProg()
+#if USE_TEST == 0
+static void mainProg(MyEndpoint &)
 {
     string json_str;
 
@@ -355,6 +393,11 @@
 	aci.username = "test";
 	aci.data = "passwd";
 	aci.realm = "*";
+	aci.dataType = PJSIP_CRED_DATA_PLAIN_PASSWD;
+#if PJSIP_HAS_DIGEST_AKA_AUTH
+	aci.dataType |= PJSIP_CRED_DATA_EXT_AKA;
+	aci.akaK = "key";
+#endif
 	accCfg.sipConfig.authCreds.push_back(aci);
 
 	jdoc.writeObject(accCfg);
@@ -378,9 +421,11 @@
 	std::cout << json_str << std::endl << std::endl;
     }
 }
+#endif
 
 
-static void mainProg4(Endpoint &ep)
+#if USE_TEST == 4
+static void mainProg4(MyEndpoint &ep)
 {
     // Init library
     EpConfig ep_cfg;
@@ -408,17 +453,34 @@
 
     delete acc;
 }
+#endif
 
 
+extern "C"
 int main()
 {
     int ret = 0;
-    Endpoint ep;
+    MyEndpoint ep;
 
     try {
 	ep.libCreate();
 
+#if USE_TEST == 0
+	mainProg(ep);
+#endif
+#if USE_TEST == 1
 	mainProg1(ep);
+#endif
+#if USE_TEST == 2
+	mainProg2(ep);
+#endif
+#if USE_TEST == 3
+	mainProg3(ep);
+#endif
+#if USE_TEST == 4
+	mainProg4(ep);
+#endif
+
 	ret = PJ_SUCCESS;
     } catch (Error & err) {
 	std::cout << "Exception: " << err.info() << std::endl;
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/simpleua.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/simpleua.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/simpleua.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/simpleua.c	2022-02-24 07:54:38.000000000 +0000
@@ -272,13 +272,14 @@
      */
     {
 	pj_sockaddr addr;
+	int af = AF;
 
-	pj_sockaddr_init(AF, &addr, NULL, (pj_uint16_t)SIP_PORT);
+	pj_sockaddr_init(af, &addr, NULL, (pj_uint16_t)SIP_PORT);
 	
-	if (AF == pj_AF_INET()) {
+	if (af == pj_AF_INET()) {
 	    status = pjsip_udp_transport_start( g_endpt, &addr.ipv4, NULL, 
 						1, NULL);
-	} else if (AF == pj_AF_INET6()) {
+	} else if (af == pj_AF_INET6()) {
 	    status = pjsip_udp_transport_start6(g_endpt, &addr.ipv6, NULL,
 						1, NULL);
 	} else {
@@ -364,6 +365,9 @@
 #endif
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1);
 
+    /* Create pool. */
+    pool = pjmedia_endpt_create_pool(g_med_endpt, "Media pool", 512, 512);	
+
     /* 
      * Add PCMA/PCMU codec to the media endpoint. 
      */
@@ -375,7 +379,6 @@
 
 #if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
     /* Init video subsystem */
-    pool = pjmedia_endpt_create_pool(g_med_endpt, "Video subsystem", 512, 512);
     status = pjmedia_video_format_mgr_create(pool, 64, 0, NULL);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1);
     status = pjmedia_converter_mgr_create(pool, NULL);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/siprtp.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/siprtp.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/siprtp.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/siprtp.c	2022-02-24 07:54:38.000000000 +0000
@@ -623,8 +623,9 @@
 	    pjsip_response_addr res_addr;
 	    
 	    pjsip_get_response_addr(tdata->pool, rdata, &res_addr);
-	    pjsip_endpt_send_response(app.sip_endpt, &res_addr, tdata,
-		NULL, NULL);
+	    status = pjsip_endpt_send_response(app.sip_endpt, &res_addr, tdata,
+										   NULL, NULL);
+	    if (status != PJ_SUCCESS) pjsip_tx_data_dec_ref(tdata);
 	    
 	} else {
 	    
@@ -732,7 +733,7 @@
 static void timer_disconnect_call( pj_timer_heap_t *timer_heap,
 				   struct pj_timer_entry *entry)
 {
-    struct call *call = entry->user_data;
+    struct call *call = (struct call *)(entry->user_data);
 
     PJ_UNUSED_ARG(timer_heap);
 
@@ -745,7 +746,7 @@
 static void call_on_state_changed( pjsip_inv_session *inv, 
 				   pjsip_event *e)
 {
-    struct call *call = inv->mod_data[mod_siprtp.id];
+    struct call *call = (struct call *)inv->mod_data[mod_siprtp.id];
 
     PJ_UNUSED_ARG(e);
 
@@ -1020,7 +1021,7 @@
     pjmedia_transport_get_info(audio->transport, &tpinfo);
 
     /* Create and initialize basic SDP session */
-    sdp = pj_pool_zalloc (pool, sizeof(pjmedia_sdp_session));
+    sdp = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_session);
 
     pj_gettimeofday(&tv);
     sdp->origin.user = pj_str("pjsip-siprtp");
@@ -1033,7 +1034,7 @@
     /* Since we only support one media stream at present, put the
      * SDP connection line in the session level.
      */
-    sdp->conn = pj_pool_zalloc (pool, sizeof(pjmedia_sdp_conn));
+    sdp->conn = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_conn);
     sdp->conn->net_type = pj_str("IN");
     sdp->conn->addr_type = pj_str("IP4");
     sdp->conn->addr = app.local_addr;
@@ -1046,7 +1047,7 @@
     /* Create media stream 0: */
 
     sdp->media_count = 1;
-    m = pj_pool_zalloc (pool, sizeof(pjmedia_sdp_media));
+    m = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_media);
     sdp->media[0] = m;
 
     /* Standard media info: */
@@ -1075,7 +1076,7 @@
     }
 
     /* Add sendrecv attribute. */
-    attr = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
     attr->name = pj_str("sendrecv");
     m->attr[m->attr_count++] = attr;
 
@@ -1085,12 +1086,12 @@
      */
     m->desc.fmt[m->desc.fmt_count++] = pj_str("121");
     /* Add rtpmap. */
-    attr = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
     attr->name = pj_str("rtpmap");
     attr->value = pj_str("121 telephone-event/8000");
     m->attr[m->attr_count++] = attr;
     /* Add fmtp */
-    attr = pj_pool_zalloc(pool, sizeof(pjmedia_sdp_attr));
+    attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr);
     attr->name = pj_str("fmtp");
     attr->value = pj_str("121 0-15");
     m->attr[m->attr_count++] = attr;
@@ -1189,7 +1190,7 @@
     const void *payload;
     unsigned payload_len;
 
-    strm = user_data;
+    strm = (struct media_stream *)user_data;
 
     /* Discard packet if media is inactive */
     if (!strm->active)
@@ -1228,7 +1229,7 @@
 {
     struct media_stream *strm;
 
-    strm = user_data;
+    strm = (struct media_stream *)user_data;
 
     /* Discard packet if media is inactive */
     if (!strm->active)
@@ -1253,7 +1254,7 @@
 static int media_thread(void *arg)
 {
     enum { RTCP_INTERVAL = 5000, RTCP_RAND = 2000 };
-    struct media_stream *strm = arg;
+    struct media_stream *strm = (struct media_stream *)arg;
     char packet[1500];
     unsigned msec_interval;
     pj_timestamp freq, next_rtp, next_rtcp;
@@ -1402,7 +1403,7 @@
     struct codec *codec_desc = NULL;
     unsigned i;
 
-    call = inv->mod_data[mod_siprtp.id];
+    call = (struct call *)inv->mod_data[mod_siprtp.id];
     audio = &call->media[0];
 
     /* If this is a mid-call media update, then destroy existing media */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/stateful_proxy.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/stateful_proxy.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/stateful_proxy.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/stateful_proxy.c	2022-02-24 07:54:38.000000000 +0000
@@ -346,6 +346,7 @@
     status = pjsip_endpt_send_response(global.endpt, &res_addr, tdata,
 				       NULL, NULL);
     if (status != PJ_SUCCESS) {
+	pjsip_tx_data_dec_ref(tdata);
 	app_perror("Error forwarding response", status);
 	return PJ_TRUE;
     }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/stateless_proxy.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/stateless_proxy.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/stateless_proxy.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/stateless_proxy.c	2022-02-24 07:54:38.000000000 +0000
@@ -163,6 +163,7 @@
     status = pjsip_endpt_send_response(global.endpt, &res_addr, tdata, 
 				       NULL, NULL);
     if (status != PJ_SUCCESS) {
+	pjsip_tx_data_dec_ref(tdata);
 	app_perror("Error forwarding response", status);
 	return PJ_TRUE;
     }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/vid_codec_test.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/vid_codec_test.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/vid_codec_test.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/vid_codec_test.c	2022-02-24 07:54:38.000000000 +0000
@@ -43,10 +43,6 @@
 #include "util.h"
 
 
-static const char *desc = 
- " vid_vodec_test                                                       \n"
-;
-
 #define THIS_FILE	"vid_vodec_test.c"
 
 
@@ -61,10 +57,6 @@
 #define DEF_RENDERER_HEIGHT		    480
 
 
-/* Prototype */
-static void print_stream_stat(pjmedia_vid_stream *stream,
-			      const pjmedia_vid_codec_param *codec_param);
-
 /* Prototype for LIBSRTP utility in file datatypes.c */
 int hex_string_to_octet_string(char *raw, char *hex, int len);
 
@@ -126,13 +118,6 @@
 
 }
 
-/*
- * usage()
- */
-static void usage()
-{
-    puts(desc);
-}
 
 static void show_diff(const pj_uint8_t *buf1, const pj_uint8_t *buf2,
                       unsigned size)
@@ -190,11 +175,14 @@
 	fseek(fhnd, 0, SEEK_SET);
 
 	buf[i] = (pj_uint8_t*)malloc(size[i] + 4);
-	if (!buf[i])
+	if (!buf[i]){
+	    fclose(fhnd);
 	    return;
+	}
 
 	if (fread (buf[i], 1, size[i], fhnd) != (unsigned)size[i]) {
 	    fprintf (stderr, "Unable to read whole file\n");
+	    fclose(fhnd);
 	    return;
 	}
 
@@ -360,7 +348,7 @@
 						         &codec_info, NULL);
 	if (status != PJ_SUCCESS) {
 	    printf("Error: unable to find codec %s\n", codec_id);
-	    return 1;
+	    goto on_exit;
 	}
     } else {
         static pjmedia_vid_codec_info info[1];
@@ -407,7 +395,6 @@
 	pjmedia_frame frm_yuv, frm_enc[MAX_FRAMES];
 	pj_bool_t has_more = PJ_FALSE;
 	const pj_uint8_t start_nal[] = { 0, 0, 1 };
-	unsigned i;
 
 	++ read_cnt;
 
@@ -523,6 +510,9 @@
     /* Shutdown PJLIB */
     pj_shutdown();
 
+    /* Avoid compile warning */
+    PJ_UNUSED_ARG(app_perror);
+
     return (status == PJ_SUCCESS) ? 0 : 1;
 }
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/vid_streamutil.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/vid_streamutil.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/samples/vid_streamutil.c	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/samples/vid_streamutil.c	2022-02-24 07:54:38.000000000 +0000
@@ -104,10 +104,6 @@
 #define DEF_RENDERER_HEIGHT		    480
 
 
-/* Prototype */
-static void print_stream_stat(pjmedia_vid_stream *stream,
-			      const pjmedia_vid_codec_param *codec_param);
-
 /* Hexa string to octet array */
 int my_hex_string_to_octet_string(char *raw, char *hex, int len)
 {
@@ -132,6 +128,7 @@
 
     /* To suppress warning about unused var when all codecs are disabled */
     PJ_UNUSED_ARG(status);
+	PJ_UNUSED_ARG(pf);
 
 #if defined(PJMEDIA_HAS_OPENH264_CODEC) && PJMEDIA_HAS_OPENH264_CODEC != 0
     status = pjmedia_codec_openh264_vid_init(NULL, pf);
@@ -374,7 +371,7 @@
 /*
  * main()
  */
-int main(int argc, char *argv[])
+static int main_func(int argc, char *argv[])
 {
     pj_caching_pool cp;
     pjmedia_endpt *med_endpt;
@@ -1003,6 +1000,11 @@
 }
 
 
+int main(int argc, char *argv[])
+{
+    return pj_run_app(&main_func, argc, argv, 0);
+}
+
 #else
 
 int main(int argc, char *argv[])
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/importsym.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/importsym.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/importsym.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/importsym.py	2022-02-24 07:54:38.000000000 +0000
@@ -54,6 +54,8 @@
 	sys.exit(1)
 
 # Hardcoded!
+# Note for win32:
+# - temporarily comment "#include <pj/compat/socket.h>" in pj/sock.h (line ~29)
 if sys.platform == 'win32':
 	PYCPARSER_DIR="D:/work/tool/pycparser-master"
 elif sys.platform == "linux2":
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/android.iml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/android.iml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/android.iml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/android.iml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/app.iml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/app.iml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/app.iml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/app.iml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":app" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.3" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.3" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/build.gradle asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/build.gradle
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/build.gradle	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/build.gradle	2022-02-24 07:54:38.000000000 +0000
@@ -1,23 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 15
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "org.pjsip.pjsua2.app"
-        minSdkVersion 11
-        targetSdkVersion 15
-
-        ndk {
-            moduleName "libpjsua2"
-        }
-
-        externalNativeBuild {
-            cmake {
-                arguments "-DANDROID_STL=c++_shared"
-            }
-        }
+        minSdkVersion 23
+        targetSdkVersion 29
     }
 
     buildTypes {
@@ -27,3 +16,7 @@
         }
     }
 }
+
+dependencies {
+    implementation project(path: ':pjsua2')
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/AndroidManifest.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/AndroidManifest.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/AndroidManifest.xml	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/AndroidManifest.xml	2022-02-24 07:54:38.000000000 +0000
@@ -4,10 +4,6 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="11"
-        android:targetSdkVersion="15" />
-
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java	2022-02-24 07:54:38.000000000 +0000
@@ -19,6 +19,7 @@
 package org.pjsip.pjsua2.app;
 
 import android.content.IntentFilter;
+import android.hardware.camera2.CameraManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -46,6 +47,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.pjsip.PjCameraInfo2;
 import org.pjsip.pjsua2.*;
 
 public class MainActivity extends Activity
@@ -128,6 +130,9 @@
 	super.onCreate(savedInstanceState);
 	setContentView(R.layout.activity_main);
 
+	CameraManager cm = (CameraManager)getSystemService(Context.CAMERA_SERVICE);
+	PjCameraInfo2.SetCameraManager(cm);
+
 	if (app == null) {
 	    app = new MyApp();
 	    // Wait for GDB to init, for native debugging only
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MyApp.java asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MyApp.java
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MyApp.java	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MyApp.java	2022-02-24 07:54:38.000000000 +0000
@@ -280,21 +280,7 @@
 }
 
 
-class MyApp {
-    static {
-	try{
-	    System.loadLibrary("openh264");
-            // Ticket #1937: libyuv is now included as static lib
-            //System.loadLibrary("yuv");
-	} catch (UnsatisfiedLinkError e) {
-	    System.out.println("UnsatisfiedLinkError: " + e.getMessage());
-	    System.out.println("This could be safely ignored if you " +
-			       "don't need video.");
-	}
-	System.loadLibrary("pjsua2");
-	System.out.println("Library loaded");
-    }
-
+class MyApp extends pjsua2 {
     public static Endpoint ep = new Endpoint();
     public static MyAppObserver observer;
     public ArrayList<MyAccount> accList = new ArrayList<MyAccount>();
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/build.gradle asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/build.gradle
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/build.gradle	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,38 @@
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+}
+
+android {
+    compileSdkVersion 29
+
+    defaultConfig {
+        applicationId "org.pjsip.pjsua2.app_kotlin"
+        minSdkVersion 23
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    implementation project(path: ':pjsua2')
+}
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/proguard-rules.pro asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/proguard-rules.pro
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/proguard-rules.pro	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/proguard-rules.pro	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/AndroidManifest.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/AndroidManifest.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/AndroidManifest.xml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/AndroidManifest.xml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.pjsip.pjsua2.app_kotlin">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <uses-feature android:glEsVersion="0x00020000" android:required="false" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.Android">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/java/org/pjsip/pjsua2/app_kotlin/MainActivity.kt asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/java/org/pjsip/pjsua2/app_kotlin/MainActivity.kt
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/java/org/pjsip/pjsua2/app_kotlin/MainActivity.kt	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/java/org/pjsip/pjsua2/app_kotlin/MainActivity.kt	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,167 @@
+package org.pjsip.pjsua2.app_kotlin
+
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.widget.Button
+import org.pjsip.pjsua2.*
+
+/* Global objects */
+internal object g {
+    /* Maintain reference to avoid auto garbage collecting */
+    lateinit var logWriter: MyLogWriter
+
+    val ep = Endpoint()
+    val acc = MyAccount()
+}
+
+/* Log writer, redirects logs to stdout */
+internal class MyLogWriter : LogWriter() {
+    override fun write(entry: LogEntry) {
+        println(entry.msg)
+    }
+}
+
+/* Account implementation */
+internal class MyAccount : Account() {
+    override fun onIncomingCall(prm: OnIncomingCallParam) {
+        /* Auto answer with 200 for incoming calls  */
+        val call = MyCall(g.acc, prm.callId)
+        val ansPrm = CallOpParam()
+        ansPrm.statusCode = pjsip_status_code.PJSIP_SC_OK
+        try {
+            call.answer(ansPrm)
+        } catch (e: Exception) {
+            println(e)
+        }
+    }
+}
+
+/* Call implementation */
+internal class MyCall(acc: Account, call_id: Int) : Call(acc, call_id) {
+    override fun onCallState(prm: OnCallStateParam?) {
+        val ci : CallInfo
+        try {
+            ci = info
+        } catch (e: Exception) {
+            println(e)
+            return
+        }
+
+        g.ep.utilLogWrite(3, "MyCall", "Call state changed to: " + ci.getStateText())
+        if (ci.state == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED) {
+            g.ep.utilLogWrite(3, "MyCall", this.dump(true, ""))
+        }
+    }
+
+    override fun onCallMediaState(prm: OnCallMediaStateParam?) {
+        val ci : CallInfo
+        try {
+            ci = info
+        } catch (e: Exception) {
+            println(e)
+            return
+        }
+
+        val cmiv = ci.media
+        for (i in cmiv.indices) {
+            val cmi = cmiv[i]
+            if (cmi.type == pjmedia_type.PJMEDIA_TYPE_AUDIO &&
+                    (cmi.status == pjsua_call_media_status.PJSUA_CALL_MEDIA_ACTIVE ||
+                            cmi.status == pjsua_call_media_status.PJSUA_CALL_MEDIA_REMOTE_HOLD))
+            {
+                /* Connect ports */
+                try {
+                    val am = getAudioMedia(i)
+                    g.ep.audDevManager().captureDevMedia.startTransmit(am)
+                    am.startTransmit(g.ep.audDevManager().playbackDevMedia)
+                } catch (e: Exception) {
+                    println("Failed connecting media ports" + e.message)
+                    continue
+                }
+            }
+        }
+    }
+}
+
+class MainActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        /* Setup Start button */
+        val buttonStart = findViewById<Button>(R.id.button_start)
+        buttonStart.setOnClickListener {
+
+            if (g.ep.libGetState() > pjsua_state.PJSUA_STATE_NULL)
+                return@setOnClickListener
+
+            val epConfig = EpConfig()
+
+            /* Setup our log writer */
+            val logCfg = epConfig.logConfig
+            g.logWriter = MyLogWriter()
+            logCfg.writer = g.logWriter
+            logCfg.decor = logCfg.decor and
+                    (pj_log_decoration.PJ_LOG_HAS_CR or
+                            pj_log_decoration.PJ_LOG_HAS_NEWLINE).inv().toLong()
+
+            /* Create & init PJSUA2 */
+            try {
+                g.ep.libCreate()
+                g.ep.libInit(epConfig)
+            } catch (e: Exception) {
+                println(e)
+            }
+
+            /* Create transports and account. */
+            try {
+                val sipTpConfig = TransportConfig()
+                sipTpConfig.port = 5060
+                g.ep.transportCreate(pjsip_transport_type_e.PJSIP_TRANSPORT_UDP,
+                        sipTpConfig)
+
+                val accCfg = AccountConfig()
+                accCfg.idUri = "sip:localhost"
+                g.acc.create(accCfg, true)
+            } catch (e: Exception) {
+                println(e)
+            }
+
+            /* Start PJSUA2 */
+            try {
+                g.ep.libStart()
+            } catch (e: Exception) {
+                println(e)
+            }
+        }
+
+        /* Setup Call button */
+        val buttonCall = findViewById<Button>(R.id.button_call)
+        buttonCall.setOnClickListener {
+            if (g.ep.libGetState() != pjsua_state.PJSUA_STATE_RUNNING)
+                return@setOnClickListener
+
+            try {
+                /* Setup null audio (good for emulator) */
+                g.ep.audDevManager().setNullDev()
+
+                /* Make call (to itself) */
+                val call = MyCall(g.acc, -1)
+                call.makeCall("sip:localhost", CallOpParam(true))
+            } catch (e: Exception) {
+                println(e)
+            }
+        }
+
+        /* Setup Stop button */
+        val buttonStop = findViewById<Button>(R.id.button_stop)
+        buttonStop.setOnClickListener {
+            /* Destroy PJSUA2 */
+            try {
+                g.ep.libDestroy()
+            } catch (e: Exception) {
+                println(e)
+            }
+        }
+    }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/drawable/ic_launcher_background.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/drawable/ic_launcher_background.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/drawable/ic_launcher_background.xml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/drawable/ic_launcher_background.xml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/layout/activity_main.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/layout/activity_main.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/layout/activity_main.xml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/layout/activity_main.xml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_horizontal"
+    android:gravity="center_horizontal"
+    tools:context=".MainActivity">
+
+    <Button
+        android:id="@+id/button_start"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="76dp"
+        android:gravity="center_horizontal"
+        android:text="Start" />
+
+    <Button
+        android:id="@+id/button_call"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="192dp"
+        android:gravity="center_horizontal"
+        android:text="Call" />
+
+    <Button
+        android:id="@+id/button_stop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="308dp"
+        android:gravity="center_horizontal"
+        android:text="Stop" />
+
+</RelativeLayout>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-anydpi-v26/ic_launcher.xml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
Binary files /tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-hdpi/ic_launcher.png and /tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-hdpi/ic_launcher.png differ
Binary files /tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-hdpi/ic_launcher_round.png and /tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
Binary files /tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-mdpi/ic_launcher.png and /tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-mdpi/ic_launcher.png differ
Binary files /tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-mdpi/ic_launcher_round.png and /tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
Binary files /tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-xhdpi/ic_launcher.png and /tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-xhdpi/ic_launcher.png differ
Binary files /tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
Binary files /tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-xxhdpi/ic_launcher.png and /tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
Binary files /tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
Binary files /tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
Binary files /tmp/tmpgod_td0p/c4yCX_i6qB/asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /tmp/tmpgod_td0p/iHWlLhIivf/asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/colors.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/colors.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/colors.xml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/colors.xml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/strings.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/strings.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/strings.xml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/strings.xml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">app-kotlin</string>
+</resources>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/themes.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/themes.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/themes.xml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values/themes.xml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,10 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Android" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimaryDark">@color/purple_700</item>
+        <item name="colorAccent">@color/teal_200</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values-night/themes.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values-night/themes.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values-night/themes.xml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/app-kotlin/src/main/res/values-night/themes.xml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,10 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.Android" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_200</item>
+        <item name="colorPrimaryDark">@color/purple_700</item>
+        <item name="colorAccent">@color/teal_200</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/build.gradle asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/build.gradle
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/build.gradle	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/build.gradle	2022-02-24 07:54:38.000000000 +0000
@@ -1,15 +1,21 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    ext {
+        kotlin_version = '1.3.72'
+    }
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/.gitignore asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/.gitignore
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/.gitignore	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,5 @@
+.gradle
+.idea
+local.properties
+/*/build
+/pjsua2/src/main
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/gradle/wrapper/gradle-wrapper.properties asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/gradle/wrapper/gradle-wrapper.properties
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/gradle/wrapper/gradle-wrapper.properties	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/gradle/wrapper/gradle-wrapper.properties	2022-02-24 07:54:38.000000000 +0000
@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/build.gradle asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/build.gradle
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/build.gradle	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,38 @@
+plugins {
+    id 'com.android.library'
+}
+
+android {
+    compileSdkVersion 29
+
+    defaultConfig {
+        minSdkVersion 23
+        targetSdkVersion 29
+
+
+        ndk {
+            moduleName "libpjsua2"
+        }
+
+        externalNativeBuild {
+            cmake {
+                arguments "-DANDROID_STL=c++_shared"
+            }
+        }
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/proguard-rules.pro asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/proguard-rules.pro
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/proguard-rules.pro	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/proguard-rules.pro	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/src/main/AndroidManifest.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/src/main/AndroidManifest.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/src/main/AndroidManifest.xml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/pjsua2/src/main/AndroidManifest.xml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.pjsip.pjsua2"
+    android:versionCode="1"
+    android:versionName="1.0" >
+</manifest>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/settings.gradle asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/settings.gradle
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/android/settings.gradle	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/android/settings.gradle	2022-02-24 07:54:38.000000000 +0000
@@ -1 +1,3 @@
+include ':app-kotlin'
+include ':pjsua2'
 include ':app'
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/Makefile asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/Makefile
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/java/Makefile	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/java/Makefile	2022-02-24 07:54:38.000000000 +0000
@@ -29,7 +29,7 @@
     LIBPJSUA2_SO=$(OUT_DIR)/libpjsua2.jnilib
   else
     ifeq ($(OS),android)
-      LIBPJSUA2_SO=android/app/src/main/jniLibs/$(TARGET_ARCH)/libpjsua2.so
+      LIBPJSUA2_SO=android/pjsua2/src/main/jniLibs/$(TARGET_ARCH)/libpjsua2.so
     else
       LIBPJSUA2_SO=$(OUT_DIR)/libpjsua2.so
     endif
@@ -148,16 +148,17 @@
   ifeq ($(OS),android)
     MY_JNI_CFLAGS+= -D__ANDROID__
     MY_JNI_LDFLAGS+= -Wl,-soname,libpjsua2.so
+    MY_JNI_LDXXLIBS+= -landroid
     SWIG_FLAGS+= -D__ANDROID__
   endif
 endif
 
 # Build settings
 MY_CFLAGS	 := $(PJ_CXXFLAGS) $(MY_JNI_CFLAGS) $(CFLAGS)
-MY_LDFLAGS	 := $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(MY_JNI_LDFLAGS) $(LDFLAGS)
+MY_LDFLAGS	 := $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(MY_JNI_LDXXLIBS) $(MY_JNI_LDFLAGS) $(LDFLAGS)
 MY_PACKAGE_NAME	 := org.pjsip.pjsua2
 ifeq ($(OS),android)
-  MY_PACKAGE_PATH  := android/app/src/main/java/$(subst .,/,$(MY_PACKAGE_NAME))
+  MY_PACKAGE_PATH  := android/pjsua2/src/main/java/$(subst .,/,$(MY_PACKAGE_NAME))
 else
   MY_PACKAGE_PATH  := $(OUT_DIR)/$(subst .,/,$(MY_PACKAGE_NAME))
 endif
@@ -170,9 +171,9 @@
 
 $(LIBPJSUA2_SO): $(OUT_DIR)/pjsua2_wrap.o
 ifeq ($(OS),android)
-	mkdir -p android/app/src/main/jniLibs/$(TARGET_ARCH)
+	mkdir -p android/pjsua2/src/main/jniLibs/$(TARGET_ARCH)
 	# copy libc++_shared.so manually
-	cp -f ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${TARGET_ARCH}/libc++_shared.so android/app/src/main/jniLibs/$(TARGET_ARCH)
+	cp -f ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${TARGET_ARCH}/libc++_shared.so android/pjsua2/src/main/jniLibs/$(TARGET_ARCH)
 endif
 	$(PJ_CXX) -shared -o $(LIBPJSUA2_SO) $(OUT_DIR)/pjsua2_wrap.o \
 		$(MY_LDFLAGS)
@@ -190,13 +191,18 @@
 
 clean distclean realclean:
 	rm -rf $(LIBPJSUA2_SO) $(OUT_DIR)/* \
-		$(MY_PACKAGE_PATH)/*.java $(MY_PACKAGE_PATH)/*.class
+		$(MY_PACKAGE_PATH)/*.java $(MY_PACKAGE_PATH)/*.class \
+		$(MY_PACKAGE_PATH)/../*.java $(MY_PACKAGE_PATH)/../*.class
 
 java: $(MY_PACKAGE_PATH)/Error.class $(MY_PACKAGE_PATH)/test.class $(MY_PACKAGE_PATH)/sample.class
 ifneq (,$(findstring PJMEDIA_VIDEO_DEV_HAS_ANDROID=1,$(ANDROID_CFLAGS)))
 	@echo "Copying Android camera helper components..."
 	cp $(PJDIR)/pjmedia/src/pjmedia-videodev/android/PjCamera*.java $(MY_PACKAGE_PATH)/..
 endif
+ifneq (,$(findstring PJMEDIA_AUDIO_DEV_HAS_OBOE=1,$(OBOE_CFLAGS)))
+	@echo "Copying Android Oboe audio device helper components..."
+	cp $(PJDIR)/pjmedia/src/pjmedia-audiodev/android/PjAudioDevInfo.java $(MY_PACKAGE_PATH)/..
+endif
 
 $(MY_PACKAGE_PATH)/Error.class: $(MY_PACKAGE_PATH)/Error.java
 	$(MY_JAVAC) -d $(OUT_DIR) $(MY_PACKAGE_PATH)/*.java $(MY_APP_JAVA)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/Makefile asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/Makefile
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/Makefile	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/Makefile	2022-02-24 07:54:38.000000000 +0000
@@ -24,9 +24,9 @@
 
 java python csharp:
 ifeq ($(CMD_is_lang),)
-	$(MAKE) $(MAKE_FLAGS) -C $@ $(MAKECMDGOALS)
+	$(MAKE) $(MAKE_FLAGS) --no-print-directory -C $@ $(MAKECMDGOALS)
 else
-	$(MAKE) $(MAKE_FLAGS) -C $@
+	$(MAKE) $(MAKE_FLAGS) --no-print-directory -C $@
 endif
 
 symbols.i: symbols.lst
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/pjsua2.i asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/pjsua2.i
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/pjsua2.i	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/pjsua2.i	2022-02-24 07:54:38.000000000 +0000
@@ -71,6 +71,24 @@
 #ifdef SWIGJAVA
 %include "enumtypeunsafe.swg"
 %javaconst(1);
+
+%pragma(java) jniclasscode=%{
+  static {
+    try {
+	System.loadLibrary("openh264");
+    } catch (UnsatisfiedLinkError e) {
+	System.err.println("Failed to load native library openh264\n" + e);
+	System.out.println("This could be safely ignored if you " +
+			   "don't use OpenH264 video codec.");
+    }
+    try {
+	System.loadLibrary("pjsua2");
+    } catch (UnsatisfiedLinkError e) {
+	System.err.println("Failed to load native library pjsua2\n" + e);
+    }
+  }
+%}
+
 #endif
 
 %include "symbols.i"
@@ -92,9 +110,11 @@
 //
 %include "std_string.i"
 %include "std_vector.i"
+%include "std_map.i"
 
 %template(StringVector)			std::vector<std::string>;
 %template(IntVector) 			std::vector<int>;
+%template(StringToStringMap) 			std::map<string, string>;
 
 //
 // Ignore stuffs in pjsua2
@@ -195,4 +215,3 @@
 #endif
 
 %include "pjsua2/endpoint.hpp"
-
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/symbols.i asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/symbols.i
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/symbols.i	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/symbols.i	2022-02-24 07:54:38.000000000 +0000
@@ -153,6 +153,7 @@
   PJ_SSL_SOCK_PROTO_TLS1 = 1 << 2,
   PJ_SSL_SOCK_PROTO_TLS1_1 = 1 << 3,
   PJ_SSL_SOCK_PROTO_TLS1_2 = 1 << 4,
+  PJ_SSL_SOCK_PROTO_TLS1_3 = 1 << 5,
   PJ_SSL_SOCK_PROTO_SSL23 = (1 << 16) - 1,
   PJ_SSL_SOCK_PROTO_ALL = PJ_SSL_SOCK_PROTO_SSL23,
   PJ_SSL_SOCK_PROTO_DTLS1 = 1 << 16
@@ -183,6 +184,13 @@
   PJ_SSL_CERT_EUNKNOWN = 1 << 31
 } pj_ssl_cert_verify_flag_t;
 
+typedef enum pj_ice_sess_trickle
+{
+  PJ_ICE_SESS_TRICKLE_DISABLED,
+  PJ_ICE_SESS_TRICKLE_HALF,
+  PJ_ICE_SESS_TRICKLE_FULL
+} pj_ice_sess_trickle;
+
 typedef enum pj_stun_nat_type
 {
   PJ_STUN_NAT_TYPE_UNKNOWN,
@@ -235,12 +243,14 @@
   PJMEDIA_EVENT_RX_RTCP_FB = ((('B' << 24) | ('F' << 16)) | ('T' << 8)) | 'R',
   PJMEDIA_EVENT_AUD_DEV_ERROR = ((('R' << 24) | ('R' << 16)) | ('E' << 8)) | 'A',
   PJMEDIA_EVENT_VID_DEV_ERROR = ((('R' << 24) | ('R' << 16)) | ('E' << 8)) | 'V',
-  PJMEDIA_EVENT_MEDIA_TP_ERR = ((('R' << 24) | ('R' << 16)) | ('E' << 8)) | 'T'
+  PJMEDIA_EVENT_MEDIA_TP_ERR = ((('R' << 24) | ('R' << 16)) | ('E' << 8)) | 'T',
+  PJMEDIA_EVENT_CALLBACK = (((' ' << 24) | (' ' << 16)) | ('B' << 8)) | 'C'
 } pjmedia_event_type;
 
 typedef enum pjmedia_srtp_use
 {
   PJMEDIA_SRTP_DISABLED,
+  PJMEDIA_SRTP_UNKNOWN = PJMEDIA_SRTP_DISABLED,
   PJMEDIA_SRTP_OPTIONAL,
   PJMEDIA_SRTP_MANDATORY
 } pjmedia_srtp_use;
@@ -285,9 +295,17 @@
   PJMEDIA_VID_DEV_CAP_ORIENTATION = 128,
   PJMEDIA_VID_DEV_CAP_SWITCH = 256,
   PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW_FLAGS = 512,
+  PJMEDIA_VID_DEV_CAP_OUTPUT_FULLSCREEN = 1024,
   PJMEDIA_VID_DEV_CAP_MAX = 16384
 } pjmedia_vid_dev_cap;
 
+typedef enum pjmedia_vid_dev_fullscreen_flag
+{
+  PJMEDIA_VID_DEV_WINDOWED = 0,
+  PJMEDIA_VID_DEV_FULLSCREEN = 1,
+  PJMEDIA_VID_DEV_FULLSCREEN_DESKTOP = 2
+} pjmedia_vid_dev_fullscreen_flag;
+
 typedef enum pjmedia_aud_dev_route
 {
   PJMEDIA_AUD_DEV_ROUTE_DEFAULT = 0,
@@ -431,6 +449,7 @@
   PJMEDIA_FORMAT_I420 = ((('0' << 24) | ('2' << 16)) | ('4' << 8)) | 'I',
   PJMEDIA_FORMAT_IYUV = PJMEDIA_FORMAT_I420,
   PJMEDIA_FORMAT_YV12 = ((('2' << 24) | ('1' << 16)) | ('V' << 8)) | 'Y',
+  PJMEDIA_FORMAT_NV12 = ((('2' << 24) | ('1' << 16)) | ('V' << 8)) | 'N',
   PJMEDIA_FORMAT_NV21 = ((('1' << 24) | ('2' << 16)) | ('V' << 8)) | 'N',
   PJMEDIA_FORMAT_I422 = ((('2' << 24) | ('2' << 16)) | ('4' << 8)) | 'I',
   PJMEDIA_FORMAT_I420JPEG = ((('0' << 24) | ('2' << 16)) | ('4' << 8)) | 'J',
@@ -439,10 +458,13 @@
   PJMEDIA_FORMAT_H263 = ((('3' << 24) | ('6' << 16)) | ('2' << 8)) | 'H',
   PJMEDIA_FORMAT_H263P = ((('3' << 24) | ('6' << 16)) | ('2' << 8)) | 'P',
   PJMEDIA_FORMAT_H264 = ((('4' << 24) | ('6' << 16)) | ('2' << 8)) | 'H',
+  PJMEDIA_FORMAT_VP8 = ((('0' << 24) | ('8' << 16)) | ('P' << 8)) | 'V',
+  PJMEDIA_FORMAT_VP9 = ((('0' << 24) | ('9' << 16)) | ('P' << 8)) | 'V',
   PJMEDIA_FORMAT_MJPEG = ((('G' << 24) | ('P' << 16)) | ('J' << 8)) | 'M',
   PJMEDIA_FORMAT_MPEG1VIDEO = ((('V' << 24) | ('1' << 16)) | ('P' << 8)) | 'M',
   PJMEDIA_FORMAT_MPEG2VIDEO = ((('V' << 24) | ('2' << 16)) | ('P' << 8)) | 'M',
-  PJMEDIA_FORMAT_MPEG4 = ((('4' << 24) | ('G' << 16)) | ('P' << 8)) | 'M'
+  PJMEDIA_FORMAT_MPEG4 = ((('4' << 24) | ('G' << 16)) | ('P' << 8)) | 'M',
+  PJMEDIA_FORMAT_INVALID = 0xFFFFFFFF
 } pjmedia_format_id;
 
 typedef enum pjmedia_vid_packing
@@ -493,8 +515,10 @@
   PJSIP_SC_CALL_BEING_FORWARDED = 181,
   PJSIP_SC_QUEUED = 182,
   PJSIP_SC_PROGRESS = 183,
+  PJSIP_SC_EARLY_DIALOG_TERMINATED = 199,
   PJSIP_SC_OK = 200,
   PJSIP_SC_ACCEPTED = 202,
+  PJSIP_SC_NO_NOTIFICATION = 204,
   PJSIP_SC_MULTIPLE_CHOICES = 300,
   PJSIP_SC_MOVED_PERMANENTLY = 301,
   PJSIP_SC_MOVED_TEMPORARILY = 302,
@@ -509,15 +533,31 @@
   PJSIP_SC_NOT_ACCEPTABLE = 406,
   PJSIP_SC_PROXY_AUTHENTICATION_REQUIRED = 407,
   PJSIP_SC_REQUEST_TIMEOUT = 408,
+  PJSIP_SC_CONFLICT = 409,
   PJSIP_SC_GONE = 410,
+  PJSIP_SC_LENGTH_REQUIRED = 411,
+  PJSIP_SC_CONDITIONAL_REQUEST_FAILED = 412,
   PJSIP_SC_REQUEST_ENTITY_TOO_LARGE = 413,
   PJSIP_SC_REQUEST_URI_TOO_LONG = 414,
   PJSIP_SC_UNSUPPORTED_MEDIA_TYPE = 415,
   PJSIP_SC_UNSUPPORTED_URI_SCHEME = 416,
+  PJSIP_SC_UNKNOWN_RESOURCE_PRIORITY = 417,
   PJSIP_SC_BAD_EXTENSION = 420,
   PJSIP_SC_EXTENSION_REQUIRED = 421,
   PJSIP_SC_SESSION_TIMER_TOO_SMALL = 422,
   PJSIP_SC_INTERVAL_TOO_BRIEF = 423,
+  PJSIP_SC_BAD_LOCATION_INFORMATION = 424,
+  PJSIP_SC_USE_IDENTITY_HEADER = 428,
+  PJSIP_SC_PROVIDE_REFERRER_HEADER = 429,
+  PJSIP_SC_FLOW_FAILED = 430,
+  PJSIP_SC_ANONIMITY_DISALLOWED = 433,
+  PJSIP_SC_BAD_IDENTITY_INFO = 436,
+  PJSIP_SC_UNSUPPORTED_CERTIFICATE = 437,
+  PJSIP_SC_INVALID_IDENTITY_HEADER = 438,
+  PJSIP_SC_FIRST_HOP_LACKS_OUTBOUND_SUPPORT = 439,
+  PJSIP_SC_MAX_BREADTH_EXCEEDED = 440,
+  PJSIP_SC_BAD_INFO_PACKAGE = 469,
+  PJSIP_SC_CONSENT_NEEDED = 470,
   PJSIP_SC_TEMPORARILY_UNAVAILABLE = 480,
   PJSIP_SC_CALL_TSX_DOES_NOT_EXIST = 481,
   PJSIP_SC_LOOP_DETECTED = 482,
@@ -531,6 +571,7 @@
   PJSIP_SC_REQUEST_UPDATED = 490,
   PJSIP_SC_REQUEST_PENDING = 491,
   PJSIP_SC_UNDECIPHERABLE = 493,
+  PJSIP_SC_SECURITY_AGREEMENT_NEEDED = 494,
   PJSIP_SC_INTERNAL_SERVER_ERROR = 500,
   PJSIP_SC_NOT_IMPLEMENTED = 501,
   PJSIP_SC_BAD_GATEWAY = 502,
@@ -538,11 +579,14 @@
   PJSIP_SC_SERVER_TIMEOUT = 504,
   PJSIP_SC_VERSION_NOT_SUPPORTED = 505,
   PJSIP_SC_MESSAGE_TOO_LARGE = 513,
+  PJSIP_SC_PUSH_NOTIFICATION_SERVICE_NOT_SUPPORTED = 555,
   PJSIP_SC_PRECONDITION_FAILURE = 580,
   PJSIP_SC_BUSY_EVERYWHERE = 600,
   PJSIP_SC_DECLINE = 603,
   PJSIP_SC_DOES_NOT_EXIST_ANYWHERE = 604,
   PJSIP_SC_NOT_ACCEPTABLE_ANYWHERE = 606,
+  PJSIP_SC_UNWANTED = 607,
+  PJSIP_SC_REJECTED = 608,
   PJSIP_SC_TSX_TIMEOUT = PJSIP_SC_REQUEST_TIMEOUT,
   PJSIP_SC_TSX_TRANSPORT_ERROR = PJSIP_SC_SERVICE_UNAVAILABLE,
   PJSIP_SC__force_32bit = 0x7FFFFFFF
@@ -603,6 +647,7 @@
   PJSIP_TRANSPORT_UDP,
   PJSIP_TRANSPORT_TCP,
   PJSIP_TRANSPORT_TLS,
+  PJSIP_TRANSPORT_DTLS,
   PJSIP_TRANSPORT_SCTP,
   PJSIP_TRANSPORT_LOOP,
   PJSIP_TRANSPORT_LOOP_DGRAM,
@@ -610,7 +655,8 @@
   PJSIP_TRANSPORT_IPV6 = 128,
   PJSIP_TRANSPORT_UDP6 = PJSIP_TRANSPORT_UDP + PJSIP_TRANSPORT_IPV6,
   PJSIP_TRANSPORT_TCP6 = PJSIP_TRANSPORT_TCP + PJSIP_TRANSPORT_IPV6,
-  PJSIP_TRANSPORT_TLS6 = PJSIP_TRANSPORT_TLS + PJSIP_TRANSPORT_IPV6
+  PJSIP_TRANSPORT_TLS6 = PJSIP_TRANSPORT_TLS + PJSIP_TRANSPORT_IPV6,
+  PJSIP_TRANSPORT_DTLS6 = PJSIP_TRANSPORT_DTLS + PJSIP_TRANSPORT_IPV6
 } pjsip_transport_type_e;
 
 enum pjsip_transport_flags_e
@@ -636,6 +682,7 @@
   PJSIP_TLSV1_METHOD = 31,
   PJSIP_TLSV1_1_METHOD = 32,
   PJSIP_TLSV1_2_METHOD = 33,
+  PJSIP_TLSV1_3_METHOD = 34,
   PJSIP_SSLV23_METHOD = 23
 } pjsip_ssl_method;
 
@@ -818,7 +865,8 @@
   PJSUA_CALL_NO_SDP_OFFER = 8,
   PJSUA_CALL_REINIT_MEDIA = 16,
   PJSUA_CALL_UPDATE_VIA = 32,
-  PJSUA_CALL_UPDATE_TARGET = 64
+  PJSUA_CALL_UPDATE_TARGET = 64,
+  PJSUA_CALL_SET_MEDIA_DIR = 128
 } pjsua_call_flag;
 
 typedef enum pjsua_create_media_transport_flag
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/symbols.lst asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/symbols.lst
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/swig/symbols.lst	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/swig/symbols.lst	2022-02-24 07:54:38.000000000 +0000
@@ -4,6 +4,7 @@
 pj/sock_qos.h			pj_qos_type pj_qos_flag pj_qos_wmm_prio pj_qos_params
 pj/ssl_sock.h			pj_ssl_cipher pj_ssl_sock_proto pj_ssl_cert_name_type pj_ssl_cert_verify_flag_t
 
+pjnath/ice_session.h          	pj_ice_sess_trickle
 pjnath/nat_detect.h          	pj_stun_nat_type
 pjnath/turn_session.h          	pj_turn_tp_type
 
@@ -11,7 +12,7 @@
 pjmedia/event.h                 pjmedia_event_type
 pjmedia/transport_srtp.h	pjmedia_srtp_use pjmedia_srtp_crypto_option pjmedia_srtp_keying_method
 pjmedia/vid_stream.h		pjmedia_vid_stream_rc_method
-pjmedia-videodev/videodev.h	pjmedia_vid_dev_index pjmedia_vid_dev_std_index pjmedia_vid_dev_cap
+pjmedia-videodev/videodev.h	pjmedia_vid_dev_index pjmedia_vid_dev_std_index pjmedia_vid_dev_cap pjmedia_vid_dev_fullscreen_flag
 pjmedia-audiodev/audiodev.h 	pjmedia_aud_dev_route pjmedia_aud_dev_cap
 pjmedia/wav_port.h              pjmedia_file_writer_option pjmedia_file_player_option
 pjmedia/tonegen.h		pjmedia_tone_digit pjmedia_tone_digit_map pjmedia_tone_desc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/vidgui/INSTALL.TXT asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/vidgui/INSTALL.TXT
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/vidgui/INSTALL.TXT	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/vidgui/INSTALL.TXT	2022-02-24 07:54:38.000000000 +0000
@@ -22,7 +22,8 @@
 
     Mac OS X
     --------
-      $ qmake -spec macx-g++
+      $ (for Qt5)qmake -spec macx-clang
+        (for Qt4)qmake -spec macx-g++
       $ make
 
     Linux 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/vidgui/vidgui.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/vidgui/vidgui.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/vidgui/vidgui.cpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/vidgui/vidgui.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -293,7 +293,7 @@
 	char uri[256];
 	pjsua_call_setting call_setting;
 
-	pj_ansi_strncpy(uri, dst.toAscii().data(), sizeof(uri));
+	pj_ansi_strncpy(uri, dst.toUtf8().data(), sizeof(uri));
 	pj_str_t uri2 = pj_str((char*)uri);
 
 	pj_assert(currentCall_ == -1);
@@ -659,8 +659,9 @@
     srv->hvalue = pj_str((char*)"pjsua simple registrar");
     pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)srv);
 
-    pjsip_endpt_send_response2(pjsua_get_pjsip_endpt(),
+    pj_status_t status = pjsip_endpt_send_response2(pjsua_get_pjsip_endpt(),
                                rdata, tdata, NULL, NULL);
+    if (status != PJ_SUCCESS) pjsip_tx_data_dec_ref(tdata);
 }
 
 /* Notification on incoming request */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/vidgui/vidgui.pro asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/vidgui/vidgui.pro
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/vidgui/vidgui.pro	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/vidgui/vidgui.pro	2022-02-24 07:54:38.000000000 +0000
@@ -27,8 +27,9 @@
 
 TEMPLATE = app
 CONFIG += thread debug
-TARGET = 
+TARGET = vidgui
 DEPENDPATH += .
+QT += core widgets
 
 # Input
 HEADERS += vidgui.h vidwin.h
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/vidgui/vidwin.cpp asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/vidgui/vidwin.cpp
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/pjsip-apps/src/vidgui/vidwin.cpp	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/pjsip-apps/src/vidgui/vidwin.cpp	2022-02-24 07:54:38.000000000 +0000
@@ -34,7 +34,8 @@
     setAttribute(Qt::WA_UpdatesDisabled);
     setAttribute(Qt::WA_PaintOnScreen);
     setAttribute(Qt::WA_NoSystemBackground);
-    setAttribute(Qt::WA_PaintOutsidePaintEvent);
+    //Deprecated in Qt5
+    //setAttribute(Qt::WA_PaintOutsidePaintEvent);
     setUpdatesEnabled(false);
 
     pj_bzero(&hwnd, sizeof(hwnd));
@@ -209,7 +210,7 @@
 {
     if (!hwnd.info.cocoa.window) return;
 
-    NSWindow *w = (NSWindow*)hwnd.info.cocoa.window;
+    //NSWindow *w = (NSWindow*)hwnd.info.cocoa.window;
 
     size_hint = QSize(300, 200);
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/README.txt asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/README.txt
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/README.txt	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/README.txt	2022-02-24 07:54:38.000000000 +0000
@@ -361,7 +361,7 @@
      * PJSIP Configuration (the pjsip/sip_config.h file)
 
    A     sample    config_site.h    file    is    also    available    in
-   pjlib/include/config_site_sample.h.
+   pjlib/include/pj/config_site_sample.h.
 
 
 Creating config_site.h file
@@ -404,6 +404,7 @@
      * mingw (i386),
      * FreeBSD and maybe other BSD's (i386, Opteron, etc.),
      * RTEMS with cross compilation (ARM, powerpc),
+     * Embox RTOS (i386, ARM including STM32),
      * etc.
 
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/SECURITY.md asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/SECURITY.md
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/SECURITY.md	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/SECURITY.md	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,66 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 2.x   | :white_check_mark: |
+| < 2.0  | :x:                |
+
+## Reporting a Vulnerability
+
+Please email security@pjsip.org
+
+
+Encrypt sensitive information using our PGP public key below.
+
+```
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: User-ID:	Teluu <security@pjsip.org>
+Comment: Created:	7/29/2021 8:24 AM
+Comment: Expires:	7/29/2023 12:00 PM
+Comment: Type:	3,072-bit RSA (secret key available)
+Comment: Usage:	Signing, Encryption, Certifying User-IDs
+Comment: Fingerprint:	C2A9D29D94D131466D8832AE15BA5B3B5DAE8B36
+
+
+mQGNBGECAzwBDADjloGXRtTaSoTj+Nz4uy5Ei8e9CpIe0kEXLUykdr0bxWh7EiUX
+EqkZnFXbt3bWcFTVp7CQMn1as8/AUSteRbKuweLVyx/fFFtxrOQIBNqrwJhwwbmx
+SKLc4Pe/RqT8HmJb+MRnU3rkuzJ4ak0Nh5fLUFL/gBmped8MqBmF8OobJt0U/z/d
+opqVGfnHPablA3nJUcbMW97GJ8FH4cX5ZT+46cbpoJo/L7WbMUpbZcnz+iPiQFFO
+/oO7AbVihdvFNd0SoXi7aE8i8BFIhOYa9nLJId/PMRqG9aFTRP8dOwbOL+EekQ7d
+5x81bQLgjpXogORDxiUns0cFgPBDz5P1Y1qXlQ+HYa8m/vIKnEZMo1mnNhBR40cM
+XyrapeA9WcXiYNo4FBEt6rHoCKpGbMG5Rfpk5u5KljDGxg3tdbuXNfbJPFAOp3IB
+hQ72zhT4rWV31J8IEmoBOT8smf04cEr+jfrjs/ejYJh//Ez7AzMhyoDm1m1ELWwW
+Mzvm5QPtm1pwHakAEQEAAbQaVGVsdXUgPHNlY3VyaXR5QHBqc2lwLm9yZz6JAdQE
+EwEIAD4WIQTCqdKdlNExRm2IMq4Vuls7Xa6LNgUCYQIDPAIbAwUJA8KZlAULCQgH
+AgYVCgkICwIEFgIDAQIeAQIXgAAKCRAVuls7Xa6LNhEGC/4p9GiArgRF0DgVa40O
+JeH8mObjpweBvQc1zpHX2cA9DhkEs/vP0lg29v1248HnnZFz0HBnXKGQVq599jZX
+blm1IphNJSWfkutfjIIH80fqDCuqHOHLhrf0qzDxIAWaSSr0Bh/rGHlsPo2+s35f
+3EMwpkDzETnoLeJMShxAwJOocZBqIieWK2/MZKdLnwn2Evb40BJ63UftFOCf7LuQ
+tbZQ/w2op3Capt+6BL5aNAwnhz5uTgzUE2dLA31YCpWPDJbE1vMy05suzbEqGLu1
+aAFAKocdw1gbFrvEj2nDhH3dD10kQeMtXNPXqtQfRcmQCi8HCetfmFjfB8n5J6YW
+G6dtmiC9RfDgUlrhfTcHRL7ioD2g8jZt2LE2yXulS+8AD10/WQTWkEHYmly0bHAE
+sbAtwNA1asVsuVNUreTirZA0KgTJRySe/WbCyaCXStlTHy2X2aKR0jaNhm56Snpz
+K+aRPTsc6ZFOQOzBMys7hBCAQlCQ0CQyzucMfV3Egl83Qxm5AY0EYQIDPAEMALRb
+OcHPuJ77J+jZGtNAp27/QDXsA1AwvyxDVP+BhZUS3gKXqoyXS3THNEQoqL8GhvZz
+j/sDQo7Hs6p3oEj+HXF2LzlOjiaqObZsYaEBrMo/OS6p/8YvVOa39eTtuvgNVeDB
+EitlH8/pjk5bsZ0KFWqijcqsu0i4ye758UyERZ1ruXHNMB4auow4ZAwqn0vNN0CH
+f1hP/2qMLw5krCgHx1QowMk7S83ljFF5J36ojOuVQjzrCd96eWMHCdUpXbBJv7dd
+firVH9JIOAMDRAEoeX/EjWqeHlPVoOElGUWqAVKveQ0GNdN10hT+1gg0lxqR8f5G
+QDz7u6pDHJHhDQeMH6HYpRLXiXN23AEYnwpzFyw7p22WihV/6rKzGAP7JECZGDsD
+w5x2/YWRcg04MWcnY25f79JM/QWfRGfX6cxdKPxDDgZKUREzESy8/VeefF+xLklg
+O8t9xASz7dU4iSzwdyT5AJX7hIjyJxij8EroQ+4rn4m/zwVE9I9vUNn139kIaQAR
+AQABiQG8BBgBCAAmFiEEwqnSnZTRMUZtiDKuFbpbO12uizYFAmECAzwCGwwFCQPC
+mZQACgkQFbpbO12uizZQHwwAkActQzy2bb6naSAAVgxvobrNuXzO+HygJLgBa37l
+NdFxbBnN0YjYYrjA5PJJZYTcEaedz8Uec2onqTDpsaMDRwouCRayo19WizmSQd34
+DdygKA2CecQdXxKUf/2vxE//Jxq1/Sq0+facynhTygG24aSI44F/iw2h+9Z9JPcM
+BwtNLdGcuWEU2slHcN24sBveBHbTyCe4h52OMr/HBPldAREa2zojF4J8fxTPD6ES
+wx8mWc79sr50EPejw2r3ipKjrbxiB1yDtiry/eZatidb0slGWLzBhawOkZAUrVJh
+DODKf+upkfP8V/MayqRdNNH8FDxYUgxYwnX9+VbtJr7BrvnoyGgOwIuxN5TV+EQt
++Bf7Kzzsqz2/bzsPtnd/F3faAAoOEzby//fdLWUpKcubf7kVq0EQ9bMKwC56rLpd
+BnLaAfcL/676JS3bjJMc3ij3T2doC3IFwj84kNoBk+ArgBFlKjcB84Uket+rj23e
+SjwjgsVZsFg9w1+m0F72hyAQ
+=rD28
+-----END PGP PUBLIC KEY BLOCK-----
+```
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/inc_cfg.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/inc_cfg.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/inc_cfg.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/inc_cfg.py	2022-02-24 07:54:38.000000000 +0000
@@ -3,10 +3,13 @@
 import config_site
 import socket
 import errno
+import time
 
 DEFAULT_ECHO = True
 DEFAULT_TRACE = True
 DEFAULT_START_SIP_PORT = 50000
+DEFAULT_TELNET = True
+DEFAULT_START_TELNET_PORT = 60000
 
 # Shared vars
 ARGS = []		# arguments containing script module & config
@@ -18,6 +21,10 @@
 	name = ""
 	# pjsua command line arguments, concatenated in string
 	arg = ""
+	# Specify whether pjsua telnet CLI is enabled
+	telnet_enabled = DEFAULT_TELNET
+	# Telnet port number, zero to automatically assign
+	telnet_port = 0
 	# Specify whether pjsua output should be echoed to stdout
 	echo_enabled = DEFAULT_ECHO
 	# Enable/disable test tracing
@@ -38,22 +45,46 @@
 			arg, 			# Cmd-line arguments
 			uri="", 		# URI
 			uri_param="",		# Additional URI param
+			telnet_port=0, 		# Telnet port
 			sip_port=0, 		# SIP port
 			have_reg=False,		# Have registration?
 			have_publish=False,	# Have publish?
 			echo_enabled=DEFAULT_ECHO, 
 			trace_enabled=DEFAULT_TRACE,
+			telnet_enabled = DEFAULT_TELNET,
 			enable_buffer = False):
 		# Instance name
 		self.name = name
+		# Give random telnet_port if it's not specified and telnet CLI is enabled
+		if telnet_enabled and telnet_port==0:
+			# avoid port conflict
+			cnt = 0
+			port = 0
+			while cnt < 10:
+				cnt = cnt + 1
+				port = random.randint(DEFAULT_START_TELNET_PORT, 65534)
+				s = socket.socket(socket.AF_INET)
+				try:
+					s.bind(("0.0.0.0", port))
+				except socket.error as serr:
+					s.close()
+					if serr.errno ==  errno.EADDRINUSE:
+						continue
+				s.close()
+				break;
+			self.telnet_port = port
+		else:
+			self.telnet_port = telnet_port
 		# Give random sip_port if it's not specified
 		if sip_port==0:
 			# avoid port conflict
 			cnt = 0
 			port = 0
 			while cnt < 10:
+				port = random.randint(DEFAULT_START_SIP_PORT, 60000)
+				if port==self.telnet_port:
+					continue
 				cnt = cnt + 1
-				port = random.randint(DEFAULT_START_SIP_PORT, 65534)
 				s = socket.socket(socket.AF_INET)
 				try:
 					s.bind(("0.0.0.0", port))
@@ -64,6 +95,8 @@
 				s.close()
 				break;
 			self.sip_port = port
+			# Give some time for socket close
+			time.sleep(0.5)
 		else:
 			self.sip_port = sip_port
 		# Autogenerate URI if it's empty.
@@ -95,7 +128,7 @@
 	# flag if this tes should be skipped
 	skip = None
 	# list of Expect instances, to be filled at run-time by
-        # the test program	
+	# the test program	
 	process = []
 	# the function for test body
 	test_func = None
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/logs/.gitignore asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/logs/.gitignore
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/logs/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/logs/.gitignore	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1 @@
+*
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/mod_call.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/mod_call.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/mod_call.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/mod_call.py	2022-02-24 07:54:38.000000000 +0000
@@ -8,217 +8,341 @@
 # Load configuration
 cfg_file = imp.load_source("cfg_file", ARGS[1])
 
+# Trigger address switch for media flow between ua1 and ua2.
+# When the receiver uses STUN while both sides are actually in the same
+# private network, initial media packets may be sent to public IP address
+# as specified in the receiver SDP and those packets may not be delivered
+# if the NAT does not support hairpinning. This function will make both
+# sides to send some initial packets to trigger destination address switch
+# in media transport, so future packets will be delivered to the correct
+# address (private IP address).
+def hole_punch(ua1, ua2):
+    if ua1.use_telnet:
+        ua1.send("# 987")
+    else:
+        ua1.send("#")
+        ua1.expect("#")
+        ua1.send("987")
+
+    if ua2.use_telnet:
+        ua2.send("# 789")
+    else:
+        ua2.send("#")
+        ua2.expect("#")
+        ua2.send("789")
+
+    time.sleep(0.1)
+
+
 # Check media flow between ua1 and ua2
 def check_media(ua1, ua2):
-	ua1.send("#")
-	ua1.expect("#")
-	ua1.send("1122")
-	ua2.expect(const.RX_DTMF + "1")
-	ua2.expect(const.RX_DTMF + "1")
-	ua2.expect(const.RX_DTMF + "2")
-	ua2.expect(const.RX_DTMF + "2")
+    if ua1.use_telnet:
+        ua1.send("# 1122")
+    else:
+        ua1.send("#")
+        ua1.expect("#")
+        ua1.send("1122")
+    ua2.expect(const.RX_DTMF + "1")
+    ua2.expect(const.RX_DTMF + "1")
+    ua2.expect(const.RX_DTMF + "2")
+    ua2.expect(const.RX_DTMF + "2")
 
 
 # Test body function
 def test_func(t):
-	callee = t.process[0]
-	caller = t.process[1]
+    callee = t.process[0]
+    caller = t.process[1]
 
-	# if have_reg then wait for couple of seconds for PUBLISH
-	# to complete (just in case pUBLISH is used)
-	if callee.inst_param.have_reg:
-		time.sleep(1)
-	if caller.inst_param.have_reg:
-		time.sleep(1)
-
-	# Caller making call
-	caller.send("m")
-	caller.send(t.inst_params[0].uri)
-	caller.expect(const.STATE_CALLING)
-	
-	# Callee waits for call and answers with 180/Ringing
-	time.sleep(0.2)
-	callee.expect(const.EVENT_INCOMING_CALL)
-	callee.send("a")
-	callee.send("180")
-	callee.expect("SIP/2.0 180")
-	caller.expect("SIP/2.0 180")
-
-	# Synchronize stdout
-	caller.sync_stdout()
-	callee.sync_stdout()
-
-	# Callee answers with 200/OK
-	callee.send("a")
-	callee.send("200")
-
-	# Wait until call is connected in both endpoints
-	##time.sleep(0.2)
-	caller.expect(const.STATE_CONFIRMED)
-	callee.expect(const.STATE_CONFIRMED)
-
-	# Synchronize stdout
-	caller.sync_stdout()
-	callee.sync_stdout()
-	##time.sleep(0.1)
-	caller.sync_stdout()
-	callee.sync_stdout()
-
-	# Test that media is okay
-	##time.sleep(0.3)
-	check_media(caller, callee)
-	check_media(callee, caller)
-
-	# Hold call by caller
-	caller.send("H")
-	caller.expect("INVITE sip:")
-	callee.expect("INVITE sip:")
-	callee.expect(const.MEDIA_HOLD)
-	caller.expect(const.MEDIA_HOLD)
-	
-	# Synchronize stdout
-	caller.sync_stdout()
-	callee.sync_stdout()
-
-	# Release hold
-	##time.sleep(0.5)
-	caller.send("v")
-	caller.expect("INVITE sip:")
-	callee.expect("INVITE sip:")
-	callee.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
-	caller.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
-
-	# Synchronize stdout
-	caller.sync_stdout()
-	callee.sync_stdout()
-
-	# Test that media is okay
-	check_media(caller, callee)
-	check_media(callee, caller)
-
-	# Synchronize stdout
-	caller.sync_stdout()
-	callee.sync_stdout()
-
-	# Hold call by callee
-	callee.send("H")
-	callee.expect("INVITE sip:")
-	caller.expect("INVITE sip:")
-	caller.expect(const.MEDIA_HOLD)
-	callee.expect(const.MEDIA_HOLD)
-	
-	# Synchronize stdout
-	caller.sync_stdout()
-	callee.sync_stdout()
-
-	# Release hold
-	##time.sleep(0.1)
-	callee.send("v")
-	callee.expect("INVITE sip:")
-	caller.expect("INVITE sip:")
-	caller.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
-	callee.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
-
-	# Synchronize stdout
-	caller.sync_stdout()
-	callee.sync_stdout()
-
-	# Test that media is okay
-	# Wait for some time for ICE negotiation
-	##time.sleep(0.6)
-	check_media(caller, callee)
-	check_media(callee, caller)
-
-	# Synchronize stdout
-	caller.sync_stdout()
-	callee.sync_stdout()
-
-	# UPDATE (by caller)
-	caller.send("U")
-	#caller.sync_stdout()
-	callee.expect(const.MEDIA_ACTIVE, title="waiting for media active with UPDATE")
-	caller.expect(const.MEDIA_ACTIVE, title="waiting for media active with UPDATE")
-	
-	# Synchronize stdout
-	caller.sync_stdout()
-	callee.sync_stdout()
-
-	# Test that media is okay
-	##time.sleep(0.1)
-	check_media(caller, callee)
-	check_media(callee, caller)
-
-	# UPDATE (by callee)
-	callee.send("U")
-	callee.expect("UPDATE sip:")
-	caller.expect("UPDATE sip:")
-	caller.expect(const.MEDIA_ACTIVE, title="waiting for media active with UPDATE")
-	callee.expect(const.MEDIA_ACTIVE, title="waiting for media active with UPDATE")
-	
-	# Synchronize stdout
-	caller.sync_stdout()
-	callee.sync_stdout()
-
-	# Test that media is okay
-	##time.sleep(0.1)
-	check_media(caller, callee)
-	check_media(callee, caller)
-
-	# Synchronize stdout
-	caller.sync_stdout()
-	callee.sync_stdout()
-
-	# Set codecs in both caller and callee so that there is
-	# no common codec between them.
-	# In caller we only enable PCMU, in callee we only enable PCMA
-	caller.send("Cp")
-	caller.expect("Enter codec")
-	caller.send("* 0")
-	caller.send("Cp")
-	caller.expect("Enter codec")
-	caller.send("pcmu 120")
-	
-	callee.send("Cp")
-	callee.expect("Enter codec")
-	callee.send("* 0")
-	callee.send("Cp")
-	callee.expect("Enter codec")
-	callee.send("pcma 120")
-
-	# Test when UPDATE fails (by callee)
-	callee.send("U")
-	caller.expect("SIP/2.0 488")
-	callee.expect("SIP/2.0 488")
-	callee.sync_stdout()
-	caller.sync_stdout()
-	
-	# Test that media is still okay
-	##time.sleep(0.1)
-	check_media(caller, callee)
-	check_media(callee, caller)
-
-	# Test when UPDATE fails (by caller)
-	caller.send("U")
-	caller.expect("UPDATE sip:")
-	callee.expect("UPDATE sip:")
-	callee.expect("SIP/2.0 488")
-	caller.expect("SIP/2.0 488")
-	caller.sync_stdout()
-	callee.sync_stdout()
-	
-	# Test that media is still okay
-	##time.sleep(0.1)
-	check_media(callee, caller)
-	check_media(caller, callee)
-
-	# Hangup call
-	##time.sleep(0.1)
-	caller.send("h")
-
-	# Wait until calls are cleared in both endpoints
-	caller.expect(const.STATE_DISCONNECTED)
-	callee.expect(const.STATE_DISCONNECTED)
-	
+    # if have_reg then wait for couple of seconds for PUBLISH
+    # to complete (just in case pUBLISH is used)
+    if callee.inst_param.have_reg:
+        time.sleep(1)
+    if caller.inst_param.have_reg:
+        time.sleep(1)
+        
+    # Check if ICE is used
+    use_ice = ("--use-ice" in caller.inst_param.arg) and ("--use-ice" in callee.inst_param.arg)
+
+    # Check if STUN is used (by either side)
+    use_stun = ("--stun-srv" in caller.inst_param.arg) or ("--stun-srv" in callee.inst_param.arg)
+
+    # Check if DTLS-SRTP is used
+    use_dtls_srtp = "--srtp-keying=1" in caller.inst_param.arg
+
+    # Caller making call
+    if caller.use_telnet:
+        caller.send("call new " + t.inst_params[0].uri)
+    else:
+        caller.send("m")
+        caller.send(t.inst_params[0].uri)
+    caller.expect(const.STATE_CALLING)
+    
+    # Callee waits for call and answers with 180/Ringing
+    time.sleep(0.2)
+    callee.expect(const.EVENT_INCOMING_CALL)
+    if callee.use_telnet:
+        callee.send("call answer 180")
+    else:
+        callee.send("a")
+        callee.send("180")
+    callee.expect("SIP/2.0 180")
+    caller.expect("SIP/2.0 180")
+
+    # Synchronize stdout
+    caller.sync_stdout()
+    callee.sync_stdout()
+
+    # Callee answers with 200/OK
+    if callee.use_telnet:
+        callee.send("call answer 200")
+    else:
+        callee.send("a")
+        callee.send("200")
+
+    # Wait until call is connected in both endpoints
+    ##time.sleep(0.2)
+    caller.expect(const.STATE_CONFIRMED)
+    callee.expect(const.STATE_CONFIRMED)
+
+    # Synchronize stdout
+    caller.sync_stdout()
+    callee.sync_stdout()
+    ##time.sleep(0.1)
+    caller.sync_stdout()
+    callee.sync_stdout()
+    
+    # Wait ICE nego before checking media
+    if use_ice:
+        # Unfortunately ICE nego may race with STATE_CONFIRMED (esp. on callee side), so let's just sleep
+        #caller.expect("ICE negotiation success")
+        #callee.expect("ICE negotiation success")
+        # Additional wait for ICE updating address (via UPDATE/re-INVITE)
+        time.sleep(0.5)
+
+    # Wait DTLS-SRTP nego before checking media
+    if use_dtls_srtp:
+        # Unfortunately DTLS-SRTP nego may race with STATE_CONFIRMED, so let's just sleep
+        #caller.expect("SRTP started, keying=DTLS-SRTP")
+        #callee.expect("SRTP started, keying=DTLS-SRTP")
+        time.sleep(0.5)
+
+    # Trigger address switch before checking media
+    if use_stun and not use_ice:
+        hole_punch(caller, callee)
+
+    # Test that media is okay
+    check_media(caller, callee)
+    check_media(callee, caller)
+
+    # Hold call by caller
+    if caller.use_telnet:
+        caller.send("call hold")
+    else:
+        caller.send("H")
+    caller.expect("INVITE sip:")
+    callee.expect("INVITE sip:")
+    callee.expect(const.MEDIA_HOLD)
+    caller.expect(const.MEDIA_HOLD)
+    
+    # Synchronize stdout
+    caller.sync_stdout()
+    callee.sync_stdout()
+
+    # Release hold
+    ##time.sleep(0.5)
+    if caller.use_telnet:
+        caller.send("call reinvite")
+    else:
+        caller.send("v")
+    caller.expect("INVITE sip:")
+    callee.expect("INVITE sip:")
+    callee.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
+    caller.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
+
+    # Synchronize stdout
+    caller.sync_stdout()
+    callee.sync_stdout()
+
+    # Trigger address switch before checking media
+    if use_stun and not use_ice:
+        hole_punch(caller, callee)
+
+    # Test that media is okay
+    check_media(caller, callee)
+    check_media(callee, caller)
+
+    # Synchronize stdout
+    caller.sync_stdout()
+    callee.sync_stdout()
+
+    # Hold call by callee
+    if callee.use_telnet:
+        callee.send("call hold")
+    else:
+        callee.send("H")
+    callee.expect("INVITE sip:")
+    caller.expect("INVITE sip:")
+    caller.expect(const.MEDIA_HOLD)
+    callee.expect(const.MEDIA_HOLD)
+    
+    # Synchronize stdout
+    caller.sync_stdout()
+    callee.sync_stdout()
+
+    # Release hold
+    ##time.sleep(0.1)
+    if callee.use_telnet:
+        callee.send("call reinvite")
+    else:
+        callee.send("v")
+    callee.expect("INVITE sip:")
+    caller.expect("INVITE sip:")
+    caller.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
+    callee.expect(const.MEDIA_ACTIVE, title="waiting for media active after call hold")
+
+    # Synchronize stdout
+    caller.sync_stdout()
+    callee.sync_stdout()
+
+    # Trigger address switch before checking media
+    if use_stun and not use_ice:
+        hole_punch(caller, callee)
+
+    # Test that media is okay
+    # Wait for some time for ICE negotiation
+    ##time.sleep(0.6)
+    check_media(caller, callee)
+    check_media(callee, caller)
+
+    # Synchronize stdout
+    caller.sync_stdout()
+    callee.sync_stdout()
+
+    # UPDATE (by caller)
+    if caller.use_telnet:
+        caller.send("call update")
+    else:
+        caller.send("U")
+    #caller.sync_stdout()
+    callee.expect(const.MEDIA_ACTIVE, title="waiting for media active with UPDATE")
+    caller.expect(const.MEDIA_ACTIVE, title="waiting for media active with UPDATE")
+    
+    # Synchronize stdout
+    caller.sync_stdout()
+    callee.sync_stdout()
+
+    # Trigger address switch before checking media
+    if use_stun and not use_ice:
+        hole_punch(caller, callee)
+
+    # Test that media is okay
+    ##time.sleep(0.1)
+    check_media(caller, callee)
+    check_media(callee, caller)
+
+    # UPDATE (by callee)
+    if callee.use_telnet:
+        callee.send("call update")
+    else:
+        callee.send("U")
+    callee.expect("UPDATE sip:")
+    caller.expect("UPDATE sip:")
+    caller.expect(const.MEDIA_ACTIVE, title="waiting for media active with UPDATE")
+    callee.expect(const.MEDIA_ACTIVE, title="waiting for media active with UPDATE")
+    
+    # Synchronize stdout
+    caller.sync_stdout()
+    callee.sync_stdout()
+
+    # Trigger address switch before checking media
+    if use_stun and not use_ice:
+        hole_punch(caller, callee)
+
+    # Test that media is okay
+    ##time.sleep(0.1)
+    check_media(caller, callee)
+    check_media(callee, caller)
+
+    # Synchronize stdout
+    caller.sync_stdout()
+    callee.sync_stdout()
+
+    # Set codecs in both caller and callee so that there is
+    # no common codec between them.
+    # In caller we only enable PCMU, in callee we only enable PCMA
+    if caller.use_telnet:
+        caller.send("Cp * 0")
+        caller.send("Cp")
+        caller.expect("PCMU/8000.* prio: 0")
+        caller.send("Cp PCMU 120")
+        caller.send("Cp")
+        caller.expect("PCMU/8000.* prio: 120")
+    else:
+        caller.send("Cp")
+        caller.expect("Enter codec")
+        caller.send("* 0")
+        caller.send("Cp")
+        caller.expect("Enter codec")
+        caller.send("pcmu 120")
+
+    if callee.use_telnet:
+        callee.send("Cp * 0")
+        callee.send("Cp")
+        callee.expect("PCMA/8000.* prio: 0")
+        callee.send("Cp PCMA 120")
+        callee.send("Cp")
+        callee.expect("PCMA/8000.* prio: 120")
+    else:
+        callee.send("Cp")
+        callee.expect("Enter codec")
+        callee.send("* 0")
+        callee.send("Cp")
+        callee.expect("Enter codec")
+        callee.send("pcma 120")
+
+    # Test when UPDATE fails (by callee)
+    if callee.use_telnet:
+        callee.send("call update")
+    else:
+        callee.send("U")
+    caller.expect("SIP/2.0 488")
+    callee.expect("SIP/2.0 488")
+    callee.sync_stdout()
+    caller.sync_stdout()
+    
+    # Test that media is still okay
+    ##time.sleep(0.1)
+    check_media(caller, callee)
+    check_media(callee, caller)
+
+    # Test when UPDATE fails (by caller)
+    if caller.use_telnet:
+        caller.send("call update")
+    else:
+        caller.send("U")
+    caller.expect("UPDATE sip:")
+    callee.expect("UPDATE sip:")
+    callee.expect("SIP/2.0 488")
+    caller.expect("SIP/2.0 488")
+    caller.sync_stdout()
+    callee.sync_stdout()
+    
+    # Test that media is still okay
+    ##time.sleep(0.1)
+    check_media(callee, caller)
+    check_media(caller, callee)
+
+    # Hangup call
+    ##time.sleep(0.1)
+    if caller.use_telnet:
+        caller.send("call hangup")
+    else:
+        caller.send("h")
+
+    # Wait until calls are cleared in both endpoints
+    caller.expect(const.STATE_DISCONNECTED)
+    callee.expect(const.STATE_DISCONNECTED)
+    
 
 # Here where it all comes together
 test = cfg_file.test_param
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/mod_media_playrec.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/mod_media_playrec.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/mod_media_playrec.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/mod_media_playrec.py	2022-02-24 07:54:38.000000000 +0000
@@ -3,10 +3,10 @@
 # PLAYFILE -> RECFILE:
 # Input file is played and is recorded to output, then compare them.
 # Useful to tes clock rates compatibility and resample quality
-#	null-audio
-#	port 1: wav file input xxxxxx.clock_rate.wav, e.g: test1.8.wav
-#	port 2: wav file ouput xxxxxx.clock_rate.wav, e.g: res1.8.wav
-#	wav input must be more than 3 seconds long
+#    null-audio
+#    port 1: wav file input xxxxxx.clock_rate.wav, e.g: test1.8.wav
+#    port 2: wav file ouput xxxxxx.clock_rate.wav, e.g: res1.8.wav
+#    wav input must be more than 3 seconds long
 
 import time
 import imp
@@ -33,73 +33,73 @@
 COMPARE_THRESHOLD = 2
 
 # COMPARE params
-input_filename	= ""			# Input filename
-output_filename = ""			# Output filename
+input_filename  = ""	# Input filename
+output_filename = ""	# Output filename
 
 # Test body function
 def test_func(t):
-	global input_filename
-	global output_filename
+    global input_filename
+    global output_filename
 
-	endpt = t.process[0]
-	
-	# Get input file name
-	input_filename = re.compile(const.MEDIA_PLAY_FILE).search(endpt.inst_param.arg).group(1)
-	endpt.trace("Input file = " + input_filename)
-
-	# Get output file name
-	output_filename = re.compile(const.MEDIA_REC_FILE).search(endpt.inst_param.arg).group(1)
-	endpt.trace("Output file = " + output_filename)
-
-	# Find appropriate clock rate for the input file
-	clock_rate = re.compile(".+(\.\d+\.wav)$").match(output_filename).group(1)
-	if (clock_rate==None):
-		endpt.trace("Cannot compare input & output, incorrect output filename format")
-		return
-	input_filename = re.sub("\.\d+\.wav$", clock_rate, input_filename)
-	endpt.trace("WAV file to be compared with output = " + input_filename)
-
-	# Connect input-output file
-	endpt.sync_stdout()
-
-	endpt.send("cc 1 2")
-	endpt.expect(const.MEDIA_CONN_PORT_SUCCESS)
-
-	# Wait
-	time.sleep(3)
-
-	endpt.sync_stdout()
-
-	# Disconnect input-output file
-	endpt.send("cd 1 2")
-	endpt.expect(const.MEDIA_DISCONN_PORT_SUCCESS)
+    endpt = t.process[0]
+    
+    # Get input file name
+    input_filename = re.compile(const.MEDIA_PLAY_FILE).search(endpt.inst_param.arg).group(1)
+    endpt.trace("Input file = " + input_filename)
+
+    # Get output file name
+    output_filename = re.compile(const.MEDIA_REC_FILE).search(endpt.inst_param.arg).group(1)
+    endpt.trace("Output file = " + output_filename)
+
+    # Find appropriate clock rate for the input file
+    clock_rate = re.compile(".+(\.\d+\.wav)$").match(output_filename).group(1)
+    if (clock_rate==None):
+        endpt.trace("Cannot compare input & output, incorrect output filename format")
+        return
+    input_filename = re.sub("\.\d+\.wav$", clock_rate, input_filename)
+    endpt.trace("WAV file to be compared with output = " + input_filename)
+
+    # Connect input-output file
+    endpt.sync_stdout()
+
+    endpt.send("cc 1 2")
+    endpt.expect(const.MEDIA_CONN_PORT_SUCCESS)
+
+    # Wait
+    time.sleep(3)
+
+    endpt.sync_stdout()
+
+    # Disconnect input-output file
+    endpt.send("cd 1 2")
+    endpt.expect(const.MEDIA_DISCONN_PORT_SUCCESS)
 
 
 # Post body function
 def post_func(t):
-	global input_filename
-	global output_filename
+    global input_filename
+    global output_filename
 
-	endpt = t.process[0]
+    endpt = t.process[0]
 
-	# Check WAV similarity
-	fullcmd = COMPARE_WAV_EXE + " " + input_filename + " " + output_filename + " " + "3000"
-	endpt.trace("Popen " + fullcmd)
-	cmp_proc = subprocess.Popen(fullcmd, shell=G_INUNIX, stdout=subprocess.PIPE, universal_newlines=True)
-
-	# Parse similarity ouput
-	line = cmp_proc.stdout.readline()
-	mo_sim_val = re.match(".+=\s+(\d+)", line)
-	if (mo_sim_val == None):
-		raise TestError("Error comparing WAV files")
-		return
-
-	# Evaluate the similarity value
-	sim_val = mo_sim_val.group(1)
-	if (sim_val >= COMPARE_THRESHOLD):
-		endpt.trace("WAV similarity = " + sim_val)
-	else:
-		raise TestError("WAV degraded heavily, similarity = " + sim_val)
+    # Check WAV similarity
+    fullcmd = COMPARE_WAV_EXE + " " + input_filename + " " + output_filename + " " + "3000"
+    endpt.trace("Popen " + fullcmd)
+    cmp_proc = subprocess.Popen(fullcmd, shell=G_INUNIX, stdout=subprocess.PIPE, universal_newlines=True)
+
+    # Parse similarity ouput
+    line = cmp_proc.stdout.readline()
+    mo_sim_val = re.match(".+=\s+(\d+)", line)
+    if (mo_sim_val == None):
+        raise TestError("Error comparing WAV files")
+        return
+
+    # Evaluate the similarity value
+    sim_val = mo_sim_val.group(1)
+    if (sim_val >= COMPARE_THRESHOLD):
+        endpt.trace("WAV similarity = " + sim_val)
+    else:
+        raise TestError("WAV degraded heavily, similarity = " + sim_val)
 
 
 # Here where it all comes together
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/mod_pesq.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/mod_pesq.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/mod_pesq.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/mod_pesq.py	2022-02-24 07:54:38.000000000 +0000
@@ -26,138 +26,145 @@
 cfg_file = imp.load_source("cfg_file", ARGS[1])
 
 # PESQ configs
-PESQ = "tools/pesq"			# PESQ executable path
-PESQ_DEFAULT_THRESHOLD = 3.4		# Default minimum acceptable PESQ MOS value
+PESQ = "tools/pesq"				# PESQ executable path
+PESQ_DEFAULT_THRESHOLD = 3.4	# Default minimum acceptable PESQ MOS value
 
 # PESQ params
 pesq_sample_rate_opt = ""		# Sample rate option for PESQ
-input_filename	= ""			# Input/Reference filename
+input_filename    = ""			# Input/Reference filename
 output_filename = ""			# Output/Degraded filename
 
 
 # Test body function
 def test_func(t):
-	global pesq_sample_rate_opt
-	global input_filename
-	global output_filename
-
-	ua1 = t.process[0]
-	ua2 = t.process[1]
-
-	# Get input file name
-	input_filename = re.compile(const.MEDIA_PLAY_FILE).search(ua1.inst_param.arg).group(1)
-
-	# Get output file name
-	output_filename = re.compile(const.MEDIA_REC_FILE).search(ua2.inst_param.arg).group(1)
-
-	# Get WAV input length, in seconds
-	fin = wave.open(input_filename, "r")
-	if fin == None:
-		raise TestError("Failed opening input WAV file")
-	inwavlen = fin.getnframes() * 1.0 / fin.getframerate()
-	inwavlen += 0.2
-	fin.close()
-	print "WAV input len = " + str(inwavlen) + "s"
-
-	# Get clock rate of the output
-	mo_clock_rate = re.compile("\.(\d+)\.wav").search(output_filename)
-	if (mo_clock_rate==None):
-		raise TestError("Cannot compare input & output, incorrect output filename format")
-	clock_rate = mo_clock_rate.group(1)
-	
-	# Get channel count of the output
-	channel_count = 1
-	if re.search("--stereo", ua2.inst_param.arg) != None:
-		channel_count = 2
-	
-	# Get matched input file from output file
-	# (PESQ evaluates only files whose same clock rate & channel count)
-	if channel_count == 2:
-	    if re.search("\.\d+\.\d+\.wav", input_filename) != None:
-		    input_filename = re.sub("\.\d+\.\d+\.wav", "." + str(channel_count) + "."+clock_rate+".wav", input_filename)
-	    else:
-		    input_filename = re.sub("\.\d+\.wav", "." + str(channel_count) + "."+clock_rate+".wav", input_filename)
-
-	if (clock_rate != "8") & (clock_rate != "16"):
-		raise TestError("PESQ only works on clock rate 8kHz or 16kHz, clock rate used = "+clock_rate+ "kHz")
-
-	# Get conference clock rate of UA2 for PESQ sample rate option
-	pesq_sample_rate_opt = "+" + clock_rate + "000"
-
-	# UA1 making call
-	ua1.send("m")
-	ua1.send(t.inst_params[1].uri)
-	ua1.expect(const.STATE_CALLING)
-
-	# UA2 wait until call established
-	ua2.expect(const.STATE_CONFIRMED)
-
-	ua1.sync_stdout()
-	ua2.sync_stdout()
-	time.sleep(2)
-
-	# Disconnect mic -> rec file, to avoid echo recorded when using sound device
-	# Disconnect stream -> spk, make it silent
-	# Connect stream -> rec file, start recording
-	ua2.send("cd 0 1\ncd 4 0\ncc 4 1")
-
-	# Disconnect mic -> stream, make stream purely sending from file
-	# Disconnect stream -> spk, make it silent
-	# Connect file -> stream, start sending
-	ua1.send("cd 0 4\ncd 4 0\ncc 1 4")
-
-	time.sleep(inwavlen)
-
-	# Disconnect files from bridge
-	ua2.send("cd 4 1")
-	ua2.expect(const.MEDIA_DISCONN_PORT_SUCCESS)
-	ua1.send("cd 1 4")
-	ua1.expect(const.MEDIA_DISCONN_PORT_SUCCESS)
+    global pesq_sample_rate_opt
+    global input_filename
+    global output_filename
+
+    ua1 = t.process[0]
+    ua2 = t.process[1]
+
+    # Get input file name
+    input_filename = re.compile(const.MEDIA_PLAY_FILE).search(ua1.inst_param.arg).group(1)
+
+    # Get output file name
+    output_filename = re.compile(const.MEDIA_REC_FILE).search(ua2.inst_param.arg).group(1)
+
+    # Get WAV input length, in seconds
+    fin = wave.open(input_filename, "r")
+    if fin == None:
+        raise TestError("Failed opening input WAV file")
+    inwavlen = fin.getnframes() * 1.0 / fin.getframerate()
+    inwavlen += 0.2
+    fin.close()
+    print "WAV input len = " + str(inwavlen) + "s"
+
+    # Get clock rate of the output
+    mo_clock_rate = re.compile("\.(\d+)\.wav").search(output_filename)
+    if (mo_clock_rate==None):
+        raise TestError("Cannot compare input & output, incorrect output filename format")
+    clock_rate = mo_clock_rate.group(1)
+    
+    # Get channel count of the output
+    channel_count = 1
+    if re.search("--stereo", ua2.inst_param.arg) != None:
+        channel_count = 2
+    
+    # Get matched input file from output file
+    # (PESQ evaluates only files whose same clock rate & channel count)
+    if channel_count == 2:
+        if re.search("\.\d+\.\d+\.wav", input_filename) != None:
+            input_filename = re.sub("\.\d+\.\d+\.wav", "." + str(channel_count) + "."+clock_rate+".wav", input_filename)
+        else:
+            input_filename = re.sub("\.\d+\.wav", "." + str(channel_count) + "."+clock_rate+".wav", input_filename)
+
+    if (clock_rate != "8") & (clock_rate != "16"):
+        raise TestError("PESQ only works on clock rate 8kHz or 16kHz, clock rate used = "+clock_rate+ "kHz")
+
+    # Get conference clock rate of UA2 for PESQ sample rate option
+    pesq_sample_rate_opt = "+" + clock_rate + "000"
+
+    # UA1 making call
+    if ua1.use_telnet:
+        ua1.send("call new " + t.inst_params[1].uri)
+    else:
+        ua1.send("m")
+        ua1.send(t.inst_params[1].uri)
+    ua1.expect(const.STATE_CALLING)
+
+    # UA2 wait until call established
+    ua2.expect(const.STATE_CONFIRMED)
+
+    ua1.sync_stdout()
+    ua2.sync_stdout()
+    time.sleep(2)
+
+    # Disconnect mic -> rec file, to avoid echo recorded when using sound device
+    # Disconnect stream -> spk, make it silent
+    # Connect stream -> rec file, start recording
+    ua2.send("cd 0 1")
+    ua2.send("cd 4 0")
+    ua2.send("cc 4 1")
+
+    # Disconnect mic -> stream, make stream purely sending from file
+    # Disconnect stream -> spk, make it silent
+    # Connect file -> stream, start sending
+    ua1.send("cd 0 4")
+    ua1.send("cd 4 0")
+    ua1.send("cc 1 4")
+
+    time.sleep(inwavlen)
+
+    # Disconnect files from bridge
+    ua2.send("cd 4 1")
+    ua2.expect(const.MEDIA_DISCONN_PORT_SUCCESS)
+    ua1.send("cd 1 4")
+    ua1.expect(const.MEDIA_DISCONN_PORT_SUCCESS)
 
 
 # Post body function
 def post_func(t):
-	global pesq_sample_rate_opt
-	global input_filename
-	global output_filename
-
-	endpt = t.process[0]
-
-	# Execute PESQ
-	fullcmd = os.path.normpath(PESQ) + " " + pesq_sample_rate_opt + " " + input_filename + " " + output_filename
-	endpt.trace("Popen " + fullcmd)
-	pesq_proc = subprocess.Popen(fullcmd, shell=True, stdout=subprocess.PIPE, universal_newlines=True)
-	pesq_out  = pesq_proc.communicate()
-
-	# Parse ouput
-	mo_pesq_out = re.compile("Prediction[^=]+=\s+([\-\d\.]+)\s*").search(pesq_out[0])
-	if (mo_pesq_out == None):
-		raise TestError("Failed to fetch PESQ result")
-
-	# Get threshold
-	if (cfg_file.pesq_threshold != None) | (cfg_file.pesq_threshold > -0.5 ):
-		threshold = cfg_file.pesq_threshold
-	else:
-		threshold = PESQ_DEFAULT_THRESHOLD
-
-	# Evaluate the PESQ MOS value
-	pesq_res = mo_pesq_out.group(1)
-	if (float(pesq_res) >= threshold):
-		endpt.trace("Success, PESQ result = " + pesq_res + " (target=" + str(threshold) + ").")
-	else:
-		endpt.trace("Failed, PESQ result = " + pesq_res + " (target=" + str(threshold) + ").")
-		# Save the wav file
-		wavoutname = ARGS[1]
-		wavoutname = re.sub("[\\\/]", "_", wavoutname)
-		wavoutname = re.sub("\.py$", ".wav", wavoutname)
-		wavoutname = "logs/" + wavoutname
-		try:
-			shutil.copyfile(output_filename, wavoutname)
-			print "Output WAV is copied to " + wavoutname
-		except:
-			print "Couldn't copy output WAV, please check if 'logs' directory exists."
+    global pesq_sample_rate_opt
+    global input_filename
+    global output_filename
+
+    endpt = t.process[0]
+
+    # Execute PESQ
+    fullcmd = os.path.normpath(PESQ) + " " + pesq_sample_rate_opt + " " + input_filename + " " + output_filename
+    endpt.trace("Popen " + fullcmd)
+    pesq_proc = subprocess.Popen(fullcmd, shell=True, stdout=subprocess.PIPE, universal_newlines=True)
+    pesq_out  = pesq_proc.communicate()
+
+    # Parse ouput
+    mo_pesq_out = re.compile("Prediction[^=]+=\s+([\-\d\.]+)\s*").search(pesq_out[0])
+    if (mo_pesq_out == None):
+        raise TestError("Failed to fetch PESQ result")
+
+    # Get threshold
+    if (cfg_file.pesq_threshold != None) | (cfg_file.pesq_threshold > -0.5 ):
+        threshold = cfg_file.pesq_threshold
+    else:
+        threshold = PESQ_DEFAULT_THRESHOLD
+
+    # Evaluate the PESQ MOS value
+    pesq_res = mo_pesq_out.group(1)
+    if (float(pesq_res) >= threshold):
+        endpt.trace("Success, PESQ result = " + pesq_res + " (target=" + str(threshold) + ").")
+    else:
+        endpt.trace("Failed, PESQ result = " + pesq_res + " (target=" + str(threshold) + ").")
+        # Save the wav file
+        wavoutname = ARGS[1]
+        wavoutname = re.sub("[\\\/]", "_", wavoutname)
+        wavoutname = re.sub("\.py$", ".wav", wavoutname)
+        wavoutname = "logs/" + wavoutname
+        try:
+            shutil.copyfile(output_filename, wavoutname)
+            print "Output WAV is copied to " + wavoutname
+        except:
+            print "Couldn't copy output WAV, please check if 'logs' directory exists."
 
-		raise TestError("WAV seems to be degraded badly, PESQ = "+ pesq_res + " (target=" + str(threshold) + ").")
+        raise TestError("WAV seems to be degraded badly, PESQ = "+ pesq_res + " (target=" + str(threshold) + ").")
 
 
 # Here where it all comes together
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/mod_pres.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/mod_pres.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/mod_pres.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/mod_pres.py	2022-02-24 07:54:38.000000000 +0000
@@ -11,112 +11,140 @@
 
 # Test body function
 def test_func(t):
-	u1 = t.process[0]
-	uri1 = cfg_file.test_param.inst_params[0].uri
-	acc1 = "-1"
-	u2 = t.process[1]
-	uri2 = cfg_file.test_param.inst_params[1].uri
-	acc2 = "-1"
-
-	# if have_reg then wait for couple of seconds for PUBLISH
-	# to complete (just in case pUBLISH is used)
-	if u1.inst_param.have_reg:
-		time.sleep(1)
-	if u2.inst_param.have_reg:
-		time.sleep(1)
-
-	# U1 adds U2 as buddy
-	u1.send("+b")
-	u1.send(uri2)
-	u1.expect("Subscription state changed NULL --> SENT")
-	u1.expect("Presence subscription.*is ACCEPTED")
-	if not u2.inst_param.have_publish:
-		# Process incoming SUBSCRIBE in U2
-		# Finds out which account gets the subscription in U2
-		line = u2.expect("pjsua_pres.*subscription.*using account")
-		acc2 = line.split("using account ")[1]
-	# wait until we've got Online notification
-	u1.expect(uri2 + ".*Online")
-
-	# Synchronize stdout
-	u1.sync_stdout()
-	u2.sync_stdout()
-
-	# U2 adds U1 as buddy
-	u2.send("+b")
-	u2.send(uri1)
-	u2.expect("Subscription state changed NULL --> SENT")
-	u2.expect("Presence subscription.*is ACCEPTED")
-	if not u1.inst_param.have_publish:
-		# Process incoming SUBSCRIBE in U1
-		# Finds out which account gets the subscription in U1
-		line = u1.expect("pjsua_pres.*subscription.*using account")
-		acc1 = line.split("using account ")[1]
-	# wait until we've got Online notification
-	u2.expect(uri1 + ".*Online")
-
-	# Synchronize stdout
-	u1.sync_stdout()
-	u2.sync_stdout()
-
-	# Set current account in both U1 and U2
-	if acc1!="-1":
-		u1.send(">")
-		u1.send(acc1)
-		u1.expect("Current account changed")
-	if acc2!="-1":
-		u2.send(">")
-		u2.send(acc2)
-		u2.expect("Current account changed")
-
-	# Synchronize stdout
-	u1.sync_stdout()
-	u2.sync_stdout()
-
-	# u2 toggles online status
-	u2.send("t")
-	u1.expect(uri2 + ".*status.*Offline")
-	u2.expect("offline")
-	
-	# Synchronize stdout
-	u1.sync_stdout()
-	u2.sync_stdout()
-
-	# u1 toggles online status
-	u1.send("t")
-	u2.expect(uri1 + ".*status.*Offline")
-	u1.expect("offline")
-
-	# Synchronize stdout
-	u1.sync_stdout()
-	u2.sync_stdout()
-
-	# u2 set online status to On the phone
-	u2.send("T")
-	u2.send("3")
-	u1.expect(uri2 + ".*status.*On the phone")
-	u2.expect("On the phone")
-	
-	# Synchronize stdout
-	u1.sync_stdout()
-	u2.sync_stdout()
-
-	# Synchronize stdout
-	u1.sync_stdout()
-	u2.sync_stdout()
-
-	# U1 send IM
-	im_text = "Hello World from U1"
-	u1.send("i")
-	u1.send(uri2)
-	u2.expect(" is typing")
-	u1.send(im_text)
-	u1.expect(im_text+".*delivered successfully")
-	u2.expect("MESSAGE from.*"+im_text)
-	
-	# Synchronize stdout
-	u1.sync_stdout()
-	u2.sync_stdout()
+    u1 = t.process[0]
+    uri1 = cfg_file.test_param.inst_params[0].uri
+    acc1 = "-1"
+    u2 = t.process[1]
+    uri2 = cfg_file.test_param.inst_params[1].uri
+    acc2 = "-1"
+
+    # if have_reg then wait for couple of seconds for PUBLISH
+    # to complete (just in case pUBLISH is used)
+    if u1.inst_param.have_reg:
+        time.sleep(1)
+    if u2.inst_param.have_reg:
+        time.sleep(1)
+
+    # U1 adds U2 as buddy
+    if u1.use_telnet:
+        u1.send("im add_b " + uri2)
+    else:
+        u1.send("+b")
+        u1.send(uri2)
+    u1.expect("Subscription state changed NULL --> SENT")
+    u1.expect("Presence subscription.*is ACCEPTED")
+    if not u2.inst_param.have_publish:
+        # Process incoming SUBSCRIBE in U2
+        # Finds out which account gets the subscription in U2
+        line = u2.expect("pjsua_pres.*subscription.*using account")
+        acc2 = line.split("using account ")[1]
+    # wait until we've got Online notification
+    u1.expect(uri2 + ".*Online")
+
+    # Synchronize stdout
+    u1.sync_stdout()
+    u2.sync_stdout()
+
+    # U2 adds U1 as buddy
+    if u2.use_telnet:
+        u2.send("im add_b " + uri1)
+    else:
+        u2.send("+b")
+        u2.send(uri1)
+    u2.expect("Subscription state changed NULL --> SENT")
+    # sometime it is NULL->SENT->ACCEPTED->ACTIVE
+    # some othertime NULL->SENT->ACTIVE
+    #u2.expect("Presence subscription.*is ACCEPTED")
+    u2.expect("Presence subscription.*is ACTIVE")
+    if not u1.inst_param.have_publish:
+        # Process incoming SUBSCRIBE in U1
+        # Finds out which account gets the subscription in U1
+        line = u1.expect("pjsua_pres.*subscription.*using account")
+        acc1 = line.split("using account ")[1]
+    # wait until we've got Online notification
+    u2.expect(uri1 + ".*Online")
+
+    # Synchronize stdout
+    u1.sync_stdout()
+    u2.sync_stdout()
+
+    # Set current account in both U1 and U2
+    if acc1!="-1":
+        if u1.use_telnet:
+            u1.send("acc prev " + acc1)
+        else:
+            u1.send(">")
+            u1.send(acc1)
+        u1.expect("Current account changed")
+    if acc2!="-1":
+        if u2.use_telnet:
+            u2.send("acc prev " + acc2)
+        else:
+            u2.send(">")
+            u2.send(acc2)
+        u2.expect("Current account changed")
+
+    # Synchronize stdout
+    u1.sync_stdout()
+    u2.sync_stdout()
+
+    # u2 toggles online status
+    if u2.use_telnet:
+        u2.send("im tog_state")
+    else:
+        u2.send("t")
+    u1.expect(uri2 + ".*status.*Offline")
+    u2.expect("offline")
+    
+    # Synchronize stdout
+    u1.sync_stdout()
+    u2.sync_stdout()
+
+    # u1 toggles online status
+    if u1.use_telnet:
+        u1.send("im tog_state")
+    else:
+        u1.send("t")
+    u2.expect(uri1 + ".*status.*Offline")
+    u1.expect("offline")
+
+    # Synchronize stdout
+    u1.sync_stdout()
+    u2.sync_stdout()
+
+    # u2 set online status to On the phone
+    if u2.use_telnet:
+        u2.send("im pre_text 3")
+    else:
+        u2.send("T")
+        u2.send("3")
+    u1.expect(uri2 + ".*status.*On the phone")
+    u2.expect("On the phone")
+    
+    # Synchronize stdout
+    u1.sync_stdout()
+    u2.sync_stdout()
+
+    # Synchronize stdout
+    u1.sync_stdout()
+    u2.sync_stdout()
+
+    # U1 send IM
+    if u1.use_telnet:
+        im_text = "Hello-World-from-U1"
+        u1.send("im send_im %s %s" % (uri2, im_text))
+    else:
+        im_text = "Hello World from U1"
+        u1.send("i")
+        u1.send(uri2)
+        u2.expect(" is typing")
+        u1.send(im_text)
+    u1.expect(im_text+".*delivered successfully")
+    u2.expect("MESSAGE from.*"+im_text)
+    
+    # Synchronize stdout
+    u1.sync_stdout()
+    u2.sync_stdout()
 
 
 # Here where it all comes together
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/mod_recvfrom.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/mod_recvfrom.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/mod_recvfrom.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/mod_recvfrom.py	2022-02-24 07:54:38.000000000 +0000
@@ -13,85 +13,85 @@
 srv_port = 50070
 
 def test_func(test):
-	pjsua = test.process[0]
-	dlg = sip.Dialog("127.0.0.1", pjsua.inst_param.sip_port, 
-			 local_port=srv_port, 
-			 tcp=cfg_file.recvfrom_cfg.tcp)
-
-	last_cseq = 0
-	last_method = ""
-	last_call_id = ""
-	for t in cfg_file.recvfrom_cfg.transaction:
-		# Print transaction title
-		if t.title != "":
-			dlg.trace(t.title)
-		# Run command and expect patterns
-		for c in t.cmds:
-			if c[0] and c[0] != "":
-				pjsua.send(c[0])
-			if len(c)>1 and c[1] and c[1] != "":
-				pjsua.expect(c[1])
-		# Wait for request
-		if t.check_cseq:
-			# Absorbs retransmissions
-			cseq = 0
-			method = last_method
-			call_id = last_call_id
-			while cseq <= last_cseq and method == last_method and call_id == last_call_id:
-				request, src_addr = dlg.wait_msg_from(30)
-				if request==None or request=="":
-					raise TestError("Timeout waiting for request")
-				method = request.split(" ", 1)[0]
-				cseq_hval = sip.get_header(request, "CSeq")
-				cseq_hval = cseq_hval.split(" ")[0]
-				cseq = int(cseq_hval)
-				call_id = sip.get_header(request, "Call-ID")
-			last_cseq = cseq
-			last_method = method
-		else:
-			request, src_addr = dlg.wait_msg_from(30)
-			if request==None or request=="":
-				raise TestError("Timeout waiting for request")
-
-		# Check for include patterns
-		for pat in t.include:
-			if re.search(pat, request, re.M | re.I)==None:
-				if t.title:
-					tname = " in " + t.title + " transaction"
-				else:
-					tname = ""
-				raise TestError("Pattern " + pat + " not found" + tname)
-		# Check for exclude patterns
-		for pat in t.exclude:
-			if re.search(pat, request, re.M | re.I)!=None:
-				if t.title:
-					tname = " in " + t.title + " transaction"
-				else:
-					tname = ""
-				raise TestError("Excluded pattern " + pat + " found" + tname)
-		# Create response
-		if t.resp_code!=0:
-			response = dlg.create_response(request, t.resp_code, "Status reason")
-			# Add headers to response
-			for h in t.resp_hdr:
-				response = response + h + "\r\n"
-			# Add message body if required
-			if t.body:
-				response = response + t.body
-			# Send response
-			dlg.send_msg(response, src_addr)
-
-		# Expect something to happen in pjsua
-		if t.expect != "":
-			pjsua.expect(t.expect)
-		# Sync
-		pjsua.sync_stdout()
+    pjsua = test.process[0]
+    dlg = sip.Dialog("127.0.0.1", pjsua.inst_param.sip_port, 
+             local_port=srv_port, 
+             tcp=cfg_file.recvfrom_cfg.tcp)
+
+    last_cseq = 0
+    last_method = ""
+    last_call_id = ""
+    for t in cfg_file.recvfrom_cfg.transaction:
+        # Print transaction title
+        if t.title != "":
+            dlg.trace(t.title)
+        # Run command and expect patterns
+        for c in t.cmds:
+            if c[0] and c[0] != "":
+                pjsua.send(c[0])
+            if len(c)>1 and c[1] and c[1] != "":
+                pjsua.expect(c[1])
+        # Wait for request
+        if t.check_cseq:
+            # Absorbs retransmissions
+            cseq = 0
+            method = last_method
+            call_id = last_call_id
+            while cseq <= last_cseq and method == last_method and call_id == last_call_id:
+                request, src_addr = dlg.wait_msg_from(30)
+                if request==None or request=="":
+                    raise TestError("Timeout waiting for request")
+                method = request.split(" ", 1)[0]
+                cseq_hval = sip.get_header(request, "CSeq")
+                cseq_hval = cseq_hval.split(" ")[0]
+                cseq = int(cseq_hval)
+                call_id = sip.get_header(request, "Call-ID")
+            last_cseq = cseq
+            last_method = method
+        else:
+            request, src_addr = dlg.wait_msg_from(30)
+            if request==None or request=="":
+                raise TestError("Timeout waiting for request")
+
+        # Check for include patterns
+        for pat in t.include:
+            if re.search(pat, request, re.M | re.I)==None:
+                if t.title:
+                    tname = " in " + t.title + " transaction"
+                else:
+                    tname = ""
+                raise TestError("Pattern " + pat + " not found" + tname)
+        # Check for exclude patterns
+        for pat in t.exclude:
+            if re.search(pat, request, re.M | re.I)!=None:
+                if t.title:
+                    tname = " in " + t.title + " transaction"
+                else:
+                    tname = ""
+                raise TestError("Excluded pattern " + pat + " found" + tname)
+        # Create response
+        if t.resp_code!=0:
+            response = dlg.create_response(request, t.resp_code, "Status reason")
+            # Add headers to response
+            for h in t.resp_hdr:
+                response = response + h + "\r\n"
+            # Add message body if required
+            if t.body:
+                response = response + t.body
+            # Send response
+            dlg.send_msg(response, src_addr)
+
+        # Expect something to happen in pjsua
+        if t.expect != "":
+            pjsua.expect(t.expect)
+        # Sync
+        pjsua.sync_stdout()
 
 # Replace "$PORT" with server port in pjsua args
 cfg_file.recvfrom_cfg.inst_param.arg = cfg_file.recvfrom_cfg.inst_param.arg.replace("$PORT", str(srv_port))
 
 # Here where it all comes together
 test = TestParam(cfg_file.recvfrom_cfg.name, 
-		 [cfg_file.recvfrom_cfg.inst_param], 
-		 test_func)
+                 [cfg_file.recvfrom_cfg.inst_param], 
+                 test_func)
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/mod_sipp.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/mod_sipp.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/mod_sipp.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/mod_sipp.py	2022-02-24 07:54:38.000000000 +0000
@@ -14,10 +14,10 @@
 ##   in tests/pjsua/scripts-sipp/ folder for detail.
 ##
 ##   Here are defined macros that can be used in the custom driver:
-##   - $SIPP_PORT	    : SIPp binding port
-##   - $SIPP_URI	    : SIPp SIP URI
-##   - $PJSUA_PORT[N]	    : binding port of PJSUA instance #N
-##   - $PJSUA_URI[N]	    : SIP URI of PJSUA instance #N
+##   - $SIPP_PORT            : SIPp binding port
+##   - $SIPP_URI            : SIPp SIP URI
+##   - $PJSUA_PORT[N]            : binding port of PJSUA instance #N
+##   - $PJSUA_URI[N]            : SIP URI of PJSUA instance #N
 
 import ctypes
 import time
@@ -42,7 +42,7 @@
 # SIPp executable path and param
 #SIPP_PATH = '"C:\\devs\\bin\\Sipp_3.2\\sipp.exe"'
 SIPP_PATH = 'sipp'
-SIPP_PORT    = 6000
+SIPP_PORT    = 50070
 SIPP_PARAM = "-m 1 -i 127.0.0.1 -p " + str(SIPP_PORT)
 SIPP_TIMEOUT = 60
 # On BG mode, SIPp doesn't require special terminal
@@ -88,17 +88,20 @@
     # Load test driver file (the corresponding .py file), if any
     cfg_file = imp.load_source("cfg_file", SIPP_SCEN_XML[:-4]+".py")
     for ua_idx, ua_param in enumerate(cfg_file.PJSUA):
-	ua_param = resolve_driver_macros(ua_param)
-	PJSUA_INST_PARAM.append(InstanceParam("pjsua"+str(ua_idx), ua_param))
-    PJSUA_EXPECTS = cfg_file.PJSUA_EXPECTS
+        ua_param = resolve_driver_macros(ua_param)
+        PJSUA_INST_PARAM.append(InstanceParam("pjsua"+str(ua_idx), ua_param))
+    if DEFAULT_TELNET and hasattr(cfg_file, 'PJSUA_CLI_EXPECTS'):
+        PJSUA_EXPECTS = cfg_file.PJSUA_CLI_EXPECTS
+    else:
+        PJSUA_EXPECTS = cfg_file.PJSUA_EXPECTS
 else:
     # Generate default test driver
     if os.path.basename(SIPP_SCEN_XML)[0:3] == "uas":
-	# auto make call when SIPp is as UAS
-	ua_param = PJSUA_DEF_PARAM + " sip:127.0.0.1:" + str(SIPP_PORT)
+        # auto make call when SIPp is as UAS
+        ua_param = PJSUA_DEF_PARAM + " sip:127.0.0.1:" + str(SIPP_PORT)
     else:
-	# auto answer when SIPp is as UAC
-	ua_param = PJSUA_DEF_PARAM + " --auto-answer=200" 
+        # auto answer when SIPp is as UAC
+        ua_param = PJSUA_DEF_PARAM + " --auto-answer=200" 
     PJSUA_INST_PARAM.append(InstanceParam("pjsua", ua_param))
 
 
@@ -109,9 +112,9 @@
 
     sipp_param = SIPP_PARAM + " -sf " + SIPP_SCEN_XML
     if SIPP_BG_MODE:
-	sipp_param = sipp_param + " -bg"
+        sipp_param = sipp_param + " -bg"
     if SIPP_TIMEOUT:
-	sipp_param = sipp_param + " -timeout "+str(SIPP_TIMEOUT)+"s -timeout_error" + " -deadcall_wait "+str(SIPP_TIMEOUT)+"s"
+        sipp_param = sipp_param + " -timeout "+str(SIPP_TIMEOUT)+"s -timeout_error" + " -deadcall_wait "+str(SIPP_TIMEOUT)+"s"
 
     # add target param
     sipp_param = sipp_param + " 127.0.0.1:" + str(PJSUA_INST_PARAM[0].sip_port)
@@ -120,73 +123,73 @@
     fullcmd = os.path.normpath(SIPP_PATH) + " " + sipp_param
     print "Running SIPP: " + fullcmd
     if SIPP_BG_MODE:
-	sipp_proc = subprocess.Popen(fullcmd, bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE, shell=G_INUNIX, universal_newlines=False)
+        sipp_proc = subprocess.Popen(fullcmd, bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE, shell=G_INUNIX, universal_newlines=False)
     else:
-	# redirect output to NULL
-	global FDEVNULL
-	#FDEVNULL  = open(os.devnull, 'w')
-	FDEVNULL  = open("logs/sipp_output.tmp", 'w')
-	sipp_proc = subprocess.Popen(fullcmd, shell=G_INUNIX, stdout=FDEVNULL, stderr=FDEVNULL)
+        # redirect output to NULL
+        global FDEVNULL
+        #FDEVNULL  = open(os.devnull, 'w')
+        FDEVNULL  = open("logs/sipp_output.tmp", 'w')
+        sipp_proc = subprocess.Popen(fullcmd, shell=G_INUNIX, stdout=FDEVNULL, stderr=FDEVNULL)
 
     if not SIPP_BG_MODE:
-	if sipp_proc == None or sipp_proc.poll():
-	    return None
-	return sipp_proc
+        if sipp_proc == None or sipp_proc.poll():
+            return None
+        return sipp_proc
 
     else:
-	# get SIPp child process PID
-	pid = 0
-	r = re.compile("PID=\[(\d+)\]", re.I)
-
-	while True:
-	    line = sipp_proc.stdout.readline()
-	    pid_r = r.search(line)
-	    if pid_r:
-		pid = int(pid_r.group(1))
-		break
-	    if not sipp_proc.poll():
-		break
-
-	if pid != 0:
-	    # Win specific: get process handle from PID, as on win32, os.waitpid() takes process handle instead of pid
-	    if (sys.platform == "win32"):
-		SYNCHRONIZE = 0x00100000
-		PROCESS_QUERY_INFORMATION = 0x0400
-		hnd = ctypes.windll.kernel32.OpenProcess(SYNCHRONIZE | PROCESS_QUERY_INFORMATION, False, pid)
-		pid = hnd
+        # get SIPp child process PID
+        pid = 0
+        r = re.compile("PID=\[(\d+)\]", re.I)
+
+        while True:
+            line = sipp_proc.stdout.readline()
+            pid_r = r.search(line)
+            if pid_r:
+                pid = int(pid_r.group(1))
+                break
+            if not sipp_proc.poll():
+                break
+
+        if pid != 0:
+            # Win specific: get process handle from PID, as on win32, os.waitpid() takes process handle instead of pid
+            if (sys.platform == "win32"):
+                SYNCHRONIZE = 0x00100000
+                PROCESS_QUERY_INFORMATION = 0x0400
+                hnd = ctypes.windll.kernel32.OpenProcess(SYNCHRONIZE | PROCESS_QUERY_INFORMATION, False, pid)
+                pid = hnd
 
-	return pid
+        return pid
 
 
 # Wait SIPp process to exit, returning SIPp exit code
 def wait_sipp(sipp):
     if not SIPP_BG_MODE:
-	global FDEVNULL
-	sipp.wait()
-	FDEVNULL.close()
-	return sipp.returncode
+        global FDEVNULL
+        sipp.wait()
+        FDEVNULL.close()
+        return sipp.returncode
 
     else:
-	print "Waiting SIPp (PID=" + str(sipp) + ") to exit.."
-	wait_cnt = 0
-	while True:
-	    try:
-		wait_cnt = wait_cnt + 1
-		[pid_, ret_code] = os.waitpid(sipp, 0)
-		if sipp == pid_:
-		    #print "SIPP returned ", ret_code
-		    ret_code = ret_code >> 8
-
-		    # Win specific: Close process handle
-		    if (sys.platform == "win32"):
-			ctypes.windll.kernel32.CloseHandle(sipp)
-		    
-		    return ret_code
-	    except os.error:
-		if wait_cnt <= 5:
-		    print "Retry ("+str(wait_cnt)+") waiting SIPp.."
-		else:
-		    return -99
+        print "Waiting SIPp (PID=" + str(sipp) + ") to exit.."
+        wait_cnt = 0
+        while True:
+            try:
+                wait_cnt = wait_cnt + 1
+                [pid_, ret_code] = os.waitpid(sipp, 0)
+                if sipp == pid_:
+                    #print "SIPP returned ", ret_code
+                    ret_code = ret_code >> 8
+
+                    # Win specific: Close process handle
+                    if (sys.platform == "win32"):
+                        ctypes.windll.kernel32.CloseHandle(sipp)
+                    
+                    return ret_code
+            except os.error:
+                if wait_cnt <= 5:
+                    print "Retry ("+str(wait_cnt)+") waiting SIPp.."
+                else:
+                    return -99
 
 
 # Execute PJSUA flow
@@ -194,26 +197,30 @@
     # Get all PJSUA instances
     ua = []
     for ua_idx in range(len(PJSUA_INST_PARAM)):
-	ua.append(t.process[ua_idx])
+        ua.append(t.process[ua_idx])
 
     ua_err_st = ""
     while len(PJSUA_EXPECTS):
-	expect = PJSUA_EXPECTS.pop(0)
-	ua_idx = expect[0]
-	expect_st = expect[1]
-	send_cmd = resolve_driver_macros(expect[2])
-	# Handle exception in pjsua flow, to avoid zombie SIPp process
-	try:
-	    if expect_st != "":
-		ua[ua_idx].expect(expect_st, raise_on_error = True)
-	    if send_cmd != "":
-		ua[ua_idx].send(send_cmd)
-	except TestError, e:
-	    ua_err_st = e.desc
-	    break;
-	except:
-	    ua_err_st = "Unknown error"
-	    break;
+        expect = PJSUA_EXPECTS.pop(0)
+        ua_idx = expect[0]
+        expect_st = expect[1]
+        send_cmd = resolve_driver_macros(expect[2])
+        timeout = expect[3] if len(expect)>=4 else 0
+        # Handle exception in pjsua flow, to avoid zombie SIPp process
+        try:
+            if expect_st != "":
+                if timeout > 0:
+                    ua[ua_idx].expect(expect_st, raise_on_error = True, timeout = timeout)
+                else:
+                    ua[ua_idx].expect(expect_st, raise_on_error = True)
+            if send_cmd != "":
+                ua[ua_idx].send(send_cmd)
+        except TestError, e:
+            ua_err_st = e.desc
+            break;
+        except:
+            ua_err_st = "Unknown error"
+            break;
 
     # Need to poll here for handling these cases:
     # - If there is no PJSUA EXPECT scenario, we must keep polling the stdout,
@@ -227,26 +234,26 @@
     # Update: now pjsua stdout is polled continuously by a dedicated thread,
     #         so the poll is no longer needed
     #for ua_idx in range(len(ua)):
-    #	ua[ua_idx].expect(inc_const.STDOUT_REFRESH, raise_on_error = False)
+    #        ua[ua_idx].expect(inc_const.STDOUT_REFRESH, raise_on_error = False)
 
     return ua_err_st
 
 
 def sipp_err_to_str(err_code):
     if err_code == 0:
-	return "All calls were successful"
+        return "All calls were successful"
     elif err_code == 1:
-	return "At least one call failed"
+        return "At least one call failed"
     elif err_code == 97:
-	return "exit on internal command. Calls may have been processed"
+        return "exit on internal command. Calls may have been processed"
     elif err_code == 99:
-	return "Normal exit without calls processed"
+        return "Normal exit without calls processed"
     elif err_code == -1:
-	return "Fatal error (timeout)"
+        return "Fatal error (timeout)"
     elif err_code == -2:
-	return "Fatal error binding a socket"
+        return "Fatal error binding a socket"
     else:
-	return "Unknown error"
+        return "Unknown error"
 
 
 # Test body function
@@ -257,21 +264,21 @@
 
     sipp = start_sipp()
     if not sipp:
-	raise TestError("Failed starting SIPp")
+        raise TestError("Failed starting SIPp")
 
     ua_err_st = exec_pjsua_expects(t, sipp)
 
     sipp_ret_code = wait_sipp(sipp)
 
     if ua_err_st != "":
-	raise TestError(ua_err_st)
+        raise TestError(ua_err_st)
 
     if sipp_ret_code:
-	rc = ctypes.c_byte(sipp_ret_code).value
+        rc = ctypes.c_byte(sipp_ret_code).value
         raise TestError("SIPp returned error " + str(rc) + ": " + sipp_err_to_str(rc))
 
 
 # Here where it all comes together
 test = TestParam(SIPP_SCEN_XML[:-4],
-		 PJSUA_INST_PARAM,
-		 TEST_FUNC)
+                 PJSUA_INST_PARAM,
+                 TEST_FUNC)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/README.TXT asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/README.TXT
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/README.TXT	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/README.TXT	2022-02-24 07:54:38.000000000 +0000
@@ -61,5 +61,6 @@
 Example:
   $ python run.py mod_run.py scripts-run/100_simple.py
   $ python run.py mod_call.py scripts-call/100_simple.py
+  $ python run.py mod_sipp.py scripts-sipp/uac-bad-ack.xml
 
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/runall.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/runall.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/runall.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/runall.py	2022-02-24 07:54:38.000000000 +0000
@@ -4,6 +4,7 @@
 import time
 import re
 import shutil
+import platform
 
 PYTHON = os.path.basename(sys.executable)
 
@@ -15,35 +16,39 @@
 tests = []
 
 # Excluded tests (because they fail?)
-excluded_tests = [ "svn",
-		   "pyc",
-		   "scripts-call/150_srtp_2_1",				# SRTP optional 'cannot' call SRTP mandatory
-                   "scripts-call/150_srtp_2_3.py",                      # disabled because #1267 wontfix
-		   "scripts-call/301_ice_public_a.py",			# Unreliable, proxy returns 408 sometimes
-		   "scripts-call/301_ice_public_b.py",			# Doesn't work because OpenSER modifies SDP
-		   "scripts-pres/200_publish.py",			# Ok from cmdline, error from runall.py
-		   "scripts-media-playrec/100_resample_lf_8_11.py",	# related to clock-rate 11 kHz problem
-		   "scripts-media-playrec/100_resample_lf_8_22.py",	# related to clock-rate 22 kHz problem
-		   "scripts-media-playrec/100_resample_lf_11",		# related to clock-rate 11 kHz problem
-		   "pesq",						                    # temporarily disabling all pesq related test due to unreliability
-           # TODO check all tests below for false negatives
-           "pjmedia-test",
-           "pjsip-test",
-           "call_305_ice_comp_1_2",
-           "scripts-sendto/155_err_sdp_bad_syntax",
-           "transfer-attended",
-            "uac-inv-and-ack-without-sdp",
-            "uac-subscribe",
-            "uac-ticket-1148",
-            "uas-422-then-200-bad-se",
-            "uas-answer-180-multiple-fmts-support-update",
-            "uas-inv-answered-with-srtp",
-            "uas-mwi-0",
-            "uas-mwi",
-            "uas-register-ip-change-port-only",
-            "uas-register-ip-change",
-            "uas-timer-update"
-                   ]
+excluded_tests = [
+    "svn",
+    "pyc",
+    "scripts-call/150_srtp_2_1",                     # SRTP optional 'cannot' call SRTP mandatory
+    "scripts-call/150_srtp_2_3.py",                  # disabled because #1267 wontfix
+    "scripts-call/301_ice_public_a.py",              # Unreliable, proxy returns 408 sometimes
+    "scripts-call/301_ice_public_b.py",              # Doesn't work because OpenSER modifies SDP
+    "scripts-pres/200_publish.py",                   # Ok from cmdline, error from runall.py
+    "scripts-media-playrec/100_resample_lf_8_11.py", # related to clock-rate 11 kHz problem
+    "scripts-media-playrec/100_resample_lf_8_22.py", # related to clock-rate 22 kHz problem
+    "scripts-media-playrec/100_resample_lf_11",      # related to clock-rate 11 kHz problem
+    "pesq",                                          # temporarily disabling all pesq related test due to unreliability
+    # TODO check all tests below for false negatives
+    "call_305_ice_comp_1_2",
+    "scripts-sendto/155_err_sdp_bad_syntax",
+    "transfer-attended",
+    "uac-inv-and-ack-without-sdp",
+    "uac-subscribe",
+    "uac-ticket-1148",
+    "uas-422-then-200-bad-se",
+    "uas-answer-180-multiple-fmts-support-update",
+    "uas-inv-answered-with-srtp",
+    "uas-mwi-0",
+    "uas-mwi",
+    "uas-register-ip-change-port-only",
+    "uas-register-ip-change",
+    "uas-timer-update"
+]
+
+# Exclude scripts-sipp/uac-reinvite-bad-via-branch on MacOS due to unreliable result
+if platform.system()=='Darwin':
+    excluded_tests.append("scripts-sipp/uac-reinvite-bad-via-branch")
+
 
 # Add basic tests
 for f in os.listdir("scripts-run"):
@@ -76,75 +81,90 @@
 # Add sipp tests
 for f in os.listdir("scripts-sipp"):
     if f.endswith(".xml"):
-	tests.append("mod_sipp.py scripts-sipp/" + f)
-
-# Filter-out excluded tests
-for pat in excluded_tests:
-    tests = [t for t in tests if t.find(pat)==-1]
+        tests.append("mod_sipp.py scripts-sipp/" + f)
 
 
 resume_script=""
 shell_cmd=""
+with_log=True
 
 # Parse arguments
 sys.argv.pop(0)
 while len(sys.argv):
-        if sys.argv[0]=='/h' or sys.argv[0]=='-h' or sys.argv[0]=='--help' or sys.argv[0]=='/help':
-                sys.argv.pop(0)
-                print "Usage:"
-                print "  runall.py [OPTIONS] [run.py-OPTIONS]"
-                print "OPTIONS:"
-                print " --list"
-                print "     List the tests"
-                print "  --list-xml"
-                print "     List the tests as XML format suitable for ccdash"
-                print "  --resume,-r RESUME"
-                print "      RESUME is string/substring to specify where to resume tests."
-                print "      If this argument is omited, tests will start from the beginning."
-                print "  --shell,-s SHELL"
-                print "      Run the tests with the specified SHELL cmd. This can also be"
-                print "      used to run the test with ccdash. Example:"
-                print "        --shell '/bin/sh -c'"
-                print "  run.py-OPTIONS are applicable here"
-                sys.exit(0)
-	elif sys.argv[0] == '-r' or sys.argv[0] == '--resume':
-	        if len(sys.argv) > 1:
-			resume_script=sys.argv[1]
-			sys.argv.pop(0)
-			sys.argv.pop(0)
-	        else:
-	                sys.argv.pop(0)
-                        sys.stderr.write("Error: argument value required")
-                        sys.exit(1)
-	elif sys.argv[0] == '--list':
-	        sys.argv.pop(0)
-		for t in tests:
-		      print t
-		sys.exit(0)
-        elif sys.argv[0] == '--list-xml':
-                sys.argv.pop(0)
-                for t in tests:
-                        (mod,param) = t.split(None,2)
-		        tname = mod[4:mod.find(".py")] + "_" + \
-		                param[param.find("/")+1:param.rfind(".")]
-			c = ""
-			if len(sys.argv):
-				c = " ".join(sys.argv) + " "
-                        tcmd = PYTHON + ' run.py ' + c + t
-                        print '\t\t<Test name="%s" cmd="%s" wdir="tests/pjsua" />' % (tname, tcmd)
-                sys.exit(0)
-        elif sys.argv[0] == '-s' or sys.argv[0] == '--shell':
-                if len(sys.argv) > 1:
-			shell_cmd = sys.argv[1]
-			sys.argv.pop(0)
-			sys.argv.pop(0)
-                else:
-                        sys.argv.pop(0)
-                        sys.stderr.write("Error: argument value required")
-                        sys.exit(1)
-	else:
-		# should be run.py options
-		break
+    if sys.argv[0]=='/h' or sys.argv[0]=='-h' or sys.argv[0]=='--help' or sys.argv[0]=='/help':
+        sys.argv.pop(0)
+        print "Usage:"
+        print "  runall.py [OPTIONS] [run.py-OPTIONS]"
+        print "OPTIONS:"
+        print "  --list"
+        print "    List the tests"
+        print "  --list-xml"
+        print "    List the tests as XML format suitable for ccdash"
+        print "  --resume,-r RESUME"
+        print "    RESUME is string/substring to specify where to resume tests."
+        print "    If this argument is omited, tests will start from the beginning."
+        print "  --disable,-d TEST_NAME"
+        print "    Disable a specific test that contains the specified TEST_NAME."
+        print "  --shell,-s SHELL"
+        print "    Run the tests with the specified SHELL cmd. This can also be"
+        print "    used to run the test with ccdash. Example:"
+        print "    --shell '/bin/sh -c'"
+        print "  --no-log"
+        print "    Do not generate log files. By default log files will be generated"
+        print "    and put in 'logs' dir."
+        print ""
+        print "  run.py-OPTIONS are applicable here"
+        sys.exit(0)
+    elif sys.argv[0] == '-r' or sys.argv[0] == '--resume':
+        if len(sys.argv) > 1:
+            resume_script=sys.argv[1]
+            sys.argv.pop(0)
+            sys.argv.pop(0)
+        else:
+            sys.argv.pop(0)
+            sys.stderr.write("Error: argument value required")
+            sys.exit(1)
+    elif sys.argv[0] == '--list':
+        sys.argv.pop(0)
+        for t in tests:
+              print t
+        sys.exit(0)
+    elif sys.argv[0] == '--list-xml':
+        sys.argv.pop(0)
+        for t in tests:
+            (mod,param) = t.split(None,2)
+            tname = mod[4:mod.find(".py")] + "_" + \
+            param[param.find("/")+1:param.rfind(".")]
+            c = ""
+            if len(sys.argv):
+                c = " ".join(sys.argv) + " "
+            tcmd = PYTHON + ' run.py ' + c + t
+            print '\t\t<Test name="%s" cmd="%s" wdir="tests/pjsua" />' % (tname, tcmd)
+        sys.exit(0)
+    elif sys.argv[0] == '-s' or sys.argv[0] == '--shell':
+        if len(sys.argv) > 1:
+            shell_cmd = sys.argv[1]
+            sys.argv.pop(0)
+            sys.argv.pop(0)
+        else:
+            sys.argv.pop(0)
+            sys.stderr.write("Error: argument value required")
+            sys.exit(1)
+    elif sys.argv[0] == '-d' or sys.argv[0] == '--disable':
+        if len(sys.argv) > 1:
+            excluded_tests.append(sys.argv[1])
+            sys.argv.pop(0)
+            sys.argv.pop(0)
+        else:
+            sys.argv.pop(0)
+            sys.stderr.write("Error: argument value required")
+            sys.exit(1)        	
+    elif sys.argv[0] == '--no-log':
+        sys.argv.pop(0)
+        with_log=False
+    else:
+        # should be run.py options
+        break
 
 
 # Generate arguments for run.py
@@ -154,52 +174,51 @@
 fails_cnt = 0
 tests_cnt = 0
 
-# Re-create "logs" directory
-try:
-    shutil.rmtree("logs")
-except:
-    print "Warning: failed in removing directory 'logs'"
-
-try:
-    os.mkdir("logs")
-except:
-    print "Warning: failed in creating directory 'logs'"
+# Filter-out excluded tests
+for pat in excluded_tests:
+    tests = [t for t in tests if t.find(pat)==-1]
 
 # Now run the tests
 total_cnt = len(tests)
 for t in tests:
-	if resume_script!="" and t.find(resume_script)==-1:
-	    print "Skipping " + t +".."
-            total_cnt = total_cnt - 1
-	    continue
-	resume_script=""
-	cmdline = "python run.py " + argv_st + t
-        if shell_cmd:
-                cmdline = "%s '%s'" % (shell_cmd, cmdline)
-	t0 = time.time()
-	msg = "Running %d/%d: %s..." % (tests_cnt+1, total_cnt, cmdline)
-        sys.stdout.write(msg)
-        sys.stdout.flush()
-	ret = os.system(cmdline + " > output.log")
-	t1 = time.time()
-	if ret != 0:
-		dur = int(t1 - t0)
-		print " failed!! [" + str(dur) + "s]"
-		logname = re.search(".*\s+(.*)", t).group(1)
-		logname = re.sub("[\\\/]", "_", logname)
-		logname = re.sub("\.py$", ".log", logname)
-		logname = re.sub("\.xml$", ".log", logname)
-		logname = "logs/" + logname
-		shutil.move("output.log", logname)
-		print "Please see '" + logname + "' for the test log."
-		fails_cnt += 1
-	else:
-		dur = int(t1 - t0)
-		print " ok [" + str(dur) + "s]"
-	tests_cnt += 1
+    if resume_script!="" and t.find(resume_script)==-1:
+        print "Skipping " + t +".."
+        total_cnt = total_cnt - 1
+        continue
+    resume_script=""
+    cmdline = "python run.py " + argv_st + t
+    if shell_cmd:
+        cmdline = "%s '%s'" % (shell_cmd, cmdline)
+    t0 = time.time()
+    msg = "Running %3d/%d: %s..." % (tests_cnt+1, total_cnt, cmdline)
+    sys.stdout.write(msg)
+    sys.stdout.flush()
+    if with_log:
+        logname = re.search(".*\s+(.*)", t).group(1)
+        logname = re.sub("[\\\/]", "_", logname)
+        logname = re.sub("\.py$", ".log", logname)
+        logname = re.sub("\.xml$", ".log", logname)
+        logname = "logs/" + logname
+    else:
+        logname = os.devnull
+    ret = os.system(cmdline + " > " + logname)
+    t1 = time.time()
+    if ret != 0:
+        dur = int(t1 - t0)
+        print " failed!! [" + str(dur) + "s]"
+        if with_log:
+            lines = open(logname, "r").readlines()
+            print ''.join(lines)
+            print "Log file: '" + logname + "'."
+        fails_cnt += 1
+    else:
+        dur = int(t1 - t0)
+        print " ok [" + str(dur) + "s]"
+    tests_cnt += 1
 
 if fails_cnt == 0:
-	print "All " + str(tests_cnt) + " tests completed successfully"
+    print "All " + str(tests_cnt) + " tests completed successfully"
 else:
-	print str(tests_cnt) + " tests completed, " +  str(fails_cnt) + " test(s) failed"
+    print str(tests_cnt) + " tests completed, " +  str(fails_cnt) + " test(s) failed"
 
+sys.exit(fails_cnt)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/run.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/run.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/run.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/run.py	2022-02-24 07:54:38.000000000 +0000
@@ -5,17 +5,18 @@
 import os
 import subprocess
 import random
+import telnetlib
 import time
 import threading
 import traceback
 import getopt
 
-import inc_const as const
 import inc_cfg as inc
+import inc_const as const
 
 # Vars
-G_EXE = ""		# pjsua executable path
-G_INUNIX = False	# flags that test is running in Unix
+G_EXE = ""        # pjsua executable path
+G_INUNIX = False    # flags that test is running in Unix
 
 
 # Usage string
@@ -24,12 +25,12 @@
 run.py - Automated test driver
 
 Usage:
-	run.py [options] MODULE CONFIG
+    run.py [options] MODULE CONFIG
 Options:
-	--exe, -e		pjsua executable path
-	--null-audio, -n	use null audio
+    --exe, -e           pjsua executable path
+    --null-audio, -n    use null audio
 Sample:
-	run.py -n mod_run.py scripts-run/100_simple.py
+    run.py -n mod_run.py scripts-run/100_simple.py
 """
 
 # Parse arguments
@@ -41,70 +42,76 @@
     sys.exit(2)
 for o, a in opts:
     if o in ("-h", "--help"):
-	print usage
-	sys.exit()
+        print usage
+        sys.exit()
     elif o in ("-n", "--null-audio"):
         inc.HAS_SND_DEV = 0
     elif o in ("-e", "--exe"):
         G_EXE = a
     else:
         print "Unknown options"
-	sys.exit(2)
+        sys.exit(2)
 
 if len(args) != 2:
-	print "Invalid arguments"
-	print usage
-	sys.exit(2)
+    print "Invalid arguments"
+    print usage
+    sys.exit(2)
 
 # Set global ARGS to be used by modules
 inc.ARGS = args
 
 # Get the pjsua executable name
 if G_EXE == "":
-	if sys.platform.find("win32")!=-1:
-	    EXE_DIR = "../../pjsip-apps/bin/"
-	    EXECUTABLES = [ "pjsua_vc6d.exe",
-			    "pjsua_vc6.exe",
-			    "pjsua-i386-Win32-vc8-Debug.exe",
-			    "pjsua-i386-Win32-vc8-Debug-Dynamic.exe",
-			    "pjsua-i386-Win32-vc8-Debug-Static.exe",
-			    "pjsua-i386-Win32-vc8-Release.exe",
-			    "pjsua-i386-Win32-vc8-Release-Dynamic.exe",
-			    "pjsua-i386-Win32-vc8-Release-Static.exe"
-			    ]
-	    e_ts = 0
-	    for e in EXECUTABLES:
-		e = EXE_DIR + e
-		if os.access(e, os.F_OK):
-		    st = os.stat(e)
-		    if e_ts==0 or e_ts<st.st_mtime:
-			G_EXE = e
-			e_ts = st.st_mtime
-
-	    if G_EXE=="":
-		print "Unable to find valid pjsua. Please build pjsip first"
-		sys.exit(1)
-		
-	    G_INUNIX = False
-	else:
-	    f = open("../../build.mak", "r")
-	    while True:
-		line = f.readline()
-		if not line:
-		    break
-		if line.find("TARGET_NAME")!=-1:
-		    print line
-		    G_EXE="../../pjsip-apps/bin/pjsua-" + line.split(":= ")[1]
-		    break
-	    if G_EXE=="":
-		print "Unable to find ../../../build.mak. Please build pjsip first"
-		sys.exit(1)
-	    G_INUNIX = True
+    if sys.platform.find("win32")!=-1:
+        EXE_DIR = "../../pjsip-apps/bin/"
+        EXECUTABLES = [ "pjsua_vc6d.exe",
+                "pjsua_vc6.exe",
+                "pjsua-i386-Win32-vc8-Debug.exe",
+                "pjsua-i386-Win32-vc8-Debug-Dynamic.exe",
+                "pjsua-i386-Win32-vc8-Debug-Static.exe",
+                "pjsua-i386-Win32-vc8-Release.exe",
+                "pjsua-i386-Win32-vc8-Release-Dynamic.exe",
+                "pjsua-i386-Win32-vc8-Release-Static.exe",
+                "pjsua-i386-Win32-vc14-Debug.exe",
+                "pjsua-i386-Win32-vc14-Debug-Dynamic.exe",
+                "pjsua-i386-Win32-vc14-Debug-Static.exe",
+                "pjsua-i386-Win32-vc14-Release.exe",
+                "pjsua-i386-Win32-vc14-Release-Dynamic.exe",
+                "pjsua-i386-Win32-vc14-Release-Static.exe"                
+                ]
+        e_ts = 0
+        for e in EXECUTABLES:
+            e = EXE_DIR + e
+            if os.access(e, os.F_OK):
+                st = os.stat(e)
+                if e_ts==0 or e_ts<st.st_mtime:
+                    G_EXE = e
+                    e_ts = st.st_mtime
+
+        if G_EXE=="":
+            print "Unable to find valid pjsua. Please build pjsip first"
+            sys.exit(1)
+
+        G_INUNIX = False
+    else:
+        f = open("../../build.mak", "r")
+        while True:
+            line = f.readline()
+            if not line:
+                break
+            if line.find("TARGET_NAME")!=-1:
+                print line
+                G_EXE="../../pjsip-apps/bin/pjsua-" + line.split(":= ")[1]
+                break
+        if G_EXE=="":
+            print "Unable to find ../../../build.mak. Please build pjsip first"
+            sys.exit(1)
+        G_INUNIX = True
 else:
-	if sys.platform.lower().find("win32")!=-1 or sys.platform.lower().find("microsoft")!=-1:
-		G_INUNIX = False
-	else:
-		G_INUNIX = True
+    if sys.platform.lower().find("win32")!=-1 or sys.platform.lower().find("microsoft")!=-1:
+        G_INUNIX = False
+    else:
+        G_INUNIX = True
 
 
 G_EXE = G_EXE.rstrip("\n\r \t")
@@ -112,145 +119,194 @@
 ###################################
 # Poor man's 'expect'-like class
 class Expect(threading.Thread):
-	proc = None
-	echo = False
-	trace_enabled = False
-	inst_param = None
-	rh = re.compile(const.DESTROYED)
-	ra = re.compile(const.ASSERT, re.I)
-	rr = re.compile(const.STDOUT_REFRESH)
-	t0 = time.time()
-	output = ""
-	lock = threading.Lock()
-	running = False
-	def __init__(self, inst_param):
-		threading.Thread.__init__(self)
-		self.inst_param = inst_param
-		self.name = inst_param.name
-		self.echo = inst_param.echo_enabled
-		self.trace_enabled = inst_param.trace_enabled
-		
-	def run(self):
-		fullcmd = G_EXE + " " + inst_param.arg + " --stdout-refresh=5 --stdout-refresh-text=" + const.STDOUT_REFRESH
-		if not inst_param.enable_buffer:
-			fullcmd = fullcmd + " --stdout-no-buf"
-		self.trace("Popen " + fullcmd)
-		self.proc = subprocess.Popen(fullcmd, shell=G_INUNIX, bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=False)
-		self.running = True
-		while self.proc.poll() == None:
-			line = self.proc.stdout.readline()
-			if line == "":
-				break;
-				
-			#Print the line if echo is ON
-			if self.echo:
-				print self.name + ": " + line.rstrip()
-
-			self.lock.acquire()
-			self.output += line
-			self.lock.release()
-		self.running = False
-				
-	def send(self, cmd):
-		self.trace("send " + cmd)
-		self.proc.stdin.writelines(cmd + "\n")
-		self.proc.stdin.flush()
-		
-	def expect(self, pattern, raise_on_error=True, title=""):
-		self.trace("expect " + pattern)
-		r = re.compile(pattern, re.I)
-		found_at = -1
-		t0 = time.time()
-		while found_at < 0:
-			self.lock.acquire()
-			lines = self.output.splitlines()
-			
-			for i, line in enumerate(lines):
-				# Search for expected text
-				if r.search(line) != None:
-					found_at = i
-					break
-				
-				# Trap assertion error
-				if raise_on_error:
-					if self.ra.search(line) != None:
-						self.lock.release()
-						raise inc.TestError(self.name + ": " + line)
-
-			self.output = '\n'.join(lines[found_at+1:]) if found_at >= 0 else ""
-			self.lock.release()
-			
-			if found_at >= 0:
-				return line
-
-			if not self.running:
-				if raise_on_error:
-					raise inc.TestError(self.name + ": Premature EOF")
-				break
-			else:
-				t1 = time.time()
-				dur = int(t1 - t0)
-				if dur > 15:
-					self.trace("Timed-out!")
-					if raise_on_error:
-						raise inc.TestError(self.name + " " + title + ": Timeout expecting pattern: \"" + pattern + "\"")
-					break
-				else:
-					time.sleep(0.01)
-		return None
-							
-
-	def sync_stdout(self):
-		self.trace("sync_stdout")
-		cmd = "echo 1" + str(random.randint(1000,9999))
-		self.send(cmd)
-		self.expect(cmd)
-
-	def wait(self):
-		self.trace("wait")
-		self.join()
-		self.proc.communicate()
-
-	def trace(self, s):
-		if self.trace_enabled:
-			now = time.time()
-			fmt = self.name + ": " + "================== " + s + " ==================" + " [at t=%(time)03d]"
-			print fmt % {'time':int(now - self.t0)}
+    proc = None
+    telnet = None
+    use_telnet = False
+    echo = False
+    trace_enabled = False
+    inst_param = None
+    rh = re.compile(const.DESTROYED)
+    ra = re.compile(const.ASSERT, re.I)
+    rr = re.compile(const.STDOUT_REFRESH)
+    t0 = time.time()
+    output = ""
+    lock = threading.Lock()
+    running = False
+    def __init__(self, inst_param):
+        threading.Thread.__init__(self)
+        self.inst_param = inst_param
+        self.name = inst_param.name
+        self.echo = inst_param.echo_enabled
+        self.trace_enabled = inst_param.trace_enabled
+        self.use_telnet = inst_param.telnet_enabled
+        self.telnet = None
+        
+    def run(self):
+        if self.use_telnet:
+            fullcmd = G_EXE + " " + self.inst_param.arg + " --use-cli --no-cli-console --cli-telnet-port=%d" % (self.inst_param.telnet_port)
+            self.trace("Popen " + fullcmd)
+            self.proc = subprocess.Popen(fullcmd, shell=G_INUNIX)
+            
+            # start telnet-ing to pjsua, raise exception if telnet fails after 5s
+            t0 = time.time()
+            while self.proc.poll() is None and self.telnet is None:
+                try:
+                    time.sleep(0.01)
+                    self.telnet = telnetlib.Telnet('127.0.0.1', port=self.inst_param.telnet_port, timeout=60)
+                except Exception as e:
+                    t1 = time.time()
+                    dur = int(t1 - t0)
+                    if dur > 5:
+                        raise inc.TestError(self.name + ": Timeout connecting to pjsua: " + repr(e))
+
+            self.running = True
+            while self.proc.poll() is None:
+                line = self.telnet.read_until('\n', 60)
+                if line == "" or const.DESTROYED in line:
+                    break;
+                    
+                #Print the line if echo is ON
+                if self.echo:
+                    print self.name + ": " + line.rstrip()
+
+                self.lock.acquire()
+                self.output += line
+                self.lock.release()
+            self.running = False
+        else:
+            fullcmd = G_EXE + " " + self.inst_param.arg + " --stdout-refresh=5 --stdout-refresh-text=" + const.STDOUT_REFRESH
+            if not self.inst_param.enable_buffer:
+                fullcmd = fullcmd + " --stdout-no-buf"
+            self.trace("Popen " + fullcmd)
+            self.proc = subprocess.Popen(fullcmd, shell=G_INUNIX, bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=False)
+            self.running = True
+            while self.proc.poll() is None:
+                line = self.proc.stdout.readline()
+                if line == "":
+                    break;
+                    
+                #Print the line if echo is ON
+                if self.echo:
+                    print self.name + ": " + line.rstrip()
+
+                self.lock.acquire()
+                self.output += line
+                self.lock.release()
+            self.running = False
+
+    def send(self, cmd):
+        self.trace("send " + cmd)
+        if self.use_telnet:
+            self.telnet.write(cmd + '\r\n')
+        else:
+            self.proc.stdin.writelines(cmd + "\n")
+            self.proc.stdin.flush()
+        
+    def expect(self, pattern, raise_on_error=True, title="", timeout=15):
+        # no prompt for telnet
+        if self.use_telnet and pattern==const.PROMPT:
+            return
+
+        self.trace("expect " + pattern)
+        r = re.compile(pattern, re.I)
+        found_at = -1
+        t0 = time.time()
+        while found_at < 0:
+            self.lock.acquire()
+            lines = self.output.splitlines()
+            
+            for i, line in enumerate(lines):
+                # Search for expected text
+                if r.search(line) != None:
+                    found_at = i
+                    break
+                
+                # Trap assertion error
+                if raise_on_error:
+                    if self.ra.search(line) != None:
+                        self.lock.release()
+                        raise inc.TestError(self.name + ": " + line)
+
+            self.output = '\n'.join(lines[found_at+1:])+"\n" if found_at >= 0 else ""
+            self.lock.release()
+            
+            if found_at >= 0:
+                return line
+
+            if not self.running:
+                if raise_on_error:
+                    raise inc.TestError(self.name + ": Premature EOF")
+                break
+            else:
+                t1 = time.time()
+                dur = int(t1 - t0)
+                if dur > timeout:
+                    self.trace("Timed-out!")
+                    if raise_on_error:
+                        raise inc.TestError(self.name + " " + title + ": Timeout expecting pattern: \"" + pattern + "\"")
+                    break
+                else:
+                    time.sleep(0.01)
+        return None
+                            
+
+    def sync_stdout(self):
+        if not self.use_telnet:
+            self.trace("sync_stdout")
+            cmd = "echo 1" + str(random.randint(1000,9999))
+            self.send(cmd)
+            self.expect(cmd)
+
+    def wait(self):
+        self.trace("wait")
+        self.join()
+        self.proc.communicate()
+        if self.telnet:
+            self.telnet.close()
+
+    def trace(self, s):
+        if self.trace_enabled:
+            now = time.time()
+            fmt = self.name + ": " + "================== " + s + " ==================" + " [at t=%(time)03d]"
+            print fmt % {'time':int(now - self.t0)}
 
 #########################
 # Error handling
 def handle_error(errmsg, t, close_processes = True):
-	print "====== Caught error: " + errmsg + " ======"
-	if (close_processes):
-		time.sleep(1)
-		for p in t.process:
-			# Protect against 'Broken pipe' exception
-			try:
-				p.send("q")
-				p.send("q")
-			except:
-				pass
-			is_err = False
-			try:
-				ret = p.expect(const.DESTROYED, False)
-				if not ret:
-					is_err = True
-			except:
-				is_err = True
-			if is_err:
-				if sys.hexversion >= 0x02060000:
-					p.proc.terminate()
-				else:
-					p.wait()
-			else:
-				p.wait()
-				
-	print "Test completed with error: " + errmsg
-	sys.exit(1)
+    print "====== Caught error: " + errmsg + " ======"
+    if (close_processes):
+        time.sleep(1)
+        for p in t.process:
+            # Protect against 'Broken pipe' exception
+            try:
+                if not p.use_telnet:
+                    p.send("q")
+                    p.send("q")
+                else:
+                    p.send("shutdown")
+            except:
+                pass
+            is_err = False
+            try:
+                ret = p.expect(const.DESTROYED, False)
+                if ret is None:
+                    is_err = True
+            except:
+                is_err = True
+            if is_err and p.proc.poll() is None:
+                if sys.hexversion >= 0x02060000:
+                    p.proc.terminate()
+                else:
+                    p.wait()
+            else:
+                p.wait()
+
+    print "Test completed with error: " + errmsg
+    sys.exit(1)
 
 
 #########################
-# MAIN	
+# MAIN    
 
 # Import the test script
 script = imp.load_source("script", inc.ARGS[0])  
@@ -260,85 +316,113 @@
 
 # Validate
 if script.test == None:
-	print "Error: no test defined"
-	sys.exit(1)
+    print "Error: no test defined"
+    sys.exit(1)
 
 if script.test.skip:
-	print "Test " + script.test.title + " is skipped"
-	sys.exit(0)
+    print "Test " + script.test.title + " is skipped"
+    sys.exit(0)
 
 if len(script.test.inst_params) == 0:
-	print "Error: test doesn't contain pjsua run descriptions"
-	sys.exit(1)
+    print "Error: test doesn't contain pjsua run descriptions"
+    sys.exit(1)
 
 # Instantiate pjsuas
 print "====== Running " + script.test.title + " ======"
 print "Using " + G_EXE + " as pjsua executable"
 
 for inst_param in script.test.inst_params:
-	try:
-		# Create pjsua's Expect instance from the param
-		p = Expect(inst_param)
-		p.start()
-	except inc.TestError, e:
-		handle_error(e.desc, script.test)
-		
-	# wait process ready
-	while True:
-		try:
-			p.send("echo 1")
-		except:
-			time.sleep(0.1)
-			continue
-		break
+    retry = 0
+    process_running = False
+    while (not process_running) and retry < 3:
+        p = None
+        retry += 1
+        try:
+            # Create pjsua's Expect instance from the param
+            p = Expect(inst_param)
+            p.start()
+        except inc.TestError, e:
+            handle_error(e.desc, script.test)
+
+        # wait process ready
+        if not p.use_telnet:
+            while True:
+                try:
+                    p.send("echo 1")
+                except:
+                    time.sleep(0.1)
+                    continue
+                break
+            process_running = True
+        else:
+            t0 = time.time()
+            while p.telnet is None:
+                time.sleep(0.1)
+                dur = int(time.time() - t0)
+                if dur > 5:
+                    break
+            process_running = p.telnet is not None
+
+        # wait before retrying
+        if not process_running and retry < 2:
+            time.sleep(2)
 
-	# add running instance
-	script.test.process.append(p)
+    if not process_running:
+        handle_error("Failed running pjsua", script.test)
+
+    # add running instance
+    script.test.process.append(p)
 
 for p in script.test.process:
-	try:
-		# Wait until registration completes
-		if p.inst_param.have_reg:
-			p.expect(p.inst_param.uri+".*registration success")
-	 	# Synchronize stdout
-		p.send("")
-		p.expect(const.PROMPT)
-		p.send("echo 1")
-		p.expect("echo 1")
+    try:
+        # Wait until registration completes
+        if p.inst_param.have_reg:
+            p.send("rr")
+            p.expect(p.inst_param.uri+".*registration success")
+         # Synchronize stdout
+        if not p.use_telnet:
+            p.send("")
+            p.expect(const.PROMPT)
+            p.send("echo 1")
+            p.expect("echo 1")
 
-	except inc.TestError, e:
-		handle_error(e.desc, script.test)
+    except inc.TestError, e:
+        handle_error(e.desc, script.test)
 
 # Run the test function
 if script.test.test_func != None:
-	try:
-		script.test.test_func(script.test)
-	except inc.TestError, e:
-		handle_error(e.desc, script.test)
-	except:
-		handle_error("Unknown error: " + str(traceback.format_exc()), script.test)
+    try:
+        script.test.test_func(script.test)
+    except inc.TestError, e:
+        handle_error(e.desc, script.test)
+    except:
+        handle_error("Unknown error: " + str(traceback.format_exc()), script.test)
 
 # Shutdown all instances
 for p in script.test.process:
-	# Unregister if we have_reg to make sure that next tests
-	# won't wail
-	if p.inst_param.have_reg:
-		p.send("ru")
-		p.expect(p.inst_param.uri+".*unregistration success")
-	p.send("q")
+    # Unregister if we have_reg to make sure that next tests
+    # won't fail
+    if p.inst_param.have_reg:
+        p.send("ru")
+        p.expect(p.inst_param.uri+".*unregistration success")
+    
+    if p.use_telnet:
+        p.send("shutdown")
+    else:
+        p.send("q")
 
 time.sleep(0.5)
 for p in script.test.process:
-	if p.running:
-		p.expect(const.DESTROYED, False)
-	p.wait()
+    if p.running:
+        p.expect(const.DESTROYED, False)
+    p.wait()
 
 # Run the post test function
 if script.test.post_func != None:
-	try:
-		script.test.post_func(script.test)
-	except inc.TestError, e:
-		handle_error(e.desc, script.test, False)
+    try:
+        script.test.post_func(script.test)
+    except inc.TestError, e:
+        handle_error(e.desc, script.test, False)
 
 # Done
 print "Test " + script.test.title + " completed successfully"
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/160_srtp_dtls.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/160_srtp_dtls.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/160_srtp_dtls.py	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/160_srtp_dtls.py	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,11 @@
+# $Id$
+#
+from inc_cfg import *
+
+test_param = TestParam(
+		"Callee=mandatory SRTP, caller=mandatory SRTP with DTLS keying",
+		[
+			InstanceParam("callee", "--null-audio --use-srtp=2 --srtp-secure=0 --max-calls=1"),
+			InstanceParam("caller", "--null-audio --use-srtp=2 --srtp-secure=0 --max-calls=1 --srtp-keying=1")
+		]
+		)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/320_ice_dtls_srtp.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/320_ice_dtls_srtp.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/320_ice_dtls_srtp.py	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/320_ice_dtls_srtp.py	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,12 @@
+# $Id$
+#
+from inc_cfg import *
+
+# ICE mismatch
+test_param = TestParam(
+		"Callee=use ICE & SRTP, caller=use ICE & DTLS-SRTP",
+		[
+			InstanceParam("callee", "--null-audio --use-ice --max-calls=1 --use-srtp=2 --srtp-secure=0"),
+			InstanceParam("caller", "--null-audio --use-ice --max-calls=1 --use-srtp=2 --srtp-secure=0 --srtp-keying=1")
+		]
+		)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_no_ice_vs_trickle_full.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_no_ice_vs_trickle_full.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_no_ice_vs_trickle_full.py	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_no_ice_vs_trickle_full.py	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,12 @@
+# $Id$
+#
+from inc_cfg import *
+
+# No ICE vs trickle ICE full, should be okay (as ICE will be disabled)
+test_param = TestParam(
+		"Callee=Trickle ICE (full), caller=no ICE",
+		[
+			InstanceParam("callee", "--null-audio --max-calls=1 --use-ice --ice-trickle=2 --stun-srv stun.pjsip.org"),
+			InstanceParam("caller", "--null-audio --max-calls=1")
+		]
+		)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_reg_vs_trickle_full.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_reg_vs_trickle_full.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_reg_vs_trickle_full.py	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_reg_vs_trickle_full.py	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,12 @@
+# $Id$
+#
+from inc_cfg import *
+
+# Regular ICE vs trickle ICE full, should be okay (as trickle will be disabled)
+test_param = TestParam(
+		"Callee=Trickle ICE (full), caller=Regular ICE",
+		[
+			InstanceParam("callee", "--null-audio --max-calls=1 --use-ice --ice-trickle=2 --stun-srv stun.pjsip.org"),
+			InstanceParam("caller", "--null-audio --max-calls=1 --use-ice --ice-trickle=0 --stun-srv stun.pjsip.org")
+		]
+		)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full.py	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full.py	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,12 @@
+# $Id$
+#
+from inc_cfg import *
+
+# Trickle ICE full vs full
+test_param = TestParam(
+		"Callee=Trickle ICE (full), caller=Trickle ICE (full)",
+		[
+			InstanceParam("callee", "--null-audio --max-calls=1 --use-ice --ice-trickle=2 --stun-srv stun.pjsip.org"),
+			InstanceParam("caller", "--null-audio --max-calls=1 --use-ice --ice-trickle=2 --stun-srv stun.pjsip.org")
+		]
+		)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full_vs_no_ice.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full_vs_no_ice.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full_vs_no_ice.py	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full_vs_no_ice.py	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,12 @@
+# $Id$
+#
+from inc_cfg import *
+
+# Trickle ICE full vs no ICE, should be okay (as there are host candidates)
+test_param = TestParam(
+		"Callee=no ICE, caller=Trickle ICE (full)",
+		[
+			InstanceParam("callee", "--null-audio --max-calls=1"),
+			InstanceParam("caller", "--null-audio --max-calls=1 --use-ice --ice-trickle=2 --stun-srv stun.pjsip.org")
+		]
+		)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full_vs_reg.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full_vs_reg.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full_vs_reg.py	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_full_vs_reg.py	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,12 @@
+# $Id$
+#
+from inc_cfg import *
+
+# Trickle ICE full vs regular, should be okay (as there are host candidates)
+test_param = TestParam(
+		"Callee=Regular ICE, caller=Trickle ICE (full)",
+		[
+			InstanceParam("callee", "--null-audio --max-calls=1 --use-ice --ice-trickle=0 --stun-srv stun.pjsip.org"),
+			InstanceParam("caller", "--null-audio --max-calls=1 --use-ice --ice-trickle=2 --stun-srv stun.pjsip.org")
+		]
+		)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_half.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_half.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_half.py	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_half.py	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,12 @@
+# $Id$
+#
+from inc_cfg import *
+
+# Trickle ICE half vs half
+test_param = TestParam(
+		"Callee=Trickle ICE (half), caller=Trickle ICE (half)",
+		[
+			InstanceParam("callee", "--null-audio --max-calls=1 --use-ice --ice-trickle=1 --stun-srv stun.pjsip.org"),
+			InstanceParam("caller", "--null-audio --max-calls=1 --use-ice --ice-trickle=1 --stun-srv stun.pjsip.org")
+		]
+		)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_half_vs_reg.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_half_vs_reg.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_half_vs_reg.py	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-call/330_ice_trickle_half_vs_reg.py	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,12 @@
+# $Id$
+#
+from inc_cfg import *
+
+# Trickle ICE half vs regular, should be okay (just like regular vs regular)
+test_param = TestParam(
+		"Callee=Regular ICE, caller=Trickle ICE (half)",
+		[
+			InstanceParam("callee", "--null-audio --max-calls=1 --use-ice --ice-trickle=0 --stun-srv stun.pjsip.org"),
+			InstanceParam("caller", "--null-audio --max-calls=1 --use-ice --ice-trickle=1 --stun-srv stun.pjsip.org")
+		]
+		)
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py	2022-02-24 07:54:38.000000000 +0000
@@ -16,10 +16,11 @@
 
 req2 = sip.RecvfromTransaction("Registration retry with auth", 200,
 				include=["REGISTER sip", 
-					 "Authorization:[\\s\\S]+Authorization:", # Must have 2 Auth hdrs
-					 "realm=\"python1\"", "realm=\"python2\"", 
-					 "username=\"theuser1\"", "username=\"theuser2\"", 
-					 "nonce=\"1234\"", "nonce=\"6789\"", 
+					 # Must only have 1 Auth hdr since #2887
+					 "Authorization:", # [\\s\\S]+Authorization:"
+					 "realm=\"python1\"", # "realm=\"python2\"", 
+					 "username=\"theuser1\"", # "username=\"theuser2\"", 
+					 "nonce=\"1234\"", # "nonce=\"6789\"", 
 					 "response="],
 				expect="registration success"	     
 			  )
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/strict-route.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/strict-route.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/strict-route.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/strict-route.py	2022-02-24 07:54:38.000000000 +0000
@@ -7,3 +7,7 @@
 PJSUA_EXPECTS = [[0, "ACK sip:proxy@.* SIP/2\.0", ""],
 		 [0, const.STATE_CONFIRMED, "h"]
  		 ]
+
+PJSUA_CLI_EXPECTS = [[0, "ACK sip:proxy@.* SIP/2\.0", ""],
+		 [0, const.STATE_CONFIRMED, "call hangup"]
+ 		 ]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/transfer-attended.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/transfer-attended.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/transfer-attended.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/transfer-attended.py	2022-02-24 07:54:38.000000000 +0000
@@ -50,3 +50,42 @@
 		 [2, const.MEDIA_ACTIVE, ""],
 		 [1, const.STATE_DISCONNECTED, ""]
 		]
+
+PJSUA_CLI_EXPECTS = [
+		 # A calls B
+		 [0, "", "call new $PJSUA_URI[1]"],
+		 [0, const.STATE_CALLING, ""],
+		 [1, const.EVENT_INCOMING_CALL, "call answer 200"],
+		 [0, const.STATE_CONFIRMED, ""],
+		 [1, const.STATE_CONFIRMED, ""],
+
+		 # B holds A
+		 [1, "", "call hold"],
+		 [0, const.MEDIA_HOLD, ""],
+		 [1, const.MEDIA_HOLD, ""],
+
+		 # B calls C
+		 [1, "", "call new $PJSUA_URI[2]"],
+		 [1, const.STATE_CALLING, ""],
+		 [2, const.EVENT_INCOMING_CALL, "call answer 200"],
+		 [1, const.STATE_CONFIRMED, ""],
+		 [2, const.STATE_CONFIRMED, ""],
+
+		 # B holds C
+		 [1, "", "call next"],
+		 [1, "", "call hold"],
+		 [2, const.MEDIA_HOLD, ""],
+		 [1, const.MEDIA_HOLD, ""],
+		 [1, "", "call next"],
+
+		 # B transfer A to C
+		 [1, "", "call transfer_replaces 1"],
+		 [0, "Call .* is being transferred", ""],
+		 [1, "Subscription state .* ACCEPTED", ""],
+		 [0, const.STATE_CALLING, ""],
+		 [2, "Call .* is being replaced", ""],
+		 [1, "call transferred successfully", ""],
+		 [0, const.MEDIA_ACTIVE, ""],
+		 [2, const.MEDIA_ACTIVE, ""],
+		 [1, const.STATE_DISCONNECTED, ""]
+		]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/transfer-unattended.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/transfer-unattended.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/transfer-unattended.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/transfer-unattended.py	2022-02-24 07:54:38.000000000 +0000
@@ -28,3 +28,21 @@
 		 [1, "call transferred successfully", ""],
 		 [1, const.STATE_DISCONNECTED, ""]
 		]
+
+PJSUA_CLI_EXPECTS = [
+		 # A calls B
+		 [0, "", "call new $PJSUA_URI[1]"],
+		 [0, const.STATE_CALLING, ""],
+		 [1, const.EVENT_INCOMING_CALL, "call answer 200"],
+		 [0, const.STATE_CONFIRMED, ""],
+		 [1, const.STATE_CONFIRMED, ""],
+
+		 # B transfer A to C
+		 [1, "", "call transfer $PJSUA_URI[2]"],
+		 [0, const.STATE_CALLING, ""],
+		 [2, const.EVENT_INCOMING_CALL, "call answer 200"],
+		 [0, const.MEDIA_ACTIVE, ""],
+		 [2, const.MEDIA_ACTIVE, ""],
+		 [1, "call transferred successfully", ""],
+		 [1, const.STATE_DISCONNECTED, ""]
+		]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uac-inv-without-sdp.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uac-inv-without-sdp.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uac-inv-without-sdp.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uac-inv-without-sdp.py	2022-02-24 07:54:38.000000000 +0000
@@ -9,3 +9,8 @@
 		 [0, const.MEDIA_ACTIVE, ""],
 		 [0, const.STATE_CONFIRMED, "h"]
 		 ]
+
+PJSUA_CLI_EXPECTS = [[0, const.EVENT_INCOMING_CALL, "call answer 200"],
+		 [0, const.MEDIA_ACTIVE, ""],
+		 [0, const.STATE_CONFIRMED, "call hangup"]
+		 ]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uac-reinvite-bad-via-branch.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uac-reinvite-bad-via-branch.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uac-reinvite-bad-via-branch.xml	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uac-reinvite-bad-via-branch.xml	2022-02-24 07:54:38.000000000 +0000
@@ -98,7 +98,7 @@
       From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
       To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
-      CSeq: [cseq+1] INVITE
+      CSeq: [cseq] INVITE
       Contact: sip:sipp@[local_ip]:[local_port]
       Max-Forwards: 70
       Subject: Performance Test
@@ -161,7 +161,7 @@
       From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[call_number]
       To: sut <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]
       Call-ID: [call_id]
-      CSeq: [cseq+1] BYE
+      CSeq: [cseq] BYE
       Contact: sip:sipp@[local_ip]:[local_port]
       Max-Forwards: 70
       Subject: Performance Test
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-auth-two-algo.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-auth-two-algo.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-auth-two-algo.py	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-auth-two-algo.py	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,7 @@
+# $Id$
+#
+import inc_const as const
+
+PJSUA = ["--null-audio --max-calls=1 --id=sip:a@localhost --username=a --realm=* --registrar=$SIPP_URI"]
+
+PJSUA_EXPECTS = [[0, "registration success", ""]]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-auth-two-algo.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-auth-two-algo.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-auth-two-algo.xml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-auth-two-algo.xml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<scenario name="Basic UAS responder">
+  <recv request="REGISTER" crlf="true">
+  </recv>
+
+  <send>
+    <![CDATA[
+      SIP/2.0 100 Trying
+      [last_Via:];received=1.1.1.1;rport=1111
+      [last_From:]
+      [last_To:];tag=[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Content-Length: 0
+    ]]>
+  </send>
+
+  <send>
+    <![CDATA[
+      SIP/2.0 401 Unauthorized
+      [last_Via:];received=1.1.1.1;rport=1111
+      [last_From:]
+      [last_To:];tag=[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      WWW-Authenticate: Digest realm="sip.linphone.org", nonce="PARV4gAAAADgw3asAADW8zsi5BEAAAAA", opaque="+GNywA==", algorithm=SHA-256, qop="auth"
+      WWW-Authenticate: Digest realm="sip.linphone.org", nonce="PARV4gAAAADgw3asAADW8zsi5BEAAAAA", opaque="+GNywA==", algorithm=MD5, qop="auth"
+      WWW-Authenticate: Digest realm="sip.linphone.org", nonce="PARV4gAAAADgw3asAADW8zsi5BEAAAAA", opaque="+GNywA==", algorithm=MD2, qop="auth"
+      Content-Length: 0
+    ]]>
+  </send>
+
+  <recv request="REGISTER" crlf="true">
+    <action>
+      <ereg regexp=".*"
+            search_in="hdr"
+	    header="Authorization:"
+	    assign_to="have_auth" />
+    </action>
+  </recv>
+
+  <nop next="resp_okay" test="have_auth" />
+  
+  <send next="end">
+    <![CDATA[
+      SIP/2.0 403 no auth
+      [last_Via:];received=1.1.1.1;rport=1111
+      [last_From:]
+      [last_To:];tag=[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      [last_Contact:]
+      Content-Length: 0
+    ]]>
+  </send>
+
+  <label id="resp_okay" />
+  
+  <send>
+    <![CDATA[
+      SIP/2.0 200 OK
+      [last_Via:];received=1.1.1.1;rport=1111
+      [last_From:]
+      [last_To:];tag=[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      [last_Contact:]
+      Content-Length: 0
+    ]]>
+  </send>
+
+  <label id="end" />
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-cancel-no-final.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-cancel-no-final.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-cancel-no-final.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-cancel-no-final.py	2022-02-24 07:54:38.000000000 +0000
@@ -5,3 +5,5 @@
 PJSUA = ["--null-audio --max-calls=1 --no-tcp $SIPP_URI"]
 
 PJSUA_EXPECTS = [[0, const.STATE_EARLY, "h"]]
+
+PJSUA_CLI_EXPECTS = [[0, const.STATE_EARLY, "call hangup"]]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-forked-200.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-forked-200.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-forked-200.xml	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-forked-200.xml	2022-02-24 07:54:38.000000000 +0000
@@ -24,8 +24,16 @@
    <action>
     <ereg regexp="branch=([^;]*)"
           search_in="hdr"
-          header="Via"
+          header="Via:"
           assign_to="1,2"/>
+    <ereg regexp=".*"
+          search_in="hdr"
+	  header="CSeq:"
+	  assign_to="cseq" />
+    <ereg regexp=".*"
+          search_in="hdr"
+	  header="To:"
+	  assign_to="to" />
     <assign assign_to="1" variable="2"/>
     </action>
   </recv>
@@ -63,15 +71,19 @@
     ]]>
   </send>
 
+  <!-- Receive ACK -->
+  <recv request="ACK" optional="false">
+  </recv>
+
   <!-- Call leg 2: 200/OK -->
   <send>
     <![CDATA[
       SIP/2.0 200 OK
       Via: SIP/2.0/UDP 127.0.0.1;received=127.0.0.1;rport=5080;branch=[$2]
       [last_From:]
-      [last_To:];tag=UA_2
+      To:[$to];tag=UA_2
       [last_Call-ID:]
-      [last_CSeq:]
+      CSeq:[$cseq]
       Contact: <sip:UA_2@[local_ip]:[local_port]>
       Content-Type: application/sdp
 
@@ -85,15 +97,9 @@
     ]]>
   </send>
 
-  <!-- Receive ACK -->
-  <recv request="ACK"
-        optional="false"
-        rtd="true"
-        crlf="true">
-  </recv>
 
-  <!-- Receive BYE -->
-  <recv request="BYE" crlf="true">
+  <!-- Receive BYE (for leg 2) -->
+  <recv request="BYE" optional="false">
   </recv>
 
   <!-- Send 200/OK to BYE -->
@@ -109,12 +115,8 @@
   </send>
 
 
-
   <!-- Receive ACK -->
-  <recv request="ACK"
-        optional="false"
-        rtd="true"
-        crlf="true">
+  <recv request="ACK" optional="false">
   </recv>
 
 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-after-failed-nego.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-after-failed-nego.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-after-failed-nego.py	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-after-failed-nego.py	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,10 @@
+# $Id$
+#
+import inc_const as const
+
+PJSUA = ["--null-audio --max-calls=1 --use-timer=3 --timer-se=90 --no-tcp $SIPP_URI"]
+
+PJSUA_EXPECTS = [[0, const.STATE_CONFIRMED, "v"],
+                 [0, "SDP rejected for test", ""],
+                 [0, "Audio updated", "", 50] # wait for session timer refresh about 45 secs
+                ]
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-after-failed-nego.xml asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-after-failed-nego.xml
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-after-failed-nego.xml	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-reinv-after-failed-nego.xml	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE scenario SYSTEM "sipp.dtd">
+
+<!-- This program is free software; you can redistribute it and/or      -->
+<!-- modify it under the terms of the GNU General Public License as     -->
+<!-- published by the Free Software Foundation; either version 2 of the -->
+<!-- License, or (at your option) any later version.                    -->
+<!--                                                                    -->
+<!-- This program is distributed in the hope that it will be useful,    -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of     -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the      -->
+<!-- GNU General Public License for more details.                       -->
+<!--                                                                    -->
+<!-- You should have received a copy of the GNU General Public License  -->
+<!-- along with this program; if not, write to the                      -->
+<!-- Free Software Foundation, Inc.,                                    -->
+<!-- 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA             -->
+
+
+<!--                                                                    -->
+<!--   Session timer where UAS doesn't indicate support for UPDATE.     -->
+<!--   In this case, UAC MUST use re-INVITE with SDP.                   -->
+
+<scenario name="Basic UAS responder">
+  <recv request="INVITE" crlf="true">
+  </recv>
+
+  <send retrans="500">
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]> 
+      Content-Type: application/sdp
+      Content-Length: [len]
+ 
+      v=0
+      o=Some-UserAgent 68 210 IN IP4 [local_ip]
+      s=SIP Call
+      c=IN IP4 [local_ip]
+      t=0 0
+      m=audio 17294 RTP/AVP 0
+      c=IN IP4 [local_ip]
+    ]]>
+  </send>
+
+  <recv request="ACK"
+        optional="true"
+        rtd="true"
+        crlf="true"> 
+  </recv> 
+ 
+  <recv request="INVITE" crlf="true">
+  </recv>
+
+  <send retrans="500">
+    <![CDATA[
+
+      SIP/2.0 500 SDP rejected for test
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]> 
+    ]]>
+  </send>
+
+  <recv request="ACK"
+        rtd="true"
+        crlf="true"> 
+  </recv> 
+
+  <recv request="INVITE" crlf="true">
+  </recv>
+
+  <send retrans="500">
+    <![CDATA[
+
+      SIP/2.0 200 OK
+      [last_Via:]
+      [last_From:]
+      [last_To:];tag=[call_number]
+      [last_Call-ID:]
+      [last_CSeq:]
+      Contact: <sip:[local_ip]:[local_port];transport=[transport]> 
+      Content-Type: application/sdp
+      Content-Length: [len]
+ 
+      v=0
+      o=Some-UserAgent 68 210 IN IP4 [local_ip]
+      s=SIP Call
+      c=IN IP4 [local_ip]
+      t=0 0
+      m=audio 17294 RTP/AVP 0
+      c=IN IP4 [local_ip]
+    ]]>
+  </send>
+
+  <recv request="ACK"
+        rtd="true"
+        crlf="true"> 
+  </recv> 
+
+  <!-- definition of the response time repartition table (unit is ms)   -->
+  <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/>
+
+  <!-- definition of the call length repartition table (unit is ms)     -->
+  <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/>
+
+</scenario>
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-late-notify.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-late-notify.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-late-notify.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-late-notify.py	2022-02-24 07:54:38.000000000 +0000
@@ -9,3 +9,8 @@
 		 [0, "subscription state is ACTIVE", ""],
 		 [0, "subscription state is TERMINATED", ""]
 		 ]
+
+PJSUA_CLI_EXPECTS = [[0, "", "im sub_pre 1"],
+		 [0, "subscription state is ACTIVE", ""],
+		 [0, "subscription state is TERMINATED", ""]
+		 ]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-multipart-notify.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-multipart-notify.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-multipart-notify.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-multipart-notify.py	2022-02-24 07:54:38.000000000 +0000
@@ -9,3 +9,8 @@
 		 [0, "status is Online", ""],
 		 [0, "subscription state is TERMINATED", ""]
 		 ]
+
+PJSUA_CLI_EXPECTS = [[0, "", "im sub_pre 1"],
+		 [0, "status is Online", ""],
+		 [0, "subscription state is TERMINATED", ""]
+		 ]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-notify-terminate.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-notify-terminate.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-notify-terminate.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-notify-terminate.py	2022-02-24 07:54:38.000000000 +0000
@@ -8,3 +8,7 @@
 		 [0, "Subscribe presence of:", "1"],
 		 [0, "subscription state is TERMINATED", ""]
 		 ]
+
+PJSUA_CLI_EXPECTS = [[0, "", "im sub_pre 1"],
+		 [0, "subscription state is TERMINATED", ""]
+		 ]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-refresh-481.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-refresh-481.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-refresh-481.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-refresh-481.py	2022-02-24 07:54:38.000000000 +0000
@@ -9,3 +9,8 @@
 		 [0, "status is Online", ""],
 		 [0, "subscription state is TERMINATED", ""]
 		 ]
+
+PJSUA_CLI_EXPECTS = [[0, "", "im sub_pre 1"],
+		 [0, "status is Online", ""],
+		 [0, "subscription state is TERMINATED", ""]
+		 ]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-terminated-retry.py asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-terminated-retry.py
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-terminated-retry.py	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/scripts-sipp/uas-subscribe-terminated-retry.py	2022-02-24 07:54:38.000000000 +0000
@@ -9,3 +9,8 @@
 		 [0, "Presence subscription .* is TERMINATED", ""],
 		 [0, "Resubscribing .* in 5000 ms", ""]
 		 ]
+
+PJSUA_CLI_EXPECTS = [[0, "", "im sub_pre 1"],
+		 [0, "Presence subscription .* is TERMINATED", ""],
+		 [0, "Resubscribing .* in 5000 ms", ""]
+		 ]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/tools/cmp_wav.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/tools/cmp_wav.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/tests/pjsua/tools/cmp_wav.vcxproj	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/tests/pjsua/tools/cmp_wav.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="cmp_wav.c" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9102D366-6707-4789-938B-A373675F5B4C}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>cmp_wav</RootNamespace>    
+    <OutDir>.\</OutDir>    
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../../../pjsip/include;../../../pjlib/include;../../../pjlib-util/include;../../../pjmedia/include;../../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;libpjproject-i386-Win32-vc14-Debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>libcmtd.lib</IgnoreSpecificDefaultLibraries>
+      <OutputFile>$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../pjsip/include;../../../pjlib/include;../../../pjlib-util/include;../../../pjmedia/include;../../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;libpjproject-x86_64-x64-vc14-Debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
+      <OutputFile>$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>../../../pjsip/include;../../../pjlib/include;../../../pjlib-util/include;../../../pjmedia/include;../../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;libpjproject-i386-Win32-vc14-Release.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
+      <OutputFile>$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>../../../pjsip/include;../../../pjlib/include;../../../pjlib-util/include;../../../pjmedia/include;../../../pjnath/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Iphlpapi.lib;dsound.lib;dxguid.lib;netapi32.lib;mswsock.lib;ws2_32.lib;odbc32.lib;odbccp32.lib;ole32.lib;user32.lib;gdi32.lib;advapi32.lib;libpjproject-x86_64-x64-vc14-Release.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
+      <OutputFile>$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/baseclasses/libbaseclasses.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/baseclasses/libbaseclasses.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/baseclasses/libbaseclasses.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/baseclasses/libbaseclasses.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -78,7 +102,7 @@
   <Import Project="..\..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}</ProjectGuid>
-    <RootNamespace>libbaseclasses</RootNamespace>    
+    <RootNamespace>libbaseclasses</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -148,35 +172,66 @@
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>    
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -246,35 +301,65 @@
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
-    <OutDir>..\..\lib\</OutDir>    
+    <OutDir>..\..\lib\</OutDir>
   </PropertyGroup>
   <!-- Compile and link option definition -->
   <ItemDefinitionGroup>
@@ -324,6 +409,20 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -367,6 +466,21 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -410,6 +524,21 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -453,6 +582,21 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -495,6 +639,20 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -528,6 +686,20 @@
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../baseclasses;../../../pjmedia/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WIN32_DCOM;WINVER=0x400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/baseclasses/Makefile asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/baseclasses/Makefile
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/baseclasses/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/baseclasses/Makefile	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,72 @@
+include ../../../build.mak
+include ../../../build/common.mak
+
+export LIBDIR := ../../lib
+
+RULES_MAK := $(PJDIR)/build/rules.mak
+
+export BASECLASSES_LIB := libbaseclasses-$(TARGET_NAME)$(LIBEXT)
+
+ifeq ($(PJ_SHARED_LIBRARIES),)
+else
+export BASECLASSES_SONAME := libbaseclasses.$(SHLIB_SUFFIX)
+export BASECLASSES_SHLIB := $(BASECLASSES_SONAME).$(PJ_VERSION_MAJOR)
+endif
+
+###############################################################################
+# Gather all flags.
+#
+export _CFLAGS 	:= $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+		   $(CFLAGS) $(CC_INC)../../BaseClasses \
+		   $(CC_INC)../../../pjmedia/include $(CC_INC)../../../pjlib/include
+export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+		   $(HOST_CXXFLAGS) $(CXXFLAGS)
+export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+		   $(LDFLAGS) 
+
+export BASECLASSES_SRCDIR = ../../BaseClasses
+export BASECLASSES_OBJS = amfilter.o amvideo.o arithutil.o combase.o ctlutil.o \
+                          mtype.o renbase.o wxdebug.o wxlist.o \
+                          wxutil.o 
+
+export BASECLASSES_CFLAGS = $(_CFLAGS)
+export BASECLASSES_CXXFLAGS = -fpermissive -D__STRSAFE__NO_INLINE=1 -DPJMEDIA_VIDEO_DEV_HAS_DSHOW=1 $(_CFLAGS)
+
+
+export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 
+###############################################################################
+# Main entry
+#
+# $(TARGET) is defined in os-$(OS_NAME).mak file in current directory.
+#
+TARGETS := $(BASECLASSES_LIB) $(BASECLASSES_SONAME)
+
+all: $(TARGETS)
+
+doc:
+	cd .. && doxygen docs/doxygen.cfg
+
+dep: depend
+distclean: realclean
+
+.PHONY: all dep depend clean realclean distclean
+.PHONY: $(TARGETS)
+.PHONY: $(BASECLASSES_LIB) $(BASECLASSES_SONAME)
+
+libbaseclasses: $(BASECLASSES_LIB)
+$(BASECLASSES_SONAME): $(BASECLASSES_LIB)
+$(BASECLASSES_LIB) $(BASECLASSES_SONAME):
+	$(MAKE) -f $(RULES_MAK) APP=BASECLASSES app=baseclasses $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
+
+clean print_lib:
+	$(MAKE) -f $(RULES_MAK) APP=BASECLASSES app=baseclasses $@
+
+realclean:
+	$(subst @@,$(subst /,$(HOST_PSEP),.ilbc-$(TARGET_NAME).depend),$(HOST_RMR))
+	
+	$(MAKE) -f $(RULES_MAK) APP=BASECLASSES app=baseclasses $@
+
+depend:
+	$(MAKE) -f $(RULES_MAK) APP=BASECLASSES app=baseclasses $@
+
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/g7221/libg7221codec.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/g7221/libg7221codec.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/g7221/libg7221codec.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/g7221/libg7221codec.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -79,7 +103,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2A3F241E-682C-47E1-9543-DC28708B406A}</ProjectGuid>
     <RootNamespace>libg7221codec</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>    
+    <DefaultLanguage>en-US</DefaultLanguage>
     <!-- Specific UWP property -->
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -148,35 +172,67 @@
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
-    <PlatformToolset>$(BuildToolset)</PlatformToolset><CharacterSet Condition="'$(API_Family)'=='WinDesktop'">MultiByte</CharacterSet>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <PlatformToolset>$(BuildToolset)</PlatformToolset>
+    <CharacterSet Condition="'$(API_Family)'=='WinDesktop'">MultiByte</CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -246,31 +302,61 @@
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -316,6 +402,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -351,6 +449,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -386,6 +497,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -421,6 +545,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -455,6 +592,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -487,6 +636,18 @@
     </ClCompile>
     <Lib>
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../..;../../g7221/common;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/gsm/libgsmcodec.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/gsm/libgsmcodec.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/gsm/libgsmcodec.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/gsm/libgsmcodec.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -78,7 +102,7 @@
   <Import Project="..\..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E53AA5FF-B737-40AA-BD13-387EFA99023D}</ProjectGuid>
-    <RootNamespace>libgsmcodec</RootNamespace>    
+    <RootNamespace>libgsmcodec</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -161,41 +185,78 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
-  </PropertyGroup>  
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -264,31 +325,61 @@
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <!-- Compile and link option definition -->
   <ItemDefinitionGroup>
@@ -298,7 +389,7 @@
   </ItemDefinitionGroup>
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
-    <OutDir>..\..\lib\</OutDir>    
+    <OutDir>..\..\lib\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -338,6 +429,20 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../gsm/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../gsm/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -375,6 +480,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../gsm/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../gsm/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -413,6 +531,20 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../gsm/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../gsm/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -450,6 +582,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../gsm/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../gsm/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -488,6 +633,20 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../gsm/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../gsm/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -522,6 +681,19 @@
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../gsm/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/ilbc/libilbccodec.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/ilbc/libilbccodec.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/ilbc/libilbccodec.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/ilbc/libilbccodec.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -78,7 +102,7 @@
   <Import Project="..\..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}</ProjectGuid>
-    <RootNamespace>libilbccodec</RootNamespace>    
+    <RootNamespace>libilbccodec</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -161,41 +185,78 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
-  </PropertyGroup>  
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -264,31 +325,61 @@
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -332,6 +423,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -363,6 +466,17 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -395,6 +509,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -426,6 +552,17 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -458,6 +595,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -487,6 +636,17 @@
     </ClCompile>
     <Lib>
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/milenage/libmilenage.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/milenage/libmilenage.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/milenage/libmilenage.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/milenage/libmilenage.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -78,7 +102,7 @@
   <Import Project="..\..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{4BF51C21-5A30-423B-82FE-1ED410E5769D}</ProjectGuid>
-    <RootNamespace>libmilenage</RootNamespace>    
+    <RootNamespace>libmilenage</RootNamespace>
     <!-- Specific UWP property -->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
@@ -161,40 +185,77 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -264,31 +325,61 @@
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -335,6 +426,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -369,6 +473,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -404,6 +520,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -438,6 +567,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -473,6 +614,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -505,6 +659,18 @@
     </ClCompile>
     <Lib>
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/os-auto.mak.in asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/os-auto.mak.in
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/os-auto.mak.in	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/os-auto.mak.in	2022-02-24 07:54:38.000000000 +0000
@@ -39,6 +39,10 @@
 endif
 endif
 
+ifneq ($(findstring windows_os,@ac_pjmedia_video@),)
+DIRS += baseclasses
+endif
+
 ifneq (@ac_external_srtp@,0)
 # External SRTP
 else
@@ -117,3 +121,31 @@
 endif
 endif
 endif
+
+ifneq (@ac_no_webrtc_aec3@,1)
+ifeq (@ac_external_webrtc_aec3@,1)
+# External webrtc AEC3
+else
+DIRS += webrtc_aec3
+WEBRTC_AEC3_OTHER_CFLAGS = -fexceptions @ac_webrtc_aec3_cflags@
+ifneq ($(findstring sse2,@ac_webrtc_aec3_instset@),)
+    export WEBRTC_AEC3_SRC = \
+	common_audio/resampler/sinc_resampler_sse.o \
+	common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.o
+    export WEBRTC_AEC3_SRC += \
+	common_audio/resampler/sinc_resampler_avx2.o \
+	modules/audio_processing/aec3/adaptive_fir_filter_erl_avx2.o \
+	modules/audio_processing/aec3/adaptive_fir_filter_avx2.o \
+	modules/audio_processing/aec3/fft_data_avx2.o \
+	modules/audio_processing/aec3/matched_filter_avx2.o \
+	modules/audio_processing/aec3/vector_math_avx2.o \
+	modules/audio_processing/agc2/rnn_vad/rnn_vector_math_avx2.o
+    WEBRTC_AEC3_OTHER_CFLAGS += -mfma
+else ifneq ($(findstring neon,@ac_webrtc_aec3_instset@),)
+    export WEBRTC_AEC3_SRC = \
+	common_audio/resampler/sinc_resampler_neon.o \
+	common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.o
+    WEBRTC_AEC3_OTHER_CFLAGS += -DWEBRTC_HAS_NEON
+endif
+endif
+endif
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/resample/libresample.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/resample/libresample.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/resample/libresample.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/resample/libresample.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -75,7 +99,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <!-- Import common config -->
-  <Import Project="..\..\..\build\vs\pjproject-vs14-common-config.props" />  
+  <Import Project="..\..\..\build\vs\pjproject-vs14-common-config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6794B975-4E84-4F49-B2DC-C31F2224E03E}</ProjectGuid>
     <RootNamespace>libresample</RootNamespace>
@@ -161,40 +185,77 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -264,35 +325,65 @@
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
-    <OutDir>..\..\lib\</OutDir>    
+    <OutDir>..\..\lib\</OutDir>
   </PropertyGroup>
   <!-- Compile and link option definition -->
   <ItemDefinitionGroup>
@@ -335,6 +426,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -369,6 +473,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -404,6 +520,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -438,6 +567,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -473,6 +614,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -505,6 +659,18 @@
     </ClCompile>
     <Lib>
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../resample/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/samplerate/README.txt asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/samplerate/README.txt
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/samplerate/README.txt	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/samplerate/README.txt	2022-02-24 07:54:38.000000000 +0000
@@ -11,7 +11,8 @@
 ----------
    Secret Rabbit Code (aka libsamplerate) is a sample rate conversion
    library, available from http://www.mega-nerd.com/SRC/index.html.
-   It is licensed under dual license, GPL and proprietary.
+   It is licensed under the 2-clause BSD license (initially it was
+   licensed under dual license, GPL and proprietary).
 
    
 Supported Platforms
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/speex/libspeex.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/speex/libspeex.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/speex/libspeex.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/speex/libspeex.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -161,36 +185,72 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
@@ -265,31 +325,61 @@
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -336,6 +426,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -370,6 +473,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -405,6 +520,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -439,6 +567,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -474,6 +614,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -508,425 +661,551 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../speex/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\speex\libspeex\bits.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\cb_search.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\exc_10_16_table.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\exc_10_32_table.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\exc_20_32_table.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\exc_5_256_table.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\exc_5_64_table.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\exc_8_128_table.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\fftwrap.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\filterbank.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\filters.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\gain_table.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\gain_table_lbr.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\hexc_10_32_table.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\hexc_table.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\high_lsp_tables.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\kiss_fft.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\kiss_fftr.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\lpc.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\lsp.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\lsp_tables_nb.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\ltp.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\mdf.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\modes.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\modes_wb.c" />
     <ClCompile Include="..\..\speex\libspeex\nb_celp.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\preprocess.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\quant_lsp.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\resample.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\sb_celp.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\scal.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
-      <ClCompile Include="..\..\speex\libspeex\smallft.c">
+    <ClCompile Include="..\..\speex\libspeex\smallft.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\speex.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\speex_callbacks.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\speex_header.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\stereo.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\vbr.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\vq.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
     <ClCompile Include="..\..\speex\libspeex\window.c">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MaxSpeed</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">MaxSpeed</Optimization>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/srtp/libsrtp.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/srtp/libsrtp.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/srtp/libsrtp.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/srtp/libsrtp.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -5,6 +5,10 @@
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -17,6 +21,10 @@
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -29,6 +37,10 @@
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -41,6 +53,10 @@
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -53,6 +69,10 @@
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -65,6 +85,10 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -149,31 +173,61 @@
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
@@ -248,31 +302,61 @@
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
@@ -319,6 +403,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -353,6 +450,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -388,6 +497,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -422,6 +544,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -457,6 +591,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -491,6 +638,18 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalIncludeDirectories>.;../../srtp/include;../../srtp/crypto/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\srtp\crypto\cipher\aes.c" />
     <ClCompile Include="..\..\srtp\crypto\cipher\aes_gcm_ossl.c">
@@ -501,11 +660,17 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
@@ -522,11 +687,17 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
@@ -546,11 +717,17 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">true</ExcludedFromBuild>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/webrtc/libwebrtc.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/webrtc/libwebrtc.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/webrtc/libwebrtc.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/webrtc/libwebrtc.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -4,7 +4,11 @@
     <ProjectConfiguration Include="Debug-Dynamic|ARM">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
-    </ProjectConfiguration>      
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -16,7 +20,11 @@
     <ProjectConfiguration Include="Debug-Static|ARM">
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
-    </ProjectConfiguration>      
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -28,7 +36,11 @@
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
-    </ProjectConfiguration>      
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -40,7 +52,11 @@
     <ProjectConfiguration Include="Release-Dynamic|ARM">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
-    </ProjectConfiguration>      
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -52,7 +68,11 @@
     <ProjectConfiguration Include="Release-Static|ARM">
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
-    </ProjectConfiguration>      
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -64,7 +84,11 @@
     <ProjectConfiguration Include="Release|ARM">
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
-    </ProjectConfiguration>      
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -74,6 +98,13 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <!-- Check the instruction set -->
+  <PropertyGroup>
+    <InstSet Condition="$(Platform)==Win32">SSE</InstSet>
+    <InstSet Condition="$(Platform)==x64">SSE</InstSet>
+    <InstSet Condition="$(Platform)==ARM">NEON</InstSet>
+    <InstSet Condition="$(Platform)==ARM64">NEON</InstSet>
+  </PropertyGroup>
   <ItemGroup>
     <ClInclude Include="..\..\webrtc\src\webrtc\common_audio\fft4g.h" />
     <ClInclude Include="..\..\webrtc\src\webrtc\common_audio\ring_buffer.h" />
@@ -118,9 +149,11 @@
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\complex_fft.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\copy_set_operations.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\cross_correlation.c" />
+    <ClCompile Condition="$(InstSet)==NEON" Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\cross_correlation_neon.c" />  
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\division_operations.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\dot_product_with_scale.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\downsample_fast.c" />
+    <ClCompile Condition="$(IntsSet)==NEON" Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\downsample_fast_neon.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\energy.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\filter_ar.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\filter_ar_fast_q12.c" />
@@ -131,6 +164,7 @@
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\levinson_durbin.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\lpc_to_refl_coef.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\min_max_operations.c" />
+    <ClCompile Condition="$(IntsSet)==NEON" Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\min_max_operations_neon.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\randomization_functions.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\real_fft.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\refl_coef_to_lpc.c" />
@@ -144,24 +178,27 @@
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\spl_sqrt.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\spl_sqrt_floor.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\sqrt_of_one_minus_x_squared.c" />
-    <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\vector_scaling_operations.c" />
+    <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\vector_scaling_operations.c" />      
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aecm\aecm_core.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aecm\aecm_core_c.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aecm\echo_control_mobile.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core.c" />
-    <ClCompile Condition="$(Platform)!=ARM" Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core_sse2.c" />
+    <ClCompile Condition="$(InstSet)==NEON" Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core_neon.c" />      
+    <ClCompile Condition="$(InstSet)==SSE" Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core_sse2.c" />    
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft.c" />
-    <ClCompile Condition="$(Platform)!=ARM" Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft_sse2.c" />
+    <ClCompile Condition="$(InstSet)==NEON" Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft_neon.c" />
+    <ClCompile Condition="$(InstSet)==SSE" Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft_sse2.c" />    
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_resampler.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\echo_cancellation.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\ns\noise_suppression.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\ns\noise_suppression_x.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\ns\nsx_core.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\ns\nsx_core_c.c" />
+    <ClCompile Condition="$(InstSet)==NEON" Include="..\..\webrtc\src\webrtc\modules\audio_processing\ns\nsx_core_neon.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\ns\ns_core.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\utility\delay_estimator.c" />
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\utility\delay_estimator_wrapper.c" />
-    <ClCompile Include="..\..\webrtc\src\webrtc\system_wrappers\source\cpu_features.cc" />
+    <ClCompile Condition="$(InstSet)==SSE" Include="..\..\webrtc\src\webrtc\system_wrappers\source\cpu_features.cc" />
   </ItemGroup>
   <!-- Import common config -->
   <Import Project="..\..\..\build\vs\pjproject-vs14-common-config.props" />
@@ -229,60 +266,97 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>      
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>      
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>      
-  </PropertyGroup>        
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
-    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'"></CharacterSet>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -346,37 +420,67 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
-  </ImportGroup>    
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.24730.2</_ProjectFileVersion>
@@ -385,7 +489,7 @@
   <!-- Compile and link option definition -->
   <ItemDefinitionGroup>
     <ClCompile>
-        <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -453,7 +557,7 @@
     <Lib>
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
-  </ItemDefinitionGroup>   
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <ClCompile>
       <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
@@ -519,7 +623,7 @@
     <Lib>
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
-  </ItemDefinitionGroup>    
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -535,6 +639,20 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -549,6 +667,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -564,6 +695,20 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -578,6 +723,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -593,6 +751,20 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -605,6 +777,19 @@
     </ClCompile>
     <Lib>
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_HAS_NEON;WEBRTC_ARCH_ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/webrtc/libwebrtc.vcxproj.filters asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/webrtc/libwebrtc.vcxproj.filters
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/webrtc/libwebrtc.vcxproj.filters	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/webrtc/libwebrtc.vcxproj.filters	2022-02-24 07:54:38.000000000 +0000
@@ -116,15 +116,9 @@
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core_sse2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft_sse2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_resampler.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -149,9 +143,6 @@
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\copy_set_operations.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\webrtc\src\webrtc\system_wrappers\source\cpu_features.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\cross_correlation.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -266,5 +257,23 @@
     <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\sqrt_of_one_minus_x_squared.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_core_neon.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\aec\aec_rdft_neon.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\cross_correlation_neon.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\downsample_fast_neon.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc\src\webrtc\common_audio\signal_processing\min_max_operations_neon.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc\src\webrtc\modules\audio_processing\ns\nsx_core_neon.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,907 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug-Dynamic|ARM">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|Win32">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|x64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|Win32">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|x64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|Win32">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|x64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|Win32">
+      <Configuration>Release-Static</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|x64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <!-- Check the instruction set -->
+  <PropertyGroup>
+    <InstSet Condition="$(Platform)==Win32">SSE</InstSet>
+    <InstSet Condition="$(Platform)==x64">SSE</InstSet>
+    <InstSet Condition="$(Platform)==ARM">NEON</InstSet>
+    <InstSet Condition="$(Platform)==ARM64">NEON</InstSet>
+  </PropertyGroup>    
+  <ItemGroup>
+    <ClInclude Include="..\..\webrtc_aec3\src\absl\base\config.h" />
+    <ClInclude Include="..\..\webrtc_aec3\src\api\audio\echo_control.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\webrtc_aec3\src\absl\types\bad_optional_access.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\api\audio\channel_layout.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\api\audio\echo_canceller3_config.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\api\audio\echo_canceller3_factory.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\api\audio\echo_detector_creator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\audio_util.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\resampler\push_resampler.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\resampler\push_sinc_resampler.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\resampler\sinc_resampler.cc" />
+    <ClCompile Condition="$(InstSet)==SSE" Include="..\..\webrtc_aec3\src\common_audio\resampler\sinc_resampler_avx2.cc" />
+    <ClCompile Condition="$(InstSet)==SSE" Include="..\..\webrtc_aec3\src\common_audio\resampler\sinc_resampler_sse.cc" />
+    <ClCompile Condition="$(InstSet)==NEON" Include="..\..\webrtc_aec3\src\common_audio\resampler\sinc_resampler_neon.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\signal_processing\splitting_filter2.c" />
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\third_party\ooura\fft_size_128\ooura_fft.cc" />
+    <ClCompile Condition="$(InstSet)==SSE" Include="..\..\webrtc_aec3\src\common_audio\third_party\ooura\fft_size_128\ooura_fft_sse2.cc" />
+    <ClCompile Condition="$(InstSet)==NEON" Include="..\..\webrtc_aec3\src\common_audio\third_party\ooura\fft_size_128\ooura_fft_neon.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\third_party\ooura\fft_size_256\fft4g.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\adaptive_fir_filter.cc" />
+    <ClCompile Condition="$(InstSet)==SSE" Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\adaptive_fir_filter_avx2.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\adaptive_fir_filter_erl.cc" />
+    <ClCompile Condition="$(InstSet)==SSE" Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\adaptive_fir_filter_erl_avx2.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\aec3_common.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\aec3_fft.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\aec_state.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\alignment_mixer.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\api_call_jitter_metrics.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\block_buffer.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\block_delay_buffer.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\block_framer.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\block_processor.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\block_processor_metrics.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\clockdrift_detector.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\coarse_filter_update_gain.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\comfort_noise_generator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\decimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\dominant_nearend_detector.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\downsampled_render_buffer.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\echo_audibility.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\echo_canceller3.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\echo_path_delay_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\echo_path_variability.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\echo_remover.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\echo_remover_metrics.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\erle_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\erl_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\fft_buffer.cc" />
+    <ClCompile Condition="$(InstSet)==SSE" Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\fft_data_avx2.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\filter_analyzer.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\frame_blocker.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\fullband_erle_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\matched_filter.cc" />
+    <ClCompile Condition="$(InstSet)==SSE" Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\matched_filter_avx2.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\matched_filter_lag_aggregator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\moving_average.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\refined_filter_update_gain.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\render_buffer.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\render_delay_buffer.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\render_delay_controller.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\render_delay_controller_metrics.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\render_signal_analyzer.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\residual_echo_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\reverb_decay_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\reverb_frequency_response.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\reverb_model.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\reverb_model_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\signal_dependent_erle_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\spectrum_buffer.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\stationarity_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\subband_erle_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\subband_nearend_detector.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\subtractor.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\subtractor_output.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\subtractor_output_analyzer.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\suppression_filter.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\suppression_gain.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\transparent_mode.cc" />
+    <ClCompile Condition="$(InstSet)==SSE" Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\vector_math_avx2.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\adaptive_agc.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\adaptive_digital_gain_applier.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\adaptive_mode_level_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\biquad_filter.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\compute_interpolated_gain_curve.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\cpu_features.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\down_sampler.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\fixed_digital_level_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\gain_applier.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\interpolated_gain_curve.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\limiter.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\limiter_db_gain_curve.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\noise_level_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\noise_spectrum_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\auto_correlation.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\features_extraction.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\lp_residual.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\pitch_search.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\pitch_search_internal.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\rnn.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\rnn_fc.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\rnn_gru.cc" />
+    <ClCompile Condition="$(InstSet)==SSE" Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\rnn_vector_math_avx2.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\spectral_features.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\spectral_features_internal.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\saturation_protector.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\saturation_protector_buffer.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\signal_classifier.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\vad_with_level.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\vector_float_frame.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\audio_buffer.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\gain_controller2.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\high_pass_filter.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\logging\apm_data_dumper.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\fast_math.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\histograms.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\noise_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\noise_suppressor.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\ns_fft.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\prior_signal_model.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\prior_signal_model_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\quantile_noise_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\signal_model.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\signal_model_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\speech_probability_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\suppression_params.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\wiener_filter.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\splitting_filter.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\three_band_filter_bank.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\utility\cascaded_biquad_filter.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\utility\delay_estimator.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\utility\delay_estimator_wrapper.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\utility\pffft_wrapper.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\checks.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\experiments\field_trial_parser.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\logging.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\memory\aligned_malloc.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\platform_thread_types.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\race_checker.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\strings\string_builder.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\string_encode.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\string_to_number.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\string_utils.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\synchronization\mutex.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\synchronization\yield.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\system\file_wrapper.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\system_time.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\time_utils.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\system_wrappers\source\cpu_features2.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\system_wrappers\source\field_trial.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\system_wrappers\source\metrics.cc" />
+    <ClCompile Include="..\..\webrtc_aec3\src\third_party\pffft\src\pffft.c" />
+    <ClCompile Include="..\..\webrtc_aec3\src\third_party\rnnoise\src\rnn_vad_weights.cc" />
+  </ItemGroup>
+  <!-- Import common config -->
+  <Import Project="..\..\..\build\vs\pjproject-vs14-common-config.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{D738A812-CE37-40A4-B2FA-D81488C12C87}</ProjectGuid>
+    <RootNamespace>libwebrtc_aec3</RootNamespace>
+    <!-- Specific UWP property -->
+    <DefaultLanguage>en-US</DefaultLanguage>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v142</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <!-- Override the PlatformToolset -->
+  <PropertyGroup>
+    <PlatformToolset>$(BuildToolset)</PlatformToolset>
+    <CharacterSet Condition="'$(API_Family)'!='WinDesktop'">
+    </CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>14.0.24730.2</_ProjectFileVersion>
+    <OutDir>..\..\lib\</OutDir>
+  </PropertyGroup>
+  <!-- Compile and link option definition -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <RuntimeLibrary Condition="'$(API_Family)'=='UWP'">MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;__ARMEL__;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;WEBRTC_HAS_NEON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;WEBRTC_HAS_NEON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;WEBRTC_HAS_NEON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;WEBRTC_HAS_NEON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;WEBRTC_HAS_NEON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile />
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4305 /wd4456 /wd4530 /wd4100 /wd4244 /wd4715 /wd4127 /wd4005 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../webrtc_aec3/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;WEBRTC_WIN;WEBRTC_APM_DEBUG_DUMP=0;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING;_USE_MATH_DEFINES;WEBRTC_HAS_NEON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <ExceptionHandling>false</ExceptionHandling>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj.filters asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj.filters
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj.filters	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/webrtc_aec3/libwebrtc_aec3.vcxproj.filters	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,522 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{d1521b07-9b1c-41b7-b6f2-848cf25559b4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{9d5ef30c-9759-4e25-8586-28896609c552}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\absl">
+      <UniqueIdentifier>{b4619809-e1d5-4d66-a6b3-953bf8c75ab0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\absl">
+      <UniqueIdentifier>{e3db4b13-c39c-40bd-b2d0-2d3df0bc0529}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\absl\types">
+      <UniqueIdentifier>{5eb3ceab-b77c-4cf7-b129-794dee1f66fc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\api">
+      <UniqueIdentifier>{fa5d3cb5-3803-4944-a017-a260c8e59912}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\api\audio">
+      <UniqueIdentifier>{911f4305-1369-4531-a6cd-ec5771848f38}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\api">
+      <UniqueIdentifier>{7f53e4f5-c002-46c2-94bc-b99eaac7a5d8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\modules">
+      <UniqueIdentifier>{58d34c2c-e442-4378-b9df-60b19cbe1dba}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\modules\audio_processing">
+      <UniqueIdentifier>{9b920eb8-1db7-4470-a913-8a24407d3af8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\modules\audio_processing\aec3">
+      <UniqueIdentifier>{c4f36bdb-67e1-4bac-8f12-93cde19a8870}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\modules\audio_processing\agc2">
+      <UniqueIdentifier>{7f7f5771-a653-4f26-b433-e71cf98a6c40}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\modules\audio_processing\agc2\rnn_vad">
+      <UniqueIdentifier>{2ebe53aa-9c2f-4be2-a47d-32185868bf27}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\modules\audio_processing\ns">
+      <UniqueIdentifier>{8fa7e856-f5d9-4b47-a45f-24992b26ed28}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\modules\audio_processing\logging">
+      <UniqueIdentifier>{7bbaa4f6-c5c6-41b6-9dc3-11b60d997de0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\modules\audio_processing\utility">
+      <UniqueIdentifier>{81f55853-e41f-4ba1-927c-fec0d25e78dd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\third_party">
+      <UniqueIdentifier>{82880ef6-a258-4350-aa90-44fb409f0bf4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\rtc_base">
+      <UniqueIdentifier>{a9dc81cd-8209-485a-b732-880b08597859}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\system_wrappers">
+      <UniqueIdentifier>{deffebea-dd2d-4900-b052-1e3ce7b2cade}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\third_party\rnnoise">
+      <UniqueIdentifier>{231eb606-3614-4416-8713-1f48b47155e5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\third_party\pffft">
+      <UniqueIdentifier>{4b48769a-fab5-49ef-840a-1f55a3a24d56}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\common_audio">
+      <UniqueIdentifier>{970f4aaf-69aa-415c-ba4f-51fa97d7b1a9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\common_audio\resampler">
+      <UniqueIdentifier>{ca3df877-a47f-482c-bea2-efce3958e51b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\common_audio\signal_processing">
+      <UniqueIdentifier>{b2a0d4da-3350-4c76-a0fc-28b15b7666c7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\common_audio\third_party">
+      <UniqueIdentifier>{dfb507ca-efdf-4ccf-93be-4e2367a87cfe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\common_audio\third_party\ooura">
+      <UniqueIdentifier>{1c6d4fc0-9c1e-413a-bcb6-5afa5890410c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\common_audio\third_party\ooura\fft_size_128">
+      <UniqueIdentifier>{f7d7a821-03c6-453c-811f-fbf827050175}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\common_audio\third_party\ooura\fft_size_256">
+      <UniqueIdentifier>{27f4991c-1ffd-4503-b28e-4c5cf193e33b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\webrtc_aec3\src\absl\base\config.h">
+      <Filter>Header Files\absl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\webrtc_aec3\src\api\audio\echo_control.h">
+      <Filter>Header Files\api</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\webrtc_aec3\src\absl\types\bad_optional_access.cc">
+      <Filter>Source Files\absl\types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\api\audio\channel_layout.cc">
+      <Filter>Source Files\api\audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\api\audio\echo_canceller3_config.cc">
+      <Filter>Source Files\api\audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\api\audio\echo_canceller3_factory.cc">
+      <Filter>Source Files\api\audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\api\audio\echo_detector_creator.cc">
+      <Filter>Source Files\api\audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\third_party\ooura\fft_size_128\ooura_fft.cc">
+      <Filter>Source Files\common_audio\third_party\ooura\fft_size_128</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\third_party\ooura\fft_size_256\fft4g.cc">
+      <Filter>Source Files\common_audio\third_party\ooura\fft_size_256</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\resampler\push_resampler.cc">
+      <Filter>Source Files\common_audio\resampler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\resampler\push_sinc_resampler.cc">
+      <Filter>Source Files\common_audio\resampler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\resampler\sinc_resampler.cc">
+      <Filter>Source Files\common_audio\resampler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\signal_processing\splitting_filter2.c">
+      <Filter>Source Files\common_audio\signal_processing</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\audio_buffer.cc">
+      <Filter>Source Files\modules\audio_processing</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\gain_controller2.cc">
+      <Filter>Source Files\modules\audio_processing</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\high_pass_filter.cc">
+      <Filter>Source Files\modules\audio_processing</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\splitting_filter.cc">
+      <Filter>Source Files\modules\audio_processing</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\three_band_filter_bank.cc">
+      <Filter>Source Files\modules\audio_processing</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\adaptive_fir_filter.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\adaptive_fir_filter_erl.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\aec_state.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\aec3_common.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\aec3_fft.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\alignment_mixer.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\api_call_jitter_metrics.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\block_buffer.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\block_delay_buffer.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\block_framer.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\block_processor.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\clockdrift_detector.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\coarse_filter_update_gain.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\comfort_noise_generator.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\decimator.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\dominant_nearend_detector.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\downsampled_render_buffer.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\echo_audibility.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\echo_canceller3.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\echo_path_delay_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\echo_path_variability.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\echo_remover.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\echo_remover_metrics.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\erl_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\erle_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\fft_buffer.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\filter_analyzer.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\frame_blocker.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\fullband_erle_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\matched_filter.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\matched_filter_lag_aggregator.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\moving_average.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\refined_filter_update_gain.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\render_buffer.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\render_delay_buffer.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\render_delay_controller.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\render_delay_controller_metrics.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\render_signal_analyzer.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\residual_echo_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\reverb_decay_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\reverb_frequency_response.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\reverb_model.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\reverb_model_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\signal_dependent_erle_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\spectrum_buffer.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\stationarity_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\subband_erle_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\subband_nearend_detector.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\subtractor.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\subtractor_output.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\subtractor_output_analyzer.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\suppression_filter.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\suppression_gain.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\transparent_mode.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\adaptive_agc.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\adaptive_digital_gain_applier.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\adaptive_mode_level_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\biquad_filter.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\compute_interpolated_gain_curve.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\cpu_features.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\down_sampler.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\fixed_digital_level_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\gain_applier.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\interpolated_gain_curve.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\limiter.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\limiter_db_gain_curve.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\noise_level_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\noise_spectrum_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\saturation_protector.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\saturation_protector_buffer.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\signal_classifier.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\vad_with_level.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\vector_float_frame.cc">
+      <Filter>Source Files\modules\audio_processing\agc2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\auto_correlation.cc">
+      <Filter>Source Files\modules\audio_processing\agc2\rnn_vad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\features_extraction.cc">
+      <Filter>Source Files\modules\audio_processing\agc2\rnn_vad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\lp_residual.cc">
+      <Filter>Source Files\modules\audio_processing\agc2\rnn_vad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\pitch_search.cc">
+      <Filter>Source Files\modules\audio_processing\agc2\rnn_vad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\pitch_search_internal.cc">
+      <Filter>Source Files\modules\audio_processing\agc2\rnn_vad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\rnn.cc">
+      <Filter>Source Files\modules\audio_processing\agc2\rnn_vad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\rnn_fc.cc">
+      <Filter>Source Files\modules\audio_processing\agc2\rnn_vad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\rnn_gru.cc">
+      <Filter>Source Files\modules\audio_processing\agc2\rnn_vad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\spectral_features.cc">
+      <Filter>Source Files\modules\audio_processing\agc2\rnn_vad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\agc2\rnn_vad\spectral_features_internal.cc">
+      <Filter>Source Files\modules\audio_processing\agc2\rnn_vad</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\fast_math.cc">
+      <Filter>Source Files\modules\audio_processing\ns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\histograms.cc">
+      <Filter>Source Files\modules\audio_processing\ns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\noise_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\ns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\noise_suppressor.cc">
+      <Filter>Source Files\modules\audio_processing\ns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\ns_fft.cc">
+      <Filter>Source Files\modules\audio_processing\ns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\prior_signal_model.cc">
+      <Filter>Source Files\modules\audio_processing\ns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\prior_signal_model_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\ns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\quantile_noise_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\ns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\signal_model.cc">
+      <Filter>Source Files\modules\audio_processing\ns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\signal_model_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\ns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\speech_probability_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\ns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\suppression_params.cc">
+      <Filter>Source Files\modules\audio_processing\ns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\ns\wiener_filter.cc">
+      <Filter>Source Files\modules\audio_processing\ns</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\logging\apm_data_dumper.cc">
+      <Filter>Source Files\modules\audio_processing\logging</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\utility\cascaded_biquad_filter.cc">
+      <Filter>Source Files\modules\audio_processing\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\utility\delay_estimator.cc">
+      <Filter>Source Files\modules\audio_processing\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\utility\delay_estimator_wrapper.cc">
+      <Filter>Source Files\modules\audio_processing\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\utility\pffft_wrapper.cc">
+      <Filter>Source Files\modules\audio_processing\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\checks.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\logging.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\platform_thread_types.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\race_checker.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\string_encode.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\string_to_number.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\string_utils.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\system_time.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\time_utils.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\system_wrappers\source\cpu_features2.cc">
+      <Filter>Source Files\system_wrappers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\system_wrappers\source\field_trial.cc">
+      <Filter>Source Files\system_wrappers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\system_wrappers\source\metrics.cc">
+      <Filter>Source Files\system_wrappers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\third_party\pffft\src\pffft.c">
+      <Filter>Source Files\third_party\pffft</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\third_party\rnnoise\src\rnn_vad_weights.cc">
+      <Filter>Source Files\third_party\rnnoise</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\audio_util.cc">
+      <Filter>Source Files\common_audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\experiments\field_trial_parser.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\memory\aligned_malloc.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\strings\string_builder.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\synchronization\mutex.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\synchronization\yield.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\rtc_base\system\file_wrapper.cc">
+      <Filter>Source Files\rtc_base</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\modules\audio_processing\aec3\block_processor_metrics.cc">
+      <Filter>Source Files\modules\audio_processing\aec3</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\resampler\sinc_resampler_neon.cc">
+      <Filter>Source Files\common_audio\resampler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\webrtc_aec3\src\common_audio\third_party\ooura\fft_size_128\ooura_fft_neon.cc">
+      <Filter>Source Files\third_party</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/webrtc_aec3/Makefile asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/webrtc_aec3/Makefile
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/webrtc_aec3/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/webrtc_aec3/Makefile	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,209 @@
+include ../../../build.mak
+include ../../../build/common.mak
+include ../os-$(OS_NAME).mak
+
+export LIBDIR := ../../lib
+
+RULES_MAK := $(PJDIR)/build/rules.mak
+
+export WEBRTC_AEC3_LIB := libwebrtc-aec3-$(TARGET_NAME)$(LIBEXT)
+
+ifeq ($(PJ_SHARED_LIBRARIES),)
+else
+export WEBRTC_AEC3_SONAME := libwebrtc-aec3.$(SHLIB_SUFFIX)
+export WEBRTC_AEC3_SHLIB := $(WEBRTC_AEC3_SONAME).$(PJ_VERSION_MAJOR)
+endif
+
+###############################################################################
+# Gather all flags.
+#
+export _CFLAGS 	:= $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \
+		   $(CFLAGS) $(CC_INC). $(CC_INC)../../webrtc_aec3/src  \
+		   $(CC_INC)../../../pjlib/include
+export _CXXFLAGS:= $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \
+		   $(HOST_CXXFLAGS) $(CXXFLAGS) $(_CFLAGS)
+export _LDFLAGS := $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \
+		   $(LDFLAGS) 
+
+export WEBRTC_AEC3_SRCDIR = ../../webrtc_aec3/src/
+export WEBRTC_AEC3_OBJS = \
+	absl/types/bad_optional_access.o \
+	common_audio/audio_util.o \
+	common_audio/third_party/ooura/fft_size_128/ooura_fft.o \
+	common_audio/third_party/ooura/fft_size_256/fft4g.o \
+	common_audio/resampler/push_resampler.o \
+	common_audio/resampler/push_sinc_resampler.o \
+	common_audio/resampler/sinc_resampler.o \
+	common_audio/signal_processing/splitting_filter2.o \
+	api/audio/channel_layout.o \
+	api/audio/echo_canceller3_config.o \
+	api/audio/echo_canceller3_factory.o \
+	api/audio/echo_detector_creator.o \
+	modules/audio_processing/audio_buffer.o \
+	modules/audio_processing/gain_controller2.o \
+	modules/audio_processing/high_pass_filter.o \
+	modules/audio_processing/splitting_filter.o \
+	modules/audio_processing/three_band_filter_bank.o \
+	modules/audio_processing/aec3/adaptive_fir_filter_erl.o \
+	modules/audio_processing/aec3/adaptive_fir_filter.o \
+	modules/audio_processing/aec3/aec_state.o \
+	modules/audio_processing/aec3/aec3_common.o \
+	modules/audio_processing/aec3/aec3_fft.o \
+	modules/audio_processing/aec3/alignment_mixer.o \
+	modules/audio_processing/aec3/api_call_jitter_metrics.o \
+	modules/audio_processing/aec3/block_framer.o \
+	modules/audio_processing/aec3/block_delay_buffer.o \
+	modules/audio_processing/aec3/block_buffer.o \
+	modules/audio_processing/aec3/block_processor_metrics.o \
+	modules/audio_processing/aec3/block_processor.o \
+	modules/audio_processing/aec3/clockdrift_detector.o \
+	modules/audio_processing/aec3/coarse_filter_update_gain.o \
+	modules/audio_processing/aec3/comfort_noise_generator.o \
+	modules/audio_processing/aec3/decimator.o \
+	modules/audio_processing/aec3/dominant_nearend_detector.o \
+	modules/audio_processing/aec3/downsampled_render_buffer.o \
+	modules/audio_processing/aec3/echo_audibility.o \
+	modules/audio_processing/aec3/echo_canceller3.o \
+	modules/audio_processing/aec3/echo_path_delay_estimator.o \
+	modules/audio_processing/aec3/echo_path_variability.o \
+	modules/audio_processing/aec3/echo_remover_metrics.o \
+	modules/audio_processing/aec3/echo_remover.o \
+	modules/audio_processing/aec3/erl_estimator.o \
+	modules/audio_processing/aec3/erle_estimator.o \
+	modules/audio_processing/aec3/fft_buffer.o \
+	modules/audio_processing/aec3/filter_analyzer.o \
+	modules/audio_processing/aec3/frame_blocker.o \
+	modules/audio_processing/aec3/fullband_erle_estimator.o \
+	modules/audio_processing/aec3/matched_filter_lag_aggregator.o \
+	modules/audio_processing/aec3/matched_filter.o \
+	modules/audio_processing/aec3/moving_average.o \
+	modules/audio_processing/aec3/refined_filter_update_gain.o \
+	modules/audio_processing/aec3/render_buffer.o \
+	modules/audio_processing/aec3/render_delay_buffer.o \
+	modules/audio_processing/aec3/render_delay_controller_metrics.o \
+	modules/audio_processing/aec3/render_delay_controller.o \
+	modules/audio_processing/aec3/render_signal_analyzer.o \
+	modules/audio_processing/aec3/residual_echo_estimator.o \
+	modules/audio_processing/aec3/reverb_decay_estimator.o \
+	modules/audio_processing/aec3/reverb_frequency_response.o \
+	modules/audio_processing/aec3/reverb_model_estimator.o \
+	modules/audio_processing/aec3/reverb_model.o \
+	modules/audio_processing/aec3/signal_dependent_erle_estimator.o \
+	modules/audio_processing/aec3/spectrum_buffer.o \
+	modules/audio_processing/aec3/stationarity_estimator.o \
+	modules/audio_processing/aec3/subband_erle_estimator.o \
+	modules/audio_processing/aec3/subband_nearend_detector.o \
+	modules/audio_processing/aec3/subtractor_output_analyzer.o \
+	modules/audio_processing/aec3/subtractor_output.o \
+	modules/audio_processing/aec3/subtractor.o \
+	modules/audio_processing/aec3/suppression_filter.o \
+	modules/audio_processing/aec3/suppression_gain.o \
+	modules/audio_processing/aec3/transparent_mode.o \
+	modules/audio_processing/agc2/adaptive_agc.o \
+	modules/audio_processing/agc2/adaptive_digital_gain_applier.o \
+	modules/audio_processing/agc2/adaptive_mode_level_estimator.o \
+	modules/audio_processing/agc2/biquad_filter.o \
+	modules/audio_processing/agc2/compute_interpolated_gain_curve.o \
+	modules/audio_processing/agc2/cpu_features.o \
+	modules/audio_processing/agc2/down_sampler.o \
+	modules/audio_processing/agc2/fixed_digital_level_estimator.o \
+	modules/audio_processing/agc2/gain_applier.o \
+	modules/audio_processing/agc2/interpolated_gain_curve.o \
+	modules/audio_processing/agc2/limiter_db_gain_curve.o \
+	modules/audio_processing/agc2/limiter.o \
+	modules/audio_processing/agc2/noise_level_estimator.o \
+	modules/audio_processing/agc2/noise_spectrum_estimator.o \
+	modules/audio_processing/agc2/saturation_protector_buffer.o \
+	modules/audio_processing/agc2/saturation_protector.o \
+	modules/audio_processing/agc2/signal_classifier.o \
+	modules/audio_processing/agc2/vad_with_level.o \
+	modules/audio_processing/agc2/vector_float_frame.o \
+	modules/audio_processing/agc2/rnn_vad/auto_correlation.o \
+	modules/audio_processing/agc2/rnn_vad/features_extraction.o \
+	modules/audio_processing/agc2/rnn_vad/lp_residual.o \
+	modules/audio_processing/agc2/rnn_vad/rnn.o \
+	modules/audio_processing/agc2/rnn_vad/rnn_fc.o \
+	modules/audio_processing/agc2/rnn_vad/rnn_gru.o \
+	modules/audio_processing/agc2/rnn_vad/pitch_search_internal.o \
+	modules/audio_processing/agc2/rnn_vad/pitch_search.o \
+	modules/audio_processing/agc2/rnn_vad/spectral_features_internal.o \
+	modules/audio_processing/agc2/rnn_vad/spectral_features.o \
+	modules/audio_processing/ns/fast_math.o \
+	modules/audio_processing/ns/histograms.o \
+	modules/audio_processing/ns/noise_estimator.o \
+	modules/audio_processing/ns/noise_suppressor.o \
+	modules/audio_processing/ns/ns_fft.o \
+	modules/audio_processing/ns/prior_signal_model_estimator.o \
+	modules/audio_processing/ns/prior_signal_model.o \
+	modules/audio_processing/ns/quantile_noise_estimator.o \
+	modules/audio_processing/ns/signal_model_estimator.o \
+	modules/audio_processing/ns/signal_model.o \
+	modules/audio_processing/ns/speech_probability_estimator.o \
+	modules/audio_processing/ns/suppression_params.o \
+	modules/audio_processing/ns/wiener_filter.o \
+	modules/audio_processing/logging/apm_data_dumper.o \
+	modules/audio_processing/utility/cascaded_biquad_filter.o \
+	modules/audio_processing/utility/delay_estimator_wrapper.o \
+	modules/audio_processing/utility/delay_estimator.o \
+	modules/audio_processing/utility/pffft_wrapper.o \
+	rtc_base/checks.o \
+	rtc_base/logging.o \
+	rtc_base/platform_thread_types.o \
+	rtc_base/race_checker.o \
+	rtc_base/string_encode.o \
+	rtc_base/string_to_number.o \
+	rtc_base/string_utils.o \
+	rtc_base/system_time.o \
+	rtc_base/time_utils.o \
+	rtc_base/experiments/field_trial_parser.o \
+	rtc_base/memory/aligned_malloc.o \
+	rtc_base/strings/string_builder.o \
+	rtc_base/synchronization/mutex.o \
+	rtc_base/synchronization/yield.o \
+	rtc_base/system/file_wrapper.o \
+	system_wrappers/source/cpu_features2.o \
+	system_wrappers/source/field_trial.o \
+	system_wrappers/source/metrics.o \
+	third_party/rnnoise/src/rnn_vad_weights.o \
+	third_party/pffft/src/pffft.o \
+	$(WEBRTC_AEC3_SRC)
+
+export WEBRTC_AEC3_CFLAGS = $(_CFLAGS) $(WEBRTC_AEC3_OTHER_CFLAGS)
+export WEBRTC_AEC3_CXXFLAGS = $(WEBRTC_AEC3_CFLAGS) $(_CXXFLAGS)
+
+
+export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 
+###############################################################################
+# Main entry
+#
+# $(TARGET) is defined in os-$(OS_NAME).mak file in current directory.
+#
+TARGETS := $(WEBRTC_AEC3_LIB) $(WEBRTC_AEC3_SONAME)
+
+all: $(TARGETS)
+
+doc:
+	cd .. && doxygen docs/doxygen.cfg
+
+dep: depend
+distclean: realclean
+
+.PHONY: all dep depend clean realclean distclean
+.PHONY: $(TARGETS)
+.PHONY: $(WEBRTC_AEC3_LIB) $(WEBRTC_AEC3_SONAME)
+
+libwebrtc-aec3: $(WEBRTC_AEC3_LIB)
+$(WEBRTC_AEC3_SONAME): $(WEBRTC_AEC3_LIB)
+$(WEBRTC_AEC3_LIB) $(WEBRTC_AEC3_SONAME):
+	$(MAKE) -f $(RULES_MAK) APP=WEBRTC_AEC3 app=libwebrtc-aec3 $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
+
+clean print_lib:
+	$(MAKE) -f $(RULES_MAK) APP=WEBRTC_AEC3 app=libwebrtc-aec3 $@
+
+realclean:
+	$(subst @@,$(subst /,$(HOST_PSEP),.webrtc-aec3-$(TARGET_NAME).depend),$(HOST_RMR))
+	
+	$(MAKE) -f $(RULES_MAK) APP=WEBRTC_AEC3 app=libwebrtc-aec3 $@
+
+depend:
+	$(MAKE) -f $(RULES_MAK) APP=WEBRTC_AEC3 app=libwebrtc-aec3 $@
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/yuv/libyuv.vcxproj asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/yuv/libyuv.vcxproj
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/yuv/libyuv.vcxproj	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/yuv/libyuv.vcxproj	2022-02-24 07:54:38.000000000 +0000
@@ -4,7 +4,11 @@
     <ProjectConfiguration Include="Debug-Dynamic|ARM">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>ARM</Platform>
-    </ProjectConfiguration>      
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Dynamic|ARM64">
+      <Configuration>Debug-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Dynamic|Win32">
       <Configuration>Debug-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -16,7 +20,11 @@
     <ProjectConfiguration Include="Debug-Static|ARM">
       <Configuration>Debug-Static</Configuration>
       <Platform>ARM</Platform>
-    </ProjectConfiguration>      
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug-Static|ARM64">
+      <Configuration>Debug-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug-Static|Win32">
       <Configuration>Debug-Static</Configuration>
       <Platform>Win32</Platform>
@@ -28,7 +36,11 @@
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
       <Platform>ARM</Platform>
-    </ProjectConfiguration>      
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -40,7 +52,11 @@
     <ProjectConfiguration Include="Release-Dynamic|ARM">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>ARM</Platform>
-    </ProjectConfiguration>      
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Dynamic|ARM64">
+      <Configuration>Release-Dynamic</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Dynamic|Win32">
       <Configuration>Release-Dynamic</Configuration>
       <Platform>Win32</Platform>
@@ -52,7 +68,11 @@
     <ProjectConfiguration Include="Release-Static|ARM">
       <Configuration>Release-Static</Configuration>
       <Platform>ARM</Platform>
-    </ProjectConfiguration>      
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release-Static|ARM64">
+      <Configuration>Release-Static</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release-Static|Win32">
       <Configuration>Release-Static</Configuration>
       <Platform>Win32</Platform>
@@ -64,7 +84,11 @@
     <ProjectConfiguration Include="Release|ARM">
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
-    </ProjectConfiguration>      
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -140,56 +164,92 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>      
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>      
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>      
-  </PropertyGroup>     
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
   <!-- Override the PlatformToolset -->
   <PropertyGroup>
     <PlatformToolset>$(BuildToolset)</PlatformToolset>
@@ -258,37 +318,67 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win32-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
-  </ImportGroup>    
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-release-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-release-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-release-dynamic-defaults.props" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-win64-common-defaults.props" />
     <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-arm64-common-defaults.props" />
+    <Import Project="..\..\..\build\vs\pjproject-vs14-debug-static-defaults.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.24730.2</_ProjectFileVersion>
@@ -433,7 +523,7 @@
     <Lib>
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
-  </ItemDefinitionGroup>    
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -449,6 +539,20 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -463,6 +567,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -478,6 +595,20 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -492,6 +623,19 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -507,6 +651,20 @@
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
@@ -519,6 +677,19 @@
     </ClCompile>
     <Lib>
       <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|ARM64'">
+    <Midl />
+    <ClCompile>
+      <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Lib>
+      <OutputFile>..\..\lib\$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration).lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/yuv/Makefile asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/yuv/Makefile
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/yuv/Makefile	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/yuv/Makefile	2022-02-24 07:54:38.000000000 +0000
@@ -70,8 +70,8 @@
 	scale_win.o         \
 	video_common.o
 
-export YUV_CFLAGS = -fomit-frame-pointer $(_CFLAGS)
-export YUV_CXXFLAGS = -fomit-frame-pointer $(_CXXFLAGS)
+export YUV_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing -Wno-memset-elt-size -Wno-unknown-warning-option -Wno-pragmas $(_CFLAGS)
+export YUV_CXXFLAGS = -fomit-frame-pointer -fno-strict-aliasing -Wno-memset-elt-size -Wno-unknown-warning-option -Wno-pragmas $(_CXXFLAGS)
 
 
 export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/yuv/Notes.txt asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/yuv/Notes.txt
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/build/yuv/Notes.txt	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/build/yuv/Notes.txt	2022-02-24 07:54:38.000000000 +0000
@@ -35,4 +35,4 @@
     diff += __popcnt(x);
     --------------------------------------------------------------------------------------
     So, we use the default method HammingDistance_C() to calculate Hamming Distance.
-    
\ No newline at end of file
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/LICENSE asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/LICENSE
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/LICENSE	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,29 @@
+Copyright (c) 2011, The WebRTC project authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/OWNERS asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/OWNERS
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/OWNERS	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/OWNERS	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,19 @@
+henrika@webrtc.org
+hta@webrtc.org
+juberti@webrtc.org
+mflodman@webrtc.org
+stefan@webrtc.org
+tommi@webrtc.org
+per-file .gitignore=*
+per-file .gn=mbonadei@webrtc.org
+per-file *.gn=mbonadei@webrtc.org
+per-file *.gni=mbonadei@webrtc.org
+per-file AUTHORS=*
+per-file DEPS=*
+per-file pylintrc=phoglund@webrtc.org
+per-file WATCHLISTS=*
+per-file abseil-in-webrtc.md=danilchap@webrtc.org
+per-file abseil-in-webrtc.md=mbonadei@webrtc.org
+per-file style-guide.md=danilchap@webrtc.org
+per-file native-api.md=mbonadei@webrtc.org
+per-file *.lua=titovartem@webrtc.org
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/PATENTS asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/PATENTS
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/PATENTS	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/PATENTS	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,24 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the WebRTC code package.
+
+Google hereby grants to you a perpetual, worldwide, non-exclusive,
+no-charge, irrevocable (except as stated in this section) patent
+license to make, have made, use, offer to sell, sell, import,
+transfer, and otherwise run, modify and propagate the contents of this
+implementation of the WebRTC code package, where such license applies
+only to those patent claims, both currently owned by Google and
+acquired in the future, licensable by Google that are necessarily
+infringed by this implementation of the WebRTC code package. This
+grant does not include claims that would be infringed only as a
+consequence of further modification of this implementation. If you or
+your agent or exclusive licensee institute or order or agree to the
+institution of patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that this
+implementation of the WebRTC code package or any code incorporated
+within this implementation of the WebRTC code package constitutes
+direct or contributory patent infringement, or inducement of patent
+infringement, then any patent rights granted to you under this License
+for this implementation of the WebRTC code package shall terminate as
+of the date such litigation is filed.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/PJSIP_NOTES asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/PJSIP_NOTES
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/PJSIP_NOTES	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/PJSIP_NOTES	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,80 @@
+The WebRtc source is cloned from the repo:
+https://webrtc.googlesource.com/src
+dated Apr 21 2021
+license: third_party/webrtc_aec3/LICENSE
+
+The abseil's source in src/absl is not part of WebRtc and taken separately from:
+https://github.com/abseil/abseil-cpp
+dated Apr 20 2021
+abseil's license: src/absl/LICENSE
+
+src/third_party's source is obtained from:
+* rnnoise
+https://chromium.googlesource.com/chromium/src/+/HEAD/third_party/rnnoise
+dated Apr 30 2021
+license: src/third_party/rnnoise/COPYING
+
+* pffft
+https://bitbucket.org/jpommier/pffft/src/master/
+dated Apr 30 2021
+license: src/third_party/pffft/README.txt
+
+Local changes:
+1. Undeclared PR_SET_NAME on Android.
+diff --git a/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.cc b/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.cc
+index b0243b41d..fc7a09000 100644
+--- a/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.cc
++++ b/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.cc
+@@ -105,7 +105,7 @@ void SetCurrentThreadName(const char* name) {
+   } __except (EXCEPTION_EXECUTE_HANDLER) {  // NOLINT
+   }
+ #pragma warning(pop)
+-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
++#elif defined(WEBRTC_LINUX) // || defined(WEBRTC_ANDROID)
+   prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name));  // NOLINT
+ #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
+   pthread_setname_np(name);
+
+2. Error: 'unique_ptr' is not a member of 'std' on Linux.
+diff --git a/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.h b/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.h
+index 3b9971aba..e4e954067 100644
+--- a/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.h
++++ b/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.h
+@@ -12,6 +12,7 @@
+ #define MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_ESTIMATOR_H_
+ 
+ #include <array>
++#include <memory>
+ #include <vector>
+
+3. Visual Studio will choose one implementation from the source code with the same file name.
+   Rename these files:
+   - third_party/webrtc_aec3/src/common_audio/signal_processing/{splitting_filter.c => splitting_filter2.c}
+   - third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/{vector_math_avx2.cc => rnn_vector_math_avx2.cc}
+   - third_party/webrtc_aec3/src/system_wrappers/source/{cpu_features.cc => cpu_features2.cc}
+
+4. error C2011: 'sockaddr': 'struct' type redefinition
+diff --git a/third_party/webrtc_aec3/src/rtc_base/logging.cc b/third_party/webrtc_aec3/src/rtc_base/logging.cc
+index a333d8397..e0e669b5e 100644
+--- a/third_party/webrtc_aec3/src/rtc_base/logging.cc
++++ b/third_party/webrtc_aec3/src/rtc_base/logging.cc
+@@ -15,6 +15,7 @@
+ #if RTC_LOG_ENABLED()
+ 
+ #if defined(WEBRTC_WIN)
++#include <winsock2.h>
+
+5. ARM64 support build for Visual Studio.
+diff --git a/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.c b/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.c
+index d76d35167..2d8b1037f 100644
+--- a/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.c
++++ b/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.c
+@@ -148,7 +148,7 @@ typedef __m128 v4sf;
+ /*
+   ARM NEON support macros
+ */
+-#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(__aarch64__) || defined(__arm64__))
++#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64))
+ #  include <arm_neon.h>
+ typedef float32x4_t v4sf;
+ #  define SIMD_SZ 4
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/README.md asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/README.md
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/README.md	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/README.md	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,31 @@
+**WebRTC is a free, open software project** that provides browsers and mobile
+applications with Real-Time Communications (RTC) capabilities via simple APIs.
+The WebRTC components have been optimized to best serve this purpose.
+
+**Our mission:** To enable rich, high-quality RTC applications to be
+developed for the browser, mobile platforms, and IoT devices, and allow them
+all to communicate via a common set of protocols.
+
+The WebRTC initiative is a project supported by Google, Mozilla and Opera,
+amongst others.
+
+### Development
+
+See [here][native-dev] for instructions on how to get started
+developing with the native code.
+
+[Authoritative list](native-api.md) of directories that contain the
+native API header files.
+
+### More info
+
+ * Official web site: http://www.webrtc.org
+ * Master source code repo: https://webrtc.googlesource.com/src
+ * Samples and reference apps: https://github.com/webrtc
+ * Mailing list: http://groups.google.com/group/discuss-webrtc
+ * Continuous build: https://ci.chromium.org/p/webrtc/g/ci/console
+ * [Coding style guide](style-guide.md)
+ * [Code of conduct](CODE_OF_CONDUCT.md)
+ * [Reporting bugs](docs/bug-reporting.md)
+
+[native-dev]: https://webrtc.googlesource.com/src/+/refs/heads/master/docs/native-code/index.md
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/AUTHORS asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/AUTHORS
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/AUTHORS	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/AUTHORS	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,6 @@
+# This is the list of Abseil authors for copyright purposes.
+#
+# This does not necessarily list everyone who has contributed code, since in
+# some cases, their employer may be the copyright holder.  To see the full list
+# of contributors, see the revision history in source control.
+Google Inc.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/attributes.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/attributes.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/attributes.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/attributes.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,731 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// This header file defines macros for declaring attributes for functions,
+// types, and variables.
+//
+// These macros are used within Abseil and allow the compiler to optimize, where
+// applicable, certain function calls.
+//
+// Most macros here are exposing GCC or Clang features, and are stubbed out for
+// other compilers.
+//
+// GCC attributes documentation:
+//   https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Function-Attributes.html
+//   https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Variable-Attributes.html
+//   https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Type-Attributes.html
+//
+// Most attributes in this file are already supported by GCC 4.7. However, some
+// of them are not supported in older version of Clang. Thus, we check
+// `__has_attribute()` first. If the check fails, we check if we are on GCC and
+// assume the attribute exists on GCC (which is verified on GCC 4.7).
+
+#ifndef ABSL_BASE_ATTRIBUTES_H_
+#define ABSL_BASE_ATTRIBUTES_H_
+
+#include "absl/base/config.h"
+
+// ABSL_HAVE_ATTRIBUTE
+//
+// A function-like feature checking macro that is a wrapper around
+// `__has_attribute`, which is defined by GCC 5+ and Clang and evaluates to a
+// nonzero constant integer if the attribute is supported or 0 if not.
+//
+// It evaluates to zero if `__has_attribute` is not defined by the compiler.
+//
+// GCC: https://gcc.gnu.org/gcc-5/changes.html
+// Clang: https://clang.llvm.org/docs/LanguageExtensions.html
+#ifdef __has_attribute
+#define ABSL_HAVE_ATTRIBUTE(x) __has_attribute(x)
+#else
+#define ABSL_HAVE_ATTRIBUTE(x) 0
+#endif
+
+// ABSL_HAVE_CPP_ATTRIBUTE
+//
+// A function-like feature checking macro that accepts C++11 style attributes.
+// It's a wrapper around `__has_cpp_attribute`, defined by ISO C++ SD-6
+// (https://en.cppreference.com/w/cpp/experimental/feature_test). If we don't
+// find `__has_cpp_attribute`, will evaluate to 0.
+#if defined(__cplusplus) && defined(__has_cpp_attribute)
+// NOTE: requiring __cplusplus above should not be necessary, but
+// works around https://bugs.llvm.org/show_bug.cgi?id=23435.
+#define ABSL_HAVE_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
+#else
+#define ABSL_HAVE_CPP_ATTRIBUTE(x) 0
+#endif
+
+// -----------------------------------------------------------------------------
+// Function Attributes
+// -----------------------------------------------------------------------------
+//
+// GCC: https://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
+// Clang: https://clang.llvm.org/docs/AttributeReference.html
+
+// ABSL_PRINTF_ATTRIBUTE
+// ABSL_SCANF_ATTRIBUTE
+//
+// Tells the compiler to perform `printf` format string checking if the
+// compiler supports it; see the 'format' attribute in
+// <https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Function-Attributes.html>.
+//
+// Note: As the GCC manual states, "[s]ince non-static C++ methods
+// have an implicit 'this' argument, the arguments of such methods
+// should be counted from two, not one."
+#if ABSL_HAVE_ATTRIBUTE(format) || (defined(__GNUC__) && !defined(__clang__))
+#define ABSL_PRINTF_ATTRIBUTE(string_index, first_to_check) \
+  __attribute__((__format__(__printf__, string_index, first_to_check)))
+#define ABSL_SCANF_ATTRIBUTE(string_index, first_to_check) \
+  __attribute__((__format__(__scanf__, string_index, first_to_check)))
+#else
+#define ABSL_PRINTF_ATTRIBUTE(string_index, first_to_check)
+#define ABSL_SCANF_ATTRIBUTE(string_index, first_to_check)
+#endif
+
+// ABSL_ATTRIBUTE_ALWAYS_INLINE
+// ABSL_ATTRIBUTE_NOINLINE
+//
+// Forces functions to either inline or not inline. Introduced in gcc 3.1.
+#if ABSL_HAVE_ATTRIBUTE(always_inline) || \
+    (defined(__GNUC__) && !defined(__clang__))
+#define ABSL_ATTRIBUTE_ALWAYS_INLINE __attribute__((always_inline))
+#define ABSL_HAVE_ATTRIBUTE_ALWAYS_INLINE 1
+#else
+#define ABSL_ATTRIBUTE_ALWAYS_INLINE
+#endif
+
+#if ABSL_HAVE_ATTRIBUTE(noinline) || (defined(__GNUC__) && !defined(__clang__))
+#define ABSL_ATTRIBUTE_NOINLINE __attribute__((noinline))
+#define ABSL_HAVE_ATTRIBUTE_NOINLINE 1
+#else
+#define ABSL_ATTRIBUTE_NOINLINE
+#endif
+
+// ABSL_ATTRIBUTE_NO_TAIL_CALL
+//
+// Prevents the compiler from optimizing away stack frames for functions which
+// end in a call to another function.
+#if ABSL_HAVE_ATTRIBUTE(disable_tail_calls)
+#define ABSL_HAVE_ATTRIBUTE_NO_TAIL_CALL 1
+#define ABSL_ATTRIBUTE_NO_TAIL_CALL __attribute__((disable_tail_calls))
+#elif defined(__GNUC__) && !defined(__clang__) && !defined(__e2k__)
+#define ABSL_HAVE_ATTRIBUTE_NO_TAIL_CALL 1
+#define ABSL_ATTRIBUTE_NO_TAIL_CALL \
+  __attribute__((optimize("no-optimize-sibling-calls")))
+#else
+#define ABSL_ATTRIBUTE_NO_TAIL_CALL
+#define ABSL_HAVE_ATTRIBUTE_NO_TAIL_CALL 0
+#endif
+
+// ABSL_ATTRIBUTE_WEAK
+//
+// Tags a function as weak for the purposes of compilation and linking.
+// Weak attributes did not work properly in LLVM's Windows backend before
+// 9.0.0, so disable them there. See https://bugs.llvm.org/show_bug.cgi?id=37598
+// for further information.
+// The MinGW compiler doesn't complain about the weak attribute until the link
+// step, presumably because Windows doesn't use ELF binaries.
+#if (ABSL_HAVE_ATTRIBUTE(weak) ||                   \
+     (defined(__GNUC__) && !defined(__clang__))) && \
+    (!defined(_WIN32) || __clang_major__ < 9) && !defined(__MINGW32__)
+#undef ABSL_ATTRIBUTE_WEAK
+#define ABSL_ATTRIBUTE_WEAK __attribute__((weak))
+#define ABSL_HAVE_ATTRIBUTE_WEAK 1
+#else
+#define ABSL_ATTRIBUTE_WEAK
+#define ABSL_HAVE_ATTRIBUTE_WEAK 0
+#endif
+
+// ABSL_ATTRIBUTE_NONNULL
+//
+// Tells the compiler either (a) that a particular function parameter
+// should be a non-null pointer, or (b) that all pointer arguments should
+// be non-null.
+//
+// Note: As the GCC manual states, "[s]ince non-static C++ methods
+// have an implicit 'this' argument, the arguments of such methods
+// should be counted from two, not one."
+//
+// Args are indexed starting at 1.
+//
+// For non-static class member functions, the implicit `this` argument
+// is arg 1, and the first explicit argument is arg 2. For static class member
+// functions, there is no implicit `this`, and the first explicit argument is
+// arg 1.
+//
+// Example:
+//
+//   /* arg_a cannot be null, but arg_b can */
+//   void Function(void* arg_a, void* arg_b) ABSL_ATTRIBUTE_NONNULL(1);
+//
+//   class C {
+//     /* arg_a cannot be null, but arg_b can */
+//     void Method(void* arg_a, void* arg_b) ABSL_ATTRIBUTE_NONNULL(2);
+//
+//     /* arg_a cannot be null, but arg_b can */
+//     static void StaticMethod(void* arg_a, void* arg_b)
+//     ABSL_ATTRIBUTE_NONNULL(1);
+//   };
+//
+// If no arguments are provided, then all pointer arguments should be non-null.
+//
+//  /* No pointer arguments may be null. */
+//  void Function(void* arg_a, void* arg_b, int arg_c) ABSL_ATTRIBUTE_NONNULL();
+//
+// NOTE: The GCC nonnull attribute actually accepts a list of arguments, but
+// ABSL_ATTRIBUTE_NONNULL does not.
+#if ABSL_HAVE_ATTRIBUTE(nonnull) || (defined(__GNUC__) && !defined(__clang__))
+#define ABSL_ATTRIBUTE_NONNULL(arg_index) __attribute__((nonnull(arg_index)))
+#else
+#define ABSL_ATTRIBUTE_NONNULL(...)
+#endif
+
+// ABSL_ATTRIBUTE_NORETURN
+//
+// Tells the compiler that a given function never returns.
+#if ABSL_HAVE_ATTRIBUTE(noreturn) || (defined(__GNUC__) && !defined(__clang__))
+#define ABSL_ATTRIBUTE_NORETURN __attribute__((noreturn))
+#elif defined(_MSC_VER)
+#define ABSL_ATTRIBUTE_NORETURN __declspec(noreturn)
+#else
+#define ABSL_ATTRIBUTE_NORETURN
+#endif
+
+// ABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS
+//
+// Tells the AddressSanitizer (or other memory testing tools) to ignore a given
+// function. Useful for cases when a function reads random locations on stack,
+// calls _exit from a cloned subprocess, deliberately accesses buffer
+// out of bounds or does other scary things with memory.
+// NOTE: GCC supports AddressSanitizer(asan) since 4.8.
+// https://gcc.gnu.org/gcc-4.8/changes.html
+#if ABSL_HAVE_ATTRIBUTE(no_sanitize_address)
+#define ABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS __attribute__((no_sanitize_address))
+#else
+#define ABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS
+#endif
+
+// ABSL_ATTRIBUTE_NO_SANITIZE_MEMORY
+//
+// Tells the MemorySanitizer to relax the handling of a given function. All "Use
+// of uninitialized value" warnings from such functions will be suppressed, and
+// all values loaded from memory will be considered fully initialized.  This
+// attribute is similar to the ABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS attribute
+// above, but deals with initialized-ness rather than addressability issues.
+// NOTE: MemorySanitizer(msan) is supported by Clang but not GCC.
+#if ABSL_HAVE_ATTRIBUTE(no_sanitize_memory)
+#define ABSL_ATTRIBUTE_NO_SANITIZE_MEMORY __attribute__((no_sanitize_memory))
+#else
+#define ABSL_ATTRIBUTE_NO_SANITIZE_MEMORY
+#endif
+
+// ABSL_ATTRIBUTE_NO_SANITIZE_THREAD
+//
+// Tells the ThreadSanitizer to not instrument a given function.
+// NOTE: GCC supports ThreadSanitizer(tsan) since 4.8.
+// https://gcc.gnu.org/gcc-4.8/changes.html
+#if ABSL_HAVE_ATTRIBUTE(no_sanitize_thread)
+#define ABSL_ATTRIBUTE_NO_SANITIZE_THREAD __attribute__((no_sanitize_thread))
+#else
+#define ABSL_ATTRIBUTE_NO_SANITIZE_THREAD
+#endif
+
+// ABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED
+//
+// Tells the UndefinedSanitizer to ignore a given function. Useful for cases
+// where certain behavior (eg. division by zero) is being used intentionally.
+// NOTE: GCC supports UndefinedBehaviorSanitizer(ubsan) since 4.9.
+// https://gcc.gnu.org/gcc-4.9/changes.html
+#if ABSL_HAVE_ATTRIBUTE(no_sanitize_undefined)
+#define ABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED \
+  __attribute__((no_sanitize_undefined))
+#elif ABSL_HAVE_ATTRIBUTE(no_sanitize)
+#define ABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED \
+  __attribute__((no_sanitize("undefined")))
+#else
+#define ABSL_ATTRIBUTE_NO_SANITIZE_UNDEFINED
+#endif
+
+// ABSL_ATTRIBUTE_NO_SANITIZE_CFI
+//
+// Tells the ControlFlowIntegrity sanitizer to not instrument a given function.
+// See https://clang.llvm.org/docs/ControlFlowIntegrity.html for details.
+#if ABSL_HAVE_ATTRIBUTE(no_sanitize)
+#define ABSL_ATTRIBUTE_NO_SANITIZE_CFI __attribute__((no_sanitize("cfi")))
+#else
+#define ABSL_ATTRIBUTE_NO_SANITIZE_CFI
+#endif
+
+// ABSL_ATTRIBUTE_NO_SANITIZE_SAFESTACK
+//
+// Tells the SafeStack to not instrument a given function.
+// See https://clang.llvm.org/docs/SafeStack.html for details.
+#if ABSL_HAVE_ATTRIBUTE(no_sanitize)
+#define ABSL_ATTRIBUTE_NO_SANITIZE_SAFESTACK \
+  __attribute__((no_sanitize("safe-stack")))
+#else
+#define ABSL_ATTRIBUTE_NO_SANITIZE_SAFESTACK
+#endif
+
+// ABSL_ATTRIBUTE_RETURNS_NONNULL
+//
+// Tells the compiler that a particular function never returns a null pointer.
+#if ABSL_HAVE_ATTRIBUTE(returns_nonnull) || \
+    (defined(__GNUC__) && \
+     (__GNUC__ > 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)) && \
+     !defined(__clang__))
+#define ABSL_ATTRIBUTE_RETURNS_NONNULL __attribute__((returns_nonnull))
+#else
+#define ABSL_ATTRIBUTE_RETURNS_NONNULL
+#endif
+
+// ABSL_HAVE_ATTRIBUTE_SECTION
+//
+// Indicates whether labeled sections are supported. Weak symbol support is
+// a prerequisite. Labeled sections are not supported on Darwin/iOS.
+#ifdef ABSL_HAVE_ATTRIBUTE_SECTION
+#error ABSL_HAVE_ATTRIBUTE_SECTION cannot be directly set
+#elif (ABSL_HAVE_ATTRIBUTE(section) ||                \
+       (defined(__GNUC__) && !defined(__clang__))) && \
+    !defined(__APPLE__) && ABSL_HAVE_ATTRIBUTE_WEAK
+#define ABSL_HAVE_ATTRIBUTE_SECTION 1
+
+// ABSL_ATTRIBUTE_SECTION
+//
+// Tells the compiler/linker to put a given function into a section and define
+// `__start_ ## name` and `__stop_ ## name` symbols to bracket the section.
+// This functionality is supported by GNU linker.  Any function annotated with
+// `ABSL_ATTRIBUTE_SECTION` must not be inlined, or it will be placed into
+// whatever section its caller is placed into.
+//
+#ifndef ABSL_ATTRIBUTE_SECTION
+#define ABSL_ATTRIBUTE_SECTION(name) \
+  __attribute__((section(#name))) __attribute__((noinline))
+#endif
+
+
+// ABSL_ATTRIBUTE_SECTION_VARIABLE
+//
+// Tells the compiler/linker to put a given variable into a section and define
+// `__start_ ## name` and `__stop_ ## name` symbols to bracket the section.
+// This functionality is supported by GNU linker.
+#ifndef ABSL_ATTRIBUTE_SECTION_VARIABLE
+#define ABSL_ATTRIBUTE_SECTION_VARIABLE(name) __attribute__((section(#name)))
+#endif
+
+// ABSL_DECLARE_ATTRIBUTE_SECTION_VARS
+//
+// A weak section declaration to be used as a global declaration
+// for ABSL_ATTRIBUTE_SECTION_START|STOP(name) to compile and link
+// even without functions with ABSL_ATTRIBUTE_SECTION(name).
+// ABSL_DEFINE_ATTRIBUTE_SECTION should be in the exactly one file; it's
+// a no-op on ELF but not on Mach-O.
+//
+#ifndef ABSL_DECLARE_ATTRIBUTE_SECTION_VARS
+#define ABSL_DECLARE_ATTRIBUTE_SECTION_VARS(name) \
+  extern char __start_##name[] ABSL_ATTRIBUTE_WEAK;    \
+  extern char __stop_##name[] ABSL_ATTRIBUTE_WEAK
+#endif
+#ifndef ABSL_DEFINE_ATTRIBUTE_SECTION_VARS
+#define ABSL_INIT_ATTRIBUTE_SECTION_VARS(name)
+#define ABSL_DEFINE_ATTRIBUTE_SECTION_VARS(name)
+#endif
+
+// ABSL_ATTRIBUTE_SECTION_START
+//
+// Returns `void*` pointers to start/end of a section of code with
+// functions having ABSL_ATTRIBUTE_SECTION(name).
+// Returns 0 if no such functions exist.
+// One must ABSL_DECLARE_ATTRIBUTE_SECTION_VARS(name) for this to compile and
+// link.
+//
+#define ABSL_ATTRIBUTE_SECTION_START(name) \
+  (reinterpret_cast<void *>(__start_##name))
+#define ABSL_ATTRIBUTE_SECTION_STOP(name) \
+  (reinterpret_cast<void *>(__stop_##name))
+
+#else  // !ABSL_HAVE_ATTRIBUTE_SECTION
+
+#define ABSL_HAVE_ATTRIBUTE_SECTION 0
+
+// provide dummy definitions
+#define ABSL_ATTRIBUTE_SECTION(name)
+#define ABSL_ATTRIBUTE_SECTION_VARIABLE(name)
+#define ABSL_INIT_ATTRIBUTE_SECTION_VARS(name)
+#define ABSL_DEFINE_ATTRIBUTE_SECTION_VARS(name)
+#define ABSL_DECLARE_ATTRIBUTE_SECTION_VARS(name)
+#define ABSL_ATTRIBUTE_SECTION_START(name) (reinterpret_cast<void *>(0))
+#define ABSL_ATTRIBUTE_SECTION_STOP(name) (reinterpret_cast<void *>(0))
+
+#endif  // ABSL_ATTRIBUTE_SECTION
+
+// ABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
+//
+// Support for aligning the stack on 32-bit x86.
+#if ABSL_HAVE_ATTRIBUTE(force_align_arg_pointer) || \
+    (defined(__GNUC__) && !defined(__clang__))
+#if defined(__i386__)
+#define ABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC \
+  __attribute__((force_align_arg_pointer))
+#define ABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (0)
+#elif defined(__x86_64__)
+#define ABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (1)
+#define ABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
+#else  // !__i386__ && !__x86_64
+#define ABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (0)
+#define ABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
+#endif  // __i386__
+#else
+#define ABSL_ATTRIBUTE_STACK_ALIGN_FOR_OLD_LIBC
+#define ABSL_REQUIRE_STACK_ALIGN_TRAMPOLINE (0)
+#endif
+
+// ABSL_MUST_USE_RESULT
+//
+// Tells the compiler to warn about unused results.
+//
+// When annotating a function, it must appear as the first part of the
+// declaration or definition. The compiler will warn if the return value from
+// such a function is unused:
+//
+//   ABSL_MUST_USE_RESULT Sprocket* AllocateSprocket();
+//   AllocateSprocket();  // Triggers a warning.
+//
+// When annotating a class, it is equivalent to annotating every function which
+// returns an instance.
+//
+//   class ABSL_MUST_USE_RESULT Sprocket {};
+//   Sprocket();  // Triggers a warning.
+//
+//   Sprocket MakeSprocket();
+//   MakeSprocket();  // Triggers a warning.
+//
+// Note that references and pointers are not instances:
+//
+//   Sprocket* SprocketPointer();
+//   SprocketPointer();  // Does *not* trigger a warning.
+//
+// ABSL_MUST_USE_RESULT allows using cast-to-void to suppress the unused result
+// warning. For that, warn_unused_result is used only for clang but not for gcc.
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425
+//
+// Note: past advice was to place the macro after the argument list.
+#if ABSL_HAVE_ATTRIBUTE(nodiscard)
+#define ABSL_MUST_USE_RESULT [[nodiscard]]
+#elif defined(__clang__) && ABSL_HAVE_ATTRIBUTE(warn_unused_result)
+#define ABSL_MUST_USE_RESULT __attribute__((warn_unused_result))
+#else
+#define ABSL_MUST_USE_RESULT
+#endif
+
+// ABSL_ATTRIBUTE_HOT, ABSL_ATTRIBUTE_COLD
+//
+// Tells GCC that a function is hot or cold. GCC can use this information to
+// improve static analysis, i.e. a conditional branch to a cold function
+// is likely to be not-taken.
+// This annotation is used for function declarations.
+//
+// Example:
+//
+//   int foo() ABSL_ATTRIBUTE_HOT;
+#if ABSL_HAVE_ATTRIBUTE(hot) || (defined(__GNUC__) && !defined(__clang__))
+#define ABSL_ATTRIBUTE_HOT __attribute__((hot))
+#else
+#define ABSL_ATTRIBUTE_HOT
+#endif
+
+#if ABSL_HAVE_ATTRIBUTE(cold) || (defined(__GNUC__) && !defined(__clang__))
+#define ABSL_ATTRIBUTE_COLD __attribute__((cold))
+#else
+#define ABSL_ATTRIBUTE_COLD
+#endif
+
+// ABSL_XRAY_ALWAYS_INSTRUMENT, ABSL_XRAY_NEVER_INSTRUMENT, ABSL_XRAY_LOG_ARGS
+//
+// We define the ABSL_XRAY_ALWAYS_INSTRUMENT and ABSL_XRAY_NEVER_INSTRUMENT
+// macro used as an attribute to mark functions that must always or never be
+// instrumented by XRay. Currently, this is only supported in Clang/LLVM.
+//
+// For reference on the LLVM XRay instrumentation, see
+// http://llvm.org/docs/XRay.html.
+//
+// A function with the XRAY_ALWAYS_INSTRUMENT macro attribute in its declaration
+// will always get the XRay instrumentation sleds. These sleds may introduce
+// some binary size and runtime overhead and must be used sparingly.
+//
+// These attributes only take effect when the following conditions are met:
+//
+//   * The file/target is built in at least C++11 mode, with a Clang compiler
+//     that supports XRay attributes.
+//   * The file/target is built with the -fxray-instrument flag set for the
+//     Clang/LLVM compiler.
+//   * The function is defined in the translation unit (the compiler honors the
+//     attribute in either the definition or the declaration, and must match).
+//
+// There are cases when, even when building with XRay instrumentation, users
+// might want to control specifically which functions are instrumented for a
+// particular build using special-case lists provided to the compiler. These
+// special case lists are provided to Clang via the
+// -fxray-always-instrument=... and -fxray-never-instrument=... flags. The
+// attributes in source take precedence over these special-case lists.
+//
+// To disable the XRay attributes at build-time, users may define
+// ABSL_NO_XRAY_ATTRIBUTES. Do NOT define ABSL_NO_XRAY_ATTRIBUTES on specific
+// packages/targets, as this may lead to conflicting definitions of functions at
+// link-time.
+//
+// XRay isn't currently supported on Android:
+// https://github.com/android/ndk/issues/368
+#if ABSL_HAVE_CPP_ATTRIBUTE(clang::xray_always_instrument) && \
+    !defined(ABSL_NO_XRAY_ATTRIBUTES) && !defined(__ANDROID__)
+#define ABSL_XRAY_ALWAYS_INSTRUMENT [[clang::xray_always_instrument]]
+#define ABSL_XRAY_NEVER_INSTRUMENT [[clang::xray_never_instrument]]
+#if ABSL_HAVE_CPP_ATTRIBUTE(clang::xray_log_args)
+#define ABSL_XRAY_LOG_ARGS(N) \
+    [[clang::xray_always_instrument, clang::xray_log_args(N)]]
+#else
+#define ABSL_XRAY_LOG_ARGS(N) [[clang::xray_always_instrument]]
+#endif
+#else
+#define ABSL_XRAY_ALWAYS_INSTRUMENT
+#define ABSL_XRAY_NEVER_INSTRUMENT
+#define ABSL_XRAY_LOG_ARGS(N)
+#endif
+
+// ABSL_ATTRIBUTE_REINITIALIZES
+//
+// Indicates that a member function reinitializes the entire object to a known
+// state, independent of the previous state of the object.
+//
+// The clang-tidy check bugprone-use-after-move allows member functions marked
+// with this attribute to be called on objects that have been moved from;
+// without the attribute, this would result in a use-after-move warning.
+#if ABSL_HAVE_CPP_ATTRIBUTE(clang::reinitializes)
+#define ABSL_ATTRIBUTE_REINITIALIZES [[clang::reinitializes]]
+#else
+#define ABSL_ATTRIBUTE_REINITIALIZES
+#endif
+
+// -----------------------------------------------------------------------------
+// Variable Attributes
+// -----------------------------------------------------------------------------
+
+// ABSL_ATTRIBUTE_UNUSED
+//
+// Prevents the compiler from complaining about variables that appear unused.
+//
+// For code or headers that are assured to only build with C++17 and up, prefer
+// just using the standard '[[maybe_unused]]' directly over this macro.
+//
+// Due to differences in positioning requirements between the old, compiler
+// specific __attribute__ syntax and the now standard [[maybe_unused]], this
+// macro does not attempt to take advantage of '[[maybe_unused]]'.
+#if ABSL_HAVE_ATTRIBUTE(unused) || (defined(__GNUC__) && !defined(__clang__))
+#undef ABSL_ATTRIBUTE_UNUSED
+#define ABSL_ATTRIBUTE_UNUSED __attribute__((__unused__))
+#else
+#define ABSL_ATTRIBUTE_UNUSED
+#endif
+
+// ABSL_ATTRIBUTE_INITIAL_EXEC
+//
+// Tells the compiler to use "initial-exec" mode for a thread-local variable.
+// See http://people.redhat.com/drepper/tls.pdf for the gory details.
+#if ABSL_HAVE_ATTRIBUTE(tls_model) || (defined(__GNUC__) && !defined(__clang__))
+#define ABSL_ATTRIBUTE_INITIAL_EXEC __attribute__((tls_model("initial-exec")))
+#else
+#define ABSL_ATTRIBUTE_INITIAL_EXEC
+#endif
+
+// ABSL_ATTRIBUTE_PACKED
+//
+// Instructs the compiler not to use natural alignment for a tagged data
+// structure, but instead to reduce its alignment to 1. This attribute can
+// either be applied to members of a structure or to a structure in its
+// entirety. Applying this attribute (judiciously) to a structure in its
+// entirety to optimize the memory footprint of very commonly-used structs is
+// fine. Do not apply this attribute to a structure in its entirety if the
+// purpose is to control the offsets of the members in the structure. Instead,
+// apply this attribute only to structure members that need it.
+//
+// When applying ABSL_ATTRIBUTE_PACKED only to specific structure members the
+// natural alignment of structure members not annotated is preserved. Aligned
+// member accesses are faster than non-aligned member accesses even if the
+// targeted microprocessor supports non-aligned accesses.
+#if ABSL_HAVE_ATTRIBUTE(packed) || (defined(__GNUC__) && !defined(__clang__))
+#define ABSL_ATTRIBUTE_PACKED __attribute__((__packed__))
+#else
+#define ABSL_ATTRIBUTE_PACKED
+#endif
+
+// ABSL_ATTRIBUTE_FUNC_ALIGN
+//
+// Tells the compiler to align the function start at least to certain
+// alignment boundary
+#if ABSL_HAVE_ATTRIBUTE(aligned) || (defined(__GNUC__) && !defined(__clang__))
+#define ABSL_ATTRIBUTE_FUNC_ALIGN(bytes) __attribute__((aligned(bytes)))
+#else
+#define ABSL_ATTRIBUTE_FUNC_ALIGN(bytes)
+#endif
+
+// ABSL_FALLTHROUGH_INTENDED
+//
+// Annotates implicit fall-through between switch labels, allowing a case to
+// indicate intentional fallthrough and turn off warnings about any lack of a
+// `break` statement. The ABSL_FALLTHROUGH_INTENDED macro should be followed by
+// a semicolon and can be used in most places where `break` can, provided that
+// no statements exist between it and the next switch label.
+//
+// Example:
+//
+//  switch (x) {
+//    case 40:
+//    case 41:
+//      if (truth_is_out_there) {
+//        ++x;
+//        ABSL_FALLTHROUGH_INTENDED;  // Use instead of/along with annotations
+//                                    // in comments
+//      } else {
+//        return x;
+//      }
+//    case 42:
+//      ...
+//
+// Notes: when compiled with clang in C++11 mode, the ABSL_FALLTHROUGH_INTENDED
+// macro is expanded to the [[clang::fallthrough]] attribute, which is analysed
+// when  performing switch labels fall-through diagnostic
+// (`-Wimplicit-fallthrough`). See clang documentation on language extensions
+// for details:
+// https://clang.llvm.org/docs/AttributeReference.html#fallthrough-clang-fallthrough
+//
+// When used with unsupported compilers, the ABSL_FALLTHROUGH_INTENDED macro
+// has no effect on diagnostics. In any case this macro has no effect on runtime
+// behavior and performance of code.
+
+#ifdef ABSL_FALLTHROUGH_INTENDED
+#error "ABSL_FALLTHROUGH_INTENDED should not be defined."
+#endif
+
+// TODO(zhangxy): Use c++17 standard [[fallthrough]] macro, when supported.
+#if defined(__clang__) && defined(__has_warning)
+#if __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough")
+#define ABSL_FALLTHROUGH_INTENDED [[clang::fallthrough]]
+#endif
+#elif defined(__GNUC__) && __GNUC__ >= 7
+#define ABSL_FALLTHROUGH_INTENDED [[gnu::fallthrough]]
+#endif
+
+#ifndef ABSL_FALLTHROUGH_INTENDED
+#define ABSL_FALLTHROUGH_INTENDED \
+  do {                            \
+  } while (0)
+#endif
+
+// ABSL_DEPRECATED()
+//
+// Marks a deprecated class, struct, enum, function, method and variable
+// declarations. The macro argument is used as a custom diagnostic message (e.g.
+// suggestion of a better alternative).
+//
+// Examples:
+//
+//   class ABSL_DEPRECATED("Use Bar instead") Foo {...};
+//
+//   ABSL_DEPRECATED("Use Baz() instead") void Bar() {...}
+//
+//   template <typename T>
+//   ABSL_DEPRECATED("Use DoThat() instead")
+//   void DoThis();
+//
+// Every usage of a deprecated entity will trigger a warning when compiled with
+// clang's `-Wdeprecated-declarations` option. This option is turned off by
+// default, but the warnings will be reported by clang-tidy.
+#if defined(__clang__) && defined(__cplusplus) && __cplusplus >= 201103L
+#define ABSL_DEPRECATED(message) __attribute__((deprecated(message)))
+#endif
+
+#ifndef ABSL_DEPRECATED
+#define ABSL_DEPRECATED(message)
+#endif
+
+// ABSL_CONST_INIT
+//
+// A variable declaration annotated with the `ABSL_CONST_INIT` attribute will
+// not compile (on supported platforms) unless the variable has a constant
+// initializer. This is useful for variables with static and thread storage
+// duration, because it guarantees that they will not suffer from the so-called
+// "static init order fiasco".  Prefer to put this attribute on the most visible
+// declaration of the variable, if there's more than one, because code that
+// accesses the variable can then use the attribute for optimization.
+//
+// Example:
+//
+//   class MyClass {
+//    public:
+//     ABSL_CONST_INIT static MyType my_var;
+//   };
+//
+//   MyType MyClass::my_var = MakeMyType(...);
+//
+// Note that this attribute is redundant if the variable is declared constexpr.
+#if ABSL_HAVE_CPP_ATTRIBUTE(clang::require_constant_initialization)
+#define ABSL_CONST_INIT [[clang::require_constant_initialization]]
+#else
+#define ABSL_CONST_INIT
+#endif  // ABSL_HAVE_CPP_ATTRIBUTE(clang::require_constant_initialization)
+
+// ABSL_ATTRIBUTE_PURE_FUNCTION
+//
+// ABSL_ATTRIBUTE_PURE_FUNCTION is used to annotate declarations of "pure"
+// functions. A function is pure if its return value is only a function of its
+// arguments. The pure attribute prohibits a function from modifying the state
+// of the program that is observable by means other than inspecting the
+// function's return value. Declaring such functions with the pure attribute
+// allows the compiler to avoid emitting some calls in repeated invocations of
+// the function with the same argument values.
+//
+// Example:
+//
+//  ABSL_ATTRIBUTE_PURE_FUNCTION int64_t ToInt64Milliseconds(Duration d);
+#if ABSL_HAVE_CPP_ATTRIBUTE(gnu::pure)
+#define ABSL_ATTRIBUTE_PURE_FUNCTION [[gnu::pure]]
+#elif ABSL_HAVE_ATTRIBUTE(pure)
+#define ABSL_ATTRIBUTE_PURE_FUNCTION __attribute__((pure))
+#else
+#define ABSL_ATTRIBUTE_PURE_FUNCTION
+#endif
+
+// ABSL_ATTRIBUTE_LIFETIME_BOUND indicates that a resource owned by a function
+// parameter or implicit object parameter is retained by the return value of the
+// annotated function (or, for a parameter of a constructor, in the value of the
+// constructed object). This attribute causes warnings to be produced if a
+// temporary object does not live long enough.
+//
+// When applied to a reference parameter, the referenced object is assumed to be
+// retained by the return value of the function. When applied to a non-reference
+// parameter (for example, a pointer or a class type), all temporaries
+// referenced by the parameter are assumed to be retained by the return value of
+// the function.
+//
+// See also the upstream documentation:
+// https://clang.llvm.org/docs/AttributeReference.html#lifetimebound
+#if ABSL_HAVE_CPP_ATTRIBUTE(clang::lifetimebound)
+#define ABSL_ATTRIBUTE_LIFETIME_BOUND [[clang::lifetimebound]]
+#elif ABSL_HAVE_ATTRIBUTE(lifetimebound)
+#define ABSL_ATTRIBUTE_LIFETIME_BOUND __attribute__((lifetimebound))
+#else
+#define ABSL_ATTRIBUTE_LIFETIME_BOUND
+#endif
+
+#endif  // ABSL_BASE_ATTRIBUTES_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/config.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/config.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/config.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/config.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,730 @@
+//
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// -----------------------------------------------------------------------------
+// File: config.h
+// -----------------------------------------------------------------------------
+//
+// This header file defines a set of macros for checking the presence of
+// important compiler and platform features. Such macros can be used to
+// produce portable code by parameterizing compilation based on the presence or
+// lack of a given feature.
+//
+// We define a "feature" as some interface we wish to program to: for example,
+// a library function or system call. A value of `1` indicates support for
+// that feature; any other value indicates the feature support is undefined.
+//
+// Example:
+//
+// Suppose a programmer wants to write a program that uses the 'mmap()' system
+// call. The Abseil macro for that feature (`ABSL_HAVE_MMAP`) allows you to
+// selectively include the `mmap.h` header and bracket code using that feature
+// in the macro:
+//
+//   #include "absl/base/config.h"
+//
+//   #ifdef ABSL_HAVE_MMAP
+//   #include "sys/mman.h"
+//   #endif  //ABSL_HAVE_MMAP
+//
+//   ...
+//   #ifdef ABSL_HAVE_MMAP
+//   void *ptr = mmap(...);
+//   ...
+//   #endif  // ABSL_HAVE_MMAP
+
+#ifndef ABSL_BASE_CONFIG_H_
+#define ABSL_BASE_CONFIG_H_
+
+// Included for the __GLIBC__ macro (or similar macros on other systems).
+#include <limits.h>
+
+#ifdef __cplusplus
+// Included for __GLIBCXX__, _LIBCPP_VERSION
+#include <cstddef>
+#endif  // __cplusplus
+
+#if defined(__APPLE__)
+// Included for TARGET_OS_IPHONE, __IPHONE_OS_VERSION_MIN_REQUIRED,
+// __IPHONE_8_0.
+#include <Availability.h>
+#include <TargetConditionals.h>
+#endif
+
+#include "absl/base/options.h"
+#include "absl/base/policy_checks.h"
+
+// Helper macro to convert a CPP variable to a string literal.
+#define ABSL_INTERNAL_DO_TOKEN_STR(x) #x
+#define ABSL_INTERNAL_TOKEN_STR(x) ABSL_INTERNAL_DO_TOKEN_STR(x)
+
+// -----------------------------------------------------------------------------
+// Abseil namespace annotations
+// -----------------------------------------------------------------------------
+
+// ABSL_NAMESPACE_BEGIN/ABSL_NAMESPACE_END
+//
+// An annotation placed at the beginning/end of each `namespace absl` scope.
+// This is used to inject an inline namespace.
+//
+// The proper way to write Abseil code in the `absl` namespace is:
+//
+// namespace absl {
+// ABSL_NAMESPACE_BEGIN
+//
+// void Foo();  // absl::Foo().
+//
+// ABSL_NAMESPACE_END
+// }  // namespace absl
+//
+// Users of Abseil should not use these macros, because users of Abseil should
+// not write `namespace absl {` in their own code for any reason.  (Abseil does
+// not support forward declarations of its own types, nor does it support
+// user-provided specialization of Abseil templates.  Code that violates these
+// rules may be broken without warning.)
+#if !defined(ABSL_OPTION_USE_INLINE_NAMESPACE) || \
+    !defined(ABSL_OPTION_INLINE_NAMESPACE_NAME)
+#error options.h is misconfigured.
+#endif
+
+// Check that ABSL_OPTION_INLINE_NAMESPACE_NAME is neither "head" nor ""
+#if defined(__cplusplus) && ABSL_OPTION_USE_INLINE_NAMESPACE == 1
+
+#define ABSL_INTERNAL_INLINE_NAMESPACE_STR \
+  ABSL_INTERNAL_TOKEN_STR(ABSL_OPTION_INLINE_NAMESPACE_NAME)
+
+static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != '\0',
+              "options.h misconfigured: ABSL_OPTION_INLINE_NAMESPACE_NAME must "
+              "not be empty.");
+static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
+                  ABSL_INTERNAL_INLINE_NAMESPACE_STR[1] != 'e' ||
+                  ABSL_INTERNAL_INLINE_NAMESPACE_STR[2] != 'a' ||
+                  ABSL_INTERNAL_INLINE_NAMESPACE_STR[3] != 'd' ||
+                  ABSL_INTERNAL_INLINE_NAMESPACE_STR[4] != '\0',
+              "options.h misconfigured: ABSL_OPTION_INLINE_NAMESPACE_NAME must "
+              "be changed to a new, unique identifier name.");
+
+#endif
+
+#if ABSL_OPTION_USE_INLINE_NAMESPACE == 0
+#define ABSL_NAMESPACE_BEGIN
+#define ABSL_NAMESPACE_END
+#define ABSL_INTERNAL_C_SYMBOL(x) x
+#elif ABSL_OPTION_USE_INLINE_NAMESPACE == 1
+#define ABSL_NAMESPACE_BEGIN \
+  inline namespace ABSL_OPTION_INLINE_NAMESPACE_NAME {
+#define ABSL_NAMESPACE_END }
+#define ABSL_INTERNAL_C_SYMBOL_HELPER_2(x, v) x##_##v
+#define ABSL_INTERNAL_C_SYMBOL_HELPER_1(x, v) \
+  ABSL_INTERNAL_C_SYMBOL_HELPER_2(x, v)
+#define ABSL_INTERNAL_C_SYMBOL(x) \
+  ABSL_INTERNAL_C_SYMBOL_HELPER_1(x, ABSL_OPTION_INLINE_NAMESPACE_NAME)
+#else
+#error options.h is misconfigured.
+#endif
+
+// -----------------------------------------------------------------------------
+// Compiler Feature Checks
+// -----------------------------------------------------------------------------
+
+// ABSL_HAVE_BUILTIN()
+//
+// Checks whether the compiler supports a Clang Feature Checking Macro, and if
+// so, checks whether it supports the provided builtin function "x" where x
+// is one of the functions noted in
+// https://clang.llvm.org/docs/LanguageExtensions.html
+//
+// Note: Use this macro to avoid an extra level of #ifdef __has_builtin check.
+// http://releases.llvm.org/3.3/tools/clang/docs/LanguageExtensions.html
+#ifdef __has_builtin
+#define ABSL_HAVE_BUILTIN(x) __has_builtin(x)
+#else
+#define ABSL_HAVE_BUILTIN(x) 0
+#endif
+
+#if defined(__is_identifier)
+#define ABSL_INTERNAL_HAS_KEYWORD(x) !(__is_identifier(x))
+#else
+#define ABSL_INTERNAL_HAS_KEYWORD(x) 0
+#endif
+
+#ifdef __has_feature
+#define ABSL_HAVE_FEATURE(f) __has_feature(f)
+#else
+#define ABSL_HAVE_FEATURE(f) 0
+#endif
+
+// ABSL_HAVE_TLS is defined to 1 when __thread should be supported.
+// We assume __thread is supported on Linux when compiled with Clang or compiled
+// against libstdc++ with _GLIBCXX_HAVE_TLS defined.
+#ifdef ABSL_HAVE_TLS
+#error ABSL_HAVE_TLS cannot be directly set
+#elif defined(__linux__) && (defined(__clang__) || defined(_GLIBCXX_HAVE_TLS))
+#define ABSL_HAVE_TLS 1
+#endif
+
+// ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
+//
+// Checks whether `std::is_trivially_destructible<T>` is supported.
+//
+// Notes: All supported compilers using libc++ support this feature, as does
+// gcc >= 4.8.1 using libstdc++, and Visual Studio.
+#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
+#error ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE cannot be directly set
+#elif defined(_LIBCPP_VERSION) ||                                        \
+    (!defined(__clang__) && defined(__GNUC__) && defined(__GLIBCXX__) && \
+     (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) ||        \
+    defined(_MSC_VER)
+#define ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE 1
+#endif
+
+// ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
+//
+// Checks whether `std::is_trivially_default_constructible<T>` and
+// `std::is_trivially_copy_constructible<T>` are supported.
+
+// ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
+//
+// Checks whether `std::is_trivially_copy_assignable<T>` is supported.
+
+// Notes: Clang with libc++ supports these features, as does gcc >= 5.1 with
+// either libc++ or libstdc++, and Visual Studio (but not NVCC).
+#if defined(ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE)
+#error ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE cannot be directly set
+#elif defined(ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE)
+#error ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE cannot directly set
+#elif (defined(__clang__) && defined(_LIBCPP_VERSION)) ||        \
+    (!defined(__clang__) && defined(__GNUC__) &&                 \
+     (__GNUC__ > 7 || (__GNUC__ == 7 && __GNUC_MINOR__ >= 4)) && \
+     (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__))) ||      \
+    (defined(_MSC_VER) && !defined(__NVCC__))
+#define ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE 1
+#define ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE 1
+#endif
+
+// ABSL_HAVE_SOURCE_LOCATION_CURRENT
+//
+// Indicates whether `absl::SourceLocation::current()` will return useful
+// information in some contexts.
+#ifndef ABSL_HAVE_SOURCE_LOCATION_CURRENT
+#if ABSL_INTERNAL_HAS_KEYWORD(__builtin_LINE) && \
+    ABSL_INTERNAL_HAS_KEYWORD(__builtin_FILE)
+#define ABSL_HAVE_SOURCE_LOCATION_CURRENT 1
+#elif defined(__GNUC__) && __GNUC__ >= 5
+#define ABSL_HAVE_SOURCE_LOCATION_CURRENT 1
+#endif
+#endif
+
+// ABSL_HAVE_THREAD_LOCAL
+//
+// Checks whether C++11's `thread_local` storage duration specifier is
+// supported.
+#ifdef ABSL_HAVE_THREAD_LOCAL
+#error ABSL_HAVE_THREAD_LOCAL cannot be directly set
+#elif defined(__APPLE__)
+// Notes:
+// * Xcode's clang did not support `thread_local` until version 8, and
+//   even then not for all iOS < 9.0.
+// * Xcode 9.3 started disallowing `thread_local` for 32-bit iOS simulator
+//   targeting iOS 9.x.
+// * Xcode 10 moves the deployment target check for iOS < 9.0 to link time
+//   making ABSL_HAVE_FEATURE unreliable there.
+//
+#if ABSL_HAVE_FEATURE(cxx_thread_local) && \
+    !(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0)
+#define ABSL_HAVE_THREAD_LOCAL 1
+#endif
+#else  // !defined(__APPLE__)
+#define ABSL_HAVE_THREAD_LOCAL 1
+#endif
+
+// There are platforms for which TLS should not be used even though the compiler
+// makes it seem like it's supported (Android NDK < r12b for example).
+// This is primarily because of linker problems and toolchain misconfiguration:
+// Abseil does not intend to support this indefinitely. Currently, the newest
+// toolchain that we intend to support that requires this behavior is the
+// r11 NDK - allowing for a 5 year support window on that means this option
+// is likely to be removed around June of 2021.
+// TLS isn't supported until NDK r12b per
+// https://developer.android.com/ndk/downloads/revision_history.html
+// Since NDK r16, `__NDK_MAJOR__` and `__NDK_MINOR__` are defined in
+// <android/ndk-version.h>. For NDK < r16, users should define these macros,
+// e.g. `-D__NDK_MAJOR__=11 -D__NKD_MINOR__=0` for NDK r11.
+#if defined(__ANDROID__) && defined(__clang__)
+#if __has_include(<android/ndk-version.h>)
+#include <android/ndk-version.h>
+#endif  // __has_include(<android/ndk-version.h>)
+#if defined(__ANDROID__) && defined(__clang__) && defined(__NDK_MAJOR__) && \
+    defined(__NDK_MINOR__) &&                                               \
+    ((__NDK_MAJOR__ < 12) || ((__NDK_MAJOR__ == 12) && (__NDK_MINOR__ < 1)))
+#undef ABSL_HAVE_TLS
+#undef ABSL_HAVE_THREAD_LOCAL
+#endif
+#endif  // defined(__ANDROID__) && defined(__clang__)
+
+// ABSL_HAVE_INTRINSIC_INT128
+//
+// Checks whether the __int128 compiler extension for a 128-bit integral type is
+// supported.
+//
+// Note: __SIZEOF_INT128__ is defined by Clang and GCC when __int128 is
+// supported, but we avoid using it in certain cases:
+// * On Clang:
+//   * Building using Clang for Windows, where the Clang runtime library has
+//     128-bit support only on LP64 architectures, but Windows is LLP64.
+// * On Nvidia's nvcc:
+//   * nvcc also defines __GNUC__ and __SIZEOF_INT128__, but not all versions
+//     actually support __int128.
+#ifdef ABSL_HAVE_INTRINSIC_INT128
+#error ABSL_HAVE_INTRINSIC_INT128 cannot be directly set
+#elif defined(__SIZEOF_INT128__)
+#if (defined(__clang__) && !defined(_WIN32)) || \
+    (defined(__CUDACC__) && __CUDACC_VER_MAJOR__ >= 9) ||                \
+    (defined(__GNUC__) && !defined(__clang__) && !defined(__CUDACC__))
+#define ABSL_HAVE_INTRINSIC_INT128 1
+#elif defined(__CUDACC__)
+// __CUDACC_VER__ is a full version number before CUDA 9, and is defined to a
+// string explaining that it has been removed starting with CUDA 9. We use
+// nested #ifs because there is no short-circuiting in the preprocessor.
+// NOTE: `__CUDACC__` could be undefined while `__CUDACC_VER__` is defined.
+#if __CUDACC_VER__ >= 70000
+#define ABSL_HAVE_INTRINSIC_INT128 1
+#endif  // __CUDACC_VER__ >= 70000
+#endif  // defined(__CUDACC__)
+#endif  // ABSL_HAVE_INTRINSIC_INT128
+
+// ABSL_HAVE_EXCEPTIONS
+//
+// Checks whether the compiler both supports and enables exceptions. Many
+// compilers support a "no exceptions" mode that disables exceptions.
+//
+// Generally, when ABSL_HAVE_EXCEPTIONS is not defined:
+//
+// * Code using `throw` and `try` may not compile.
+// * The `noexcept` specifier will still compile and behave as normal.
+// * The `noexcept` operator may still return `false`.
+//
+// For further details, consult the compiler's documentation.
+#ifdef ABSL_HAVE_EXCEPTIONS
+#error ABSL_HAVE_EXCEPTIONS cannot be directly set.
+
+#elif defined(__clang__)
+
+#if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
+// Clang >= 3.6
+#if ABSL_HAVE_FEATURE(cxx_exceptions)
+#define ABSL_HAVE_EXCEPTIONS 1
+#endif  // ABSL_HAVE_FEATURE(cxx_exceptions)
+#else
+// Clang < 3.6
+// http://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html#the-exceptions-macro
+#if defined(__EXCEPTIONS) && ABSL_HAVE_FEATURE(cxx_exceptions)
+#define ABSL_HAVE_EXCEPTIONS 1
+#endif  // defined(__EXCEPTIONS) && ABSL_HAVE_FEATURE(cxx_exceptions)
+#endif  // __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 6)
+
+// Handle remaining special cases and default to exceptions being supported.
+#elif !(defined(__GNUC__) && (__GNUC__ < 5) && !defined(__EXCEPTIONS)) &&    \
+    !(defined(__GNUC__) && (__GNUC__ >= 5) && !defined(__cpp_exceptions)) && \
+    !(defined(_MSC_VER) && !defined(_CPPUNWIND))
+#define ABSL_HAVE_EXCEPTIONS 1
+#endif
+
+// -----------------------------------------------------------------------------
+// Platform Feature Checks
+// -----------------------------------------------------------------------------
+
+// Currently supported operating systems and associated preprocessor
+// symbols:
+//
+//   Linux and Linux-derived           __linux__
+//   Android                           __ANDROID__ (implies __linux__)
+//   Linux (non-Android)               __linux__ && !__ANDROID__
+//   Darwin (macOS and iOS)            __APPLE__
+//   Akaros (http://akaros.org)        __ros__
+//   Windows                           _WIN32
+//   NaCL                              __native_client__
+//   AsmJS                             __asmjs__
+//   WebAssembly                       __wasm__
+//   Fuchsia                           __Fuchsia__
+//
+// Note that since Android defines both __ANDROID__ and __linux__, one
+// may probe for either Linux or Android by simply testing for __linux__.
+
+// ABSL_HAVE_MMAP
+//
+// Checks whether the platform has an mmap(2) implementation as defined in
+// POSIX.1-2001.
+#ifdef ABSL_HAVE_MMAP
+#error ABSL_HAVE_MMAP cannot be directly set
+#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ||   \
+    defined(__ros__) || defined(__native_client__) || defined(__asmjs__) || \
+    defined(__wasm__) || defined(__Fuchsia__) || defined(__sun) || \
+    defined(__ASYLO__) || defined(__myriad2__)
+#define ABSL_HAVE_MMAP 1
+#endif
+
+// ABSL_HAVE_PTHREAD_GETSCHEDPARAM
+//
+// Checks whether the platform implements the pthread_(get|set)schedparam(3)
+// functions as defined in POSIX.1-2001.
+#ifdef ABSL_HAVE_PTHREAD_GETSCHEDPARAM
+#error ABSL_HAVE_PTHREAD_GETSCHEDPARAM cannot be directly set
+#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
+    defined(__ros__)
+#define ABSL_HAVE_PTHREAD_GETSCHEDPARAM 1
+#endif
+
+// ABSL_HAVE_SCHED_GETCPU
+//
+// Checks whether sched_getcpu is available.
+#ifdef ABSL_HAVE_SCHED_GETCPU
+#error ABSL_HAVE_SCHED_GETCPU cannot be directly set
+#elif defined(__linux__)
+#define ABSL_HAVE_SCHED_GETCPU 1
+#endif
+
+// ABSL_HAVE_SCHED_YIELD
+//
+// Checks whether the platform implements sched_yield(2) as defined in
+// POSIX.1-2001.
+#ifdef ABSL_HAVE_SCHED_YIELD
+#error ABSL_HAVE_SCHED_YIELD cannot be directly set
+#elif defined(__linux__) || defined(__ros__) || defined(__native_client__)
+#define ABSL_HAVE_SCHED_YIELD 1
+#endif
+
+// ABSL_HAVE_SEMAPHORE_H
+//
+// Checks whether the platform supports the <semaphore.h> header and sem_init(3)
+// family of functions as standardized in POSIX.1-2001.
+//
+// Note: While Apple provides <semaphore.h> for both iOS and macOS, it is
+// explicitly deprecated and will cause build failures if enabled for those
+// platforms.  We side-step the issue by not defining it here for Apple
+// platforms.
+#ifdef ABSL_HAVE_SEMAPHORE_H
+#error ABSL_HAVE_SEMAPHORE_H cannot be directly set
+#elif defined(__linux__) || defined(__ros__)
+#define ABSL_HAVE_SEMAPHORE_H 1
+#endif
+
+// ABSL_HAVE_ALARM
+//
+// Checks whether the platform supports the <signal.h> header and alarm(2)
+// function as standardized in POSIX.1-2001.
+#ifdef ABSL_HAVE_ALARM
+#error ABSL_HAVE_ALARM cannot be directly set
+#elif defined(__GOOGLE_GRTE_VERSION__)
+// feature tests for Google's GRTE
+#define ABSL_HAVE_ALARM 1
+#elif defined(__GLIBC__)
+// feature test for glibc
+#define ABSL_HAVE_ALARM 1
+#elif defined(_MSC_VER)
+// feature tests for Microsoft's library
+#elif defined(__MINGW32__)
+// mingw32 doesn't provide alarm(2):
+// https://osdn.net/projects/mingw/scm/git/mingw-org-wsl/blobs/5.2-trunk/mingwrt/include/unistd.h
+// mingw-w64 provides a no-op implementation:
+// https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-crt/misc/alarm.c
+#elif defined(__EMSCRIPTEN__)
+// emscripten doesn't support signals
+#elif defined(__Fuchsia__)
+// Signals don't exist on fuchsia.
+#elif defined(__native_client__)
+#else
+// other standard libraries
+#define ABSL_HAVE_ALARM 1
+#endif
+
+// ABSL_IS_LITTLE_ENDIAN
+// ABSL_IS_BIG_ENDIAN
+//
+// Checks the endianness of the platform.
+//
+// Notes: uses the built in endian macros provided by GCC (since 4.6) and
+// Clang (since 3.2); see
+// https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html.
+// Otherwise, if _WIN32, assume little endian. Otherwise, bail with an error.
+#if defined(ABSL_IS_BIG_ENDIAN)
+#error "ABSL_IS_BIG_ENDIAN cannot be directly set."
+#endif
+#if defined(ABSL_IS_LITTLE_ENDIAN)
+#error "ABSL_IS_LITTLE_ENDIAN cannot be directly set."
+#endif
+
+#if (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
+     __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+#define ABSL_IS_LITTLE_ENDIAN 1
+#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
+    __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#define ABSL_IS_BIG_ENDIAN 1
+#elif defined(_WIN32)
+#define ABSL_IS_LITTLE_ENDIAN 1
+#else
+#error "absl endian detection needs to be set up for your compiler"
+#endif
+
+// macOS 10.13 and iOS 10.11 don't let you use <any>, <optional>, or <variant>
+// even though the headers exist and are publicly noted to work.  See
+// https://github.com/abseil/abseil-cpp/issues/207 and
+// https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes
+// libc++ spells out the availability requirements in the file
+// llvm-project/libcxx/include/__config via the #define
+// _LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS.
+#if defined(__APPLE__) && defined(_LIBCPP_VERSION) && \
+  ((defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
+   __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101400) || \
+  (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && \
+   __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 120000) || \
+  (defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && \
+   __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 50000) || \
+  (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && \
+   __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 120000))
+#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1
+#else
+#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0
+#endif
+
+// ABSL_HAVE_STD_ANY
+//
+// Checks whether C++17 std::any is available by checking whether <any> exists.
+#ifdef ABSL_HAVE_STD_ANY
+#error "ABSL_HAVE_STD_ANY cannot be directly set."
+#endif
+
+#ifdef __has_include
+#if __has_include(<any>) && defined(__cplusplus) && __cplusplus >= 201703L && \
+    !ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE
+#define ABSL_HAVE_STD_ANY 1
+#endif
+#endif
+
+// ABSL_HAVE_STD_OPTIONAL
+//
+// Checks whether C++17 std::optional is available.
+#ifdef ABSL_HAVE_STD_OPTIONAL
+#error "ABSL_HAVE_STD_OPTIONAL cannot be directly set."
+#endif
+
+#ifdef __has_include
+#if __has_include(<optional>) && defined(__cplusplus) && \
+    __cplusplus >= 201703L && !ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE
+#define ABSL_HAVE_STD_OPTIONAL 1
+#endif
+#endif
+
+// ABSL_HAVE_STD_VARIANT
+//
+// Checks whether C++17 std::variant is available.
+#ifdef ABSL_HAVE_STD_VARIANT
+#error "ABSL_HAVE_STD_VARIANT cannot be directly set."
+#endif
+
+#ifdef __has_include
+#if __has_include(<variant>) && defined(__cplusplus) && \
+    __cplusplus >= 201703L && !ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE
+#define ABSL_HAVE_STD_VARIANT 1
+#endif
+#endif
+
+// ABSL_HAVE_STD_STRING_VIEW
+//
+// Checks whether C++17 std::string_view is available.
+#ifdef ABSL_HAVE_STD_STRING_VIEW
+#error "ABSL_HAVE_STD_STRING_VIEW cannot be directly set."
+#endif
+
+#ifdef __has_include
+#if __has_include(<string_view>) && defined(__cplusplus) && \
+    __cplusplus >= 201703L
+#define ABSL_HAVE_STD_STRING_VIEW 1
+#endif
+#endif
+
+// For MSVC, `__has_include` is supported in VS 2017 15.3, which is later than
+// the support for <optional>, <any>, <string_view>, <variant>. So we use
+// _MSC_VER to check whether we have VS 2017 RTM (when <optional>, <any>,
+// <string_view>, <variant> is implemented) or higher. Also, `__cplusplus` is
+// not correctly set by MSVC, so we use `_MSVC_LANG` to check the language
+// version.
+// TODO(zhangxy): fix tests before enabling aliasing for `std::any`.
+#if defined(_MSC_VER) && _MSC_VER >= 1910 &&         \
+    ((defined(_MSVC_LANG) && _MSVC_LANG > 201402) || \
+     (defined(__cplusplus) && __cplusplus > 201402))
+// #define ABSL_HAVE_STD_ANY 1
+#define ABSL_HAVE_STD_OPTIONAL 1
+#define ABSL_HAVE_STD_VARIANT 1
+#define ABSL_HAVE_STD_STRING_VIEW 1
+#endif
+
+// ABSL_USES_STD_ANY
+//
+// Indicates whether absl::any is an alias for std::any.
+#if !defined(ABSL_OPTION_USE_STD_ANY)
+#error options.h is misconfigured.
+#elif ABSL_OPTION_USE_STD_ANY == 0 || \
+    (ABSL_OPTION_USE_STD_ANY == 2 && !defined(ABSL_HAVE_STD_ANY))
+#undef ABSL_USES_STD_ANY
+#elif ABSL_OPTION_USE_STD_ANY == 1 || \
+    (ABSL_OPTION_USE_STD_ANY == 2 && defined(ABSL_HAVE_STD_ANY))
+#define ABSL_USES_STD_ANY 1
+#else
+#error options.h is misconfigured.
+#endif
+
+// ABSL_USES_STD_OPTIONAL
+//
+// Indicates whether absl::optional is an alias for std::optional.
+#if !defined(ABSL_OPTION_USE_STD_OPTIONAL)
+#error options.h is misconfigured.
+#elif ABSL_OPTION_USE_STD_OPTIONAL == 0 || \
+    (ABSL_OPTION_USE_STD_OPTIONAL == 2 && !defined(ABSL_HAVE_STD_OPTIONAL))
+#undef ABSL_USES_STD_OPTIONAL
+#elif ABSL_OPTION_USE_STD_OPTIONAL == 1 || \
+    (ABSL_OPTION_USE_STD_OPTIONAL == 2 && defined(ABSL_HAVE_STD_OPTIONAL))
+#define ABSL_USES_STD_OPTIONAL 1
+#else
+#error options.h is misconfigured.
+#endif
+
+// ABSL_USES_STD_VARIANT
+//
+// Indicates whether absl::variant is an alias for std::variant.
+#if !defined(ABSL_OPTION_USE_STD_VARIANT)
+#error options.h is misconfigured.
+#elif ABSL_OPTION_USE_STD_VARIANT == 0 || \
+    (ABSL_OPTION_USE_STD_VARIANT == 2 && !defined(ABSL_HAVE_STD_VARIANT))
+#undef ABSL_USES_STD_VARIANT
+#elif ABSL_OPTION_USE_STD_VARIANT == 1 || \
+    (ABSL_OPTION_USE_STD_VARIANT == 2 && defined(ABSL_HAVE_STD_VARIANT))
+#define ABSL_USES_STD_VARIANT 1
+#else
+#error options.h is misconfigured.
+#endif
+
+// ABSL_USES_STD_STRING_VIEW
+//
+// Indicates whether absl::string_view is an alias for std::string_view.
+#if !defined(ABSL_OPTION_USE_STD_STRING_VIEW)
+#error options.h is misconfigured.
+#elif ABSL_OPTION_USE_STD_STRING_VIEW == 0 || \
+    (ABSL_OPTION_USE_STD_STRING_VIEW == 2 &&  \
+     !defined(ABSL_HAVE_STD_STRING_VIEW))
+#undef ABSL_USES_STD_STRING_VIEW
+#elif ABSL_OPTION_USE_STD_STRING_VIEW == 1 || \
+    (ABSL_OPTION_USE_STD_STRING_VIEW == 2 &&  \
+     defined(ABSL_HAVE_STD_STRING_VIEW))
+#define ABSL_USES_STD_STRING_VIEW 1
+#else
+#error options.h is misconfigured.
+#endif
+
+// In debug mode, MSVC 2017's std::variant throws a EXCEPTION_ACCESS_VIOLATION
+// SEH exception from emplace for variant<SomeStruct> when constructing the
+// struct can throw. This defeats some of variant_test and
+// variant_exception_safety_test.
+#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_DEBUG)
+#define ABSL_INTERNAL_MSVC_2017_DBG_MODE
+#endif
+
+// ABSL_INTERNAL_MANGLED_NS
+// ABSL_INTERNAL_MANGLED_BACKREFERENCE
+//
+// Internal macros for building up mangled names in our internal fork of CCTZ.
+// This implementation detail is only needed and provided for the MSVC build.
+//
+// These macros both expand to string literals.  ABSL_INTERNAL_MANGLED_NS is
+// the mangled spelling of the `absl` namespace, and
+// ABSL_INTERNAL_MANGLED_BACKREFERENCE is a back-reference integer representing
+// the proper count to skip past the CCTZ fork namespace names.  (This number
+// is one larger when there is an inline namespace name to skip.)
+#if defined(_MSC_VER)
+#if ABSL_OPTION_USE_INLINE_NAMESPACE == 0
+#define ABSL_INTERNAL_MANGLED_NS "absl"
+#define ABSL_INTERNAL_MANGLED_BACKREFERENCE "5"
+#else
+#define ABSL_INTERNAL_MANGLED_NS \
+  ABSL_INTERNAL_TOKEN_STR(ABSL_OPTION_INLINE_NAMESPACE_NAME) "@absl"
+#define ABSL_INTERNAL_MANGLED_BACKREFERENCE "6"
+#endif
+#endif
+
+#undef ABSL_INTERNAL_HAS_KEYWORD
+
+// ABSL_DLL
+//
+// When building Abseil as a DLL, this macro expands to `__declspec(dllexport)`
+// so we can annotate symbols appropriately as being exported. When used in
+// headers consuming a DLL, this macro expands to `__declspec(dllimport)` so
+// that consumers know the symbol is defined inside the DLL. In all other cases,
+// the macro expands to nothing.
+#if defined(_MSC_VER)
+#if defined(ABSL_BUILD_DLL)
+#define ABSL_DLL __declspec(dllexport)
+#elif defined(ABSL_CONSUME_DLL)
+#define ABSL_DLL __declspec(dllimport)
+#else
+#define ABSL_DLL
+#endif
+#else
+#define ABSL_DLL
+#endif  // defined(_MSC_VER)
+
+// ABSL_HAVE_MEMORY_SANITIZER
+//
+// MemorySanitizer (MSan) is a detector of uninitialized reads. It consists of
+// a compiler instrumentation module and a run-time library.
+#ifdef ABSL_HAVE_MEMORY_SANITIZER
+#error "ABSL_HAVE_MEMORY_SANITIZER cannot be directly set."
+#elif defined(__SANITIZE_MEMORY__)
+#define ABSL_HAVE_MEMORY_SANITIZER 1
+#elif !defined(__native_client__) && ABSL_HAVE_FEATURE(memory_sanitizer)
+#define ABSL_HAVE_MEMORY_SANITIZER 1
+#endif
+
+// ABSL_HAVE_THREAD_SANITIZER
+//
+// ThreadSanitizer (TSan) is a fast data race detector.
+#ifdef ABSL_HAVE_THREAD_SANITIZER
+#error "ABSL_HAVE_THREAD_SANITIZER cannot be directly set."
+#elif defined(__SANITIZE_THREAD__)
+#define ABSL_HAVE_THREAD_SANITIZER 1
+#elif ABSL_HAVE_FEATURE(thread_sanitizer)
+#define ABSL_HAVE_THREAD_SANITIZER 1
+#endif
+
+// ABSL_HAVE_ADDRESS_SANITIZER
+//
+// AddressSanitizer (ASan) is a fast memory error detector.
+#ifdef ABSL_HAVE_ADDRESS_SANITIZER
+#error "ABSL_HAVE_ADDRESS_SANITIZER cannot be directly set."
+#elif defined(__SANITIZE_ADDRESS__)
+#define ABSL_HAVE_ADDRESS_SANITIZER 1
+#elif ABSL_HAVE_FEATURE(address_sanitizer)
+#define ABSL_HAVE_ADDRESS_SANITIZER 1
+#endif
+
+// ABSL_HAVE_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
+//
+// Class template argument deduction is a language feature added in C++17.
+#ifdef ABSL_HAVE_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
+#error "ABSL_HAVE_CLASS_TEMPLATE_ARGUMENT_DEDUCTION cannot be directly set."
+#elif defined(__cpp_deduction_guides)
+#define ABSL_HAVE_CLASS_TEMPLATE_ARGUMENT_DEDUCTION 1
+#endif
+
+#endif  // ABSL_BASE_CONFIG_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/const_init.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/const_init.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/const_init.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/const_init.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,76 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// -----------------------------------------------------------------------------
+// kConstInit
+// -----------------------------------------------------------------------------
+//
+// A constructor tag used to mark an object as safe for use as a global
+// variable, avoiding the usual lifetime issues that can affect globals.
+
+#ifndef ABSL_BASE_CONST_INIT_H_
+#define ABSL_BASE_CONST_INIT_H_
+
+#include "absl/base/config.h"
+
+// In general, objects with static storage duration (such as global variables)
+// can trigger tricky object lifetime situations.  Attempting to access them
+// from the constructors or destructors of other global objects can result in
+// undefined behavior, unless their constructors and destructors are designed
+// with this issue in mind.
+//
+// The normal way to deal with this issue in C++11 is to use constant
+// initialization and trivial destructors.
+//
+// Constant initialization is guaranteed to occur before any other code
+// executes.  Constructors that are declared 'constexpr' are eligible for
+// constant initialization.  You can annotate a variable declaration with the
+// ABSL_CONST_INIT macro to express this intent.  For compilers that support
+// it, this annotation will cause a compilation error for declarations that
+// aren't subject to constant initialization (perhaps because a runtime value
+// was passed as a constructor argument).
+//
+// On program shutdown, lifetime issues can be avoided on global objects by
+// ensuring that they contain  trivial destructors.  A class has a trivial
+// destructor unless it has a user-defined destructor, a virtual method or base
+// class, or a data member or base class with a non-trivial destructor of its
+// own.  Objects with static storage duration and a trivial destructor are not
+// cleaned up on program shutdown, and are thus safe to access from other code
+// running during shutdown.
+//
+// For a few core Abseil classes, we make a best effort to allow for safe global
+// instances, even though these classes have non-trivial destructors.  These
+// objects can be created with the absl::kConstInit tag.  For example:
+//   ABSL_CONST_INIT absl::Mutex global_mutex(absl::kConstInit);
+//
+// The line above declares a global variable of type absl::Mutex which can be
+// accessed at any point during startup or shutdown.  global_mutex's destructor
+// will still run, but will not invalidate the object.  Note that C++ specifies
+// that accessing an object after its destructor has run results in undefined
+// behavior, but this pattern works on the toolchains we support.
+//
+// The absl::kConstInit tag should only be used to define objects with static
+// or thread_local storage duration.
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+enum ConstInitType {
+  kConstInit,
+};
+
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_BASE_CONST_INIT_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/atomic_hook.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/atomic_hook.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/atomic_hook.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/atomic_hook.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,200 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef ABSL_BASE_INTERNAL_ATOMIC_HOOK_H_
+#define ABSL_BASE_INTERNAL_ATOMIC_HOOK_H_
+
+#include <atomic>
+#include <cassert>
+#include <cstdint>
+#include <utility>
+
+#include "absl/base/attributes.h"
+#include "absl/base/config.h"
+
+#if defined(_MSC_VER) && !defined(__clang__)
+#define ABSL_HAVE_WORKING_CONSTEXPR_STATIC_INIT 0
+#else
+#define ABSL_HAVE_WORKING_CONSTEXPR_STATIC_INIT 1
+#endif
+
+#if defined(_MSC_VER)
+#define ABSL_HAVE_WORKING_ATOMIC_POINTER 0
+#else
+#define ABSL_HAVE_WORKING_ATOMIC_POINTER 1
+#endif
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace base_internal {
+
+template <typename T>
+class AtomicHook;
+
+// To workaround AtomicHook not being constant-initializable on some platforms,
+// prefer to annotate instances with `ABSL_INTERNAL_ATOMIC_HOOK_ATTRIBUTES`
+// instead of `ABSL_CONST_INIT`.
+#if ABSL_HAVE_WORKING_CONSTEXPR_STATIC_INIT
+#define ABSL_INTERNAL_ATOMIC_HOOK_ATTRIBUTES ABSL_CONST_INIT
+#else
+#define ABSL_INTERNAL_ATOMIC_HOOK_ATTRIBUTES
+#endif
+
+// `AtomicHook` is a helper class, templatized on a raw function pointer type,
+// for implementing Abseil customization hooks.  It is a callable object that
+// dispatches to the registered hook.  Objects of type `AtomicHook` must have
+// static or thread storage duration.
+//
+// A default constructed object performs a no-op (and returns a default
+// constructed object) if no hook has been registered.
+//
+// Hooks can be pre-registered via constant initialization, for example:
+//
+// ABSL_INTERNAL_ATOMIC_HOOK_ATTRIBUTES static AtomicHook<void(*)()>
+//     my_hook(DefaultAction);
+//
+// and then changed at runtime via a call to `Store()`.
+//
+// Reads and writes guarantee memory_order_acquire/memory_order_release
+// semantics.
+template <typename ReturnType, typename... Args>
+class AtomicHook<ReturnType (*)(Args...)> {
+ public:
+  using FnPtr = ReturnType (*)(Args...);
+
+  // Constructs an object that by default performs a no-op (and
+  // returns a default constructed object) when no hook as been registered.
+  constexpr AtomicHook() : AtomicHook(DummyFunction) {}
+
+  // Constructs an object that by default dispatches to/returns the
+  // pre-registered default_fn when no hook has been registered at runtime.
+#if ABSL_HAVE_WORKING_ATOMIC_POINTER && ABSL_HAVE_WORKING_CONSTEXPR_STATIC_INIT
+  explicit constexpr AtomicHook(FnPtr default_fn)
+      : hook_(default_fn), default_fn_(default_fn) {}
+#elif ABSL_HAVE_WORKING_CONSTEXPR_STATIC_INIT
+  explicit constexpr AtomicHook(FnPtr default_fn)
+      : hook_(kUninitialized), default_fn_(default_fn) {}
+#else
+  // As of January 2020, on all known versions of MSVC this constructor runs in
+  // the global constructor sequence.  If `Store()` is called by a dynamic
+  // initializer, we want to preserve the value, even if this constructor runs
+  // after the call to `Store()`.  If not, `hook_` will be
+  // zero-initialized by the linker and we have no need to set it.
+  // https://developercommunity.visualstudio.com/content/problem/336946/class-with-constexpr-constructor-not-using-static.html
+  explicit constexpr AtomicHook(FnPtr default_fn)
+      : /* hook_(deliberately omitted), */ default_fn_(default_fn) {
+    static_assert(kUninitialized == 0, "here we rely on zero-initialization");
+  }
+#endif
+
+  // Stores the provided function pointer as the value for this hook.
+  //
+  // This is intended to be called once.  Multiple calls are legal only if the
+  // same function pointer is provided for each call.  The store is implemented
+  // as a memory_order_release operation, and read accesses are implemented as
+  // memory_order_acquire.
+  void Store(FnPtr fn) {
+    bool success = DoStore(fn);
+    static_cast<void>(success);
+    assert(success);
+  }
+
+  // Invokes the registered callback.  If no callback has yet been registered, a
+  // default-constructed object of the appropriate type is returned instead.
+  template <typename... CallArgs>
+  ReturnType operator()(CallArgs&&... args) const {
+    return DoLoad()(std::forward<CallArgs>(args)...);
+  }
+
+  // Returns the registered callback, or nullptr if none has been registered.
+  // Useful if client code needs to conditionalize behavior based on whether a
+  // callback was registered.
+  //
+  // Note that atomic_hook.Load()() and atomic_hook() have different semantics:
+  // operator()() will perform a no-op if no callback was registered, while
+  // Load()() will dereference a null function pointer.  Prefer operator()() to
+  // Load()() unless you must conditionalize behavior on whether a hook was
+  // registered.
+  FnPtr Load() const {
+    FnPtr ptr = DoLoad();
+    return (ptr == DummyFunction) ? nullptr : ptr;
+  }
+
+ private:
+  static ReturnType DummyFunction(Args...) {
+    return ReturnType();
+  }
+
+  // Current versions of MSVC (as of September 2017) have a broken
+  // implementation of std::atomic<T*>:  Its constructor attempts to do the
+  // equivalent of a reinterpret_cast in a constexpr context, which is not
+  // allowed.
+  //
+  // This causes an issue when building with LLVM under Windows.  To avoid this,
+  // we use a less-efficient, intptr_t-based implementation on Windows.
+#if ABSL_HAVE_WORKING_ATOMIC_POINTER
+  // Return the stored value, or DummyFunction if no value has been stored.
+  FnPtr DoLoad() const { return hook_.load(std::memory_order_acquire); }
+
+  // Store the given value.  Returns false if a different value was already
+  // stored to this object.
+  bool DoStore(FnPtr fn) {
+    assert(fn);
+    FnPtr expected = default_fn_;
+    const bool store_succeeded = hook_.compare_exchange_strong(
+        expected, fn, std::memory_order_acq_rel, std::memory_order_acquire);
+    const bool same_value_already_stored = (expected == fn);
+    return store_succeeded || same_value_already_stored;
+  }
+
+  std::atomic<FnPtr> hook_;
+#else  // !ABSL_HAVE_WORKING_ATOMIC_POINTER
+  // Use a sentinel value unlikely to be the address of an actual function.
+  static constexpr intptr_t kUninitialized = 0;
+
+  static_assert(sizeof(intptr_t) >= sizeof(FnPtr),
+                "intptr_t can't contain a function pointer");
+
+  FnPtr DoLoad() const {
+    const intptr_t value = hook_.load(std::memory_order_acquire);
+    if (value == kUninitialized) {
+      return default_fn_;
+    }
+    return reinterpret_cast<FnPtr>(value);
+  }
+
+  bool DoStore(FnPtr fn) {
+    assert(fn);
+    const auto value = reinterpret_cast<intptr_t>(fn);
+    intptr_t expected = kUninitialized;
+    const bool store_succeeded = hook_.compare_exchange_strong(
+        expected, value, std::memory_order_acq_rel, std::memory_order_acquire);
+    const bool same_value_already_stored = (expected == value);
+    return store_succeeded || same_value_already_stored;
+  }
+
+  std::atomic<intptr_t> hook_;
+#endif
+
+  const FnPtr default_fn_;
+};
+
+#undef ABSL_HAVE_WORKING_ATOMIC_POINTER
+#undef ABSL_HAVE_WORKING_CONSTEXPR_STATIC_INIT
+
+}  // namespace base_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_BASE_INTERNAL_ATOMIC_HOOK_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/identity.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/identity.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/identity.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/identity.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,37 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#ifndef ABSL_BASE_INTERNAL_IDENTITY_H_
+#define ABSL_BASE_INTERNAL_IDENTITY_H_
+
+#include "absl/base/config.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace internal {
+
+template <typename T>
+struct identity {
+  typedef T type;
+};
+
+template <typename T>
+using identity_t = typename identity<T>::type;
+
+}  // namespace internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_BASE_INTERNAL_IDENTITY_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/inline_variable.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/inline_variable.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/inline_variable.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/inline_variable.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,107 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef ABSL_BASE_INTERNAL_INLINE_VARIABLE_EMULATION_H_
+#define ABSL_BASE_INTERNAL_INLINE_VARIABLE_EMULATION_H_
+
+#include <type_traits>
+
+#include "absl/base/internal/identity.h"
+
+// File:
+//   This file define a macro that allows the creation of or emulation of C++17
+//   inline variables based on whether or not the feature is supported.
+
+////////////////////////////////////////////////////////////////////////////////
+// Macro: ABSL_INTERNAL_INLINE_CONSTEXPR(type, name, init)
+//
+// Description:
+//   Expands to the equivalent of an inline constexpr instance of the specified
+//   `type` and `name`, initialized to the value `init`. If the compiler being
+//   used is detected as supporting actual inline variables as a language
+//   feature, then the macro expands to an actual inline variable definition.
+//
+// Requires:
+//   `type` is a type that is usable in an extern variable declaration.
+//
+// Requires: `name` is a valid identifier
+//
+// Requires:
+//   `init` is an expression that can be used in the following definition:
+//     constexpr type name = init;
+//
+// Usage:
+//
+//   // Equivalent to: `inline constexpr size_t variant_npos = -1;`
+//   ABSL_INTERNAL_INLINE_CONSTEXPR(size_t, variant_npos, -1);
+//
+// Differences in implementation:
+//   For a direct, language-level inline variable, decltype(name) will be the
+//   type that was specified along with const qualification, whereas for
+//   emulated inline variables, decltype(name) may be different (in practice
+//   it will likely be a reference type).
+////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cpp_inline_variables
+
+// Clang's -Wmissing-variable-declarations option erroneously warned that
+// inline constexpr objects need to be pre-declared. This has now been fixed,
+// but we will need to support this workaround for people building with older
+// versions of clang.
+//
+// Bug: https://bugs.llvm.org/show_bug.cgi?id=35862
+//
+// Note:
+//   identity_t is used here so that the const and name are in the
+//   appropriate place for pointer types, reference types, function pointer
+//   types, etc..
+#if defined(__clang__)
+#define ABSL_INTERNAL_EXTERN_DECL(type, name) \
+  extern const ::absl::internal::identity_t<type> name;
+#else  // Otherwise, just define the macro to do nothing.
+#define ABSL_INTERNAL_EXTERN_DECL(type, name)
+#endif  // defined(__clang__)
+
+// See above comment at top of file for details.
+#define ABSL_INTERNAL_INLINE_CONSTEXPR(type, name, init) \
+  ABSL_INTERNAL_EXTERN_DECL(type, name)                  \
+  inline constexpr ::absl::internal::identity_t<type> name = init
+
+#else
+
+// See above comment at top of file for details.
+//
+// Note:
+//   identity_t is used here so that the const and name are in the
+//   appropriate place for pointer types, reference types, function pointer
+//   types, etc..
+#define ABSL_INTERNAL_INLINE_CONSTEXPR(var_type, name, init)                  \
+  template <class /*AbslInternalDummy*/ = void>                               \
+  struct AbslInternalInlineVariableHolder##name {                             \
+    static constexpr ::absl::internal::identity_t<var_type> kInstance = init; \
+  };                                                                          \
+                                                                              \
+  template <class AbslInternalDummy>                                          \
+  constexpr ::absl::internal::identity_t<var_type>                            \
+      AbslInternalInlineVariableHolder##name<AbslInternalDummy>::kInstance;   \
+                                                                              \
+  static constexpr const ::absl::internal::identity_t<var_type>&              \
+      name = /* NOLINT */                                                     \
+      AbslInternalInlineVariableHolder##name<>::kInstance;                    \
+  static_assert(sizeof(void (*)(decltype(name))) != 0,                        \
+                "Silence unused variable warnings.")
+
+#endif  // __cpp_inline_variables
+
+#endif  // ABSL_BASE_INTERNAL_INLINE_VARIABLE_EMULATION_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/invoke.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/invoke.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/invoke.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/invoke.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,187 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// absl::base_internal::invoke(f, args...) is an implementation of
+// INVOKE(f, args...) from section [func.require] of the C++ standard.
+//
+// [func.require]
+// Define INVOKE (f, t1, t2, ..., tN) as follows:
+// 1. (t1.*f)(t2, ..., tN) when f is a pointer to a member function of a class T
+//    and t1 is an object of type T or a reference to an object of type T or a
+//    reference to an object of a type derived from T;
+// 2. ((*t1).*f)(t2, ..., tN) when f is a pointer to a member function of a
+//    class T and t1 is not one of the types described in the previous item;
+// 3. t1.*f when N == 1 and f is a pointer to member data of a class T and t1 is
+//    an object of type T or a reference to an object of type T or a reference
+//    to an object of a type derived from T;
+// 4. (*t1).*f when N == 1 and f is a pointer to member data of a class T and t1
+//    is not one of the types described in the previous item;
+// 5. f(t1, t2, ..., tN) in all other cases.
+//
+// The implementation is SFINAE-friendly: substitution failure within invoke()
+// isn't an error.
+
+#ifndef ABSL_BASE_INTERNAL_INVOKE_H_
+#define ABSL_BASE_INTERNAL_INVOKE_H_
+
+#include <algorithm>
+#include <type_traits>
+#include <utility>
+
+#include "absl/meta/type_traits.h"
+
+// The following code is internal implementation detail.  See the comment at the
+// top of this file for the API documentation.
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace base_internal {
+
+// The five classes below each implement one of the clauses from the definition
+// of INVOKE. The inner class template Accept<F, Args...> checks whether the
+// clause is applicable; static function template Invoke(f, args...) does the
+// invocation.
+//
+// By separating the clause selection logic from invocation we make sure that
+// Invoke() does exactly what the standard says.
+
+template <typename Derived>
+struct StrippedAccept {
+  template <typename... Args>
+  struct Accept : Derived::template AcceptImpl<typename std::remove_cv<
+                      typename std::remove_reference<Args>::type>::type...> {};
+};
+
+// (t1.*f)(t2, ..., tN) when f is a pointer to a member function of a class T
+// and t1 is an object of type T or a reference to an object of type T or a
+// reference to an object of a type derived from T.
+struct MemFunAndRef : StrippedAccept<MemFunAndRef> {
+  template <typename... Args>
+  struct AcceptImpl : std::false_type {};
+
+  template <typename MemFunType, typename C, typename Obj, typename... Args>
+  struct AcceptImpl<MemFunType C::*, Obj, Args...>
+      : std::integral_constant<bool, std::is_base_of<C, Obj>::value &&
+                                         absl::is_function<MemFunType>::value> {
+  };
+
+  template <typename MemFun, typename Obj, typename... Args>
+  static decltype((std::declval<Obj>().*
+                   std::declval<MemFun>())(std::declval<Args>()...))
+  Invoke(MemFun&& mem_fun, Obj&& obj, Args&&... args) {
+    return (std::forward<Obj>(obj).*
+            std::forward<MemFun>(mem_fun))(std::forward<Args>(args)...);
+  }
+};
+
+// ((*t1).*f)(t2, ..., tN) when f is a pointer to a member function of a
+// class T and t1 is not one of the types described in the previous item.
+struct MemFunAndPtr : StrippedAccept<MemFunAndPtr> {
+  template <typename... Args>
+  struct AcceptImpl : std::false_type {};
+
+  template <typename MemFunType, typename C, typename Ptr, typename... Args>
+  struct AcceptImpl<MemFunType C::*, Ptr, Args...>
+      : std::integral_constant<bool, !std::is_base_of<C, Ptr>::value &&
+                                         absl::is_function<MemFunType>::value> {
+  };
+
+  template <typename MemFun, typename Ptr, typename... Args>
+  static decltype(((*std::declval<Ptr>()).*
+                   std::declval<MemFun>())(std::declval<Args>()...))
+  Invoke(MemFun&& mem_fun, Ptr&& ptr, Args&&... args) {
+    return ((*std::forward<Ptr>(ptr)).*
+            std::forward<MemFun>(mem_fun))(std::forward<Args>(args)...);
+  }
+};
+
+// t1.*f when N == 1 and f is a pointer to member data of a class T and t1 is
+// an object of type T or a reference to an object of type T or a reference
+// to an object of a type derived from T.
+struct DataMemAndRef : StrippedAccept<DataMemAndRef> {
+  template <typename... Args>
+  struct AcceptImpl : std::false_type {};
+
+  template <typename R, typename C, typename Obj>
+  struct AcceptImpl<R C::*, Obj>
+      : std::integral_constant<bool, std::is_base_of<C, Obj>::value &&
+                                         !absl::is_function<R>::value> {};
+
+  template <typename DataMem, typename Ref>
+  static decltype(std::declval<Ref>().*std::declval<DataMem>()) Invoke(
+      DataMem&& data_mem, Ref&& ref) {
+    return std::forward<Ref>(ref).*std::forward<DataMem>(data_mem);
+  }
+};
+
+// (*t1).*f when N == 1 and f is a pointer to member data of a class T and t1
+// is not one of the types described in the previous item.
+struct DataMemAndPtr : StrippedAccept<DataMemAndPtr> {
+  template <typename... Args>
+  struct AcceptImpl : std::false_type {};
+
+  template <typename R, typename C, typename Ptr>
+  struct AcceptImpl<R C::*, Ptr>
+      : std::integral_constant<bool, !std::is_base_of<C, Ptr>::value &&
+                                         !absl::is_function<R>::value> {};
+
+  template <typename DataMem, typename Ptr>
+  static decltype((*std::declval<Ptr>()).*std::declval<DataMem>()) Invoke(
+      DataMem&& data_mem, Ptr&& ptr) {
+    return (*std::forward<Ptr>(ptr)).*std::forward<DataMem>(data_mem);
+  }
+};
+
+// f(t1, t2, ..., tN) in all other cases.
+struct Callable {
+  // Callable doesn't have Accept because it's the last clause that gets picked
+  // when none of the previous clauses are applicable.
+  template <typename F, typename... Args>
+  static decltype(std::declval<F>()(std::declval<Args>()...)) Invoke(
+      F&& f, Args&&... args) {
+    return std::forward<F>(f)(std::forward<Args>(args)...);
+  }
+};
+
+// Resolves to the first matching clause.
+template <typename... Args>
+struct Invoker {
+  typedef typename std::conditional<
+      MemFunAndRef::Accept<Args...>::value, MemFunAndRef,
+      typename std::conditional<
+          MemFunAndPtr::Accept<Args...>::value, MemFunAndPtr,
+          typename std::conditional<
+              DataMemAndRef::Accept<Args...>::value, DataMemAndRef,
+              typename std::conditional<DataMemAndPtr::Accept<Args...>::value,
+                                        DataMemAndPtr, Callable>::type>::type>::
+          type>::type type;
+};
+
+// The result type of Invoke<F, Args...>.
+template <typename F, typename... Args>
+using invoke_result_t = decltype(Invoker<F, Args...>::type::Invoke(
+    std::declval<F>(), std::declval<Args>()...));
+
+// Invoke(f, args...) is an implementation of INVOKE(f, args...) from section
+// [func.require] of the C++ standard.
+template <typename F, typename... Args>
+invoke_result_t<F, Args...> invoke(F&& f, Args&&... args) {
+  return Invoker<F, Args...>::type::Invoke(std::forward<F>(f),
+                                           std::forward<Args>(args)...);
+}
+}  // namespace base_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_BASE_INTERNAL_INVOKE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/raw_logging.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/raw_logging.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/raw_logging.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/raw_logging.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,242 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "absl/base/internal/raw_logging.h"
+
+#include <stddef.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
+#include "absl/base/attributes.h"
+#include "absl/base/config.h"
+#include "absl/base/internal/atomic_hook.h"
+#include "absl/base/log_severity.h"
+
+// We know how to perform low-level writes to stderr in POSIX and Windows.  For
+// these platforms, we define the token ABSL_LOW_LEVEL_WRITE_SUPPORTED.
+// Much of raw_logging.cc becomes a no-op when we can't output messages,
+// although a FATAL ABSL_RAW_LOG message will still abort the process.
+
+// ABSL_HAVE_POSIX_WRITE is defined when the platform provides posix write()
+// (as from unistd.h)
+//
+// This preprocessor token is also defined in raw_io.cc.  If you need to copy
+// this, consider moving both to config.h instead.
+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
+    defined(__Fuchsia__) || defined(__native_client__) || \
+    defined(__EMSCRIPTEN__) || defined(__ASYLO__)
+
+#include <unistd.h>
+
+#define ABSL_HAVE_POSIX_WRITE 1
+#define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1
+#else
+#undef ABSL_HAVE_POSIX_WRITE
+#endif
+
+// ABSL_HAVE_SYSCALL_WRITE is defined when the platform provides the syscall
+//   syscall(SYS_write, /*int*/ fd, /*char* */ buf, /*size_t*/ len);
+// for low level operations that want to avoid libc.
+#if (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__)
+#include <sys/syscall.h>
+#define ABSL_HAVE_SYSCALL_WRITE 1
+#define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1
+#else
+#undef ABSL_HAVE_SYSCALL_WRITE
+#endif
+
+#ifdef _WIN32
+#include <io.h>
+
+#define ABSL_HAVE_RAW_IO 1
+#define ABSL_LOW_LEVEL_WRITE_SUPPORTED 1
+#else
+#undef ABSL_HAVE_RAW_IO
+#endif
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace raw_logging_internal {
+namespace {
+
+// TODO(gfalcon): We want raw-logging to work on as many platforms as possible.
+// Explicitly `#error` out when not `ABSL_LOW_LEVEL_WRITE_SUPPORTED`, except for
+// a selected set of platforms for which we expect not to be able to raw log.
+
+ABSL_INTERNAL_ATOMIC_HOOK_ATTRIBUTES
+    absl::base_internal::AtomicHook<LogPrefixHook>
+        log_prefix_hook;
+ABSL_INTERNAL_ATOMIC_HOOK_ATTRIBUTES
+    absl::base_internal::AtomicHook<AbortHook>
+        abort_hook;
+
+#ifdef ABSL_LOW_LEVEL_WRITE_SUPPORTED
+constexpr char kTruncated[] = " ... (message truncated)\n";
+
+// sprintf the format to the buffer, adjusting *buf and *size to reflect the
+// consumed bytes, and return whether the message fit without truncation.  If
+// truncation occurred, if possible leave room in the buffer for the message
+// kTruncated[].
+bool VADoRawLog(char** buf, int* size, const char* format, va_list ap)
+    ABSL_PRINTF_ATTRIBUTE(3, 0);
+bool VADoRawLog(char** buf, int* size, const char* format, va_list ap) {
+  int n = vsnprintf(*buf, *size, format, ap);
+  bool result = true;
+  if (n < 0 || n > *size) {
+    result = false;
+    if (static_cast<size_t>(*size) > sizeof(kTruncated)) {
+      n = *size - sizeof(kTruncated);  // room for truncation message
+    } else {
+      n = 0;  // no room for truncation message
+    }
+  }
+  *size -= n;
+  *buf += n;
+  return result;
+}
+#endif  // ABSL_LOW_LEVEL_WRITE_SUPPORTED
+
+constexpr int kLogBufSize = 3000;
+
+// CAVEAT: vsnprintf called from *DoRawLog below has some (exotic) code paths
+// that invoke malloc() and getenv() that might acquire some locks.
+
+// Helper for RawLog below.
+// *DoRawLog writes to *buf of *size and move them past the written portion.
+// It returns true iff there was no overflow or error.
+bool DoRawLog(char** buf, int* size, const char* format, ...)
+    ABSL_PRINTF_ATTRIBUTE(3, 4);
+bool DoRawLog(char** buf, int* size, const char* format, ...) {
+  va_list ap;
+  va_start(ap, format);
+  int n = vsnprintf(*buf, *size, format, ap);
+  va_end(ap);
+  if (n < 0 || n > *size) return false;
+  *size -= n;
+  *buf += n;
+  return true;
+}
+
+void RawLogVA(absl::LogSeverity severity, const char* file, int line,
+              const char* format, va_list ap) ABSL_PRINTF_ATTRIBUTE(4, 0);
+void RawLogVA(absl::LogSeverity severity, const char* file, int line,
+              const char* format, va_list ap) {
+  char buffer[kLogBufSize];
+  char* buf = buffer;
+  int size = sizeof(buffer);
+#ifdef ABSL_LOW_LEVEL_WRITE_SUPPORTED
+  bool enabled = true;
+#else
+  bool enabled = false;
+#endif
+
+#ifdef ABSL_MIN_LOG_LEVEL
+  if (severity < static_cast<absl::LogSeverity>(ABSL_MIN_LOG_LEVEL) &&
+      severity < absl::LogSeverity::kFatal) {
+    enabled = false;
+  }
+#endif
+
+  auto log_prefix_hook_ptr = log_prefix_hook.Load();
+  if (log_prefix_hook_ptr) {
+    enabled = log_prefix_hook_ptr(severity, file, line, &buf, &size);
+  } else {
+    if (enabled) {
+      DoRawLog(&buf, &size, "[%s : %d] RAW: ", file, line);
+    }
+  }
+  const char* const prefix_end = buf;
+
+#ifdef ABSL_LOW_LEVEL_WRITE_SUPPORTED
+  if (enabled) {
+    bool no_chop = VADoRawLog(&buf, &size, format, ap);
+    if (no_chop) {
+      DoRawLog(&buf, &size, "\n");
+    } else {
+      DoRawLog(&buf, &size, "%s", kTruncated);
+    }
+    SafeWriteToStderr(buffer, strlen(buffer));
+  }
+#else
+  static_cast<void>(format);
+  static_cast<void>(ap);
+#endif
+
+  // Abort the process after logging a FATAL message, even if the output itself
+  // was suppressed.
+  if (severity == absl::LogSeverity::kFatal) {
+    abort_hook(file, line, buffer, prefix_end, buffer + kLogBufSize);
+    abort();
+  }
+}
+
+// Non-formatting version of RawLog().
+//
+// TODO(gfalcon): When string_view no longer depends on base, change this
+// interface to take its message as a string_view instead.
+void DefaultInternalLog(absl::LogSeverity severity, const char* file, int line,
+                        const std::string& message) {
+  RawLog(severity, file, line, "%.*s", static_cast<int>(message.size()),
+         message.data());
+}
+
+}  // namespace
+
+void SafeWriteToStderr(const char *s, size_t len) {
+#if defined(ABSL_HAVE_SYSCALL_WRITE)
+  syscall(SYS_write, STDERR_FILENO, s, len);
+#elif defined(ABSL_HAVE_POSIX_WRITE)
+  write(STDERR_FILENO, s, len);
+#elif defined(ABSL_HAVE_RAW_IO)
+  _write(/* stderr */ 2, s, len);
+#else
+  // stderr logging unsupported on this platform
+  (void) s;
+  (void) len;
+#endif
+}
+
+void RawLog(absl::LogSeverity severity, const char* file, int line,
+            const char* format, ...) {
+  va_list ap;
+  va_start(ap, format);
+  RawLogVA(severity, file, line, format, ap);
+  va_end(ap);
+}
+
+bool RawLoggingFullySupported() {
+#ifdef ABSL_LOW_LEVEL_WRITE_SUPPORTED
+  return true;
+#else  // !ABSL_LOW_LEVEL_WRITE_SUPPORTED
+  return false;
+#endif  // !ABSL_LOW_LEVEL_WRITE_SUPPORTED
+}
+
+ABSL_INTERNAL_ATOMIC_HOOK_ATTRIBUTES ABSL_DLL
+    absl::base_internal::AtomicHook<InternalLogFunction>
+        internal_log_function(DefaultInternalLog);
+
+void RegisterLogPrefixHook(LogPrefixHook func) { log_prefix_hook.Store(func); }
+
+void RegisterAbortHook(AbortHook func) { abort_hook.Store(func); }
+
+void RegisterInternalLogFunction(InternalLogFunction func) {
+  internal_log_function.Store(func);
+}
+
+}  // namespace raw_logging_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/raw_logging.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/raw_logging.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/raw_logging.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/raw_logging.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,195 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Thread-safe logging routines that do not allocate any memory or
+// acquire any locks, and can therefore be used by low-level memory
+// allocation, synchronization, and signal-handling code.
+
+#ifndef ABSL_BASE_INTERNAL_RAW_LOGGING_H_
+#define ABSL_BASE_INTERNAL_RAW_LOGGING_H_
+
+#include <string>
+
+#include "absl/base/attributes.h"
+#include "absl/base/config.h"
+#include "absl/base/internal/atomic_hook.h"
+#include "absl/base/log_severity.h"
+#include "absl/base/macros.h"
+#include "absl/base/optimization.h"
+#include "absl/base/port.h"
+
+// This is similar to LOG(severity) << format..., but
+// * it is to be used ONLY by low-level modules that can't use normal LOG()
+// * it is designed to be a low-level logger that does not allocate any
+//   memory and does not need any locks, hence:
+// * it logs straight and ONLY to STDERR w/o buffering
+// * it uses an explicit printf-format and arguments list
+// * it will silently chop off really long message strings
+// Usage example:
+//   ABSL_RAW_LOG(ERROR, "Failed foo with %i: %s", status, error);
+// This will print an almost standard log line like this to stderr only:
+//   E0821 211317 file.cc:123] RAW: Failed foo with 22: bad_file
+
+#define ABSL_RAW_LOG(severity, ...)                                            \
+  do {                                                                         \
+    constexpr const char* absl_raw_logging_internal_basename =                 \
+        ::absl::raw_logging_internal::Basename(__FILE__,                       \
+                                               sizeof(__FILE__) - 1);          \
+    ::absl::raw_logging_internal::RawLog(ABSL_RAW_LOGGING_INTERNAL_##severity, \
+                                         absl_raw_logging_internal_basename,   \
+                                         __LINE__, __VA_ARGS__);               \
+  } while (0)
+
+// Similar to CHECK(condition) << message, but for low-level modules:
+// we use only ABSL_RAW_LOG that does not allocate memory.
+// We do not want to provide args list here to encourage this usage:
+//   if (!cond)  ABSL_RAW_LOG(FATAL, "foo ...", hard_to_compute_args);
+// so that the args are not computed when not needed.
+#define ABSL_RAW_CHECK(condition, message)                             \
+  do {                                                                 \
+    if (ABSL_PREDICT_FALSE(!(condition))) {                            \
+      ABSL_RAW_LOG(FATAL, "Check %s failed: %s", #condition, message); \
+    }                                                                  \
+  } while (0)
+
+// ABSL_INTERNAL_LOG and ABSL_INTERNAL_CHECK work like the RAW variants above,
+// except that if the richer log library is linked into the binary, we dispatch
+// to that instead.  This is potentially useful for internal logging and
+// assertions, where we are using RAW_LOG neither for its async-signal-safety
+// nor for its non-allocating nature, but rather because raw logging has very
+// few other dependencies.
+//
+// The API is a subset of the above: each macro only takes two arguments.  Use
+// StrCat if you need to build a richer message.
+#define ABSL_INTERNAL_LOG(severity, message)                                 \
+  do {                                                                       \
+    constexpr const char* absl_raw_logging_internal_filename = __FILE__;     \
+    ::absl::raw_logging_internal::internal_log_function(                     \
+        ABSL_RAW_LOGGING_INTERNAL_##severity,                                \
+        absl_raw_logging_internal_filename, __LINE__, message);              \
+    if (ABSL_RAW_LOGGING_INTERNAL_##severity == ::absl::LogSeverity::kFatal) \
+      ABSL_INTERNAL_UNREACHABLE;                                             \
+  } while (0)
+
+#define ABSL_INTERNAL_CHECK(condition, message)                    \
+  do {                                                             \
+    if (ABSL_PREDICT_FALSE(!(condition))) {                        \
+      std::string death_message = "Check " #condition " failed: "; \
+      death_message += std::string(message);                       \
+      ABSL_INTERNAL_LOG(FATAL, death_message);                     \
+    }                                                              \
+  } while (0)
+
+#define ABSL_RAW_LOGGING_INTERNAL_INFO ::absl::LogSeverity::kInfo
+#define ABSL_RAW_LOGGING_INTERNAL_WARNING ::absl::LogSeverity::kWarning
+#define ABSL_RAW_LOGGING_INTERNAL_ERROR ::absl::LogSeverity::kError
+#define ABSL_RAW_LOGGING_INTERNAL_FATAL ::absl::LogSeverity::kFatal
+#define ABSL_RAW_LOGGING_INTERNAL_LEVEL(severity) \
+  ::absl::NormalizeLogSeverity(severity)
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace raw_logging_internal {
+
+// Helper function to implement ABSL_RAW_LOG
+// Logs format... at "severity" level, reporting it
+// as called from file:line.
+// This does not allocate memory or acquire locks.
+void RawLog(absl::LogSeverity severity, const char* file, int line,
+            const char* format, ...) ABSL_PRINTF_ATTRIBUTE(4, 5);
+
+// Writes the provided buffer directly to stderr, in a safe, low-level manner.
+//
+// In POSIX this means calling write(), which is async-signal safe and does
+// not malloc.  If the platform supports the SYS_write syscall, we invoke that
+// directly to side-step any libc interception.
+void SafeWriteToStderr(const char *s, size_t len);
+
+// compile-time function to get the "base" filename, that is, the part of
+// a filename after the last "/" or "\" path separator.  The search starts at
+// the end of the string; the second parameter is the length of the string.
+constexpr const char* Basename(const char* fname, int offset) {
+  return offset == 0 || fname[offset - 1] == '/' || fname[offset - 1] == '\\'
+             ? fname + offset
+             : Basename(fname, offset - 1);
+}
+
+// For testing only.
+// Returns true if raw logging is fully supported. When it is not
+// fully supported, no messages will be emitted, but a log at FATAL
+// severity will cause an abort.
+//
+// TODO(gfalcon): Come up with a better name for this method.
+bool RawLoggingFullySupported();
+
+// Function type for a raw_logging customization hook for suppressing messages
+// by severity, and for writing custom prefixes on non-suppressed messages.
+//
+// The installed hook is called for every raw log invocation.  The message will
+// be logged to stderr only if the hook returns true.  FATAL errors will cause
+// the process to abort, even if writing to stderr is suppressed.  The hook is
+// also provided with an output buffer, where it can write a custom log message
+// prefix.
+//
+// The raw_logging system does not allocate memory or grab locks.  User-provided
+// hooks must avoid these operations, and must not throw exceptions.
+//
+// 'severity' is the severity level of the message being written.
+// 'file' and 'line' are the file and line number where the ABSL_RAW_LOG macro
+// was located.
+// 'buffer' and 'buf_size' are pointers to the buffer and buffer size.  If the
+// hook writes a prefix, it must increment *buffer and decrement *buf_size
+// accordingly.
+using LogPrefixHook = bool (*)(absl::LogSeverity severity, const char* file,
+                               int line, char** buffer, int* buf_size);
+
+// Function type for a raw_logging customization hook called to abort a process
+// when a FATAL message is logged.  If the provided AbortHook() returns, the
+// logging system will call abort().
+//
+// 'file' and 'line' are the file and line number where the ABSL_RAW_LOG macro
+// was located.
+// The NUL-terminated logged message lives in the buffer between 'buf_start'
+// and 'buf_end'.  'prefix_end' points to the first non-prefix character of the
+// buffer (as written by the LogPrefixHook.)
+using AbortHook = void (*)(const char* file, int line, const char* buf_start,
+                           const char* prefix_end, const char* buf_end);
+
+// Internal logging function for ABSL_INTERNAL_LOG to dispatch to.
+//
+// TODO(gfalcon): When string_view no longer depends on base, change this
+// interface to take its message as a string_view instead.
+using InternalLogFunction = void (*)(absl::LogSeverity severity,
+                                     const char* file, int line,
+                                     const std::string& message);
+
+ABSL_INTERNAL_ATOMIC_HOOK_ATTRIBUTES ABSL_DLL extern base_internal::AtomicHook<
+    InternalLogFunction>
+    internal_log_function;
+
+// Registers hooks of the above types.  Only a single hook of each type may be
+// registered.  It is an error to call these functions multiple times with
+// different input arguments.
+//
+// These functions are safe to call at any point during initialization; they do
+// not block or malloc, and are async-signal safe.
+void RegisterLogPrefixHook(LogPrefixHook func);
+void RegisterAbortHook(AbortHook func);
+void RegisterInternalLogFunction(InternalLogFunction func);
+
+}  // namespace raw_logging_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_BASE_INTERNAL_RAW_LOGGING_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/throw_delegate.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/throw_delegate.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/throw_delegate.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/throw_delegate.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,212 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "absl/base/internal/throw_delegate.h"
+
+#include <cstdlib>
+#include <functional>
+#include <new>
+#include <stdexcept>
+
+#include "absl/base/config.h"
+#include "absl/base/internal/raw_logging.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace base_internal {
+
+// NOTE: The various STL exception throwing functions are placed within the
+// #ifdef blocks so the symbols aren't exposed on platforms that don't support
+// them, such as the Android NDK. For example, ANGLE fails to link when building
+// within AOSP without them, since the STL functions don't exist.
+namespace {
+#ifdef ABSL_HAVE_EXCEPTIONS
+template <typename T>
+[[noreturn]] void Throw(const T& error) {
+  throw error;
+}
+#endif
+}  // namespace
+
+void ThrowStdLogicError(const std::string& what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::logic_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg.c_str());
+  std::abort();
+#endif
+}
+void ThrowStdLogicError(const char* what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::logic_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg);
+  std::abort();
+#endif
+}
+void ThrowStdInvalidArgument(const std::string& what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::invalid_argument(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg.c_str());
+  std::abort();
+#endif
+}
+void ThrowStdInvalidArgument(const char* what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::invalid_argument(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg);
+  std::abort();
+#endif
+}
+
+void ThrowStdDomainError(const std::string& what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::domain_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg.c_str());
+  std::abort();
+#endif
+}
+void ThrowStdDomainError(const char* what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::domain_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg);
+  std::abort();
+#endif
+}
+
+void ThrowStdLengthError(const std::string& what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::length_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg.c_str());
+  std::abort();
+#endif
+}
+void ThrowStdLengthError(const char* what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::length_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg);
+  std::abort();
+#endif
+}
+
+void ThrowStdOutOfRange(const std::string& what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::out_of_range(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg.c_str());
+  std::abort();
+#endif
+}
+void ThrowStdOutOfRange(const char* what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::out_of_range(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg);
+  std::abort();
+#endif
+}
+
+void ThrowStdRuntimeError(const std::string& what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::runtime_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg.c_str());
+  std::abort();
+#endif
+}
+void ThrowStdRuntimeError(const char* what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::runtime_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg);
+  std::abort();
+#endif
+}
+
+void ThrowStdRangeError(const std::string& what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::range_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg.c_str());
+  std::abort();
+#endif
+}
+void ThrowStdRangeError(const char* what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::range_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg);
+  std::abort();
+#endif
+}
+
+void ThrowStdOverflowError(const std::string& what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::overflow_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg.c_str());
+  std::abort();
+#endif
+}
+void ThrowStdOverflowError(const char* what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::overflow_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg);
+  std::abort();
+#endif
+}
+
+void ThrowStdUnderflowError(const std::string& what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::underflow_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg.c_str());
+  std::abort();
+#endif
+}
+void ThrowStdUnderflowError(const char* what_arg) {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::underflow_error(what_arg));
+#else
+  ABSL_RAW_LOG(FATAL, "%s", what_arg);
+  std::abort();
+#endif
+}
+
+void ThrowStdBadFunctionCall() {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::bad_function_call());
+#else
+  std::abort();
+#endif
+}
+
+void ThrowStdBadAlloc() {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  Throw(std::bad_alloc());
+#else
+  std::abort();
+#endif
+}
+
+}  // namespace base_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/throw_delegate.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/throw_delegate.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/throw_delegate.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/internal/throw_delegate.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,75 @@
+//
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#ifndef ABSL_BASE_INTERNAL_THROW_DELEGATE_H_
+#define ABSL_BASE_INTERNAL_THROW_DELEGATE_H_
+
+#include <string>
+
+#include "absl/base/config.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace base_internal {
+
+// Helper functions that allow throwing exceptions consistently from anywhere.
+// The main use case is for header-based libraries (eg templates), as they will
+// be built by many different targets with their own compiler options.
+// In particular, this will allow a safe way to throw exceptions even if the
+// caller is compiled with -fno-exceptions.  This is intended for implementing
+// things like map<>::at(), which the standard documents as throwing an
+// exception on error.
+//
+// Using other techniques like #if tricks could lead to ODR violations.
+//
+// You shouldn't use it unless you're writing code that you know will be built
+// both with and without exceptions and you need to conform to an interface
+// that uses exceptions.
+
+[[noreturn]] void ThrowStdLogicError(const std::string& what_arg);
+[[noreturn]] void ThrowStdLogicError(const char* what_arg);
+[[noreturn]] void ThrowStdInvalidArgument(const std::string& what_arg);
+[[noreturn]] void ThrowStdInvalidArgument(const char* what_arg);
+[[noreturn]] void ThrowStdDomainError(const std::string& what_arg);
+[[noreturn]] void ThrowStdDomainError(const char* what_arg);
+[[noreturn]] void ThrowStdLengthError(const std::string& what_arg);
+[[noreturn]] void ThrowStdLengthError(const char* what_arg);
+[[noreturn]] void ThrowStdOutOfRange(const std::string& what_arg);
+[[noreturn]] void ThrowStdOutOfRange(const char* what_arg);
+[[noreturn]] void ThrowStdRuntimeError(const std::string& what_arg);
+[[noreturn]] void ThrowStdRuntimeError(const char* what_arg);
+[[noreturn]] void ThrowStdRangeError(const std::string& what_arg);
+[[noreturn]] void ThrowStdRangeError(const char* what_arg);
+[[noreturn]] void ThrowStdOverflowError(const std::string& what_arg);
+[[noreturn]] void ThrowStdOverflowError(const char* what_arg);
+[[noreturn]] void ThrowStdUnderflowError(const std::string& what_arg);
+[[noreturn]] void ThrowStdUnderflowError(const char* what_arg);
+
+[[noreturn]] void ThrowStdBadFunctionCall();
+[[noreturn]] void ThrowStdBadAlloc();
+
+// ThrowStdBadArrayNewLength() cannot be consistently supported because
+// std::bad_array_new_length is missing in libstdc++ until 4.9.0.
+// https://gcc.gnu.org/onlinedocs/gcc-4.8.3/libstdc++/api/a01379_source.html
+// https://gcc.gnu.org/onlinedocs/gcc-4.9.0/libstdc++/api/a01327_source.html
+// libcxx (as of 3.2) and msvc (as of 2015) both have it.
+// [[noreturn]] void ThrowStdBadArrayNewLength();
+
+}  // namespace base_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_BASE_INTERNAL_THROW_DELEGATE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/log_severity.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/log_severity.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/log_severity.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/log_severity.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,27 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "absl/base/log_severity.h"
+
+#include <ostream>
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+std::ostream& operator<<(std::ostream& os, absl::LogSeverity s) {
+  if (s == absl::NormalizeLogSeverity(s)) return os << absl::LogSeverityName(s);
+  return os << "absl::LogSeverity(" << static_cast<int>(s) << ")";
+}
+ABSL_NAMESPACE_END
+}  // namespace absl
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/log_severity.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/log_severity.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/log_severity.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/log_severity.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,121 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef ABSL_BASE_LOG_SEVERITY_H_
+#define ABSL_BASE_LOG_SEVERITY_H_
+
+#include <array>
+#include <ostream>
+
+#include "absl/base/attributes.h"
+#include "absl/base/config.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+// absl::LogSeverity
+//
+// Four severity levels are defined. Logging APIs should terminate the program
+// when a message is logged at severity `kFatal`; the other levels have no
+// special semantics.
+//
+// Values other than the four defined levels (e.g. produced by `static_cast`)
+// are valid, but their semantics when passed to a function, macro, or flag
+// depend on the function, macro, or flag. The usual behavior is to normalize
+// such values to a defined severity level, however in some cases values other
+// than the defined levels are useful for comparison.
+//
+// Example:
+//
+//   // Effectively disables all logging:
+//   SetMinLogLevel(static_cast<absl::LogSeverity>(100));
+//
+// Abseil flags may be defined with type `LogSeverity`. Dependency layering
+// constraints require that the `AbslParseFlag()` overload be declared and
+// defined in the flags library itself rather than here. The `AbslUnparseFlag()`
+// overload is defined there as well for consistency.
+//
+// absl::LogSeverity Flag String Representation
+//
+// An `absl::LogSeverity` has a string representation used for parsing
+// command-line flags based on the enumerator name (e.g. `kFatal`) or
+// its unprefixed name (without the `k`) in any case-insensitive form. (E.g.
+// "FATAL", "fatal" or "Fatal" are all valid.) Unparsing such flags produces an
+// unprefixed string representation in all caps (e.g. "FATAL") or an integer.
+//
+// Additionally, the parser accepts arbitrary integers (as if the type were
+// `int`).
+//
+// Examples:
+//
+//   --my_log_level=kInfo
+//   --my_log_level=INFO
+//   --my_log_level=info
+//   --my_log_level=0
+//
+// Unparsing a flag produces the same result as `absl::LogSeverityName()` for
+// the standard levels and a base-ten integer otherwise.
+enum class LogSeverity : int {
+  kInfo = 0,
+  kWarning = 1,
+  kError = 2,
+  kFatal = 3,
+};
+
+// LogSeverities()
+//
+// Returns an iterable of all standard `absl::LogSeverity` values, ordered from
+// least to most severe.
+constexpr std::array<absl::LogSeverity, 4> LogSeverities() {
+  return {{absl::LogSeverity::kInfo, absl::LogSeverity::kWarning,
+           absl::LogSeverity::kError, absl::LogSeverity::kFatal}};
+}
+
+// LogSeverityName()
+//
+// Returns the all-caps string representation (e.g. "INFO") of the specified
+// severity level if it is one of the standard levels and "UNKNOWN" otherwise.
+constexpr const char* LogSeverityName(absl::LogSeverity s) {
+  return s == absl::LogSeverity::kInfo
+             ? "INFO"
+             : s == absl::LogSeverity::kWarning
+                   ? "WARNING"
+                   : s == absl::LogSeverity::kError
+                         ? "ERROR"
+                         : s == absl::LogSeverity::kFatal ? "FATAL" : "UNKNOWN";
+}
+
+// NormalizeLogSeverity()
+//
+// Values less than `kInfo` normalize to `kInfo`; values greater than `kFatal`
+// normalize to `kError` (**NOT** `kFatal`).
+constexpr absl::LogSeverity NormalizeLogSeverity(absl::LogSeverity s) {
+  return s < absl::LogSeverity::kInfo
+             ? absl::LogSeverity::kInfo
+             : s > absl::LogSeverity::kFatal ? absl::LogSeverity::kError : s;
+}
+constexpr absl::LogSeverity NormalizeLogSeverity(int s) {
+  return absl::NormalizeLogSeverity(static_cast<absl::LogSeverity>(s));
+}
+
+// operator<<
+//
+// The exact representation of a streamed `absl::LogSeverity` is deliberately
+// unspecified; do not rely on it.
+std::ostream& operator<<(std::ostream& os, absl::LogSeverity s);
+
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_BASE_LOG_SEVERITY_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/macros.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/macros.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/macros.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/macros.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,158 @@
+//
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// -----------------------------------------------------------------------------
+// File: macros.h
+// -----------------------------------------------------------------------------
+//
+// This header file defines the set of language macros used within Abseil code.
+// For the set of macros used to determine supported compilers and platforms,
+// see absl/base/config.h instead.
+//
+// This code is compiled directly on many platforms, including client
+// platforms like Windows, Mac, and embedded systems.  Before making
+// any changes here, make sure that you're not breaking any platforms.
+
+#ifndef ABSL_BASE_MACROS_H_
+#define ABSL_BASE_MACROS_H_
+
+#include <cassert>
+#include <cstddef>
+
+#include "absl/base/attributes.h"
+#include "absl/base/config.h"
+#include "absl/base/optimization.h"
+#include "absl/base/port.h"
+
+// ABSL_ARRAYSIZE()
+//
+// Returns the number of elements in an array as a compile-time constant, which
+// can be used in defining new arrays. If you use this macro on a pointer by
+// mistake, you will get a compile-time error.
+#define ABSL_ARRAYSIZE(array) \
+  (sizeof(::absl::macros_internal::ArraySizeHelper(array)))
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+namespace macros_internal {
+// Note: this internal template function declaration is used by ABSL_ARRAYSIZE.
+// The function doesn't need a definition, as we only use its type.
+template <typename T, size_t N>
+auto ArraySizeHelper(const T (&array)[N]) -> char (&)[N];
+}  // namespace macros_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+// ABSL_BAD_CALL_IF()
+//
+// Used on a function overload to trap bad calls: any call that matches the
+// overload will cause a compile-time error. This macro uses a clang-specific
+// "enable_if" attribute, as described at
+// https://clang.llvm.org/docs/AttributeReference.html#enable-if
+//
+// Overloads which use this macro should be bracketed by
+// `#ifdef ABSL_BAD_CALL_IF`.
+//
+// Example:
+//
+//   int isdigit(int c);
+//   #ifdef ABSL_BAD_CALL_IF
+//   int isdigit(int c)
+//     ABSL_BAD_CALL_IF(c <= -1 || c > 255,
+//                       "'c' must have the value of an unsigned char or EOF");
+//   #endif // ABSL_BAD_CALL_IF
+#if ABSL_HAVE_ATTRIBUTE(enable_if)
+#define ABSL_BAD_CALL_IF(expr, msg) \
+  __attribute__((enable_if(expr, "Bad call trap"), unavailable(msg)))
+#endif
+
+// ABSL_ASSERT()
+//
+// In C++11, `assert` can't be used portably within constexpr functions.
+// ABSL_ASSERT functions as a runtime assert but works in C++11 constexpr
+// functions.  Example:
+//
+// constexpr double Divide(double a, double b) {
+//   return ABSL_ASSERT(b != 0), a / b;
+// }
+//
+// This macro is inspired by
+// https://akrzemi1.wordpress.com/2017/05/18/asserts-in-constexpr-functions/
+#if defined(NDEBUG)
+#define ABSL_ASSERT(expr) \
+  (false ? static_cast<void>(expr) : static_cast<void>(0))
+#else
+#define ABSL_ASSERT(expr)                           \
+  (ABSL_PREDICT_TRUE((expr)) ? static_cast<void>(0) \
+                             : [] { assert(false && #expr); }())  // NOLINT
+#endif
+
+// `ABSL_INTERNAL_HARDENING_ABORT()` controls how `ABSL_HARDENING_ASSERT()`
+// aborts the program in release mode (when NDEBUG is defined). The
+// implementation should abort the program as quickly as possible and ideally it
+// should not be possible to ignore the abort request.
+#if (ABSL_HAVE_BUILTIN(__builtin_trap) &&         \
+     ABSL_HAVE_BUILTIN(__builtin_unreachable)) || \
+    (defined(__GNUC__) && !defined(__clang__))
+#define ABSL_INTERNAL_HARDENING_ABORT() \
+  do {                                  \
+    __builtin_trap();                   \
+    __builtin_unreachable();            \
+  } while (false)
+#else
+#define ABSL_INTERNAL_HARDENING_ABORT() abort()
+#endif
+
+// ABSL_HARDENING_ASSERT()
+//
+// `ABSL_HARDENING_ASSERT()` is like `ABSL_ASSERT()`, but used to implement
+// runtime assertions that should be enabled in hardened builds even when
+// `NDEBUG` is defined.
+//
+// When `NDEBUG` is not defined, `ABSL_HARDENING_ASSERT()` is identical to
+// `ABSL_ASSERT()`.
+//
+// See `ABSL_OPTION_HARDENED` in `absl/base/options.h` for more information on
+// hardened mode.
+#if ABSL_OPTION_HARDENED == 1 && defined(NDEBUG)
+#define ABSL_HARDENING_ASSERT(expr)                 \
+  (ABSL_PREDICT_TRUE((expr)) ? static_cast<void>(0) \
+                             : [] { ABSL_INTERNAL_HARDENING_ABORT(); }())
+#else
+#define ABSL_HARDENING_ASSERT(expr) ABSL_ASSERT(expr)
+#endif
+
+#ifdef ABSL_HAVE_EXCEPTIONS
+#define ABSL_INTERNAL_TRY try
+#define ABSL_INTERNAL_CATCH_ANY catch (...)
+#define ABSL_INTERNAL_RETHROW do { throw; } while (false)
+#else  // ABSL_HAVE_EXCEPTIONS
+#define ABSL_INTERNAL_TRY if (true)
+#define ABSL_INTERNAL_CATCH_ANY else if (false)
+#define ABSL_INTERNAL_RETHROW do {} while (false)
+#endif  // ABSL_HAVE_EXCEPTIONS
+
+// `ABSL_INTERNAL_UNREACHABLE` is an unreachable statement.  A program which
+// reaches one has undefined behavior, and the compiler may optimize
+// accordingly.
+#if defined(__GNUC__) || ABSL_HAVE_BUILTIN(__builtin_unreachable)
+#define ABSL_INTERNAL_UNREACHABLE __builtin_unreachable()
+#elif defined(_MSC_VER)
+#define ABSL_INTERNAL_UNREACHABLE __assume(0)
+#else
+#define ABSL_INTERNAL_UNREACHABLE
+#endif
+
+#endif  // ABSL_BASE_MACROS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/optimization.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/optimization.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/optimization.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/optimization.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,244 @@
+//
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// -----------------------------------------------------------------------------
+// File: optimization.h
+// -----------------------------------------------------------------------------
+//
+// This header file defines portable macros for performance optimization.
+
+#ifndef ABSL_BASE_OPTIMIZATION_H_
+#define ABSL_BASE_OPTIMIZATION_H_
+
+#include <assert.h>
+
+#include "absl/base/config.h"
+
+// ABSL_BLOCK_TAIL_CALL_OPTIMIZATION
+//
+// Instructs the compiler to avoid optimizing tail-call recursion. This macro is
+// useful when you wish to preserve the existing function order within a stack
+// trace for logging, debugging, or profiling purposes.
+//
+// Example:
+//
+//   int f() {
+//     int result = g();
+//     ABSL_BLOCK_TAIL_CALL_OPTIMIZATION();
+//     return result;
+//   }
+#if defined(__pnacl__)
+#define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() if (volatile int x = 0) { (void)x; }
+#elif defined(__clang__)
+// Clang will not tail call given inline volatile assembly.
+#define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __asm__ __volatile__("")
+#elif defined(__GNUC__)
+// GCC will not tail call given inline volatile assembly.
+#define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __asm__ __volatile__("")
+#elif defined(_MSC_VER)
+#include <intrin.h>
+// The __nop() intrinsic blocks the optimisation.
+#define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() __nop()
+#else
+#define ABSL_BLOCK_TAIL_CALL_OPTIMIZATION() if (volatile int x = 0) { (void)x; }
+#endif
+
+// ABSL_CACHELINE_SIZE
+//
+// Explicitly defines the size of the L1 cache for purposes of alignment.
+// Setting the cacheline size allows you to specify that certain objects be
+// aligned on a cacheline boundary with `ABSL_CACHELINE_ALIGNED` declarations.
+// (See below.)
+//
+// NOTE: this macro should be replaced with the following C++17 features, when
+// those are generally available:
+//
+//   * `std::hardware_constructive_interference_size`
+//   * `std::hardware_destructive_interference_size`
+//
+// See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0154r1.html
+// for more information.
+#if defined(__GNUC__)
+// Cache line alignment
+#if defined(__i386__) || defined(__x86_64__)
+#define ABSL_CACHELINE_SIZE 64
+#elif defined(__powerpc64__)
+#define ABSL_CACHELINE_SIZE 128
+#elif defined(__aarch64__)
+// We would need to read special register ctr_el0 to find out L1 dcache size.
+// This value is a good estimate based on a real aarch64 machine.
+#define ABSL_CACHELINE_SIZE 64
+#elif defined(__arm__)
+// Cache line sizes for ARM: These values are not strictly correct since
+// cache line sizes depend on implementations, not architectures.  There
+// are even implementations with cache line sizes configurable at boot
+// time.
+#if defined(__ARM_ARCH_5T__)
+#define ABSL_CACHELINE_SIZE 32
+#elif defined(__ARM_ARCH_7A__)
+#define ABSL_CACHELINE_SIZE 64
+#endif
+#endif
+
+#ifndef ABSL_CACHELINE_SIZE
+// A reasonable default guess.  Note that overestimates tend to waste more
+// space, while underestimates tend to waste more time.
+#define ABSL_CACHELINE_SIZE 64
+#endif
+
+// ABSL_CACHELINE_ALIGNED
+//
+// Indicates that the declared object be cache aligned using
+// `ABSL_CACHELINE_SIZE` (see above). Cacheline aligning objects allows you to
+// load a set of related objects in the L1 cache for performance improvements.
+// Cacheline aligning objects properly allows constructive memory sharing and
+// prevents destructive (or "false") memory sharing.
+//
+// NOTE: callers should replace uses of this macro with `alignas()` using
+// `std::hardware_constructive_interference_size` and/or
+// `std::hardware_destructive_interference_size` when C++17 becomes available to
+// them.
+//
+// See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0154r1.html
+// for more information.
+//
+// On some compilers, `ABSL_CACHELINE_ALIGNED` expands to an `__attribute__`
+// or `__declspec` attribute. For compilers where this is not known to work,
+// the macro expands to nothing.
+//
+// No further guarantees are made here. The result of applying the macro
+// to variables and types is always implementation-defined.
+//
+// WARNING: It is easy to use this attribute incorrectly, even to the point
+// of causing bugs that are difficult to diagnose, crash, etc. It does not
+// of itself guarantee that objects are aligned to a cache line.
+//
+// NOTE: Some compilers are picky about the locations of annotations such as
+// this attribute, so prefer to put it at the beginning of your declaration.
+// For example,
+//
+//   ABSL_CACHELINE_ALIGNED static Foo* foo = ...
+//
+//   class ABSL_CACHELINE_ALIGNED Bar { ...
+//
+// Recommendations:
+//
+// 1) Consult compiler documentation; this comment is not kept in sync as
+//    toolchains evolve.
+// 2) Verify your use has the intended effect. This often requires inspecting
+//    the generated machine code.
+// 3) Prefer applying this attribute to individual variables. Avoid
+//    applying it to types. This tends to localize the effect.
+#define ABSL_CACHELINE_ALIGNED __attribute__((aligned(ABSL_CACHELINE_SIZE)))
+#elif defined(_MSC_VER)
+#define ABSL_CACHELINE_SIZE 64
+#define ABSL_CACHELINE_ALIGNED __declspec(align(ABSL_CACHELINE_SIZE))
+#else
+#define ABSL_CACHELINE_SIZE 64
+#define ABSL_CACHELINE_ALIGNED
+#endif
+
+// ABSL_PREDICT_TRUE, ABSL_PREDICT_FALSE
+//
+// Enables the compiler to prioritize compilation using static analysis for
+// likely paths within a boolean branch.
+//
+// Example:
+//
+//   if (ABSL_PREDICT_TRUE(expression)) {
+//     return result;                        // Faster if more likely
+//   } else {
+//     return 0;
+//   }
+//
+// Compilers can use the information that a certain branch is not likely to be
+// taken (for instance, a CHECK failure) to optimize for the common case in
+// the absence of better information (ie. compiling gcc with `-fprofile-arcs`).
+//
+// Recommendation: Modern CPUs dynamically predict branch execution paths,
+// typically with accuracy greater than 97%. As a result, annotating every
+// branch in a codebase is likely counterproductive; however, annotating
+// specific branches that are both hot and consistently mispredicted is likely
+// to yield performance improvements.
+#if ABSL_HAVE_BUILTIN(__builtin_expect) || \
+    (defined(__GNUC__) && !defined(__clang__))
+#define ABSL_PREDICT_FALSE(x) (__builtin_expect(false || (x), false))
+#define ABSL_PREDICT_TRUE(x) (__builtin_expect(false || (x), true))
+#else
+#define ABSL_PREDICT_FALSE(x) (x)
+#define ABSL_PREDICT_TRUE(x) (x)
+#endif
+
+// ABSL_INTERNAL_ASSUME(cond)
+// Informs the compiler that a condition is always true and that it can assume
+// it to be true for optimization purposes. The call has undefined behavior if
+// the condition is false.
+// In !NDEBUG mode, the condition is checked with an assert().
+// NOTE: The expression must not have side effects, as it will only be evaluated
+// in some compilation modes and not others.
+//
+// Example:
+//
+//   int x = ...;
+//   ABSL_INTERNAL_ASSUME(x >= 0);
+//   // The compiler can optimize the division to a simple right shift using the
+//   // assumption specified above.
+//   int y = x / 16;
+//
+#if !defined(NDEBUG)
+#define ABSL_INTERNAL_ASSUME(cond) assert(cond)
+#elif ABSL_HAVE_BUILTIN(__builtin_assume)
+#define ABSL_INTERNAL_ASSUME(cond) __builtin_assume(cond)
+#elif defined(__GNUC__) || ABSL_HAVE_BUILTIN(__builtin_unreachable)
+#define ABSL_INTERNAL_ASSUME(cond)        \
+  do {                                    \
+    if (!(cond)) __builtin_unreachable(); \
+  } while (0)
+#elif defined(_MSC_VER)
+#define ABSL_INTERNAL_ASSUME(cond) __assume(cond)
+#else
+#define ABSL_INTERNAL_ASSUME(cond)      \
+  do {                                  \
+    static_cast<void>(false && (cond)); \
+  } while (0)
+#endif
+
+// ABSL_INTERNAL_UNIQUE_SMALL_NAME(cond)
+// This macro forces small unique name on a static file level symbols like
+// static local variables or static functions. This is intended to be used in
+// macro definitions to optimize the cost of generated code. Do NOT use it on
+// symbols exported from translation unit since it may cause a link time
+// conflict.
+//
+// Example:
+//
+// #define MY_MACRO(txt)
+// namespace {
+//  char VeryVeryLongVarName[] ABSL_INTERNAL_UNIQUE_SMALL_NAME() = txt;
+//  const char* VeryVeryLongFuncName() ABSL_INTERNAL_UNIQUE_SMALL_NAME();
+//  const char* VeryVeryLongFuncName() { return txt; }
+// }
+//
+
+#if defined(__GNUC__)
+#define ABSL_INTERNAL_UNIQUE_SMALL_NAME2(x) #x
+#define ABSL_INTERNAL_UNIQUE_SMALL_NAME1(x) ABSL_INTERNAL_UNIQUE_SMALL_NAME2(x)
+#define ABSL_INTERNAL_UNIQUE_SMALL_NAME() \
+  asm(ABSL_INTERNAL_UNIQUE_SMALL_NAME1(.absl.__COUNTER__))
+#else
+#define ABSL_INTERNAL_UNIQUE_SMALL_NAME()
+#endif
+
+#endif  // ABSL_BASE_OPTIMIZATION_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/options.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/options.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/options.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/options.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,238 @@
+// Copyright 2019 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// -----------------------------------------------------------------------------
+// File: options.h
+// -----------------------------------------------------------------------------
+//
+// This file contains Abseil configuration options for setting specific
+// implementations instead of letting Abseil determine which implementation to
+// use at compile-time. Setting these options may be useful for package or build
+// managers who wish to guarantee ABI stability within binary builds (which are
+// otherwise difficult to enforce).
+//
+// *** IMPORTANT NOTICE FOR PACKAGE MANAGERS:  It is important that
+// maintainers of package managers who wish to package Abseil read and
+// understand this file! ***
+//
+// Abseil contains a number of possible configuration endpoints, based on
+// parameters such as the detected platform, language version, or command-line
+// flags used to invoke the underlying binary. As is the case with all
+// libraries, binaries which contain Abseil code must ensure that separate
+// packages use the same compiled copy of Abseil to avoid a diamond dependency
+// problem, which can occur if two packages built with different Abseil
+// configuration settings are linked together. Diamond dependency problems in
+// C++ may manifest as violations to the One Definition Rule (ODR) (resulting in
+// linker errors), or undefined behavior (resulting in crashes).
+//
+// Diamond dependency problems can be avoided if all packages utilize the same
+// exact version of Abseil. Building from source code with the same compilation
+// parameters is the easiest way to avoid such dependency problems. However, for
+// package managers who cannot control such compilation parameters, we are
+// providing the file to allow you to inject ABI (Application Binary Interface)
+// stability across builds. Settings options in this file will neither change
+// API nor ABI, providing a stable copy of Abseil between packages.
+//
+// Care must be taken to keep options within these configurations isolated
+// from any other dynamic settings, such as command-line flags which could alter
+// these options. This file is provided specifically to help build and package
+// managers provide a stable copy of Abseil within their libraries and binaries;
+// other developers should not have need to alter the contents of this file.
+//
+// -----------------------------------------------------------------------------
+// Usage
+// -----------------------------------------------------------------------------
+//
+// For any particular package release, set the appropriate definitions within
+// this file to whatever value makes the most sense for your package(s). Note
+// that, by default, most of these options, at the moment, affect the
+// implementation of types; future options may affect other implementation
+// details.
+//
+// NOTE: the defaults within this file all assume that Abseil can select the
+// proper Abseil implementation at compile-time, which will not be sufficient
+// to guarantee ABI stability to package managers.
+
+#ifndef ABSL_BASE_OPTIONS_H_
+#define ABSL_BASE_OPTIONS_H_
+
+// Include a standard library header to allow configuration based on the
+// standard library in use.
+#ifdef __cplusplus
+#include <ciso646>
+#endif
+
+// -----------------------------------------------------------------------------
+// Type Compatibility Options
+// -----------------------------------------------------------------------------
+//
+// ABSL_OPTION_USE_STD_ANY
+//
+// This option controls whether absl::any is implemented as an alias to
+// std::any, or as an independent implementation.
+//
+// A value of 0 means to use Abseil's implementation.  This requires only C++11
+// support, and is expected to work on every toolchain we support.
+//
+// A value of 1 means to use an alias to std::any.  This requires that all code
+// using Abseil is built in C++17 mode or later.
+//
+// A value of 2 means to detect the C++ version being used to compile Abseil,
+// and use an alias only if a working std::any is available.  This option is
+// useful when you are building your entire program, including all of its
+// dependencies, from source.  It should not be used otherwise -- for example,
+// if you are distributing Abseil in a binary package manager -- since in
+// mode 2, absl::any will name a different type, with a different mangled name
+// and binary layout, depending on the compiler flags passed by the end user.
+// For more info, see https://abseil.io/about/design/dropin-types.
+//
+// User code should not inspect this macro.  To check in the preprocessor if
+// absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY.
+
+#define ABSL_OPTION_USE_STD_ANY 2
+
+
+// ABSL_OPTION_USE_STD_OPTIONAL
+//
+// This option controls whether absl::optional is implemented as an alias to
+// std::optional, or as an independent implementation.
+//
+// A value of 0 means to use Abseil's implementation.  This requires only C++11
+// support, and is expected to work on every toolchain we support.
+//
+// A value of 1 means to use an alias to std::optional.  This requires that all
+// code using Abseil is built in C++17 mode or later.
+//
+// A value of 2 means to detect the C++ version being used to compile Abseil,
+// and use an alias only if a working std::optional is available.  This option
+// is useful when you are building your program from source.  It should not be
+// used otherwise -- for example, if you are distributing Abseil in a binary
+// package manager -- since in mode 2, absl::optional will name a different
+// type, with a different mangled name and binary layout, depending on the
+// compiler flags passed by the end user.  For more info, see
+// https://abseil.io/about/design/dropin-types.
+
+// User code should not inspect this macro.  To check in the preprocessor if
+// absl::optional is a typedef of std::optional, use the feature macro
+// ABSL_USES_STD_OPTIONAL.
+
+#define ABSL_OPTION_USE_STD_OPTIONAL 2
+
+
+// ABSL_OPTION_USE_STD_STRING_VIEW
+//
+// This option controls whether absl::string_view is implemented as an alias to
+// std::string_view, or as an independent implementation.
+//
+// A value of 0 means to use Abseil's implementation.  This requires only C++11
+// support, and is expected to work on every toolchain we support.
+//
+// A value of 1 means to use an alias to std::string_view.  This requires that
+// all code using Abseil is built in C++17 mode or later.
+//
+// A value of 2 means to detect the C++ version being used to compile Abseil,
+// and use an alias only if a working std::string_view is available.  This
+// option is useful when you are building your program from source.  It should
+// not be used otherwise -- for example, if you are distributing Abseil in a
+// binary package manager -- since in mode 2, absl::string_view will name a
+// different type, with a different mangled name and binary layout, depending on
+// the compiler flags passed by the end user.  For more info, see
+// https://abseil.io/about/design/dropin-types.
+//
+// User code should not inspect this macro.  To check in the preprocessor if
+// absl::string_view is a typedef of std::string_view, use the feature macro
+// ABSL_USES_STD_STRING_VIEW.
+
+#define ABSL_OPTION_USE_STD_STRING_VIEW 2
+
+// ABSL_OPTION_USE_STD_VARIANT
+//
+// This option controls whether absl::variant is implemented as an alias to
+// std::variant, or as an independent implementation.
+//
+// A value of 0 means to use Abseil's implementation.  This requires only C++11
+// support, and is expected to work on every toolchain we support.
+//
+// A value of 1 means to use an alias to std::variant.  This requires that all
+// code using Abseil is built in C++17 mode or later.
+//
+// A value of 2 means to detect the C++ version being used to compile Abseil,
+// and use an alias only if a working std::variant is available.  This option
+// is useful when you are building your program from source.  It should not be
+// used otherwise -- for example, if you are distributing Abseil in a binary
+// package manager -- since in mode 2, absl::variant will name a different
+// type, with a different mangled name and binary layout, depending on the
+// compiler flags passed by the end user.  For more info, see
+// https://abseil.io/about/design/dropin-types.
+//
+// User code should not inspect this macro.  To check in the preprocessor if
+// absl::variant is a typedef of std::variant, use the feature macro
+// ABSL_USES_STD_VARIANT.
+
+#define ABSL_OPTION_USE_STD_VARIANT 2
+
+
+// ABSL_OPTION_USE_INLINE_NAMESPACE
+// ABSL_OPTION_INLINE_NAMESPACE_NAME
+//
+// These options controls whether all entities in the absl namespace are
+// contained within an inner inline namespace.  This does not affect the
+// user-visible API of Abseil, but it changes the mangled names of all symbols.
+//
+// This can be useful as a version tag if you are distributing Abseil in
+// precompiled form.  This will prevent a binary library build of Abseil with
+// one inline namespace being used with headers configured with a different
+// inline namespace name.  Binary packagers are reminded that Abseil does not
+// guarantee any ABI stability in Abseil, so any update of Abseil or
+// configuration change in such a binary package should be combined with a
+// new, unique value for the inline namespace name.
+//
+// A value of 0 means not to use inline namespaces.
+//
+// A value of 1 means to use an inline namespace with the given name inside
+// namespace absl.  If this is set, ABSL_OPTION_INLINE_NAMESPACE_NAME must also
+// be changed to a new, unique identifier name.  In particular "head" is not
+// allowed.
+
+#define ABSL_OPTION_USE_INLINE_NAMESPACE 0
+#define ABSL_OPTION_INLINE_NAMESPACE_NAME head
+
+// ABSL_OPTION_HARDENED
+//
+// This option enables a "hardened" build in release mode (in this context,
+// release mode is defined as a build where the `NDEBUG` macro is defined).
+//
+// A value of 0 means that "hardened" mode is not enabled.
+//
+// A value of 1 means that "hardened" mode is enabled.
+//
+// Hardened builds have additional security checks enabled when `NDEBUG` is
+// defined. Defining `NDEBUG` is normally used to turn `assert()` macro into a
+// no-op, as well as disabling other bespoke program consistency checks. By
+// defining ABSL_OPTION_HARDENED to 1, a select set of checks remain enabled in
+// release mode. These checks guard against programming errors that may lead to
+// security vulnerabilities. In release mode, when one of these programming
+// errors is encountered, the program will immediately abort, possibly without
+// any attempt at logging.
+//
+// The checks enabled by this option are not free; they do incur runtime cost.
+//
+// The checks enabled by this option are always active when `NDEBUG` is not
+// defined, even in the case when ABSL_OPTION_HARDENED is defined to 0. The
+// checks enabled by this option may abort the program in a different way and
+// log additional information when `NDEBUG` is not defined.
+
+#define ABSL_OPTION_HARDENED 0
+
+#endif  // ABSL_BASE_OPTIONS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/policy_checks.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/policy_checks.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/policy_checks.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/policy_checks.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,111 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// -----------------------------------------------------------------------------
+// File: policy_checks.h
+// -----------------------------------------------------------------------------
+//
+// This header enforces a minimum set of policies at build time, such as the
+// supported compiler and library versions. Unsupported configurations are
+// reported with `#error`. This enforcement is best effort, so successfully
+// compiling this header does not guarantee a supported configuration.
+
+#ifndef ABSL_BASE_POLICY_CHECKS_H_
+#define ABSL_BASE_POLICY_CHECKS_H_
+
+// Included for the __GLIBC_PREREQ macro used below.
+#include <limits.h>
+
+// Included for the _STLPORT_VERSION macro used below.
+#if defined(__cplusplus)
+#include <cstddef>
+#endif
+
+// -----------------------------------------------------------------------------
+// Operating System Check
+// -----------------------------------------------------------------------------
+
+#if defined(__CYGWIN__)
+#error "Cygwin is not supported."
+#endif
+
+// -----------------------------------------------------------------------------
+// Toolchain Check
+// -----------------------------------------------------------------------------
+
+// We support MSVC++ 14.0 update 2 and later.
+// This minimum will go up.
+#if defined(_MSC_FULL_VER) && _MSC_FULL_VER < 190023918 && !defined(__clang__)
+#error "This package requires Visual Studio 2015 Update 2 or higher."
+#endif
+
+// We support gcc 4.7 and later.
+// This minimum will go up.
+#if defined(__GNUC__) && !defined(__clang__)
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
+#error "This package requires gcc 4.7 or higher."
+#endif
+#endif
+
+// We support Apple Xcode clang 4.2.1 (version 421.11.65) and later.
+// This corresponds to Apple Xcode version 4.5.
+// This minimum will go up.
+#if defined(__apple_build_version__) && __apple_build_version__ < 4211165
+#error "This package requires __apple_build_version__ of 4211165 or higher."
+#endif
+
+// -----------------------------------------------------------------------------
+// C++ Version Check
+// -----------------------------------------------------------------------------
+
+// Enforce C++11 as the minimum.  Note that Visual Studio has not
+// advanced __cplusplus despite being good enough for our purposes, so
+// so we exempt it from the check.
+#if defined(__cplusplus) && !defined(_MSC_VER)
+#if __cplusplus < 201103L
+#error "C++ versions less than C++11 are not supported."
+#endif
+#endif
+
+// -----------------------------------------------------------------------------
+// Standard Library Check
+// -----------------------------------------------------------------------------
+
+#if defined(_STLPORT_VERSION)
+#error "STLPort is not supported."
+#endif
+
+// -----------------------------------------------------------------------------
+// `char` Size Check
+// -----------------------------------------------------------------------------
+
+// Abseil currently assumes CHAR_BIT == 8. If you would like to use Abseil on a
+// platform where this is not the case, please provide us with the details about
+// your platform so we can consider relaxing this requirement.
+#if CHAR_BIT != 8
+#error "Abseil assumes CHAR_BIT == 8."
+#endif
+
+// -----------------------------------------------------------------------------
+// `int` Size Check
+// -----------------------------------------------------------------------------
+
+// Abseil currently assumes that an int is 4 bytes. If you would like to use
+// Abseil on a platform where this is not the case, please provide us with the
+// details about your platform so we can consider relaxing this requirement.
+#if INT_MAX < 2147483647
+#error "Abseil assumes that int is at least 4 bytes. "
+#endif
+
+#endif  // ABSL_BASE_POLICY_CHECKS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/port.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/port.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/port.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/base/port.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,25 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// This files is a forwarding header for other headers containing various
+// portability macros and functions.
+
+#ifndef ABSL_BASE_PORT_H_
+#define ABSL_BASE_PORT_H_
+
+#include "absl/base/attributes.h"
+#include "absl/base/config.h"
+#include "absl/base/optimization.h"
+
+#endif  // ABSL_BASE_PORT_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/LICENSE asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/LICENSE
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/LICENSE	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/memory/memory.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/memory/memory.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/memory/memory.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/memory/memory.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,699 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// -----------------------------------------------------------------------------
+// File: memory.h
+// -----------------------------------------------------------------------------
+//
+// This header file contains utility functions for managing the creation and
+// conversion of smart pointers. This file is an extension to the C++
+// standard <memory> library header file.
+
+#ifndef ABSL_MEMORY_MEMORY_H_
+#define ABSL_MEMORY_MEMORY_H_
+
+#include <cstddef>
+#include <limits>
+#include <memory>
+#include <new>
+#include <type_traits>
+#include <utility>
+
+#include "absl/base/macros.h"
+#include "absl/meta/type_traits.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+// -----------------------------------------------------------------------------
+// Function Template: WrapUnique()
+// -----------------------------------------------------------------------------
+//
+// Adopts ownership from a raw pointer and transfers it to the returned
+// `std::unique_ptr`, whose type is deduced. Because of this deduction, *do not*
+// specify the template type `T` when calling `WrapUnique`.
+//
+// Example:
+//   X* NewX(int, int);
+//   auto x = WrapUnique(NewX(1, 2));  // 'x' is std::unique_ptr<X>.
+//
+// Do not call WrapUnique with an explicit type, as in
+// `WrapUnique<X>(NewX(1, 2))`.  The purpose of WrapUnique is to automatically
+// deduce the pointer type. If you wish to make the type explicit, just use
+// `std::unique_ptr` directly.
+//
+//   auto x = std::unique_ptr<X>(NewX(1, 2));
+//                  - or -
+//   std::unique_ptr<X> x(NewX(1, 2));
+//
+// While `absl::WrapUnique` is useful for capturing the output of a raw
+// pointer factory, prefer 'absl::make_unique<T>(args...)' over
+// 'absl::WrapUnique(new T(args...))'.
+//
+//   auto x = WrapUnique(new X(1, 2));  // works, but nonideal.
+//   auto x = make_unique<X>(1, 2);     // safer, standard, avoids raw 'new'.
+//
+// Note that `absl::WrapUnique(p)` is valid only if `delete p` is a valid
+// expression. In particular, `absl::WrapUnique()` cannot wrap pointers to
+// arrays, functions or void, and it must not be used to capture pointers
+// obtained from array-new expressions (even though that would compile!).
+template <typename T>
+std::unique_ptr<T> WrapUnique(T* ptr) {
+  static_assert(!std::is_array<T>::value, "array types are unsupported");
+  static_assert(std::is_object<T>::value, "non-object types are unsupported");
+  return std::unique_ptr<T>(ptr);
+}
+
+namespace memory_internal {
+
+// Traits to select proper overload and return type for `absl::make_unique<>`.
+template <typename T>
+struct MakeUniqueResult {
+  using scalar = std::unique_ptr<T>;
+};
+template <typename T>
+struct MakeUniqueResult<T[]> {
+  using array = std::unique_ptr<T[]>;
+};
+template <typename T, size_t N>
+struct MakeUniqueResult<T[N]> {
+  using invalid = void;
+};
+
+}  // namespace memory_internal
+
+// gcc 4.8 has __cplusplus at 201301 but the libstdc++ shipped with it doesn't
+// define make_unique.  Other supported compilers either just define __cplusplus
+// as 201103 but have make_unique (msvc), or have make_unique whenever
+// __cplusplus > 201103 (clang).
+#if (__cplusplus > 201103L || defined(_MSC_VER)) && \
+    !(defined(__GLIBCXX__) && !defined(__cpp_lib_make_unique))
+using std::make_unique;
+#else
+// -----------------------------------------------------------------------------
+// Function Template: make_unique<T>()
+// -----------------------------------------------------------------------------
+//
+// Creates a `std::unique_ptr<>`, while avoiding issues creating temporaries
+// during the construction process. `absl::make_unique<>` also avoids redundant
+// type declarations, by avoiding the need to explicitly use the `new` operator.
+//
+// This implementation of `absl::make_unique<>` is designed for C++11 code and
+// will be replaced in C++14 by the equivalent `std::make_unique<>` abstraction.
+// `absl::make_unique<>` is designed to be 100% compatible with
+// `std::make_unique<>` so that the eventual migration will involve a simple
+// rename operation.
+//
+// For more background on why `std::unique_ptr<T>(new T(a,b))` is problematic,
+// see Herb Sutter's explanation on
+// (Exception-Safe Function Calls)[https://herbsutter.com/gotw/_102/].
+// (In general, reviewers should treat `new T(a,b)` with scrutiny.)
+//
+// Example usage:
+//
+//    auto p = make_unique<X>(args...);  // 'p'  is a std::unique_ptr<X>
+//    auto pa = make_unique<X[]>(5);     // 'pa' is a std::unique_ptr<X[]>
+//
+// Three overloads of `absl::make_unique` are required:
+//
+//   - For non-array T:
+//
+//       Allocates a T with `new T(std::forward<Args> args...)`,
+//       forwarding all `args` to T's constructor.
+//       Returns a `std::unique_ptr<T>` owning that object.
+//
+//   - For an array of unknown bounds T[]:
+//
+//       `absl::make_unique<>` will allocate an array T of type U[] with
+//       `new U[n]()` and return a `std::unique_ptr<U[]>` owning that array.
+//
+//       Note that 'U[n]()' is different from 'U[n]', and elements will be
+//       value-initialized. Note as well that `std::unique_ptr` will perform its
+//       own destruction of the array elements upon leaving scope, even though
+//       the array [] does not have a default destructor.
+//
+//       NOTE: an array of unknown bounds T[] may still be (and often will be)
+//       initialized to have a size, and will still use this overload. E.g:
+//
+//         auto my_array = absl::make_unique<int[]>(10);
+//
+//   - For an array of known bounds T[N]:
+//
+//       `absl::make_unique<>` is deleted (like with `std::make_unique<>`) as
+//       this overload is not useful.
+//
+//       NOTE: an array of known bounds T[N] is not considered a useful
+//       construction, and may cause undefined behavior in templates. E.g:
+//
+//         auto my_array = absl::make_unique<int[10]>();
+//
+//       In those cases, of course, you can still use the overload above and
+//       simply initialize it to its desired size:
+//
+//         auto my_array = absl::make_unique<int[]>(10);
+
+// `absl::make_unique` overload for non-array types.
+template <typename T, typename... Args>
+typename memory_internal::MakeUniqueResult<T>::scalar make_unique(
+    Args&&... args) {
+  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+}
+
+// `absl::make_unique` overload for an array T[] of unknown bounds.
+// The array allocation needs to use the `new T[size]` form and cannot take
+// element constructor arguments. The `std::unique_ptr` will manage destructing
+// these array elements.
+template <typename T>
+typename memory_internal::MakeUniqueResult<T>::array make_unique(size_t n) {
+  return std::unique_ptr<T>(new typename absl::remove_extent_t<T>[n]());
+}
+
+// `absl::make_unique` overload for an array T[N] of known bounds.
+// This construction will be rejected.
+template <typename T, typename... Args>
+typename memory_internal::MakeUniqueResult<T>::invalid make_unique(
+    Args&&... /* args */) = delete;
+#endif
+
+// -----------------------------------------------------------------------------
+// Function Template: RawPtr()
+// -----------------------------------------------------------------------------
+//
+// Extracts the raw pointer from a pointer-like value `ptr`. `absl::RawPtr` is
+// useful within templates that need to handle a complement of raw pointers,
+// `std::nullptr_t`, and smart pointers.
+template <typename T>
+auto RawPtr(T&& ptr) -> decltype(std::addressof(*ptr)) {
+  // ptr is a forwarding reference to support Ts with non-const operators.
+  return (ptr != nullptr) ? std::addressof(*ptr) : nullptr;
+}
+inline std::nullptr_t RawPtr(std::nullptr_t) { return nullptr; }
+
+// -----------------------------------------------------------------------------
+// Function Template: ShareUniquePtr()
+// -----------------------------------------------------------------------------
+//
+// Adopts a `std::unique_ptr` rvalue and returns a `std::shared_ptr` of deduced
+// type. Ownership (if any) of the held value is transferred to the returned
+// shared pointer.
+//
+// Example:
+//
+//     auto up = absl::make_unique<int>(10);
+//     auto sp = absl::ShareUniquePtr(std::move(up));  // shared_ptr<int>
+//     CHECK_EQ(*sp, 10);
+//     CHECK(up == nullptr);
+//
+// Note that this conversion is correct even when T is an array type, and more
+// generally it works for *any* deleter of the `unique_ptr` (single-object
+// deleter, array deleter, or any custom deleter), since the deleter is adopted
+// by the shared pointer as well. The deleter is copied (unless it is a
+// reference).
+//
+// Implements the resolution of [LWG 2415](http://wg21.link/lwg2415), by which a
+// null shared pointer does not attempt to call the deleter.
+template <typename T, typename D>
+std::shared_ptr<T> ShareUniquePtr(std::unique_ptr<T, D>&& ptr) {
+  return ptr ? std::shared_ptr<T>(std::move(ptr)) : std::shared_ptr<T>();
+}
+
+// -----------------------------------------------------------------------------
+// Function Template: WeakenPtr()
+// -----------------------------------------------------------------------------
+//
+// Creates a weak pointer associated with a given shared pointer. The returned
+// value is a `std::weak_ptr` of deduced type.
+//
+// Example:
+//
+//    auto sp = std::make_shared<int>(10);
+//    auto wp = absl::WeakenPtr(sp);
+//    CHECK_EQ(sp.get(), wp.lock().get());
+//    sp.reset();
+//    CHECK(wp.lock() == nullptr);
+//
+template <typename T>
+std::weak_ptr<T> WeakenPtr(const std::shared_ptr<T>& ptr) {
+  return std::weak_ptr<T>(ptr);
+}
+
+namespace memory_internal {
+
+// ExtractOr<E, O, D>::type evaluates to E<O> if possible. Otherwise, D.
+template <template <typename> class Extract, typename Obj, typename Default,
+          typename>
+struct ExtractOr {
+  using type = Default;
+};
+
+template <template <typename> class Extract, typename Obj, typename Default>
+struct ExtractOr<Extract, Obj, Default, void_t<Extract<Obj>>> {
+  using type = Extract<Obj>;
+};
+
+template <template <typename> class Extract, typename Obj, typename Default>
+using ExtractOrT = typename ExtractOr<Extract, Obj, Default, void>::type;
+
+// Extractors for the features of allocators.
+template <typename T>
+using GetPointer = typename T::pointer;
+
+template <typename T>
+using GetConstPointer = typename T::const_pointer;
+
+template <typename T>
+using GetVoidPointer = typename T::void_pointer;
+
+template <typename T>
+using GetConstVoidPointer = typename T::const_void_pointer;
+
+template <typename T>
+using GetDifferenceType = typename T::difference_type;
+
+template <typename T>
+using GetSizeType = typename T::size_type;
+
+template <typename T>
+using GetPropagateOnContainerCopyAssignment =
+    typename T::propagate_on_container_copy_assignment;
+
+template <typename T>
+using GetPropagateOnContainerMoveAssignment =
+    typename T::propagate_on_container_move_assignment;
+
+template <typename T>
+using GetPropagateOnContainerSwap = typename T::propagate_on_container_swap;
+
+template <typename T>
+using GetIsAlwaysEqual = typename T::is_always_equal;
+
+template <typename T>
+struct GetFirstArg;
+
+template <template <typename...> class Class, typename T, typename... Args>
+struct GetFirstArg<Class<T, Args...>> {
+  using type = T;
+};
+
+template <typename Ptr, typename = void>
+struct ElementType {
+  using type = typename GetFirstArg<Ptr>::type;
+};
+
+template <typename T>
+struct ElementType<T, void_t<typename T::element_type>> {
+  using type = typename T::element_type;
+};
+
+template <typename T, typename U>
+struct RebindFirstArg;
+
+template <template <typename...> class Class, typename T, typename... Args,
+          typename U>
+struct RebindFirstArg<Class<T, Args...>, U> {
+  using type = Class<U, Args...>;
+};
+
+template <typename T, typename U, typename = void>
+struct RebindPtr {
+  using type = typename RebindFirstArg<T, U>::type;
+};
+
+template <typename T, typename U>
+struct RebindPtr<T, U, void_t<typename T::template rebind<U>>> {
+  using type = typename T::template rebind<U>;
+};
+
+template <typename T, typename U>
+constexpr bool HasRebindAlloc(...) {
+  return false;
+}
+
+template <typename T, typename U>
+constexpr bool HasRebindAlloc(typename T::template rebind<U>::other*) {
+  return true;
+}
+
+template <typename T, typename U, bool = HasRebindAlloc<T, U>(nullptr)>
+struct RebindAlloc {
+  using type = typename RebindFirstArg<T, U>::type;
+};
+
+template <typename T, typename U>
+struct RebindAlloc<T, U, true> {
+  using type = typename T::template rebind<U>::other;
+};
+
+}  // namespace memory_internal
+
+// -----------------------------------------------------------------------------
+// Class Template: pointer_traits
+// -----------------------------------------------------------------------------
+//
+// An implementation of C++11's std::pointer_traits.
+//
+// Provided for portability on toolchains that have a working C++11 compiler,
+// but the standard library is lacking in C++11 support. For example, some
+// version of the Android NDK.
+//
+
+template <typename Ptr>
+struct pointer_traits {
+  using pointer = Ptr;
+
+  // element_type:
+  // Ptr::element_type if present. Otherwise T if Ptr is a template
+  // instantiation Template<T, Args...>
+  using element_type = typename memory_internal::ElementType<Ptr>::type;
+
+  // difference_type:
+  // Ptr::difference_type if present, otherwise std::ptrdiff_t
+  using difference_type =
+      memory_internal::ExtractOrT<memory_internal::GetDifferenceType, Ptr,
+                                  std::ptrdiff_t>;
+
+  // rebind:
+  // Ptr::rebind<U> if exists, otherwise Template<U, Args...> if Ptr is a
+  // template instantiation Template<T, Args...>
+  template <typename U>
+  using rebind = typename memory_internal::RebindPtr<Ptr, U>::type;
+
+  // pointer_to:
+  // Calls Ptr::pointer_to(r)
+  static pointer pointer_to(element_type& r) {  // NOLINT(runtime/references)
+    return Ptr::pointer_to(r);
+  }
+};
+
+// Specialization for T*.
+template <typename T>
+struct pointer_traits<T*> {
+  using pointer = T*;
+  using element_type = T;
+  using difference_type = std::ptrdiff_t;
+
+  template <typename U>
+  using rebind = U*;
+
+  // pointer_to:
+  // Calls std::addressof(r)
+  static pointer pointer_to(
+      element_type& r) noexcept {  // NOLINT(runtime/references)
+    return std::addressof(r);
+  }
+};
+
+// -----------------------------------------------------------------------------
+// Class Template: allocator_traits
+// -----------------------------------------------------------------------------
+//
+// A C++11 compatible implementation of C++17's std::allocator_traits.
+//
+#if __cplusplus >= 201703L
+using std::allocator_traits;
+#else  // __cplusplus >= 201703L
+template <typename Alloc>
+struct allocator_traits {
+  using allocator_type = Alloc;
+
+  // value_type:
+  // Alloc::value_type
+  using value_type = typename Alloc::value_type;
+
+  // pointer:
+  // Alloc::pointer if present, otherwise value_type*
+  using pointer = memory_internal::ExtractOrT<memory_internal::GetPointer,
+                                              Alloc, value_type*>;
+
+  // const_pointer:
+  // Alloc::const_pointer if present, otherwise
+  // absl::pointer_traits<pointer>::rebind<const value_type>
+  using const_pointer =
+      memory_internal::ExtractOrT<memory_internal::GetConstPointer, Alloc,
+                                  typename absl::pointer_traits<pointer>::
+                                      template rebind<const value_type>>;
+
+  // void_pointer:
+  // Alloc::void_pointer if present, otherwise
+  // absl::pointer_traits<pointer>::rebind<void>
+  using void_pointer = memory_internal::ExtractOrT<
+      memory_internal::GetVoidPointer, Alloc,
+      typename absl::pointer_traits<pointer>::template rebind<void>>;
+
+  // const_void_pointer:
+  // Alloc::const_void_pointer if present, otherwise
+  // absl::pointer_traits<pointer>::rebind<const void>
+  using const_void_pointer = memory_internal::ExtractOrT<
+      memory_internal::GetConstVoidPointer, Alloc,
+      typename absl::pointer_traits<pointer>::template rebind<const void>>;
+
+  // difference_type:
+  // Alloc::difference_type if present, otherwise
+  // absl::pointer_traits<pointer>::difference_type
+  using difference_type = memory_internal::ExtractOrT<
+      memory_internal::GetDifferenceType, Alloc,
+      typename absl::pointer_traits<pointer>::difference_type>;
+
+  // size_type:
+  // Alloc::size_type if present, otherwise
+  // std::make_unsigned<difference_type>::type
+  using size_type = memory_internal::ExtractOrT<
+      memory_internal::GetSizeType, Alloc,
+      typename std::make_unsigned<difference_type>::type>;
+
+  // propagate_on_container_copy_assignment:
+  // Alloc::propagate_on_container_copy_assignment if present, otherwise
+  // std::false_type
+  using propagate_on_container_copy_assignment = memory_internal::ExtractOrT<
+      memory_internal::GetPropagateOnContainerCopyAssignment, Alloc,
+      std::false_type>;
+
+  // propagate_on_container_move_assignment:
+  // Alloc::propagate_on_container_move_assignment if present, otherwise
+  // std::false_type
+  using propagate_on_container_move_assignment = memory_internal::ExtractOrT<
+      memory_internal::GetPropagateOnContainerMoveAssignment, Alloc,
+      std::false_type>;
+
+  // propagate_on_container_swap:
+  // Alloc::propagate_on_container_swap if present, otherwise std::false_type
+  using propagate_on_container_swap =
+      memory_internal::ExtractOrT<memory_internal::GetPropagateOnContainerSwap,
+                                  Alloc, std::false_type>;
+
+  // is_always_equal:
+  // Alloc::is_always_equal if present, otherwise std::is_empty<Alloc>::type
+  using is_always_equal =
+      memory_internal::ExtractOrT<memory_internal::GetIsAlwaysEqual, Alloc,
+                                  typename std::is_empty<Alloc>::type>;
+
+  // rebind_alloc:
+  // Alloc::rebind<T>::other if present, otherwise Alloc<T, Args> if this Alloc
+  // is Alloc<U, Args>
+  template <typename T>
+  using rebind_alloc = typename memory_internal::RebindAlloc<Alloc, T>::type;
+
+  // rebind_traits:
+  // absl::allocator_traits<rebind_alloc<T>>
+  template <typename T>
+  using rebind_traits = absl::allocator_traits<rebind_alloc<T>>;
+
+  // allocate(Alloc& a, size_type n):
+  // Calls a.allocate(n)
+  static pointer allocate(Alloc& a,  // NOLINT(runtime/references)
+                          size_type n) {
+    return a.allocate(n);
+  }
+
+  // allocate(Alloc& a, size_type n, const_void_pointer hint):
+  // Calls a.allocate(n, hint) if possible.
+  // If not possible, calls a.allocate(n)
+  static pointer allocate(Alloc& a, size_type n,  // NOLINT(runtime/references)
+                          const_void_pointer hint) {
+    return allocate_impl(0, a, n, hint);
+  }
+
+  // deallocate(Alloc& a, pointer p, size_type n):
+  // Calls a.deallocate(p, n)
+  static void deallocate(Alloc& a, pointer p,  // NOLINT(runtime/references)
+                         size_type n) {
+    a.deallocate(p, n);
+  }
+
+  // construct(Alloc& a, T* p, Args&&... args):
+  // Calls a.construct(p, std::forward<Args>(args)...) if possible.
+  // If not possible, calls
+  //   ::new (static_cast<void*>(p)) T(std::forward<Args>(args)...)
+  template <typename T, typename... Args>
+  static void construct(Alloc& a, T* p,  // NOLINT(runtime/references)
+                        Args&&... args) {
+    construct_impl(0, a, p, std::forward<Args>(args)...);
+  }
+
+  // destroy(Alloc& a, T* p):
+  // Calls a.destroy(p) if possible. If not possible, calls p->~T().
+  template <typename T>
+  static void destroy(Alloc& a, T* p) {  // NOLINT(runtime/references)
+    destroy_impl(0, a, p);
+  }
+
+  // max_size(const Alloc& a):
+  // Returns a.max_size() if possible. If not possible, returns
+  //   std::numeric_limits<size_type>::max() / sizeof(value_type)
+  static size_type max_size(const Alloc& a) { return max_size_impl(0, a); }
+
+  // select_on_container_copy_construction(const Alloc& a):
+  // Returns a.select_on_container_copy_construction() if possible.
+  // If not possible, returns a.
+  static Alloc select_on_container_copy_construction(const Alloc& a) {
+    return select_on_container_copy_construction_impl(0, a);
+  }
+
+ private:
+  template <typename A>
+  static auto allocate_impl(int, A& a,  // NOLINT(runtime/references)
+                            size_type n, const_void_pointer hint)
+      -> decltype(a.allocate(n, hint)) {
+    return a.allocate(n, hint);
+  }
+  static pointer allocate_impl(char, Alloc& a,  // NOLINT(runtime/references)
+                               size_type n, const_void_pointer) {
+    return a.allocate(n);
+  }
+
+  template <typename A, typename... Args>
+  static auto construct_impl(int, A& a,  // NOLINT(runtime/references)
+                             Args&&... args)
+      -> decltype(a.construct(std::forward<Args>(args)...)) {
+    a.construct(std::forward<Args>(args)...);
+  }
+
+  template <typename T, typename... Args>
+  static void construct_impl(char, Alloc&, T* p, Args&&... args) {
+    ::new (static_cast<void*>(p)) T(std::forward<Args>(args)...);
+  }
+
+  template <typename A, typename T>
+  static auto destroy_impl(int, A& a,  // NOLINT(runtime/references)
+                           T* p) -> decltype(a.destroy(p)) {
+    a.destroy(p);
+  }
+  template <typename T>
+  static void destroy_impl(char, Alloc&, T* p) {
+    p->~T();
+  }
+
+  template <typename A>
+  static auto max_size_impl(int, const A& a) -> decltype(a.max_size()) {
+    return a.max_size();
+  }
+  static size_type max_size_impl(char, const Alloc&) {
+    return (std::numeric_limits<size_type>::max)() / sizeof(value_type);
+  }
+
+  template <typename A>
+  static auto select_on_container_copy_construction_impl(int, const A& a)
+      -> decltype(a.select_on_container_copy_construction()) {
+    return a.select_on_container_copy_construction();
+  }
+  static Alloc select_on_container_copy_construction_impl(char,
+                                                          const Alloc& a) {
+    return a;
+  }
+};
+#endif  // __cplusplus >= 201703L
+
+namespace memory_internal {
+
+// This template alias transforms Alloc::is_nothrow into a metafunction with
+// Alloc as a parameter so it can be used with ExtractOrT<>.
+template <typename Alloc>
+using GetIsNothrow = typename Alloc::is_nothrow;
+
+}  // namespace memory_internal
+
+// ABSL_ALLOCATOR_NOTHROW is a build time configuration macro for user to
+// specify whether the default allocation function can throw or never throws.
+// If the allocation function never throws, user should define it to a non-zero
+// value (e.g. via `-DABSL_ALLOCATOR_NOTHROW`).
+// If the allocation function can throw, user should leave it undefined or
+// define it to zero.
+//
+// allocator_is_nothrow<Alloc> is a traits class that derives from
+// Alloc::is_nothrow if present, otherwise std::false_type. It's specialized
+// for Alloc = std::allocator<T> for any type T according to the state of
+// ABSL_ALLOCATOR_NOTHROW.
+//
+// default_allocator_is_nothrow is a class that derives from std::true_type
+// when the default allocator (global operator new) never throws, and
+// std::false_type when it can throw. It is a convenience shorthand for writing
+// allocator_is_nothrow<std::allocator<T>> (T can be any type).
+// NOTE: allocator_is_nothrow<std::allocator<T>> is guaranteed to derive from
+// the same type for all T, because users should specialize neither
+// allocator_is_nothrow nor std::allocator.
+template <typename Alloc>
+struct allocator_is_nothrow
+    : memory_internal::ExtractOrT<memory_internal::GetIsNothrow, Alloc,
+                                  std::false_type> {};
+
+#if defined(ABSL_ALLOCATOR_NOTHROW) && ABSL_ALLOCATOR_NOTHROW
+template <typename T>
+struct allocator_is_nothrow<std::allocator<T>> : std::true_type {};
+struct default_allocator_is_nothrow : std::true_type {};
+#else
+struct default_allocator_is_nothrow : std::false_type {};
+#endif
+
+namespace memory_internal {
+template <typename Allocator, typename Iterator, typename... Args>
+void ConstructRange(Allocator& alloc, Iterator first, Iterator last,
+                    const Args&... args) {
+  for (Iterator cur = first; cur != last; ++cur) {
+    ABSL_INTERNAL_TRY {
+      std::allocator_traits<Allocator>::construct(alloc, std::addressof(*cur),
+                                                  args...);
+    }
+    ABSL_INTERNAL_CATCH_ANY {
+      while (cur != first) {
+        --cur;
+        std::allocator_traits<Allocator>::destroy(alloc, std::addressof(*cur));
+      }
+      ABSL_INTERNAL_RETHROW;
+    }
+  }
+}
+
+template <typename Allocator, typename Iterator, typename InputIterator>
+void CopyRange(Allocator& alloc, Iterator destination, InputIterator first,
+               InputIterator last) {
+  for (Iterator cur = destination; first != last;
+       static_cast<void>(++cur), static_cast<void>(++first)) {
+    ABSL_INTERNAL_TRY {
+      std::allocator_traits<Allocator>::construct(alloc, std::addressof(*cur),
+                                                  *first);
+    }
+    ABSL_INTERNAL_CATCH_ANY {
+      while (cur != destination) {
+        --cur;
+        std::allocator_traits<Allocator>::destroy(alloc, std::addressof(*cur));
+      }
+      ABSL_INTERNAL_RETHROW;
+    }
+  }
+}
+}  // namespace memory_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_MEMORY_MEMORY_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/meta/type_traits.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/meta/type_traits.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/meta/type_traits.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/meta/type_traits.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,788 @@
+//
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// -----------------------------------------------------------------------------
+// type_traits.h
+// -----------------------------------------------------------------------------
+//
+// This file contains C++11-compatible versions of standard <type_traits> API
+// functions for determining the characteristics of types. Such traits can
+// support type inference, classification, and transformation, as well as
+// make it easier to write templates based on generic type behavior.
+//
+// See https://en.cppreference.com/w/cpp/header/type_traits
+//
+// WARNING: use of many of the constructs in this header will count as "complex
+// template metaprogramming", so before proceeding, please carefully consider
+// https://google.github.io/styleguide/cppguide.html#Template_metaprogramming
+//
+// WARNING: using template metaprogramming to detect or depend on API
+// features is brittle and not guaranteed. Neither the standard library nor
+// Abseil provides any guarantee that APIs are stable in the face of template
+// metaprogramming. Use with caution.
+#ifndef ABSL_META_TYPE_TRAITS_H_
+#define ABSL_META_TYPE_TRAITS_H_
+
+#include <stddef.h>
+#include <functional>
+#include <type_traits>
+
+#include "absl/base/config.h"
+
+// MSVC constructibility traits do not detect destructor properties and so our
+// implementations should not use them as a source-of-truth.
+#if defined(_MSC_VER) && !defined(__clang__) && !defined(__GNUC__)
+#define ABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION 1
+#endif
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+// Defined and documented later on in this file.
+template <typename T>
+struct is_trivially_destructible;
+
+// Defined and documented later on in this file.
+template <typename T>
+struct is_trivially_move_assignable;
+
+namespace type_traits_internal {
+
+// Silence MSVC warnings about the destructor being defined as deleted.
+#if defined(_MSC_VER) && !defined(__GNUC__)
+#pragma warning(push)
+#pragma warning(disable : 4624)
+#endif  // defined(_MSC_VER) && !defined(__GNUC__)
+
+template <class T>
+union SingleMemberUnion {
+  T t;
+};
+
+// Restore the state of the destructor warning that was silenced above.
+#if defined(_MSC_VER) && !defined(__GNUC__)
+#pragma warning(pop)
+#endif  // defined(_MSC_VER) && !defined(__GNUC__)
+
+template <class T>
+struct IsTriviallyMoveConstructibleObject
+    : std::integral_constant<
+          bool, std::is_move_constructible<
+                    type_traits_internal::SingleMemberUnion<T>>::value &&
+                    absl::is_trivially_destructible<T>::value> {};
+
+template <class T>
+struct IsTriviallyCopyConstructibleObject
+    : std::integral_constant<
+          bool, std::is_copy_constructible<
+                    type_traits_internal::SingleMemberUnion<T>>::value &&
+                    absl::is_trivially_destructible<T>::value> {};
+
+template <class T>
+struct IsTriviallyMoveAssignableReference : std::false_type {};
+
+template <class T>
+struct IsTriviallyMoveAssignableReference<T&>
+    : absl::is_trivially_move_assignable<T>::type {};
+
+template <class T>
+struct IsTriviallyMoveAssignableReference<T&&>
+    : absl::is_trivially_move_assignable<T>::type {};
+
+template <typename... Ts>
+struct VoidTImpl {
+  using type = void;
+};
+
+// This trick to retrieve a default alignment is necessary for our
+// implementation of aligned_storage_t to be consistent with any implementation
+// of std::aligned_storage.
+template <size_t Len, typename T = std::aligned_storage<Len>>
+struct default_alignment_of_aligned_storage;
+
+template <size_t Len, size_t Align>
+struct default_alignment_of_aligned_storage<Len,
+                                            std::aligned_storage<Len, Align>> {
+  static constexpr size_t value = Align;
+};
+
+////////////////////////////////
+// Library Fundamentals V2 TS //
+////////////////////////////////
+
+// NOTE: The `is_detected` family of templates here differ from the library
+// fundamentals specification in that for library fundamentals, `Op<Args...>` is
+// evaluated as soon as the type `is_detected<Op, Args...>` undergoes
+// substitution, regardless of whether or not the `::value` is accessed. That
+// is inconsistent with all other standard traits and prevents lazy evaluation
+// in larger contexts (such as if the `is_detected` check is a trailing argument
+// of a `conjunction`. This implementation opts to instead be lazy in the same
+// way that the standard traits are (this "defect" of the detection idiom
+// specifications has been reported).
+
+template <class Enabler, template <class...> class Op, class... Args>
+struct is_detected_impl {
+  using type = std::false_type;
+};
+
+template <template <class...> class Op, class... Args>
+struct is_detected_impl<typename VoidTImpl<Op<Args...>>::type, Op, Args...> {
+  using type = std::true_type;
+};
+
+template <template <class...> class Op, class... Args>
+struct is_detected : is_detected_impl<void, Op, Args...>::type {};
+
+template <class Enabler, class To, template <class...> class Op, class... Args>
+struct is_detected_convertible_impl {
+  using type = std::false_type;
+};
+
+template <class To, template <class...> class Op, class... Args>
+struct is_detected_convertible_impl<
+    typename std::enable_if<std::is_convertible<Op<Args...>, To>::value>::type,
+    To, Op, Args...> {
+  using type = std::true_type;
+};
+
+template <class To, template <class...> class Op, class... Args>
+struct is_detected_convertible
+    : is_detected_convertible_impl<void, To, Op, Args...>::type {};
+
+template <typename T>
+using IsCopyAssignableImpl =
+    decltype(std::declval<T&>() = std::declval<const T&>());
+
+template <typename T>
+using IsMoveAssignableImpl = decltype(std::declval<T&>() = std::declval<T&&>());
+
+}  // namespace type_traits_internal
+
+// MSVC 19.20 has a regression that causes our workarounds to fail, but their
+// std forms now appear to be compliant.
+#if defined(_MSC_VER) && !defined(__clang__) && (_MSC_VER >= 1920)
+
+template <typename T>
+using is_copy_assignable = std::is_copy_assignable<T>;
+
+template <typename T>
+using is_move_assignable = std::is_move_assignable<T>;
+
+#else
+
+template <typename T>
+struct is_copy_assignable : type_traits_internal::is_detected<
+                                type_traits_internal::IsCopyAssignableImpl, T> {
+};
+
+template <typename T>
+struct is_move_assignable : type_traits_internal::is_detected<
+                                type_traits_internal::IsMoveAssignableImpl, T> {
+};
+
+#endif
+
+// void_t()
+//
+// Ignores the type of any its arguments and returns `void`. In general, this
+// metafunction allows you to create a general case that maps to `void` while
+// allowing specializations that map to specific types.
+//
+// This metafunction is designed to be a drop-in replacement for the C++17
+// `std::void_t` metafunction.
+//
+// NOTE: `absl::void_t` does not use the standard-specified implementation so
+// that it can remain compatible with gcc < 5.1. This can introduce slightly
+// different behavior, such as when ordering partial specializations.
+template <typename... Ts>
+using void_t = typename type_traits_internal::VoidTImpl<Ts...>::type;
+
+// conjunction
+//
+// Performs a compile-time logical AND operation on the passed types (which
+// must have  `::value` members convertible to `bool`. Short-circuits if it
+// encounters any `false` members (and does not compare the `::value` members
+// of any remaining arguments).
+//
+// This metafunction is designed to be a drop-in replacement for the C++17
+// `std::conjunction` metafunction.
+template <typename... Ts>
+struct conjunction : std::true_type {};
+
+template <typename T, typename... Ts>
+struct conjunction<T, Ts...>
+    : std::conditional<T::value, conjunction<Ts...>, T>::type {};
+
+template <typename T>
+struct conjunction<T> : T {};
+
+// disjunction
+//
+// Performs a compile-time logical OR operation on the passed types (which
+// must have  `::value` members convertible to `bool`. Short-circuits if it
+// encounters any `true` members (and does not compare the `::value` members
+// of any remaining arguments).
+//
+// This metafunction is designed to be a drop-in replacement for the C++17
+// `std::disjunction` metafunction.
+template <typename... Ts>
+struct disjunction : std::false_type {};
+
+template <typename T, typename... Ts>
+struct disjunction<T, Ts...> :
+      std::conditional<T::value, T, disjunction<Ts...>>::type {};
+
+template <typename T>
+struct disjunction<T> : T {};
+
+// negation
+//
+// Performs a compile-time logical NOT operation on the passed type (which
+// must have  `::value` members convertible to `bool`.
+//
+// This metafunction is designed to be a drop-in replacement for the C++17
+// `std::negation` metafunction.
+template <typename T>
+struct negation : std::integral_constant<bool, !T::value> {};
+
+// is_function()
+//
+// Determines whether the passed type `T` is a function type.
+//
+// This metafunction is designed to be a drop-in replacement for the C++11
+// `std::is_function()` metafunction for platforms that have incomplete C++11
+// support (such as libstdc++ 4.x).
+//
+// This metafunction works because appending `const` to a type does nothing to
+// function types and reference types (and forms a const-qualified type
+// otherwise).
+template <typename T>
+struct is_function
+    : std::integral_constant<
+          bool, !(std::is_reference<T>::value ||
+                  std::is_const<typename std::add_const<T>::type>::value)> {};
+
+// is_trivially_destructible()
+//
+// Determines whether the passed type `T` is trivially destructible.
+//
+// This metafunction is designed to be a drop-in replacement for the C++11
+// `std::is_trivially_destructible()` metafunction for platforms that have
+// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
+// fully support C++11, we check whether this yields the same result as the std
+// implementation.
+//
+// NOTE: the extensions (__has_trivial_xxx) are implemented in gcc (version >=
+// 4.3) and clang. Since we are supporting libstdc++ > 4.7, they should always
+// be present. These  extensions are documented at
+// https://gcc.gnu.org/onlinedocs/gcc/Type-Traits.html#Type-Traits.
+template <typename T>
+struct is_trivially_destructible
+    : std::integral_constant<bool, __has_trivial_destructor(T) &&
+                                   std::is_destructible<T>::value> {
+#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
+ private:
+  static constexpr bool compliant = std::is_trivially_destructible<T>::value ==
+                                    is_trivially_destructible::value;
+  static_assert(compliant || std::is_trivially_destructible<T>::value,
+                "Not compliant with std::is_trivially_destructible; "
+                "Standard: false, Implementation: true");
+  static_assert(compliant || !std::is_trivially_destructible<T>::value,
+                "Not compliant with std::is_trivially_destructible; "
+                "Standard: true, Implementation: false");
+#endif  // ABSL_HAVE_STD_IS_TRIVIALLY_DESTRUCTIBLE
+};
+
+// is_trivially_default_constructible()
+//
+// Determines whether the passed type `T` is trivially default constructible.
+//
+// This metafunction is designed to be a drop-in replacement for the C++11
+// `std::is_trivially_default_constructible()` metafunction for platforms that
+// have incomplete C++11 support (such as libstdc++ 4.x). On any platforms that
+// do fully support C++11, we check whether this yields the same result as the
+// std implementation.
+//
+// NOTE: according to the C++ standard, Section: 20.15.4.3 [meta.unary.prop]
+// "The predicate condition for a template specialization is_constructible<T,
+// Args...> shall be satisfied if and only if the following variable
+// definition would be well-formed for some invented variable t:
+//
+// T t(declval<Args>()...);
+//
+// is_trivially_constructible<T, Args...> additionally requires that the
+// variable definition does not call any operation that is not trivial.
+// For the purposes of this check, the call to std::declval is considered
+// trivial."
+//
+// Notes from https://en.cppreference.com/w/cpp/types/is_constructible:
+// In many implementations, is_nothrow_constructible also checks if the
+// destructor throws because it is effectively noexcept(T(arg)). Same
+// applies to is_trivially_constructible, which, in these implementations, also
+// requires that the destructor is trivial.
+// GCC bug 51452: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51452
+// LWG issue 2116: http://cplusplus.github.io/LWG/lwg-active.html#2116.
+//
+// "T obj();" need to be well-formed and not call any nontrivial operation.
+// Nontrivially destructible types will cause the expression to be nontrivial.
+template <typename T>
+struct is_trivially_default_constructible
+    : std::integral_constant<bool, __has_trivial_constructor(T) &&
+                                   std::is_default_constructible<T>::value &&
+                                   is_trivially_destructible<T>::value> {
+#if defined(ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \
+    !defined(                                            \
+        ABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION)
+ private:
+  static constexpr bool compliant =
+      std::is_trivially_default_constructible<T>::value ==
+      is_trivially_default_constructible::value;
+  static_assert(compliant || std::is_trivially_default_constructible<T>::value,
+                "Not compliant with std::is_trivially_default_constructible; "
+                "Standard: false, Implementation: true");
+  static_assert(compliant || !std::is_trivially_default_constructible<T>::value,
+                "Not compliant with std::is_trivially_default_constructible; "
+                "Standard: true, Implementation: false");
+#endif  // ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
+};
+
+// is_trivially_move_constructible()
+//
+// Determines whether the passed type `T` is trivially move constructible.
+//
+// This metafunction is designed to be a drop-in replacement for the C++11
+// `std::is_trivially_move_constructible()` metafunction for platforms that have
+// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
+// fully support C++11, we check whether this yields the same result as the std
+// implementation.
+//
+// NOTE: `T obj(declval<T>());` needs to be well-formed and not call any
+// nontrivial operation.  Nontrivially destructible types will cause the
+// expression to be nontrivial.
+template <typename T>
+struct is_trivially_move_constructible
+    : std::conditional<
+          std::is_object<T>::value && !std::is_array<T>::value,
+          type_traits_internal::IsTriviallyMoveConstructibleObject<T>,
+          std::is_reference<T>>::type::type {
+#if defined(ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \
+    !defined(                                            \
+        ABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION)
+ private:
+  static constexpr bool compliant =
+      std::is_trivially_move_constructible<T>::value ==
+      is_trivially_move_constructible::value;
+  static_assert(compliant || std::is_trivially_move_constructible<T>::value,
+                "Not compliant with std::is_trivially_move_constructible; "
+                "Standard: false, Implementation: true");
+  static_assert(compliant || !std::is_trivially_move_constructible<T>::value,
+                "Not compliant with std::is_trivially_move_constructible; "
+                "Standard: true, Implementation: false");
+#endif  // ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
+};
+
+// is_trivially_copy_constructible()
+//
+// Determines whether the passed type `T` is trivially copy constructible.
+//
+// This metafunction is designed to be a drop-in replacement for the C++11
+// `std::is_trivially_copy_constructible()` metafunction for platforms that have
+// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
+// fully support C++11, we check whether this yields the same result as the std
+// implementation.
+//
+// NOTE: `T obj(declval<const T&>());` needs to be well-formed and not call any
+// nontrivial operation.  Nontrivially destructible types will cause the
+// expression to be nontrivial.
+template <typename T>
+struct is_trivially_copy_constructible
+    : std::conditional<
+          std::is_object<T>::value && !std::is_array<T>::value,
+          type_traits_internal::IsTriviallyCopyConstructibleObject<T>,
+          std::is_lvalue_reference<T>>::type::type {
+#if defined(ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE) && \
+    !defined(                                            \
+        ABSL_META_INTERNAL_STD_CONSTRUCTION_TRAITS_DONT_CHECK_DESTRUCTION)
+ private:
+  static constexpr bool compliant =
+      std::is_trivially_copy_constructible<T>::value ==
+      is_trivially_copy_constructible::value;
+  static_assert(compliant || std::is_trivially_copy_constructible<T>::value,
+                "Not compliant with std::is_trivially_copy_constructible; "
+                "Standard: false, Implementation: true");
+  static_assert(compliant || !std::is_trivially_copy_constructible<T>::value,
+                "Not compliant with std::is_trivially_copy_constructible; "
+                "Standard: true, Implementation: false");
+#endif  // ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE
+};
+
+// is_trivially_move_assignable()
+//
+// Determines whether the passed type `T` is trivially move assignable.
+//
+// This metafunction is designed to be a drop-in replacement for the C++11
+// `std::is_trivially_move_assignable()` metafunction for platforms that have
+// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
+// fully support C++11, we check whether this yields the same result as the std
+// implementation.
+//
+// NOTE: `is_assignable<T, U>::value` is `true` if the expression
+// `declval<T>() = declval<U>()` is well-formed when treated as an unevaluated
+// operand. `is_trivially_assignable<T, U>` requires the assignment to call no
+// operation that is not trivial. `is_trivially_copy_assignable<T>` is simply
+// `is_trivially_assignable<T&, T>`.
+template <typename T>
+struct is_trivially_move_assignable
+    : std::conditional<
+          std::is_object<T>::value && !std::is_array<T>::value &&
+              std::is_move_assignable<T>::value,
+          std::is_move_assignable<type_traits_internal::SingleMemberUnion<T>>,
+          type_traits_internal::IsTriviallyMoveAssignableReference<T>>::type::
+          type {
+#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
+ private:
+  static constexpr bool compliant =
+      std::is_trivially_move_assignable<T>::value ==
+      is_trivially_move_assignable::value;
+  static_assert(compliant || std::is_trivially_move_assignable<T>::value,
+                "Not compliant with std::is_trivially_move_assignable; "
+                "Standard: false, Implementation: true");
+  static_assert(compliant || !std::is_trivially_move_assignable<T>::value,
+                "Not compliant with std::is_trivially_move_assignable; "
+                "Standard: true, Implementation: false");
+#endif  // ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
+};
+
+// is_trivially_copy_assignable()
+//
+// Determines whether the passed type `T` is trivially copy assignable.
+//
+// This metafunction is designed to be a drop-in replacement for the C++11
+// `std::is_trivially_copy_assignable()` metafunction for platforms that have
+// incomplete C++11 support (such as libstdc++ 4.x). On any platforms that do
+// fully support C++11, we check whether this yields the same result as the std
+// implementation.
+//
+// NOTE: `is_assignable<T, U>::value` is `true` if the expression
+// `declval<T>() = declval<U>()` is well-formed when treated as an unevaluated
+// operand. `is_trivially_assignable<T, U>` requires the assignment to call no
+// operation that is not trivial. `is_trivially_copy_assignable<T>` is simply
+// `is_trivially_assignable<T&, const T&>`.
+template <typename T>
+struct is_trivially_copy_assignable
+    : std::integral_constant<
+          bool, __has_trivial_assign(typename std::remove_reference<T>::type) &&
+                    absl::is_copy_assignable<T>::value> {
+#ifdef ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
+ private:
+  static constexpr bool compliant =
+      std::is_trivially_copy_assignable<T>::value ==
+      is_trivially_copy_assignable::value;
+  static_assert(compliant || std::is_trivially_copy_assignable<T>::value,
+                "Not compliant with std::is_trivially_copy_assignable; "
+                "Standard: false, Implementation: true");
+  static_assert(compliant || !std::is_trivially_copy_assignable<T>::value,
+                "Not compliant with std::is_trivially_copy_assignable; "
+                "Standard: true, Implementation: false");
+#endif  // ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE
+};
+
+#if defined(__cpp_lib_remove_cvref) && __cpp_lib_remove_cvref >= 201711L
+template <typename T>
+using remove_cvref = std::remove_cvref<T>;
+
+template <typename T>
+using remove_cvref_t = typename std::remove_cvref<T>::type;
+#else
+// remove_cvref()
+//
+// C++11 compatible implementation of std::remove_cvref which was added in
+// C++20.
+template <typename T>
+struct remove_cvref {
+  using type =
+      typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+};
+
+template <typename T>
+using remove_cvref_t = typename remove_cvref<T>::type;
+#endif
+
+namespace type_traits_internal {
+// is_trivially_copyable()
+//
+// Determines whether the passed type `T` is trivially copyable.
+//
+// This metafunction is designed to be a drop-in replacement for the C++11
+// `std::is_trivially_copyable()` metafunction for platforms that have
+// incomplete C++11 support (such as libstdc++ 4.x). We use the C++17 definition
+// of TriviallyCopyable.
+//
+// NOTE: `is_trivially_copyable<T>::value` is `true` if all of T's copy/move
+// constructors/assignment operators are trivial or deleted, T has at least
+// one non-deleted copy/move constructor/assignment operator, and T is trivially
+// destructible. Arrays of trivially copyable types are trivially copyable.
+//
+// We expose this metafunction only for internal use within absl.
+template <typename T>
+class is_trivially_copyable_impl {
+  using ExtentsRemoved = typename std::remove_all_extents<T>::type;
+  static constexpr bool kIsCopyOrMoveConstructible =
+      std::is_copy_constructible<ExtentsRemoved>::value ||
+      std::is_move_constructible<ExtentsRemoved>::value;
+  static constexpr bool kIsCopyOrMoveAssignable =
+      absl::is_copy_assignable<ExtentsRemoved>::value ||
+      absl::is_move_assignable<ExtentsRemoved>::value;
+
+ public:
+  static constexpr bool kValue =
+      (__has_trivial_copy(ExtentsRemoved) || !kIsCopyOrMoveConstructible) &&
+      (__has_trivial_assign(ExtentsRemoved) || !kIsCopyOrMoveAssignable) &&
+      (kIsCopyOrMoveConstructible || kIsCopyOrMoveAssignable) &&
+      is_trivially_destructible<ExtentsRemoved>::value &&
+      // We need to check for this explicitly because otherwise we'll say
+      // references are trivial copyable when compiled by MSVC.
+      !std::is_reference<ExtentsRemoved>::value;
+};
+
+template <typename T>
+struct is_trivially_copyable
+    : std::integral_constant<
+          bool, type_traits_internal::is_trivially_copyable_impl<T>::kValue> {};
+}  // namespace type_traits_internal
+
+// -----------------------------------------------------------------------------
+// C++14 "_t" trait aliases
+// -----------------------------------------------------------------------------
+
+template <typename T>
+using remove_cv_t = typename std::remove_cv<T>::type;
+
+template <typename T>
+using remove_const_t = typename std::remove_const<T>::type;
+
+template <typename T>
+using remove_volatile_t = typename std::remove_volatile<T>::type;
+
+template <typename T>
+using add_cv_t = typename std::add_cv<T>::type;
+
+template <typename T>
+using add_const_t = typename std::add_const<T>::type;
+
+template <typename T>
+using add_volatile_t = typename std::add_volatile<T>::type;
+
+template <typename T>
+using remove_reference_t = typename std::remove_reference<T>::type;
+
+template <typename T>
+using add_lvalue_reference_t = typename std::add_lvalue_reference<T>::type;
+
+template <typename T>
+using add_rvalue_reference_t = typename std::add_rvalue_reference<T>::type;
+
+template <typename T>
+using remove_pointer_t = typename std::remove_pointer<T>::type;
+
+template <typename T>
+using add_pointer_t = typename std::add_pointer<T>::type;
+
+template <typename T>
+using make_signed_t = typename std::make_signed<T>::type;
+
+template <typename T>
+using make_unsigned_t = typename std::make_unsigned<T>::type;
+
+template <typename T>
+using remove_extent_t = typename std::remove_extent<T>::type;
+
+template <typename T>
+using remove_all_extents_t = typename std::remove_all_extents<T>::type;
+
+template <size_t Len, size_t Align = type_traits_internal::
+                          default_alignment_of_aligned_storage<Len>::value>
+using aligned_storage_t = typename std::aligned_storage<Len, Align>::type;
+
+template <typename T>
+using decay_t = typename std::decay<T>::type;
+
+template <bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+template <bool B, typename T, typename F>
+using conditional_t = typename std::conditional<B, T, F>::type;
+
+template <typename... T>
+using common_type_t = typename std::common_type<T...>::type;
+
+template <typename T>
+using underlying_type_t = typename std::underlying_type<T>::type;
+
+
+namespace type_traits_internal {
+
+#if __cplusplus >= 201703L
+// std::result_of is deprecated (C++17) or removed (C++20)
+template<typename> struct result_of;
+template<typename F, typename... Args>
+struct result_of<F(Args...)> : std::invoke_result<F, Args...> {};
+#else
+template<typename F> using result_of = std::result_of<F>;
+#endif
+
+}  // namespace type_traits_internal
+
+template<typename F>
+using result_of_t = typename type_traits_internal::result_of<F>::type;
+
+namespace type_traits_internal {
+// In MSVC we can't probe std::hash or stdext::hash because it triggers a
+// static_assert instead of failing substitution. Libc++ prior to 4.0
+// also used a static_assert.
+//
+#if defined(_MSC_VER) || (defined(_LIBCPP_VERSION) && \
+                          _LIBCPP_VERSION < 4000 && _LIBCPP_STD_VER > 11)
+#define ABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_ 0
+#else
+#define ABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_ 1
+#endif
+
+#if !ABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_
+template <typename Key, typename = size_t>
+struct IsHashable : std::true_type {};
+#else   // ABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_
+template <typename Key, typename = void>
+struct IsHashable : std::false_type {};
+
+template <typename Key>
+struct IsHashable<
+    Key,
+    absl::enable_if_t<std::is_convertible<
+        decltype(std::declval<std::hash<Key>&>()(std::declval<Key const&>())),
+        std::size_t>::value>> : std::true_type {};
+#endif  // !ABSL_META_INTERNAL_STD_HASH_SFINAE_FRIENDLY_
+
+struct AssertHashEnabledHelper {
+ private:
+  static void Sink(...) {}
+  struct NAT {};
+
+  template <class Key>
+  static auto GetReturnType(int)
+      -> decltype(std::declval<std::hash<Key>>()(std::declval<Key const&>()));
+  template <class Key>
+  static NAT GetReturnType(...);
+
+  template <class Key>
+  static std::nullptr_t DoIt() {
+    static_assert(IsHashable<Key>::value,
+                  "std::hash<Key> does not provide a call operator");
+    static_assert(
+        std::is_default_constructible<std::hash<Key>>::value,
+        "std::hash<Key> must be default constructible when it is enabled");
+    static_assert(
+        std::is_copy_constructible<std::hash<Key>>::value,
+        "std::hash<Key> must be copy constructible when it is enabled");
+    static_assert(absl::is_copy_assignable<std::hash<Key>>::value,
+                  "std::hash<Key> must be copy assignable when it is enabled");
+    // is_destructible is unchecked as it's implied by each of the
+    // is_constructible checks.
+    using ReturnType = decltype(GetReturnType<Key>(0));
+    static_assert(std::is_same<ReturnType, NAT>::value ||
+                      std::is_same<ReturnType, size_t>::value,
+                  "std::hash<Key> must return size_t");
+    return nullptr;
+  }
+
+  template <class... Ts>
+  friend void AssertHashEnabled();
+};
+
+template <class... Ts>
+inline void AssertHashEnabled() {
+  using Helper = AssertHashEnabledHelper;
+  Helper::Sink(Helper::DoIt<Ts>()...);
+}
+
+}  // namespace type_traits_internal
+
+// An internal namespace that is required to implement the C++17 swap traits.
+// It is not further nested in type_traits_internal to avoid long symbol names.
+namespace swap_internal {
+
+// Necessary for the traits.
+using std::swap;
+
+// This declaration prevents global `swap` and `absl::swap` overloads from being
+// considered unless ADL picks them up.
+void swap();
+
+template <class T>
+using IsSwappableImpl = decltype(swap(std::declval<T&>(), std::declval<T&>()));
+
+// NOTE: This dance with the default template parameter is for MSVC.
+template <class T,
+          class IsNoexcept = std::integral_constant<
+              bool, noexcept(swap(std::declval<T&>(), std::declval<T&>()))>>
+using IsNothrowSwappableImpl = typename std::enable_if<IsNoexcept::value>::type;
+
+// IsSwappable
+//
+// Determines whether the standard swap idiom is a valid expression for
+// arguments of type `T`.
+template <class T>
+struct IsSwappable
+    : absl::type_traits_internal::is_detected<IsSwappableImpl, T> {};
+
+// IsNothrowSwappable
+//
+// Determines whether the standard swap idiom is a valid expression for
+// arguments of type `T` and is noexcept.
+template <class T>
+struct IsNothrowSwappable
+    : absl::type_traits_internal::is_detected<IsNothrowSwappableImpl, T> {};
+
+// Swap()
+//
+// Performs the swap idiom from a namespace where valid candidates may only be
+// found in `std` or via ADL.
+template <class T, absl::enable_if_t<IsSwappable<T>::value, int> = 0>
+void Swap(T& lhs, T& rhs) noexcept(IsNothrowSwappable<T>::value) {
+  swap(lhs, rhs);
+}
+
+// StdSwapIsUnconstrained
+//
+// Some standard library implementations are broken in that they do not
+// constrain `std::swap`. This will effectively tell us if we are dealing with
+// one of those implementations.
+using StdSwapIsUnconstrained = IsSwappable<void()>;
+
+}  // namespace swap_internal
+
+namespace type_traits_internal {
+
+// Make the swap-related traits/function accessible from this namespace.
+using swap_internal::IsNothrowSwappable;
+using swap_internal::IsSwappable;
+using swap_internal::Swap;
+using swap_internal::StdSwapIsUnconstrained;
+
+}  // namespace type_traits_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_META_TYPE_TRAITS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/README.md asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/README.md
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/README.md	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/README.md	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,139 @@
+# Abseil - C++ Common Libraries
+
+The repository contains the Abseil C++ library code. Abseil is an open-source
+collection of C++ code (compliant to C++11) designed to augment the C++
+standard library.
+
+## Table of Contents
+
+- [About Abseil](#about)
+- [Quickstart](#quickstart)
+- [Building Abseil](#build)
+- [Support](#support)
+- [Codemap](#codemap)
+- [Releases](#releases)
+- [License](#license)
+- [Links](#links)
+
+<a name="about"></a>
+## About Abseil
+
+Abseil is an open-source collection of C++ library code designed to augment
+the C++ standard library. The Abseil library code is collected from Google's
+own C++ code base, has been extensively tested and used in production, and
+is the same code we depend on in our daily coding lives.
+
+In some cases, Abseil provides pieces missing from the C++ standard; in
+others, Abseil provides alternatives to the standard for special needs
+we've found through usage in the Google code base. We denote those cases
+clearly within the library code we provide you.
+
+Abseil is not meant to be a competitor to the standard library; we've
+just found that many of these utilities serve a purpose within our code
+base, and we now want to provide those resources to the C++ community as
+a whole.
+
+<a name="quickstart"></a>
+## Quickstart
+
+If you want to just get started, make sure you at least run through the
+[Abseil Quickstart](https://abseil.io/docs/cpp/quickstart). The Quickstart
+contains information about setting up your development environment, downloading
+the Abseil code, running tests, and getting a simple binary working.
+
+<a name="build"></a>
+## Building Abseil
+
+[Bazel](https://bazel.build) and [CMake](https://cmake.org/) are the official
+build systems for Abseil.
+
+See the [quickstart](https://abseil.io/docs/cpp/quickstart) for more information
+on building Abseil using the Bazel build system.
+
+If you require CMake support, please check the [CMake build
+instructions](CMake/README.md) and [CMake
+Quickstart](https://abseil.io/docs/cpp/quickstart-cmake).
+
+## Support
+
+Abseil is officially supported on many platforms. See the [Abseil
+platform support
+guide](https://abseil.io/docs/cpp/platforms/platforms) for details on
+supported operating systems, compilers, CPUs, etc.
+
+## Codemap
+
+Abseil contains the following C++ library components:
+
+* [`base`](absl/base/) Abseil Fundamentals
+  <br /> The `base` library contains initialization code and other code which
+  all other Abseil code depends on. Code within `base` may not depend on any
+  other code (other than the C++ standard library).
+* [`algorithm`](absl/algorithm/)
+  <br /> The `algorithm` library contains additions to the C++ `<algorithm>`
+  library and container-based versions of such algorithms.
+* [`cleanup`](absl/cleanup/)
+  <br /> The `cleanup` library contains the control-flow-construct-like type
+  `absl::Cleanup` which is used for executing a callback on scope exit.
+* [`container`](absl/container/)
+  <br /> The `container` library contains additional STL-style containers,
+  including Abseil's unordered "Swiss table" containers.
+* [`debugging`](absl/debugging/)
+  <br /> The `debugging` library contains code useful for enabling leak
+  checks, and stacktrace and symbolization utilities.
+* [`hash`](absl/hash/)
+  <br /> The `hash` library contains the hashing framework and default hash
+  functor implementations for hashable types in Abseil.
+* [`memory`](absl/memory/)
+  <br /> The `memory` library contains C++11-compatible versions of
+  `std::make_unique()` and related memory management facilities.
+* [`meta`](absl/meta/)
+  <br /> The `meta` library contains C++11-compatible versions of type checks
+  available within C++14 and C++17 versions of the C++ `<type_traits>` library.
+* [`numeric`](absl/numeric/)
+  <br /> The `numeric` library contains C++11-compatible 128-bit integers.
+* [`status`](absl/status/)
+  <br /> The `status` contains abstractions for error handling, specifically
+  `absl::Status` and `absl::StatusOr<T>`.
+* [`strings`](absl/strings/)
+  <br /> The `strings` library contains a variety of strings routines and
+  utilities, including a C++11-compatible version of the C++17
+  `std::string_view` type.
+* [`synchronization`](absl/synchronization/)
+  <br /> The `synchronization` library contains concurrency primitives (Abseil's
+  `absl::Mutex` class, an alternative to `std::mutex`) and a variety of
+  synchronization abstractions.
+* [`time`](absl/time/)
+  <br /> The `time` library contains abstractions for computing with absolute
+  points in time, durations of time, and formatting and parsing time within
+  time zones.
+* [`types`](absl/types/)
+  <br /> The `types` library contains non-container utility types, like a
+  C++11-compatible version of the C++17 `std::optional` type.
+* [`utility`](absl/utility/)
+  <br /> The `utility` library contains utility and helper code.
+
+## Releases
+
+Abseil recommends users "live-at-head" (update to the latest commit from the
+master branch as often as possible). However, we realize this philosophy doesn't
+work for every project, so we also provide [Long Term Support
+Releases](https://github.com/abseil/abseil-cpp/releases) to which we backport
+fixes for severe bugs. See our [release
+management](https://abseil.io/about/releases) document for more details.
+
+## License
+
+The Abseil C++ library is licensed under the terms of the Apache
+license. See [LICENSE](LICENSE) for more information.
+
+## Links
+
+For more information about Abseil:
+
+* Consult our [Abseil Introduction](https://abseil.io/about/intro)
+* Read [Why Adopt Abseil](https://abseil.io/about/philosophy) to understand our
+  design philosophy.
+* Peruse our
+  [Abseil Compatibility Guarantees](https://abseil.io/about/compatibility) to
+  understand both what we promise to you, and what we expect of you in return.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/strings/string_view.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/strings/string_view.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/strings/string_view.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/strings/string_view.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,235 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "absl/strings/string_view.h"
+
+#ifndef ABSL_USES_STD_STRING_VIEW
+
+#include <algorithm>
+#include <climits>
+#include <cstring>
+#include <ostream>
+
+#include "absl/strings/internal/memutil.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+namespace {
+void WritePadding(std::ostream& o, size_t pad) {
+  char fill_buf[32];
+  memset(fill_buf, o.fill(), sizeof(fill_buf));
+  while (pad) {
+    size_t n = std::min(pad, sizeof(fill_buf));
+    o.write(fill_buf, n);
+    pad -= n;
+  }
+}
+
+class LookupTable {
+ public:
+  // For each character in wanted, sets the index corresponding
+  // to the ASCII code of that character. This is used by
+  // the find_.*_of methods below to tell whether or not a character is in
+  // the lookup table in constant time.
+  explicit LookupTable(string_view wanted) {
+    for (char c : wanted) {
+      table_[Index(c)] = true;
+    }
+  }
+  bool operator[](char c) const { return table_[Index(c)]; }
+
+ private:
+  static unsigned char Index(char c) { return static_cast<unsigned char>(c); }
+  bool table_[UCHAR_MAX + 1] = {};
+};
+
+}  // namespace
+
+std::ostream& operator<<(std::ostream& o, string_view piece) {
+  std::ostream::sentry sentry(o);
+  if (sentry) {
+    size_t lpad = 0;
+    size_t rpad = 0;
+    if (static_cast<size_t>(o.width()) > piece.size()) {
+      size_t pad = o.width() - piece.size();
+      if ((o.flags() & o.adjustfield) == o.left) {
+        rpad = pad;
+      } else {
+        lpad = pad;
+      }
+    }
+    if (lpad) WritePadding(o, lpad);
+    o.write(piece.data(), piece.size());
+    if (rpad) WritePadding(o, rpad);
+    o.width(0);
+  }
+  return o;
+}
+
+string_view::size_type string_view::find(string_view s, size_type pos) const
+    noexcept {
+  if (empty() || pos > length_) {
+    if (empty() && pos == 0 && s.empty()) return 0;
+    return npos;
+  }
+  const char* result =
+      strings_internal::memmatch(ptr_ + pos, length_ - pos, s.ptr_, s.length_);
+  return result ? result - ptr_ : npos;
+}
+
+string_view::size_type string_view::find(char c, size_type pos) const noexcept {
+  if (empty() || pos >= length_) {
+    return npos;
+  }
+  const char* result =
+      static_cast<const char*>(memchr(ptr_ + pos, c, length_ - pos));
+  return result != nullptr ? result - ptr_ : npos;
+}
+
+string_view::size_type string_view::rfind(string_view s, size_type pos) const
+    noexcept {
+  if (length_ < s.length_) return npos;
+  if (s.empty()) return std::min(length_, pos);
+  const char* last = ptr_ + std::min(length_ - s.length_, pos) + s.length_;
+  const char* result = std::find_end(ptr_, last, s.ptr_, s.ptr_ + s.length_);
+  return result != last ? result - ptr_ : npos;
+}
+
+// Search range is [0..pos] inclusive.  If pos == npos, search everything.
+string_view::size_type string_view::rfind(char c, size_type pos) const
+    noexcept {
+  // Note: memrchr() is not available on Windows.
+  if (empty()) return npos;
+  for (size_type i = std::min(pos, length_ - 1);; --i) {
+    if (ptr_[i] == c) {
+      return i;
+    }
+    if (i == 0) break;
+  }
+  return npos;
+}
+
+string_view::size_type string_view::find_first_of(string_view s,
+                                                  size_type pos) const
+    noexcept {
+  if (empty() || s.empty()) {
+    return npos;
+  }
+  // Avoid the cost of LookupTable() for a single-character search.
+  if (s.length_ == 1) return find_first_of(s.ptr_[0], pos);
+  LookupTable tbl(s);
+  for (size_type i = pos; i < length_; ++i) {
+    if (tbl[ptr_[i]]) {
+      return i;
+    }
+  }
+  return npos;
+}
+
+string_view::size_type string_view::find_first_not_of(string_view s,
+                                                      size_type pos) const
+    noexcept {
+  if (empty()) return npos;
+  // Avoid the cost of LookupTable() for a single-character search.
+  if (s.length_ == 1) return find_first_not_of(s.ptr_[0], pos);
+  LookupTable tbl(s);
+  for (size_type i = pos; i < length_; ++i) {
+    if (!tbl[ptr_[i]]) {
+      return i;
+    }
+  }
+  return npos;
+}
+
+string_view::size_type string_view::find_first_not_of(char c,
+                                                      size_type pos) const
+    noexcept {
+  if (empty()) return npos;
+  for (; pos < length_; ++pos) {
+    if (ptr_[pos] != c) {
+      return pos;
+    }
+  }
+  return npos;
+}
+
+string_view::size_type string_view::find_last_of(string_view s,
+                                                 size_type pos) const noexcept {
+  if (empty() || s.empty()) return npos;
+  // Avoid the cost of LookupTable() for a single-character search.
+  if (s.length_ == 1) return find_last_of(s.ptr_[0], pos);
+  LookupTable tbl(s);
+  for (size_type i = std::min(pos, length_ - 1);; --i) {
+    if (tbl[ptr_[i]]) {
+      return i;
+    }
+    if (i == 0) break;
+  }
+  return npos;
+}
+
+string_view::size_type string_view::find_last_not_of(string_view s,
+                                                     size_type pos) const
+    noexcept {
+  if (empty()) return npos;
+  size_type i = std::min(pos, length_ - 1);
+  if (s.empty()) return i;
+  // Avoid the cost of LookupTable() for a single-character search.
+  if (s.length_ == 1) return find_last_not_of(s.ptr_[0], pos);
+  LookupTable tbl(s);
+  for (;; --i) {
+    if (!tbl[ptr_[i]]) {
+      return i;
+    }
+    if (i == 0) break;
+  }
+  return npos;
+}
+
+string_view::size_type string_view::find_last_not_of(char c,
+                                                     size_type pos) const
+    noexcept {
+  if (empty()) return npos;
+  size_type i = std::min(pos, length_ - 1);
+  for (;; --i) {
+    if (ptr_[i] != c) {
+      return i;
+    }
+    if (i == 0) break;
+  }
+  return npos;
+}
+
+// MSVC has non-standard behavior that implicitly creates definitions for static
+// const members. These implicit definitions conflict with explicit out-of-class
+// member definitions that are required by the C++ standard, resulting in
+// LNK1169 "multiply defined" errors at link time. __declspec(selectany) asks
+// MSVC to choose only one definition for the symbol it decorates. See details
+// at https://msdn.microsoft.com/en-us/library/34h23df8(v=vs.100).aspx
+#ifdef _MSC_VER
+#define ABSL_STRING_VIEW_SELECTANY __declspec(selectany)
+#else
+#define ABSL_STRING_VIEW_SELECTANY
+#endif
+
+ABSL_STRING_VIEW_SELECTANY
+constexpr string_view::size_type string_view::npos;
+ABSL_STRING_VIEW_SELECTANY
+constexpr string_view::size_type string_view::kMaxSize;
+
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_USES_STD_STRING_VIEW
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/strings/string_view.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/strings/string_view.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/strings/string_view.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/strings/string_view.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,628 @@
+//
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// -----------------------------------------------------------------------------
+// File: string_view.h
+// -----------------------------------------------------------------------------
+//
+// This file contains the definition of the `absl::string_view` class. A
+// `string_view` points to a contiguous span of characters, often part or all of
+// another `std::string`, double-quoted string literal, character array, or even
+// another `string_view`.
+//
+// This `absl::string_view` abstraction is designed to be a drop-in
+// replacement for the C++17 `std::string_view` abstraction.
+#ifndef ABSL_STRINGS_STRING_VIEW_H_
+#define ABSL_STRINGS_STRING_VIEW_H_
+
+#include <algorithm>
+#include <cassert>
+#include <cstddef>
+#include <cstring>
+#include <iosfwd>
+#include <iterator>
+#include <limits>
+#include <string>
+
+#include "absl/base/attributes.h"
+#include "absl/base/config.h"
+#include "absl/base/internal/throw_delegate.h"
+#include "absl/base/macros.h"
+#include "absl/base/optimization.h"
+#include "absl/base/port.h"
+
+#ifdef ABSL_USES_STD_STRING_VIEW
+
+#include <string_view>  // IWYU pragma: export
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+using string_view = std::string_view;
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#else  // ABSL_USES_STD_STRING_VIEW
+
+#if ABSL_HAVE_BUILTIN(__builtin_memcmp) || \
+    (defined(__GNUC__) && !defined(__clang__))
+#define ABSL_INTERNAL_STRING_VIEW_MEMCMP __builtin_memcmp
+#else  // ABSL_HAVE_BUILTIN(__builtin_memcmp)
+#define ABSL_INTERNAL_STRING_VIEW_MEMCMP memcmp
+#endif  // ABSL_HAVE_BUILTIN(__builtin_memcmp)
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+// absl::string_view
+//
+// A `string_view` provides a lightweight view into the string data provided by
+// a `std::string`, double-quoted string literal, character array, or even
+// another `string_view`. A `string_view` does *not* own the string to which it
+// points, and that data cannot be modified through the view.
+//
+// You can use `string_view` as a function or method parameter anywhere a
+// parameter can receive a double-quoted string literal, `const char*`,
+// `std::string`, or another `absl::string_view` argument with no need to copy
+// the string data. Systematic use of `string_view` within function arguments
+// reduces data copies and `strlen()` calls.
+//
+// Because of its small size, prefer passing `string_view` by value:
+//
+//   void MyFunction(absl::string_view arg);
+//
+// If circumstances require, you may also pass one by const reference:
+//
+//   void MyFunction(const absl::string_view& arg);  // not preferred
+//
+// Passing by value generates slightly smaller code for many architectures.
+//
+// In either case, the source data of the `string_view` must outlive the
+// `string_view` itself.
+//
+// A `string_view` is also suitable for local variables if you know that the
+// lifetime of the underlying object is longer than the lifetime of your
+// `string_view` variable. However, beware of binding a `string_view` to a
+// temporary value:
+//
+//   // BAD use of string_view: lifetime problem
+//   absl::string_view sv = obj.ReturnAString();
+//
+//   // GOOD use of string_view: str outlives sv
+//   std::string str = obj.ReturnAString();
+//   absl::string_view sv = str;
+//
+// Due to lifetime issues, a `string_view` is sometimes a poor choice for a
+// return value and usually a poor choice for a data member. If you do use a
+// `string_view` this way, it is your responsibility to ensure that the object
+// pointed to by the `string_view` outlives the `string_view`.
+//
+// A `string_view` may represent a whole string or just part of a string. For
+// example, when splitting a string, `std::vector<absl::string_view>` is a
+// natural data type for the output.
+//
+// For another example, a Cord is a non-contiguous, potentially very
+// long string-like object.  The Cord class has an interface that iteratively
+// provides string_view objects that point to the successive pieces of a Cord
+// object.
+//
+// When constructed from a source which is NUL-terminated, the `string_view`
+// itself will not include the NUL-terminator unless a specific size (including
+// the NUL) is passed to the constructor. As a result, common idioms that work
+// on NUL-terminated strings do not work on `string_view` objects. If you write
+// code that scans a `string_view`, you must check its length rather than test
+// for nul, for example. Note, however, that nuls may still be embedded within
+// a `string_view` explicitly.
+//
+// You may create a null `string_view` in two ways:
+//
+//   absl::string_view sv;
+//   absl::string_view sv(nullptr, 0);
+//
+// For the above, `sv.data() == nullptr`, `sv.length() == 0`, and
+// `sv.empty() == true`. Also, if you create a `string_view` with a non-null
+// pointer then `sv.data() != nullptr`. Thus, you can use `string_view()` to
+// signal an undefined value that is different from other `string_view` values
+// in a similar fashion to how `const char* p1 = nullptr;` is different from
+// `const char* p2 = "";`. However, in practice, it is not recommended to rely
+// on this behavior.
+//
+// Be careful not to confuse a null `string_view` with an empty one. A null
+// `string_view` is an empty `string_view`, but some empty `string_view`s are
+// not null. Prefer checking for emptiness over checking for null.
+//
+// There are many ways to create an empty string_view:
+//
+//   const char* nullcp = nullptr;
+//   // string_view.size() will return 0 in all cases.
+//   absl::string_view();
+//   absl::string_view(nullcp, 0);
+//   absl::string_view("");
+//   absl::string_view("", 0);
+//   absl::string_view("abcdef", 0);
+//   absl::string_view("abcdef" + 6, 0);
+//
+// All empty `string_view` objects whether null or not, are equal:
+//
+//   absl::string_view() == absl::string_view("", 0)
+//   absl::string_view(nullptr, 0) == absl::string_view("abcdef"+6, 0)
+class string_view {
+ public:
+  using traits_type = std::char_traits<char>;
+  using value_type = char;
+  using pointer = char*;
+  using const_pointer = const char*;
+  using reference = char&;
+  using const_reference = const char&;
+  using const_iterator = const char*;
+  using iterator = const_iterator;
+  using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+  using reverse_iterator = const_reverse_iterator;
+  using size_type = size_t;
+  using difference_type = std::ptrdiff_t;
+
+  static constexpr size_type npos = static_cast<size_type>(-1);
+
+  // Null `string_view` constructor
+  constexpr string_view() noexcept : ptr_(nullptr), length_(0) {}
+
+  // Implicit constructors
+
+  template <typename Allocator>
+  string_view(  // NOLINT(runtime/explicit)
+      const std::basic_string<char, std::char_traits<char>, Allocator>& str
+          ABSL_ATTRIBUTE_LIFETIME_BOUND) noexcept
+      // This is implemented in terms of `string_view(p, n)` so `str.size()`
+      // doesn't need to be reevaluated after `ptr_` is set.
+      : string_view(str.data(), str.size()) {}
+
+  // Implicit constructor of a `string_view` from NUL-terminated `str`. When
+  // accepting possibly null strings, use `absl::NullSafeStringView(str)`
+  // instead (see below).
+  constexpr string_view(const char* str)  // NOLINT(runtime/explicit)
+      : ptr_(str),
+        length_(str ? CheckLengthInternal(StrlenInternal(str)) : 0) {}
+
+  // Implicit constructor of a `string_view` from a `const char*` and length.
+  constexpr string_view(const char* data, size_type len)
+      : ptr_(data), length_(CheckLengthInternal(len)) {}
+
+  // NOTE: Harmlessly omitted to work around gdb bug.
+  //   constexpr string_view(const string_view&) noexcept = default;
+  //   string_view& operator=(const string_view&) noexcept = default;
+
+  // Iterators
+
+  // string_view::begin()
+  //
+  // Returns an iterator pointing to the first character at the beginning of the
+  // `string_view`, or `end()` if the `string_view` is empty.
+  constexpr const_iterator begin() const noexcept { return ptr_; }
+
+  // string_view::end()
+  //
+  // Returns an iterator pointing just beyond the last character at the end of
+  // the `string_view`. This iterator acts as a placeholder; attempting to
+  // access it results in undefined behavior.
+  constexpr const_iterator end() const noexcept { return ptr_ + length_; }
+
+  // string_view::cbegin()
+  //
+  // Returns a const iterator pointing to the first character at the beginning
+  // of the `string_view`, or `end()` if the `string_view` is empty.
+  constexpr const_iterator cbegin() const noexcept { return begin(); }
+
+  // string_view::cend()
+  //
+  // Returns a const iterator pointing just beyond the last character at the end
+  // of the `string_view`. This pointer acts as a placeholder; attempting to
+  // access its element results in undefined behavior.
+  constexpr const_iterator cend() const noexcept { return end(); }
+
+  // string_view::rbegin()
+  //
+  // Returns a reverse iterator pointing to the last character at the end of the
+  // `string_view`, or `rend()` if the `string_view` is empty.
+  const_reverse_iterator rbegin() const noexcept {
+    return const_reverse_iterator(end());
+  }
+
+  // string_view::rend()
+  //
+  // Returns a reverse iterator pointing just before the first character at the
+  // beginning of the `string_view`. This pointer acts as a placeholder;
+  // attempting to access its element results in undefined behavior.
+  const_reverse_iterator rend() const noexcept {
+    return const_reverse_iterator(begin());
+  }
+
+  // string_view::crbegin()
+  //
+  // Returns a const reverse iterator pointing to the last character at the end
+  // of the `string_view`, or `crend()` if the `string_view` is empty.
+  const_reverse_iterator crbegin() const noexcept { return rbegin(); }
+
+  // string_view::crend()
+  //
+  // Returns a const reverse iterator pointing just before the first character
+  // at the beginning of the `string_view`. This pointer acts as a placeholder;
+  // attempting to access its element results in undefined behavior.
+  const_reverse_iterator crend() const noexcept { return rend(); }
+
+  // Capacity Utilities
+
+  // string_view::size()
+  //
+  // Returns the number of characters in the `string_view`.
+  constexpr size_type size() const noexcept {
+    return length_;
+  }
+
+  // string_view::length()
+  //
+  // Returns the number of characters in the `string_view`. Alias for `size()`.
+  constexpr size_type length() const noexcept { return size(); }
+
+  // string_view::max_size()
+  //
+  // Returns the maximum number of characters the `string_view` can hold.
+  constexpr size_type max_size() const noexcept { return kMaxSize; }
+
+  // string_view::empty()
+  //
+  // Checks if the `string_view` is empty (refers to no characters).
+  constexpr bool empty() const noexcept { return length_ == 0; }
+
+  // string_view::operator[]
+  //
+  // Returns the ith element of the `string_view` using the array operator.
+  // Note that this operator does not perform any bounds checking.
+  constexpr const_reference operator[](size_type i) const {
+    return ABSL_HARDENING_ASSERT(i < size()), ptr_[i];
+  }
+
+  // string_view::at()
+  //
+  // Returns the ith element of the `string_view`. Bounds checking is performed,
+  // and an exception of type `std::out_of_range` will be thrown on invalid
+  // access.
+  constexpr const_reference at(size_type i) const {
+    return ABSL_PREDICT_TRUE(i < size())
+               ? ptr_[i]
+               : ((void)base_internal::ThrowStdOutOfRange(
+                      "absl::string_view::at"),
+                  ptr_[i]);
+  }
+
+  // string_view::front()
+  //
+  // Returns the first element of a `string_view`.
+  constexpr const_reference front() const {
+    return ABSL_HARDENING_ASSERT(!empty()), ptr_[0];
+  }
+
+  // string_view::back()
+  //
+  // Returns the last element of a `string_view`.
+  constexpr const_reference back() const {
+    return ABSL_HARDENING_ASSERT(!empty()), ptr_[size() - 1];
+  }
+
+  // string_view::data()
+  //
+  // Returns a pointer to the underlying character array (which is of course
+  // stored elsewhere). Note that `string_view::data()` may contain embedded nul
+  // characters, but the returned buffer may or may not be NUL-terminated;
+  // therefore, do not pass `data()` to a routine that expects a NUL-terminated
+  // string.
+  constexpr const_pointer data() const noexcept { return ptr_; }
+
+  // Modifiers
+
+  // string_view::remove_prefix()
+  //
+  // Removes the first `n` characters from the `string_view`. Note that the
+  // underlying string is not changed, only the view.
+  void remove_prefix(size_type n) {
+    ABSL_HARDENING_ASSERT(n <= length_);
+    ptr_ += n;
+    length_ -= n;
+  }
+
+  // string_view::remove_suffix()
+  //
+  // Removes the last `n` characters from the `string_view`. Note that the
+  // underlying string is not changed, only the view.
+  void remove_suffix(size_type n) {
+    ABSL_HARDENING_ASSERT(n <= length_);
+    length_ -= n;
+  }
+
+  // string_view::swap()
+  //
+  // Swaps this `string_view` with another `string_view`.
+  void swap(string_view& s) noexcept {
+    auto t = *this;
+    *this = s;
+    s = t;
+  }
+
+  // Explicit conversion operators
+
+  // Converts to `std::basic_string`.
+  template <typename A>
+  explicit operator std::basic_string<char, traits_type, A>() const {
+    if (!data()) return {};
+    return std::basic_string<char, traits_type, A>(data(), size());
+  }
+
+  // string_view::copy()
+  //
+  // Copies the contents of the `string_view` at offset `pos` and length `n`
+  // into `buf`.
+  size_type copy(char* buf, size_type n, size_type pos = 0) const {
+    if (ABSL_PREDICT_FALSE(pos > length_)) {
+      base_internal::ThrowStdOutOfRange("absl::string_view::copy");
+    }
+    size_type rlen = (std::min)(length_ - pos, n);
+    if (rlen > 0) {
+      const char* start = ptr_ + pos;
+      traits_type::copy(buf, start, rlen);
+    }
+    return rlen;
+  }
+
+  // string_view::substr()
+  //
+  // Returns a "substring" of the `string_view` (at offset `pos` and length
+  // `n`) as another string_view. This function throws `std::out_of_bounds` if
+  // `pos > size`.
+  // Use absl::ClippedSubstr if you need a truncating substr operation.
+  constexpr string_view substr(size_type pos, size_type n = npos) const {
+    return ABSL_PREDICT_FALSE(pos > length_)
+               ? (base_internal::ThrowStdOutOfRange(
+                      "absl::string_view::substr"),
+                  string_view())
+               : string_view(ptr_ + pos, Min(n, length_ - pos));
+  }
+
+  // string_view::compare()
+  //
+  // Performs a lexicographical comparison between this `string_view` and
+  // another `string_view` `x`, returning a negative value if `*this` is less
+  // than `x`, 0 if `*this` is equal to `x`, and a positive value if `*this`
+  // is greater than `x`.
+  constexpr int compare(string_view x) const noexcept {
+    return CompareImpl(length_, x.length_,
+                       Min(length_, x.length_) == 0
+                           ? 0
+                           : ABSL_INTERNAL_STRING_VIEW_MEMCMP(
+                                 ptr_, x.ptr_, Min(length_, x.length_)));
+  }
+
+  // Overload of `string_view::compare()` for comparing a substring of the
+  // 'string_view` and another `absl::string_view`.
+  int compare(size_type pos1, size_type count1, string_view v) const {
+    return substr(pos1, count1).compare(v);
+  }
+
+  // Overload of `string_view::compare()` for comparing a substring of the
+  // `string_view` and a substring of another `absl::string_view`.
+  int compare(size_type pos1, size_type count1, string_view v, size_type pos2,
+              size_type count2) const {
+    return substr(pos1, count1).compare(v.substr(pos2, count2));
+  }
+
+  // Overload of `string_view::compare()` for comparing a `string_view` and a
+  // a different  C-style string `s`.
+  int compare(const char* s) const { return compare(string_view(s)); }
+
+  // Overload of `string_view::compare()` for comparing a substring of the
+  // `string_view` and a different string C-style string `s`.
+  int compare(size_type pos1, size_type count1, const char* s) const {
+    return substr(pos1, count1).compare(string_view(s));
+  }
+
+  // Overload of `string_view::compare()` for comparing a substring of the
+  // `string_view` and a substring of a different C-style string `s`.
+  int compare(size_type pos1, size_type count1, const char* s,
+              size_type count2) const {
+    return substr(pos1, count1).compare(string_view(s, count2));
+  }
+
+  // Find Utilities
+
+  // string_view::find()
+  //
+  // Finds the first occurrence of the substring `s` within the `string_view`,
+  // returning the position of the first character's match, or `npos` if no
+  // match was found.
+  size_type find(string_view s, size_type pos = 0) const noexcept;
+
+  // Overload of `string_view::find()` for finding the given character `c`
+  // within the `string_view`.
+  size_type find(char c, size_type pos = 0) const noexcept;
+
+  // string_view::rfind()
+  //
+  // Finds the last occurrence of a substring `s` within the `string_view`,
+  // returning the position of the first character's match, or `npos` if no
+  // match was found.
+  size_type rfind(string_view s, size_type pos = npos) const
+      noexcept;
+
+  // Overload of `string_view::rfind()` for finding the last given character `c`
+  // within the `string_view`.
+  size_type rfind(char c, size_type pos = npos) const noexcept;
+
+  // string_view::find_first_of()
+  //
+  // Finds the first occurrence of any of the characters in `s` within the
+  // `string_view`, returning the start position of the match, or `npos` if no
+  // match was found.
+  size_type find_first_of(string_view s, size_type pos = 0) const
+      noexcept;
+
+  // Overload of `string_view::find_first_of()` for finding a character `c`
+  // within the `string_view`.
+  size_type find_first_of(char c, size_type pos = 0) const
+      noexcept {
+    return find(c, pos);
+  }
+
+  // string_view::find_last_of()
+  //
+  // Finds the last occurrence of any of the characters in `s` within the
+  // `string_view`, returning the start position of the match, or `npos` if no
+  // match was found.
+  size_type find_last_of(string_view s, size_type pos = npos) const
+      noexcept;
+
+  // Overload of `string_view::find_last_of()` for finding a character `c`
+  // within the `string_view`.
+  size_type find_last_of(char c, size_type pos = npos) const
+      noexcept {
+    return rfind(c, pos);
+  }
+
+  // string_view::find_first_not_of()
+  //
+  // Finds the first occurrence of any of the characters not in `s` within the
+  // `string_view`, returning the start position of the first non-match, or
+  // `npos` if no non-match was found.
+  size_type find_first_not_of(string_view s, size_type pos = 0) const noexcept;
+
+  // Overload of `string_view::find_first_not_of()` for finding a character
+  // that is not `c` within the `string_view`.
+  size_type find_first_not_of(char c, size_type pos = 0) const noexcept;
+
+  // string_view::find_last_not_of()
+  //
+  // Finds the last occurrence of any of the characters not in `s` within the
+  // `string_view`, returning the start position of the last non-match, or
+  // `npos` if no non-match was found.
+  size_type find_last_not_of(string_view s,
+                                          size_type pos = npos) const noexcept;
+
+  // Overload of `string_view::find_last_not_of()` for finding a character
+  // that is not `c` within the `string_view`.
+  size_type find_last_not_of(char c, size_type pos = npos) const
+      noexcept;
+
+ private:
+  static constexpr size_type kMaxSize =
+      (std::numeric_limits<difference_type>::max)();
+
+  static constexpr size_type CheckLengthInternal(size_type len) {
+    return ABSL_HARDENING_ASSERT(len <= kMaxSize), len;
+  }
+
+  static constexpr size_type StrlenInternal(const char* str) {
+#if defined(_MSC_VER) && _MSC_VER >= 1910 && !defined(__clang__)
+    // MSVC 2017+ can evaluate this at compile-time.
+    const char* begin = str;
+    while (*str != '\0') ++str;
+    return str - begin;
+#elif ABSL_HAVE_BUILTIN(__builtin_strlen) || \
+    (defined(__GNUC__) && !defined(__clang__))
+    // GCC has __builtin_strlen according to
+    // https://gcc.gnu.org/onlinedocs/gcc-4.7.0/gcc/Other-Builtins.html, but
+    // ABSL_HAVE_BUILTIN doesn't detect that, so we use the extra checks above.
+    // __builtin_strlen is constexpr.
+    return __builtin_strlen(str);
+#else
+    return str ? strlen(str) : 0;
+#endif
+  }
+
+  static constexpr size_t Min(size_type length_a, size_type length_b) {
+    return length_a < length_b ? length_a : length_b;
+  }
+
+  static constexpr int CompareImpl(size_type length_a, size_type length_b,
+                                   int compare_result) {
+    return compare_result == 0 ? static_cast<int>(length_a > length_b) -
+                                     static_cast<int>(length_a < length_b)
+                               : (compare_result < 0 ? -1 : 1);
+  }
+
+  const char* ptr_;
+  size_type length_;
+};
+
+// This large function is defined inline so that in a fairly common case where
+// one of the arguments is a literal, the compiler can elide a lot of the
+// following comparisons.
+constexpr bool operator==(string_view x, string_view y) noexcept {
+  return x.size() == y.size() &&
+         (x.empty() ||
+          ABSL_INTERNAL_STRING_VIEW_MEMCMP(x.data(), y.data(), x.size()) == 0);
+}
+
+constexpr bool operator!=(string_view x, string_view y) noexcept {
+  return !(x == y);
+}
+
+constexpr bool operator<(string_view x, string_view y) noexcept {
+  return x.compare(y) < 0;
+}
+
+constexpr bool operator>(string_view x, string_view y) noexcept {
+  return y < x;
+}
+
+constexpr bool operator<=(string_view x, string_view y) noexcept {
+  return !(y < x);
+}
+
+constexpr bool operator>=(string_view x, string_view y) noexcept {
+  return !(x < y);
+}
+
+// IO Insertion Operator
+std::ostream& operator<<(std::ostream& o, string_view piece);
+
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#undef ABSL_INTERNAL_STRING_VIEW_MEMCMP
+
+#endif  // ABSL_USES_STD_STRING_VIEW
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+// ClippedSubstr()
+//
+// Like `s.substr(pos, n)`, but clips `pos` to an upper bound of `s.size()`.
+// Provided because std::string_view::substr throws if `pos > size()`
+inline string_view ClippedSubstr(string_view s, size_t pos,
+                                 size_t n = string_view::npos) {
+  pos = (std::min)(pos, static_cast<size_t>(s.size()));
+  return s.substr(pos, n);
+}
+
+// NullSafeStringView()
+//
+// Creates an `absl::string_view` from a pointer `p` even if it's null-valued.
+// This function should be used where an `absl::string_view` can be created from
+// a possibly-null pointer.
+constexpr string_view NullSafeStringView(const char* p) {
+  return p ? string_view(p) : string_view();
+}
+
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_STRINGS_STRING_VIEW_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/bad_optional_access.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/bad_optional_access.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/bad_optional_access.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/bad_optional_access.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,48 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "absl/types/bad_optional_access.h"
+
+#ifndef ABSL_USES_STD_OPTIONAL
+
+#include <cstdlib>
+
+#include "absl/base/config.h"
+#include "absl/base/internal/raw_logging.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+bad_optional_access::~bad_optional_access() = default;
+
+const char* bad_optional_access::what() const noexcept {
+  return "optional has no value";
+}
+
+namespace optional_internal {
+
+void throw_bad_optional_access() {
+#ifdef ABSL_HAVE_EXCEPTIONS
+  throw bad_optional_access();
+#else
+  ABSL_RAW_LOG(FATAL, "Bad optional access");
+  abort();
+#endif
+}
+
+}  // namespace optional_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_USES_STD_OPTIONAL
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/bad_optional_access.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/bad_optional_access.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/bad_optional_access.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/bad_optional_access.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,78 @@
+// Copyright 2018 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// -----------------------------------------------------------------------------
+// bad_optional_access.h
+// -----------------------------------------------------------------------------
+//
+// This header file defines the `absl::bad_optional_access` type.
+
+#ifndef ABSL_TYPES_BAD_OPTIONAL_ACCESS_H_
+#define ABSL_TYPES_BAD_OPTIONAL_ACCESS_H_
+
+#include <stdexcept>
+
+#include "absl/base/config.h"
+
+#ifdef ABSL_USES_STD_OPTIONAL
+
+#include <optional>
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+using std::bad_optional_access;
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#else  // ABSL_USES_STD_OPTIONAL
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+// -----------------------------------------------------------------------------
+// bad_optional_access
+// -----------------------------------------------------------------------------
+//
+// An `absl::bad_optional_access` type is an exception type that is thrown when
+// attempting to access an `absl::optional` object that does not contain a
+// value.
+//
+// Example:
+//
+//   absl::optional<int> o;
+//
+//   try {
+//     int n = o.value();
+//   } catch(const absl::bad_optional_access& e) {
+//     std::cout << "Bad optional access: " << e.what() << '\n';
+//   }
+class bad_optional_access : public std::exception {
+ public:
+  bad_optional_access() = default;
+  ~bad_optional_access() override;
+  const char* what() const noexcept override;
+};
+
+namespace optional_internal {
+
+// throw delegator
+[[noreturn]] void throw_bad_optional_access();
+
+}  // namespace optional_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_USES_STD_OPTIONAL
+
+#endif  // ABSL_TYPES_BAD_OPTIONAL_ACCESS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/internal/optional.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/internal/optional.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/internal/optional.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/internal/optional.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,396 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#ifndef ABSL_TYPES_INTERNAL_OPTIONAL_H_
+#define ABSL_TYPES_INTERNAL_OPTIONAL_H_
+
+#include <functional>
+#include <new>
+#include <type_traits>
+#include <utility>
+
+#include "absl/base/internal/inline_variable.h"
+#include "absl/memory/memory.h"
+#include "absl/meta/type_traits.h"
+#include "absl/utility/utility.h"
+
+// ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS
+//
+// Inheriting constructors is supported in GCC 4.8+, Clang 3.3+ and MSVC 2015.
+// __cpp_inheriting_constructors is a predefined macro and a recommended way to
+// check for this language feature, but GCC doesn't support it until 5.0 and
+// Clang doesn't support it until 3.6.
+// Also, MSVC 2015 has a bug: it doesn't inherit the constexpr template
+// constructor. For example, the following code won't work on MSVC 2015 Update3:
+// struct Base {
+//   int t;
+//   template <typename T>
+//   constexpr Base(T t_) : t(t_) {}
+// };
+// struct Foo : Base {
+//   using Base::Base;
+// }
+// constexpr Foo foo(0);  // doesn't work on MSVC 2015
+#if defined(__clang__)
+#if __has_feature(cxx_inheriting_constructors)
+#define ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS 1
+#endif
+#elif (defined(__GNUC__) &&                                       \
+       (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 8)) || \
+    (__cpp_inheriting_constructors >= 200802) ||                  \
+    (defined(_MSC_VER) && _MSC_VER >= 1910)
+#define ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS 1
+#endif
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+// Forward declaration
+template <typename T>
+class optional;
+
+namespace optional_internal {
+
+// This tag type is used as a constructor parameter type for `nullopt_t`.
+struct init_t {
+  explicit init_t() = default;
+};
+
+struct empty_struct {};
+
+// This class stores the data in optional<T>.
+// It is specialized based on whether T is trivially destructible.
+// This is the specialization for non trivially destructible type.
+template <typename T, bool unused = std::is_trivially_destructible<T>::value>
+class optional_data_dtor_base {
+  struct dummy_type {
+    static_assert(sizeof(T) % sizeof(empty_struct) == 0, "");
+    // Use an array to avoid GCC 6 placement-new warning.
+    empty_struct data[sizeof(T) / sizeof(empty_struct)];
+  };
+
+ protected:
+  // Whether there is data or not.
+  bool engaged_;
+  // Data storage
+  union {
+    T data_;
+    dummy_type dummy_;
+  };
+
+  void destruct() noexcept {
+    if (engaged_) {
+      data_.~T();
+      engaged_ = false;
+    }
+  }
+
+  // dummy_ must be initialized for constexpr constructor.
+  constexpr optional_data_dtor_base() noexcept : engaged_(false), dummy_{{}} {}
+
+  template <typename... Args>
+  constexpr explicit optional_data_dtor_base(in_place_t, Args&&... args)
+      : engaged_(true), data_(absl::forward<Args>(args)...) {}
+
+  ~optional_data_dtor_base() { destruct(); }
+};
+
+// Specialization for trivially destructible type.
+template <typename T>
+class optional_data_dtor_base<T, true> {
+  struct dummy_type {
+    static_assert(sizeof(T) % sizeof(empty_struct) == 0, "");
+    // Use array to avoid GCC 6 placement-new warning.
+    empty_struct data[sizeof(T) / sizeof(empty_struct)];
+  };
+
+ protected:
+  // Whether there is data or not.
+  bool engaged_;
+  // Data storage
+  union {
+    T data_;
+    dummy_type dummy_;
+  };
+  void destruct() noexcept { engaged_ = false; }
+
+  // dummy_ must be initialized for constexpr constructor.
+  constexpr optional_data_dtor_base() noexcept : engaged_(false), dummy_{{}} {}
+
+  template <typename... Args>
+  constexpr explicit optional_data_dtor_base(in_place_t, Args&&... args)
+      : engaged_(true), data_(absl::forward<Args>(args)...) {}
+};
+
+template <typename T>
+class optional_data_base : public optional_data_dtor_base<T> {
+ protected:
+  using base = optional_data_dtor_base<T>;
+#ifdef ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS
+  using base::base;
+#else
+  optional_data_base() = default;
+
+  template <typename... Args>
+  constexpr explicit optional_data_base(in_place_t t, Args&&... args)
+      : base(t, absl::forward<Args>(args)...) {}
+#endif
+
+  template <typename... Args>
+  void construct(Args&&... args) {
+    // Use dummy_'s address to work around casting cv-qualified T* to void*.
+    ::new (static_cast<void*>(&this->dummy_)) T(std::forward<Args>(args)...);
+    this->engaged_ = true;
+  }
+
+  template <typename U>
+  void assign(U&& u) {
+    if (this->engaged_) {
+      this->data_ = std::forward<U>(u);
+    } else {
+      construct(std::forward<U>(u));
+    }
+  }
+};
+
+// TODO(absl-team): Add another class using
+// std::is_trivially_move_constructible trait when available to match
+// http://cplusplus.github.io/LWG/lwg-defects.html#2900, for types that
+// have trivial move but nontrivial copy.
+// Also, we should be checking is_trivially_copyable here, which is not
+// supported now, so we use is_trivially_* traits instead.
+template <typename T,
+          bool unused = absl::is_trivially_copy_constructible<T>::value&&
+              absl::is_trivially_copy_assignable<typename std::remove_cv<
+                  T>::type>::value&& std::is_trivially_destructible<T>::value>
+class optional_data;
+
+// Trivially copyable types
+template <typename T>
+class optional_data<T, true> : public optional_data_base<T> {
+ protected:
+#ifdef ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS
+  using optional_data_base<T>::optional_data_base;
+#else
+  optional_data() = default;
+
+  template <typename... Args>
+  constexpr explicit optional_data(in_place_t t, Args&&... args)
+      : optional_data_base<T>(t, absl::forward<Args>(args)...) {}
+#endif
+};
+
+template <typename T>
+class optional_data<T, false> : public optional_data_base<T> {
+ protected:
+#ifdef ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS
+  using optional_data_base<T>::optional_data_base;
+#else
+  template <typename... Args>
+  constexpr explicit optional_data(in_place_t t, Args&&... args)
+      : optional_data_base<T>(t, absl::forward<Args>(args)...) {}
+#endif
+
+  optional_data() = default;
+
+  optional_data(const optional_data& rhs) : optional_data_base<T>() {
+    if (rhs.engaged_) {
+      this->construct(rhs.data_);
+    }
+  }
+
+  optional_data(optional_data&& rhs) noexcept(
+      absl::default_allocator_is_nothrow::value ||
+      std::is_nothrow_move_constructible<T>::value)
+      : optional_data_base<T>() {
+    if (rhs.engaged_) {
+      this->construct(std::move(rhs.data_));
+    }
+  }
+
+  optional_data& operator=(const optional_data& rhs) {
+    if (rhs.engaged_) {
+      this->assign(rhs.data_);
+    } else {
+      this->destruct();
+    }
+    return *this;
+  }
+
+  optional_data& operator=(optional_data&& rhs) noexcept(
+      std::is_nothrow_move_assignable<T>::value&&
+          std::is_nothrow_move_constructible<T>::value) {
+    if (rhs.engaged_) {
+      this->assign(std::move(rhs.data_));
+    } else {
+      this->destruct();
+    }
+    return *this;
+  }
+};
+
+// Ordered by level of restriction, from low to high.
+// Copyable implies movable.
+enum class copy_traits { copyable = 0, movable = 1, non_movable = 2 };
+
+// Base class for enabling/disabling copy/move constructor.
+template <copy_traits>
+class optional_ctor_base;
+
+template <>
+class optional_ctor_base<copy_traits::copyable> {
+ public:
+  constexpr optional_ctor_base() = default;
+  optional_ctor_base(const optional_ctor_base&) = default;
+  optional_ctor_base(optional_ctor_base&&) = default;
+  optional_ctor_base& operator=(const optional_ctor_base&) = default;
+  optional_ctor_base& operator=(optional_ctor_base&&) = default;
+};
+
+template <>
+class optional_ctor_base<copy_traits::movable> {
+ public:
+  constexpr optional_ctor_base() = default;
+  optional_ctor_base(const optional_ctor_base&) = delete;
+  optional_ctor_base(optional_ctor_base&&) = default;
+  optional_ctor_base& operator=(const optional_ctor_base&) = default;
+  optional_ctor_base& operator=(optional_ctor_base&&) = default;
+};
+
+template <>
+class optional_ctor_base<copy_traits::non_movable> {
+ public:
+  constexpr optional_ctor_base() = default;
+  optional_ctor_base(const optional_ctor_base&) = delete;
+  optional_ctor_base(optional_ctor_base&&) = delete;
+  optional_ctor_base& operator=(const optional_ctor_base&) = default;
+  optional_ctor_base& operator=(optional_ctor_base&&) = default;
+};
+
+// Base class for enabling/disabling copy/move assignment.
+template <copy_traits>
+class optional_assign_base;
+
+template <>
+class optional_assign_base<copy_traits::copyable> {
+ public:
+  constexpr optional_assign_base() = default;
+  optional_assign_base(const optional_assign_base&) = default;
+  optional_assign_base(optional_assign_base&&) = default;
+  optional_assign_base& operator=(const optional_assign_base&) = default;
+  optional_assign_base& operator=(optional_assign_base&&) = default;
+};
+
+template <>
+class optional_assign_base<copy_traits::movable> {
+ public:
+  constexpr optional_assign_base() = default;
+  optional_assign_base(const optional_assign_base&) = default;
+  optional_assign_base(optional_assign_base&&) = default;
+  optional_assign_base& operator=(const optional_assign_base&) = delete;
+  optional_assign_base& operator=(optional_assign_base&&) = default;
+};
+
+template <>
+class optional_assign_base<copy_traits::non_movable> {
+ public:
+  constexpr optional_assign_base() = default;
+  optional_assign_base(const optional_assign_base&) = default;
+  optional_assign_base(optional_assign_base&&) = default;
+  optional_assign_base& operator=(const optional_assign_base&) = delete;
+  optional_assign_base& operator=(optional_assign_base&&) = delete;
+};
+
+template <typename T>
+struct ctor_copy_traits {
+  static constexpr copy_traits traits =
+      std::is_copy_constructible<T>::value
+          ? copy_traits::copyable
+          : std::is_move_constructible<T>::value ? copy_traits::movable
+                                                 : copy_traits::non_movable;
+};
+
+template <typename T>
+struct assign_copy_traits {
+  static constexpr copy_traits traits =
+      absl::is_copy_assignable<T>::value && std::is_copy_constructible<T>::value
+          ? copy_traits::copyable
+          : absl::is_move_assignable<T>::value &&
+                    std::is_move_constructible<T>::value
+                ? copy_traits::movable
+                : copy_traits::non_movable;
+};
+
+// Whether T is constructible or convertible from optional<U>.
+template <typename T, typename U>
+struct is_constructible_convertible_from_optional
+    : std::integral_constant<
+          bool, std::is_constructible<T, optional<U>&>::value ||
+                    std::is_constructible<T, optional<U>&&>::value ||
+                    std::is_constructible<T, const optional<U>&>::value ||
+                    std::is_constructible<T, const optional<U>&&>::value ||
+                    std::is_convertible<optional<U>&, T>::value ||
+                    std::is_convertible<optional<U>&&, T>::value ||
+                    std::is_convertible<const optional<U>&, T>::value ||
+                    std::is_convertible<const optional<U>&&, T>::value> {};
+
+// Whether T is constructible or convertible or assignable from optional<U>.
+template <typename T, typename U>
+struct is_constructible_convertible_assignable_from_optional
+    : std::integral_constant<
+          bool, is_constructible_convertible_from_optional<T, U>::value ||
+                    std::is_assignable<T&, optional<U>&>::value ||
+                    std::is_assignable<T&, optional<U>&&>::value ||
+                    std::is_assignable<T&, const optional<U>&>::value ||
+                    std::is_assignable<T&, const optional<U>&&>::value> {};
+
+// Helper function used by [optional.relops], [optional.comp_with_t],
+// for checking whether an expression is convertible to bool.
+bool convertible_to_bool(bool);
+
+// Base class for std::hash<absl::optional<T>>:
+// If std::hash<std::remove_const_t<T>> is enabled, it provides operator() to
+// compute the hash; Otherwise, it is disabled.
+// Reference N4659 23.14.15 [unord.hash].
+template <typename T, typename = size_t>
+struct optional_hash_base {
+  optional_hash_base() = delete;
+  optional_hash_base(const optional_hash_base&) = delete;
+  optional_hash_base(optional_hash_base&&) = delete;
+  optional_hash_base& operator=(const optional_hash_base&) = delete;
+  optional_hash_base& operator=(optional_hash_base&&) = delete;
+};
+
+template <typename T>
+struct optional_hash_base<T, decltype(std::hash<absl::remove_const_t<T> >()(
+                                 std::declval<absl::remove_const_t<T> >()))> {
+  using argument_type = absl::optional<T>;
+  using result_type = size_t;
+  size_t operator()(const absl::optional<T>& opt) const {
+    absl::type_traits_internal::AssertHashEnabled<absl::remove_const_t<T>>();
+    if (opt) {
+      return std::hash<absl::remove_const_t<T> >()(*opt);
+    } else {
+      return static_cast<size_t>(0x297814aaad196e6dULL);
+    }
+  }
+};
+
+}  // namespace optional_internal
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#undef ABSL_OPTIONAL_USE_INHERITING_CONSTRUCTORS
+
+#endif  // ABSL_TYPES_INTERNAL_OPTIONAL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/optional.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/optional.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/optional.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/types/optional.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,776 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// -----------------------------------------------------------------------------
+// optional.h
+// -----------------------------------------------------------------------------
+//
+// This header file defines the `absl::optional` type for holding a value which
+// may or may not be present. This type is useful for providing value semantics
+// for operations that may either wish to return or hold "something-or-nothing".
+//
+// Example:
+//
+//   // A common way to signal operation failure is to provide an output
+//   // parameter and a bool return type:
+//   bool AcquireResource(const Input&, Resource * out);
+//
+//   // Providing an absl::optional return type provides a cleaner API:
+//   absl::optional<Resource> AcquireResource(const Input&);
+//
+// `absl::optional` is a C++11 compatible version of the C++17 `std::optional`
+// abstraction and is designed to be a drop-in replacement for code compliant
+// with C++17.
+#ifndef ABSL_TYPES_OPTIONAL_H_
+#define ABSL_TYPES_OPTIONAL_H_
+
+#include "absl/base/config.h"   // TODO(calabrese) IWYU removal?
+#include "absl/utility/utility.h"
+
+#ifdef ABSL_USES_STD_OPTIONAL
+
+#include <optional>  // IWYU pragma: export
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+using std::bad_optional_access;
+using std::optional;
+using std::make_optional;
+using std::nullopt_t;
+using std::nullopt;
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#else  // ABSL_USES_STD_OPTIONAL
+
+#include <cassert>
+#include <functional>
+#include <initializer_list>
+#include <type_traits>
+#include <utility>
+
+#include "absl/base/attributes.h"
+#include "absl/base/internal/inline_variable.h"
+#include "absl/meta/type_traits.h"
+#include "absl/types/bad_optional_access.h"
+#include "absl/types/internal/optional.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+// nullopt_t
+//
+// Class type for `absl::nullopt` used to indicate an `absl::optional<T>` type
+// that does not contain a value.
+struct nullopt_t {
+  // It must not be default-constructible to avoid ambiguity for opt = {}.
+  explicit constexpr nullopt_t(optional_internal::init_t) noexcept {}
+};
+
+// nullopt
+//
+// A tag constant of type `absl::nullopt_t` used to indicate an empty
+// `absl::optional` in certain functions, such as construction or assignment.
+ABSL_INTERNAL_INLINE_CONSTEXPR(nullopt_t, nullopt,
+                               nullopt_t(optional_internal::init_t()));
+
+// -----------------------------------------------------------------------------
+// absl::optional
+// -----------------------------------------------------------------------------
+//
+// A value of type `absl::optional<T>` holds either a value of `T` or an
+// "empty" value.  When it holds a value of `T`, it stores it as a direct
+// sub-object, so `sizeof(optional<T>)` is approximately
+// `sizeof(T) + sizeof(bool)`.
+//
+// This implementation is based on the specification in the latest draft of the
+// C++17 `std::optional` specification as of May 2017, section 20.6.
+//
+// Differences between `absl::optional<T>` and `std::optional<T>` include:
+//
+//    * `constexpr` is not used for non-const member functions.
+//      (dependency on some differences between C++11 and C++14.)
+//    * `absl::nullopt` and `absl::in_place` are not declared `constexpr`. We
+//      need the inline variable support in C++17 for external linkage.
+//    * Throws `absl::bad_optional_access` instead of
+//      `std::bad_optional_access`.
+//    * `make_optional()` cannot be declared `constexpr` due to the absence of
+//      guaranteed copy elision.
+//    * The move constructor's `noexcept` specification is stronger, i.e. if the
+//      default allocator is non-throwing (via setting
+//      `ABSL_ALLOCATOR_NOTHROW`), it evaluates to `noexcept(true)`, because
+//      we assume
+//       a) move constructors should only throw due to allocation failure and
+//       b) if T's move constructor allocates, it uses the same allocation
+//          function as the default allocator.
+//
+template <typename T>
+class optional : private optional_internal::optional_data<T>,
+                 private optional_internal::optional_ctor_base<
+                     optional_internal::ctor_copy_traits<T>::traits>,
+                 private optional_internal::optional_assign_base<
+                     optional_internal::assign_copy_traits<T>::traits> {
+  using data_base = optional_internal::optional_data<T>;
+
+ public:
+  typedef T value_type;
+
+  // Constructors
+
+  // Constructs an `optional` holding an empty value, NOT a default constructed
+  // `T`.
+  constexpr optional() noexcept {}
+
+  // Constructs an `optional` initialized with `nullopt` to hold an empty value.
+  constexpr optional(nullopt_t) noexcept {}  // NOLINT(runtime/explicit)
+
+  // Copy constructor, standard semantics
+  optional(const optional&) = default;
+
+  // Move constructor, standard semantics
+  optional(optional&&) = default;
+
+  // Constructs a non-empty `optional` direct-initialized value of type `T` from
+  // the arguments `std::forward<Args>(args)...`  within the `optional`.
+  // (The `in_place_t` is a tag used to indicate that the contained object
+  // should be constructed in-place.)
+  template <typename InPlaceT, typename... Args,
+            absl::enable_if_t<absl::conjunction<
+                std::is_same<InPlaceT, in_place_t>,
+                std::is_constructible<T, Args&&...> >::value>* = nullptr>
+  constexpr explicit optional(InPlaceT, Args&&... args)
+      : data_base(in_place_t(), absl::forward<Args>(args)...) {}
+
+  // Constructs a non-empty `optional` direct-initialized value of type `T` from
+  // the arguments of an initializer_list and `std::forward<Args>(args)...`.
+  // (The `in_place_t` is a tag used to indicate that the contained object
+  // should be constructed in-place.)
+  template <typename U, typename... Args,
+            typename = typename std::enable_if<std::is_constructible<
+                T, std::initializer_list<U>&, Args&&...>::value>::type>
+  constexpr explicit optional(in_place_t, std::initializer_list<U> il,
+                              Args&&... args)
+      : data_base(in_place_t(), il, absl::forward<Args>(args)...) {
+  }
+
+  // Value constructor (implicit)
+  template <
+      typename U = T,
+      typename std::enable_if<
+          absl::conjunction<absl::negation<std::is_same<
+                                in_place_t, typename std::decay<U>::type> >,
+                            absl::negation<std::is_same<
+                                optional<T>, typename std::decay<U>::type> >,
+                            std::is_convertible<U&&, T>,
+                            std::is_constructible<T, U&&> >::value,
+          bool>::type = false>
+  constexpr optional(U&& v) : data_base(in_place_t(), absl::forward<U>(v)) {}
+
+  // Value constructor (explicit)
+  template <
+      typename U = T,
+      typename std::enable_if<
+          absl::conjunction<absl::negation<std::is_same<
+                                in_place_t, typename std::decay<U>::type>>,
+                            absl::negation<std::is_same<
+                                optional<T>, typename std::decay<U>::type>>,
+                            absl::negation<std::is_convertible<U&&, T>>,
+                            std::is_constructible<T, U&&>>::value,
+          bool>::type = false>
+  explicit constexpr optional(U&& v)
+      : data_base(in_place_t(), absl::forward<U>(v)) {}
+
+  // Converting copy constructor (implicit)
+  template <typename U,
+            typename std::enable_if<
+                absl::conjunction<
+                    absl::negation<std::is_same<T, U> >,
+                    std::is_constructible<T, const U&>,
+                    absl::negation<
+                        optional_internal::
+                            is_constructible_convertible_from_optional<T, U> >,
+                    std::is_convertible<const U&, T> >::value,
+                bool>::type = false>
+  optional(const optional<U>& rhs) {
+    if (rhs) {
+      this->construct(*rhs);
+    }
+  }
+
+  // Converting copy constructor (explicit)
+  template <typename U,
+            typename std::enable_if<
+                absl::conjunction<
+                    absl::negation<std::is_same<T, U>>,
+                    std::is_constructible<T, const U&>,
+                    absl::negation<
+                        optional_internal::
+                            is_constructible_convertible_from_optional<T, U>>,
+                    absl::negation<std::is_convertible<const U&, T>>>::value,
+                bool>::type = false>
+  explicit optional(const optional<U>& rhs) {
+    if (rhs) {
+      this->construct(*rhs);
+    }
+  }
+
+  // Converting move constructor (implicit)
+  template <typename U,
+            typename std::enable_if<
+                absl::conjunction<
+                    absl::negation<std::is_same<T, U> >,
+                    std::is_constructible<T, U&&>,
+                    absl::negation<
+                        optional_internal::
+                            is_constructible_convertible_from_optional<T, U> >,
+                    std::is_convertible<U&&, T> >::value,
+                bool>::type = false>
+  optional(optional<U>&& rhs) {
+    if (rhs) {
+      this->construct(std::move(*rhs));
+    }
+  }
+
+  // Converting move constructor (explicit)
+  template <
+      typename U,
+      typename std::enable_if<
+          absl::conjunction<
+              absl::negation<std::is_same<T, U>>, std::is_constructible<T, U&&>,
+              absl::negation<
+                  optional_internal::is_constructible_convertible_from_optional<
+                      T, U>>,
+              absl::negation<std::is_convertible<U&&, T>>>::value,
+          bool>::type = false>
+  explicit optional(optional<U>&& rhs) {
+    if (rhs) {
+      this->construct(std::move(*rhs));
+    }
+  }
+
+  // Destructor. Trivial if `T` is trivially destructible.
+  ~optional() = default;
+
+  // Assignment Operators
+
+  // Assignment from `nullopt`
+  //
+  // Example:
+  //
+  //   struct S { int value; };
+  //   optional<S> opt = absl::nullopt;  // Could also use opt = { };
+  optional& operator=(nullopt_t) noexcept {
+    this->destruct();
+    return *this;
+  }
+
+  // Copy assignment operator, standard semantics
+  optional& operator=(const optional& src) = default;
+
+  // Move assignment operator, standard semantics
+  optional& operator=(optional&& src) = default;
+
+  // Value assignment operators
+  template <
+      typename U = T,
+      typename = typename std::enable_if<absl::conjunction<
+          absl::negation<
+              std::is_same<optional<T>, typename std::decay<U>::type>>,
+          absl::negation<
+              absl::conjunction<std::is_scalar<T>,
+                                std::is_same<T, typename std::decay<U>::type>>>,
+          std::is_constructible<T, U>, std::is_assignable<T&, U>>::value>::type>
+  optional& operator=(U&& v) {
+    this->assign(std::forward<U>(v));
+    return *this;
+  }
+
+  template <
+      typename U,
+      typename = typename std::enable_if<absl::conjunction<
+          absl::negation<std::is_same<T, U>>,
+          std::is_constructible<T, const U&>, std::is_assignable<T&, const U&>,
+          absl::negation<
+              optional_internal::
+                  is_constructible_convertible_assignable_from_optional<
+                      T, U>>>::value>::type>
+  optional& operator=(const optional<U>& rhs) {
+    if (rhs) {
+      this->assign(*rhs);
+    } else {
+      this->destruct();
+    }
+    return *this;
+  }
+
+  template <typename U,
+            typename = typename std::enable_if<absl::conjunction<
+                absl::negation<std::is_same<T, U>>, std::is_constructible<T, U>,
+                std::is_assignable<T&, U>,
+                absl::negation<
+                    optional_internal::
+                        is_constructible_convertible_assignable_from_optional<
+                            T, U>>>::value>::type>
+  optional& operator=(optional<U>&& rhs) {
+    if (rhs) {
+      this->assign(std::move(*rhs));
+    } else {
+      this->destruct();
+    }
+    return *this;
+  }
+
+  // Modifiers
+
+  // optional::reset()
+  //
+  // Destroys the inner `T` value of an `absl::optional` if one is present.
+  ABSL_ATTRIBUTE_REINITIALIZES void reset() noexcept { this->destruct(); }
+
+  // optional::emplace()
+  //
+  // (Re)constructs the underlying `T` in-place with the given forwarded
+  // arguments.
+  //
+  // Example:
+  //
+  //   optional<Foo> opt;
+  //   opt.emplace(arg1,arg2,arg3);  // Constructs Foo(arg1,arg2,arg3)
+  //
+  // If the optional is non-empty, and the `args` refer to subobjects of the
+  // current object, then behaviour is undefined, because the current object
+  // will be destructed before the new object is constructed with `args`.
+  template <typename... Args,
+            typename = typename std::enable_if<
+                std::is_constructible<T, Args&&...>::value>::type>
+  T& emplace(Args&&... args) {
+    this->destruct();
+    this->construct(std::forward<Args>(args)...);
+    return reference();
+  }
+
+  // Emplace reconstruction overload for an initializer list and the given
+  // forwarded arguments.
+  //
+  // Example:
+  //
+  //   struct Foo {
+  //     Foo(std::initializer_list<int>);
+  //   };
+  //
+  //   optional<Foo> opt;
+  //   opt.emplace({1,2,3});  // Constructs Foo({1,2,3})
+  template <typename U, typename... Args,
+            typename = typename std::enable_if<std::is_constructible<
+                T, std::initializer_list<U>&, Args&&...>::value>::type>
+  T& emplace(std::initializer_list<U> il, Args&&... args) {
+    this->destruct();
+    this->construct(il, std::forward<Args>(args)...);
+    return reference();
+  }
+
+  // Swaps
+
+  // Swap, standard semantics
+  void swap(optional& rhs) noexcept(
+      std::is_nothrow_move_constructible<T>::value&&
+          type_traits_internal::IsNothrowSwappable<T>::value) {
+    if (*this) {
+      if (rhs) {
+        type_traits_internal::Swap(**this, *rhs);
+      } else {
+        rhs.construct(std::move(**this));
+        this->destruct();
+      }
+    } else {
+      if (rhs) {
+        this->construct(std::move(*rhs));
+        rhs.destruct();
+      } else {
+        // No effect (swap(disengaged, disengaged)).
+      }
+    }
+  }
+
+  // Observers
+
+  // optional::operator->()
+  //
+  // Accesses the underlying `T` value's member `m` of an `optional`. If the
+  // `optional` is empty, behavior is undefined.
+  //
+  // If you need myOpt->foo in constexpr, use (*myOpt).foo instead.
+  const T* operator->() const {
+    ABSL_HARDENING_ASSERT(this->engaged_);
+    return std::addressof(this->data_);
+  }
+  T* operator->() {
+    ABSL_HARDENING_ASSERT(this->engaged_);
+    return std::addressof(this->data_);
+  }
+
+  // optional::operator*()
+  //
+  // Accesses the underlying `T` value of an `optional`. If the `optional` is
+  // empty, behavior is undefined.
+  constexpr const T& operator*() const& {
+    return ABSL_HARDENING_ASSERT(this->engaged_), reference();
+  }
+  T& operator*() & {
+    ABSL_HARDENING_ASSERT(this->engaged_);
+    return reference();
+  }
+  constexpr const T&& operator*() const && {
+    return ABSL_HARDENING_ASSERT(this->engaged_), absl::move(reference());
+  }
+  T&& operator*() && {
+    ABSL_HARDENING_ASSERT(this->engaged_);
+    return std::move(reference());
+  }
+
+  // optional::operator bool()
+  //
+  // Returns false if and only if the `optional` is empty.
+  //
+  //   if (opt) {
+  //     // do something with *opt or opt->;
+  //   } else {
+  //     // opt is empty.
+  //   }
+  //
+  constexpr explicit operator bool() const noexcept { return this->engaged_; }
+
+  // optional::has_value()
+  //
+  // Determines whether the `optional` contains a value. Returns `false` if and
+  // only if `*this` is empty.
+  constexpr bool has_value() const noexcept { return this->engaged_; }
+
+// Suppress bogus warning on MSVC: MSVC complains call to reference() after
+// throw_bad_optional_access() is unreachable.
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4702)
+#endif  // _MSC_VER
+  // optional::value()
+  //
+  // Returns a reference to an `optional`s underlying value. The constness
+  // and lvalue/rvalue-ness of the `optional` is preserved to the view of
+  // the `T` sub-object. Throws `absl::bad_optional_access` when the `optional`
+  // is empty.
+  constexpr const T& value() const & {
+    return static_cast<bool>(*this)
+               ? reference()
+               : (optional_internal::throw_bad_optional_access(), reference());
+  }
+  T& value() & {
+    return static_cast<bool>(*this)
+               ? reference()
+               : (optional_internal::throw_bad_optional_access(), reference());
+  }
+  T&& value() && {  // NOLINT(build/c++11)
+    return std::move(
+        static_cast<bool>(*this)
+            ? reference()
+            : (optional_internal::throw_bad_optional_access(), reference()));
+  }
+  constexpr const T&& value() const && {  // NOLINT(build/c++11)
+    return absl::move(
+        static_cast<bool>(*this)
+            ? reference()
+            : (optional_internal::throw_bad_optional_access(), reference()));
+  }
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif  // _MSC_VER
+
+  // optional::value_or()
+  //
+  // Returns either the value of `T` or a passed default `v` if the `optional`
+  // is empty.
+  template <typename U>
+  constexpr T value_or(U&& v) const& {
+    static_assert(std::is_copy_constructible<value_type>::value,
+                  "optional<T>::value_or: T must be copy constructible");
+    static_assert(std::is_convertible<U&&, value_type>::value,
+                  "optional<T>::value_or: U must be convertible to T");
+    return static_cast<bool>(*this)
+               ? **this
+               : static_cast<T>(absl::forward<U>(v));
+  }
+  template <typename U>
+  T value_or(U&& v) && {  // NOLINT(build/c++11)
+    static_assert(std::is_move_constructible<value_type>::value,
+                  "optional<T>::value_or: T must be move constructible");
+    static_assert(std::is_convertible<U&&, value_type>::value,
+                  "optional<T>::value_or: U must be convertible to T");
+    return static_cast<bool>(*this) ? std::move(**this)
+                                    : static_cast<T>(std::forward<U>(v));
+  }
+
+ private:
+  // Private accessors for internal storage viewed as reference to T.
+  constexpr const T& reference() const { return this->data_; }
+  T& reference() { return this->data_; }
+
+  // T constraint checks.  You can't have an optional of nullopt_t, in_place_t
+  // or a reference.
+  static_assert(
+      !std::is_same<nullopt_t, typename std::remove_cv<T>::type>::value,
+      "optional<nullopt_t> is not allowed.");
+  static_assert(
+      !std::is_same<in_place_t, typename std::remove_cv<T>::type>::value,
+      "optional<in_place_t> is not allowed.");
+  static_assert(!std::is_reference<T>::value,
+                "optional<reference> is not allowed.");
+};
+
+// Non-member functions
+
+// swap()
+//
+// Performs a swap between two `absl::optional` objects, using standard
+// semantics.
+template <typename T, typename std::enable_if<
+                          std::is_move_constructible<T>::value &&
+                              type_traits_internal::IsSwappable<T>::value,
+                          bool>::type = false>
+void swap(optional<T>& a, optional<T>& b) noexcept(noexcept(a.swap(b))) {
+  a.swap(b);
+}
+
+// make_optional()
+//
+// Creates a non-empty `optional<T>` where the type of `T` is deduced. An
+// `absl::optional` can also be explicitly instantiated with
+// `make_optional<T>(v)`.
+//
+// Note: `make_optional()` constructions may be declared `constexpr` for
+// trivially copyable types `T`. Non-trivial types require copy elision
+// support in C++17 for `make_optional` to support `constexpr` on such
+// non-trivial types.
+//
+// Example:
+//
+//   constexpr absl::optional<int> opt = absl::make_optional(1);
+//   static_assert(opt.value() == 1, "");
+template <typename T>
+constexpr optional<typename std::decay<T>::type> make_optional(T&& v) {
+  return optional<typename std::decay<T>::type>(absl::forward<T>(v));
+}
+
+template <typename T, typename... Args>
+constexpr optional<T> make_optional(Args&&... args) {
+  return optional<T>(in_place_t(), absl::forward<Args>(args)...);
+}
+
+template <typename T, typename U, typename... Args>
+constexpr optional<T> make_optional(std::initializer_list<U> il,
+                                    Args&&... args) {
+  return optional<T>(in_place_t(), il,
+                     absl::forward<Args>(args)...);
+}
+
+// Relational operators [optional.relops]
+
+// Empty optionals are considered equal to each other and less than non-empty
+// optionals. Supports relations between optional<T> and optional<U>, between
+// optional<T> and U, and between optional<T> and nullopt.
+//
+// Note: We're careful to support T having non-bool relationals.
+
+// Requires: The expression, e.g. "*x == *y" shall be well-formed and its result
+// shall be convertible to bool.
+// The C++17 (N4606) "Returns:" statements are translated into
+// code in an obvious way here, and the original text retained as function docs.
+// Returns: If bool(x) != bool(y), false; otherwise if bool(x) == false, true;
+// otherwise *x == *y.
+template <typename T, typename U>
+constexpr auto operator==(const optional<T>& x, const optional<U>& y)
+    -> decltype(optional_internal::convertible_to_bool(*x == *y)) {
+  return static_cast<bool>(x) != static_cast<bool>(y)
+             ? false
+             : static_cast<bool>(x) == false ? true
+                                             : static_cast<bool>(*x == *y);
+}
+
+// Returns: If bool(x) != bool(y), true; otherwise, if bool(x) == false, false;
+// otherwise *x != *y.
+template <typename T, typename U>
+constexpr auto operator!=(const optional<T>& x, const optional<U>& y)
+    -> decltype(optional_internal::convertible_to_bool(*x != *y)) {
+  return static_cast<bool>(x) != static_cast<bool>(y)
+             ? true
+             : static_cast<bool>(x) == false ? false
+                                             : static_cast<bool>(*x != *y);
+}
+// Returns: If !y, false; otherwise, if !x, true; otherwise *x < *y.
+template <typename T, typename U>
+constexpr auto operator<(const optional<T>& x, const optional<U>& y)
+    -> decltype(optional_internal::convertible_to_bool(*x < *y)) {
+  return !y ? false : !x ? true : static_cast<bool>(*x < *y);
+}
+// Returns: If !x, false; otherwise, if !y, true; otherwise *x > *y.
+template <typename T, typename U>
+constexpr auto operator>(const optional<T>& x, const optional<U>& y)
+    -> decltype(optional_internal::convertible_to_bool(*x > *y)) {
+  return !x ? false : !y ? true : static_cast<bool>(*x > *y);
+}
+// Returns: If !x, true; otherwise, if !y, false; otherwise *x <= *y.
+template <typename T, typename U>
+constexpr auto operator<=(const optional<T>& x, const optional<U>& y)
+    -> decltype(optional_internal::convertible_to_bool(*x <= *y)) {
+  return !x ? true : !y ? false : static_cast<bool>(*x <= *y);
+}
+// Returns: If !y, true; otherwise, if !x, false; otherwise *x >= *y.
+template <typename T, typename U>
+constexpr auto operator>=(const optional<T>& x, const optional<U>& y)
+    -> decltype(optional_internal::convertible_to_bool(*x >= *y)) {
+  return !y ? true : !x ? false : static_cast<bool>(*x >= *y);
+}
+
+// Comparison with nullopt [optional.nullops]
+// The C++17 (N4606) "Returns:" statements are used directly here.
+template <typename T>
+constexpr bool operator==(const optional<T>& x, nullopt_t) noexcept {
+  return !x;
+}
+template <typename T>
+constexpr bool operator==(nullopt_t, const optional<T>& x) noexcept {
+  return !x;
+}
+template <typename T>
+constexpr bool operator!=(const optional<T>& x, nullopt_t) noexcept {
+  return static_cast<bool>(x);
+}
+template <typename T>
+constexpr bool operator!=(nullopt_t, const optional<T>& x) noexcept {
+  return static_cast<bool>(x);
+}
+template <typename T>
+constexpr bool operator<(const optional<T>&, nullopt_t) noexcept {
+  return false;
+}
+template <typename T>
+constexpr bool operator<(nullopt_t, const optional<T>& x) noexcept {
+  return static_cast<bool>(x);
+}
+template <typename T>
+constexpr bool operator<=(const optional<T>& x, nullopt_t) noexcept {
+  return !x;
+}
+template <typename T>
+constexpr bool operator<=(nullopt_t, const optional<T>&) noexcept {
+  return true;
+}
+template <typename T>
+constexpr bool operator>(const optional<T>& x, nullopt_t) noexcept {
+  return static_cast<bool>(x);
+}
+template <typename T>
+constexpr bool operator>(nullopt_t, const optional<T>&) noexcept {
+  return false;
+}
+template <typename T>
+constexpr bool operator>=(const optional<T>&, nullopt_t) noexcept {
+  return true;
+}
+template <typename T>
+constexpr bool operator>=(nullopt_t, const optional<T>& x) noexcept {
+  return !x;
+}
+
+// Comparison with T [optional.comp_with_t]
+
+// Requires: The expression, e.g. "*x == v" shall be well-formed and its result
+// shall be convertible to bool.
+// The C++17 (N4606) "Equivalent to:" statements are used directly here.
+template <typename T, typename U>
+constexpr auto operator==(const optional<T>& x, const U& v)
+    -> decltype(optional_internal::convertible_to_bool(*x == v)) {
+  return static_cast<bool>(x) ? static_cast<bool>(*x == v) : false;
+}
+template <typename T, typename U>
+constexpr auto operator==(const U& v, const optional<T>& x)
+    -> decltype(optional_internal::convertible_to_bool(v == *x)) {
+  return static_cast<bool>(x) ? static_cast<bool>(v == *x) : false;
+}
+template <typename T, typename U>
+constexpr auto operator!=(const optional<T>& x, const U& v)
+    -> decltype(optional_internal::convertible_to_bool(*x != v)) {
+  return static_cast<bool>(x) ? static_cast<bool>(*x != v) : true;
+}
+template <typename T, typename U>
+constexpr auto operator!=(const U& v, const optional<T>& x)
+    -> decltype(optional_internal::convertible_to_bool(v != *x)) {
+  return static_cast<bool>(x) ? static_cast<bool>(v != *x) : true;
+}
+template <typename T, typename U>
+constexpr auto operator<(const optional<T>& x, const U& v)
+    -> decltype(optional_internal::convertible_to_bool(*x < v)) {
+  return static_cast<bool>(x) ? static_cast<bool>(*x < v) : true;
+}
+template <typename T, typename U>
+constexpr auto operator<(const U& v, const optional<T>& x)
+    -> decltype(optional_internal::convertible_to_bool(v < *x)) {
+  return static_cast<bool>(x) ? static_cast<bool>(v < *x) : false;
+}
+template <typename T, typename U>
+constexpr auto operator<=(const optional<T>& x, const U& v)
+    -> decltype(optional_internal::convertible_to_bool(*x <= v)) {
+  return static_cast<bool>(x) ? static_cast<bool>(*x <= v) : true;
+}
+template <typename T, typename U>
+constexpr auto operator<=(const U& v, const optional<T>& x)
+    -> decltype(optional_internal::convertible_to_bool(v <= *x)) {
+  return static_cast<bool>(x) ? static_cast<bool>(v <= *x) : false;
+}
+template <typename T, typename U>
+constexpr auto operator>(const optional<T>& x, const U& v)
+    -> decltype(optional_internal::convertible_to_bool(*x > v)) {
+  return static_cast<bool>(x) ? static_cast<bool>(*x > v) : false;
+}
+template <typename T, typename U>
+constexpr auto operator>(const U& v, const optional<T>& x)
+    -> decltype(optional_internal::convertible_to_bool(v > *x)) {
+  return static_cast<bool>(x) ? static_cast<bool>(v > *x) : true;
+}
+template <typename T, typename U>
+constexpr auto operator>=(const optional<T>& x, const U& v)
+    -> decltype(optional_internal::convertible_to_bool(*x >= v)) {
+  return static_cast<bool>(x) ? static_cast<bool>(*x >= v) : false;
+}
+template <typename T, typename U>
+constexpr auto operator>=(const U& v, const optional<T>& x)
+    -> decltype(optional_internal::convertible_to_bool(v >= *x)) {
+  return static_cast<bool>(x) ? static_cast<bool>(v >= *x) : true;
+}
+
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+namespace std {
+
+// std::hash specialization for absl::optional.
+template <typename T>
+struct hash<absl::optional<T> >
+    : absl::optional_internal::optional_hash_base<T> {};
+
+}  // namespace std
+
+#undef ABSL_MSVC_CONSTEXPR_BUG_IN_UNION_LIKE_CLASS
+
+#endif  // ABSL_USES_STD_OPTIONAL
+
+#endif  // ABSL_TYPES_OPTIONAL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/utility/utility.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/utility/utility.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/utility/utility.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/absl/utility/utility.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,350 @@
+// Copyright 2017 The Abseil Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// This header file contains C++11 versions of standard <utility> header
+// abstractions available within C++14 and C++17, and are designed to be drop-in
+// replacement for code compliant with C++14 and C++17.
+//
+// The following abstractions are defined:
+//
+//   * integer_sequence<T, Ints...>  == std::integer_sequence<T, Ints...>
+//   * index_sequence<Ints...>       == std::index_sequence<Ints...>
+//   * make_integer_sequence<T, N>   == std::make_integer_sequence<T, N>
+//   * make_index_sequence<N>        == std::make_index_sequence<N>
+//   * index_sequence_for<Ts...>     == std::index_sequence_for<Ts...>
+//   * apply<Functor, Tuple>         == std::apply<Functor, Tuple>
+//   * exchange<T>                   == std::exchange<T>
+//   * make_from_tuple<T>            == std::make_from_tuple<T>
+//
+// This header file also provides the tag types `in_place_t`, `in_place_type_t`,
+// and `in_place_index_t`, as well as the constant `in_place`, and
+// `constexpr` `std::move()` and `std::forward()` implementations in C++11.
+//
+// References:
+//
+//  https://en.cppreference.com/w/cpp/utility/integer_sequence
+//  https://en.cppreference.com/w/cpp/utility/apply
+//  http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3658.html
+
+#ifndef ABSL_UTILITY_UTILITY_H_
+#define ABSL_UTILITY_UTILITY_H_
+
+#include <cstddef>
+#include <cstdlib>
+#include <tuple>
+#include <utility>
+
+#include "absl/base/config.h"
+#include "absl/base/internal/inline_variable.h"
+#include "absl/base/internal/invoke.h"
+#include "absl/meta/type_traits.h"
+
+namespace absl {
+ABSL_NAMESPACE_BEGIN
+
+// integer_sequence
+//
+// Class template representing a compile-time integer sequence. An instantiation
+// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
+// type through its template arguments (which is a common need when
+// working with C++11 variadic templates). `absl::integer_sequence` is designed
+// to be a drop-in replacement for C++14's `std::integer_sequence`.
+//
+// Example:
+//
+//   template< class T, T... Ints >
+//   void user_function(integer_sequence<T, Ints...>);
+//
+//   int main()
+//   {
+//     // user_function's `T` will be deduced to `int` and `Ints...`
+//     // will be deduced to `0, 1, 2, 3, 4`.
+//     user_function(make_integer_sequence<int, 5>());
+//   }
+template <typename T, T... Ints>
+struct integer_sequence {
+  using value_type = T;
+  static constexpr size_t size() noexcept { return sizeof...(Ints); }
+};
+
+// index_sequence
+//
+// A helper template for an `integer_sequence` of `size_t`,
+// `absl::index_sequence` is designed to be a drop-in replacement for C++14's
+// `std::index_sequence`.
+template <size_t... Ints>
+using index_sequence = integer_sequence<size_t, Ints...>;
+
+namespace utility_internal {
+
+template <typename Seq, size_t SeqSize, size_t Rem>
+struct Extend;
+
+// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 0> {
+  using type = integer_sequence<T, Ints..., (Ints + SeqSize)...>;
+};
+
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 1> {
+  using type = integer_sequence<T, Ints..., (Ints + SeqSize)..., 2 * SeqSize>;
+};
+
+// Recursion helper for 'make_integer_sequence<T, N>'.
+// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
+template <typename T, size_t N>
+struct Gen {
+  using type =
+      typename Extend<typename Gen<T, N / 2>::type, N / 2, N % 2>::type;
+};
+
+template <typename T>
+struct Gen<T, 0> {
+  using type = integer_sequence<T>;
+};
+
+template <typename T>
+struct InPlaceTypeTag {
+  explicit InPlaceTypeTag() = delete;
+  InPlaceTypeTag(const InPlaceTypeTag&) = delete;
+  InPlaceTypeTag& operator=(const InPlaceTypeTag&) = delete;
+};
+
+template <size_t I>
+struct InPlaceIndexTag {
+  explicit InPlaceIndexTag() = delete;
+  InPlaceIndexTag(const InPlaceIndexTag&) = delete;
+  InPlaceIndexTag& operator=(const InPlaceIndexTag&) = delete;
+};
+
+}  // namespace utility_internal
+
+// Compile-time sequences of integers
+
+// make_integer_sequence
+//
+// This template alias is equivalent to
+// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
+// replacement for C++14's `std::make_integer_sequence`.
+template <typename T, T N>
+using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
+
+// make_index_sequence
+//
+// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
+// and is designed to be a drop-in replacement for C++14's
+// `std::make_index_sequence`.
+template <size_t N>
+using make_index_sequence = make_integer_sequence<size_t, N>;
+
+// index_sequence_for
+//
+// Converts a typename pack into an index sequence of the same length, and
+// is designed to be a drop-in replacement for C++14's
+// `std::index_sequence_for()`
+template <typename... Ts>
+using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
+
+// Tag types
+
+#ifdef ABSL_USES_STD_OPTIONAL
+
+using std::in_place_t;
+using std::in_place;
+
+#else  // ABSL_USES_STD_OPTIONAL
+
+// in_place_t
+//
+// Tag type used to specify in-place construction, such as with
+// `absl::optional`, designed to be a drop-in replacement for C++17's
+// `std::in_place_t`.
+struct in_place_t {};
+
+ABSL_INTERNAL_INLINE_CONSTEXPR(in_place_t, in_place, {});
+
+#endif  // ABSL_USES_STD_OPTIONAL
+
+#if defined(ABSL_USES_STD_ANY) || defined(ABSL_USES_STD_VARIANT)
+using std::in_place_type;
+using std::in_place_type_t;
+#else
+
+// in_place_type_t
+//
+// Tag type used for in-place construction when the type to construct needs to
+// be specified, such as with `absl::any`, designed to be a drop-in replacement
+// for C++17's `std::in_place_type_t`.
+template <typename T>
+using in_place_type_t = void (*)(utility_internal::InPlaceTypeTag<T>);
+
+template <typename T>
+void in_place_type(utility_internal::InPlaceTypeTag<T>) {}
+#endif  // ABSL_USES_STD_ANY || ABSL_USES_STD_VARIANT
+
+#ifdef ABSL_USES_STD_VARIANT
+using std::in_place_index;
+using std::in_place_index_t;
+#else
+
+// in_place_index_t
+//
+// Tag type used for in-place construction when the type to construct needs to
+// be specified, such as with `absl::any`, designed to be a drop-in replacement
+// for C++17's `std::in_place_index_t`.
+template <size_t I>
+using in_place_index_t = void (*)(utility_internal::InPlaceIndexTag<I>);
+
+template <size_t I>
+void in_place_index(utility_internal::InPlaceIndexTag<I>) {}
+#endif  // ABSL_USES_STD_VARIANT
+
+// Constexpr move and forward
+
+// move()
+//
+// A constexpr version of `std::move()`, designed to be a drop-in replacement
+// for C++14's `std::move()`.
+template <typename T>
+constexpr absl::remove_reference_t<T>&& move(T&& t) noexcept {
+  return static_cast<absl::remove_reference_t<T>&&>(t);
+}
+
+// forward()
+//
+// A constexpr version of `std::forward()`, designed to be a drop-in replacement
+// for C++14's `std::forward()`.
+template <typename T>
+constexpr T&& forward(
+    absl::remove_reference_t<T>& t) noexcept {  // NOLINT(runtime/references)
+  return static_cast<T&&>(t);
+}
+
+namespace utility_internal {
+// Helper method for expanding tuple into a called method.
+template <typename Functor, typename Tuple, std::size_t... Indexes>
+auto apply_helper(Functor&& functor, Tuple&& t, index_sequence<Indexes...>)
+    -> decltype(absl::base_internal::invoke(
+        absl::forward<Functor>(functor),
+        std::get<Indexes>(absl::forward<Tuple>(t))...)) {
+  return absl::base_internal::invoke(
+      absl::forward<Functor>(functor),
+      std::get<Indexes>(absl::forward<Tuple>(t))...);
+}
+
+}  // namespace utility_internal
+
+// apply
+//
+// Invokes a Callable using elements of a tuple as its arguments.
+// Each element of the tuple corresponds to an argument of the call (in order).
+// Both the Callable argument and the tuple argument are perfect-forwarded.
+// For member-function Callables, the first tuple element acts as the `this`
+// pointer. `absl::apply` is designed to be a drop-in replacement for C++17's
+// `std::apply`. Unlike C++17's `std::apply`, this is not currently `constexpr`.
+//
+// Example:
+//
+//   class Foo {
+//    public:
+//     void Bar(int);
+//   };
+//   void user_function1(int, std::string);
+//   void user_function2(std::unique_ptr<Foo>);
+//   auto user_lambda = [](int, int) {};
+//
+//   int main()
+//   {
+//       std::tuple<int, std::string> tuple1(42, "bar");
+//       // Invokes the first user function on int, std::string.
+//       absl::apply(&user_function1, tuple1);
+//
+//       std::tuple<std::unique_ptr<Foo>> tuple2(absl::make_unique<Foo>());
+//       // Invokes the user function that takes ownership of the unique
+//       // pointer.
+//       absl::apply(&user_function2, std::move(tuple2));
+//
+//       auto foo = absl::make_unique<Foo>();
+//       std::tuple<Foo*, int> tuple3(foo.get(), 42);
+//       // Invokes the method Bar on foo with one argument, 42.
+//       absl::apply(&Foo::Bar, tuple3);
+//
+//       std::tuple<int, int> tuple4(8, 9);
+//       // Invokes a lambda.
+//       absl::apply(user_lambda, tuple4);
+//   }
+template <typename Functor, typename Tuple>
+auto apply(Functor&& functor, Tuple&& t)
+    -> decltype(utility_internal::apply_helper(
+        absl::forward<Functor>(functor), absl::forward<Tuple>(t),
+        absl::make_index_sequence<std::tuple_size<
+            typename std::remove_reference<Tuple>::type>::value>{})) {
+  return utility_internal::apply_helper(
+      absl::forward<Functor>(functor), absl::forward<Tuple>(t),
+      absl::make_index_sequence<std::tuple_size<
+          typename std::remove_reference<Tuple>::type>::value>{});
+}
+
+// exchange
+//
+// Replaces the value of `obj` with `new_value` and returns the old value of
+// `obj`.  `absl::exchange` is designed to be a drop-in replacement for C++14's
+// `std::exchange`.
+//
+// Example:
+//
+//   Foo& operator=(Foo&& other) {
+//     ptr1_ = absl::exchange(other.ptr1_, nullptr);
+//     int1_ = absl::exchange(other.int1_, -1);
+//     return *this;
+//   }
+template <typename T, typename U = T>
+T exchange(T& obj, U&& new_value) {
+  T old_value = absl::move(obj);
+  obj = absl::forward<U>(new_value);
+  return old_value;
+}
+
+namespace utility_internal {
+template <typename T, typename Tuple, size_t... I>
+T make_from_tuple_impl(Tuple&& tup, absl::index_sequence<I...>) {
+  return T(std::get<I>(std::forward<Tuple>(tup))...);
+}
+}  // namespace utility_internal
+
+// make_from_tuple
+//
+// Given the template parameter type `T` and a tuple of arguments
+// `std::tuple(arg0, arg1, ..., argN)` constructs an object of type `T` as if by
+// calling `T(arg0, arg1, ..., argN)`.
+//
+// Example:
+//
+//   std::tuple<const char*, size_t> args("hello world", 5);
+//   auto s = absl::make_from_tuple<std::string>(args);
+//   assert(s == "hello");
+//
+template <typename T, typename Tuple>
+constexpr T make_from_tuple(Tuple&& tup) {
+  return utility_internal::make_from_tuple_impl<T>(
+      std::forward<Tuple>(tup),
+      absl::make_index_sequence<
+          std::tuple_size<absl::decay_t<Tuple>>::value>{});
+}
+
+ABSL_NAMESPACE_END
+}  // namespace absl
+
+#endif  // ABSL_UTILITY_UTILITY_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/array_view.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/array_view.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/array_view.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/array_view.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,328 @@
+/*
+ *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_ARRAY_VIEW_H_
+#define API_ARRAY_VIEW_H_
+
+#include <algorithm>
+#include <array>
+#include <iterator>
+#include <type_traits>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/type_traits.h"
+
+namespace rtc {
+
+// tl;dr: rtc::ArrayView is the same thing as gsl::span from the Guideline
+//        Support Library.
+//
+// Many functions read from or write to arrays. The obvious way to do this is
+// to use two arguments, a pointer to the first element and an element count:
+//
+//   bool Contains17(const int* arr, size_t size) {
+//     for (size_t i = 0; i < size; ++i) {
+//       if (arr[i] == 17)
+//         return true;
+//     }
+//     return false;
+//   }
+//
+// This is flexible, since it doesn't matter how the array is stored (C array,
+// std::vector, rtc::Buffer, ...), but it's error-prone because the caller has
+// to correctly specify the array length:
+//
+//   Contains17(arr, arraysize(arr));     // C array
+//   Contains17(arr.data(), arr.size());  // std::vector
+//   Contains17(arr, size);               // pointer + size
+//   ...
+//
+// It's also kind of messy to have two separate arguments for what is
+// conceptually a single thing.
+//
+// Enter rtc::ArrayView<T>. It contains a T pointer (to an array it doesn't
+// own) and a count, and supports the basic things you'd expect, such as
+// indexing and iteration. It allows us to write our function like this:
+//
+//   bool Contains17(rtc::ArrayView<const int> arr) {
+//     for (auto e : arr) {
+//       if (e == 17)
+//         return true;
+//     }
+//     return false;
+//   }
+//
+// And even better, because a bunch of things will implicitly convert to
+// ArrayView, we can call it like this:
+//
+//   Contains17(arr);                             // C array
+//   Contains17(arr);                             // std::vector
+//   Contains17(rtc::ArrayView<int>(arr, size));  // pointer + size
+//   Contains17(nullptr);                         // nullptr -> empty ArrayView
+//   ...
+//
+// ArrayView<T> stores both a pointer and a size, but you may also use
+// ArrayView<T, N>, which has a size that's fixed at compile time (which means
+// it only has to store the pointer).
+//
+// One important point is that ArrayView<T> and ArrayView<const T> are
+// different types, which allow and don't allow mutation of the array elements,
+// respectively. The implicit conversions work just like you'd hope, so that
+// e.g. vector<int> will convert to either ArrayView<int> or ArrayView<const
+// int>, but const vector<int> will convert only to ArrayView<const int>.
+// (ArrayView itself can be the source type in such conversions, so
+// ArrayView<int> will convert to ArrayView<const int>.)
+//
+// Note: ArrayView is tiny (just a pointer and a count if variable-sized, just
+// a pointer if fix-sized) and trivially copyable, so it's probably cheaper to
+// pass it by value than by const reference.
+
+namespace impl {
+
+// Magic constant for indicating that the size of an ArrayView is variable
+// instead of fixed.
+enum : std::ptrdiff_t { kArrayViewVarSize = -4711 };
+
+// Base class for ArrayViews of fixed nonzero size.
+template <typename T, std::ptrdiff_t Size>
+class ArrayViewBase {
+  static_assert(Size > 0, "ArrayView size must be variable or non-negative");
+
+ public:
+  ArrayViewBase(T* data, size_t size) : data_(data) {}
+
+  static constexpr size_t size() { return Size; }
+  static constexpr bool empty() { return false; }
+  T* data() const { return data_; }
+
+ protected:
+  static constexpr bool fixed_size() { return true; }
+
+ private:
+  T* data_;
+};
+
+// Specialized base class for ArrayViews of fixed zero size.
+template <typename T>
+class ArrayViewBase<T, 0> {
+ public:
+  explicit ArrayViewBase(T* data, size_t size) {}
+
+  static constexpr size_t size() { return 0; }
+  static constexpr bool empty() { return true; }
+  T* data() const { return nullptr; }
+
+ protected:
+  static constexpr bool fixed_size() { return true; }
+};
+
+// Specialized base class for ArrayViews of variable size.
+template <typename T>
+class ArrayViewBase<T, impl::kArrayViewVarSize> {
+ public:
+  ArrayViewBase(T* data, size_t size)
+      : data_(size == 0 ? nullptr : data), size_(size) {}
+
+  size_t size() const { return size_; }
+  bool empty() const { return size_ == 0; }
+  T* data() const { return data_; }
+
+ protected:
+  static constexpr bool fixed_size() { return false; }
+
+ private:
+  T* data_;
+  size_t size_;
+};
+
+}  // namespace impl
+
+template <typename T, std::ptrdiff_t Size = impl::kArrayViewVarSize>
+class ArrayView final : public impl::ArrayViewBase<T, Size> {
+ public:
+  using value_type = T;
+  using const_iterator = const T*;
+
+  // Construct an ArrayView from a pointer and a length.
+  template <typename U>
+  ArrayView(U* data, size_t size)
+      : impl::ArrayViewBase<T, Size>::ArrayViewBase(data, size) {
+    RTC_DCHECK_EQ(size == 0 ? nullptr : data, this->data());
+    RTC_DCHECK_EQ(size, this->size());
+    RTC_DCHECK_EQ(!this->data(),
+                  this->size() == 0);  // data is null iff size == 0.
+  }
+
+  // Construct an empty ArrayView. Note that fixed-size ArrayViews of size > 0
+  // cannot be empty.
+  ArrayView() : ArrayView(nullptr, 0) {}
+  ArrayView(std::nullptr_t)  // NOLINT
+      : ArrayView() {}
+  ArrayView(std::nullptr_t, size_t size)
+      : ArrayView(static_cast<T*>(nullptr), size) {
+    static_assert(Size == 0 || Size == impl::kArrayViewVarSize, "");
+    RTC_DCHECK_EQ(0, size);
+  }
+
+  // Construct an ArrayView from a C-style array.
+  template <typename U, size_t N>
+  ArrayView(U (&array)[N])  // NOLINT
+      : ArrayView(array, N) {
+    static_assert(Size == N || Size == impl::kArrayViewVarSize,
+                  "Array size must match ArrayView size");
+  }
+
+  // (Only if size is fixed.) Construct a fixed size ArrayView<T, N> from a
+  // non-const std::array instance. For an ArrayView with variable size, the
+  // used ctor is ArrayView(U& u) instead.
+  template <typename U,
+            size_t N,
+            typename std::enable_if<
+                Size == static_cast<std::ptrdiff_t>(N)>::type* = nullptr>
+  ArrayView(std::array<U, N>& u)  // NOLINT
+      : ArrayView(u.data(), u.size()) {}
+
+  // (Only if size is fixed.) Construct a fixed size ArrayView<T, N> where T is
+  // const from a const(expr) std::array instance. For an ArrayView with
+  // variable size, the used ctor is ArrayView(U& u) instead.
+  template <typename U,
+            size_t N,
+            typename std::enable_if<
+                Size == static_cast<std::ptrdiff_t>(N)>::type* = nullptr>
+  ArrayView(const std::array<U, N>& u)  // NOLINT
+      : ArrayView(u.data(), u.size()) {}
+
+  // (Only if size is fixed.) Construct an ArrayView from any type U that has a
+  // static constexpr size() method whose return value is equal to Size, and a
+  // data() method whose return value converts implicitly to T*. In particular,
+  // this means we allow conversion from ArrayView<T, N> to ArrayView<const T,
+  // N>, but not the other way around. We also don't allow conversion from
+  // ArrayView<T> to ArrayView<T, N>, or from ArrayView<T, M> to ArrayView<T,
+  // N> when M != N.
+  template <
+      typename U,
+      typename std::enable_if<Size != impl::kArrayViewVarSize &&
+                              HasDataAndSize<U, T>::value>::type* = nullptr>
+  ArrayView(U& u)  // NOLINT
+      : ArrayView(u.data(), u.size()) {
+    static_assert(U::size() == Size, "Sizes must match exactly");
+  }
+  template <
+      typename U,
+      typename std::enable_if<Size != impl::kArrayViewVarSize &&
+                              HasDataAndSize<U, T>::value>::type* = nullptr>
+  ArrayView(const U& u)  // NOLINT(runtime/explicit)
+      : ArrayView(u.data(), u.size()) {
+    static_assert(U::size() == Size, "Sizes must match exactly");
+  }
+
+  // (Only if size is variable.) Construct an ArrayView from any type U that
+  // has a size() method whose return value converts implicitly to size_t, and
+  // a data() method whose return value converts implicitly to T*. In
+  // particular, this means we allow conversion from ArrayView<T> to
+  // ArrayView<const T>, but not the other way around. Other allowed
+  // conversions include
+  // ArrayView<T, N> to ArrayView<T> or ArrayView<const T>,
+  // std::vector<T> to ArrayView<T> or ArrayView<const T>,
+  // const std::vector<T> to ArrayView<const T>,
+  // rtc::Buffer to ArrayView<uint8_t> or ArrayView<const uint8_t>, and
+  // const rtc::Buffer to ArrayView<const uint8_t>.
+  template <
+      typename U,
+      typename std::enable_if<Size == impl::kArrayViewVarSize &&
+                              HasDataAndSize<U, T>::value>::type* = nullptr>
+  ArrayView(U& u)  // NOLINT
+      : ArrayView(u.data(), u.size()) {}
+  template <
+      typename U,
+      typename std::enable_if<Size == impl::kArrayViewVarSize &&
+                              HasDataAndSize<U, T>::value>::type* = nullptr>
+  ArrayView(const U& u)  // NOLINT(runtime/explicit)
+      : ArrayView(u.data(), u.size()) {}
+
+  // Indexing and iteration. These allow mutation even if the ArrayView is
+  // const, because the ArrayView doesn't own the array. (To prevent mutation,
+  // use a const element type.)
+  T& operator[](size_t idx) const {
+    RTC_DCHECK_LT(idx, this->size());
+    RTC_DCHECK(this->data());
+    return this->data()[idx];
+  }
+  T* begin() const { return this->data(); }
+  T* end() const { return this->data() + this->size(); }
+  const T* cbegin() const { return this->data(); }
+  const T* cend() const { return this->data() + this->size(); }
+  std::reverse_iterator<T*> rbegin() const {
+    return std::make_reverse_iterator(end());
+  }
+  std::reverse_iterator<T*> rend() const {
+    return std::make_reverse_iterator(begin());
+  }
+  std::reverse_iterator<const T*> crbegin() const {
+    return std::make_reverse_iterator(cend());
+  }
+  std::reverse_iterator<const T*> crend() const {
+    return std::make_reverse_iterator(cbegin());
+  }
+
+  ArrayView<T> subview(size_t offset, size_t size) const {
+    return offset < this->size()
+               ? ArrayView<T>(this->data() + offset,
+                              std::min(size, this->size() - offset))
+               : ArrayView<T>();
+  }
+  ArrayView<T> subview(size_t offset) const {
+    return subview(offset, this->size());
+  }
+};
+
+// Comparing two ArrayViews compares their (pointer,size) pairs; it does *not*
+// dereference the pointers.
+template <typename T, std::ptrdiff_t Size1, std::ptrdiff_t Size2>
+bool operator==(const ArrayView<T, Size1>& a, const ArrayView<T, Size2>& b) {
+  return a.data() == b.data() && a.size() == b.size();
+}
+template <typename T, std::ptrdiff_t Size1, std::ptrdiff_t Size2>
+bool operator!=(const ArrayView<T, Size1>& a, const ArrayView<T, Size2>& b) {
+  return !(a == b);
+}
+
+// Variable-size ArrayViews are the size of two pointers; fixed-size ArrayViews
+// are the size of one pointer. (And as a special case, fixed-size ArrayViews
+// of size 0 require no storage.)
+static_assert(sizeof(ArrayView<int>) == 2 * sizeof(int*), "");
+static_assert(sizeof(ArrayView<int, 17>) == sizeof(int*), "");
+static_assert(std::is_empty<ArrayView<int, 0>>::value, "");
+
+template <typename T>
+inline ArrayView<T> MakeArrayView(T* data, size_t size) {
+  return ArrayView<T>(data, size);
+}
+
+// Only for primitive types that have the same size and aligment.
+// Allow reinterpret cast of the array view to another primitive type of the
+// same size.
+// Template arguments order is (U, T, Size) to allow deduction of the template
+// arguments in client calls: reinterpret_array_view<target_type>(array_view).
+template <typename U, typename T, std::ptrdiff_t Size>
+inline ArrayView<U, Size> reinterpret_array_view(ArrayView<T, Size> view) {
+  static_assert(sizeof(U) == sizeof(T) && alignof(U) == alignof(T),
+                "ArrayView reinterpret_cast is only supported for casting "
+                "between views that represent the same chunk of memory.");
+  static_assert(
+      std::is_fundamental<T>::value && std::is_fundamental<U>::value,
+      "ArrayView reinterpret_cast is only supported for casting between "
+      "fundamental types.");
+  return ArrayView<U, Size>(reinterpret_cast<U*>(view.data()), view.size());
+}
+
+}  // namespace rtc
+
+#endif  // API_ARRAY_VIEW_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,164 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "api/audio/audio_frame.h"
+
+#include <string.h>
+#include <algorithm>
+#include <utility>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/time_utils.h"
+
+namespace webrtc {
+
+AudioFrame::AudioFrame() {
+  // Visual Studio doesn't like this in the class definition.
+  static_assert(sizeof(data_) == kMaxDataSizeBytes, "kMaxDataSizeBytes");
+}
+
+void swap(AudioFrame& a, AudioFrame& b) {
+  using std::swap;
+  swap(a.timestamp_, b.timestamp_);
+  swap(a.elapsed_time_ms_, b.elapsed_time_ms_);
+  swap(a.ntp_time_ms_, b.ntp_time_ms_);
+  swap(a.samples_per_channel_, b.samples_per_channel_);
+  swap(a.sample_rate_hz_, b.sample_rate_hz_);
+  swap(a.num_channels_, b.num_channels_);
+  swap(a.channel_layout_, b.channel_layout_);
+  swap(a.speech_type_, b.speech_type_);
+  swap(a.vad_activity_, b.vad_activity_);
+  swap(a.profile_timestamp_ms_, b.profile_timestamp_ms_);
+  swap(a.packet_infos_, b.packet_infos_);
+  const size_t length_a = a.samples_per_channel_ * a.num_channels_;
+  const size_t length_b = b.samples_per_channel_ * b.num_channels_;
+  RTC_DCHECK_LE(length_a, AudioFrame::kMaxDataSizeSamples);
+  RTC_DCHECK_LE(length_b, AudioFrame::kMaxDataSizeSamples);
+  std::swap_ranges(a.data_, a.data_ + std::max(length_a, length_b), b.data_);
+  swap(a.muted_, b.muted_);
+  swap(a.absolute_capture_timestamp_ms_, b.absolute_capture_timestamp_ms_);
+}
+
+void AudioFrame::Reset() {
+  ResetWithoutMuting();
+  muted_ = true;
+}
+
+void AudioFrame::ResetWithoutMuting() {
+  // TODO(wu): Zero is a valid value for |timestamp_|. We should initialize
+  // to an invalid value, or add a new member to indicate invalidity.
+  timestamp_ = 0;
+  elapsed_time_ms_ = -1;
+  ntp_time_ms_ = -1;
+  samples_per_channel_ = 0;
+  sample_rate_hz_ = 0;
+  num_channels_ = 0;
+  channel_layout_ = CHANNEL_LAYOUT_NONE;
+  speech_type_ = kUndefined;
+  vad_activity_ = kVadUnknown;
+  profile_timestamp_ms_ = 0;
+  packet_infos_ = RtpPacketInfos();
+  absolute_capture_timestamp_ms_ = absl::nullopt;
+}
+
+void AudioFrame::UpdateFrame(uint32_t timestamp,
+                             const int16_t* data,
+                             size_t samples_per_channel,
+                             int sample_rate_hz,
+                             SpeechType speech_type,
+                             VADActivity vad_activity,
+                             size_t num_channels) {
+  timestamp_ = timestamp;
+  samples_per_channel_ = samples_per_channel;
+  sample_rate_hz_ = sample_rate_hz;
+  speech_type_ = speech_type;
+  vad_activity_ = vad_activity;
+  num_channels_ = num_channels;
+  channel_layout_ = GuessChannelLayout(num_channels);
+  if (channel_layout_ != CHANNEL_LAYOUT_UNSUPPORTED) {
+    RTC_DCHECK_EQ(num_channels, ChannelLayoutToChannelCount(channel_layout_));
+  }
+
+  const size_t length = samples_per_channel * num_channels;
+  RTC_CHECK_LE(length, kMaxDataSizeSamples);
+  if (data != nullptr) {
+    memcpy(data_, data, sizeof(int16_t) * length);
+    muted_ = false;
+  } else {
+    muted_ = true;
+  }
+}
+
+void AudioFrame::CopyFrom(const AudioFrame& src) {
+  if (this == &src)
+    return;
+
+  timestamp_ = src.timestamp_;
+  elapsed_time_ms_ = src.elapsed_time_ms_;
+  ntp_time_ms_ = src.ntp_time_ms_;
+  packet_infos_ = src.packet_infos_;
+  muted_ = src.muted();
+  samples_per_channel_ = src.samples_per_channel_;
+  sample_rate_hz_ = src.sample_rate_hz_;
+  speech_type_ = src.speech_type_;
+  vad_activity_ = src.vad_activity_;
+  num_channels_ = src.num_channels_;
+  channel_layout_ = src.channel_layout_;
+  absolute_capture_timestamp_ms_ = src.absolute_capture_timestamp_ms();
+
+  const size_t length = samples_per_channel_ * num_channels_;
+  RTC_CHECK_LE(length, kMaxDataSizeSamples);
+  if (!src.muted()) {
+    memcpy(data_, src.data(), sizeof(int16_t) * length);
+    muted_ = false;
+  }
+}
+
+void AudioFrame::UpdateProfileTimeStamp() {
+  profile_timestamp_ms_ = rtc::TimeMillis();
+}
+
+int64_t AudioFrame::ElapsedProfileTimeMs() const {
+  if (profile_timestamp_ms_ == 0) {
+    // Profiling has not been activated.
+    return -1;
+  }
+  return rtc::TimeSince(profile_timestamp_ms_);
+}
+
+const int16_t* AudioFrame::data() const {
+  return muted_ ? empty_data() : data_;
+}
+
+// TODO(henrik.lundin) Can we skip zeroing the buffer?
+// See https://bugs.chromium.org/p/webrtc/issues/detail?id=5647.
+int16_t* AudioFrame::mutable_data() {
+  if (muted_) {
+    memset(data_, 0, kMaxDataSizeBytes);
+    muted_ = false;
+  }
+  return data_;
+}
+
+void AudioFrame::Mute() {
+  muted_ = true;
+}
+
+bool AudioFrame::muted() const {
+  return muted_;
+}
+
+// static
+const int16_t* AudioFrame::empty_data() {
+  static int16_t* null_data = new int16_t[kMaxDataSizeSamples]();
+  return &null_data[0];
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,177 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_AUDIO_AUDIO_FRAME_H_
+#define API_AUDIO_AUDIO_FRAME_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include <utility>
+
+#include "api/audio/channel_layout.h"
+#include "api/rtp_packet_infos.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+/* This class holds up to 120 ms of super-wideband (32 kHz) stereo audio. It
+ * allows for adding and subtracting frames while keeping track of the resulting
+ * states.
+ *
+ * Notes
+ * - This is a de-facto api, not designed for external use. The AudioFrame class
+ *   is in need of overhaul or even replacement, and anyone depending on it
+ *   should be prepared for that.
+ * - The total number of samples is samples_per_channel_ * num_channels_.
+ * - Stereo data is interleaved starting with the left channel.
+ */
+class AudioFrame {
+ public:
+  // Using constexpr here causes linker errors unless the variable also has an
+  // out-of-class definition, which is impractical in this header-only class.
+  // (This makes no sense because it compiles as an enum value, which we most
+  // certainly cannot take the address of, just fine.) C++17 introduces inline
+  // variables which should allow us to switch to constexpr and keep this a
+  // header-only class.
+  enum : size_t {
+    // Stereo, 32 kHz, 120 ms (2 * 32 * 120)
+    // Stereo, 192 kHz, 20 ms (2 * 192 * 20)
+    kMaxDataSizeSamples = 7680,
+    kMaxDataSizeBytes = kMaxDataSizeSamples * sizeof(int16_t),
+  };
+
+  enum VADActivity { kVadActive = 0, kVadPassive = 1, kVadUnknown = 2 };
+  enum SpeechType {
+    kNormalSpeech = 0,
+    kPLC = 1,
+    kCNG = 2,
+    kPLCCNG = 3,
+    kCodecPLC = 5,
+    kUndefined = 4
+  };
+
+  AudioFrame();
+
+  friend void swap(AudioFrame& a, AudioFrame& b);
+
+  // Resets all members to their default state.
+  void Reset();
+  // Same as Reset(), but leaves mute state unchanged. Muting a frame requires
+  // the buffer to be zeroed on the next call to mutable_data(). Callers
+  // intending to write to the buffer immediately after Reset() can instead use
+  // ResetWithoutMuting() to skip this wasteful zeroing.
+  void ResetWithoutMuting();
+
+  void UpdateFrame(uint32_t timestamp,
+                   const int16_t* data,
+                   size_t samples_per_channel,
+                   int sample_rate_hz,
+                   SpeechType speech_type,
+                   VADActivity vad_activity,
+                   size_t num_channels = 1);
+
+  void CopyFrom(const AudioFrame& src);
+
+  // Sets a wall-time clock timestamp in milliseconds to be used for profiling
+  // of time between two points in the audio chain.
+  // Example:
+  //   t0: UpdateProfileTimeStamp()
+  //   t1: ElapsedProfileTimeMs() => t1 - t0 [msec]
+  void UpdateProfileTimeStamp();
+  // Returns the time difference between now and when UpdateProfileTimeStamp()
+  // was last called. Returns -1 if UpdateProfileTimeStamp() has not yet been
+  // called.
+  int64_t ElapsedProfileTimeMs() const;
+
+  // data() returns a zeroed static buffer if the frame is muted.
+  // mutable_frame() always returns a non-static buffer; the first call to
+  // mutable_frame() zeros the non-static buffer and marks the frame unmuted.
+  const int16_t* data() const;
+  int16_t* mutable_data();
+
+  // Prefer to mute frames using AudioFrameOperations::Mute.
+  void Mute();
+  // Frame is muted by default.
+  bool muted() const;
+
+  size_t max_16bit_samples() const { return kMaxDataSizeSamples; }
+  size_t samples_per_channel() const { return samples_per_channel_; }
+  size_t num_channels() const { return num_channels_; }
+  ChannelLayout channel_layout() const { return channel_layout_; }
+  int sample_rate_hz() const { return sample_rate_hz_; }
+
+  void set_absolute_capture_timestamp_ms(
+      int64_t absolute_capture_time_stamp_ms) {
+    absolute_capture_timestamp_ms_ = absolute_capture_time_stamp_ms;
+  }
+
+  absl::optional<int64_t> absolute_capture_timestamp_ms() const {
+    return absolute_capture_timestamp_ms_;
+  }
+
+  // RTP timestamp of the first sample in the AudioFrame.
+  uint32_t timestamp_ = 0;
+  // Time since the first frame in milliseconds.
+  // -1 represents an uninitialized value.
+  int64_t elapsed_time_ms_ = -1;
+  // NTP time of the estimated capture time in local timebase in milliseconds.
+  // -1 represents an uninitialized value.
+  int64_t ntp_time_ms_ = -1;
+  size_t samples_per_channel_ = 0;
+  int sample_rate_hz_ = 0;
+  size_t num_channels_ = 0;
+  ChannelLayout channel_layout_ = CHANNEL_LAYOUT_NONE;
+  SpeechType speech_type_ = kUndefined;
+  VADActivity vad_activity_ = kVadUnknown;
+  // Monotonically increasing timestamp intended for profiling of audio frames.
+  // Typically used for measuring elapsed time between two different points in
+  // the audio path. No lock is used to save resources and we are thread safe
+  // by design.
+  // TODO(nisse@webrtc.org): consider using absl::optional.
+  int64_t profile_timestamp_ms_ = 0;
+
+  // Information about packets used to assemble this audio frame. This is needed
+  // by |SourceTracker| when the frame is delivered to the RTCRtpReceiver's
+  // MediaStreamTrack, in order to implement getContributingSources(). See:
+  // https://w3c.github.io/webrtc-pc/#dom-rtcrtpreceiver-getcontributingsources
+  //
+  // TODO(bugs.webrtc.org/10757):
+  //   Note that this information might not be fully accurate since we currently
+  //   don't have a proper way to track it across the audio sync buffer. The
+  //   sync buffer is the small sample-holding buffer located after the audio
+  //   decoder and before where samples are assembled into output frames.
+  //
+  // |RtpPacketInfos| may also be empty if the audio samples did not come from
+  // RTP packets. E.g. if the audio were locally generated by packet loss
+  // concealment, comfort noise generation, etc.
+  RtpPacketInfos packet_infos_;
+
+ private:
+  // A permanently zeroed out buffer to represent muted frames. This is a
+  // header-only class, so the only way to avoid creating a separate empty
+  // buffer per translation unit is to wrap a static in an inline function.
+  static const int16_t* empty_data();
+
+  int16_t data_[kMaxDataSizeSamples];
+  bool muted_ = true;
+
+  // Absolute capture timestamp when this audio frame was originally captured.
+  // This is only valid for audio frames captured on this machine. The absolute
+  // capture timestamp of a received frame is found in |packet_infos_|.
+  // This timestamp MUST be based on the same clock as rtc::TimeMillis().
+  absl::optional<int64_t> absolute_capture_timestamp_ms_;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(AudioFrame);
+};
+
+}  // namespace webrtc
+
+#endif  // API_AUDIO_AUDIO_FRAME_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame_processor.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame_processor.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame_processor.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_frame_processor.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_AUDIO_AUDIO_FRAME_PROCESSOR_H_
+#define API_AUDIO_AUDIO_FRAME_PROCESSOR_H_
+
+#include <functional>
+#include <memory>
+
+namespace webrtc {
+
+class AudioFrame;
+
+// If passed into PeerConnectionFactory, will be used for additional
+// processing of captured audio frames, performed before encoding.
+// Implementations must be thread-safe.
+class AudioFrameProcessor {
+ public:
+  using OnAudioFrameCallback = std::function<void(std::unique_ptr<AudioFrame>)>;
+  virtual ~AudioFrameProcessor() = default;
+
+  // Processes the frame received from WebRTC, is called by WebRTC off the
+  // realtime audio capturing path. AudioFrameProcessor must reply with
+  // processed frames by calling |sink_callback| if it was provided in SetSink()
+  // call. |sink_callback| can be called in the context of Process().
+  virtual void Process(std::unique_ptr<AudioFrame> frame) = 0;
+
+  // Atomically replaces the current sink with the new one. Before the
+  // first call to this function, or if the provided |sink_callback| is nullptr,
+  // processed frames are simply discarded.
+  virtual void SetSink(OnAudioFrameCallback sink_callback) = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // API_AUDIO_AUDIO_FRAME_PROCESSOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_mixer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_mixer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_mixer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/audio_mixer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_AUDIO_AUDIO_MIXER_H_
+#define API_AUDIO_AUDIO_MIXER_H_
+
+#include <memory>
+
+#include "api/audio/audio_frame.h"
+#include "rtc_base/ref_count.h"
+
+namespace webrtc {
+
+// WORK IN PROGRESS
+// This class is under development and is not yet intended for for use outside
+// of WebRtc/Libjingle.
+class AudioMixer : public rtc::RefCountInterface {
+ public:
+  // A callback class that all mixer participants must inherit from/implement.
+  class Source {
+   public:
+    enum class AudioFrameInfo {
+      kNormal,  // The samples in audio_frame are valid and should be used.
+      kMuted,   // The samples in audio_frame should not be used, but
+                // should be implicitly interpreted as zero. Other
+                // fields in audio_frame may be read and should
+                // contain meaningful values.
+      kError,   // The audio_frame will not be used.
+    };
+
+    // Overwrites |audio_frame|. The data_ field is overwritten with
+    // 10 ms of new audio (either 1 or 2 interleaved channels) at
+    // |sample_rate_hz|. All fields in |audio_frame| must be updated.
+    virtual AudioFrameInfo GetAudioFrameWithInfo(int sample_rate_hz,
+                                                 AudioFrame* audio_frame) = 0;
+
+    // A way for a mixer implementation to distinguish participants.
+    virtual int Ssrc() const = 0;
+
+    // A way for this source to say that GetAudioFrameWithInfo called
+    // with this sample rate or higher will not cause quality loss.
+    virtual int PreferredSampleRate() const = 0;
+
+    virtual ~Source() {}
+  };
+
+  // Returns true if adding was successful. A source is never added
+  // twice. Addition and removal can happen on different threads.
+  virtual bool AddSource(Source* audio_source) = 0;
+
+  // Removal is never attempted if a source has not been successfully
+  // added to the mixer.
+  virtual void RemoveSource(Source* audio_source) = 0;
+
+  // Performs mixing by asking registered audio sources for audio. The
+  // mixed result is placed in the provided AudioFrame. This method
+  // will only be called from a single thread. The channels argument
+  // specifies the number of channels of the mix result. The mixer
+  // should mix at a rate that doesn't cause quality loss of the
+  // sources' audio. The mixing rate is one of the rates listed in
+  // AudioProcessing::NativeRate. All fields in
+  // |audio_frame_for_mixing| must be updated.
+  virtual void Mix(size_t number_of_channels,
+                   AudioFrame* audio_frame_for_mixing) = 0;
+
+ protected:
+  // Since the mixer is reference counted, the destructor may be
+  // called from any thread.
+  ~AudioMixer() override {}
+};
+}  // namespace webrtc
+
+#endif  // API_AUDIO_AUDIO_MIXER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/BUILD.gn asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/BUILD.gn
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/BUILD.gn	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,108 @@
+# Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+import("../../webrtc.gni")
+
+rtc_library("audio_frame_api") {
+  visibility = [ "*" ]
+  sources = [
+    "audio_frame.cc",
+    "audio_frame.h",
+    "channel_layout.cc",
+    "channel_layout.h",
+  ]
+
+  deps = [
+    "..:rtp_packet_info",
+    "../../rtc_base:checks",
+    "../../rtc_base:rtc_base_approved",
+  ]
+}
+
+rtc_source_set("audio_frame_processor") {
+  visibility = [ "*" ]
+  sources = [ "audio_frame_processor.h" ]
+}
+
+rtc_source_set("audio_mixer_api") {
+  visibility = [ "*" ]
+  sources = [ "audio_mixer.h" ]
+
+  deps = [
+    ":audio_frame_api",
+    "../../rtc_base:rtc_base_approved",
+  ]
+}
+
+rtc_library("aec3_config") {
+  visibility = [ "*" ]
+  sources = [
+    "echo_canceller3_config.cc",
+    "echo_canceller3_config.h",
+  ]
+  deps = [
+    "../../rtc_base:checks",
+    "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_minmax",
+    "../../rtc_base/system:rtc_export",
+  ]
+}
+
+rtc_library("aec3_config_json") {
+  visibility = [ "*" ]
+  allow_poison = [ "rtc_json" ]
+  sources = [
+    "echo_canceller3_config_json.cc",
+    "echo_canceller3_config_json.h",
+  ]
+  deps = [
+    ":aec3_config",
+    "../../rtc_base:checks",
+    "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:rtc_json",
+    "../../rtc_base/system:rtc_export",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
+}
+
+rtc_library("aec3_factory") {
+  visibility = [ "*" ]
+  configs += [ "../../modules/audio_processing:apm_debug_dump" ]
+  sources = [
+    "echo_canceller3_factory.cc",
+    "echo_canceller3_factory.h",
+  ]
+
+  deps = [
+    ":aec3_config",
+    ":echo_control",
+    "../../modules/audio_processing/aec3",
+    "../../rtc_base:rtc_base_approved",
+    "../../rtc_base/system:rtc_export",
+  ]
+}
+
+rtc_source_set("echo_control") {
+  visibility = [ "*" ]
+  sources = [ "echo_control.h" ]
+  deps = [ "../../rtc_base:checks" ]
+}
+
+rtc_source_set("echo_detector_creator") {
+  visibility = [ "*" ]
+  sources = [
+    "echo_detector_creator.cc",
+    "echo_detector_creator.h",
+  ]
+  deps = [
+    "../../api:scoped_refptr",
+    "../../modules/audio_processing:api",
+    "../../modules/audio_processing:audio_processing",
+    "../../rtc_base:refcount",
+  ]
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/channel_layout.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/channel_layout.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/channel_layout.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/channel_layout.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,282 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "api/audio/channel_layout.h"
+
+#include <stddef.h>
+
+#include "rtc_base/arraysize.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+
+namespace webrtc {
+
+static const int kLayoutToChannels[] = {
+    0,  // CHANNEL_LAYOUT_NONE
+    0,  // CHANNEL_LAYOUT_UNSUPPORTED
+    1,  // CHANNEL_LAYOUT_MONO
+    2,  // CHANNEL_LAYOUT_STEREO
+    3,  // CHANNEL_LAYOUT_2_1
+    3,  // CHANNEL_LAYOUT_SURROUND
+    4,  // CHANNEL_LAYOUT_4_0
+    4,  // CHANNEL_LAYOUT_2_2
+    4,  // CHANNEL_LAYOUT_QUAD
+    5,  // CHANNEL_LAYOUT_5_0
+    6,  // CHANNEL_LAYOUT_5_1
+    5,  // CHANNEL_LAYOUT_5_0_BACK
+    6,  // CHANNEL_LAYOUT_5_1_BACK
+    7,  // CHANNEL_LAYOUT_7_0
+    8,  // CHANNEL_LAYOUT_7_1
+    8,  // CHANNEL_LAYOUT_7_1_WIDE
+    2,  // CHANNEL_LAYOUT_STEREO_DOWNMIX
+    3,  // CHANNEL_LAYOUT_2POINT1
+    4,  // CHANNEL_LAYOUT_3_1
+    5,  // CHANNEL_LAYOUT_4_1
+    6,  // CHANNEL_LAYOUT_6_0
+    6,  // CHANNEL_LAYOUT_6_0_FRONT
+    6,  // CHANNEL_LAYOUT_HEXAGONAL
+    7,  // CHANNEL_LAYOUT_6_1
+    7,  // CHANNEL_LAYOUT_6_1_BACK
+    7,  // CHANNEL_LAYOUT_6_1_FRONT
+    7,  // CHANNEL_LAYOUT_7_0_FRONT
+    8,  // CHANNEL_LAYOUT_7_1_WIDE_BACK
+    8,  // CHANNEL_LAYOUT_OCTAGONAL
+    0,  // CHANNEL_LAYOUT_DISCRETE
+    3,  // CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC
+    5,  // CHANNEL_LAYOUT_4_1_QUAD_SIDE
+    0,  // CHANNEL_LAYOUT_BITSTREAM
+};
+
+// The channel orderings for each layout as specified by FFmpeg. Each value
+// represents the index of each channel in each layout.  Values of -1 mean the
+// channel at that index is not used for that layout. For example, the left side
+// surround sound channel in FFmpeg's 5.1 layout is in the 5th position (because
+// the order is L, R, C, LFE, LS, RS), so
+// kChannelOrderings[CHANNEL_LAYOUT_5_1][SIDE_LEFT] = 4;
+static const int kChannelOrderings[CHANNEL_LAYOUT_MAX + 1][CHANNELS_MAX + 1] = {
+    // FL | FR | FC | LFE | BL | BR | FLofC | FRofC | BC | SL | SR
+
+    // CHANNEL_LAYOUT_NONE
+    {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_UNSUPPORTED
+    {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_MONO
+    {-1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_STEREO
+    {0, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_2_1
+    {0, 1, -1, -1, -1, -1, -1, -1, 2, -1, -1},
+
+    // CHANNEL_LAYOUT_SURROUND
+    {0, 1, 2, -1, -1, -1, -1, -1, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_4_0
+    {0, 1, 2, -1, -1, -1, -1, -1, 3, -1, -1},
+
+    // CHANNEL_LAYOUT_2_2
+    {0, 1, -1, -1, -1, -1, -1, -1, -1, 2, 3},
+
+    // CHANNEL_LAYOUT_QUAD
+    {0, 1, -1, -1, 2, 3, -1, -1, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_5_0
+    {0, 1, 2, -1, -1, -1, -1, -1, -1, 3, 4},
+
+    // CHANNEL_LAYOUT_5_1
+    {0, 1, 2, 3, -1, -1, -1, -1, -1, 4, 5},
+
+    // FL | FR | FC | LFE | BL | BR | FLofC | FRofC | BC | SL | SR
+
+    // CHANNEL_LAYOUT_5_0_BACK
+    {0, 1, 2, -1, 3, 4, -1, -1, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_5_1_BACK
+    {0, 1, 2, 3, 4, 5, -1, -1, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_7_0
+    {0, 1, 2, -1, 5, 6, -1, -1, -1, 3, 4},
+
+    // CHANNEL_LAYOUT_7_1
+    {0, 1, 2, 3, 6, 7, -1, -1, -1, 4, 5},
+
+    // CHANNEL_LAYOUT_7_1_WIDE
+    {0, 1, 2, 3, -1, -1, 6, 7, -1, 4, 5},
+
+    // CHANNEL_LAYOUT_STEREO_DOWNMIX
+    {0, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_2POINT1
+    {0, 1, -1, 2, -1, -1, -1, -1, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_3_1
+    {0, 1, 2, 3, -1, -1, -1, -1, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_4_1
+    {0, 1, 2, 4, -1, -1, -1, -1, 3, -1, -1},
+
+    // CHANNEL_LAYOUT_6_0
+    {0, 1, 2, -1, -1, -1, -1, -1, 5, 3, 4},
+
+    // CHANNEL_LAYOUT_6_0_FRONT
+    {0, 1, -1, -1, -1, -1, 4, 5, -1, 2, 3},
+
+    // FL | FR | FC | LFE | BL | BR | FLofC | FRofC | BC | SL | SR
+
+    // CHANNEL_LAYOUT_HEXAGONAL
+    {0, 1, 2, -1, 3, 4, -1, -1, 5, -1, -1},
+
+    // CHANNEL_LAYOUT_6_1
+    {0, 1, 2, 3, -1, -1, -1, -1, 6, 4, 5},
+
+    // CHANNEL_LAYOUT_6_1_BACK
+    {0, 1, 2, 3, 4, 5, -1, -1, 6, -1, -1},
+
+    // CHANNEL_LAYOUT_6_1_FRONT
+    {0, 1, -1, 6, -1, -1, 4, 5, -1, 2, 3},
+
+    // CHANNEL_LAYOUT_7_0_FRONT
+    {0, 1, 2, -1, -1, -1, 5, 6, -1, 3, 4},
+
+    // CHANNEL_LAYOUT_7_1_WIDE_BACK
+    {0, 1, 2, 3, 4, 5, 6, 7, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_OCTAGONAL
+    {0, 1, 2, -1, 5, 6, -1, -1, 7, 3, 4},
+
+    // CHANNEL_LAYOUT_DISCRETE
+    {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC
+    {0, 1, 2, -1, -1, -1, -1, -1, -1, -1, -1},
+
+    // CHANNEL_LAYOUT_4_1_QUAD_SIDE
+    {0, 1, -1, 4, -1, -1, -1, -1, -1, 2, 3},
+
+    // CHANNEL_LAYOUT_BITSTREAM
+    {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1},
+
+    // FL | FR | FC | LFE | BL | BR | FLofC | FRofC | BC | SL | SR
+};
+
+int ChannelLayoutToChannelCount(ChannelLayout layout) {
+  RTC_DCHECK_LT(static_cast<size_t>(layout), arraysize(kLayoutToChannels));
+  RTC_DCHECK_LE(kLayoutToChannels[layout], kMaxConcurrentChannels);
+  return kLayoutToChannels[layout];
+}
+
+// Converts a channel count into a channel layout.
+ChannelLayout GuessChannelLayout(int channels) {
+  switch (channels) {
+    case 1:
+      return CHANNEL_LAYOUT_MONO;
+    case 2:
+      return CHANNEL_LAYOUT_STEREO;
+    case 3:
+      return CHANNEL_LAYOUT_SURROUND;
+    case 4:
+      return CHANNEL_LAYOUT_QUAD;
+    case 5:
+      return CHANNEL_LAYOUT_5_0;
+    case 6:
+      return CHANNEL_LAYOUT_5_1;
+    case 7:
+      return CHANNEL_LAYOUT_6_1;
+    case 8:
+      return CHANNEL_LAYOUT_7_1;
+    default:
+      RTC_DLOG(LS_WARNING) << "Unsupported channel count: " << channels;
+  }
+  return CHANNEL_LAYOUT_UNSUPPORTED;
+}
+
+int ChannelOrder(ChannelLayout layout, Channels channel) {
+  RTC_DCHECK_LT(static_cast<size_t>(layout), arraysize(kChannelOrderings));
+  RTC_DCHECK_LT(static_cast<size_t>(channel), arraysize(kChannelOrderings[0]));
+  return kChannelOrderings[layout][channel];
+}
+
+const char* ChannelLayoutToString(ChannelLayout layout) {
+  switch (layout) {
+    case CHANNEL_LAYOUT_NONE:
+      return "NONE";
+    case CHANNEL_LAYOUT_UNSUPPORTED:
+      return "UNSUPPORTED";
+    case CHANNEL_LAYOUT_MONO:
+      return "MONO";
+    case CHANNEL_LAYOUT_STEREO:
+      return "STEREO";
+    case CHANNEL_LAYOUT_2_1:
+      return "2.1";
+    case CHANNEL_LAYOUT_SURROUND:
+      return "SURROUND";
+    case CHANNEL_LAYOUT_4_0:
+      return "4.0";
+    case CHANNEL_LAYOUT_2_2:
+      return "QUAD_SIDE";
+    case CHANNEL_LAYOUT_QUAD:
+      return "QUAD";
+    case CHANNEL_LAYOUT_5_0:
+      return "5.0";
+    case CHANNEL_LAYOUT_5_1:
+      return "5.1";
+    case CHANNEL_LAYOUT_5_0_BACK:
+      return "5.0_BACK";
+    case CHANNEL_LAYOUT_5_1_BACK:
+      return "5.1_BACK";
+    case CHANNEL_LAYOUT_7_0:
+      return "7.0";
+    case CHANNEL_LAYOUT_7_1:
+      return "7.1";
+    case CHANNEL_LAYOUT_7_1_WIDE:
+      return "7.1_WIDE";
+    case CHANNEL_LAYOUT_STEREO_DOWNMIX:
+      return "STEREO_DOWNMIX";
+    case CHANNEL_LAYOUT_2POINT1:
+      return "2POINT1";
+    case CHANNEL_LAYOUT_3_1:
+      return "3.1";
+    case CHANNEL_LAYOUT_4_1:
+      return "4.1";
+    case CHANNEL_LAYOUT_6_0:
+      return "6.0";
+    case CHANNEL_LAYOUT_6_0_FRONT:
+      return "6.0_FRONT";
+    case CHANNEL_LAYOUT_HEXAGONAL:
+      return "HEXAGONAL";
+    case CHANNEL_LAYOUT_6_1:
+      return "6.1";
+    case CHANNEL_LAYOUT_6_1_BACK:
+      return "6.1_BACK";
+    case CHANNEL_LAYOUT_6_1_FRONT:
+      return "6.1_FRONT";
+    case CHANNEL_LAYOUT_7_0_FRONT:
+      return "7.0_FRONT";
+    case CHANNEL_LAYOUT_7_1_WIDE_BACK:
+      return "7.1_WIDE_BACK";
+    case CHANNEL_LAYOUT_OCTAGONAL:
+      return "OCTAGONAL";
+    case CHANNEL_LAYOUT_DISCRETE:
+      return "DISCRETE";
+    case CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC:
+      return "STEREO_AND_KEYBOARD_MIC";
+    case CHANNEL_LAYOUT_4_1_QUAD_SIDE:
+      return "4.1_QUAD_SIDE";
+    case CHANNEL_LAYOUT_BITSTREAM:
+      return "BITSTREAM";
+  }
+  RTC_NOTREACHED() << "Invalid channel layout provided: " << layout;
+  return "";
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/channel_layout.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/channel_layout.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/channel_layout.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/channel_layout.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,165 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_AUDIO_CHANNEL_LAYOUT_H_
+#define API_AUDIO_CHANNEL_LAYOUT_H_
+
+namespace webrtc {
+
+// This file is derived from Chromium's base/channel_layout.h.
+
+// Enumerates the various representations of the ordering of audio channels.
+// Logged to UMA, so never reuse a value, always add new/greater ones!
+enum ChannelLayout {
+  CHANNEL_LAYOUT_NONE = 0,
+  CHANNEL_LAYOUT_UNSUPPORTED = 1,
+
+  // Front C
+  CHANNEL_LAYOUT_MONO = 2,
+
+  // Front L, Front R
+  CHANNEL_LAYOUT_STEREO = 3,
+
+  // Front L, Front R, Back C
+  CHANNEL_LAYOUT_2_1 = 4,
+
+  // Front L, Front R, Front C
+  CHANNEL_LAYOUT_SURROUND = 5,
+
+  // Front L, Front R, Front C, Back C
+  CHANNEL_LAYOUT_4_0 = 6,
+
+  // Front L, Front R, Side L, Side R
+  CHANNEL_LAYOUT_2_2 = 7,
+
+  // Front L, Front R, Back L, Back R
+  CHANNEL_LAYOUT_QUAD = 8,
+
+  // Front L, Front R, Front C, Side L, Side R
+  CHANNEL_LAYOUT_5_0 = 9,
+
+  // Front L, Front R, Front C, LFE, Side L, Side R
+  CHANNEL_LAYOUT_5_1 = 10,
+
+  // Front L, Front R, Front C, Back L, Back R
+  CHANNEL_LAYOUT_5_0_BACK = 11,
+
+  // Front L, Front R, Front C, LFE, Back L, Back R
+  CHANNEL_LAYOUT_5_1_BACK = 12,
+
+  // Front L, Front R, Front C, Side L, Side R, Back L, Back R
+  CHANNEL_LAYOUT_7_0 = 13,
+
+  // Front L, Front R, Front C, LFE, Side L, Side R, Back L, Back R
+  CHANNEL_LAYOUT_7_1 = 14,
+
+  // Front L, Front R, Front C, LFE, Side L, Side R, Front LofC, Front RofC
+  CHANNEL_LAYOUT_7_1_WIDE = 15,
+
+  // Stereo L, Stereo R
+  CHANNEL_LAYOUT_STEREO_DOWNMIX = 16,
+
+  // Stereo L, Stereo R, LFE
+  CHANNEL_LAYOUT_2POINT1 = 17,
+
+  // Stereo L, Stereo R, Front C, LFE
+  CHANNEL_LAYOUT_3_1 = 18,
+
+  // Stereo L, Stereo R, Front C, Rear C, LFE
+  CHANNEL_LAYOUT_4_1 = 19,
+
+  // Stereo L, Stereo R, Front C, Side L, Side R, Back C
+  CHANNEL_LAYOUT_6_0 = 20,
+
+  // Stereo L, Stereo R, Side L, Side R, Front LofC, Front RofC
+  CHANNEL_LAYOUT_6_0_FRONT = 21,
+
+  // Stereo L, Stereo R, Front C, Rear L, Rear R, Rear C
+  CHANNEL_LAYOUT_HEXAGONAL = 22,
+
+  // Stereo L, Stereo R, Front C, LFE, Side L, Side R, Rear Center
+  CHANNEL_LAYOUT_6_1 = 23,
+
+  // Stereo L, Stereo R, Front C, LFE, Back L, Back R, Rear Center
+  CHANNEL_LAYOUT_6_1_BACK = 24,
+
+  // Stereo L, Stereo R, Side L, Side R, Front LofC, Front RofC, LFE
+  CHANNEL_LAYOUT_6_1_FRONT = 25,
+
+  // Front L, Front R, Front C, Side L, Side R, Front LofC, Front RofC
+  CHANNEL_LAYOUT_7_0_FRONT = 26,
+
+  // Front L, Front R, Front C, LFE, Back L, Back R, Front LofC, Front RofC
+  CHANNEL_LAYOUT_7_1_WIDE_BACK = 27,
+
+  // Front L, Front R, Front C, Side L, Side R, Rear L, Back R, Back C.
+  CHANNEL_LAYOUT_OCTAGONAL = 28,
+
+  // Channels are not explicitly mapped to speakers.
+  CHANNEL_LAYOUT_DISCRETE = 29,
+
+  // Front L, Front R, Front C. Front C contains the keyboard mic audio. This
+  // layout is only intended for input for WebRTC. The Front C channel
+  // is stripped away in the WebRTC audio input pipeline and never seen outside
+  // of that.
+  CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC = 30,
+
+  // Front L, Front R, Side L, Side R, LFE
+  CHANNEL_LAYOUT_4_1_QUAD_SIDE = 31,
+
+  // Actual channel layout is specified in the bitstream and the actual channel
+  // count is unknown at Chromium media pipeline level (useful for audio
+  // pass-through mode).
+  CHANNEL_LAYOUT_BITSTREAM = 32,
+
+  // Max value, must always equal the largest entry ever logged.
+  CHANNEL_LAYOUT_MAX = CHANNEL_LAYOUT_BITSTREAM
+};
+
+// Note: Do not reorder or reassign these values; other code depends on their
+// ordering to operate correctly. E.g., CoreAudio channel layout computations.
+enum Channels {
+  LEFT = 0,
+  RIGHT,
+  CENTER,
+  LFE,
+  BACK_LEFT,
+  BACK_RIGHT,
+  LEFT_OF_CENTER,
+  RIGHT_OF_CENTER,
+  BACK_CENTER,
+  SIDE_LEFT,
+  SIDE_RIGHT,
+  CHANNELS_MAX =
+      SIDE_RIGHT,  // Must always equal the largest value ever logged.
+};
+
+// The maximum number of concurrently active channels for all possible layouts.
+// ChannelLayoutToChannelCount() will never return a value higher than this.
+constexpr int kMaxConcurrentChannels = 8;
+
+// Returns the expected channel position in an interleaved stream.  Values of -1
+// mean the channel at that index is not used for that layout.  Values range
+// from 0 to ChannelLayoutToChannelCount(layout) - 1.
+int ChannelOrder(ChannelLayout layout, Channels channel);
+
+// Returns the number of channels in a given ChannelLayout.
+int ChannelLayoutToChannelCount(ChannelLayout layout);
+
+// Given the number of channels, return the best layout,
+// or return CHANNEL_LAYOUT_UNSUPPORTED if there is no good match.
+ChannelLayout GuessChannelLayout(int channels);
+
+// Returns a string representation of the channel layout.
+const char* ChannelLayoutToString(ChannelLayout layout);
+
+}  // namespace webrtc
+
+#endif  // API_AUDIO_CHANNEL_LAYOUT_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,271 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "api/audio/echo_canceller3_config.h"
+
+#include <algorithm>
+#include <cmath>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_minmax.h"
+
+namespace webrtc {
+namespace {
+bool Limit(float* value, float min, float max) {
+  float clamped = rtc::SafeClamp(*value, min, max);
+  clamped = std::isfinite(clamped) ? clamped : min;
+  bool res = *value == clamped;
+  *value = clamped;
+  return res;
+}
+
+bool Limit(size_t* value, size_t min, size_t max) {
+  size_t clamped = rtc::SafeClamp(*value, min, max);
+  bool res = *value == clamped;
+  *value = clamped;
+  return res;
+}
+
+bool Limit(int* value, int min, int max) {
+  int clamped = rtc::SafeClamp(*value, min, max);
+  bool res = *value == clamped;
+  *value = clamped;
+  return res;
+}
+
+bool FloorLimit(size_t* value, size_t min) {
+  size_t clamped = *value >= min ? *value : min;
+  bool res = *value == clamped;
+  *value = clamped;
+  return res;
+}
+
+}  // namespace
+
+EchoCanceller3Config::EchoCanceller3Config() = default;
+EchoCanceller3Config::EchoCanceller3Config(const EchoCanceller3Config& e) =
+    default;
+EchoCanceller3Config& EchoCanceller3Config::operator=(
+    const EchoCanceller3Config& e) = default;
+EchoCanceller3Config::Delay::Delay() = default;
+EchoCanceller3Config::Delay::Delay(const EchoCanceller3Config::Delay& e) =
+    default;
+EchoCanceller3Config::Delay& EchoCanceller3Config::Delay::operator=(
+    const Delay& e) = default;
+
+EchoCanceller3Config::EchoModel::EchoModel() = default;
+EchoCanceller3Config::EchoModel::EchoModel(
+    const EchoCanceller3Config::EchoModel& e) = default;
+EchoCanceller3Config::EchoModel& EchoCanceller3Config::EchoModel::operator=(
+    const EchoModel& e) = default;
+
+EchoCanceller3Config::Suppressor::Suppressor() = default;
+EchoCanceller3Config::Suppressor::Suppressor(
+    const EchoCanceller3Config::Suppressor& e) = default;
+EchoCanceller3Config::Suppressor& EchoCanceller3Config::Suppressor::operator=(
+    const Suppressor& e) = default;
+
+EchoCanceller3Config::Suppressor::MaskingThresholds::MaskingThresholds(
+    float enr_transparent,
+    float enr_suppress,
+    float emr_transparent)
+    : enr_transparent(enr_transparent),
+      enr_suppress(enr_suppress),
+      emr_transparent(emr_transparent) {}
+EchoCanceller3Config::Suppressor::MaskingThresholds::MaskingThresholds(
+    const EchoCanceller3Config::Suppressor::MaskingThresholds& e) = default;
+EchoCanceller3Config::Suppressor::MaskingThresholds&
+EchoCanceller3Config::Suppressor::MaskingThresholds::operator=(
+    const MaskingThresholds& e) = default;
+
+EchoCanceller3Config::Suppressor::Tuning::Tuning(MaskingThresholds mask_lf,
+                                                 MaskingThresholds mask_hf,
+                                                 float max_inc_factor,
+                                                 float max_dec_factor_lf)
+    : mask_lf(mask_lf),
+      mask_hf(mask_hf),
+      max_inc_factor(max_inc_factor),
+      max_dec_factor_lf(max_dec_factor_lf) {}
+EchoCanceller3Config::Suppressor::Tuning::Tuning(
+    const EchoCanceller3Config::Suppressor::Tuning& e) = default;
+EchoCanceller3Config::Suppressor::Tuning&
+EchoCanceller3Config::Suppressor::Tuning::operator=(const Tuning& e) = default;
+
+bool EchoCanceller3Config::Validate(EchoCanceller3Config* config) {
+  RTC_DCHECK(config);
+  EchoCanceller3Config* c = config;
+  bool res = true;
+
+  if (c->delay.down_sampling_factor != 4 &&
+      c->delay.down_sampling_factor != 8) {
+    c->delay.down_sampling_factor = 4;
+    res = false;
+  }
+
+  res = res & Limit(&c->delay.default_delay, 0, 5000);
+  res = res & Limit(&c->delay.num_filters, 0, 5000);
+  res = res & Limit(&c->delay.delay_headroom_samples, 0, 5000);
+  res = res & Limit(&c->delay.hysteresis_limit_blocks, 0, 5000);
+  res = res & Limit(&c->delay.fixed_capture_delay_samples, 0, 5000);
+  res = res & Limit(&c->delay.delay_estimate_smoothing, 0.f, 1.f);
+  res = res & Limit(&c->delay.delay_candidate_detection_threshold, 0.f, 1.f);
+  res = res & Limit(&c->delay.delay_selection_thresholds.initial, 1, 250);
+  res = res & Limit(&c->delay.delay_selection_thresholds.converged, 1, 250);
+
+  res = res & FloorLimit(&c->filter.refined.length_blocks, 1);
+  res = res & Limit(&c->filter.refined.leakage_converged, 0.f, 1000.f);
+  res = res & Limit(&c->filter.refined.leakage_diverged, 0.f, 1000.f);
+  res = res & Limit(&c->filter.refined.error_floor, 0.f, 1000.f);
+  res = res & Limit(&c->filter.refined.error_ceil, 0.f, 100000000.f);
+  res = res & Limit(&c->filter.refined.noise_gate, 0.f, 100000000.f);
+
+  res = res & FloorLimit(&c->filter.refined_initial.length_blocks, 1);
+  res = res & Limit(&c->filter.refined_initial.leakage_converged, 0.f, 1000.f);
+  res = res & Limit(&c->filter.refined_initial.leakage_diverged, 0.f, 1000.f);
+  res = res & Limit(&c->filter.refined_initial.error_floor, 0.f, 1000.f);
+  res = res & Limit(&c->filter.refined_initial.error_ceil, 0.f, 100000000.f);
+  res = res & Limit(&c->filter.refined_initial.noise_gate, 0.f, 100000000.f);
+
+  if (c->filter.refined.length_blocks <
+      c->filter.refined_initial.length_blocks) {
+    c->filter.refined_initial.length_blocks = c->filter.refined.length_blocks;
+    res = false;
+  }
+
+  res = res & FloorLimit(&c->filter.coarse.length_blocks, 1);
+  res = res & Limit(&c->filter.coarse.rate, 0.f, 1.f);
+  res = res & Limit(&c->filter.coarse.noise_gate, 0.f, 100000000.f);
+
+  res = res & FloorLimit(&c->filter.coarse_initial.length_blocks, 1);
+  res = res & Limit(&c->filter.coarse_initial.rate, 0.f, 1.f);
+  res = res & Limit(&c->filter.coarse_initial.noise_gate, 0.f, 100000000.f);
+
+  if (c->filter.coarse.length_blocks < c->filter.coarse_initial.length_blocks) {
+    c->filter.coarse_initial.length_blocks = c->filter.coarse.length_blocks;
+    res = false;
+  }
+
+  res = res & Limit(&c->filter.config_change_duration_blocks, 0, 100000);
+  res = res & Limit(&c->filter.initial_state_seconds, 0.f, 100.f);
+  res = res & Limit(&c->filter.coarse_reset_hangover_blocks, 0, 2500);
+
+  res = res & Limit(&c->erle.min, 1.f, 100000.f);
+  res = res & Limit(&c->erle.max_l, 1.f, 100000.f);
+  res = res & Limit(&c->erle.max_h, 1.f, 100000.f);
+  if (c->erle.min > c->erle.max_l || c->erle.min > c->erle.max_h) {
+    c->erle.min = std::min(c->erle.max_l, c->erle.max_h);
+    res = false;
+  }
+  res = res & Limit(&c->erle.num_sections, 1, c->filter.refined.length_blocks);
+
+  res = res & Limit(&c->ep_strength.default_gain, 0.f, 1000000.f);
+  res = res & Limit(&c->ep_strength.default_len, -1.f, 1.f);
+
+  res =
+      res & Limit(&c->echo_audibility.low_render_limit, 0.f, 32768.f * 32768.f);
+  res = res &
+        Limit(&c->echo_audibility.normal_render_limit, 0.f, 32768.f * 32768.f);
+  res = res & Limit(&c->echo_audibility.floor_power, 0.f, 32768.f * 32768.f);
+  res = res & Limit(&c->echo_audibility.audibility_threshold_lf, 0.f,
+                    32768.f * 32768.f);
+  res = res & Limit(&c->echo_audibility.audibility_threshold_mf, 0.f,
+                    32768.f * 32768.f);
+  res = res & Limit(&c->echo_audibility.audibility_threshold_hf, 0.f,
+                    32768.f * 32768.f);
+
+  res = res &
+        Limit(&c->render_levels.active_render_limit, 0.f, 32768.f * 32768.f);
+  res = res & Limit(&c->render_levels.poor_excitation_render_limit, 0.f,
+                    32768.f * 32768.f);
+  res = res & Limit(&c->render_levels.poor_excitation_render_limit_ds8, 0.f,
+                    32768.f * 32768.f);
+
+  res = res & Limit(&c->echo_model.noise_floor_hold, 0, 1000);
+  res = res & Limit(&c->echo_model.min_noise_floor_power, 0, 2000000.f);
+  res = res & Limit(&c->echo_model.stationary_gate_slope, 0, 1000000.f);
+  res = res & Limit(&c->echo_model.noise_gate_power, 0, 1000000.f);
+  res = res & Limit(&c->echo_model.noise_gate_slope, 0, 1000000.f);
+  res = res & Limit(&c->echo_model.render_pre_window_size, 0, 100);
+  res = res & Limit(&c->echo_model.render_post_window_size, 0, 100);
+
+  res = res & Limit(&c->comfort_noise.noise_floor_dbfs, -200.f, 0.f);
+
+  res = res & Limit(&c->suppressor.nearend_average_blocks, 1, 5000);
+
+  res = res &
+        Limit(&c->suppressor.normal_tuning.mask_lf.enr_transparent, 0.f, 100.f);
+  res = res &
+        Limit(&c->suppressor.normal_tuning.mask_lf.enr_suppress, 0.f, 100.f);
+  res = res &
+        Limit(&c->suppressor.normal_tuning.mask_lf.emr_transparent, 0.f, 100.f);
+  res = res &
+        Limit(&c->suppressor.normal_tuning.mask_hf.enr_transparent, 0.f, 100.f);
+  res = res &
+        Limit(&c->suppressor.normal_tuning.mask_hf.enr_suppress, 0.f, 100.f);
+  res = res &
+        Limit(&c->suppressor.normal_tuning.mask_hf.emr_transparent, 0.f, 100.f);
+  res = res & Limit(&c->suppressor.normal_tuning.max_inc_factor, 0.f, 100.f);
+  res = res & Limit(&c->suppressor.normal_tuning.max_dec_factor_lf, 0.f, 100.f);
+
+  res = res & Limit(&c->suppressor.nearend_tuning.mask_lf.enr_transparent, 0.f,
+                    100.f);
+  res = res &
+        Limit(&c->suppressor.nearend_tuning.mask_lf.enr_suppress, 0.f, 100.f);
+  res = res & Limit(&c->suppressor.nearend_tuning.mask_lf.emr_transparent, 0.f,
+                    100.f);
+  res = res & Limit(&c->suppressor.nearend_tuning.mask_hf.enr_transparent, 0.f,
+                    100.f);
+  res = res &
+        Limit(&c->suppressor.nearend_tuning.mask_hf.enr_suppress, 0.f, 100.f);
+  res = res & Limit(&c->suppressor.nearend_tuning.mask_hf.emr_transparent, 0.f,
+                    100.f);
+  res = res & Limit(&c->suppressor.nearend_tuning.max_inc_factor, 0.f, 100.f);
+  res =
+      res & Limit(&c->suppressor.nearend_tuning.max_dec_factor_lf, 0.f, 100.f);
+
+  res = res & Limit(&c->suppressor.dominant_nearend_detection.enr_threshold,
+                    0.f, 1000000.f);
+  res = res & Limit(&c->suppressor.dominant_nearend_detection.snr_threshold,
+                    0.f, 1000000.f);
+  res = res & Limit(&c->suppressor.dominant_nearend_detection.hold_duration, 0,
+                    10000);
+  res = res & Limit(&c->suppressor.dominant_nearend_detection.trigger_threshold,
+                    0, 10000);
+
+  res = res &
+        Limit(&c->suppressor.subband_nearend_detection.nearend_average_blocks,
+              1, 1024);
+  res =
+      res & Limit(&c->suppressor.subband_nearend_detection.subband1.low, 0, 65);
+  res = res & Limit(&c->suppressor.subband_nearend_detection.subband1.high,
+                    c->suppressor.subband_nearend_detection.subband1.low, 65);
+  res =
+      res & Limit(&c->suppressor.subband_nearend_detection.subband2.low, 0, 65);
+  res = res & Limit(&c->suppressor.subband_nearend_detection.subband2.high,
+                    c->suppressor.subband_nearend_detection.subband2.low, 65);
+  res = res & Limit(&c->suppressor.subband_nearend_detection.nearend_threshold,
+                    0.f, 1.e24f);
+  res = res & Limit(&c->suppressor.subband_nearend_detection.snr_threshold, 0.f,
+                    1.e24f);
+
+  res = res & Limit(&c->suppressor.high_bands_suppression.enr_threshold, 0.f,
+                    1000000.f);
+  res = res & Limit(&c->suppressor.high_bands_suppression.max_gain_during_echo,
+                    0.f, 1.f);
+  res = res & Limit(&c->suppressor.high_bands_suppression
+                         .anti_howling_activation_threshold,
+                    0.f, 32768.f * 32768.f);
+  res = res & Limit(&c->suppressor.high_bands_suppression.anti_howling_gain,
+                    0.f, 1.f);
+
+  res = res & Limit(&c->suppressor.floor_first_increase, 0.f, 1000000.f);
+
+  return res;
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,232 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_AUDIO_ECHO_CANCELLER3_CONFIG_H_
+#define API_AUDIO_ECHO_CANCELLER3_CONFIG_H_
+
+#include <stddef.h>  // size_t
+
+#include "rtc_base/system/rtc_export.h"
+
+namespace webrtc {
+
+// Configuration struct for EchoCanceller3
+struct RTC_EXPORT EchoCanceller3Config {
+  // Checks and updates the config parameters to lie within (mostly) reasonable
+  // ranges. Returns true if and only of the config did not need to be changed.
+  static bool Validate(EchoCanceller3Config* config);
+
+  EchoCanceller3Config();
+  EchoCanceller3Config(const EchoCanceller3Config& e);
+  EchoCanceller3Config& operator=(const EchoCanceller3Config& other);
+
+  struct Buffering {
+    size_t excess_render_detection_interval_blocks = 250;
+    size_t max_allowed_excess_render_blocks = 8;
+  } buffering;
+
+  struct Delay {
+    Delay();
+    Delay(const Delay& e);
+    Delay& operator=(const Delay& e);
+    size_t default_delay = 5;
+    size_t down_sampling_factor = 4;
+    size_t num_filters = 5;
+    size_t delay_headroom_samples = 32;
+    size_t hysteresis_limit_blocks = 1;
+    size_t fixed_capture_delay_samples = 0;
+    float delay_estimate_smoothing = 0.7f;
+    float delay_candidate_detection_threshold = 0.2f;
+    struct DelaySelectionThresholds {
+      int initial;
+      int converged;
+    } delay_selection_thresholds = {5, 20};
+    bool use_external_delay_estimator = false;
+    bool log_warning_on_delay_changes = false;
+    struct AlignmentMixing {
+      bool downmix;
+      bool adaptive_selection;
+      float activity_power_threshold;
+      bool prefer_first_two_channels;
+    };
+    AlignmentMixing render_alignment_mixing = {false, true, 10000.f, true};
+    AlignmentMixing capture_alignment_mixing = {false, true, 10000.f, false};
+  } delay;
+
+  struct Filter {
+    struct RefinedConfiguration {
+      size_t length_blocks;
+      float leakage_converged;
+      float leakage_diverged;
+      float error_floor;
+      float error_ceil;
+      float noise_gate;
+    };
+
+    struct CoarseConfiguration {
+      size_t length_blocks;
+      float rate;
+      float noise_gate;
+    };
+
+    RefinedConfiguration refined = {13,     0.00005f, 0.05f,
+                                    0.001f, 2.f,      20075344.f};
+    CoarseConfiguration coarse = {13, 0.7f, 20075344.f};
+
+    RefinedConfiguration refined_initial = {12,     0.005f, 0.5f,
+                                            0.001f, 2.f,    20075344.f};
+    CoarseConfiguration coarse_initial = {12, 0.9f, 20075344.f};
+
+    size_t config_change_duration_blocks = 250;
+    float initial_state_seconds = 2.5f;
+    int coarse_reset_hangover_blocks = 25;
+    bool conservative_initial_phase = false;
+    bool enable_coarse_filter_output_usage = true;
+    bool use_linear_filter = true;
+    bool high_pass_filter_echo_reference = false;
+    bool export_linear_aec_output = false;
+  } filter;
+
+  struct Erle {
+    float min = 1.f;
+    float max_l = 4.f;
+    float max_h = 1.5f;
+    bool onset_detection = true;
+    size_t num_sections = 1;
+    bool clamp_quality_estimate_to_zero = true;
+    bool clamp_quality_estimate_to_one = true;
+  } erle;
+
+  struct EpStrength {
+    float default_gain = 1.f;
+    float default_len = 0.83f;
+    bool echo_can_saturate = true;
+    bool bounded_erl = false;
+    bool erle_onset_compensation_in_dominant_nearend = false;
+  } ep_strength;
+
+  struct EchoAudibility {
+    float low_render_limit = 4 * 64.f;
+    float normal_render_limit = 64.f;
+    float floor_power = 2 * 64.f;
+    float audibility_threshold_lf = 10;
+    float audibility_threshold_mf = 10;
+    float audibility_threshold_hf = 10;
+    bool use_stationarity_properties = false;
+    bool use_stationarity_properties_at_init = false;
+  } echo_audibility;
+
+  struct RenderLevels {
+    float active_render_limit = 100.f;
+    float poor_excitation_render_limit = 150.f;
+    float poor_excitation_render_limit_ds8 = 20.f;
+    float render_power_gain_db = 0.f;
+  } render_levels;
+
+  struct EchoRemovalControl {
+    bool has_clock_drift = false;
+    bool linear_and_stable_echo_path = false;
+  } echo_removal_control;
+
+  struct EchoModel {
+    EchoModel();
+    EchoModel(const EchoModel& e);
+    EchoModel& operator=(const EchoModel& e);
+    size_t noise_floor_hold = 50;
+    float min_noise_floor_power = 1638400.f;
+    float stationary_gate_slope = 10.f;
+    float noise_gate_power = 27509.42f;
+    float noise_gate_slope = 0.3f;
+    size_t render_pre_window_size = 1;
+    size_t render_post_window_size = 1;
+    bool model_reverb_in_nonlinear_mode = true;
+  } echo_model;
+
+  struct ComfortNoise {
+    float noise_floor_dbfs = -96.03406f;
+  } comfort_noise;
+
+  struct Suppressor {
+    Suppressor();
+    Suppressor(const Suppressor& e);
+    Suppressor& operator=(const Suppressor& e);
+
+    size_t nearend_average_blocks = 4;
+
+    struct MaskingThresholds {
+      MaskingThresholds(float enr_transparent,
+                        float enr_suppress,
+                        float emr_transparent);
+      MaskingThresholds(const MaskingThresholds& e);
+      MaskingThresholds& operator=(const MaskingThresholds& e);
+      float enr_transparent;
+      float enr_suppress;
+      float emr_transparent;
+    };
+
+    struct Tuning {
+      Tuning(MaskingThresholds mask_lf,
+             MaskingThresholds mask_hf,
+             float max_inc_factor,
+             float max_dec_factor_lf);
+      Tuning(const Tuning& e);
+      Tuning& operator=(const Tuning& e);
+      MaskingThresholds mask_lf;
+      MaskingThresholds mask_hf;
+      float max_inc_factor;
+      float max_dec_factor_lf;
+    };
+
+    Tuning normal_tuning = Tuning(MaskingThresholds(.3f, .4f, .3f),
+                                  MaskingThresholds(.07f, .1f, .3f),
+                                  2.0f,
+                                  0.25f);
+    Tuning nearend_tuning = Tuning(MaskingThresholds(1.09f, 1.1f, .3f),
+                                   MaskingThresholds(.1f, .3f, .3f),
+                                   2.0f,
+                                   0.25f);
+
+    struct DominantNearendDetection {
+      float enr_threshold = .25f;
+      float enr_exit_threshold = 10.f;
+      float snr_threshold = 30.f;
+      int hold_duration = 50;
+      int trigger_threshold = 12;
+      bool use_during_initial_phase = true;
+    } dominant_nearend_detection;
+
+    struct SubbandNearendDetection {
+      size_t nearend_average_blocks = 1;
+      struct SubbandRegion {
+        size_t low;
+        size_t high;
+      };
+      SubbandRegion subband1 = {1, 1};
+      SubbandRegion subband2 = {1, 1};
+      float nearend_threshold = 1.f;
+      float snr_threshold = 1.f;
+    } subband_nearend_detection;
+
+    bool use_subband_nearend_detection = false;
+
+    struct HighBandsSuppression {
+      float enr_threshold = 1.f;
+      float max_gain_during_echo = 1.f;
+      float anti_howling_activation_threshold = 400.f;
+      float anti_howling_gain = 1.f;
+    } high_bands_suppression;
+
+    float floor_first_increase = 0.00001f;
+    bool conservative_hf_suppression = false;
+  } suppressor;
+};
+}  // namespace webrtc
+
+#endif  // API_AUDIO_ECHO_CANCELLER3_CONFIG_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config_json.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config_json.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config_json.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config_json.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,705 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "api/audio/echo_canceller3_config_json.h"
+
+#include <stddef.h>
+
+#include <string>
+#include <vector>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/strings/json.h"
+#include "rtc_base/strings/string_builder.h"
+
+namespace webrtc {
+namespace {
+void ReadParam(const Json::Value& root, std::string param_name, bool* param) {
+  RTC_DCHECK(param);
+  bool v;
+  if (rtc::GetBoolFromJsonObject(root, param_name, &v)) {
+    *param = v;
+  }
+}
+
+void ReadParam(const Json::Value& root, std::string param_name, size_t* param) {
+  RTC_DCHECK(param);
+  int v;
+  if (rtc::GetIntFromJsonObject(root, param_name, &v) && v >= 0) {
+    *param = v;
+  }
+}
+
+void ReadParam(const Json::Value& root, std::string param_name, int* param) {
+  RTC_DCHECK(param);
+  int v;
+  if (rtc::GetIntFromJsonObject(root, param_name, &v)) {
+    *param = v;
+  }
+}
+
+void ReadParam(const Json::Value& root, std::string param_name, float* param) {
+  RTC_DCHECK(param);
+  double v;
+  if (rtc::GetDoubleFromJsonObject(root, param_name, &v)) {
+    *param = static_cast<float>(v);
+  }
+}
+
+void ReadParam(const Json::Value& root,
+               std::string param_name,
+               EchoCanceller3Config::Filter::RefinedConfiguration* param) {
+  RTC_DCHECK(param);
+  Json::Value json_array;
+  if (rtc::GetValueFromJsonObject(root, param_name, &json_array)) {
+    std::vector<double> v;
+    rtc::JsonArrayToDoubleVector(json_array, &v);
+    if (v.size() != 6) {
+      RTC_LOG(LS_ERROR) << "Incorrect array size for " << param_name;
+      return;
+    }
+    param->length_blocks = static_cast<size_t>(v[0]);
+    param->leakage_converged = static_cast<float>(v[1]);
+    param->leakage_diverged = static_cast<float>(v[2]);
+    param->error_floor = static_cast<float>(v[3]);
+    param->error_ceil = static_cast<float>(v[4]);
+    param->noise_gate = static_cast<float>(v[5]);
+  }
+}
+
+void ReadParam(const Json::Value& root,
+               std::string param_name,
+               EchoCanceller3Config::Filter::CoarseConfiguration* param) {
+  RTC_DCHECK(param);
+  Json::Value json_array;
+  if (rtc::GetValueFromJsonObject(root, param_name, &json_array)) {
+    std::vector<double> v;
+    rtc::JsonArrayToDoubleVector(json_array, &v);
+    if (v.size() != 3) {
+      RTC_LOG(LS_ERROR) << "Incorrect array size for " << param_name;
+      return;
+    }
+    param->length_blocks = static_cast<size_t>(v[0]);
+    param->rate = static_cast<float>(v[1]);
+    param->noise_gate = static_cast<float>(v[2]);
+  }
+}
+
+void ReadParam(const Json::Value& root,
+               std::string param_name,
+               EchoCanceller3Config::Delay::AlignmentMixing* param) {
+  RTC_DCHECK(param);
+
+  Json::Value subsection;
+  if (rtc::GetValueFromJsonObject(root, param_name, &subsection)) {
+    ReadParam(subsection, "downmix", &param->downmix);
+    ReadParam(subsection, "adaptive_selection", &param->adaptive_selection);
+    ReadParam(subsection, "activity_power_threshold",
+              &param->activity_power_threshold);
+    ReadParam(subsection, "prefer_first_two_channels",
+              &param->prefer_first_two_channels);
+  }
+}
+
+void ReadParam(
+    const Json::Value& root,
+    std::string param_name,
+    EchoCanceller3Config::Suppressor::SubbandNearendDetection::SubbandRegion*
+        param) {
+  RTC_DCHECK(param);
+  Json::Value json_array;
+  if (rtc::GetValueFromJsonObject(root, param_name, &json_array)) {
+    std::vector<int> v;
+    rtc::JsonArrayToIntVector(json_array, &v);
+    if (v.size() != 2) {
+      RTC_LOG(LS_ERROR) << "Incorrect array size for " << param_name;
+      return;
+    }
+    param->low = static_cast<size_t>(v[0]);
+    param->high = static_cast<size_t>(v[1]);
+  }
+}
+
+void ReadParam(const Json::Value& root,
+               std::string param_name,
+               EchoCanceller3Config::Suppressor::MaskingThresholds* param) {
+  RTC_DCHECK(param);
+  Json::Value json_array;
+  if (rtc::GetValueFromJsonObject(root, param_name, &json_array)) {
+    std::vector<double> v;
+    rtc::JsonArrayToDoubleVector(json_array, &v);
+    if (v.size() != 3) {
+      RTC_LOG(LS_ERROR) << "Incorrect array size for " << param_name;
+      return;
+    }
+    param->enr_transparent = static_cast<float>(v[0]);
+    param->enr_suppress = static_cast<float>(v[1]);
+    param->emr_transparent = static_cast<float>(v[2]);
+  }
+}
+}  // namespace
+
+void Aec3ConfigFromJsonString(absl::string_view json_string,
+                              EchoCanceller3Config* config,
+                              bool* parsing_successful) {
+  RTC_DCHECK(config);
+  RTC_DCHECK(parsing_successful);
+  EchoCanceller3Config& cfg = *config;
+  cfg = EchoCanceller3Config();
+  *parsing_successful = true;
+
+  Json::Value root;
+  bool success = Json::Reader().parse(std::string(json_string), root);
+  if (!success) {
+    RTC_LOG(LS_ERROR) << "Incorrect JSON format: " << json_string;
+    *parsing_successful = false;
+    return;
+  }
+
+  Json::Value aec3_root;
+  success = rtc::GetValueFromJsonObject(root, "aec3", &aec3_root);
+  if (!success) {
+    RTC_LOG(LS_ERROR) << "Missing AEC3 config field: " << json_string;
+    *parsing_successful = false;
+    return;
+  }
+
+  Json::Value section;
+  if (rtc::GetValueFromJsonObject(aec3_root, "buffering", &section)) {
+    ReadParam(section, "excess_render_detection_interval_blocks",
+              &cfg.buffering.excess_render_detection_interval_blocks);
+    ReadParam(section, "max_allowed_excess_render_blocks",
+              &cfg.buffering.max_allowed_excess_render_blocks);
+  }
+
+  if (rtc::GetValueFromJsonObject(aec3_root, "delay", &section)) {
+    ReadParam(section, "default_delay", &cfg.delay.default_delay);
+    ReadParam(section, "down_sampling_factor", &cfg.delay.down_sampling_factor);
+    ReadParam(section, "num_filters", &cfg.delay.num_filters);
+    ReadParam(section, "delay_headroom_samples",
+              &cfg.delay.delay_headroom_samples);
+    ReadParam(section, "hysteresis_limit_blocks",
+              &cfg.delay.hysteresis_limit_blocks);
+    ReadParam(section, "fixed_capture_delay_samples",
+              &cfg.delay.fixed_capture_delay_samples);
+    ReadParam(section, "delay_estimate_smoothing",
+              &cfg.delay.delay_estimate_smoothing);
+    ReadParam(section, "delay_candidate_detection_threshold",
+              &cfg.delay.delay_candidate_detection_threshold);
+
+    Json::Value subsection;
+    if (rtc::GetValueFromJsonObject(section, "delay_selection_thresholds",
+                                    &subsection)) {
+      ReadParam(subsection, "initial",
+                &cfg.delay.delay_selection_thresholds.initial);
+      ReadParam(subsection, "converged",
+                &cfg.delay.delay_selection_thresholds.converged);
+    }
+
+    ReadParam(section, "use_external_delay_estimator",
+              &cfg.delay.use_external_delay_estimator);
+    ReadParam(section, "log_warning_on_delay_changes",
+              &cfg.delay.log_warning_on_delay_changes);
+
+    ReadParam(section, "render_alignment_mixing",
+              &cfg.delay.render_alignment_mixing);
+    ReadParam(section, "capture_alignment_mixing",
+              &cfg.delay.capture_alignment_mixing);
+  }
+
+  if (rtc::GetValueFromJsonObject(aec3_root, "filter", &section)) {
+    ReadParam(section, "refined", &cfg.filter.refined);
+    ReadParam(section, "coarse", &cfg.filter.coarse);
+    ReadParam(section, "refined_initial", &cfg.filter.refined_initial);
+    ReadParam(section, "coarse_initial", &cfg.filter.coarse_initial);
+    ReadParam(section, "config_change_duration_blocks",
+              &cfg.filter.config_change_duration_blocks);
+    ReadParam(section, "initial_state_seconds",
+              &cfg.filter.initial_state_seconds);
+    ReadParam(section, "coarse_reset_hangover_blocks",
+              &cfg.filter.coarse_reset_hangover_blocks);
+    ReadParam(section, "conservative_initial_phase",
+              &cfg.filter.conservative_initial_phase);
+    ReadParam(section, "enable_coarse_filter_output_usage",
+              &cfg.filter.enable_coarse_filter_output_usage);
+    ReadParam(section, "use_linear_filter", &cfg.filter.use_linear_filter);
+    ReadParam(section, "high_pass_filter_echo_reference",
+              &cfg.filter.high_pass_filter_echo_reference);
+    ReadParam(section, "export_linear_aec_output",
+              &cfg.filter.export_linear_aec_output);
+  }
+
+  if (rtc::GetValueFromJsonObject(aec3_root, "erle", &section)) {
+    ReadParam(section, "min", &cfg.erle.min);
+    ReadParam(section, "max_l", &cfg.erle.max_l);
+    ReadParam(section, "max_h", &cfg.erle.max_h);
+    ReadParam(section, "onset_detection", &cfg.erle.onset_detection);
+    ReadParam(section, "num_sections", &cfg.erle.num_sections);
+    ReadParam(section, "clamp_quality_estimate_to_zero",
+              &cfg.erle.clamp_quality_estimate_to_zero);
+    ReadParam(section, "clamp_quality_estimate_to_one",
+              &cfg.erle.clamp_quality_estimate_to_one);
+  }
+
+  if (rtc::GetValueFromJsonObject(aec3_root, "ep_strength", &section)) {
+    ReadParam(section, "default_gain", &cfg.ep_strength.default_gain);
+    ReadParam(section, "default_len", &cfg.ep_strength.default_len);
+    ReadParam(section, "echo_can_saturate", &cfg.ep_strength.echo_can_saturate);
+    ReadParam(section, "bounded_erl", &cfg.ep_strength.bounded_erl);
+    ReadParam(section, "erle_onset_compensation_in_dominant_nearend",
+              &cfg.ep_strength.erle_onset_compensation_in_dominant_nearend);
+  }
+
+  if (rtc::GetValueFromJsonObject(aec3_root, "echo_audibility", &section)) {
+    ReadParam(section, "low_render_limit",
+              &cfg.echo_audibility.low_render_limit);
+    ReadParam(section, "normal_render_limit",
+              &cfg.echo_audibility.normal_render_limit);
+
+    ReadParam(section, "floor_power", &cfg.echo_audibility.floor_power);
+    ReadParam(section, "audibility_threshold_lf",
+              &cfg.echo_audibility.audibility_threshold_lf);
+    ReadParam(section, "audibility_threshold_mf",
+              &cfg.echo_audibility.audibility_threshold_mf);
+    ReadParam(section, "audibility_threshold_hf",
+              &cfg.echo_audibility.audibility_threshold_hf);
+    ReadParam(section, "use_stationarity_properties",
+              &cfg.echo_audibility.use_stationarity_properties);
+    ReadParam(section, "use_stationarity_properties_at_init",
+              &cfg.echo_audibility.use_stationarity_properties_at_init);
+  }
+
+  if (rtc::GetValueFromJsonObject(aec3_root, "render_levels", &section)) {
+    ReadParam(section, "active_render_limit",
+              &cfg.render_levels.active_render_limit);
+    ReadParam(section, "poor_excitation_render_limit",
+              &cfg.render_levels.poor_excitation_render_limit);
+    ReadParam(section, "poor_excitation_render_limit_ds8",
+              &cfg.render_levels.poor_excitation_render_limit_ds8);
+    ReadParam(section, "render_power_gain_db",
+              &cfg.render_levels.render_power_gain_db);
+  }
+
+  if (rtc::GetValueFromJsonObject(aec3_root, "echo_removal_control",
+                                  &section)) {
+    ReadParam(section, "has_clock_drift",
+              &cfg.echo_removal_control.has_clock_drift);
+    ReadParam(section, "linear_and_stable_echo_path",
+              &cfg.echo_removal_control.linear_and_stable_echo_path);
+  }
+
+  if (rtc::GetValueFromJsonObject(aec3_root, "echo_model", &section)) {
+    Json::Value subsection;
+    ReadParam(section, "noise_floor_hold", &cfg.echo_model.noise_floor_hold);
+    ReadParam(section, "min_noise_floor_power",
+              &cfg.echo_model.min_noise_floor_power);
+    ReadParam(section, "stationary_gate_slope",
+              &cfg.echo_model.stationary_gate_slope);
+    ReadParam(section, "noise_gate_power", &cfg.echo_model.noise_gate_power);
+    ReadParam(section, "noise_gate_slope", &cfg.echo_model.noise_gate_slope);
+    ReadParam(section, "render_pre_window_size",
+              &cfg.echo_model.render_pre_window_size);
+    ReadParam(section, "render_post_window_size",
+              &cfg.echo_model.render_post_window_size);
+    ReadParam(section, "model_reverb_in_nonlinear_mode",
+              &cfg.echo_model.model_reverb_in_nonlinear_mode);
+  }
+
+  if (rtc::GetValueFromJsonObject(aec3_root, "comfort_noise", &section)) {
+    ReadParam(section, "noise_floor_dbfs", &cfg.comfort_noise.noise_floor_dbfs);
+  }
+
+  Json::Value subsection;
+  if (rtc::GetValueFromJsonObject(aec3_root, "suppressor", &section)) {
+    ReadParam(section, "nearend_average_blocks",
+              &cfg.suppressor.nearend_average_blocks);
+
+    if (rtc::GetValueFromJsonObject(section, "normal_tuning", &subsection)) {
+      ReadParam(subsection, "mask_lf", &cfg.suppressor.normal_tuning.mask_lf);
+      ReadParam(subsection, "mask_hf", &cfg.suppressor.normal_tuning.mask_hf);
+      ReadParam(subsection, "max_inc_factor",
+                &cfg.suppressor.normal_tuning.max_inc_factor);
+      ReadParam(subsection, "max_dec_factor_lf",
+                &cfg.suppressor.normal_tuning.max_dec_factor_lf);
+    }
+
+    if (rtc::GetValueFromJsonObject(section, "nearend_tuning", &subsection)) {
+      ReadParam(subsection, "mask_lf", &cfg.suppressor.nearend_tuning.mask_lf);
+      ReadParam(subsection, "mask_hf", &cfg.suppressor.nearend_tuning.mask_hf);
+      ReadParam(subsection, "max_inc_factor",
+                &cfg.suppressor.nearend_tuning.max_inc_factor);
+      ReadParam(subsection, "max_dec_factor_lf",
+                &cfg.suppressor.nearend_tuning.max_dec_factor_lf);
+    }
+
+    if (rtc::GetValueFromJsonObject(section, "dominant_nearend_detection",
+                                    &subsection)) {
+      ReadParam(subsection, "enr_threshold",
+                &cfg.suppressor.dominant_nearend_detection.enr_threshold);
+      ReadParam(subsection, "enr_exit_threshold",
+                &cfg.suppressor.dominant_nearend_detection.enr_exit_threshold);
+      ReadParam(subsection, "snr_threshold",
+                &cfg.suppressor.dominant_nearend_detection.snr_threshold);
+      ReadParam(subsection, "hold_duration",
+                &cfg.suppressor.dominant_nearend_detection.hold_duration);
+      ReadParam(subsection, "trigger_threshold",
+                &cfg.suppressor.dominant_nearend_detection.trigger_threshold);
+      ReadParam(
+          subsection, "use_during_initial_phase",
+          &cfg.suppressor.dominant_nearend_detection.use_during_initial_phase);
+    }
+
+    if (rtc::GetValueFromJsonObject(section, "subband_nearend_detection",
+                                    &subsection)) {
+      ReadParam(
+          subsection, "nearend_average_blocks",
+          &cfg.suppressor.subband_nearend_detection.nearend_average_blocks);
+      ReadParam(subsection, "subband1",
+                &cfg.suppressor.subband_nearend_detection.subband1);
+      ReadParam(subsection, "subband2",
+                &cfg.suppressor.subband_nearend_detection.subband2);
+      ReadParam(subsection, "nearend_threshold",
+                &cfg.suppressor.subband_nearend_detection.nearend_threshold);
+      ReadParam(subsection, "snr_threshold",
+                &cfg.suppressor.subband_nearend_detection.snr_threshold);
+    }
+
+    ReadParam(section, "use_subband_nearend_detection",
+              &cfg.suppressor.use_subband_nearend_detection);
+
+    if (rtc::GetValueFromJsonObject(section, "high_bands_suppression",
+                                    &subsection)) {
+      ReadParam(subsection, "enr_threshold",
+                &cfg.suppressor.high_bands_suppression.enr_threshold);
+      ReadParam(subsection, "max_gain_during_echo",
+                &cfg.suppressor.high_bands_suppression.max_gain_during_echo);
+      ReadParam(subsection, "anti_howling_activation_threshold",
+                &cfg.suppressor.high_bands_suppression
+                     .anti_howling_activation_threshold);
+      ReadParam(subsection, "anti_howling_gain",
+                &cfg.suppressor.high_bands_suppression.anti_howling_gain);
+    }
+
+    ReadParam(section, "floor_first_increase",
+              &cfg.suppressor.floor_first_increase);
+    ReadParam(section, "conservative_hf_suppression",
+              &cfg.suppressor.conservative_hf_suppression);
+  }
+}
+
+EchoCanceller3Config Aec3ConfigFromJsonString(absl::string_view json_string) {
+  EchoCanceller3Config cfg;
+  bool not_used;
+  Aec3ConfigFromJsonString(json_string, &cfg, &not_used);
+  return cfg;
+}
+
+std::string Aec3ConfigToJsonString(const EchoCanceller3Config& config) {
+  rtc::StringBuilder ost;
+  ost << "{";
+  ost << "\"aec3\": {";
+  ost << "\"buffering\": {";
+  ost << "\"excess_render_detection_interval_blocks\": "
+      << config.buffering.excess_render_detection_interval_blocks << ",";
+  ost << "\"max_allowed_excess_render_blocks\": "
+      << config.buffering.max_allowed_excess_render_blocks;
+  ost << "},";
+
+  ost << "\"delay\": {";
+  ost << "\"default_delay\": " << config.delay.default_delay << ",";
+  ost << "\"down_sampling_factor\": " << config.delay.down_sampling_factor
+      << ",";
+  ost << "\"num_filters\": " << config.delay.num_filters << ",";
+  ost << "\"delay_headroom_samples\": " << config.delay.delay_headroom_samples
+      << ",";
+  ost << "\"hysteresis_limit_blocks\": " << config.delay.hysteresis_limit_blocks
+      << ",";
+  ost << "\"fixed_capture_delay_samples\": "
+      << config.delay.fixed_capture_delay_samples << ",";
+  ost << "\"delay_estimate_smoothing\": "
+      << config.delay.delay_estimate_smoothing << ",";
+  ost << "\"delay_candidate_detection_threshold\": "
+      << config.delay.delay_candidate_detection_threshold << ",";
+
+  ost << "\"delay_selection_thresholds\": {";
+  ost << "\"initial\": " << config.delay.delay_selection_thresholds.initial
+      << ",";
+  ost << "\"converged\": " << config.delay.delay_selection_thresholds.converged;
+  ost << "},";
+
+  ost << "\"use_external_delay_estimator\": "
+      << (config.delay.use_external_delay_estimator ? "true" : "false") << ",";
+  ost << "\"log_warning_on_delay_changes\": "
+      << (config.delay.log_warning_on_delay_changes ? "true" : "false") << ",";
+
+  ost << "\"render_alignment_mixing\": {";
+  ost << "\"downmix\": "
+      << (config.delay.render_alignment_mixing.downmix ? "true" : "false")
+      << ",";
+  ost << "\"adaptive_selection\": "
+      << (config.delay.render_alignment_mixing.adaptive_selection ? "true"
+                                                                  : "false")
+      << ",";
+  ost << "\"activity_power_threshold\": "
+      << config.delay.render_alignment_mixing.activity_power_threshold << ",";
+  ost << "\"prefer_first_two_channels\": "
+      << (config.delay.render_alignment_mixing.prefer_first_two_channels
+              ? "true"
+              : "false");
+  ost << "},";
+
+  ost << "\"capture_alignment_mixing\": {";
+  ost << "\"downmix\": "
+      << (config.delay.capture_alignment_mixing.downmix ? "true" : "false")
+      << ",";
+  ost << "\"adaptive_selection\": "
+      << (config.delay.capture_alignment_mixing.adaptive_selection ? "true"
+                                                                   : "false")
+      << ",";
+  ost << "\"activity_power_threshold\": "
+      << config.delay.capture_alignment_mixing.activity_power_threshold << ",";
+  ost << "\"prefer_first_two_channels\": "
+      << (config.delay.capture_alignment_mixing.prefer_first_two_channels
+              ? "true"
+              : "false");
+  ost << "}";
+  ost << "},";
+
+  ost << "\"filter\": {";
+
+  ost << "\"refined\": [";
+  ost << config.filter.refined.length_blocks << ",";
+  ost << config.filter.refined.leakage_converged << ",";
+  ost << config.filter.refined.leakage_diverged << ",";
+  ost << config.filter.refined.error_floor << ",";
+  ost << config.filter.refined.error_ceil << ",";
+  ost << config.filter.refined.noise_gate;
+  ost << "],";
+
+  ost << "\"coarse\": [";
+  ost << config.filter.coarse.length_blocks << ",";
+  ost << config.filter.coarse.rate << ",";
+  ost << config.filter.coarse.noise_gate;
+  ost << "],";
+
+  ost << "\"refined_initial\": [";
+  ost << config.filter.refined_initial.length_blocks << ",";
+  ost << config.filter.refined_initial.leakage_converged << ",";
+  ost << config.filter.refined_initial.leakage_diverged << ",";
+  ost << config.filter.refined_initial.error_floor << ",";
+  ost << config.filter.refined_initial.error_ceil << ",";
+  ost << config.filter.refined_initial.noise_gate;
+  ost << "],";
+
+  ost << "\"coarse_initial\": [";
+  ost << config.filter.coarse_initial.length_blocks << ",";
+  ost << config.filter.coarse_initial.rate << ",";
+  ost << config.filter.coarse_initial.noise_gate;
+  ost << "],";
+
+  ost << "\"config_change_duration_blocks\": "
+      << config.filter.config_change_duration_blocks << ",";
+  ost << "\"initial_state_seconds\": " << config.filter.initial_state_seconds
+      << ",";
+  ost << "\"coarse_reset_hangover_blocks\": "
+      << config.filter.coarse_reset_hangover_blocks << ",";
+  ost << "\"conservative_initial_phase\": "
+      << (config.filter.conservative_initial_phase ? "true" : "false") << ",";
+  ost << "\"enable_coarse_filter_output_usage\": "
+      << (config.filter.enable_coarse_filter_output_usage ? "true" : "false")
+      << ",";
+  ost << "\"use_linear_filter\": "
+      << (config.filter.use_linear_filter ? "true" : "false") << ",";
+  ost << "\"high_pass_filter_echo_reference\": "
+      << (config.filter.high_pass_filter_echo_reference ? "true" : "false")
+      << ",";
+  ost << "\"export_linear_aec_output\": "
+      << (config.filter.export_linear_aec_output ? "true" : "false");
+
+  ost << "},";
+
+  ost << "\"erle\": {";
+  ost << "\"min\": " << config.erle.min << ",";
+  ost << "\"max_l\": " << config.erle.max_l << ",";
+  ost << "\"max_h\": " << config.erle.max_h << ",";
+  ost << "\"onset_detection\": "
+      << (config.erle.onset_detection ? "true" : "false") << ",";
+  ost << "\"num_sections\": " << config.erle.num_sections << ",";
+  ost << "\"clamp_quality_estimate_to_zero\": "
+      << (config.erle.clamp_quality_estimate_to_zero ? "true" : "false") << ",";
+  ost << "\"clamp_quality_estimate_to_one\": "
+      << (config.erle.clamp_quality_estimate_to_one ? "true" : "false");
+  ost << "},";
+
+  ost << "\"ep_strength\": {";
+  ost << "\"default_gain\": " << config.ep_strength.default_gain << ",";
+  ost << "\"default_len\": " << config.ep_strength.default_len << ",";
+  ost << "\"echo_can_saturate\": "
+      << (config.ep_strength.echo_can_saturate ? "true" : "false") << ",";
+  ost << "\"bounded_erl\": "
+      << (config.ep_strength.bounded_erl ? "true" : "false") << ",";
+  ost << "\"erle_onset_compensation_in_dominant_nearend\": "
+      << (config.ep_strength.erle_onset_compensation_in_dominant_nearend
+              ? "true"
+              : "false");
+  ost << "},";
+
+  ost << "\"echo_audibility\": {";
+  ost << "\"low_render_limit\": " << config.echo_audibility.low_render_limit
+      << ",";
+  ost << "\"normal_render_limit\": "
+      << config.echo_audibility.normal_render_limit << ",";
+  ost << "\"floor_power\": " << config.echo_audibility.floor_power << ",";
+  ost << "\"audibility_threshold_lf\": "
+      << config.echo_audibility.audibility_threshold_lf << ",";
+  ost << "\"audibility_threshold_mf\": "
+      << config.echo_audibility.audibility_threshold_mf << ",";
+  ost << "\"audibility_threshold_hf\": "
+      << config.echo_audibility.audibility_threshold_hf << ",";
+  ost << "\"use_stationarity_properties\": "
+      << (config.echo_audibility.use_stationarity_properties ? "true" : "false")
+      << ",";
+  ost << "\"use_stationarity_properties_at_init\": "
+      << (config.echo_audibility.use_stationarity_properties_at_init ? "true"
+                                                                     : "false");
+  ost << "},";
+
+  ost << "\"render_levels\": {";
+  ost << "\"active_render_limit\": " << config.render_levels.active_render_limit
+      << ",";
+  ost << "\"poor_excitation_render_limit\": "
+      << config.render_levels.poor_excitation_render_limit << ",";
+  ost << "\"poor_excitation_render_limit_ds8\": "
+      << config.render_levels.poor_excitation_render_limit_ds8 << ",";
+  ost << "\"render_power_gain_db\": "
+      << config.render_levels.render_power_gain_db;
+  ost << "},";
+
+  ost << "\"echo_removal_control\": {";
+  ost << "\"has_clock_drift\": "
+      << (config.echo_removal_control.has_clock_drift ? "true" : "false")
+      << ",";
+  ost << "\"linear_and_stable_echo_path\": "
+      << (config.echo_removal_control.linear_and_stable_echo_path ? "true"
+                                                                  : "false");
+
+  ost << "},";
+
+  ost << "\"echo_model\": {";
+  ost << "\"noise_floor_hold\": " << config.echo_model.noise_floor_hold << ",";
+  ost << "\"min_noise_floor_power\": "
+      << config.echo_model.min_noise_floor_power << ",";
+  ost << "\"stationary_gate_slope\": "
+      << config.echo_model.stationary_gate_slope << ",";
+  ost << "\"noise_gate_power\": " << config.echo_model.noise_gate_power << ",";
+  ost << "\"noise_gate_slope\": " << config.echo_model.noise_gate_slope << ",";
+  ost << "\"render_pre_window_size\": "
+      << config.echo_model.render_pre_window_size << ",";
+  ost << "\"render_post_window_size\": "
+      << config.echo_model.render_post_window_size << ",";
+  ost << "\"model_reverb_in_nonlinear_mode\": "
+      << (config.echo_model.model_reverb_in_nonlinear_mode ? "true" : "false");
+  ost << "},";
+
+  ost << "\"comfort_noise\": {";
+  ost << "\"noise_floor_dbfs\": " << config.comfort_noise.noise_floor_dbfs;
+  ost << "},";
+
+  ost << "\"suppressor\": {";
+  ost << "\"nearend_average_blocks\": "
+      << config.suppressor.nearend_average_blocks << ",";
+  ost << "\"normal_tuning\": {";
+  ost << "\"mask_lf\": [";
+  ost << config.suppressor.normal_tuning.mask_lf.enr_transparent << ",";
+  ost << config.suppressor.normal_tuning.mask_lf.enr_suppress << ",";
+  ost << config.suppressor.normal_tuning.mask_lf.emr_transparent;
+  ost << "],";
+  ost << "\"mask_hf\": [";
+  ost << config.suppressor.normal_tuning.mask_hf.enr_transparent << ",";
+  ost << config.suppressor.normal_tuning.mask_hf.enr_suppress << ",";
+  ost << config.suppressor.normal_tuning.mask_hf.emr_transparent;
+  ost << "],";
+  ost << "\"max_inc_factor\": "
+      << config.suppressor.normal_tuning.max_inc_factor << ",";
+  ost << "\"max_dec_factor_lf\": "
+      << config.suppressor.normal_tuning.max_dec_factor_lf;
+  ost << "},";
+  ost << "\"nearend_tuning\": {";
+  ost << "\"mask_lf\": [";
+  ost << config.suppressor.nearend_tuning.mask_lf.enr_transparent << ",";
+  ost << config.suppressor.nearend_tuning.mask_lf.enr_suppress << ",";
+  ost << config.suppressor.nearend_tuning.mask_lf.emr_transparent;
+  ost << "],";
+  ost << "\"mask_hf\": [";
+  ost << config.suppressor.nearend_tuning.mask_hf.enr_transparent << ",";
+  ost << config.suppressor.nearend_tuning.mask_hf.enr_suppress << ",";
+  ost << config.suppressor.nearend_tuning.mask_hf.emr_transparent;
+  ost << "],";
+  ost << "\"max_inc_factor\": "
+      << config.suppressor.nearend_tuning.max_inc_factor << ",";
+  ost << "\"max_dec_factor_lf\": "
+      << config.suppressor.nearend_tuning.max_dec_factor_lf;
+  ost << "},";
+  ost << "\"dominant_nearend_detection\": {";
+  ost << "\"enr_threshold\": "
+      << config.suppressor.dominant_nearend_detection.enr_threshold << ",";
+  ost << "\"enr_exit_threshold\": "
+      << config.suppressor.dominant_nearend_detection.enr_exit_threshold << ",";
+  ost << "\"snr_threshold\": "
+      << config.suppressor.dominant_nearend_detection.snr_threshold << ",";
+  ost << "\"hold_duration\": "
+      << config.suppressor.dominant_nearend_detection.hold_duration << ",";
+  ost << "\"trigger_threshold\": "
+      << config.suppressor.dominant_nearend_detection.trigger_threshold << ",";
+  ost << "\"use_during_initial_phase\": "
+      << config.suppressor.dominant_nearend_detection.use_during_initial_phase;
+  ost << "},";
+  ost << "\"subband_nearend_detection\": {";
+  ost << "\"nearend_average_blocks\": "
+      << config.suppressor.subband_nearend_detection.nearend_average_blocks
+      << ",";
+  ost << "\"subband1\": [";
+  ost << config.suppressor.subband_nearend_detection.subband1.low << ",";
+  ost << config.suppressor.subband_nearend_detection.subband1.high;
+  ost << "],";
+  ost << "\"subband2\": [";
+  ost << config.suppressor.subband_nearend_detection.subband2.low << ",";
+  ost << config.suppressor.subband_nearend_detection.subband2.high;
+  ost << "],";
+  ost << "\"nearend_threshold\": "
+      << config.suppressor.subband_nearend_detection.nearend_threshold << ",";
+  ost << "\"snr_threshold\": "
+      << config.suppressor.subband_nearend_detection.snr_threshold;
+  ost << "},";
+  ost << "\"use_subband_nearend_detection\": "
+      << config.suppressor.use_subband_nearend_detection << ",";
+  ost << "\"high_bands_suppression\": {";
+  ost << "\"enr_threshold\": "
+      << config.suppressor.high_bands_suppression.enr_threshold << ",";
+  ost << "\"max_gain_during_echo\": "
+      << config.suppressor.high_bands_suppression.max_gain_during_echo << ",";
+  ost << "\"anti_howling_activation_threshold\": "
+      << config.suppressor.high_bands_suppression
+             .anti_howling_activation_threshold
+      << ",";
+  ost << "\"anti_howling_gain\": "
+      << config.suppressor.high_bands_suppression.anti_howling_gain;
+  ost << "},";
+  ost << "\"floor_first_increase\": " << config.suppressor.floor_first_increase
+      << ",";
+  ost << "\"conservative_hf_suppression\": "
+      << config.suppressor.conservative_hf_suppression;
+  ost << "}";
+  ost << "}";
+  ost << "}";
+
+  return ost.Release();
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config_json.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config_json.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config_json.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_config_json.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_AUDIO_ECHO_CANCELLER3_CONFIG_JSON_H_
+#define API_AUDIO_ECHO_CANCELLER3_CONFIG_JSON_H_
+
+#include <string>
+
+#include "absl/strings/string_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "rtc_base/system/rtc_export.h"
+
+namespace webrtc {
+// Parses a JSON-encoded string into an Aec3 config. Fields corresponds to
+// substruct names, with the addition that there must be a top-level node
+// "aec3". Produces default config values for anything that cannot be parsed
+// from the string. If any error was found in the parsing, parsing_successful is
+// set to false.
+RTC_EXPORT void Aec3ConfigFromJsonString(absl::string_view json_string,
+                                         EchoCanceller3Config* config,
+                                         bool* parsing_successful);
+
+// To be deprecated.
+// Parses a JSON-encoded string into an Aec3 config. Fields corresponds to
+// substruct names, with the addition that there must be a top-level node
+// "aec3". Returns default config values for anything that cannot be parsed from
+// the string.
+RTC_EXPORT EchoCanceller3Config
+Aec3ConfigFromJsonString(absl::string_view json_string);
+
+// Encodes an Aec3 config in JSON format. Fields corresponds to substruct names,
+// with the addition that the top-level node is named "aec3".
+RTC_EXPORT std::string Aec3ConfigToJsonString(
+    const EchoCanceller3Config& config);
+
+}  // namespace webrtc
+
+#endif  // API_AUDIO_ECHO_CANCELLER3_CONFIG_JSON_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_factory.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_factory.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_factory.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_factory.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "api/audio/echo_canceller3_factory.h"
+
+#include <memory>
+
+#include "modules/audio_processing/aec3/echo_canceller3.h"
+
+namespace webrtc {
+
+EchoCanceller3Factory::EchoCanceller3Factory() {}
+
+EchoCanceller3Factory::EchoCanceller3Factory(const EchoCanceller3Config& config)
+    : config_(config) {}
+
+std::unique_ptr<EchoControl> EchoCanceller3Factory::Create(
+    int sample_rate_hz,
+    int num_render_channels,
+    int num_capture_channels) {
+  return std::make_unique<EchoCanceller3>(
+      config_, sample_rate_hz, num_render_channels, num_capture_channels);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_factory.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_factory.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_factory.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_canceller3_factory.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_AUDIO_ECHO_CANCELLER3_FACTORY_H_
+#define API_AUDIO_ECHO_CANCELLER3_FACTORY_H_
+
+#include <memory>
+
+#include "api/audio/echo_canceller3_config.h"
+#include "api/audio/echo_control.h"
+#include "rtc_base/system/rtc_export.h"
+
+namespace webrtc {
+
+class RTC_EXPORT EchoCanceller3Factory : public EchoControlFactory {
+ public:
+  // Factory producing EchoCanceller3 instances with the default configuration.
+  EchoCanceller3Factory();
+
+  // Factory producing EchoCanceller3 instances with the specified
+  // configuration.
+  explicit EchoCanceller3Factory(const EchoCanceller3Config& config);
+
+  // Creates an EchoCanceller3 with a specified channel count and sampling rate.
+  std::unique_ptr<EchoControl> Create(int sample_rate_hz,
+                                      int num_render_channels,
+                                      int num_capture_channels) override;
+
+ private:
+  const EchoCanceller3Config config_;
+};
+}  // namespace webrtc
+
+#endif  // API_AUDIO_ECHO_CANCELLER3_FACTORY_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_control.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_control.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_control.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_control.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_AUDIO_ECHO_CONTROL_H_
+#define API_AUDIO_ECHO_CONTROL_H_
+
+#include <memory>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+class AudioBuffer;
+
+// Interface for an acoustic echo cancellation (AEC) submodule.
+class EchoControl {
+ public:
+  // Analysis (not changing) of the render signal.
+  virtual void AnalyzeRender(AudioBuffer* render) = 0;
+
+  // Analysis (not changing) of the capture signal.
+  virtual void AnalyzeCapture(AudioBuffer* capture) = 0;
+
+  // Processes the capture signal in order to remove the echo.
+  virtual void ProcessCapture(AudioBuffer* capture, bool level_change) = 0;
+
+  // As above, but also returns the linear filter output.
+  virtual void ProcessCapture(AudioBuffer* capture,
+                              AudioBuffer* linear_output,
+                              bool level_change) = 0;
+
+  struct Metrics {
+    double echo_return_loss;
+    double echo_return_loss_enhancement;
+    int delay_ms;
+  };
+
+  // Collect current metrics from the echo controller.
+  virtual Metrics GetMetrics() const = 0;
+
+  // Provides an optional external estimate of the audio buffer delay.
+  virtual void SetAudioBufferDelay(int delay_ms) = 0;
+
+  // Specifies whether the capture output will be used. The purpose of this is
+  // to allow the echo controller to deactivate some of the processing when the
+  // resulting output is anyway not used, for instance when the endpoint is
+  // muted.
+  // TODO(b/177830919): Make pure virtual.
+  virtual void SetCaptureOutputUsage(bool capture_output_used) {}
+
+  // Returns wheter the signal is altered.
+  virtual bool ActiveProcessing() const = 0;
+
+  virtual ~EchoControl() {}
+};
+
+// Interface for a factory that creates EchoControllers.
+class EchoControlFactory {
+ public:
+  virtual std::unique_ptr<EchoControl> Create(int sample_rate_hz,
+                                              int num_render_channels,
+                                              int num_capture_channels) = 0;
+
+  virtual ~EchoControlFactory() = default;
+};
+}  // namespace webrtc
+
+#endif  // API_AUDIO_ECHO_CONTROL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_detector_creator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_detector_creator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_detector_creator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_detector_creator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,21 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "api/audio/echo_detector_creator.h"
+
+#include "modules/audio_processing/residual_echo_detector.h"
+#include "rtc_base/ref_counted_object.h"
+
+namespace webrtc {
+
+rtc::scoped_refptr<EchoDetector> CreateEchoDetector() {
+  return new rtc::RefCountedObject<ResidualEchoDetector>();
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_detector_creator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_detector_creator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_detector_creator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/echo_detector_creator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,26 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_AUDIO_ECHO_DETECTOR_CREATOR_H_
+#define API_AUDIO_ECHO_DETECTOR_CREATOR_H_
+
+#include "api/scoped_refptr.h"
+#include "modules/audio_processing/include/audio_processing.h"
+
+namespace webrtc {
+
+// Returns an instance of the WebRTC implementation of a residual echo detector.
+// It can be provided to the webrtc::AudioProcessingBuilder to obtain the
+// usual residual echo metrics.
+rtc::scoped_refptr<EchoDetector> CreateEchoDetector();
+
+}  // namespace webrtc
+
+#endif  // API_AUDIO_ECHO_DETECTOR_CREATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/OWNERS asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/OWNERS
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/OWNERS	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/OWNERS	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,2 @@
+gustaf@webrtc.org
+peah@webrtc.org
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/audio_frame_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/audio_frame_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/audio_frame_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/audio_frame_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,186 @@
+/*
+ *  Copyright 2018 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "api/audio/audio_frame.h"
+
+#include <stdint.h>
+#include <string.h>  // memcmp
+
+#include "test/gtest.h"
+
+namespace webrtc {
+
+namespace {
+
+bool AllSamplesAre(int16_t sample, const AudioFrame& frame) {
+  const int16_t* frame_data = frame.data();
+  for (size_t i = 0; i < frame.max_16bit_samples(); i++) {
+    if (frame_data[i] != sample) {
+      return false;
+    }
+  }
+  return true;
+}
+
+constexpr uint32_t kTimestamp = 27;
+constexpr int kSampleRateHz = 16000;
+constexpr size_t kNumChannelsMono = 1;
+constexpr size_t kNumChannelsStereo = 2;
+constexpr size_t kNumChannels5_1 = 6;
+constexpr size_t kSamplesPerChannel = kSampleRateHz / 100;
+
+}  // namespace
+
+TEST(AudioFrameTest, FrameStartsMuted) {
+  AudioFrame frame;
+  EXPECT_TRUE(frame.muted());
+  EXPECT_TRUE(AllSamplesAre(0, frame));
+}
+
+TEST(AudioFrameTest, UnmutedFrameIsInitiallyZeroed) {
+  AudioFrame frame;
+  frame.mutable_data();
+  EXPECT_FALSE(frame.muted());
+  EXPECT_TRUE(AllSamplesAre(0, frame));
+}
+
+TEST(AudioFrameTest, MutedFrameBufferIsZeroed) {
+  AudioFrame frame;
+  int16_t* frame_data = frame.mutable_data();
+  for (size_t i = 0; i < frame.max_16bit_samples(); i++) {
+    frame_data[i] = 17;
+  }
+  ASSERT_TRUE(AllSamplesAre(17, frame));
+  frame.Mute();
+  EXPECT_TRUE(frame.muted());
+  EXPECT_TRUE(AllSamplesAre(0, frame));
+}
+
+TEST(AudioFrameTest, UpdateFrameMono) {
+  AudioFrame frame;
+  int16_t samples[kNumChannelsMono * kSamplesPerChannel] = {17};
+  frame.UpdateFrame(kTimestamp, samples, kSamplesPerChannel, kSampleRateHz,
+                    AudioFrame::kPLC, AudioFrame::kVadActive, kNumChannelsMono);
+
+  EXPECT_EQ(kTimestamp, frame.timestamp_);
+  EXPECT_EQ(kSamplesPerChannel, frame.samples_per_channel());
+  EXPECT_EQ(kSampleRateHz, frame.sample_rate_hz());
+  EXPECT_EQ(AudioFrame::kPLC, frame.speech_type_);
+  EXPECT_EQ(AudioFrame::kVadActive, frame.vad_activity_);
+  EXPECT_EQ(kNumChannelsMono, frame.num_channels());
+  EXPECT_EQ(CHANNEL_LAYOUT_MONO, frame.channel_layout());
+
+  EXPECT_FALSE(frame.muted());
+  EXPECT_EQ(0, memcmp(samples, frame.data(), sizeof(samples)));
+
+  frame.UpdateFrame(kTimestamp, nullptr /* data*/, kSamplesPerChannel,
+                    kSampleRateHz, AudioFrame::kPLC, AudioFrame::kVadActive,
+                    kNumChannelsMono);
+  EXPECT_TRUE(frame.muted());
+  EXPECT_TRUE(AllSamplesAre(0, frame));
+}
+
+TEST(AudioFrameTest, UpdateFrameMultiChannel) {
+  AudioFrame frame;
+  frame.UpdateFrame(kTimestamp, nullptr /* data */, kSamplesPerChannel,
+                    kSampleRateHz, AudioFrame::kPLC, AudioFrame::kVadActive,
+                    kNumChannelsStereo);
+  EXPECT_EQ(kSamplesPerChannel, frame.samples_per_channel());
+  EXPECT_EQ(kNumChannelsStereo, frame.num_channels());
+  EXPECT_EQ(CHANNEL_LAYOUT_STEREO, frame.channel_layout());
+
+  frame.UpdateFrame(kTimestamp, nullptr /* data */, kSamplesPerChannel,
+                    kSampleRateHz, AudioFrame::kPLC, AudioFrame::kVadActive,
+                    kNumChannels5_1);
+  EXPECT_EQ(kSamplesPerChannel, frame.samples_per_channel());
+  EXPECT_EQ(kNumChannels5_1, frame.num_channels());
+  EXPECT_EQ(CHANNEL_LAYOUT_5_1, frame.channel_layout());
+}
+
+TEST(AudioFrameTest, CopyFrom) {
+  AudioFrame frame1;
+  AudioFrame frame2;
+
+  int16_t samples[kNumChannelsMono * kSamplesPerChannel] = {17};
+  frame2.UpdateFrame(kTimestamp, samples, kSamplesPerChannel, kSampleRateHz,
+                     AudioFrame::kPLC, AudioFrame::kVadActive,
+                     kNumChannelsMono);
+  frame1.CopyFrom(frame2);
+
+  EXPECT_EQ(frame2.timestamp_, frame1.timestamp_);
+  EXPECT_EQ(frame2.samples_per_channel_, frame1.samples_per_channel_);
+  EXPECT_EQ(frame2.sample_rate_hz_, frame1.sample_rate_hz_);
+  EXPECT_EQ(frame2.speech_type_, frame1.speech_type_);
+  EXPECT_EQ(frame2.vad_activity_, frame1.vad_activity_);
+  EXPECT_EQ(frame2.num_channels_, frame1.num_channels_);
+
+  EXPECT_EQ(frame2.muted(), frame1.muted());
+  EXPECT_EQ(0, memcmp(frame2.data(), frame1.data(), sizeof(samples)));
+
+  frame2.UpdateFrame(kTimestamp, nullptr /* data */, kSamplesPerChannel,
+                     kSampleRateHz, AudioFrame::kPLC, AudioFrame::kVadActive,
+                     kNumChannelsMono);
+  frame1.CopyFrom(frame2);
+
+  EXPECT_EQ(frame2.muted(), frame1.muted());
+  EXPECT_EQ(0, memcmp(frame2.data(), frame1.data(), sizeof(samples)));
+}
+
+TEST(AudioFrameTest, SwapFrames) {
+  AudioFrame frame1, frame2;
+  int16_t samples1[kNumChannelsMono * kSamplesPerChannel];
+  for (size_t i = 0; i < kNumChannelsMono * kSamplesPerChannel; ++i) {
+    samples1[i] = i;
+  }
+  frame1.UpdateFrame(kTimestamp, samples1, kSamplesPerChannel, kSampleRateHz,
+                     AudioFrame::kPLC, AudioFrame::kVadActive,
+                     kNumChannelsMono);
+  frame1.set_absolute_capture_timestamp_ms(12345678);
+  const auto frame1_channel_layout = frame1.channel_layout();
+
+  int16_t samples2[(kNumChannelsMono + 1) * (kSamplesPerChannel + 1)];
+  for (size_t i = 0; i < (kNumChannelsMono + 1) * (kSamplesPerChannel + 1);
+       ++i) {
+    samples2[i] = 1000 + i;
+  }
+  frame2.UpdateFrame(kTimestamp + 1, samples2, kSamplesPerChannel + 1,
+                     kSampleRateHz + 1, AudioFrame::kNormalSpeech,
+                     AudioFrame::kVadPassive, kNumChannelsMono + 1);
+  const auto frame2_channel_layout = frame2.channel_layout();
+
+  swap(frame1, frame2);
+
+  EXPECT_EQ(kTimestamp + 1, frame1.timestamp_);
+  ASSERT_EQ(kSamplesPerChannel + 1, frame1.samples_per_channel_);
+  EXPECT_EQ(kSampleRateHz + 1, frame1.sample_rate_hz_);
+  EXPECT_EQ(AudioFrame::kNormalSpeech, frame1.speech_type_);
+  EXPECT_EQ(AudioFrame::kVadPassive, frame1.vad_activity_);
+  ASSERT_EQ(kNumChannelsMono + 1, frame1.num_channels_);
+  for (size_t i = 0; i < (kNumChannelsMono + 1) * (kSamplesPerChannel + 1);
+       ++i) {
+    EXPECT_EQ(samples2[i], frame1.data()[i]);
+  }
+  EXPECT_FALSE(frame1.absolute_capture_timestamp_ms());
+  EXPECT_EQ(frame2_channel_layout, frame1.channel_layout());
+
+  EXPECT_EQ(kTimestamp, frame2.timestamp_);
+  ASSERT_EQ(kSamplesPerChannel, frame2.samples_per_channel_);
+  EXPECT_EQ(kSampleRateHz, frame2.sample_rate_hz_);
+  EXPECT_EQ(AudioFrame::kPLC, frame2.speech_type_);
+  EXPECT_EQ(AudioFrame::kVadActive, frame2.vad_activity_);
+  ASSERT_EQ(kNumChannelsMono, frame2.num_channels_);
+  for (size_t i = 0; i < kNumChannelsMono * kSamplesPerChannel; ++i) {
+    EXPECT_EQ(samples1[i], frame2.data()[i]);
+  }
+  EXPECT_EQ(12345678, frame2.absolute_capture_timestamp_ms());
+  EXPECT_EQ(frame1_channel_layout, frame2.channel_layout());
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/BUILD.gn asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/BUILD.gn
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/BUILD.gn	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,31 @@
+# Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+import("../../../webrtc.gni")
+if (is_android) {
+  import("//build/config/android/config.gni")
+  import("//build/config/android/rules.gni")
+}
+
+if (rtc_include_tests) {
+  rtc_library("audio_api_unittests") {
+    testonly = true
+    sources = [
+      "audio_frame_unittest.cc",
+      "echo_canceller3_config_json_unittest.cc",
+      "echo_canceller3_config_unittest.cc",
+    ]
+    deps = [
+      "..:aec3_config",
+      "..:aec3_config_json",
+      "..:audio_frame_api",
+      "../../../rtc_base:rtc_base_approved",
+      "../../../test:test_support",
+    ]
+  }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/echo_canceller3_config_json_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/echo_canceller3_config_json_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/echo_canceller3_config_json_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/echo_canceller3_config_json_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+ *  Copyright 2018 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "api/audio/echo_canceller3_config_json.h"
+
+#include "api/audio/echo_canceller3_config.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+TEST(EchoCanceller3JsonHelpers, ToStringAndParseJson) {
+  EchoCanceller3Config cfg;
+  cfg.delay.down_sampling_factor = 1u;
+  cfg.delay.log_warning_on_delay_changes = true;
+  cfg.filter.refined.error_floor = 2.f;
+  cfg.filter.coarse_initial.length_blocks = 3u;
+  cfg.filter.high_pass_filter_echo_reference =
+      !cfg.filter.high_pass_filter_echo_reference;
+  cfg.comfort_noise.noise_floor_dbfs = 100.f;
+  cfg.echo_model.model_reverb_in_nonlinear_mode = false;
+  cfg.suppressor.normal_tuning.mask_hf.enr_suppress = .5f;
+  cfg.suppressor.subband_nearend_detection.nearend_average_blocks = 3;
+  cfg.suppressor.subband_nearend_detection.subband1 = {1, 3};
+  cfg.suppressor.subband_nearend_detection.subband1 = {4, 5};
+  cfg.suppressor.subband_nearend_detection.nearend_threshold = 2.f;
+  cfg.suppressor.subband_nearend_detection.snr_threshold = 100.f;
+  std::string json_string = Aec3ConfigToJsonString(cfg);
+  EchoCanceller3Config cfg_transformed = Aec3ConfigFromJsonString(json_string);
+
+  // Expect unchanged values to remain default.
+  EXPECT_EQ(cfg.ep_strength.default_len,
+            cfg_transformed.ep_strength.default_len);
+  EXPECT_EQ(cfg.suppressor.normal_tuning.mask_lf.enr_suppress,
+            cfg_transformed.suppressor.normal_tuning.mask_lf.enr_suppress);
+
+  // Expect changed values to carry through the transformation.
+  EXPECT_EQ(cfg.delay.down_sampling_factor,
+            cfg_transformed.delay.down_sampling_factor);
+  EXPECT_EQ(cfg.delay.log_warning_on_delay_changes,
+            cfg_transformed.delay.log_warning_on_delay_changes);
+  EXPECT_EQ(cfg.filter.coarse_initial.length_blocks,
+            cfg_transformed.filter.coarse_initial.length_blocks);
+  EXPECT_EQ(cfg.filter.refined.error_floor,
+            cfg_transformed.filter.refined.error_floor);
+  EXPECT_EQ(cfg.filter.high_pass_filter_echo_reference,
+            cfg_transformed.filter.high_pass_filter_echo_reference);
+  EXPECT_EQ(cfg.comfort_noise.noise_floor_dbfs,
+            cfg_transformed.comfort_noise.noise_floor_dbfs);
+  EXPECT_EQ(cfg.echo_model.model_reverb_in_nonlinear_mode,
+            cfg_transformed.echo_model.model_reverb_in_nonlinear_mode);
+  EXPECT_EQ(cfg.suppressor.normal_tuning.mask_hf.enr_suppress,
+            cfg_transformed.suppressor.normal_tuning.mask_hf.enr_suppress);
+  EXPECT_EQ(cfg.suppressor.subband_nearend_detection.nearend_average_blocks,
+            cfg_transformed.suppressor.subband_nearend_detection
+                .nearend_average_blocks);
+  EXPECT_EQ(cfg.suppressor.subband_nearend_detection.subband1.low,
+            cfg_transformed.suppressor.subband_nearend_detection.subband1.low);
+  EXPECT_EQ(cfg.suppressor.subband_nearend_detection.subband1.high,
+            cfg_transformed.suppressor.subband_nearend_detection.subband1.high);
+  EXPECT_EQ(cfg.suppressor.subband_nearend_detection.subband2.low,
+            cfg_transformed.suppressor.subband_nearend_detection.subband2.low);
+  EXPECT_EQ(cfg.suppressor.subband_nearend_detection.subband2.high,
+            cfg_transformed.suppressor.subband_nearend_detection.subband2.high);
+  EXPECT_EQ(
+      cfg.suppressor.subband_nearend_detection.nearend_threshold,
+      cfg_transformed.suppressor.subband_nearend_detection.nearend_threshold);
+  EXPECT_EQ(cfg.suppressor.subband_nearend_detection.snr_threshold,
+            cfg_transformed.suppressor.subband_nearend_detection.snr_threshold);
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/echo_canceller3_config_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/echo_canceller3_config_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/echo_canceller3_config_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/audio/test/echo_canceller3_config_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+ *  Copyright 2018 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "api/audio/echo_canceller3_config.h"
+
+#include "api/audio/echo_canceller3_config_json.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+TEST(EchoCanceller3Config, ValidConfigIsNotModified) {
+  EchoCanceller3Config config;
+  EXPECT_TRUE(EchoCanceller3Config::Validate(&config));
+  EchoCanceller3Config default_config;
+  EXPECT_EQ(Aec3ConfigToJsonString(config),
+            Aec3ConfigToJsonString(default_config));
+}
+
+TEST(EchoCanceller3Config, InvalidConfigIsCorrected) {
+  // Change a parameter and validate.
+  EchoCanceller3Config config;
+  config.echo_model.min_noise_floor_power = -1600000.f;
+  EXPECT_FALSE(EchoCanceller3Config::Validate(&config));
+  EXPECT_GE(config.echo_model.min_noise_floor_power, 0.f);
+  // Verify remaining parameters are unchanged.
+  EchoCanceller3Config default_config;
+  config.echo_model.min_noise_floor_power =
+      default_config.echo_model.min_noise_floor_power;
+  EXPECT_EQ(Aec3ConfigToJsonString(config),
+            Aec3ConfigToJsonString(default_config));
+}
+
+TEST(EchoCanceller3Config, ValidatedConfigsAreValid) {
+  EchoCanceller3Config config;
+  config.delay.down_sampling_factor = 983;
+  EXPECT_FALSE(EchoCanceller3Config::Validate(&config));
+  EXPECT_TRUE(EchoCanceller3Config::Validate(&config));
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/function_view.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/function_view.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/function_view.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/function_view.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,130 @@
+/*
+ *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_FUNCTION_VIEW_H_
+#define API_FUNCTION_VIEW_H_
+
+#include <type_traits>
+#include <utility>
+
+#include "rtc_base/checks.h"
+
+// Just like std::function, FunctionView will wrap any callable and hide its
+// actual type, exposing only its signature. But unlike std::function,
+// FunctionView doesn't own its callable---it just points to it. Thus, it's a
+// good choice mainly as a function argument when the callable argument will
+// not be called again once the function has returned.
+//
+// Its constructors are implicit, so that callers won't have to convert lambdas
+// and other callables to FunctionView<Blah(Blah, Blah)> explicitly. This is
+// safe because FunctionView is only a reference to the real callable.
+//
+// Example use:
+//
+//   void SomeFunction(rtc::FunctionView<int(int)> index_transform);
+//   ...
+//   SomeFunction([](int i) { return 2 * i + 1; });
+//
+// Note: FunctionView is tiny (essentially just two pointers) and trivially
+// copyable, so it's probably cheaper to pass it by value than by const
+// reference.
+
+namespace rtc {
+
+template <typename T>
+class FunctionView;  // Undefined.
+
+template <typename RetT, typename... ArgT>
+class FunctionView<RetT(ArgT...)> final {
+ public:
+  // Constructor for lambdas and other callables; it accepts every type of
+  // argument except those noted in its enable_if call.
+  template <
+      typename F,
+      typename std::enable_if<
+          // Not for function pointers; we have another constructor for that
+          // below.
+          !std::is_function<typename std::remove_pointer<
+              typename std::remove_reference<F>::type>::type>::value &&
+
+          // Not for nullptr; we have another constructor for that below.
+          !std::is_same<std::nullptr_t,
+                        typename std::remove_cv<F>::type>::value &&
+
+          // Not for FunctionView objects; we have another constructor for that
+          // (the implicitly declared copy constructor).
+          !std::is_same<FunctionView,
+                        typename std::remove_cv<typename std::remove_reference<
+                            F>::type>::type>::value>::type* = nullptr>
+  FunctionView(F&& f)
+      : call_(CallVoidPtr<typename std::remove_reference<F>::type>) {
+    f_.void_ptr = &f;
+  }
+
+  // Constructor that accepts function pointers. If the argument is null, the
+  // result is an empty FunctionView.
+  template <
+      typename F,
+      typename std::enable_if<std::is_function<typename std::remove_pointer<
+          typename std::remove_reference<F>::type>::type>::value>::type* =
+          nullptr>
+  FunctionView(F&& f)
+      : call_(f ? CallFunPtr<typename std::remove_pointer<F>::type> : nullptr) {
+    f_.fun_ptr = reinterpret_cast<void (*)()>(f);
+  }
+
+  // Constructor that accepts nullptr. It creates an empty FunctionView.
+  template <typename F,
+            typename std::enable_if<std::is_same<
+                std::nullptr_t,
+                typename std::remove_cv<F>::type>::value>::type* = nullptr>
+  FunctionView(F&& f) : call_(nullptr) {}
+
+  // Default constructor. Creates an empty FunctionView.
+  FunctionView() : call_(nullptr) {}
+
+  RetT operator()(ArgT... args) const {
+    RTC_DCHECK(call_);
+    return call_(f_, std::forward<ArgT>(args)...);
+  }
+
+  // Returns true if we have a function, false if we don't (i.e., we're null).
+  explicit operator bool() const { return !!call_; }
+
+ private:
+  union VoidUnion {
+    void* void_ptr;
+    void (*fun_ptr)();
+  };
+
+  template <typename F>
+  static RetT CallVoidPtr(VoidUnion vu, ArgT... args) {
+    return (*static_cast<F*>(vu.void_ptr))(std::forward<ArgT>(args)...);
+  }
+  template <typename F>
+  static RetT CallFunPtr(VoidUnion vu, ArgT... args) {
+    return (reinterpret_cast<typename std::add_pointer<F>::type>(vu.fun_ptr))(
+        std::forward<ArgT>(args)...);
+  }
+
+  // A pointer to the callable thing, with type information erased. It's a
+  // union because we have to use separate types depending on if the callable
+  // thing is a function pointer or something else.
+  VoidUnion f_;
+
+  // Pointer to a dispatch function that knows the type of the callable thing
+  // that's stored in f_, and how to call it. A FunctionView object is empty
+  // (null) iff call_ is null.
+  RetT (*call_)(VoidUnion, ArgT...);
+};
+
+}  // namespace rtc
+
+#endif  // API_FUNCTION_VIEW_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_headers.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_headers.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_headers.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_headers.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "api/rtp_headers.h"
+
+namespace webrtc {
+
+RTPHeaderExtension::RTPHeaderExtension()
+    : hasTransmissionTimeOffset(false),
+      transmissionTimeOffset(0),
+      hasAbsoluteSendTime(false),
+      absoluteSendTime(0),
+      hasTransportSequenceNumber(false),
+      transportSequenceNumber(0),
+      hasAudioLevel(false),
+      voiceActivity(false),
+      audioLevel(0),
+      hasVideoRotation(false),
+      videoRotation(kVideoRotation_0),
+      hasVideoContentType(false),
+      videoContentType(VideoContentType::UNSPECIFIED),
+      has_video_timing(false) {}
+
+RTPHeaderExtension::RTPHeaderExtension(const RTPHeaderExtension& other) =
+    default;
+
+RTPHeaderExtension& RTPHeaderExtension::operator=(
+    const RTPHeaderExtension& other) = default;
+
+RTPHeader::RTPHeader()
+    : markerBit(false),
+      payloadType(0),
+      sequenceNumber(0),
+      timestamp(0),
+      ssrc(0),
+      numCSRCs(0),
+      arrOfCSRCs(),
+      paddingLength(0),
+      headerLength(0),
+      payload_type_frequency(0),
+      extension() {}
+
+RTPHeader::RTPHeader(const RTPHeader& other) = default;
+
+RTPHeader& RTPHeader::operator=(const RTPHeader& other) = default;
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_headers.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_headers.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_headers.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_headers.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,189 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_RTP_HEADERS_H_
+#define API_RTP_HEADERS_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include <string>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "api/units/timestamp.h"
+#include "api/video/color_space.h"
+#include "api/video/video_content_type.h"
+#include "api/video/video_rotation.h"
+#include "api/video/video_timing.h"
+
+namespace webrtc {
+
+struct FeedbackRequest {
+  // Determines whether the recv delta as specified in
+  // https://tools.ietf.org/html/draft-holmer-rmcat-transport-wide-cc-extensions-01
+  // should be included.
+  bool include_timestamps;
+  // Include feedback of received packets in the range [sequence_number -
+  // sequence_count + 1, sequence_number]. That is, no feedback will be sent if
+  // sequence_count is zero.
+  int sequence_count;
+};
+
+// The Absolute Capture Time extension is used to stamp RTP packets with a NTP
+// timestamp showing when the first audio or video frame in a packet was
+// originally captured. The intent of this extension is to provide a way to
+// accomplish audio-to-video synchronization when RTCP-terminating intermediate
+// systems (e.g. mixers) are involved. See:
+// http://www.webrtc.org/experiments/rtp-hdrext/abs-capture-time
+struct AbsoluteCaptureTime {
+  // Absolute capture timestamp is the NTP timestamp of when the first frame in
+  // a packet was originally captured. This timestamp MUST be based on the same
+  // clock as the clock used to generate NTP timestamps for RTCP sender reports
+  // on the capture system.
+  //
+  // It’s not always possible to do an NTP clock readout at the exact moment of
+  // when a media frame is captured. A capture system MAY postpone the readout
+  // until a more convenient time. A capture system SHOULD have known delays
+  // (e.g. from hardware buffers) subtracted from the readout to make the final
+  // timestamp as close to the actual capture time as possible.
+  //
+  // This field is encoded as a 64-bit unsigned fixed-point number with the high
+  // 32 bits for the timestamp in seconds and low 32 bits for the fractional
+  // part. This is also known as the UQ32.32 format and is what the RTP
+  // specification defines as the canonical format to represent NTP timestamps.
+  uint64_t absolute_capture_timestamp;
+
+  // Estimated capture clock offset is the sender’s estimate of the offset
+  // between its own NTP clock and the capture system’s NTP clock. The sender is
+  // here defined as the system that owns the NTP clock used to generate the NTP
+  // timestamps for the RTCP sender reports on this stream. The sender system is
+  // typically either the capture system or a mixer.
+  //
+  // This field is encoded as a 64-bit two’s complement signed fixed-point
+  // number with the high 32 bits for the seconds and low 32 bits for the
+  // fractional part. It’s intended to make it easy for a receiver, that knows
+  // how to estimate the sender system’s NTP clock, to also estimate the capture
+  // system’s NTP clock:
+  //
+  //   Capture NTP Clock = Sender NTP Clock + Capture Clock Offset
+  absl::optional<int64_t> estimated_capture_clock_offset;
+};
+
+inline bool operator==(const AbsoluteCaptureTime& lhs,
+                       const AbsoluteCaptureTime& rhs) {
+  return (lhs.absolute_capture_timestamp == rhs.absolute_capture_timestamp) &&
+         (lhs.estimated_capture_clock_offset ==
+          rhs.estimated_capture_clock_offset);
+}
+
+inline bool operator!=(const AbsoluteCaptureTime& lhs,
+                       const AbsoluteCaptureTime& rhs) {
+  return !(lhs == rhs);
+}
+
+struct RTPHeaderExtension {
+  RTPHeaderExtension();
+  RTPHeaderExtension(const RTPHeaderExtension& other);
+  RTPHeaderExtension& operator=(const RTPHeaderExtension& other);
+
+  static constexpr int kAbsSendTimeFraction = 18;
+
+  Timestamp GetAbsoluteSendTimestamp() const {
+    RTC_DCHECK(hasAbsoluteSendTime);
+    RTC_DCHECK(absoluteSendTime < (1ul << 24));
+    return Timestamp::Micros((absoluteSendTime * 1000000ll) /
+                             (1 << kAbsSendTimeFraction));
+  }
+
+  TimeDelta GetAbsoluteSendTimeDelta(uint32_t previous_sendtime) const {
+    RTC_DCHECK(hasAbsoluteSendTime);
+    RTC_DCHECK(absoluteSendTime < (1ul << 24));
+    RTC_DCHECK(previous_sendtime < (1ul << 24));
+    int32_t delta =
+        static_cast<int32_t>((absoluteSendTime - previous_sendtime) << 8) >> 8;
+    return TimeDelta::Micros((delta * 1000000ll) / (1 << kAbsSendTimeFraction));
+  }
+
+  bool hasTransmissionTimeOffset;
+  int32_t transmissionTimeOffset;
+  bool hasAbsoluteSendTime;
+  uint32_t absoluteSendTime;
+  absl::optional<AbsoluteCaptureTime> absolute_capture_time;
+  bool hasTransportSequenceNumber;
+  uint16_t transportSequenceNumber;
+  absl::optional<FeedbackRequest> feedback_request;
+
+  // Audio Level includes both level in dBov and voiced/unvoiced bit. See:
+  // https://tools.ietf.org/html/rfc6464#section-3
+  bool hasAudioLevel;
+  bool voiceActivity;
+  uint8_t audioLevel;
+
+  // For Coordination of Video Orientation. See
+  // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/
+  // ts_126114v120700p.pdf
+  bool hasVideoRotation;
+  VideoRotation videoRotation;
+
+  // TODO(ilnik): Refactor this and one above to be absl::optional() and remove
+  // a corresponding bool flag.
+  bool hasVideoContentType;
+  VideoContentType videoContentType;
+
+  bool has_video_timing;
+  VideoSendTiming video_timing;
+
+  VideoPlayoutDelay playout_delay;
+
+  // For identification of a stream when ssrc is not signaled. See
+  // https://tools.ietf.org/html/rfc8852
+  std::string stream_id;
+  std::string repaired_stream_id;
+
+  // For identifying the media section used to interpret this RTP packet. See
+  // https://tools.ietf.org/html/rfc8843
+  std::string mid;
+
+  absl::optional<ColorSpace> color_space;
+};
+
+enum { kRtpCsrcSize = 15 };  // RFC 3550 page 13
+
+struct RTPHeader {
+  RTPHeader();
+  RTPHeader(const RTPHeader& other);
+  RTPHeader& operator=(const RTPHeader& other);
+
+  bool markerBit;
+  uint8_t payloadType;
+  uint16_t sequenceNumber;
+  uint32_t timestamp;
+  uint32_t ssrc;
+  uint8_t numCSRCs;
+  uint32_t arrOfCSRCs[kRtpCsrcSize];
+  size_t paddingLength;
+  size_t headerLength;
+  int payload_type_frequency;
+  RTPHeaderExtension extension;
+};
+
+// RTCP mode to use. Compound mode is described by RFC 4585 and reduced-size
+// RTCP mode is described by RFC 5506.
+enum class RtcpMode { kOff, kCompound, kReducedSize };
+
+enum NetworkState {
+  kNetworkUp,
+  kNetworkDown,
+};
+
+}  // namespace webrtc
+
+#endif  // API_RTP_HEADERS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_packet_info.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_packet_info.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_packet_info.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_packet_info.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "api/rtp_packet_info.h"
+
+#include <algorithm>
+#include <utility>
+
+namespace webrtc {
+
+RtpPacketInfo::RtpPacketInfo()
+    : ssrc_(0), rtp_timestamp_(0), receive_time_ms_(-1) {}
+
+RtpPacketInfo::RtpPacketInfo(
+    uint32_t ssrc,
+    std::vector<uint32_t> csrcs,
+    uint32_t rtp_timestamp,
+    absl::optional<uint8_t> audio_level,
+    absl::optional<AbsoluteCaptureTime> absolute_capture_time,
+    int64_t receive_time_ms)
+    : ssrc_(ssrc),
+      csrcs_(std::move(csrcs)),
+      rtp_timestamp_(rtp_timestamp),
+      audio_level_(audio_level),
+      absolute_capture_time_(absolute_capture_time),
+      receive_time_ms_(receive_time_ms) {}
+
+RtpPacketInfo::RtpPacketInfo(const RTPHeader& rtp_header,
+                             int64_t receive_time_ms)
+    : ssrc_(rtp_header.ssrc),
+      rtp_timestamp_(rtp_header.timestamp),
+      receive_time_ms_(receive_time_ms) {
+  const auto& extension = rtp_header.extension;
+  const auto csrcs_count = std::min<size_t>(rtp_header.numCSRCs, kRtpCsrcSize);
+
+  csrcs_.assign(&rtp_header.arrOfCSRCs[0], &rtp_header.arrOfCSRCs[csrcs_count]);
+
+  if (extension.hasAudioLevel) {
+    audio_level_ = extension.audioLevel;
+  }
+
+  absolute_capture_time_ = extension.absolute_capture_time;
+}
+
+bool operator==(const RtpPacketInfo& lhs, const RtpPacketInfo& rhs) {
+  return (lhs.ssrc() == rhs.ssrc()) && (lhs.csrcs() == rhs.csrcs()) &&
+         (lhs.rtp_timestamp() == rhs.rtp_timestamp()) &&
+         (lhs.audio_level() == rhs.audio_level()) &&
+         (lhs.absolute_capture_time() == rhs.absolute_capture_time()) &&
+         (lhs.receive_time_ms() == rhs.receive_time_ms());
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_packet_info.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_packet_info.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_packet_info.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/rtp_packet_info.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,97 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_RTP_PACKET_INFO_H_
+#define API_RTP_PACKET_INFO_H_
+
+#include <cstdint>
+#include <utility>
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/rtp_headers.h"
+#include "rtc_base/system/rtc_export.h"
+
+namespace webrtc {
+
+//
+// Structure to hold information about a received |RtpPacket|. It is primarily
+// used to carry per-packet information from when a packet is received until
+// the information is passed to |SourceTracker|.
+//
+class RTC_EXPORT RtpPacketInfo {
+ public:
+  RtpPacketInfo();
+
+  RtpPacketInfo(uint32_t ssrc,
+                std::vector<uint32_t> csrcs,
+                uint32_t rtp_timestamp,
+                absl::optional<uint8_t> audio_level,
+                absl::optional<AbsoluteCaptureTime> absolute_capture_time,
+                int64_t receive_time_ms);
+
+  RtpPacketInfo(const RTPHeader& rtp_header, int64_t receive_time_ms);
+
+  RtpPacketInfo(const RtpPacketInfo& other) = default;
+  RtpPacketInfo(RtpPacketInfo&& other) = default;
+  RtpPacketInfo& operator=(const RtpPacketInfo& other) = default;
+  RtpPacketInfo& operator=(RtpPacketInfo&& other) = default;
+
+  uint32_t ssrc() const { return ssrc_; }
+  void set_ssrc(uint32_t value) { ssrc_ = value; }
+
+  const std::vector<uint32_t>& csrcs() const { return csrcs_; }
+  void set_csrcs(std::vector<uint32_t> value) { csrcs_ = std::move(value); }
+
+  uint32_t rtp_timestamp() const { return rtp_timestamp_; }
+  void set_rtp_timestamp(uint32_t value) { rtp_timestamp_ = value; }
+
+  absl::optional<uint8_t> audio_level() const { return audio_level_; }
+  void set_audio_level(absl::optional<uint8_t> value) { audio_level_ = value; }
+
+  const absl::optional<AbsoluteCaptureTime>& absolute_capture_time() const {
+    return absolute_capture_time_;
+  }
+  void set_absolute_capture_time(
+      const absl::optional<AbsoluteCaptureTime>& value) {
+    absolute_capture_time_ = value;
+  }
+
+  int64_t receive_time_ms() const { return receive_time_ms_; }
+  void set_receive_time_ms(int64_t value) { receive_time_ms_ = value; }
+
+ private:
+  // Fields from the RTP header:
+  // https://tools.ietf.org/html/rfc3550#section-5.1
+  uint32_t ssrc_;
+  std::vector<uint32_t> csrcs_;
+  uint32_t rtp_timestamp_;
+
+  // Fields from the Audio Level header extension:
+  // https://tools.ietf.org/html/rfc6464#section-3
+  absl::optional<uint8_t> audio_level_;
+
+  // Fields from the Absolute Capture Time header extension:
+  // http://www.webrtc.org/experiments/rtp-hdrext/abs-capture-time
+  absl::optional<AbsoluteCaptureTime> absolute_capture_time_;
+
+  // Local |webrtc::Clock|-based timestamp of when the packet was received.
+  int64_t receive_time_ms_;
+};
+
+bool operator==(const RtpPacketInfo& lhs, const RtpPacketInfo& rhs);
+
+inline bool operator!=(const RtpPacketInfo& lhs, const RtpPacketInfo& rhs) {
+  return !(lhs == rhs);
+}
+
+}  // namespace webrtc
+
+#endif  // API_RTP_PACKET_INFO_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/scoped_refptr.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/scoped_refptr.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/scoped_refptr.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/scoped_refptr.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,165 @@
+/*
+ *  Copyright 2011 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Originally these classes are from Chromium.
+// http://src.chromium.org/viewvc/chrome/trunk/src/base/memory/ref_counted.h?view=markup
+
+//
+// A smart pointer class for reference counted objects.  Use this class instead
+// of calling AddRef and Release manually on a reference counted object to
+// avoid common memory leaks caused by forgetting to Release an object
+// reference.  Sample usage:
+//
+//   class MyFoo : public RefCounted<MyFoo> {
+//    ...
+//   };
+//
+//   void some_function() {
+//     scoped_refptr<MyFoo> foo = new MyFoo();
+//     foo->Method(param);
+//     // |foo| is released when this function returns
+//   }
+//
+//   void some_other_function() {
+//     scoped_refptr<MyFoo> foo = new MyFoo();
+//     ...
+//     foo = nullptr;  // explicitly releases |foo|
+//     ...
+//     if (foo)
+//       foo->Method(param);
+//   }
+//
+// The above examples show how scoped_refptr<T> acts like a pointer to T.
+// Given two scoped_refptr<T> classes, it is also possible to exchange
+// references between the two objects, like so:
+//
+//   {
+//     scoped_refptr<MyFoo> a = new MyFoo();
+//     scoped_refptr<MyFoo> b;
+//
+//     b.swap(a);
+//     // now, |b| references the MyFoo object, and |a| references null.
+//   }
+//
+// To make both |a| and |b| in the above example reference the same MyFoo
+// object, simply use the assignment operator:
+//
+//   {
+//     scoped_refptr<MyFoo> a = new MyFoo();
+//     scoped_refptr<MyFoo> b;
+//
+//     b = a;
+//     // now, |a| and |b| each own a reference to the same MyFoo object.
+//   }
+//
+
+#ifndef API_SCOPED_REFPTR_H_
+#define API_SCOPED_REFPTR_H_
+
+#include <memory>
+#include <utility>
+
+namespace rtc {
+
+template <class T>
+class scoped_refptr {
+ public:
+  typedef T element_type;
+
+  scoped_refptr() : ptr_(nullptr) {}
+
+  scoped_refptr(T* p) : ptr_(p) {  // NOLINT(runtime/explicit)
+    if (ptr_)
+      ptr_->AddRef();
+  }
+
+  scoped_refptr(const scoped_refptr<T>& r) : ptr_(r.ptr_) {
+    if (ptr_)
+      ptr_->AddRef();
+  }
+
+  template <typename U>
+  scoped_refptr(const scoped_refptr<U>& r) : ptr_(r.get()) {
+    if (ptr_)
+      ptr_->AddRef();
+  }
+
+  // Move constructors.
+  scoped_refptr(scoped_refptr<T>&& r) noexcept : ptr_(r.release()) {}
+
+  template <typename U>
+  scoped_refptr(scoped_refptr<U>&& r) noexcept : ptr_(r.release()) {}
+
+  ~scoped_refptr() {
+    if (ptr_)
+      ptr_->Release();
+  }
+
+  T* get() const { return ptr_; }
+  operator T*() const { return ptr_; }
+  T& operator*() const { return *ptr_; }
+  T* operator->() const { return ptr_; }
+
+  // Returns the (possibly null) raw pointer, and makes the scoped_refptr hold a
+  // null pointer, all without touching the reference count of the underlying
+  // pointed-to object. The object is still reference counted, and the caller of
+  // release() is now the proud owner of one reference, so it is responsible for
+  // calling Release() once on the object when no longer using it.
+  T* release() {
+    T* retVal = ptr_;
+    ptr_ = nullptr;
+    return retVal;
+  }
+
+  scoped_refptr<T>& operator=(T* p) {
+    // AddRef first so that self assignment should work
+    if (p)
+      p->AddRef();
+    if (ptr_)
+      ptr_->Release();
+    ptr_ = p;
+    return *this;
+  }
+
+  scoped_refptr<T>& operator=(const scoped_refptr<T>& r) {
+    return *this = r.ptr_;
+  }
+
+  template <typename U>
+  scoped_refptr<T>& operator=(const scoped_refptr<U>& r) {
+    return *this = r.get();
+  }
+
+  scoped_refptr<T>& operator=(scoped_refptr<T>&& r) noexcept {
+    scoped_refptr<T>(std::move(r)).swap(*this);
+    return *this;
+  }
+
+  template <typename U>
+  scoped_refptr<T>& operator=(scoped_refptr<U>&& r) noexcept {
+    scoped_refptr<T>(std::move(r)).swap(*this);
+    return *this;
+  }
+
+  void swap(T** pp) noexcept {
+    T* p = ptr_;
+    ptr_ = *pp;
+    *pp = p;
+  }
+
+  void swap(scoped_refptr<T>& r) noexcept { swap(&r.ptr_); }
+
+ protected:
+  T* ptr_;
+};
+
+}  // namespace rtc
+
+#endif  // API_SCOPED_REFPTR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/time_delta.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/time_delta.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/time_delta.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/time_delta.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "api/units/time_delta.h"
+
+#include "api/array_view.h"
+#include "rtc_base/strings/string_builder.h"
+
+namespace webrtc {
+
+std::string ToString(TimeDelta value) {
+  char buf[64];
+  rtc::SimpleStringBuilder sb(buf);
+  if (value.IsPlusInfinity()) {
+    sb << "+inf ms";
+  } else if (value.IsMinusInfinity()) {
+    sb << "-inf ms";
+  } else {
+    if (value.us() == 0 || (value.us() % 1000) != 0)
+      sb << value.us() << " us";
+    else if (value.ms() % 1000 != 0)
+      sb << value.ms() << " ms";
+    else
+      sb << value.seconds() << " s";
+  }
+  return sb.str();
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/time_delta.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/time_delta.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/time_delta.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/time_delta.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_UNITS_TIME_DELTA_H_
+#define API_UNITS_TIME_DELTA_H_
+
+#ifdef WEBRTC_UNIT_TEST
+#include <ostream>  // no-presubmit-check TODO(webrtc:8982)
+#endif              // WEBRTC_UNIT_TEST
+
+#include <cstdlib>
+#include <string>
+#include <type_traits>
+
+#include "rtc_base/units/unit_base.h"
+
+namespace webrtc {
+
+// TimeDelta represents the difference between two timestamps. Commonly this can
+// be a duration. However since two Timestamps are not guaranteed to have the
+// same epoch (they might come from different computers, making exact
+// synchronisation infeasible), the duration covered by a TimeDelta can be
+// undefined. To simplify usage, it can be constructed and converted to
+// different units, specifically seconds (s), milliseconds (ms) and
+// microseconds (us).
+class TimeDelta final : public rtc_units_impl::RelativeUnit<TimeDelta> {
+ public:
+  template <typename T>
+  static constexpr TimeDelta Seconds(T value) {
+    static_assert(std::is_arithmetic<T>::value, "");
+    return FromFraction(1'000'000, value);
+  }
+  template <typename T>
+  static constexpr TimeDelta Millis(T value) {
+    static_assert(std::is_arithmetic<T>::value, "");
+    return FromFraction(1'000, value);
+  }
+  template <typename T>
+  static constexpr TimeDelta Micros(T value) {
+    static_assert(std::is_arithmetic<T>::value, "");
+    return FromValue(value);
+  }
+
+  TimeDelta() = delete;
+
+  template <typename T = int64_t>
+  constexpr T seconds() const {
+    return ToFraction<1000000, T>();
+  }
+  template <typename T = int64_t>
+  constexpr T ms() const {
+    return ToFraction<1000, T>();
+  }
+  template <typename T = int64_t>
+  constexpr T us() const {
+    return ToValue<T>();
+  }
+  template <typename T = int64_t>
+  constexpr T ns() const {
+    return ToMultiple<1000, T>();
+  }
+
+  constexpr int64_t seconds_or(int64_t fallback_value) const {
+    return ToFractionOr<1000000>(fallback_value);
+  }
+  constexpr int64_t ms_or(int64_t fallback_value) const {
+    return ToFractionOr<1000>(fallback_value);
+  }
+  constexpr int64_t us_or(int64_t fallback_value) const {
+    return ToValueOr(fallback_value);
+  }
+
+  constexpr TimeDelta Abs() const {
+    return us() < 0 ? TimeDelta::Micros(-us()) : *this;
+  }
+
+ private:
+  friend class rtc_units_impl::UnitBase<TimeDelta>;
+  using RelativeUnit::RelativeUnit;
+  static constexpr bool one_sided = false;
+};
+
+std::string ToString(TimeDelta value);
+inline std::string ToLogString(TimeDelta value) {
+  return ToString(value);
+}
+
+#ifdef WEBRTC_UNIT_TEST
+inline std::ostream& operator<<(  // no-presubmit-check TODO(webrtc:8982)
+    std::ostream& stream,         // no-presubmit-check TODO(webrtc:8982)
+    TimeDelta value) {
+  return stream << ToString(value);
+}
+#endif  // WEBRTC_UNIT_TEST
+
+}  // namespace webrtc
+
+#endif  // API_UNITS_TIME_DELTA_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/timestamp.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/timestamp.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/timestamp.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/timestamp.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "api/units/timestamp.h"
+
+#include "api/array_view.h"
+#include "rtc_base/strings/string_builder.h"
+
+namespace webrtc {
+std::string ToString(Timestamp value) {
+  char buf[64];
+  rtc::SimpleStringBuilder sb(buf);
+  if (value.IsPlusInfinity()) {
+    sb << "+inf ms";
+  } else if (value.IsMinusInfinity()) {
+    sb << "-inf ms";
+  } else {
+    if (value.us() == 0 || (value.us() % 1000) != 0)
+      sb << value.us() << " us";
+    else if (value.ms() % 1000 != 0)
+      sb << value.ms() << " ms";
+    else
+      sb << value.seconds() << " s";
+  }
+  return sb.str();
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/timestamp.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/timestamp.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/timestamp.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/api/units/timestamp.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,138 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef API_UNITS_TIMESTAMP_H_
+#define API_UNITS_TIMESTAMP_H_
+
+#ifdef WEBRTC_UNIT_TEST
+#include <ostream>  // no-presubmit-check TODO(webrtc:8982)
+#endif              // WEBRTC_UNIT_TEST
+
+#include <string>
+#include <type_traits>
+
+#include "api/units/time_delta.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+// Timestamp represents the time that has passed since some unspecified epoch.
+// The epoch is assumed to be before any represented timestamps, this means that
+// negative values are not valid. The most notable feature is that the
+// difference of two Timestamps results in a TimeDelta.
+class Timestamp final : public rtc_units_impl::UnitBase<Timestamp> {
+ public:
+  template <typename T>
+  static constexpr Timestamp Seconds(T value) {
+    static_assert(std::is_arithmetic<T>::value, "");
+    return FromFraction(1'000'000, value);
+  }
+  template <typename T>
+  static constexpr Timestamp Millis(T value) {
+    static_assert(std::is_arithmetic<T>::value, "");
+    return FromFraction(1'000, value);
+  }
+  template <typename T>
+  static constexpr Timestamp Micros(T value) {
+    static_assert(std::is_arithmetic<T>::value, "");
+    return FromValue(value);
+  }
+
+  Timestamp() = delete;
+
+  template <typename T = int64_t>
+  constexpr T seconds() const {
+    return ToFraction<1000000, T>();
+  }
+  template <typename T = int64_t>
+  constexpr T ms() const {
+    return ToFraction<1000, T>();
+  }
+  template <typename T = int64_t>
+  constexpr T us() const {
+    return ToValue<T>();
+  }
+
+  constexpr int64_t seconds_or(int64_t fallback_value) const {
+    return ToFractionOr<1000000>(fallback_value);
+  }
+  constexpr int64_t ms_or(int64_t fallback_value) const {
+    return ToFractionOr<1000>(fallback_value);
+  }
+  constexpr int64_t us_or(int64_t fallback_value) const {
+    return ToValueOr(fallback_value);
+  }
+
+  constexpr Timestamp operator+(const TimeDelta delta) const {
+    if (IsPlusInfinity() || delta.IsPlusInfinity()) {
+      RTC_DCHECK(!IsMinusInfinity());
+      RTC_DCHECK(!delta.IsMinusInfinity());
+      return PlusInfinity();
+    } else if (IsMinusInfinity() || delta.IsMinusInfinity()) {
+      RTC_DCHECK(!IsPlusInfinity());
+      RTC_DCHECK(!delta.IsPlusInfinity());
+      return MinusInfinity();
+    }
+    return Timestamp::Micros(us() + delta.us());
+  }
+  constexpr Timestamp operator-(const TimeDelta delta) const {
+    if (IsPlusInfinity() || delta.IsMinusInfinity()) {
+      RTC_DCHECK(!IsMinusInfinity());
+      RTC_DCHECK(!delta.IsPlusInfinity());
+      return PlusInfinity();
+    } else if (IsMinusInfinity() || delta.IsPlusInfinity()) {
+      RTC_DCHECK(!IsPlusInfinity());
+      RTC_DCHECK(!delta.IsMinusInfinity());
+      return MinusInfinity();
+    }
+    return Timestamp::Micros(us() - delta.us());
+  }
+  constexpr TimeDelta operator-(const Timestamp other) const {
+    if (IsPlusInfinity() || other.IsMinusInfinity()) {
+      RTC_DCHECK(!IsMinusInfinity());
+      RTC_DCHECK(!other.IsPlusInfinity());
+      return TimeDelta::PlusInfinity();
+    } else if (IsMinusInfinity() || other.IsPlusInfinity()) {
+      RTC_DCHECK(!IsPlusInfinity());
+      RTC_DCHECK(!other.IsMinusInfinity());
+      return TimeDelta::MinusInfinity();
+    }
+    return TimeDelta::Micros(us() - other.us());
+  }
+  constexpr Timestamp& operator-=(const TimeDelta delta) {
+    *this = *this - delta;
+    return *this;
+  }
+  constexpr Timestamp& operator+=(const TimeDelta delta) {
+    *this = *this + delta;
+    return *this;
+  }
+
+ private:
+  friend class rtc_units_impl::UnitBase<Timestamp>;
+  using UnitBase::UnitBase;
+  static constexpr bool one_sided = true;
+};
+
+std::string ToString(Timestamp value);
+inline std::string ToLogString(Timestamp value) {
+  return ToString(value);
+}
+
+#ifdef WEBRTC_UNIT_TEST
+inline std::ostream& operator<<(  // no-presubmit-check TODO(webrtc:8982)
+    std::ostream& stream,         // no-presubmit-check TODO(webrtc:8982)
+    Timestamp value) {
+  return stream << ToString(value);
+}
+#endif  // WEBRTC_UNIT_TEST
+
+}  // namespace webrtc
+
+#endif  // API_UNITS_TIMESTAMP_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/audio_util.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/audio_util.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/audio_util.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/audio_util.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "common_audio/include/audio_util.h"
+
+namespace webrtc {
+
+void FloatToS16(const float* src, size_t size, int16_t* dest) {
+  for (size_t i = 0; i < size; ++i)
+    dest[i] = FloatToS16(src[i]);
+}
+
+void S16ToFloat(const int16_t* src, size_t size, float* dest) {
+  for (size_t i = 0; i < size; ++i)
+    dest[i] = S16ToFloat(src[i]);
+}
+
+void S16ToFloatS16(const int16_t* src, size_t size, float* dest) {
+  for (size_t i = 0; i < size; ++i)
+    dest[i] = src[i];
+}
+
+void FloatS16ToS16(const float* src, size_t size, int16_t* dest) {
+  for (size_t i = 0; i < size; ++i)
+    dest[i] = FloatS16ToS16(src[i]);
+}
+
+void FloatToFloatS16(const float* src, size_t size, float* dest) {
+  for (size_t i = 0; i < size; ++i)
+    dest[i] = FloatToFloatS16(src[i]);
+}
+
+void FloatS16ToFloat(const float* src, size_t size, float* dest) {
+  for (size_t i = 0; i < size; ++i)
+    dest[i] = FloatS16ToFloat(src[i]);
+}
+
+template <>
+void DownmixInterleavedToMono<int16_t>(const int16_t* interleaved,
+                                       size_t num_frames,
+                                       int num_channels,
+                                       int16_t* deinterleaved) {
+  DownmixInterleavedToMonoImpl<int16_t, int32_t>(interleaved, num_frames,
+                                                 num_channels, deinterleaved);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/channel_buffer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/channel_buffer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/channel_buffer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/channel_buffer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+ *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "common_audio/channel_buffer.h"
+
+#include <cstdint>
+
+#include "common_audio/include/audio_util.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+IFChannelBuffer::IFChannelBuffer(size_t num_frames,
+                                 size_t num_channels,
+                                 size_t num_bands)
+    : ivalid_(true),
+      ibuf_(num_frames, num_channels, num_bands),
+      fvalid_(true),
+      fbuf_(num_frames, num_channels, num_bands) {}
+
+IFChannelBuffer::~IFChannelBuffer() = default;
+
+ChannelBuffer<int16_t>* IFChannelBuffer::ibuf() {
+  RefreshI();
+  fvalid_ = false;
+  return &ibuf_;
+}
+
+ChannelBuffer<float>* IFChannelBuffer::fbuf() {
+  RefreshF();
+  ivalid_ = false;
+  return &fbuf_;
+}
+
+const ChannelBuffer<int16_t>* IFChannelBuffer::ibuf_const() const {
+  RefreshI();
+  return &ibuf_;
+}
+
+const ChannelBuffer<float>* IFChannelBuffer::fbuf_const() const {
+  RefreshF();
+  return &fbuf_;
+}
+
+void IFChannelBuffer::RefreshF() const {
+  if (!fvalid_) {
+    RTC_DCHECK(ivalid_);
+    fbuf_.set_num_channels(ibuf_.num_channels());
+    const int16_t* const* int_channels = ibuf_.channels();
+    float* const* float_channels = fbuf_.channels();
+    for (size_t i = 0; i < ibuf_.num_channels(); ++i) {
+      for (size_t j = 0; j < ibuf_.num_frames(); ++j) {
+        float_channels[i][j] = int_channels[i][j];
+      }
+    }
+    fvalid_ = true;
+  }
+}
+
+void IFChannelBuffer::RefreshI() const {
+  if (!ivalid_) {
+    RTC_DCHECK(fvalid_);
+    int16_t* const* int_channels = ibuf_.channels();
+    ibuf_.set_num_channels(fbuf_.num_channels());
+    const float* const* float_channels = fbuf_.channels();
+    for (size_t i = 0; i < fbuf_.num_channels(); ++i) {
+      FloatS16ToS16(float_channels[i], ibuf_.num_frames(), int_channels[i]);
+    }
+    ivalid_ = true;
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/channel_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/channel_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/channel_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/channel_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,215 @@
+/*
+ *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef COMMON_AUDIO_CHANNEL_BUFFER_H_
+#define COMMON_AUDIO_CHANNEL_BUFFER_H_
+
+#include <string.h>
+
+#include <memory>
+#include <vector>
+
+#include "api/array_view.h"
+#include "common_audio/include/audio_util.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/gtest_prod_util.h"
+
+namespace webrtc {
+
+// Helper to encapsulate a contiguous data buffer, full or split into frequency
+// bands, with access to a pointer arrays of the deinterleaved channels and
+// bands. The buffer is zero initialized at creation.
+//
+// The buffer structure is showed below for a 2 channel and 2 bands case:
+//
+// |data_|:
+// { [ --- b1ch1 --- ] [ --- b2ch1 --- ] [ --- b1ch2 --- ] [ --- b2ch2 --- ] }
+//
+// The pointer arrays for the same example are as follows:
+//
+// |channels_|:
+// { [ b1ch1* ] [ b1ch2* ] [ b2ch1* ] [ b2ch2* ] }
+//
+// |bands_|:
+// { [ b1ch1* ] [ b2ch1* ] [ b1ch2* ] [ b2ch2* ] }
+template <typename T>
+class ChannelBuffer {
+ public:
+  ChannelBuffer(size_t num_frames, size_t num_channels, size_t num_bands = 1)
+      : data_(new T[num_frames * num_channels]()),
+        channels_(new T*[num_channels * num_bands]),
+        bands_(new T*[num_channels * num_bands]),
+        num_frames_(num_frames),
+        num_frames_per_band_(num_frames / num_bands),
+        num_allocated_channels_(num_channels),
+        num_channels_(num_channels),
+        num_bands_(num_bands),
+        bands_view_(num_allocated_channels_,
+                    std::vector<rtc::ArrayView<T>>(num_bands_)),
+        channels_view_(
+            num_bands_,
+            std::vector<rtc::ArrayView<T>>(num_allocated_channels_)) {
+    // Temporarily cast away const_ness to allow populating the array views.
+    auto* bands_view =
+        const_cast<std::vector<std::vector<rtc::ArrayView<T>>>*>(&bands_view_);
+    auto* channels_view =
+        const_cast<std::vector<std::vector<rtc::ArrayView<T>>>*>(
+            &channels_view_);
+
+    for (size_t ch = 0; ch < num_allocated_channels_; ++ch) {
+      for (size_t band = 0; band < num_bands_; ++band) {
+        (*channels_view)[band][ch] = rtc::ArrayView<T>(
+            &data_[ch * num_frames_ + band * num_frames_per_band_],
+            num_frames_per_band_);
+        (*bands_view)[ch][band] = channels_view_[band][ch];
+        channels_[band * num_allocated_channels_ + ch] =
+            channels_view_[band][ch].data();
+        bands_[ch * num_bands_ + band] =
+            channels_[band * num_allocated_channels_ + ch];
+      }
+    }
+  }
+
+  // Returns a pointer array to the channels.
+  // If band is explicitly specificed, the channels for a specific band are
+  // returned and the usage becomes: channels(band)[channel][sample].
+  // Where:
+  // 0 <= band < |num_bands_|
+  // 0 <= channel < |num_allocated_channels_|
+  // 0 <= sample < |num_frames_per_band_|
+
+  // If band is not explicitly specified, the full-band channels (or lower band
+  // channels) are returned and the usage becomes: channels()[channel][sample].
+  // Where:
+  // 0 <= channel < |num_allocated_channels_|
+  // 0 <= sample < |num_frames_|
+  const T* const* channels(size_t band = 0) const {
+    RTC_DCHECK_LT(band, num_bands_);
+    return &channels_[band * num_allocated_channels_];
+  }
+  T* const* channels(size_t band = 0) {
+    const ChannelBuffer<T>* t = this;
+    return const_cast<T* const*>(t->channels(band));
+  }
+  rtc::ArrayView<const rtc::ArrayView<T>> channels_view(size_t band = 0) {
+    return channels_view_[band];
+  }
+  rtc::ArrayView<const rtc::ArrayView<T>> channels_view(size_t band = 0) const {
+    return channels_view_[band];
+  }
+
+  // Returns a pointer array to the bands for a specific channel.
+  // Usage:
+  // bands(channel)[band][sample].
+  // Where:
+  // 0 <= channel < |num_channels_|
+  // 0 <= band < |num_bands_|
+  // 0 <= sample < |num_frames_per_band_|
+  const T* const* bands(size_t channel) const {
+    RTC_DCHECK_LT(channel, num_channels_);
+    RTC_DCHECK_GE(channel, 0);
+    return &bands_[channel * num_bands_];
+  }
+  T* const* bands(size_t channel) {
+    const ChannelBuffer<T>* t = this;
+    return const_cast<T* const*>(t->bands(channel));
+  }
+
+  rtc::ArrayView<const rtc::ArrayView<T>> bands_view(size_t channel) {
+    return bands_view_[channel];
+  }
+  rtc::ArrayView<const rtc::ArrayView<T>> bands_view(size_t channel) const {
+    return bands_view_[channel];
+  }
+
+  // Sets the |slice| pointers to the |start_frame| position for each channel.
+  // Returns |slice| for convenience.
+  const T* const* Slice(T** slice, size_t start_frame) const {
+    RTC_DCHECK_LT(start_frame, num_frames_);
+    for (size_t i = 0; i < num_channels_; ++i)
+      slice[i] = &channels_[i][start_frame];
+    return slice;
+  }
+  T** Slice(T** slice, size_t start_frame) {
+    const ChannelBuffer<T>* t = this;
+    return const_cast<T**>(t->Slice(slice, start_frame));
+  }
+
+  size_t num_frames() const { return num_frames_; }
+  size_t num_frames_per_band() const { return num_frames_per_band_; }
+  size_t num_channels() const { return num_channels_; }
+  size_t num_bands() const { return num_bands_; }
+  size_t size() const { return num_frames_ * num_allocated_channels_; }
+
+  void set_num_channels(size_t num_channels) {
+    RTC_DCHECK_LE(num_channels, num_allocated_channels_);
+    num_channels_ = num_channels;
+  }
+
+  void SetDataForTesting(const T* data, size_t size) {
+    RTC_CHECK_EQ(size, this->size());
+    memcpy(data_.get(), data, size * sizeof(*data));
+  }
+
+ private:
+  std::unique_ptr<T[]> data_;
+  std::unique_ptr<T*[]> channels_;
+  std::unique_ptr<T*[]> bands_;
+  const size_t num_frames_;
+  const size_t num_frames_per_band_;
+  // Number of channels the internal buffer holds.
+  const size_t num_allocated_channels_;
+  // Number of channels the user sees.
+  size_t num_channels_;
+  const size_t num_bands_;
+  const std::vector<std::vector<rtc::ArrayView<T>>> bands_view_;
+  const std::vector<std::vector<rtc::ArrayView<T>>> channels_view_;
+};
+
+// One int16_t and one float ChannelBuffer that are kept in sync. The sync is
+// broken when someone requests write access to either ChannelBuffer, and
+// reestablished when someone requests the outdated ChannelBuffer. It is
+// therefore safe to use the return value of ibuf_const() and fbuf_const()
+// until the next call to ibuf() or fbuf(), and the return value of ibuf() and
+// fbuf() until the next call to any of the other functions.
+class IFChannelBuffer {
+ public:
+  IFChannelBuffer(size_t num_frames, size_t num_channels, size_t num_bands = 1);
+  ~IFChannelBuffer();
+
+  ChannelBuffer<int16_t>* ibuf();
+  ChannelBuffer<float>* fbuf();
+  const ChannelBuffer<int16_t>* ibuf_const() const;
+  const ChannelBuffer<float>* fbuf_const() const;
+
+  size_t num_frames() const { return ibuf_.num_frames(); }
+  size_t num_frames_per_band() const { return ibuf_.num_frames_per_band(); }
+  size_t num_channels() const {
+    return ivalid_ ? ibuf_.num_channels() : fbuf_.num_channels();
+  }
+  void set_num_channels(size_t num_channels) {
+    ibuf_.set_num_channels(num_channels);
+    fbuf_.set_num_channels(num_channels);
+  }
+  size_t num_bands() const { return ibuf_.num_bands(); }
+
+ private:
+  void RefreshF() const;
+  void RefreshI() const;
+
+  mutable bool ivalid_;
+  mutable ChannelBuffer<int16_t> ibuf_;
+  mutable bool fvalid_;
+  mutable ChannelBuffer<float> fbuf_;
+};
+
+}  // namespace webrtc
+
+#endif  // COMMON_AUDIO_CHANNEL_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/include/audio_util.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/include/audio_util.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/include/audio_util.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/include/audio_util.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,214 @@
+/*
+ *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_
+#define COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_
+
+#include <stdint.h>
+
+#include <algorithm>
+#include <cmath>
+#include <cstring>
+#include <limits>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+typedef std::numeric_limits<int16_t> limits_int16;
+
+// The conversion functions use the following naming convention:
+// S16:      int16_t [-32768, 32767]
+// Float:    float   [-1.0, 1.0]
+// FloatS16: float   [-32768.0, 32768.0]
+// Dbfs: float [-20.0*log(10, 32768), 0] = [-90.3, 0]
+// The ratio conversion functions use this naming convention:
+// Ratio: float (0, +inf)
+// Db: float (-inf, +inf)
+static inline float S16ToFloat(int16_t v) {
+  constexpr float kScaling = 1.f / 32768.f;
+  return v * kScaling;
+}
+
+static inline int16_t FloatS16ToS16(float v) {
+  v = std::min(v, 32767.f);
+  v = std::max(v, -32768.f);
+  return static_cast<int16_t>(v + std::copysign(0.5f, v));
+}
+
+static inline int16_t FloatToS16(float v) {
+  v *= 32768.f;
+  v = std::min(v, 32767.f);
+  v = std::max(v, -32768.f);
+  return static_cast<int16_t>(v + std::copysign(0.5f, v));
+}
+
+static inline float FloatToFloatS16(float v) {
+  v = std::min(v, 1.f);
+  v = std::max(v, -1.f);
+  return v * 32768.f;
+}
+
+static inline float FloatS16ToFloat(float v) {
+  v = std::min(v, 32768.f);
+  v = std::max(v, -32768.f);
+  constexpr float kScaling = 1.f / 32768.f;
+  return v * kScaling;
+}
+
+void FloatToS16(const float* src, size_t size, int16_t* dest);
+void S16ToFloat(const int16_t* src, size_t size, float* dest);
+void S16ToFloatS16(const int16_t* src, size_t size, float* dest);
+void FloatS16ToS16(const float* src, size_t size, int16_t* dest);
+void FloatToFloatS16(const float* src, size_t size, float* dest);
+void FloatS16ToFloat(const float* src, size_t size, float* dest);
+
+inline float DbToRatio(float v) {
+  return std::pow(10.0f, v / 20.0f);
+}
+
+inline float DbfsToFloatS16(float v) {
+  static constexpr float kMaximumAbsFloatS16 = -limits_int16::min();
+  return DbToRatio(v) * kMaximumAbsFloatS16;
+}
+
+inline float FloatS16ToDbfs(float v) {
+  RTC_DCHECK_GE(v, 0);
+
+  // kMinDbfs is equal to -20.0 * log10(-limits_int16::min())
+  static constexpr float kMinDbfs = -90.30899869919436f;
+  if (v <= 1.0f) {
+    return kMinDbfs;
+  }
+  // Equal to 20 * log10(v / (-limits_int16::min()))
+  return 20.0f * std::log10(v) + kMinDbfs;
+}
+
+// Copy audio from |src| channels to |dest| channels unless |src| and |dest|
+// point to the same address. |src| and |dest| must have the same number of
+// channels, and there must be sufficient space allocated in |dest|.
+template <typename T>
+void CopyAudioIfNeeded(const T* const* src,
+                       int num_frames,
+                       int num_channels,
+                       T* const* dest) {
+  for (int i = 0; i < num_channels; ++i) {
+    if (src[i] != dest[i]) {
+      std::copy(src[i], src[i] + num_frames, dest[i]);
+    }
+  }
+}
+
+// Deinterleave audio from |interleaved| to the channel buffers pointed to
+// by |deinterleaved|. There must be sufficient space allocated in the
+// |deinterleaved| buffers (|num_channel| buffers with |samples_per_channel|
+// per buffer).
+template <typename T>
+void Deinterleave(const T* interleaved,
+                  size_t samples_per_channel,
+                  size_t num_channels,
+                  T* const* deinterleaved) {
+  for (size_t i = 0; i < num_channels; ++i) {
+    T* channel = deinterleaved[i];
+    size_t interleaved_idx = i;
+    for (size_t j = 0; j < samples_per_channel; ++j) {
+      channel[j] = interleaved[interleaved_idx];
+      interleaved_idx += num_channels;
+    }
+  }
+}
+
+// Interleave audio from the channel buffers pointed to by |deinterleaved| to
+// |interleaved|. There must be sufficient space allocated in |interleaved|
+// (|samples_per_channel| * |num_channels|).
+template <typename T>
+void Interleave(const T* const* deinterleaved,
+                size_t samples_per_channel,
+                size_t num_channels,
+                T* interleaved) {
+  for (size_t i = 0; i < num_channels; ++i) {
+    const T* channel = deinterleaved[i];
+    size_t interleaved_idx = i;
+    for (size_t j = 0; j < samples_per_channel; ++j) {
+      interleaved[interleaved_idx] = channel[j];
+      interleaved_idx += num_channels;
+    }
+  }
+}
+
+// Copies audio from a single channel buffer pointed to by |mono| to each
+// channel of |interleaved|. There must be sufficient space allocated in
+// |interleaved| (|samples_per_channel| * |num_channels|).
+template <typename T>
+void UpmixMonoToInterleaved(const T* mono,
+                            int num_frames,
+                            int num_channels,
+                            T* interleaved) {
+  int interleaved_idx = 0;
+  for (int i = 0; i < num_frames; ++i) {
+    for (int j = 0; j < num_channels; ++j) {
+      interleaved[interleaved_idx++] = mono[i];
+    }
+  }
+}
+
+template <typename T, typename Intermediate>
+void DownmixToMono(const T* const* input_channels,
+                   size_t num_frames,
+                   int num_channels,
+                   T* out) {
+  for (size_t i = 0; i < num_frames; ++i) {
+    Intermediate value = input_channels[0][i];
+    for (int j = 1; j < num_channels; ++j) {
+      value += input_channels[j][i];
+    }
+    out[i] = value / num_channels;
+  }
+}
+
+// Downmixes an interleaved multichannel signal to a single channel by averaging
+// all channels.
+template <typename T, typename Intermediate>
+void DownmixInterleavedToMonoImpl(const T* interleaved,
+                                  size_t num_frames,
+                                  int num_channels,
+                                  T* deinterleaved) {
+  RTC_DCHECK_GT(num_channels, 0);
+  RTC_DCHECK_GT(num_frames, 0);
+
+  const T* const end = interleaved + num_frames * num_channels;
+
+  while (interleaved < end) {
+    const T* const frame_end = interleaved + num_channels;
+
+    Intermediate value = *interleaved++;
+    while (interleaved < frame_end) {
+      value += *interleaved++;
+    }
+
+    *deinterleaved++ = value / num_channels;
+  }
+}
+
+template <typename T>
+void DownmixInterleavedToMono(const T* interleaved,
+                              size_t num_frames,
+                              int num_channels,
+                              T* deinterleaved);
+
+template <>
+void DownmixInterleavedToMono<int16_t>(const int16_t* interleaved,
+                                       size_t num_frames,
+                                       int num_channels,
+                                       int16_t* deinterleaved);
+
+}  // namespace webrtc
+
+#endif  // COMMON_AUDIO_INCLUDE_AUDIO_UTIL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/include/push_resampler.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/include/push_resampler.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/include/push_resampler.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/include/push_resampler.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef COMMON_AUDIO_RESAMPLER_INCLUDE_PUSH_RESAMPLER_H_
+#define COMMON_AUDIO_RESAMPLER_INCLUDE_PUSH_RESAMPLER_H_
+
+#include <memory>
+#include <vector>
+
+namespace webrtc {
+
+class PushSincResampler;
+
+// Wraps PushSincResampler to provide stereo support.
+// TODO(ajm): add support for an arbitrary number of channels.
+template <typename T>
+class PushResampler {
+ public:
+  PushResampler();
+  virtual ~PushResampler();
+
+  // Must be called whenever the parameters change. Free to be called at any
+  // time as it is a no-op if parameters have not changed since the last call.
+  int InitializeIfNeeded(int src_sample_rate_hz,
+                         int dst_sample_rate_hz,
+                         size_t num_channels);
+
+  // Returns the total number of samples provided in destination (e.g. 32 kHz,
+  // 2 channel audio gives 640 samples).
+  int Resample(const T* src, size_t src_length, T* dst, size_t dst_capacity);
+
+ private:
+  int src_sample_rate_hz_;
+  int dst_sample_rate_hz_;
+  size_t num_channels_;
+  // Vector that is needed to provide the proper inputs and outputs to the
+  // interleave/de-interleave methods used in Resample. This needs to be
+  // heap-allocated on the state to support an arbitrary number of channels
+  // without doing run-time heap-allocations in the Resample method.
+  std::vector<T*> channel_data_array_;
+
+  struct ChannelResampler {
+    std::unique_ptr<PushSincResampler> resampler;
+    std::vector<T> source;
+    std::vector<T> destination;
+  };
+
+  std::vector<ChannelResampler> channel_resamplers_;
+};
+}  // namespace webrtc
+
+#endif  // COMMON_AUDIO_RESAMPLER_INCLUDE_PUSH_RESAMPLER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/include/resampler.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/include/resampler.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/include/resampler.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/include/resampler.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,99 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+/*
+ * A wrapper for resampling a numerous amount of sampling combinations.
+ */
+
+#ifndef COMMON_AUDIO_RESAMPLER_INCLUDE_RESAMPLER_H_
+#define COMMON_AUDIO_RESAMPLER_INCLUDE_RESAMPLER_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace webrtc {
+
+// All methods return 0 on success and -1 on failure.
+class Resampler {
+ public:
+  Resampler();
+  Resampler(int inFreq, int outFreq, size_t num_channels);
+  ~Resampler();
+
+  // Reset all states
+  int Reset(int inFreq, int outFreq, size_t num_channels);
+
+  // Reset all states if any parameter has changed
+  int ResetIfNeeded(int inFreq, int outFreq, size_t num_channels);
+
+  // Resample samplesIn to samplesOut.
+  int Push(const int16_t* samplesIn,
+           size_t lengthIn,
+           int16_t* samplesOut,
+           size_t maxLen,
+           size_t& outLen);  // NOLINT: to avoid changing APIs
+
+ private:
+  enum ResamplerMode {
+    kResamplerMode1To1,
+    kResamplerMode1To2,
+    kResamplerMode1To3,
+    kResamplerMode1To4,
+    kResamplerMode1To6,
+    kResamplerMode1To12,
+    kResamplerMode2To3,
+    kResamplerMode2To11,
+    kResamplerMode4To11,
+    kResamplerMode8To11,
+    kResamplerMode11To16,
+    kResamplerMode11To32,
+    kResamplerMode2To1,
+    kResamplerMode3To1,
+    kResamplerMode4To1,
+    kResamplerMode6To1,
+    kResamplerMode12To1,
+    kResamplerMode3To2,
+    kResamplerMode11To2,
+    kResamplerMode11To4,
+    kResamplerMode11To8
+  };
+
+  // Computes the resampler mode for a given sampling frequency pair.
+  // Returns -1 for unsupported frequency pairs.
+  static int ComputeResamplerMode(int in_freq_hz,
+                                  int out_freq_hz,
+                                  ResamplerMode* mode);
+
+  // Generic pointers since we don't know what states we'll need
+  void* state1_;
+  void* state2_;
+  void* state3_;
+
+  // Storage if needed
+  int16_t* in_buffer_;
+  int16_t* out_buffer_;
+  size_t in_buffer_size_;
+  size_t out_buffer_size_;
+  size_t in_buffer_size_max_;
+  size_t out_buffer_size_max_;
+
+  int my_in_frequency_khz_;
+  int my_out_frequency_khz_;
+  ResamplerMode my_mode_;
+  size_t num_channels_;
+
+  // Extra instance for stereo
+  Resampler* helper_left_;
+  Resampler* helper_right_;
+};
+
+}  // namespace webrtc
+
+#endif  // COMMON_AUDIO_RESAMPLER_INCLUDE_RESAMPLER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_resampler.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_resampler.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_resampler.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_resampler.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,151 @@
+/*
+ *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "common_audio/resampler/include/push_resampler.h"
+
+#include <stdint.h>
+#include <string.h>
+
+#include <memory>
+
+#include "common_audio/include/audio_util.h"
+#include "common_audio/resampler/push_sinc_resampler.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+// These checks were factored out into a non-templatized function
+// due to problems with clang on Windows in debug builds.
+// For some reason having the DCHECKs inline in the template code
+// caused the compiler to generate code that threw off the linker.
+// TODO(tommi): Re-enable when we've figured out what the problem is.
+// http://crbug.com/615050
+void CheckValidInitParams(int src_sample_rate_hz,
+                          int dst_sample_rate_hz,
+                          size_t num_channels) {
+// The below checks are temporarily disabled on WEBRTC_WIN due to problems
+// with clang debug builds.
+#if !defined(WEBRTC_WIN) && defined(__clang__)
+  RTC_DCHECK_GT(src_sample_rate_hz, 0);
+  RTC_DCHECK_GT(dst_sample_rate_hz, 0);
+  RTC_DCHECK_GT(num_channels, 0);
+#endif
+}
+
+void CheckExpectedBufferSizes(size_t src_length,
+                              size_t dst_capacity,
+                              size_t num_channels,
+                              int src_sample_rate,
+                              int dst_sample_rate) {
+// The below checks are temporarily disabled on WEBRTC_WIN due to problems
+// with clang debug builds.
+// TODO(tommi): Re-enable when we've figured out what the problem is.
+// http://crbug.com/615050
+#if !defined(WEBRTC_WIN) && defined(__clang__)
+  const size_t src_size_10ms = src_sample_rate * num_channels / 100;
+  const size_t dst_size_10ms = dst_sample_rate * num_channels / 100;
+  RTC_DCHECK_EQ(src_length, src_size_10ms);
+  RTC_DCHECK_GE(dst_capacity, dst_size_10ms);
+#endif
+}
+}  // namespace
+
+template <typename T>
+PushResampler<T>::PushResampler()
+    : src_sample_rate_hz_(0), dst_sample_rate_hz_(0), num_channels_(0) {}
+
+template <typename T>
+PushResampler<T>::~PushResampler() {}
+
+template <typename T>
+int PushResampler<T>::InitializeIfNeeded(int src_sample_rate_hz,
+                                         int dst_sample_rate_hz,
+                                         size_t num_channels) {
+  CheckValidInitParams(src_sample_rate_hz, dst_sample_rate_hz, num_channels);
+
+  if (src_sample_rate_hz == src_sample_rate_hz_ &&
+      dst_sample_rate_hz == dst_sample_rate_hz_ &&
+      num_channels == num_channels_) {
+    // No-op if settings haven't changed.
+    return 0;
+  }
+
+  if (src_sample_rate_hz <= 0 || dst_sample_rate_hz <= 0 || num_channels <= 0) {
+    return -1;
+  }
+
+  src_sample_rate_hz_ = src_sample_rate_hz;
+  dst_sample_rate_hz_ = dst_sample_rate_hz;
+  num_channels_ = num_channels;
+
+  const size_t src_size_10ms_mono =
+      static_cast<size_t>(src_sample_rate_hz / 100);
+  const size_t dst_size_10ms_mono =
+      static_cast<size_t>(dst_sample_rate_hz / 100);
+  channel_resamplers_.clear();
+  for (size_t i = 0; i < num_channels; ++i) {
+    channel_resamplers_.push_back(ChannelResampler());
+    auto channel_resampler = channel_resamplers_.rbegin();
+    channel_resampler->resampler = std::make_unique<PushSincResampler>(
+        src_size_10ms_mono, dst_size_10ms_mono);
+    channel_resampler->source.resize(src_size_10ms_mono);
+    channel_resampler->destination.resize(dst_size_10ms_mono);
+  }
+
+  channel_data_array_.resize(num_channels_);
+
+  return 0;
+}
+
+template <typename T>
+int PushResampler<T>::Resample(const T* src,
+                               size_t src_length,
+                               T* dst,
+                               size_t dst_capacity) {
+  CheckExpectedBufferSizes(src_length, dst_capacity, num_channels_,
+                           src_sample_rate_hz_, dst_sample_rate_hz_);
+
+  if (src_sample_rate_hz_ == dst_sample_rate_hz_) {
+    // The old resampler provides this memcpy facility in the case of matching
+    // sample rates, so reproduce it here for the sinc resampler.
+    memcpy(dst, src, src_length * sizeof(T));
+    return static_cast<int>(src_length);
+  }
+
+  const size_t src_length_mono = src_length / num_channels_;
+  const size_t dst_capacity_mono = dst_capacity / num_channels_;
+
+  for (size_t ch = 0; ch < num_channels_; ++ch) {
+    channel_data_array_[ch] = channel_resamplers_[ch].source.data();
+  }
+
+  Deinterleave(src, src_length_mono, num_channels_, channel_data_array_.data());
+
+  size_t dst_length_mono = 0;
+
+  for (auto& resampler : channel_resamplers_) {
+    dst_length_mono = resampler.resampler->Resample(
+        resampler.source.data(), src_length_mono, resampler.destination.data(),
+        dst_capacity_mono);
+  }
+
+  for (size_t ch = 0; ch < num_channels_; ++ch) {
+    channel_data_array_[ch] = channel_resamplers_[ch].destination.data();
+  }
+
+  Interleave(channel_data_array_.data(), dst_length_mono, num_channels_, dst);
+  return static_cast<int>(dst_length_mono * num_channels_);
+}
+
+// Explictly generate required instantiations.
+template class PushResampler<int16_t>;
+template class PushResampler<float>;
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_sinc_resampler.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_sinc_resampler.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_sinc_resampler.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_sinc_resampler.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,102 @@
+/*
+ *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "common_audio/resampler/push_sinc_resampler.h"
+
+#include <cstring>
+
+#include "common_audio/include/audio_util.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+PushSincResampler::PushSincResampler(size_t source_frames,
+                                     size_t destination_frames)
+    : resampler_(new SincResampler(source_frames * 1.0 / destination_frames,
+                                   source_frames,
+                                   this)),
+      source_ptr_(nullptr),
+      source_ptr_int_(nullptr),
+      destination_frames_(destination_frames),
+      first_pass_(true),
+      source_available_(0) {}
+
+PushSincResampler::~PushSincResampler() {}
+
+size_t PushSincResampler::Resample(const int16_t* source,
+                                   size_t source_length,
+                                   int16_t* destination,
+                                   size_t destination_capacity) {
+  if (!float_buffer_.get())
+    float_buffer_.reset(new float[destination_frames_]);
+
+  source_ptr_int_ = source;
+  // Pass nullptr as the float source to have Run() read from the int16 source.
+  Resample(nullptr, source_length, float_buffer_.get(), destination_frames_);
+  FloatS16ToS16(float_buffer_.get(), destination_frames_, destination);
+  source_ptr_int_ = nullptr;
+  return destination_frames_;
+}
+
+size_t PushSincResampler::Resample(const float* source,
+                                   size_t source_length,
+                                   float* destination,
+                                   size_t destination_capacity) {
+  RTC_CHECK_EQ(source_length, resampler_->request_frames());
+  RTC_CHECK_GE(destination_capacity, destination_frames_);
+  // Cache the source pointer. Calling Resample() will immediately trigger
+  // the Run() callback whereupon we provide the cached value.
+  source_ptr_ = source;
+  source_available_ = source_length;
+
+  // On the first pass, we call Resample() twice. During the first call, we
+  // provide dummy input and discard the output. This is done to prime the
+  // SincResampler buffer with the correct delay (half the kernel size), thereby
+  // ensuring that all later Resample() calls will only result in one input
+  // request through Run().
+  //
+  // If this wasn't done, SincResampler would call Run() twice on the first
+  // pass, and we'd have to introduce an entire |source_frames| of delay, rather
+  // than the minimum half kernel.
+  //
+  // It works out that ChunkSize() is exactly the amount of output we need to
+  // request in order to prime the buffer with a single Run() request for
+  // |source_frames|.
+  if (first_pass_)
+    resampler_->Resample(resampler_->ChunkSize(), destination);
+
+  resampler_->Resample(destination_frames_, destination);
+  source_ptr_ = nullptr;
+  return destination_frames_;
+}
+
+void PushSincResampler::Run(size_t frames, float* destination) {
+  // Ensure we are only asked for the available samples. This would fail if
+  // Run() was triggered more than once per Resample() call.
+  RTC_CHECK_EQ(source_available_, frames);
+
+  if (first_pass_) {
+    // Provide dummy input on the first pass, the output of which will be
+    // discarded, as described in Resample().
+    std::memset(destination, 0, frames * sizeof(*destination));
+    first_pass_ = false;
+    return;
+  }
+
+  if (source_ptr_) {
+    std::memcpy(destination, source_ptr_, frames * sizeof(*destination));
+  } else {
+    for (size_t i = 0; i < frames; ++i)
+      destination[i] = static_cast<float>(source_ptr_int_[i]);
+  }
+  source_available_ -= frames;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_sinc_resampler.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_sinc_resampler.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_sinc_resampler.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/push_sinc_resampler.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,81 @@
+/*
+ *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_
+#define COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include <memory>
+
+#include "common_audio/resampler/sinc_resampler.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+// A thin wrapper over SincResampler to provide a push-based interface as
+// required by WebRTC. SincResampler uses a pull-based interface, and will
+// use SincResamplerCallback::Run() to request data upon a call to Resample().
+// These Run() calls will happen on the same thread Resample() is called on.
+class PushSincResampler : public SincResamplerCallback {
+ public:
+  // Provide the size of the source and destination blocks in samples. These
+  // must correspond to the same time duration (typically 10 ms) as the sample
+  // ratio is inferred from them.
+  PushSincResampler(size_t source_frames, size_t destination_frames);
+  ~PushSincResampler() override;
+
+  // Perform the resampling. |source_frames| must always equal the
+  // |source_frames| provided at construction. |destination_capacity| must be
+  // at least as large as |destination_frames|. Returns the number of samples
+  // provided in destination (for convenience, since this will always be equal
+  // to |destination_frames|).
+  size_t Resample(const int16_t* source,
+                  size_t source_frames,
+                  int16_t* destination,
+                  size_t destination_capacity);
+  size_t Resample(const float* source,
+                  size_t source_frames,
+                  float* destination,
+                  size_t destination_capacity);
+
+  // Delay due to the filter kernel. Essentially, the time after which an input
+  // sample will appear in the resampled output.
+  static float AlgorithmicDelaySeconds(int source_rate_hz) {
+    return 1.f / source_rate_hz * SincResampler::kKernelSize / 2;
+  }
+
+ protected:
+  // Implements SincResamplerCallback.
+  void Run(size_t frames, float* destination) override;
+
+ private:
+  friend class PushSincResamplerTest;
+  SincResampler* get_resampler_for_testing() { return resampler_.get(); }
+
+  std::unique_ptr<SincResampler> resampler_;
+  std::unique_ptr<float[]> float_buffer_;
+  const float* source_ptr_;
+  const int16_t* source_ptr_int_;
+  const size_t destination_frames_;
+
+  // True on the first call to Resample(), to prime the SincResampler buffer.
+  bool first_pass_;
+
+  // Used to assert we are only requested for as much data as is available.
+  size_t source_available_;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(PushSincResampler);
+};
+
+}  // namespace webrtc
+
+#endif  // COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_avx2.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_avx2.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_avx2.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_avx2.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <immintrin.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <xmmintrin.h>
+
+#include "common_audio/resampler/sinc_resampler.h"
+
+namespace webrtc {
+
+float SincResampler::Convolve_AVX2(const float* input_ptr,
+                                   const float* k1,
+                                   const float* k2,
+                                   double kernel_interpolation_factor) {
+  __m256 m_input;
+  __m256 m_sums1 = _mm256_setzero_ps();
+  __m256 m_sums2 = _mm256_setzero_ps();
+
+  // Based on |input_ptr| alignment, we need to use loadu or load.  Unrolling
+  // these loops has not been tested or benchmarked.
+  bool aligned_input = (reinterpret_cast<uintptr_t>(input_ptr) & 0x1F) == 0;
+  if (!aligned_input) {
+    for (size_t i = 0; i < kKernelSize; i += 8) {
+      m_input = _mm256_loadu_ps(input_ptr + i);
+      m_sums1 = _mm256_fmadd_ps(m_input, _mm256_load_ps(k1 + i), m_sums1);
+      m_sums2 = _mm256_fmadd_ps(m_input, _mm256_load_ps(k2 + i), m_sums2);
+    }
+  } else {
+    for (size_t i = 0; i < kKernelSize; i += 8) {
+      m_input = _mm256_load_ps(input_ptr + i);
+      m_sums1 = _mm256_fmadd_ps(m_input, _mm256_load_ps(k1 + i), m_sums1);
+      m_sums2 = _mm256_fmadd_ps(m_input, _mm256_load_ps(k2 + i), m_sums2);
+    }
+  }
+
+  // Linearly interpolate the two "convolutions".
+  __m128 m128_sums1 = _mm_add_ps(_mm256_extractf128_ps(m_sums1, 0),
+                                 _mm256_extractf128_ps(m_sums1, 1));
+  __m128 m128_sums2 = _mm_add_ps(_mm256_extractf128_ps(m_sums2, 0),
+                                 _mm256_extractf128_ps(m_sums2, 1));
+  m128_sums1 = _mm_mul_ps(
+      m128_sums1,
+      _mm_set_ps1(static_cast<float>(1.0 - kernel_interpolation_factor)));
+  m128_sums2 = _mm_mul_ps(
+      m128_sums2, _mm_set_ps1(static_cast<float>(kernel_interpolation_factor)));
+  m128_sums1 = _mm_add_ps(m128_sums1, m128_sums2);
+
+  // Sum components together.
+  float result;
+  m128_sums2 = _mm_add_ps(_mm_movehl_ps(m128_sums1, m128_sums1), m128_sums1);
+  _mm_store_ss(&result, _mm_add_ss(m128_sums2,
+                                   _mm_shuffle_ps(m128_sums2, m128_sums2, 1)));
+
+  return result;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,366 @@
+/*
+ *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Modified from the Chromium original:
+// src/media/base/sinc_resampler.cc
+
+// Initial input buffer layout, dividing into regions r0_ to r4_ (note: r0_, r3_
+// and r4_ will move after the first load):
+//
+// |----------------|-----------------------------------------|----------------|
+//
+//                                        request_frames_
+//                   <--------------------------------------------------------->
+//                                    r0_ (during first load)
+//
+//  kKernelSize / 2   kKernelSize / 2         kKernelSize / 2   kKernelSize / 2
+// <---------------> <--------------->       <---------------> <--------------->
+//        r1_               r2_                     r3_               r4_
+//
+//                             block_size_ == r4_ - r2_
+//                   <--------------------------------------->
+//
+//                                                  request_frames_
+//                                    <------------------ ... ----------------->
+//                                               r0_ (during second load)
+//
+// On the second request r0_ slides to the right by kKernelSize / 2 and r3_, r4_
+// and block_size_ are reinitialized via step (3) in the algorithm below.
+//
+// These new regions remain constant until a Flush() occurs.  While complicated,
+// this allows us to reduce jitter by always requesting the same amount from the
+// provided callback.
+//
+// The algorithm:
+//
+// 1) Allocate input_buffer of size: request_frames_ + kKernelSize; this ensures
+//    there's enough room to read request_frames_ from the callback into region
+//    r0_ (which will move between the first and subsequent passes).
+//
+// 2) Let r1_, r2_ each represent half the kernel centered around r0_:
+//
+//        r0_ = input_buffer_ + kKernelSize / 2
+//        r1_ = input_buffer_
+//        r2_ = r0_
+//
+//    r0_ is always request_frames_ in size.  r1_, r2_ are kKernelSize / 2 in
+//    size.  r1_ must be zero initialized to avoid convolution with garbage (see
+//    step (5) for why).
+//
+// 3) Let r3_, r4_ each represent half the kernel right aligned with the end of
+//    r0_ and choose block_size_ as the distance in frames between r4_ and r2_:
+//
+//        r3_ = r0_ + request_frames_ - kKernelSize
+//        r4_ = r0_ + request_frames_ - kKernelSize / 2
+//        block_size_ = r4_ - r2_ = request_frames_ - kKernelSize / 2
+//
+// 4) Consume request_frames_ frames into r0_.
+//
+// 5) Position kernel centered at start of r2_ and generate output frames until
+//    the kernel is centered at the start of r4_ or we've finished generating
+//    all the output frames.
+//
+// 6) Wrap left over data from the r3_ to r1_ and r4_ to r2_.
+//
+// 7) If we're on the second load, in order to avoid overwriting the frames we
+//    just wrapped from r4_ we need to slide r0_ to the right by the size of
+//    r4_, which is kKernelSize / 2:
+//
+//        r0_ = r0_ + kKernelSize / 2 = input_buffer_ + kKernelSize
+//
+//    r3_, r4_, and block_size_ then need to be reinitialized, so goto (3).
+//
+// 8) Else, if we're not on the second load, goto (4).
+//
+// Note: we're glossing over how the sub-sample handling works with
+// |virtual_source_idx_|, etc.
+
+// MSVC++ requires this to be set before any other includes to get M_PI.
+#define _USE_MATH_DEFINES
+
+#include "common_audio/resampler/sinc_resampler.h"
+
+#include <math.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <limits>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/system/arch.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"  // kSSE2, WebRtc_G...
+
+namespace webrtc {
+
+namespace {
+
+double SincScaleFactor(double io_ratio) {
+  // |sinc_scale_factor| is basically the normalized cutoff frequency of the
+  // low-pass filter.
+  double sinc_scale_factor = io_ratio > 1.0 ? 1.0 / io_ratio : 1.0;
+
+  // The sinc function is an idealized brick-wall filter, but since we're
+  // windowing it the transition from pass to stop does not happen right away.
+  // So we should adjust the low pass filter cutoff slightly downward to avoid
+  // some aliasing at the very high-end.
+  // TODO(crogers): this value is empirical and to be more exact should vary
+  // depending on kKernelSize.
+  sinc_scale_factor *= 0.9;
+
+  return sinc_scale_factor;
+}
+
+}  // namespace
+
+const size_t SincResampler::kKernelSize;
+
+// If we know the minimum architecture at compile time, avoid CPU detection.
+void SincResampler::InitializeCPUSpecificFeatures() {
+#if defined(WEBRTC_HAS_NEON)
+  convolve_proc_ = Convolve_NEON;
+#elif defined(WEBRTC_ARCH_X86_FAMILY)
+  // Using AVX2 instead of SSE2 when AVX2 supported.
+  if (GetCPUInfo(kAVX2))
+    convolve_proc_ = Convolve_AVX2;
+  else if (GetCPUInfo(kSSE2))
+    convolve_proc_ = Convolve_SSE;
+  else
+    convolve_proc_ = Convolve_C;
+#else
+  // Unknown architecture.
+  convolve_proc_ = Convolve_C;
+#endif
+}
+
+SincResampler::SincResampler(double io_sample_rate_ratio,
+                             size_t request_frames,
+                             SincResamplerCallback* read_cb)
+    : io_sample_rate_ratio_(io_sample_rate_ratio),
+      read_cb_(read_cb),
+      request_frames_(request_frames),
+      input_buffer_size_(request_frames_ + kKernelSize),
+      // Create input buffers with a 32-byte alignment for SIMD optimizations.
+      kernel_storage_(static_cast<float*>(
+          AlignedMalloc(sizeof(float) * kKernelStorageSize, 32))),
+      kernel_pre_sinc_storage_(static_cast<float*>(
+          AlignedMalloc(sizeof(float) * kKernelStorageSize, 32))),
+      kernel_window_storage_(static_cast<float*>(
+          AlignedMalloc(sizeof(float) * kKernelStorageSize, 32))),
+      input_buffer_(static_cast<float*>(
+          AlignedMalloc(sizeof(float) * input_buffer_size_, 32))),
+      convolve_proc_(nullptr),
+      r1_(input_buffer_.get()),
+      r2_(input_buffer_.get() + kKernelSize / 2) {
+  InitializeCPUSpecificFeatures();
+  RTC_DCHECK(convolve_proc_);
+  RTC_DCHECK_GT(request_frames_, 0);
+  Flush();
+  RTC_DCHECK_GT(block_size_, kKernelSize);
+
+  memset(kernel_storage_.get(), 0,
+         sizeof(*kernel_storage_.get()) * kKernelStorageSize);
+  memset(kernel_pre_sinc_storage_.get(), 0,
+         sizeof(*kernel_pre_sinc_storage_.get()) * kKernelStorageSize);
+  memset(kernel_window_storage_.get(), 0,
+         sizeof(*kernel_window_storage_.get()) * kKernelStorageSize);
+
+  InitializeKernel();
+}
+
+SincResampler::~SincResampler() {}
+
+void SincResampler::UpdateRegions(bool second_load) {
+  // Setup various region pointers in the buffer (see diagram above).  If we're
+  // on the second load we need to slide r0_ to the right by kKernelSize / 2.
+  r0_ = input_buffer_.get() + (second_load ? kKernelSize : kKernelSize / 2);
+  r3_ = r0_ + request_frames_ - kKernelSize;
+  r4_ = r0_ + request_frames_ - kKernelSize / 2;
+  block_size_ = r4_ - r2_;
+
+  // r1_ at the beginning of the buffer.
+  RTC_DCHECK_EQ(r1_, input_buffer_.get());
+  // r1_ left of r2_, r4_ left of r3_ and size correct.
+  RTC_DCHECK_EQ(r2_ - r1_, r4_ - r3_);
+  // r2_ left of r3.
+  RTC_DCHECK_LT(r2_, r3_);
+}
+
+void SincResampler::InitializeKernel() {
+  // Blackman window parameters.
+  static const double kAlpha = 0.16;
+  static const double kA0 = 0.5 * (1.0 - kAlpha);
+  static const double kA1 = 0.5;
+  static const double kA2 = 0.5 * kAlpha;
+
+  // Generates a set of windowed sinc() kernels.
+  // We generate a range of sub-sample offsets from 0.0 to 1.0.
+  const double sinc_scale_factor = SincScaleFactor(io_sample_rate_ratio_);
+  for (size_t offset_idx = 0; offset_idx <= kKernelOffsetCount; ++offset_idx) {
+    const float subsample_offset =
+        static_cast<float>(offset_idx) / kKernelOffsetCount;
+
+    for (size_t i = 0; i < kKernelSize; ++i) {
+      const size_t idx = i + offset_idx * kKernelSize;
+      const float pre_sinc = static_cast<float>(
+          M_PI * (static_cast<int>(i) - static_cast<int>(kKernelSize / 2) -
+                  subsample_offset));
+      kernel_pre_sinc_storage_[idx] = pre_sinc;
+
+      // Compute Blackman window, matching the offset of the sinc().
+      const float x = (i - subsample_offset) / kKernelSize;
+      const float window = static_cast<float>(kA0 - kA1 * cos(2.0 * M_PI * x) +
+                                              kA2 * cos(4.0 * M_PI * x));
+      kernel_window_storage_[idx] = window;
+
+      // Compute the sinc with offset, then window the sinc() function and store
+      // at the correct offset.
+      kernel_storage_[idx] = static_cast<float>(
+          window * ((pre_sinc == 0)
+                        ? sinc_scale_factor
+                        : (sin(sinc_scale_factor * pre_sinc) / pre_sinc)));
+    }
+  }
+}
+
+void SincResampler::SetRatio(double io_sample_rate_ratio) {
+  if (fabs(io_sample_rate_ratio_ - io_sample_rate_ratio) <
+      std::numeric_limits<double>::epsilon()) {
+    return;
+  }
+
+  io_sample_rate_ratio_ = io_sample_rate_ratio;
+
+  // Optimize reinitialization by reusing values which are independent of
+  // |sinc_scale_factor|.  Provides a 3x speedup.
+  const double sinc_scale_factor = SincScaleFactor(io_sample_rate_ratio_);
+  for (size_t offset_idx = 0; offset_idx <= kKernelOffsetCount; ++offset_idx) {
+    for (size_t i = 0; i < kKernelSize; ++i) {
+      const size_t idx = i + offset_idx * kKernelSize;
+      const float window = kernel_window_storage_[idx];
+      const float pre_sinc = kernel_pre_sinc_storage_[idx];
+
+      kernel_storage_[idx] = static_cast<float>(
+          window * ((pre_sinc == 0)
+                        ? sinc_scale_factor
+                        : (sin(sinc_scale_factor * pre_sinc) / pre_sinc)));
+    }
+  }
+}
+
+void SincResampler::Resample(size_t frames, float* destination) {
+  size_t remaining_frames = frames;
+
+  // Step (1) -- Prime the input buffer at the start of the input stream.
+  if (!buffer_primed_ && remaining_frames) {
+    read_cb_->Run(request_frames_, r0_);
+    buffer_primed_ = true;
+  }
+
+  // Step (2) -- Resample!  const what we can outside of the loop for speed.  It
+  // actually has an impact on ARM performance.  See inner loop comment below.
+  const double current_io_ratio = io_sample_rate_ratio_;
+  const float* const kernel_ptr = kernel_storage_.get();
+  while (remaining_frames) {
+    // |i| may be negative if the last Resample() call ended on an iteration
+    // that put |virtual_source_idx_| over the limit.
+    //
+    // Note: The loop construct here can severely impact performance on ARM
+    // or when built with clang.  See https://codereview.chromium.org/18566009/
+    for (int i = static_cast<int>(
+             ceil((block_size_ - virtual_source_idx_) / current_io_ratio));
+         i > 0; --i) {
+      RTC_DCHECK_LT(virtual_source_idx_, block_size_);
+
+      // |virtual_source_idx_| lies in between two kernel offsets so figure out
+      // what they are.
+      const int source_idx = static_cast<int>(virtual_source_idx_);
+      const double subsample_remainder = virtual_source_idx_ - source_idx;
+
+      const double virtual_offset_idx =
+          subsample_remainder * kKernelOffsetCount;
+      const int offset_idx = static_cast<int>(virtual_offset_idx);
+
+      // We'll compute "convolutions" for the two kernels which straddle
+      // |virtual_source_idx_|.
+      const float* const k1 = kernel_ptr + offset_idx * kKernelSize;
+      const float* const k2 = k1 + kKernelSize;
+
+      // Ensure |k1|, |k2| are 32-byte aligned for SIMD usage.  Should always be
+      // true so long as kKernelSize is a multiple of 32.
+      RTC_DCHECK_EQ(0, reinterpret_cast<uintptr_t>(k1) % 32);
+      RTC_DCHECK_EQ(0, reinterpret_cast<uintptr_t>(k2) % 32);
+
+      // Initialize input pointer based on quantized |virtual_source_idx_|.
+      const float* const input_ptr = r1_ + source_idx;
+
+      // Figure out how much to weight each kernel's "convolution".
+      const double kernel_interpolation_factor =
+          virtual_offset_idx - offset_idx;
+      *destination++ =
+          convolve_proc_(input_ptr, k1, k2, kernel_interpolation_factor);
+
+      // Advance the virtual index.
+      virtual_source_idx_ += current_io_ratio;
+
+      if (!--remaining_frames)
+        return;
+    }
+
+    // Wrap back around to the start.
+    virtual_source_idx_ -= block_size_;
+
+    // Step (3) -- Copy r3_, r4_ to r1_, r2_.
+    // This wraps the last input frames back to the start of the buffer.
+    memcpy(r1_, r3_, sizeof(*input_buffer_.get()) * kKernelSize);
+
+    // Step (4) -- Reinitialize regions if necessary.
+    if (r0_ == r2_)
+      UpdateRegions(true);
+
+    // Step (5) -- Refresh the buffer with more input.
+    read_cb_->Run(request_frames_, r0_);
+  }
+}
+
+#undef CONVOLVE_FUNC
+
+size_t SincResampler::ChunkSize() const {
+  return static_cast<size_t>(block_size_ / io_sample_rate_ratio_);
+}
+
+void SincResampler::Flush() {
+  virtual_source_idx_ = 0;
+  buffer_primed_ = false;
+  memset(input_buffer_.get(), 0,
+         sizeof(*input_buffer_.get()) * input_buffer_size_);
+  UpdateRegions(false);
+}
+
+float SincResampler::Convolve_C(const float* input_ptr,
+                                const float* k1,
+                                const float* k2,
+                                double kernel_interpolation_factor) {
+  float sum1 = 0;
+  float sum2 = 0;
+
+  // Generate a single output sample.  Unrolling this loop hurt performance in
+  // local testing.
+  size_t n = kKernelSize;
+  while (n--) {
+    sum1 += *input_ptr * *k1++;
+    sum2 += *input_ptr++ * *k2++;
+  }
+
+  // Linearly interpolate the two "convolutions".
+  return static_cast<float>((1.0 - kernel_interpolation_factor) * sum1 +
+                            kernel_interpolation_factor * sum2);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,181 @@
+/*
+ *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Modified from the Chromium original here:
+// src/media/base/sinc_resampler.h
+
+#ifndef COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_
+#define COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_
+
+#include <stddef.h>
+
+#include <memory>
+
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/gtest_prod_util.h"
+#include "rtc_base/memory/aligned_malloc.h"
+#include "rtc_base/system/arch.h"
+
+namespace webrtc {
+
+// Callback class for providing more data into the resampler.  Expects |frames|
+// of data to be rendered into |destination|; zero padded if not enough frames
+// are available to satisfy the request.
+class SincResamplerCallback {
+ public:
+  virtual ~SincResamplerCallback() {}
+  virtual void Run(size_t frames, float* destination) = 0;
+};
+
+// SincResampler is a high-quality single-channel sample-rate converter.
+class SincResampler {
+ public:
+  // The kernel size can be adjusted for quality (higher is better) at the
+  // expense of performance.  Must be a multiple of 32.
+  // TODO(dalecurtis): Test performance to see if we can jack this up to 64+.
+  static const size_t kKernelSize = 32;
+
+  // Default request size.  Affects how often and for how much SincResampler
+  // calls back for input.  Must be greater than kKernelSize.
+  static const size_t kDefaultRequestSize = 512;
+
+  // The kernel offset count is used for interpolation and is the number of
+  // sub-sample kernel shifts.  Can be adjusted for quality (higher is better)
+  // at the expense of allocating more memory.
+  static const size_t kKernelOffsetCount = 32;
+  static const size_t kKernelStorageSize =
+      kKernelSize * (kKernelOffsetCount + 1);
+
+  // Constructs a SincResampler with the specified |read_cb|, which is used to
+  // acquire audio data for resampling.  |io_sample_rate_ratio| is the ratio
+  // of input / output sample rates.  |request_frames| controls the size in
+  // frames of the buffer requested by each |read_cb| call.  The value must be
+  // greater than kKernelSize.  Specify kDefaultRequestSize if there are no
+  // request size constraints.
+  SincResampler(double io_sample_rate_ratio,
+                size_t request_frames,
+                SincResamplerCallback* read_cb);
+  virtual ~SincResampler();
+
+  // Resample |frames| of data from |read_cb_| into |destination|.
+  void Resample(size_t frames, float* destination);
+
+  // The maximum size in frames that guarantees Resample() will only make a
+  // single call to |read_cb_| for more data.
+  size_t ChunkSize() const;
+
+  size_t request_frames() const { return request_frames_; }
+
+  // Flush all buffered data and reset internal indices.  Not thread safe, do
+  // not call while Resample() is in progress.
+  void Flush();
+
+  // Update |io_sample_rate_ratio_|.  SetRatio() will cause a reconstruction of
+  // the kernels used for resampling.  Not thread safe, do not call while
+  // Resample() is in progress.
+  //
+  // TODO(ajm): Use this in PushSincResampler rather than reconstructing
+  // SincResampler.  We would also need a way to update |request_frames_|.
+  void SetRatio(double io_sample_rate_ratio);
+
+  float* get_kernel_for_testing() { return kernel_storage_.get(); }
+
+ private:
+  FRIEND_TEST_ALL_PREFIXES(SincResamplerTest, Convolve);
+  FRIEND_TEST_ALL_PREFIXES(SincResamplerTest, ConvolveBenchmark);
+
+  void InitializeKernel();
+  void UpdateRegions(bool second_load);
+
+  // Selects runtime specific CPU features like SSE.  Must be called before
+  // using SincResampler.
+  // TODO(ajm): Currently managed by the class internally. See the note with
+  // |convolve_proc_| below.
+  void InitializeCPUSpecificFeatures();
+
+  // Compute convolution of |k1| and |k2| over |input_ptr|, resultant sums are
+  // linearly interpolated using |kernel_interpolation_factor|.  On x86 and ARM
+  // the underlying implementation is chosen at run time.
+  static float Convolve_C(const float* input_ptr,
+                          const float* k1,
+                          const float* k2,
+                          double kernel_interpolation_factor);
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+  static float Convolve_SSE(const float* input_ptr,
+                            const float* k1,
+                            const float* k2,
+                            double kernel_interpolation_factor);
+  static float Convolve_AVX2(const float* input_ptr,
+                             const float* k1,
+                             const float* k2,
+                             double kernel_interpolation_factor);
+#elif defined(WEBRTC_HAS_NEON)
+  static float Convolve_NEON(const float* input_ptr,
+                             const float* k1,
+                             const float* k2,
+                             double kernel_interpolation_factor);
+#endif
+
+  // The ratio of input / output sample rates.
+  double io_sample_rate_ratio_;
+
+  // An index on the source input buffer with sub-sample precision.  It must be
+  // double precision to avoid drift.
+  double virtual_source_idx_;
+
+  // The buffer is primed once at the very beginning of processing.
+  bool buffer_primed_;
+
+  // Source of data for resampling.
+  SincResamplerCallback* read_cb_;
+
+  // The size (in samples) to request from each |read_cb_| execution.
+  const size_t request_frames_;
+
+  // The number of source frames processed per pass.
+  size_t block_size_;
+
+  // The size (in samples) of the internal buffer used by the resampler.
+  const size_t input_buffer_size_;
+
+  // Contains kKernelOffsetCount kernels back-to-back, each of size kKernelSize.
+  // The kernel offsets are sub-sample shifts of a windowed sinc shifted from
+  // 0.0 to 1.0 sample.
+  std::unique_ptr<float[], AlignedFreeDeleter> kernel_storage_;
+  std::unique_ptr<float[], AlignedFreeDeleter> kernel_pre_sinc_storage_;
+  std::unique_ptr<float[], AlignedFreeDeleter> kernel_window_storage_;
+
+  // Data from the source is copied into this buffer for each processing pass.
+  std::unique_ptr<float[], AlignedFreeDeleter> input_buffer_;
+
+// Stores the runtime selection of which Convolve function to use.
+// TODO(ajm): Move to using a global static which must only be initialized
+// once by the user. We're not doing this initially, because we don't have
+// e.g. a LazyInstance helper in webrtc.
+  typedef float (*ConvolveProc)(const float*,
+                                const float*,
+                                const float*,
+                                double);
+  ConvolveProc convolve_proc_;
+
+  // Pointers to the various regions inside |input_buffer_|.  See the diagram at
+  // the top of the .cc file for more information.
+  float* r0_;
+  float* const r1_;
+  float* const r2_;
+  float* r3_;
+  float* r4_;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(SincResampler);
+};
+
+}  // namespace webrtc
+
+#endif  // COMMON_AUDIO_RESAMPLER_SINC_RESAMPLER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_neon.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_neon.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_neon.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_neon.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Modified from the Chromium original:
+// src/media/base/sinc_resampler.cc
+
+#include <arm_neon.h>
+
+#include "common_audio/resampler/sinc_resampler.h"
+
+namespace webrtc {
+
+float SincResampler::Convolve_NEON(const float* input_ptr,
+                                   const float* k1,
+                                   const float* k2,
+                                   double kernel_interpolation_factor) {
+  float32x4_t m_input;
+  float32x4_t m_sums1 = vmovq_n_f32(0);
+  float32x4_t m_sums2 = vmovq_n_f32(0);
+
+  const float* upper = input_ptr + kKernelSize;
+  for (; input_ptr < upper;) {
+    m_input = vld1q_f32(input_ptr);
+    input_ptr += 4;
+    m_sums1 = vmlaq_f32(m_sums1, m_input, vld1q_f32(k1));
+    k1 += 4;
+    m_sums2 = vmlaq_f32(m_sums2, m_input, vld1q_f32(k2));
+    k2 += 4;
+  }
+
+  // Linearly interpolate the two "convolutions".
+  m_sums1 = vmlaq_f32(
+      vmulq_f32(m_sums1, vmovq_n_f32(1.0 - kernel_interpolation_factor)),
+      m_sums2, vmovq_n_f32(kernel_interpolation_factor));
+
+  // Sum components together.
+  float32x2_t m_half = vadd_f32(vget_high_f32(m_sums1), vget_low_f32(m_sums1));
+  return vget_lane_f32(vpadd_f32(m_half, m_half), 0);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_sse.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_sse.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_sse.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_sse.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Modified from the Chromium original:
+// src/media/base/simd/sinc_resampler_sse.cc
+
+#include <stddef.h>
+#include <stdint.h>
+#include <xmmintrin.h>
+
+#include "common_audio/resampler/sinc_resampler.h"
+
+namespace webrtc {
+
+float SincResampler::Convolve_SSE(const float* input_ptr,
+                                  const float* k1,
+                                  const float* k2,
+                                  double kernel_interpolation_factor) {
+  __m128 m_input;
+  __m128 m_sums1 = _mm_setzero_ps();
+  __m128 m_sums2 = _mm_setzero_ps();
+
+  // Based on |input_ptr| alignment, we need to use loadu or load.  Unrolling
+  // these loops hurt performance in local testing.
+  if (reinterpret_cast<uintptr_t>(input_ptr) & 0x0F) {
+    for (size_t i = 0; i < kKernelSize; i += 4) {
+      m_input = _mm_loadu_ps(input_ptr + i);
+      m_sums1 = _mm_add_ps(m_sums1, _mm_mul_ps(m_input, _mm_load_ps(k1 + i)));
+      m_sums2 = _mm_add_ps(m_sums2, _mm_mul_ps(m_input, _mm_load_ps(k2 + i)));
+    }
+  } else {
+    for (size_t i = 0; i < kKernelSize; i += 4) {
+      m_input = _mm_load_ps(input_ptr + i);
+      m_sums1 = _mm_add_ps(m_sums1, _mm_mul_ps(m_input, _mm_load_ps(k1 + i)));
+      m_sums2 = _mm_add_ps(m_sums2, _mm_mul_ps(m_input, _mm_load_ps(k2 + i)));
+    }
+  }
+
+  // Linearly interpolate the two "convolutions".
+  m_sums1 = _mm_mul_ps(
+      m_sums1,
+      _mm_set_ps1(static_cast<float>(1.0 - kernel_interpolation_factor)));
+  m_sums2 = _mm_mul_ps(
+      m_sums2, _mm_set_ps1(static_cast<float>(kernel_interpolation_factor)));
+  m_sums1 = _mm_add_ps(m_sums1, m_sums2);
+
+  // Sum components together.
+  float result;
+  m_sums2 = _mm_add_ps(_mm_movehl_ps(m_sums1, m_sums1), m_sums1);
+  _mm_store_ss(&result,
+               _mm_add_ss(m_sums2, _mm_shuffle_ps(m_sums2, m_sums2, 1)));
+
+  return result;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/resampler/sinc_resampler_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,382 @@
+/*
+ *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Modified from the Chromium original:
+// src/media/base/sinc_resampler_unittest.cc
+
+// MSVC++ requires this to be set before any other includes to get M_PI.
+#define _USE_MATH_DEFINES
+
+#include "common_audio/resampler/sinc_resampler.h"
+
+#include <math.h>
+
+#include <algorithm>
+#include <memory>
+#include <tuple>
+
+#include "common_audio/resampler/sinusoidal_linear_chirp_source.h"
+#include "rtc_base/system/arch.h"
+#include "rtc_base/time_utils.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
+
+using ::testing::_;
+
+namespace webrtc {
+
+static const double kSampleRateRatio = 192000.0 / 44100.0;
+static const double kKernelInterpolationFactor = 0.5;
+
+// Helper class to ensure ChunkedResample() functions properly.
+class MockSource : public SincResamplerCallback {
+ public:
+  MOCK_METHOD(void, Run, (size_t frames, float* destination), (override));
+};
+
+ACTION(ClearBuffer) {
+  memset(arg1, 0, arg0 * sizeof(float));
+}
+
+ACTION(FillBuffer) {
+  // Value chosen arbitrarily such that SincResampler resamples it to something
+  // easily representable on all platforms; e.g., using kSampleRateRatio this
+  // becomes 1.81219.
+  memset(arg1, 64, arg0 * sizeof(float));
+}
+
+// Test requesting multiples of ChunkSize() frames results in the proper number
+// of callbacks.
+TEST(SincResamplerTest, ChunkedResample) {
+  MockSource mock_source;
+
+  // Choose a high ratio of input to output samples which will result in quick
+  // exhaustion of SincResampler's internal buffers.
+  SincResampler resampler(kSampleRateRatio, SincResampler::kDefaultRequestSize,
+                          &mock_source);
+
+  static const int kChunks = 2;
+  size_t max_chunk_size = resampler.ChunkSize() * kChunks;
+  std::unique_ptr<float[]> resampled_destination(new float[max_chunk_size]);
+
+  // Verify requesting ChunkSize() frames causes a single callback.
+  EXPECT_CALL(mock_source, Run(_, _)).Times(1).WillOnce(ClearBuffer());
+  resampler.Resample(resampler.ChunkSize(), resampled_destination.get());
+
+  // Verify requesting kChunks * ChunkSize() frames causes kChunks callbacks.
+  ::testing::Mock::VerifyAndClear(&mock_source);
+  EXPECT_CALL(mock_source, Run(_, _))
+      .Times(kChunks)
+      .WillRepeatedly(ClearBuffer());
+  resampler.Resample(max_chunk_size, resampled_destination.get());
+}
+
+// Test flush resets the internal state properly.
+TEST(SincResamplerTest, Flush) {
+  MockSource mock_source;
+  SincResampler resampler(kSampleRateRatio, SincResampler::kDefaultRequestSize,
+                          &mock_source);
+  std::unique_ptr<float[]> resampled_destination(
+      new float[resampler.ChunkSize()]);
+
+  // Fill the resampler with junk data.
+  EXPECT_CALL(mock_source, Run(_, _)).Times(1).WillOnce(FillBuffer());
+  resampler.Resample(resampler.ChunkSize() / 2, resampled_destination.get());
+  ASSERT_NE(resampled_destination[0], 0);
+
+  // Flush and request more data, which should all be zeros now.
+  resampler.Flush();
+  ::testing::Mock::VerifyAndClear(&mock_source);
+  EXPECT_CALL(mock_source, Run(_, _)).Times(1).WillOnce(ClearBuffer());
+  resampler.Resample(resampler.ChunkSize() / 2, resampled_destination.get());
+  for (size_t i = 0; i < resampler.ChunkSize() / 2; ++i)
+    ASSERT_FLOAT_EQ(resampled_destination[i], 0);
+}
+
+// Test flush resets the internal state properly.
+TEST(SincResamplerTest, DISABLED_SetRatioBench) {
+  MockSource mock_source;
+  SincResampler resampler(kSampleRateRatio, SincResampler::kDefaultRequestSize,
+                          &mock_source);
+
+  int64_t start = rtc::TimeNanos();
+  for (int i = 1; i < 10000; ++i)
+    resampler.SetRatio(1.0 / i);
+  double total_time_c_us =
+      (rtc::TimeNanos() - start) / rtc::kNumNanosecsPerMicrosec;
+  printf("SetRatio() took %.2fms.\n", total_time_c_us / 1000);
+}
+
+// Ensure various optimized Convolve() methods return the same value.  Only run
+// this test if other optimized methods exist, otherwise the default Convolve()
+// will be tested by the parameterized SincResampler tests below.
+TEST(SincResamplerTest, Convolve) {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+  ASSERT_TRUE(GetCPUInfo(kSSE2));
+#elif defined(WEBRTC_ARCH_ARM_V7)
+  ASSERT_TRUE(GetCPUFeaturesARM() & kCPUFeatureNEON);
+#endif
+
+  // Initialize a dummy resampler.
+  MockSource mock_source;
+  SincResampler resampler(kSampleRateRatio, SincResampler::kDefaultRequestSize,
+                          &mock_source);
+
+  // The optimized Convolve methods are slightly more precise than Convolve_C(),
+  // so comparison must be done using an epsilon.
+  static const double kEpsilon = 0.00000005;
+
+  // Use a kernel from SincResampler as input and kernel data, this has the
+  // benefit of already being properly sized and aligned for Convolve_SSE().
+  double result = resampler.Convolve_C(
+      resampler.kernel_storage_.get(), resampler.kernel_storage_.get(),
+      resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  double result2 = resampler.convolve_proc_(
+      resampler.kernel_storage_.get(), resampler.kernel_storage_.get(),
+      resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  EXPECT_NEAR(result2, result, kEpsilon);
+
+  // Test Convolve() w/ unaligned input pointer.
+  result = resampler.Convolve_C(
+      resampler.kernel_storage_.get() + 1, resampler.kernel_storage_.get(),
+      resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  result2 = resampler.convolve_proc_(
+      resampler.kernel_storage_.get() + 1, resampler.kernel_storage_.get(),
+      resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  EXPECT_NEAR(result2, result, kEpsilon);
+}
+
+// Benchmark for the various Convolve() methods.  Make sure to build with
+// branding=Chrome so that RTC_DCHECKs are compiled out when benchmarking.
+// Original benchmarks were run with --convolve-iterations=50000000.
+TEST(SincResamplerTest, ConvolveBenchmark) {
+  // Initialize a dummy resampler.
+  MockSource mock_source;
+  SincResampler resampler(kSampleRateRatio, SincResampler::kDefaultRequestSize,
+                          &mock_source);
+
+  // Retrieve benchmark iterations from command line.
+  // TODO(ajm): Reintroduce this as a command line option.
+  const int kConvolveIterations = 1000000;
+
+  printf("Benchmarking %d iterations:\n", kConvolveIterations);
+
+  // Benchmark Convolve_C().
+  int64_t start = rtc::TimeNanos();
+  for (int i = 0; i < kConvolveIterations; ++i) {
+    resampler.Convolve_C(
+        resampler.kernel_storage_.get(), resampler.kernel_storage_.get(),
+        resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  }
+  double total_time_c_us =
+      (rtc::TimeNanos() - start) / rtc::kNumNanosecsPerMicrosec;
+  printf("Convolve_C took %.2fms.\n", total_time_c_us / 1000);
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+  ASSERT_TRUE(GetCPUInfo(kSSE2));
+#elif defined(WEBRTC_ARCH_ARM_V7)
+  ASSERT_TRUE(GetCPUFeaturesARM() & kCPUFeatureNEON);
+#endif
+
+  // Benchmark with unaligned input pointer.
+  start = rtc::TimeNanos();
+  for (int j = 0; j < kConvolveIterations; ++j) {
+    resampler.convolve_proc_(
+        resampler.kernel_storage_.get() + 1, resampler.kernel_storage_.get(),
+        resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  }
+  double total_time_optimized_unaligned_us =
+      (rtc::TimeNanos() - start) / rtc::kNumNanosecsPerMicrosec;
+  printf(
+      "convolve_proc_(unaligned) took %.2fms; which is %.2fx "
+      "faster than Convolve_C.\n",
+      total_time_optimized_unaligned_us / 1000,
+      total_time_c_us / total_time_optimized_unaligned_us);
+
+  // Benchmark with aligned input pointer.
+  start = rtc::TimeNanos();
+  for (int j = 0; j < kConvolveIterations; ++j) {
+    resampler.convolve_proc_(
+        resampler.kernel_storage_.get(), resampler.kernel_storage_.get(),
+        resampler.kernel_storage_.get(), kKernelInterpolationFactor);
+  }
+  double total_time_optimized_aligned_us =
+      (rtc::TimeNanos() - start) / rtc::kNumNanosecsPerMicrosec;
+  printf(
+      "convolve_proc_ (aligned) took %.2fms; which is %.2fx "
+      "faster than Convolve_C and %.2fx faster than "
+      "convolve_proc_ (unaligned).\n",
+      total_time_optimized_aligned_us / 1000,
+      total_time_c_us / total_time_optimized_aligned_us,
+      total_time_optimized_unaligned_us / total_time_optimized_aligned_us);
+}
+
+typedef std::tuple<int, int, double, double> SincResamplerTestData;
+class SincResamplerTest
+    : public ::testing::TestWithParam<SincResamplerTestData> {
+ public:
+  SincResamplerTest()
+      : input_rate_(std::get<0>(GetParam())),
+        output_rate_(std::get<1>(GetParam())),
+        rms_error_(std::get<2>(GetParam())),
+        low_freq_error_(std::get<3>(GetParam())) {}
+
+  virtual ~SincResamplerTest() {}
+
+ protected:
+  int input_rate_;
+  int output_rate_;
+  double rms_error_;
+  double low_freq_error_;
+};
+
+// Tests resampling using a given input and output sample rate.
+TEST_P(SincResamplerTest, Resample) {
+  // Make comparisons using one second of data.
+  static const double kTestDurationSecs = 1;
+  const size_t input_samples =
+      static_cast<size_t>(kTestDurationSecs * input_rate_);
+  const size_t output_samples =
+      static_cast<size_t>(kTestDurationSecs * output_rate_);
+
+  // Nyquist frequency for the input sampling rate.
+  const double input_nyquist_freq = 0.5 * input_rate_;
+
+  // Source for data to be resampled.
+  SinusoidalLinearChirpSource resampler_source(input_rate_, input_samples,
+                                               input_nyquist_freq, 0);
+
+  const double io_ratio = input_rate_ / static_cast<double>(output_rate_);
+  SincResampler resampler(io_ratio, SincResampler::kDefaultRequestSize,
+                          &resampler_source);
+
+  // Force an update to the sample rate ratio to ensure dyanmic sample rate
+  // changes are working correctly.
+  std::unique_ptr<float[]> kernel(new float[SincResampler::kKernelStorageSize]);
+  memcpy(kernel.get(), resampler.get_kernel_for_testing(),
+         SincResampler::kKernelStorageSize);
+  resampler.SetRatio(M_PI);
+  ASSERT_NE(0, memcmp(kernel.get(), resampler.get_kernel_for_testing(),
+                      SincResampler::kKernelStorageSize));
+  resampler.SetRatio(io_ratio);
+  ASSERT_EQ(0, memcmp(kernel.get(), resampler.get_kernel_for_testing(),
+                      SincResampler::kKernelStorageSize));
+
+  // TODO(dalecurtis): If we switch to AVX/SSE optimization, we'll need to
+  // allocate these on 32-byte boundaries and ensure they're sized % 32 bytes.
+  std::unique_ptr<float[]> resampled_destination(new float[output_samples]);
+  std::unique_ptr<float[]> pure_destination(new float[output_samples]);
+
+  // Generate resampled signal.
+  resampler.Resample(output_samples, resampled_destination.get());
+
+  // Generate pure signal.
+  SinusoidalLinearChirpSource pure_source(output_rate_, output_samples,
+                                          input_nyquist_freq, 0);
+  pure_source.Run(output_samples, pure_destination.get());
+
+  // Range of the Nyquist frequency (0.5 * min(input rate, output_rate)) which
+  // we refer to as low and high.
+  static const double kLowFrequencyNyquistRange = 0.7;
+  static const double kHighFrequencyNyquistRange = 0.9;
+
+  // Calculate Root-Mean-Square-Error and maximum error for the resampling.
+  double sum_of_squares = 0;
+  double low_freq_max_error = 0;
+  double high_freq_max_error = 0;
+  int minimum_rate = std::min(input_rate_, output_rate_);
+  double low_frequency_range = kLowFrequencyNyquistRange * 0.5 * minimum_rate;
+  double high_frequency_range = kHighFrequencyNyquistRange * 0.5 * minimum_rate;
+  for (size_t i = 0; i < output_samples; ++i) {
+    double error = fabs(resampled_destination[i] - pure_destination[i]);
+
+    if (pure_source.Frequency(i) < low_frequency_range) {
+      if (error > low_freq_max_error)
+        low_freq_max_error = error;
+    } else if (pure_source.Frequency(i) < high_frequency_range) {
+      if (error > high_freq_max_error)
+        high_freq_max_error = error;
+    }
+    // TODO(dalecurtis): Sanity check frequencies > kHighFrequencyNyquistRange.
+
+    sum_of_squares += error * error;
+  }
+
+  double rms_error = sqrt(sum_of_squares / output_samples);
+
+// Convert each error to dbFS.
+#define DBFS(x) 20 * log10(x)
+  rms_error = DBFS(rms_error);
+  low_freq_max_error = DBFS(low_freq_max_error);
+  high_freq_max_error = DBFS(high_freq_max_error);
+
+  EXPECT_LE(rms_error, rms_error_);
+  EXPECT_LE(low_freq_max_error, low_freq_error_);
+
+  // All conversions currently have a high frequency error around -6 dbFS.
+  static const double kHighFrequencyMaxError = -6.02;
+  EXPECT_LE(high_freq_max_error, kHighFrequencyMaxError);
+}
+
+// Almost all conversions have an RMS error of around -14 dbFS.
+static const double kResamplingRMSError = -14.58;
+
+// Thresholds chosen arbitrarily based on what each resampling reported during
+// testing.  All thresholds are in dbFS, http://en.wikipedia.org/wiki/DBFS.
+INSTANTIATE_TEST_SUITE_P(
+    SincResamplerTest,
+    SincResamplerTest,
+    ::testing::Values(
+        // To 44.1kHz
+        std::make_tuple(8000, 44100, kResamplingRMSError, -62.73),
+        std::make_tuple(11025, 44100, kResamplingRMSError, -72.19),
+        std::make_tuple(16000, 44100, kResamplingRMSError, -62.54),
+        std::make_tuple(22050, 44100, kResamplingRMSError, -73.53),
+        std::make_tuple(32000, 44100, kResamplingRMSError, -63.32),
+        std::make_tuple(44100, 44100, kResamplingRMSError, -73.52),
+        std::make_tuple(48000, 44100, -15.01, -64.04),
+        std::make_tuple(96000, 44100, -18.49, -25.51),
+        std::make_tuple(192000, 44100, -20.50, -13.31),
+
+        // To 48kHz
+        std::make_tuple(8000, 48000, kResamplingRMSError, -63.43),
+        std::make_tuple(11025, 48000, kResamplingRMSError, -62.61),
+        std::make_tuple(16000, 48000, kResamplingRMSError, -63.95),
+        std::make_tuple(22050, 48000, kResamplingRMSError, -62.42),
+        std::make_tuple(32000, 48000, kResamplingRMSError, -64.04),
+        std::make_tuple(44100, 48000, kResamplingRMSError, -62.63),
+        std::make_tuple(48000, 48000, kResamplingRMSError, -73.52),
+        std::make_tuple(96000, 48000, -18.40, -28.44),
+        std::make_tuple(192000, 48000, -20.43, -14.11),
+
+        // To 96kHz
+        std::make_tuple(8000, 96000, kResamplingRMSError, -63.19),
+        std::make_tuple(11025, 96000, kResamplingRMSError, -62.61),
+        std::make_tuple(16000, 96000, kResamplingRMSError, -63.39),
+        std::make_tuple(22050, 96000, kResamplingRMSError, -62.42),
+        std::make_tuple(32000, 96000, kResamplingRMSError, -63.95),
+        std::make_tuple(44100, 96000, kResamplingRMSError, -62.63),
+        std::make_tuple(48000, 96000, kResamplingRMSError, -73.52),
+        std::make_tuple(96000, 96000, kResamplingRMSError, -73.52),
+        std::make_tuple(192000, 96000, kResamplingRMSError, -28.41),
+
+        // To 192kHz
+        std::make_tuple(8000, 192000, kResamplingRMSError, -63.10),
+        std::make_tuple(11025, 192000, kResamplingRMSError, -62.61),
+        std::make_tuple(16000, 192000, kResamplingRMSError, -63.14),
+        std::make_tuple(22050, 192000, kResamplingRMSError, -62.42),
+        std::make_tuple(32000, 192000, kResamplingRMSError, -63.38),
+        std::make_tuple(44100, 192000, kResamplingRMSError, -62.63),
+        std::make_tuple(48000, 192000, kResamplingRMSError, -73.44),
+        std::make_tuple(96000, 192000, kResamplingRMSError, -73.52),
+        std::make_tuple(192000, 192000, kResamplingRMSError, -73.52)));
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/dot_product_with_scale.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/dot_product_with_scale.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/dot_product_with_scale.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/dot_product_with_scale.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "common_audio/signal_processing/dot_product_with_scale.h"
+
+#include "rtc_base/numerics/safe_conversions.h"
+
+int32_t WebRtcSpl_DotProductWithScale(const int16_t* vector1,
+                                      const int16_t* vector2,
+                                      size_t length,
+                                      int scaling) {
+  int64_t sum = 0;
+  size_t i = 0;
+
+  /* Unroll the loop to improve performance. */
+  for (i = 0; i + 3 < length; i += 4) {
+    sum += (vector1[i + 0] * vector2[i + 0]) >> scaling;
+    sum += (vector1[i + 1] * vector2[i + 1]) >> scaling;
+    sum += (vector1[i + 2] * vector2[i + 2]) >> scaling;
+    sum += (vector1[i + 3] * vector2[i + 3]) >> scaling;
+  }
+  for (; i < length; i++) {
+    sum += (vector1[i] * vector2[i]) >> scaling;
+  }
+
+  return rtc::saturated_cast<int32_t>(sum);
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/dot_product_with_scale.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/dot_product_with_scale.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/dot_product_with_scale.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/dot_product_with_scale.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_
+#define COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_
+
+#include <stdint.h>
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Calculates the dot product between two (int16_t) vectors.
+//
+// Input:
+//      - vector1       : Vector 1
+//      - vector2       : Vector 2
+//      - vector_length : Number of samples used in the dot product
+//      - scaling       : The number of right bit shifts to apply on each term
+//                        during calculation to avoid overflow, i.e., the
+//                        output will be in Q(-|scaling|)
+//
+// Return value         : The dot product in Q(-scaling)
+int32_t WebRtcSpl_DotProductWithScale(const int16_t* vector1,
+                                      const int16_t* vector2,
+                                      size_t length,
+                                      int scaling);
+
+#ifdef __cplusplus
+}
+#endif  // __cplusplus
+#endif  // COMMON_AUDIO_SIGNAL_PROCESSING_DOT_PRODUCT_WITH_SCALE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/signal_processing_library.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/signal_processing_library.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/signal_processing_library.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/signal_processing_library.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,1635 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+/*
+ * This header file includes all of the fix point signal processing library
+ * (SPL) function descriptions and declarations. For specific function calls,
+ * see bottom of file.
+ */
+
+#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_
+#define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_
+
+#include <string.h>
+
+#include "common_audio/signal_processing/dot_product_with_scale.h"
+
+// Macros specific for the fixed point implementation
+#define WEBRTC_SPL_WORD16_MAX 32767
+#define WEBRTC_SPL_WORD16_MIN -32768
+#define WEBRTC_SPL_WORD32_MAX (int32_t)0x7fffffff
+#define WEBRTC_SPL_WORD32_MIN (int32_t)0x80000000
+#define WEBRTC_SPL_MAX_LPC_ORDER 14
+#define WEBRTC_SPL_MIN(A, B) (A < B ? A : B)  // Get min value
+#define WEBRTC_SPL_MAX(A, B) (A > B ? A : B)  // Get max value
+// TODO(kma/bjorn): For the next two macros, investigate how to correct the code
+// for inputs of a = WEBRTC_SPL_WORD16_MIN or WEBRTC_SPL_WORD32_MIN.
+#define WEBRTC_SPL_ABS_W16(a) (((int16_t)a >= 0) ? ((int16_t)a) : -((int16_t)a))
+#define WEBRTC_SPL_ABS_W32(a) (((int32_t)a >= 0) ? ((int32_t)a) : -((int32_t)a))
+
+#define WEBRTC_SPL_MUL(a, b) ((int32_t)((int32_t)(a) * (int32_t)(b)))
+#define WEBRTC_SPL_UMUL(a, b) ((uint32_t)((uint32_t)(a) * (uint32_t)(b)))
+#define WEBRTC_SPL_UMUL_32_16(a, b) ((uint32_t)((uint32_t)(a) * (uint16_t)(b)))
+#define WEBRTC_SPL_MUL_16_U16(a, b) ((int32_t)(int16_t)(a) * (uint16_t)(b))
+
+// clang-format off
+// clang-format would choose some identation
+// leading to presubmit error (cpplint.py)
+#ifndef WEBRTC_ARCH_ARM_V7
+// For ARMv7 platforms, these are inline functions in spl_inl_armv7.h
+#ifndef MIPS32_LE
+// For MIPS platforms, these are inline functions in spl_inl_mips.h
+#define WEBRTC_SPL_MUL_16_16(a, b) ((int32_t)(((int16_t)(a)) * ((int16_t)(b))))
+#define WEBRTC_SPL_MUL_16_32_RSFT16(a, b) \
+        (WEBRTC_SPL_MUL_16_16(a, b >> 16) +     \
+        ((WEBRTC_SPL_MUL_16_16(a, (b & 0xffff) >> 1) + 0x4000) >> 15))
+#endif
+#endif
+
+#define WEBRTC_SPL_MUL_16_32_RSFT11(a, b)          \
+        (WEBRTC_SPL_MUL_16_16(a, (b) >> 16) * (1 << 5) + \
+        (((WEBRTC_SPL_MUL_16_U16(a, (uint16_t)(b)) >> 1) + 0x0200) >> 10))
+#define WEBRTC_SPL_MUL_16_32_RSFT14(a, b)          \
+        (WEBRTC_SPL_MUL_16_16(a, (b) >> 16) * (1 << 2) + \
+        (((WEBRTC_SPL_MUL_16_U16(a, (uint16_t)(b)) >> 1) + 0x1000) >> 13))
+#define WEBRTC_SPL_MUL_16_32_RSFT15(a, b)            \
+        ((WEBRTC_SPL_MUL_16_16(a, (b) >> 16) * (1 << 1)) + \
+        (((WEBRTC_SPL_MUL_16_U16(a, (uint16_t)(b)) >> 1) + 0x2000) >> 14))
+// clang-format on
+
+#define WEBRTC_SPL_MUL_16_16_RSFT(a, b, c) (WEBRTC_SPL_MUL_16_16(a, b) >> (c))
+
+#define WEBRTC_SPL_MUL_16_16_RSFT_WITH_ROUND(a, b, c) \
+  ((WEBRTC_SPL_MUL_16_16(a, b) + ((int32_t)(((int32_t)1) << ((c)-1)))) >> (c))
+
+// C + the 32 most significant bits of A * B
+#define WEBRTC_SPL_SCALEDIFF32(A, B, C) \
+  (C + (B >> 16) * A + (((uint32_t)(B & 0x0000FFFF) * A) >> 16))
+
+#define WEBRTC_SPL_SAT(a, b, c) (b > a ? a : b < c ? c : b)
+
+// Shifting with negative numbers allowed
+// Positive means left shift
+#define WEBRTC_SPL_SHIFT_W32(x, c) ((c) >= 0 ? (x) * (1 << (c)) : (x) >> -(c))
+
+// Shifting with negative numbers not allowed
+// We cannot do casting here due to signed/unsigned problem
+#define WEBRTC_SPL_LSHIFT_W32(x, c) ((x) << (c))
+
+#define WEBRTC_SPL_RSHIFT_U32(x, c) ((uint32_t)(x) >> (c))
+
+#define WEBRTC_SPL_RAND(a) ((int16_t)((((int16_t)a * 18816) >> 7) & 0x00007fff))
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define WEBRTC_SPL_MEMCPY_W16(v1, v2, length) \
+  memcpy(v1, v2, (length) * sizeof(int16_t))
+
+// inline functions:
+#include "common_audio/signal_processing/include/spl_inl.h"
+
+// third party math functions
+#include "common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h"
+
+int16_t WebRtcSpl_GetScalingSquare(int16_t* in_vector,
+                                   size_t in_vector_length,
+                                   size_t times);
+
+// Copy and set operations. Implementation in copy_set_operations.c.
+// Descriptions at bottom of file.
+void WebRtcSpl_MemSetW16(int16_t* vector,
+                         int16_t set_value,
+                         size_t vector_length);
+void WebRtcSpl_MemSetW32(int32_t* vector,
+                         int32_t set_value,
+                         size_t vector_length);
+void WebRtcSpl_MemCpyReversedOrder(int16_t* out_vector,
+                                   int16_t* in_vector,
+                                   size_t vector_length);
+void WebRtcSpl_CopyFromEndW16(const int16_t* in_vector,
+                              size_t in_vector_length,
+                              size_t samples,
+                              int16_t* out_vector);
+void WebRtcSpl_ZerosArrayW16(int16_t* vector, size_t vector_length);
+void WebRtcSpl_ZerosArrayW32(int32_t* vector, size_t vector_length);
+// End: Copy and set operations.
+
+// Minimum and maximum operation functions and their pointers.
+// Implementation in min_max_operations.c.
+
+// Returns the largest absolute value in a signed 16-bit vector.
+//
+// Input:
+//      - vector : 16-bit input vector.
+//      - length : Number of samples in vector.
+//
+// Return value  : Maximum absolute value in vector.
+typedef int16_t (*MaxAbsValueW16)(const int16_t* vector, size_t length);
+extern const MaxAbsValueW16 WebRtcSpl_MaxAbsValueW16;
+int16_t WebRtcSpl_MaxAbsValueW16C(const int16_t* vector, size_t length);
+#if defined(WEBRTC_HAS_NEON)
+int16_t WebRtcSpl_MaxAbsValueW16Neon(const int16_t* vector, size_t length);
+#endif
+#if defined(MIPS32_LE)
+int16_t WebRtcSpl_MaxAbsValueW16_mips(const int16_t* vector, size_t length);
+#endif
+
+// Returns the largest absolute value in a signed 32-bit vector.
+//
+// Input:
+//      - vector : 32-bit input vector.
+//      - length : Number of samples in vector.
+//
+// Return value  : Maximum absolute value in vector.
+typedef int32_t (*MaxAbsValueW32)(const int32_t* vector, size_t length);
+extern const MaxAbsValueW32 WebRtcSpl_MaxAbsValueW32;
+int32_t WebRtcSpl_MaxAbsValueW32C(const int32_t* vector, size_t length);
+#if defined(WEBRTC_HAS_NEON)
+int32_t WebRtcSpl_MaxAbsValueW32Neon(const int32_t* vector, size_t length);
+#endif
+#if defined(MIPS_DSP_R1_LE)
+int32_t WebRtcSpl_MaxAbsValueW32_mips(const int32_t* vector, size_t length);
+#endif
+
+// Returns the maximum value of a 16-bit vector.
+//
+// Input:
+//      - vector : 16-bit input vector.
+//      - length : Number of samples in vector.
+//
+// Return value  : Maximum sample value in |vector|.
+typedef int16_t (*MaxValueW16)(const int16_t* vector, size_t length);
+extern const MaxValueW16 WebRtcSpl_MaxValueW16;
+int16_t WebRtcSpl_MaxValueW16C(const int16_t* vector, size_t length);
+#if defined(WEBRTC_HAS_NEON)
+int16_t WebRtcSpl_MaxValueW16Neon(const int16_t* vector, size_t length);
+#endif
+#if defined(MIPS32_LE)
+int16_t WebRtcSpl_MaxValueW16_mips(const int16_t* vector, size_t length);
+#endif
+
+// Returns the maximum value of a 32-bit vector.
+//
+// Input:
+//      - vector : 32-bit input vector.
+//      - length : Number of samples in vector.
+//
+// Return value  : Maximum sample value in |vector|.
+typedef int32_t (*MaxValueW32)(const int32_t* vector, size_t length);
+extern const MaxValueW32 WebRtcSpl_MaxValueW32;
+int32_t WebRtcSpl_MaxValueW32C(const int32_t* vector, size_t length);
+#if defined(WEBRTC_HAS_NEON)
+int32_t WebRtcSpl_MaxValueW32Neon(const int32_t* vector, size_t length);
+#endif
+#if defined(MIPS32_LE)
+int32_t WebRtcSpl_MaxValueW32_mips(const int32_t* vector, size_t length);
+#endif
+
+// Returns the minimum value of a 16-bit vector.
+//
+// Input:
+//      - vector : 16-bit input vector.
+//      - length : Number of samples in vector.
+//
+// Return value  : Minimum sample value in |vector|.
+typedef int16_t (*MinValueW16)(const int16_t* vector, size_t length);
+extern const MinValueW16 WebRtcSpl_MinValueW16;
+int16_t WebRtcSpl_MinValueW16C(const int16_t* vector, size_t length);
+#if defined(WEBRTC_HAS_NEON)
+int16_t WebRtcSpl_MinValueW16Neon(const int16_t* vector, size_t length);
+#endif
+#if defined(MIPS32_LE)
+int16_t WebRtcSpl_MinValueW16_mips(const int16_t* vector, size_t length);
+#endif
+
+// Returns the minimum value of a 32-bit vector.
+//
+// Input:
+//      - vector : 32-bit input vector.
+//      - length : Number of samples in vector.
+//
+// Return value  : Minimum sample value in |vector|.
+typedef int32_t (*MinValueW32)(const int32_t* vector, size_t length);
+extern const MinValueW32 WebRtcSpl_MinValueW32;
+int32_t WebRtcSpl_MinValueW32C(const int32_t* vector, size_t length);
+#if defined(WEBRTC_HAS_NEON)
+int32_t WebRtcSpl_MinValueW32Neon(const int32_t* vector, size_t length);
+#endif
+#if defined(MIPS32_LE)
+int32_t WebRtcSpl_MinValueW32_mips(const int32_t* vector, size_t length);
+#endif
+
+// Returns both the minimum and maximum values of a 16-bit vector.
+//
+// Input:
+//      - vector : 16-bit input vector.
+//      - length : Number of samples in vector.
+// Ouput:
+//      - max_val : Maximum sample value in |vector|.
+//      - min_val : Minimum sample value in |vector|.
+void WebRtcSpl_MinMaxW16(const int16_t* vector,
+                         size_t length,
+                         int16_t* min_val,
+                         int16_t* max_val);
+#if defined(WEBRTC_HAS_NEON)
+void WebRtcSpl_MinMaxW16Neon(const int16_t* vector,
+                             size_t length,
+                             int16_t* min_val,
+                             int16_t* max_val);
+#endif
+
+// Returns the vector index to the largest absolute value of a 16-bit vector.
+//
+// Input:
+//      - vector : 16-bit input vector.
+//      - length : Number of samples in vector.
+//
+// Return value  : Index to the maximum absolute value in vector.
+//                 If there are multiple equal maxima, return the index of the
+//                 first. -32768 will always have precedence over 32767 (despite
+//                 -32768 presenting an int16 absolute value of 32767).
+size_t WebRtcSpl_MaxAbsIndexW16(const int16_t* vector, size_t length);
+
+// Returns the element with the largest absolute value of a 16-bit vector. Note
+// that this function can return a negative value.
+//
+// Input:
+//      - vector : 16-bit input vector.
+//      - length : Number of samples in vector.
+//
+// Return value  : The element with the largest absolute value. Note that this
+//                 may be a negative value.
+int16_t WebRtcSpl_MaxAbsElementW16(const int16_t* vector, size_t length);
+
+// Returns the vector index to the maximum sample value of a 16-bit vector.
+//
+// Input:
+//      - vector : 16-bit input vector.
+//      - length : Number of samples in vector.
+//
+// Return value  : Index to the maximum value in vector (if multiple
+//                 indexes have the maximum, return the first).
+size_t WebRtcSpl_MaxIndexW16(const int16_t* vector, size_t length);
+
+// Returns the vector index to the maximum sample value of a 32-bit vector.
+//
+// Input:
+//      - vector : 32-bit input vector.
+//      - length : Number of samples in vector.
+//
+// Return value  : Index to the maximum value in vector (if multiple
+//                 indexes have the maximum, return the first).
+size_t WebRtcSpl_MaxIndexW32(const int32_t* vector, size_t length);
+
+// Returns the vector index to the minimum sample value of a 16-bit vector.
+//
+// Input:
+//      - vector : 16-bit input vector.
+//      - length : Number of samples in vector.
+//
+// Return value  : Index to the mimimum value in vector  (if multiple
+//                 indexes have the minimum, return the first).
+size_t WebRtcSpl_MinIndexW16(const int16_t* vector, size_t length);
+
+// Returns the vector index to the minimum sample value of a 32-bit vector.
+//
+// Input:
+//      - vector : 32-bit input vector.
+//      - length : Number of samples in vector.
+//
+// Return value  : Index to the mimimum value in vector  (if multiple
+//                 indexes have the minimum, return the first).
+size_t WebRtcSpl_MinIndexW32(const int32_t* vector, size_t length);
+
+// End: Minimum and maximum operations.
+
+// Vector scaling operations. Implementation in vector_scaling_operations.c.
+// Description at bottom of file.
+void WebRtcSpl_VectorBitShiftW16(int16_t* out_vector,
+                                 size_t vector_length,
+                                 const int16_t* in_vector,
+                                 int16_t right_shifts);
+void WebRtcSpl_VectorBitShiftW32(int32_t* out_vector,
+                                 size_t vector_length,
+                                 const int32_t* in_vector,
+                                 int16_t right_shifts);
+void WebRtcSpl_VectorBitShiftW32ToW16(int16_t* out_vector,
+                                      size_t vector_length,
+                                      const int32_t* in_vector,
+                                      int right_shifts);
+void WebRtcSpl_ScaleVector(const int16_t* in_vector,
+                           int16_t* out_vector,
+                           int16_t gain,
+                           size_t vector_length,
+                           int16_t right_shifts);
+void WebRtcSpl_ScaleVectorWithSat(const int16_t* in_vector,
+                                  int16_t* out_vector,
+                                  int16_t gain,
+                                  size_t vector_length,
+                                  int16_t right_shifts);
+void WebRtcSpl_ScaleAndAddVectors(const int16_t* in_vector1,
+                                  int16_t gain1,
+                                  int right_shifts1,
+                                  const int16_t* in_vector2,
+                                  int16_t gain2,
+                                  int right_shifts2,
+                                  int16_t* out_vector,
+                                  size_t vector_length);
+
+// The functions (with related pointer) perform the vector operation:
+//   out_vector[k] = ((scale1 * in_vector1[k]) + (scale2 * in_vector2[k])
+//        + round_value) >> right_shifts,
+//   where  round_value = (1 << right_shifts) >> 1.
+//
+// Input:
+//      - in_vector1       : Input vector 1
+//      - in_vector1_scale : Gain to be used for vector 1
+//      - in_vector2       : Input vector 2
+//      - in_vector2_scale : Gain to be used for vector 2
+//      - right_shifts     : Number of right bit shifts to be applied
+//      - length           : Number of elements in the input vectors
+//
+// Output:
+//      - out_vector       : Output vector
+// Return value            : 0 if OK, -1 if (in_vector1 == null
+//                           || in_vector2 == null || out_vector == null
+//                           || length <= 0 || right_shift < 0).
+typedef int (*ScaleAndAddVectorsWithRound)(const int16_t* in_vector1,
+                                           int16_t in_vector1_scale,
+                                           const int16_t* in_vector2,
+                                           int16_t in_vector2_scale,
+                                           int right_shifts,
+                                           int16_t* out_vector,
+                                           size_t length);
+extern const ScaleAndAddVectorsWithRound WebRtcSpl_ScaleAndAddVectorsWithRound;
+int WebRtcSpl_ScaleAndAddVectorsWithRoundC(const int16_t* in_vector1,
+                                           int16_t in_vector1_scale,
+                                           const int16_t* in_vector2,
+                                           int16_t in_vector2_scale,
+                                           int right_shifts,
+                                           int16_t* out_vector,
+                                           size_t length);
+#if defined(MIPS_DSP_R1_LE)
+int WebRtcSpl_ScaleAndAddVectorsWithRound_mips(const int16_t* in_vector1,
+                                               int16_t in_vector1_scale,
+                                               const int16_t* in_vector2,
+                                               int16_t in_vector2_scale,
+                                               int right_shifts,
+                                               int16_t* out_vector,
+                                               size_t length);
+#endif
+// End: Vector scaling operations.
+
+// iLBC specific functions. Implementations in ilbc_specific_functions.c.
+// Description at bottom of file.
+void WebRtcSpl_ReverseOrderMultArrayElements(int16_t* out_vector,
+                                             const int16_t* in_vector,
+                                             const int16_t* window,
+                                             size_t vector_length,
+                                             int16_t right_shifts);
+void WebRtcSpl_ElementwiseVectorMult(int16_t* out_vector,
+                                     const int16_t* in_vector,
+                                     const int16_t* window,
+                                     size_t vector_length,
+                                     int16_t right_shifts);
+void WebRtcSpl_AddVectorsAndShift(int16_t* out_vector,
+                                  const int16_t* in_vector1,
+                                  const int16_t* in_vector2,
+                                  size_t vector_length,
+                                  int16_t right_shifts);
+void WebRtcSpl_AddAffineVectorToVector(int16_t* out_vector,
+                                       const int16_t* in_vector,
+                                       int16_t gain,
+                                       int32_t add_constant,
+                                       int16_t right_shifts,
+                                       size_t vector_length);
+void WebRtcSpl_AffineTransformVector(int16_t* out_vector,
+                                     const int16_t* in_vector,
+                                     int16_t gain,
+                                     int32_t add_constant,
+                                     int16_t right_shifts,
+                                     size_t vector_length);
+// End: iLBC specific functions.
+
+// Signal processing operations.
+
+// A 32-bit fix-point implementation of auto-correlation computation
+//
+// Input:
+//      - in_vector        : Vector to calculate autocorrelation upon
+//      - in_vector_length : Length (in samples) of |vector|
+//      - order            : The order up to which the autocorrelation should be
+//                           calculated
+//
+// Output:
+//      - result           : auto-correlation values (values should be seen
+//                           relative to each other since the absolute values
+//                           might have been down shifted to avoid overflow)
+//
+//      - scale            : The number of left shifts required to obtain the
+//                           auto-correlation in Q0
+//
+// Return value            : Number of samples in |result|, i.e. (order+1)
+size_t WebRtcSpl_AutoCorrelation(const int16_t* in_vector,
+                                 size_t in_vector_length,
+                                 size_t order,
+                                 int32_t* result,
+                                 int* scale);
+
+// A 32-bit fix-point implementation of the Levinson-Durbin algorithm that
+// does NOT use the 64 bit class
+//
+// Input:
+//      - auto_corr : Vector with autocorrelation values of length >= |order|+1
+//      - order     : The LPC filter order (support up to order 20)
+//
+// Output:
+//      - lpc_coef  : lpc_coef[0..order] LPC coefficients in Q12
+//      - refl_coef : refl_coef[0...order-1]| Reflection coefficients in Q15
+//
+// Return value     : 1 for stable 0 for unstable
+int16_t WebRtcSpl_LevinsonDurbin(const int32_t* auto_corr,
+                                 int16_t* lpc_coef,
+                                 int16_t* refl_coef,
+                                 size_t order);
+
+// Converts reflection coefficients |refl_coef| to LPC coefficients |lpc_coef|.
+// This version is a 16 bit operation.
+//
+// NOTE: The 16 bit refl_coef -> lpc_coef conversion might result in a
+// "slightly unstable" filter (i.e., a pole just outside the unit circle) in
+// "rare" cases even if the reflection coefficients are stable.
+//
+// Input:
+//      - refl_coef : Reflection coefficients in Q15 that should be converted
+//                    to LPC coefficients
+//      - use_order : Number of coefficients in |refl_coef|
+//
+// Output:
+//      - lpc_coef  : LPC coefficients in Q12
+void WebRtcSpl_ReflCoefToLpc(const int16_t* refl_coef,
+                             int use_order,
+                             int16_t* lpc_coef);
+
+// Converts LPC coefficients |lpc_coef| to reflection coefficients |refl_coef|.
+// This version is a 16 bit operation.
+// The conversion is implemented by the step-down algorithm.
+//
+// Input:
+//      - lpc_coef  : LPC coefficients in Q12, that should be converted to
+//                    reflection coefficients
+//      - use_order : Number of coefficients in |lpc_coef|
+//
+// Output:
+//      - refl_coef : Reflection coefficients in Q15.
+void WebRtcSpl_LpcToReflCoef(int16_t* lpc_coef,
+                             int use_order,
+                             int16_t* refl_coef);
+
+// Calculates reflection coefficients (16 bit) from auto-correlation values
+//
+// Input:
+//      - auto_corr : Auto-correlation values
+//      - use_order : Number of coefficients wanted be calculated
+//
+// Output:
+//      - refl_coef : Reflection coefficients in Q15.
+void WebRtcSpl_AutoCorrToReflCoef(const int32_t* auto_corr,
+                                  int use_order,
+                                  int16_t* refl_coef);
+
+// The functions (with related pointer) calculate the cross-correlation between
+// two sequences |seq1| and |seq2|.
+// |seq1| is fixed and |seq2| slides as the pointer is increased with the
+// amount |step_seq2|. Note the arguments should obey the relationship:
+// |dim_seq| - 1 + |step_seq2| * (|dim_cross_correlation| - 1) <
+//      buffer size of |seq2|
+//
+// Input:
+//      - seq1           : First sequence (fixed throughout the correlation)
+//      - seq2           : Second sequence (slides |step_vector2| for each
+//                            new correlation)
+//      - dim_seq        : Number of samples to use in the cross-correlation
+//      - dim_cross_correlation : Number of cross-correlations to calculate (the
+//                            start position for |vector2| is updated for each
+//                            new one)
+//      - right_shifts   : Number of right bit shifts to use. This will
+//                            become the output Q-domain.
+//      - step_seq2      : How many (positive or negative) steps the
+//                            |vector2| pointer should be updated for each new
+//                            cross-correlation value.
+//
+// Output:
+//      - cross_correlation : The cross-correlation in Q(-right_shifts)
+typedef void (*CrossCorrelation)(int32_t* cross_correlation,
+                                 const int16_t* seq1,
+                                 const int16_t* seq2,
+                                 size_t dim_seq,
+                                 size_t dim_cross_correlation,
+                                 int right_shifts,
+                                 int step_seq2);
+extern const CrossCorrelation WebRtcSpl_CrossCorrelation;
+void WebRtcSpl_CrossCorrelationC(int32_t* cross_correlation,
+                                 const int16_t* seq1,
+                                 const int16_t* seq2,
+                                 size_t dim_seq,
+                                 size_t dim_cross_correlation,
+                                 int right_shifts,
+                                 int step_seq2);
+#if defined(WEBRTC_HAS_NEON)
+void WebRtcSpl_CrossCorrelationNeon(int32_t* cross_correlation,
+                                    const int16_t* seq1,
+                                    const int16_t* seq2,
+                                    size_t dim_seq,
+                                    size_t dim_cross_correlation,
+                                    int right_shifts,
+                                    int step_seq2);
+#endif
+#if defined(MIPS32_LE)
+void WebRtcSpl_CrossCorrelation_mips(int32_t* cross_correlation,
+                                     const int16_t* seq1,
+                                     const int16_t* seq2,
+                                     size_t dim_seq,
+                                     size_t dim_cross_correlation,
+                                     int right_shifts,
+                                     int step_seq2);
+#endif
+
+// Creates (the first half of) a Hanning window. Size must be at least 1 and
+// at most 512.
+//
+// Input:
+//      - size      : Length of the requested Hanning window (1 to 512)
+//
+// Output:
+//      - window    : Hanning vector in Q14.
+void WebRtcSpl_GetHanningWindow(int16_t* window, size_t size);
+
+// Calculates y[k] = sqrt(1 - x[k]^2) for each element of the input vector
+// |in_vector|. Input and output values are in Q15.
+//
+// Inputs:
+//      - in_vector     : Values to calculate sqrt(1 - x^2) of
+//      - vector_length : Length of vector |in_vector|
+//
+// Output:
+//      - out_vector    : Output values in Q15
+void WebRtcSpl_SqrtOfOneMinusXSquared(int16_t* in_vector,
+                                      size_t vector_length,
+                                      int16_t* out_vector);
+// End: Signal processing operations.
+
+// Randomization functions. Implementations collected in
+// randomization_functions.c and descriptions at bottom of this file.
+int16_t WebRtcSpl_RandU(uint32_t* seed);
+int16_t WebRtcSpl_RandN(uint32_t* seed);
+int16_t WebRtcSpl_RandUArray(int16_t* vector,
+                             int16_t vector_length,
+                             uint32_t* seed);
+// End: Randomization functions.
+
+// Math functions
+int32_t WebRtcSpl_Sqrt(int32_t value);
+
+// Divisions. Implementations collected in division_operations.c and
+// descriptions at bottom of this file.
+uint32_t WebRtcSpl_DivU32U16(uint32_t num, uint16_t den);
+int32_t WebRtcSpl_DivW32W16(int32_t num, int16_t den);
+int16_t WebRtcSpl_DivW32W16ResW16(int32_t num, int16_t den);
+int32_t WebRtcSpl_DivResultInQ31(int32_t num, int32_t den);
+int32_t WebRtcSpl_DivW32HiLow(int32_t num, int16_t den_hi, int16_t den_low);
+// End: Divisions.
+
+int32_t WebRtcSpl_Energy(int16_t* vector,
+                         size_t vector_length,
+                         int* scale_factor);
+
+// Filter operations.
+size_t WebRtcSpl_FilterAR(const int16_t* ar_coef,
+                          size_t ar_coef_length,
+                          const int16_t* in_vector,
+                          size_t in_vector_length,
+                          int16_t* filter_state,
+                          size_t filter_state_length,
+                          int16_t* filter_state_low,
+                          size_t filter_state_low_length,
+                          int16_t* out_vector,
+                          int16_t* out_vector_low,
+                          size_t out_vector_low_length);
+
+// WebRtcSpl_FilterMAFastQ12(...)
+//
+// Performs a MA filtering on a vector in Q12
+//
+// Input:
+//      - in_vector         : Input samples (state in positions
+//                            in_vector[-order] .. in_vector[-1])
+//      - ma_coef           : Filter coefficients (in Q12)
+//      - ma_coef_length    : Number of B coefficients (order+1)
+//      - vector_length     : Number of samples to be filtered
+//
+// Output:
+//      - out_vector        : Filtered samples
+//
+void WebRtcSpl_FilterMAFastQ12(const int16_t* in_vector,
+                               int16_t* out_vector,
+                               const int16_t* ma_coef,
+                               size_t ma_coef_length,
+                               size_t vector_length);
+
+// Performs a AR filtering on a vector in Q12
+// Input:
+//      - data_in            : Input samples
+//      - data_out           : State information in positions
+//                               data_out[-order] .. data_out[-1]
+//      - coefficients       : Filter coefficients (in Q12)
+//      - coefficients_length: Number of coefficients (order+1)
+//      - data_length        : Number of samples to be filtered
+// Output:
+//      - data_out           : Filtered samples
+void WebRtcSpl_FilterARFastQ12(const int16_t* data_in,
+                               int16_t* data_out,
+                               const int16_t* __restrict coefficients,
+                               size_t coefficients_length,
+                               size_t data_length);
+
+// The functions (with related pointer) perform a MA down sampling filter
+// on a vector.
+// Input:
+//      - data_in            : Input samples (state in positions
+//                               data_in[-order] .. data_in[-1])
+//      - data_in_length     : Number of samples in |data_in| to be filtered.
+//                               This must be at least
+//                               |delay| + |factor|*(|out_vector_length|-1) + 1)
+//      - data_out_length    : Number of down sampled samples desired
+//      - coefficients       : Filter coefficients (in Q12)
+//      - coefficients_length: Number of coefficients (order+1)
+//      - factor             : Decimation factor
+//      - delay              : Delay of filter (compensated for in out_vector)
+// Output:
+//      - data_out           : Filtered samples
+// Return value              : 0 if OK, -1 if |in_vector| is too short
+typedef int (*DownsampleFast)(const int16_t* data_in,
+                              size_t data_in_length,
+                              int16_t* data_out,
+                              size_t data_out_length,
+                              const int16_t* __restrict coefficients,
+                              size_t coefficients_length,
+                              int factor,
+                              size_t delay);
+extern const DownsampleFast WebRtcSpl_DownsampleFast;
+int WebRtcSpl_DownsampleFastC(const int16_t* data_in,
+                              size_t data_in_length,
+                              int16_t* data_out,
+                              size_t data_out_length,
+                              const int16_t* __restrict coefficients,
+                              size_t coefficients_length,
+                              int factor,
+                              size_t delay);
+#if defined(WEBRTC_HAS_NEON)
+int WebRtcSpl_DownsampleFastNeon(const int16_t* data_in,
+                                 size_t data_in_length,
+                                 int16_t* data_out,
+                                 size_t data_out_length,
+                                 const int16_t* __restrict coefficients,
+                                 size_t coefficients_length,
+                                 int factor,
+                                 size_t delay);
+#endif
+#if defined(MIPS32_LE)
+int WebRtcSpl_DownsampleFast_mips(const int16_t* data_in,
+                                  size_t data_in_length,
+                                  int16_t* data_out,
+                                  size_t data_out_length,
+                                  const int16_t* __restrict coefficients,
+                                  size_t coefficients_length,
+                                  int factor,
+                                  size_t delay);
+#endif
+
+// End: Filter operations.
+
+// FFT operations
+
+int WebRtcSpl_ComplexFFT(int16_t vector[], int stages, int mode);
+int WebRtcSpl_ComplexIFFT(int16_t vector[], int stages, int mode);
+
+// Treat a 16-bit complex data buffer |complex_data| as an array of 32-bit
+// values, and swap elements whose indexes are bit-reverses of each other.
+//
+// Input:
+//      - complex_data  : Complex data buffer containing 2^|stages| real
+//                        elements interleaved with 2^|stages| imaginary
+//                        elements: [Re Im Re Im Re Im....]
+//      - stages        : Number of FFT stages. Must be at least 3 and at most
+//                        10, since the table WebRtcSpl_kSinTable1024[] is 1024
+//                        elements long.
+//
+// Output:
+//      - complex_data  : The complex data buffer.
+
+void WebRtcSpl_ComplexBitReverse(int16_t* __restrict complex_data, int stages);
+
+// End: FFT operations
+
+/************************************************************
+ *
+ * RESAMPLING FUNCTIONS AND THEIR STRUCTS ARE DEFINED BELOW
+ *
+ ************************************************************/
+
+/*******************************************************************
+ * resample.c
+ *
+ * Includes the following resampling combinations
+ * 22 kHz -> 16 kHz
+ * 16 kHz -> 22 kHz
+ * 22 kHz ->  8 kHz
+ *  8 kHz -> 22 kHz
+ *
+ ******************************************************************/
+
+// state structure for 22 -> 16 resampler
+typedef struct {
+  int32_t S_22_44[8];
+  int32_t S_44_32[8];
+  int32_t S_32_16[8];
+} WebRtcSpl_State22khzTo16khz;
+
+void WebRtcSpl_Resample22khzTo16khz(const int16_t* in,
+                                    int16_t* out,
+                                    WebRtcSpl_State22khzTo16khz* state,
+                                    int32_t* tmpmem);
+
+void WebRtcSpl_ResetResample22khzTo16khz(WebRtcSpl_State22khzTo16khz* state);
+
+// state structure for 16 -> 22 resampler
+typedef struct {
+  int32_t S_16_32[8];
+  int32_t S_32_22[8];
+} WebRtcSpl_State16khzTo22khz;
+
+void WebRtcSpl_Resample16khzTo22khz(const int16_t* in,
+                                    int16_t* out,
+                                    WebRtcSpl_State16khzTo22khz* state,
+                                    int32_t* tmpmem);
+
+void WebRtcSpl_ResetResample16khzTo22khz(WebRtcSpl_State16khzTo22khz* state);
+
+// state structure for 22 -> 8 resampler
+typedef struct {
+  int32_t S_22_22[16];
+  int32_t S_22_16[8];
+  int32_t S_16_8[8];
+} WebRtcSpl_State22khzTo8khz;
+
+void WebRtcSpl_Resample22khzTo8khz(const int16_t* in,
+                                   int16_t* out,
+                                   WebRtcSpl_State22khzTo8khz* state,
+                                   int32_t* tmpmem);
+
+void WebRtcSpl_ResetResample22khzTo8khz(WebRtcSpl_State22khzTo8khz* state);
+
+// state structure for 8 -> 22 resampler
+typedef struct {
+  int32_t S_8_16[8];
+  int32_t S_16_11[8];
+  int32_t S_11_22[8];
+} WebRtcSpl_State8khzTo22khz;
+
+void WebRtcSpl_Resample8khzTo22khz(const int16_t* in,
+                                   int16_t* out,
+                                   WebRtcSpl_State8khzTo22khz* state,
+                                   int32_t* tmpmem);
+
+void WebRtcSpl_ResetResample8khzTo22khz(WebRtcSpl_State8khzTo22khz* state);
+
+/*******************************************************************
+ * resample_fractional.c
+ * Functions for internal use in the other resample functions
+ *
+ * Includes the following resampling combinations
+ * 48 kHz -> 32 kHz
+ * 32 kHz -> 24 kHz
+ * 44 kHz -> 32 kHz
+ *
+ ******************************************************************/
+
+void WebRtcSpl_Resample48khzTo32khz(const int32_t* In, int32_t* Out, size_t K);
+
+void WebRtcSpl_Resample32khzTo24khz(const int32_t* In, int32_t* Out, size_t K);
+
+void WebRtcSpl_Resample44khzTo32khz(const int32_t* In, int32_t* Out, size_t K);
+
+/*******************************************************************
+ * resample_48khz.c
+ *
+ * Includes the following resampling combinations
+ * 48 kHz -> 16 kHz
+ * 16 kHz -> 48 kHz
+ * 48 kHz ->  8 kHz
+ *  8 kHz -> 48 kHz
+ *
+ ******************************************************************/
+
+typedef struct {
+  int32_t S_48_48[16];
+  int32_t S_48_32[8];
+  int32_t S_32_16[8];
+} WebRtcSpl_State48khzTo16khz;
+
+void WebRtcSpl_Resample48khzTo16khz(const int16_t* in,
+                                    int16_t* out,
+                                    WebRtcSpl_State48khzTo16khz* state,
+                                    int32_t* tmpmem);
+
+void WebRtcSpl_ResetResample48khzTo16khz(WebRtcSpl_State48khzTo16khz* state);
+
+typedef struct {
+  int32_t S_16_32[8];
+  int32_t S_32_24[8];
+  int32_t S_24_48[8];
+} WebRtcSpl_State16khzTo48khz;
+
+void WebRtcSpl_Resample16khzTo48khz(const int16_t* in,
+                                    int16_t* out,
+                                    WebRtcSpl_State16khzTo48khz* state,
+                                    int32_t* tmpmem);
+
+void WebRtcSpl_ResetResample16khzTo48khz(WebRtcSpl_State16khzTo48khz* state);
+
+typedef struct {
+  int32_t S_48_24[8];
+  int32_t S_24_24[16];
+  int32_t S_24_16[8];
+  int32_t S_16_8[8];
+} WebRtcSpl_State48khzTo8khz;
+
+void WebRtcSpl_Resample48khzTo8khz(const int16_t* in,
+                                   int16_t* out,
+                                   WebRtcSpl_State48khzTo8khz* state,
+                                   int32_t* tmpmem);
+
+void WebRtcSpl_ResetResample48khzTo8khz(WebRtcSpl_State48khzTo8khz* state);
+
+typedef struct {
+  int32_t S_8_16[8];
+  int32_t S_16_12[8];
+  int32_t S_12_24[8];
+  int32_t S_24_48[8];
+} WebRtcSpl_State8khzTo48khz;
+
+void WebRtcSpl_Resample8khzTo48khz(const int16_t* in,
+                                   int16_t* out,
+                                   WebRtcSpl_State8khzTo48khz* state,
+                                   int32_t* tmpmem);
+
+void WebRtcSpl_ResetResample8khzTo48khz(WebRtcSpl_State8khzTo48khz* state);
+
+/*******************************************************************
+ * resample_by_2.c
+ *
+ * Includes down and up sampling by a factor of two.
+ *
+ ******************************************************************/
+
+void WebRtcSpl_DownsampleBy2(const int16_t* in,
+                             size_t len,
+                             int16_t* out,
+                             int32_t* filtState);
+
+void WebRtcSpl_UpsampleBy2(const int16_t* in,
+                           size_t len,
+                           int16_t* out,
+                           int32_t* filtState);
+
+/************************************************************
+ * END OF RESAMPLING FUNCTIONS
+ ************************************************************/
+void WebRtcSpl_AnalysisQMF(const int16_t* in_data,
+                           size_t in_data_length,
+                           int16_t* low_band,
+                           int16_t* high_band,
+                           int32_t* filter_state1,
+                           int32_t* filter_state2);
+void WebRtcSpl_SynthesisQMF(const int16_t* low_band,
+                            const int16_t* high_band,
+                            size_t band_length,
+                            int16_t* out_data,
+                            int32_t* filter_state1,
+                            int32_t* filter_state2);
+
+#ifdef __cplusplus
+}
+#endif  // __cplusplus
+#endif  // COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SIGNAL_PROCESSING_LIBRARY_H_
+
+//
+// WebRtcSpl_AddSatW16(...)
+// WebRtcSpl_AddSatW32(...)
+//
+// Returns the result of a saturated 16-bit, respectively 32-bit, addition of
+// the numbers specified by the |var1| and |var2| parameters.
+//
+// Input:
+//      - var1      : Input variable 1
+//      - var2      : Input variable 2
+//
+// Return value     : Added and saturated value
+//
+
+//
+// WebRtcSpl_SubSatW16(...)
+// WebRtcSpl_SubSatW32(...)
+//
+// Returns the result of a saturated 16-bit, respectively 32-bit, subtraction
+// of the numbers specified by the |var1| and |var2| parameters.
+//
+// Input:
+//      - var1      : Input variable 1
+//      - var2      : Input variable 2
+//
+// Returned value   : Subtracted and saturated value
+//
+
+//
+// WebRtcSpl_GetSizeInBits(...)
+//
+// Returns the # of bits that are needed at the most to represent the number
+// specified by the |value| parameter.
+//
+// Input:
+//      - value     : Input value
+//
+// Return value     : Number of bits needed to represent |value|
+//
+
+//
+// WebRtcSpl_NormW32(...)
+//
+// Norm returns the # of left shifts required to 32-bit normalize the 32-bit
+// signed number specified by the |value| parameter.
+//
+// Input:
+//      - value     : Input value
+//
+// Return value     : Number of bit shifts needed to 32-bit normalize |value|
+//
+
+//
+// WebRtcSpl_NormW16(...)
+//
+// Norm returns the # of left shifts required to 16-bit normalize the 16-bit
+// signed number specified by the |value| parameter.
+//
+// Input:
+//      - value     : Input value
+//
+// Return value     : Number of bit shifts needed to 32-bit normalize |value|
+//
+
+//
+// WebRtcSpl_NormU32(...)
+//
+// Norm returns the # of left shifts required to 32-bit normalize the unsigned
+// 32-bit number specified by the |value| parameter.
+//
+// Input:
+//      - value     : Input value
+//
+// Return value     : Number of bit shifts needed to 32-bit normalize |value|
+//
+
+//
+// WebRtcSpl_GetScalingSquare(...)
+//
+// Returns the # of bits required to scale the samples specified in the
+// |in_vector| parameter so that, if the squares of the samples are added the
+// # of times specified by the |times| parameter, the 32-bit addition will not
+// overflow (result in int32_t).
+//
+// Input:
+//      - in_vector         : Input vector to check scaling on
+//      - in_vector_length  : Samples in |in_vector|
+//      - times             : Number of additions to be performed
+//
+// Return value             : Number of right bit shifts needed to avoid
+//                            overflow in the addition calculation
+//
+
+//
+// WebRtcSpl_MemSetW16(...)
+//
+// Sets all the values in the int16_t vector |vector| of length
+// |vector_length| to the specified value |set_value|
+//
+// Input:
+//      - vector        : Pointer to the int16_t vector
+//      - set_value     : Value specified
+//      - vector_length : Length of vector
+//
+
+//
+// WebRtcSpl_MemSetW32(...)
+//
+// Sets all the values in the int32_t vector |vector| of length
+// |vector_length| to the specified value |set_value|
+//
+// Input:
+//      - vector        : Pointer to the int16_t vector
+//      - set_value     : Value specified
+//      - vector_length : Length of vector
+//
+
+//
+// WebRtcSpl_MemCpyReversedOrder(...)
+//
+// Copies all the values from the source int16_t vector |in_vector| to a
+// destination int16_t vector |out_vector|. It is done in reversed order,
+// meaning that the first sample of |in_vector| is copied to the last sample of
+// the |out_vector|. The procedure continues until the last sample of
+// |in_vector| has been copied to the first sample of |out_vector|. This
+// creates a reversed vector. Used in e.g. prediction in iLBC.
+//
+// Input:
+//      - in_vector     : Pointer to the first sample in a int16_t vector
+//                        of length |length|
+//      - vector_length : Number of elements to copy
+//
+// Output:
+//      - out_vector    : Pointer to the last sample in a int16_t vector
+//                        of length |length|
+//
+
+//
+// WebRtcSpl_CopyFromEndW16(...)
+//
+// Copies the rightmost |samples| of |in_vector| (of length |in_vector_length|)
+// to the vector |out_vector|.
+//
+// Input:
+//      - in_vector         : Input vector
+//      - in_vector_length  : Number of samples in |in_vector|
+//      - samples           : Number of samples to extract (from right side)
+//                            from |in_vector|
+//
+// Output:
+//      - out_vector        : Vector with the requested samples
+//
+
+//
+// WebRtcSpl_ZerosArrayW16(...)
+// WebRtcSpl_ZerosArrayW32(...)
+//
+// Inserts the value "zero" in all positions of a w16 and a w32 vector
+// respectively.
+//
+// Input:
+//      - vector_length : Number of samples in vector
+//
+// Output:
+//      - vector        : Vector containing all zeros
+//
+
+//
+// WebRtcSpl_VectorBitShiftW16(...)
+// WebRtcSpl_VectorBitShiftW32(...)
+//
+// Bit shifts all the values in a vector up or downwards. Different calls for
+// int16_t and int32_t vectors respectively.
+//
+// Input:
+//      - vector_length : Length of vector
+//      - in_vector     : Pointer to the vector that should be bit shifted
+//      - right_shifts  : Number of right bit shifts (negative value gives left
+//                        shifts)
+//
+// Output:
+//      - out_vector    : Pointer to the result vector (can be the same as
+//                        |in_vector|)
+//
+
+//
+// WebRtcSpl_VectorBitShiftW32ToW16(...)
+//
+// Bit shifts all the values in a int32_t vector up or downwards and
+// stores the result as an int16_t vector. The function will saturate the
+// signal if needed, before storing in the output vector.
+//
+// Input:
+//      - vector_length : Length of vector
+//      - in_vector     : Pointer to the vector that should be bit shifted
+//      - right_shifts  : Number of right bit shifts (negative value gives left
+//                        shifts)
+//
+// Output:
+//      - out_vector    : Pointer to the result vector (can be the same as
+//                        |in_vector|)
+//
+
+//
+// WebRtcSpl_ScaleVector(...)
+//
+// Performs the vector operation:
+//  out_vector[k] = (gain*in_vector[k])>>right_shifts
+//
+// Input:
+//      - in_vector     : Input vector
+//      - gain          : Scaling gain
+//      - vector_length : Elements in the |in_vector|
+//      - right_shifts  : Number of right bit shifts applied
+//
+// Output:
+//      - out_vector    : Output vector (can be the same as |in_vector|)
+//
+
+//
+// WebRtcSpl_ScaleVectorWithSat(...)
+//
+// Performs the vector operation:
+//  out_vector[k] = SATURATE( (gain*in_vector[k])>>right_shifts )
+//
+// Input:
+//      - in_vector     : Input vector
+//      - gain          : Scaling gain
+//      - vector_length : Elements in the |in_vector|
+//      - right_shifts  : Number of right bit shifts applied
+//
+// Output:
+//      - out_vector    : Output vector (can be the same as |in_vector|)
+//
+
+//
+// WebRtcSpl_ScaleAndAddVectors(...)
+//
+// Performs the vector operation:
+//  out_vector[k] = (gain1*in_vector1[k])>>right_shifts1
+//                  + (gain2*in_vector2[k])>>right_shifts2
+//
+// Input:
+//      - in_vector1    : Input vector 1
+//      - gain1         : Gain to be used for vector 1
+//      - right_shifts1 : Right bit shift to be used for vector 1
+//      - in_vector2    : Input vector 2
+//      - gain2         : Gain to be used for vector 2
+//      - right_shifts2 : Right bit shift to be used for vector 2
+//      - vector_length : Elements in the input vectors
+//
+// Output:
+//      - out_vector    : Output vector
+//
+
+//
+// WebRtcSpl_ReverseOrderMultArrayElements(...)
+//
+// Performs the vector operation:
+//  out_vector[n] = (in_vector[n]*window[-n])>>right_shifts
+//
+// Input:
+//      - in_vector     : Input vector
+//      - window        : Window vector (should be reversed). The pointer
+//                        should be set to the last value in the vector
+//      - right_shifts  : Number of right bit shift to be applied after the
+//                        multiplication
+//      - vector_length : Number of elements in |in_vector|
+//
+// Output:
+//      - out_vector    : Output vector (can be same as |in_vector|)
+//
+
+//
+// WebRtcSpl_ElementwiseVectorMult(...)
+//
+// Performs the vector operation:
+//  out_vector[n] = (in_vector[n]*window[n])>>right_shifts
+//
+// Input:
+//      - in_vector     : Input vector
+//      - window        : Window vector.
+//      - right_shifts  : Number of right bit shift to be applied after the
+//                        multiplication
+//      - vector_length : Number of elements in |in_vector|
+//
+// Output:
+//      - out_vector    : Output vector (can be same as |in_vector|)
+//
+
+//
+// WebRtcSpl_AddVectorsAndShift(...)
+//
+// Performs the vector operation:
+//  out_vector[k] = (in_vector1[k] + in_vector2[k])>>right_shifts
+//
+// Input:
+//      - in_vector1    : Input vector 1
+//      - in_vector2    : Input vector 2
+//      - right_shifts  : Number of right bit shift to be applied after the
+//                        multiplication
+//      - vector_length : Number of elements in |in_vector1| and |in_vector2|
+//
+// Output:
+//      - out_vector    : Output vector (can be same as |in_vector1|)
+//
+
+//
+// WebRtcSpl_AddAffineVectorToVector(...)
+//
+// Adds an affine transformed vector to another vector |out_vector|, i.e,
+// performs
+//  out_vector[k] += (in_vector[k]*gain+add_constant)>>right_shifts
+//
+// Input:
+//      - in_vector     : Input vector
+//      - gain          : Gain value, used to multiply the in vector with
+//      - add_constant  : Constant value to add (usually 1<<(right_shifts-1),
+//                        but others can be used as well
+//      - right_shifts  : Number of right bit shifts (0-16)
+//      - vector_length : Number of samples in |in_vector| and |out_vector|
+//
+// Output:
+//      - out_vector    : Vector with the output
+//
+
+//
+// WebRtcSpl_AffineTransformVector(...)
+//
+// Affine transforms a vector, i.e, performs
+//  out_vector[k] = (in_vector[k]*gain+add_constant)>>right_shifts
+//
+// Input:
+//      - in_vector     : Input vector
+//      - gain          : Gain value, used to multiply the in vector with
+//      - add_constant  : Constant value to add (usually 1<<(right_shifts-1),
+//                        but others can be used as well
+//      - right_shifts  : Number of right bit shifts (0-16)
+//      - vector_length : Number of samples in |in_vector| and |out_vector|
+//
+// Output:
+//      - out_vector    : Vector with the output
+//
+
+//
+// WebRtcSpl_IncreaseSeed(...)
+//
+// Increases the seed (and returns the new value)
+//
+// Input:
+//      - seed      : Seed for random calculation
+//
+// Output:
+//      - seed      : Updated seed value
+//
+// Return value     : The new seed value
+//
+
+//
+// WebRtcSpl_RandU(...)
+//
+// Produces a uniformly distributed value in the int16_t range
+//
+// Input:
+//      - seed      : Seed for random calculation
+//
+// Output:
+//      - seed      : Updated seed value
+//
+// Return value     : Uniformly distributed value in the range
+//                    [Word16_MIN...Word16_MAX]
+//
+
+//
+// WebRtcSpl_RandN(...)
+//
+// Produces a normal distributed value in the int16_t range
+//
+// Input:
+//      - seed      : Seed for random calculation
+//
+// Output:
+//      - seed      : Updated seed value
+//
+// Return value     : N(0,1) value in the Q13 domain
+//
+
+//
+// WebRtcSpl_RandUArray(...)
+//
+// Produces a uniformly distributed vector with elements in the int16_t
+// range
+//
+// Input:
+//      - vector_length : Samples wanted in the vector
+//      - seed          : Seed for random calculation
+//
+// Output:
+//      - vector        : Vector with the uniform values
+//      - seed          : Updated seed value
+//
+// Return value         : Number of samples in vector, i.e., |vector_length|
+//
+
+//
+// WebRtcSpl_Sqrt(...)
+//
+// Returns the square root of the input value |value|. The precision of this
+// function is integer precision, i.e., sqrt(8) gives 2 as answer.
+// If |value| is a negative number then 0 is returned.
+//
+// Algorithm:
+//
+// A sixth order Taylor Series expansion is used here to compute the square
+// root of a number y^0.5 = (1+x)^0.5
+// where
+// x = y-1
+//   = 1+(x/2)-0.5*((x/2)^2+0.5*((x/2)^3-0.625*((x/2)^4+0.875*((x/2)^5)
+// 0.5 <= x < 1
+//
+// Input:
+//      - value     : Value to calculate sqrt of
+//
+// Return value     : Result of the sqrt calculation
+//
+
+//
+// WebRtcSpl_DivU32U16(...)
+//
+// Divides a uint32_t |num| by a uint16_t |den|.
+//
+// If |den|==0, (uint32_t)0xFFFFFFFF is returned.
+//
+// Input:
+//      - num       : Numerator
+//      - den       : Denominator
+//
+// Return value     : Result of the division (as a uint32_t), i.e., the
+//                    integer part of num/den.
+//
+
+//
+// WebRtcSpl_DivW32W16(...)
+//
+// Divides a int32_t |num| by a int16_t |den|.
+//
+// If |den|==0, (int32_t)0x7FFFFFFF is returned.
+//
+// Input:
+//      - num       : Numerator
+//      - den       : Denominator
+//
+// Return value     : Result of the division (as a int32_t), i.e., the
+//                    integer part of num/den.
+//
+
+//
+// WebRtcSpl_DivW32W16ResW16(...)
+//
+// Divides a int32_t |num| by a int16_t |den|, assuming that the
+// result is less than 32768, otherwise an unpredictable result will occur.
+//
+// If |den|==0, (int16_t)0x7FFF is returned.
+//
+// Input:
+//      - num       : Numerator
+//      - den       : Denominator
+//
+// Return value     : Result of the division (as a int16_t), i.e., the
+//                    integer part of num/den.
+//
+
+//
+// WebRtcSpl_DivResultInQ31(...)
+//
+// Divides a int32_t |num| by a int16_t |den|, assuming that the
+// absolute value of the denominator is larger than the numerator, otherwise
+// an unpredictable result will occur.
+//
+// Input:
+//      - num       : Numerator
+//      - den       : Denominator
+//
+// Return value     : Result of the division in Q31.
+//
+
+//
+// WebRtcSpl_DivW32HiLow(...)
+//
+// Divides a int32_t |num| by a denominator in hi, low format. The
+// absolute value of the denominator has to be larger (or equal to) the
+// numerator.
+//
+// Input:
+//      - num       : Numerator
+//      - den_hi    : High part of denominator
+//      - den_low   : Low part of denominator
+//
+// Return value     : Divided value in Q31
+//
+
+//
+// WebRtcSpl_Energy(...)
+//
+// Calculates the energy of a vector
+//
+// Input:
+//      - vector        : Vector which the energy should be calculated on
+//      - vector_length : Number of samples in vector
+//
+// Output:
+//      - scale_factor  : Number of left bit shifts needed to get the physical
+//                        energy value, i.e, to get the Q0 value
+//
+// Return value         : Energy value in Q(-|scale_factor|)
+//
+
+//
+// WebRtcSpl_FilterAR(...)
+//
+// Performs a 32-bit AR filtering on a vector in Q12
+//
+// Input:
+//  - ar_coef                   : AR-coefficient vector (values in Q12),
+//                                ar_coef[0] must be 4096.
+//  - ar_coef_length            : Number of coefficients in |ar_coef|.
+//  - in_vector                 : Vector to be filtered.
+//  - in_vector_length          : Number of samples in |in_vector|.
+//  - filter_state              : Current state (higher part) of the filter.
+//  - filter_state_length       : Length (in samples) of |filter_state|.
+//  - filter_state_low          : Current state (lower part) of the filter.
+//  - filter_state_low_length   : Length (in samples) of |filter_state_low|.
+//  - out_vector_low_length     : Maximum length (in samples) of
+//                                |out_vector_low|.
+//
+// Output:
+//  - filter_state              : Updated state (upper part) vector.
+//  - filter_state_low          : Updated state (lower part) vector.
+//  - out_vector                : Vector containing the upper part of the
+//                                filtered values.
+//  - out_vector_low            : Vector containing the lower part of the
+//                                filtered values.
+//
+// Return value                 : Number of samples in the |out_vector|.
+//
+
+//
+// WebRtcSpl_ComplexIFFT(...)
+//
+// Complex Inverse FFT
+//
+// Computes an inverse complex 2^|stages|-point FFT on the input vector, which
+// is in bit-reversed order. The original content of the vector is destroyed in
+// the process, since the input is overwritten by the output, normal-ordered,
+// FFT vector. With X as the input complex vector, y as the output complex
+// vector and with M = 2^|stages|, the following is computed:
+//
+//        M-1
+// y(k) = sum[X(i)*[cos(2*pi*i*k/M) + j*sin(2*pi*i*k/M)]]
+//        i=0
+//
+// The implementations are optimized for speed, not for code size. It uses the
+// decimation-in-time algorithm with radix-2 butterfly technique.
+//
+// Input:
+//      - vector    : In pointer to complex vector containing 2^|stages|
+//                    real elements interleaved with 2^|stages| imaginary
+//                    elements.
+//                    [ReImReImReIm....]
+//                    The elements are in Q(-scale) domain, see more on Return
+//                    Value below.
+//
+//      - stages    : Number of FFT stages. Must be at least 3 and at most 10,
+//                    since the table WebRtcSpl_kSinTable1024[] is 1024
+//                    elements long.
+//
+//      - mode      : This parameter gives the user to choose how the FFT
+//                    should work.
+//                    mode==0: Low-complexity and Low-accuracy mode
+//                    mode==1: High-complexity and High-accuracy mode
+//
+// Output:
+//      - vector    : Out pointer to the FFT vector (the same as input).
+//
+// Return Value     : The scale value that tells the number of left bit shifts
+//                    that the elements in the |vector| should be shifted with
+//                    in order to get Q0 values, i.e. the physically correct
+//                    values. The scale parameter is always 0 or positive,
+//                    except if N>1024 (|stages|>10), which returns a scale
+//                    value of -1, indicating error.
+//
+
+//
+// WebRtcSpl_ComplexFFT(...)
+//
+// Complex FFT
+//
+// Computes a complex 2^|stages|-point FFT on the input vector, which is in
+// bit-reversed order. The original content of the vector is destroyed in
+// the process, since the input is overwritten by the output, normal-ordered,
+// FFT vector. With x as the input complex vector, Y as the output complex
+// vector and with M = 2^|stages|, the following is computed:
+//
+//              M-1
+// Y(k) = 1/M * sum[x(i)*[cos(2*pi*i*k/M) + j*sin(2*pi*i*k/M)]]
+//              i=0
+//
+// The implementations are optimized for speed, not for code size. It uses the
+// decimation-in-time algorithm with radix-2 butterfly technique.
+//
+// This routine prevents overflow by scaling by 2 before each FFT stage. This is
+// a fixed scaling, for proper normalization - there will be log2(n) passes, so
+// this results in an overall factor of 1/n, distributed to maximize arithmetic
+// accuracy.
+//
+// Input:
+//      - vector    : In pointer to complex vector containing 2^|stages| real
+//                    elements interleaved with 2^|stages| imaginary elements.
+//                    [ReImReImReIm....]
+//                    The output is in the Q0 domain.
+//
+//      - stages    : Number of FFT stages. Must be at least 3 and at most 10,
+//                    since the table WebRtcSpl_kSinTable1024[] is 1024
+//                    elements long.
+//
+//      - mode      : This parameter gives the user to choose how the FFT
+//                    should work.
+//                    mode==0: Low-complexity and Low-accuracy mode
+//                    mode==1: High-complexity and High-accuracy mode
+//
+// Output:
+//      - vector    : The output FFT vector is in the Q0 domain.
+//
+// Return value     : The scale parameter is always 0, except if N>1024,
+//                    which returns a scale value of -1, indicating error.
+//
+
+//
+// WebRtcSpl_AnalysisQMF(...)
+//
+// Splits a 0-2*F Hz signal into two sub bands: 0-F Hz and F-2*F Hz. The
+// current version has F = 8000, therefore, a super-wideband audio signal is
+// split to lower-band 0-8 kHz and upper-band 8-16 kHz.
+//
+// Input:
+//      - in_data       : Wide band speech signal, 320 samples (10 ms)
+//
+// Input & Output:
+//      - filter_state1 : Filter state for first All-pass filter
+//      - filter_state2 : Filter state for second All-pass filter
+//
+// Output:
+//      - low_band      : Lower-band signal 0-8 kHz band, 160 samples (10 ms)
+//      - high_band     : Upper-band signal 8-16 kHz band (flipped in frequency
+//                        domain), 160 samples (10 ms)
+//
+
+//
+// WebRtcSpl_SynthesisQMF(...)
+//
+// Combines the two sub bands (0-F and F-2*F Hz) into a signal of 0-2*F
+// Hz, (current version has F = 8000 Hz). So the filter combines lower-band
+// (0-8 kHz) and upper-band (8-16 kHz) channels to obtain super-wideband 0-16
+// kHz audio.
+//
+// Input:
+//      - low_band      : The signal with the 0-8 kHz band, 160 samples (10 ms)
+//      - high_band     : The signal with the 8-16 kHz band, 160 samples (10 ms)
+//
+// Input & Output:
+//      - filter_state1 : Filter state for first All-pass filter
+//      - filter_state2 : Filter state for second All-pass filter
+//
+// Output:
+//      - out_data      : Super-wideband speech signal, 0-16 kHz
+//
+
+// int16_t WebRtcSpl_SatW32ToW16(...)
+//
+// This function saturates a 32-bit word into a 16-bit word.
+//
+// Input:
+//      - value32   : The value of a 32-bit word.
+//
+// Output:
+//      - out16     : the saturated 16-bit word.
+//
+
+// int32_t WebRtc_MulAccumW16(...)
+//
+// This function multiply a 16-bit word by a 16-bit word, and accumulate this
+// value to a 32-bit integer.
+//
+// Input:
+//      - a    : The value of the first 16-bit word.
+//      - b    : The value of the second 16-bit word.
+//      - c    : The value of an 32-bit integer.
+//
+// Return Value: The value of a * b + c.
+//
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl_armv7.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl_armv7.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl_armv7.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl_armv7.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,136 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+/* This header file includes the inline functions for ARM processors in
+ * the fix point signal processing library.
+ */
+
+#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_
+#define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_
+
+/* TODO(kma): Replace some assembly code with GCC intrinsics
+ * (e.g. __builtin_clz).
+ */
+
+/* This function produces result that is not bit exact with that by the generic
+ * C version in some cases, although the former is at least as accurate as the
+ * later.
+ */
+static __inline int32_t WEBRTC_SPL_MUL_16_32_RSFT16(int16_t a, int32_t b) {
+  int32_t tmp = 0;
+  __asm __volatile("smulwb %0, %1, %2" : "=r"(tmp) : "r"(b), "r"(a));
+  return tmp;
+}
+
+static __inline int32_t WEBRTC_SPL_MUL_16_16(int16_t a, int16_t b) {
+  int32_t tmp = 0;
+  __asm __volatile("smulbb %0, %1, %2" : "=r"(tmp) : "r"(a), "r"(b));
+  return tmp;
+}
+
+// TODO(kma): add unit test.
+static __inline int32_t WebRtc_MulAccumW16(int16_t a, int16_t b, int32_t c) {
+  int32_t tmp = 0;
+  __asm __volatile("smlabb %0, %1, %2, %3"
+                   : "=r"(tmp)
+                   : "r"(a), "r"(b), "r"(c));
+  return tmp;
+}
+
+static __inline int16_t WebRtcSpl_AddSatW16(int16_t a, int16_t b) {
+  int32_t s_sum = 0;
+
+  __asm __volatile("qadd16 %0, %1, %2" : "=r"(s_sum) : "r"(a), "r"(b));
+
+  return (int16_t)s_sum;
+}
+
+static __inline int32_t WebRtcSpl_AddSatW32(int32_t l_var1, int32_t l_var2) {
+  int32_t l_sum = 0;
+
+  __asm __volatile("qadd %0, %1, %2" : "=r"(l_sum) : "r"(l_var1), "r"(l_var2));
+
+  return l_sum;
+}
+
+static __inline int32_t WebRtcSpl_SubSatW32(int32_t l_var1, int32_t l_var2) {
+  int32_t l_sub = 0;
+
+  __asm __volatile("qsub %0, %1, %2" : "=r"(l_sub) : "r"(l_var1), "r"(l_var2));
+
+  return l_sub;
+}
+
+static __inline int16_t WebRtcSpl_SubSatW16(int16_t var1, int16_t var2) {
+  int32_t s_sub = 0;
+
+  __asm __volatile("qsub16 %0, %1, %2" : "=r"(s_sub) : "r"(var1), "r"(var2));
+
+  return (int16_t)s_sub;
+}
+
+static __inline int16_t WebRtcSpl_GetSizeInBits(uint32_t n) {
+  int32_t tmp = 0;
+
+  __asm __volatile("clz %0, %1" : "=r"(tmp) : "r"(n));
+
+  return (int16_t)(32 - tmp);
+}
+
+static __inline int16_t WebRtcSpl_NormW32(int32_t a) {
+  int32_t tmp = 0;
+
+  if (a == 0) {
+    return 0;
+  } else if (a < 0) {
+    a ^= 0xFFFFFFFF;
+  }
+
+  __asm __volatile("clz %0, %1" : "=r"(tmp) : "r"(a));
+
+  return (int16_t)(tmp - 1);
+}
+
+static __inline int16_t WebRtcSpl_NormU32(uint32_t a) {
+  int tmp = 0;
+
+  if (a == 0)
+    return 0;
+
+  __asm __volatile("clz %0, %1" : "=r"(tmp) : "r"(a));
+
+  return (int16_t)tmp;
+}
+
+static __inline int16_t WebRtcSpl_NormW16(int16_t a) {
+  int32_t tmp = 0;
+  int32_t a_32 = a;
+
+  if (a_32 == 0) {
+    return 0;
+  } else if (a_32 < 0) {
+    a_32 ^= 0xFFFFFFFF;
+  }
+
+  __asm __volatile("clz %0, %1" : "=r"(tmp) : "r"(a_32));
+
+  return (int16_t)(tmp - 17);
+}
+
+// TODO(kma): add unit test.
+static __inline int16_t WebRtcSpl_SatW32ToW16(int32_t value32) {
+  int32_t out = 0;
+
+  __asm __volatile("ssat %0, #16, %1" : "=r"(out) : "r"(value32));
+
+  return (int16_t)out;
+}
+
+#endif  // COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_ARMV7_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,153 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// This header file includes the inline functions in
+// the fix point signal processing library.
+
+#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_
+#define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_
+
+#include "rtc_base/compile_assert_c.h"
+
+extern const int8_t kWebRtcSpl_CountLeadingZeros32_Table[64];
+
+// Don't call this directly except in tests!
+static __inline int WebRtcSpl_CountLeadingZeros32_NotBuiltin(uint32_t n) {
+  // Normalize n by rounding up to the nearest number that is a sequence of 0
+  // bits followed by a sequence of 1 bits. This number has the same number of
+  // leading zeros as the original n. There are exactly 33 such values.
+  n |= n >> 1;
+  n |= n >> 2;
+  n |= n >> 4;
+  n |= n >> 8;
+  n |= n >> 16;
+
+  // Multiply the modified n with a constant selected (by exhaustive search)
+  // such that each of the 33 possible values of n give a product whose 6 most
+  // significant bits are unique. Then look up the answer in the table.
+  return kWebRtcSpl_CountLeadingZeros32_Table[(n * 0x8c0b2891) >> 26];
+}
+
+// Don't call this directly except in tests!
+static __inline int WebRtcSpl_CountLeadingZeros64_NotBuiltin(uint64_t n) {
+  const int leading_zeros = n >> 32 == 0 ? 32 : 0;
+  return leading_zeros + WebRtcSpl_CountLeadingZeros32_NotBuiltin(
+                             (uint32_t)(n >> (32 - leading_zeros)));
+}
+
+// Returns the number of leading zero bits in the argument.
+static __inline int WebRtcSpl_CountLeadingZeros32(uint32_t n) {
+#ifdef __GNUC__
+  RTC_COMPILE_ASSERT(sizeof(unsigned int) == sizeof(uint32_t));
+  return n == 0 ? 32 : __builtin_clz(n);
+#else
+  return WebRtcSpl_CountLeadingZeros32_NotBuiltin(n);
+#endif
+}
+
+// Returns the number of leading zero bits in the argument.
+static __inline int WebRtcSpl_CountLeadingZeros64(uint64_t n) {
+#ifdef __GNUC__
+  RTC_COMPILE_ASSERT(sizeof(unsigned long long) == sizeof(uint64_t));  // NOLINT
+  return n == 0 ? 64 : __builtin_clzll(n);
+#else
+  return WebRtcSpl_CountLeadingZeros64_NotBuiltin(n);
+#endif
+}
+
+#ifdef WEBRTC_ARCH_ARM_V7
+#include "common_audio/signal_processing/include/spl_inl_armv7.h"
+#else
+
+#if defined(MIPS32_LE)
+#include "common_audio/signal_processing/include/spl_inl_mips.h"
+#endif
+
+#if !defined(MIPS_DSP_R1_LE)
+static __inline int16_t WebRtcSpl_SatW32ToW16(int32_t value32) {
+  int16_t out16 = (int16_t)value32;
+
+  if (value32 > 32767)
+    out16 = 32767;
+  else if (value32 < -32768)
+    out16 = -32768;
+
+  return out16;
+}
+
+static __inline int32_t WebRtcSpl_AddSatW32(int32_t a, int32_t b) {
+  // Do the addition in unsigned numbers, since signed overflow is undefined
+  // behavior.
+  const int32_t sum = (int32_t)((uint32_t)a + (uint32_t)b);
+
+  // a + b can't overflow if a and b have different signs. If they have the
+  // same sign, a + b also has the same sign iff it didn't overflow.
+  if ((a < 0) == (b < 0) && (a < 0) != (sum < 0)) {
+    // The direction of the overflow is obvious from the sign of a + b.
+    return sum < 0 ? INT32_MAX : INT32_MIN;
+  }
+  return sum;
+}
+
+static __inline int32_t WebRtcSpl_SubSatW32(int32_t a, int32_t b) {
+  // Do the subtraction in unsigned numbers, since signed overflow is undefined
+  // behavior.
+  const int32_t diff = (int32_t)((uint32_t)a - (uint32_t)b);
+
+  // a - b can't overflow if a and b have the same sign. If they have different
+  // signs, a - b has the same sign as a iff it didn't overflow.
+  if ((a < 0) != (b < 0) && (a < 0) != (diff < 0)) {
+    // The direction of the overflow is obvious from the sign of a - b.
+    return diff < 0 ? INT32_MAX : INT32_MIN;
+  }
+  return diff;
+}
+
+static __inline int16_t WebRtcSpl_AddSatW16(int16_t a, int16_t b) {
+  return WebRtcSpl_SatW32ToW16((int32_t)a + (int32_t)b);
+}
+
+static __inline int16_t WebRtcSpl_SubSatW16(int16_t var1, int16_t var2) {
+  return WebRtcSpl_SatW32ToW16((int32_t)var1 - (int32_t)var2);
+}
+#endif  // #if !defined(MIPS_DSP_R1_LE)
+
+#if !defined(MIPS32_LE)
+static __inline int16_t WebRtcSpl_GetSizeInBits(uint32_t n) {
+  return 32 - WebRtcSpl_CountLeadingZeros32(n);
+}
+
+// Return the number of steps a can be left-shifted without overflow,
+// or 0 if a == 0.
+static __inline int16_t WebRtcSpl_NormW32(int32_t a) {
+  return a == 0 ? 0 : WebRtcSpl_CountLeadingZeros32(a < 0 ? ~a : a) - 1;
+}
+
+// Return the number of steps a can be left-shifted without overflow,
+// or 0 if a == 0.
+static __inline int16_t WebRtcSpl_NormU32(uint32_t a) {
+  return a == 0 ? 0 : WebRtcSpl_CountLeadingZeros32(a);
+}
+
+// Return the number of steps a can be left-shifted without overflow,
+// or 0 if a == 0.
+static __inline int16_t WebRtcSpl_NormW16(int16_t a) {
+  const int32_t a32 = a;
+  return a == 0 ? 0 : WebRtcSpl_CountLeadingZeros32(a < 0 ? ~a32 : a32) - 17;
+}
+
+static __inline int32_t WebRtc_MulAccumW16(int16_t a, int16_t b, int32_t c) {
+  return (a * b + c);
+}
+#endif  // #if !defined(MIPS32_LE)
+
+#endif  // WEBRTC_ARCH_ARM_V7
+
+#endif  // COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl_mips.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl_mips.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl_mips.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/include/spl_inl_mips.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,204 @@
+/*
+ *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// This header file includes the inline functions in
+// the fix point signal processing library.
+
+#ifndef COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_MIPS_H_
+#define COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_MIPS_H_
+
+static __inline int32_t WEBRTC_SPL_MUL_16_16(int32_t a, int32_t b) {
+  int32_t value32 = 0;
+  int32_t a1 = 0, b1 = 0;
+
+  __asm __volatile(
+#if defined(MIPS32_R2_LE)
+      "seh    %[a1],          %[a]                \n\t"
+      "seh    %[b1],          %[b]                \n\t"
+#else
+      "sll    %[a1],          %[a],         16    \n\t"
+      "sll    %[b1],          %[b],         16    \n\t"
+      "sra    %[a1],          %[a1],        16    \n\t"
+      "sra    %[b1],          %[b1],        16    \n\t"
+#endif
+      "mul    %[value32],     %[a1],  %[b1]       \n\t"
+      : [value32] "=r"(value32), [a1] "=&r"(a1), [b1] "=&r"(b1)
+      : [a] "r"(a), [b] "r"(b)
+      : "hi", "lo");
+  return value32;
+}
+
+static __inline int32_t WEBRTC_SPL_MUL_16_32_RSFT16(int16_t a, int32_t b) {
+  int32_t value32 = 0, b1 = 0, b2 = 0;
+  int32_t a1 = 0;
+
+  __asm __volatile(
+#if defined(MIPS32_R2_LE)
+      "seh    %[a1],          %[a]                        \n\t"
+#else
+      "sll    %[a1],          %[a],           16          \n\t"
+      "sra    %[a1],          %[a1],          16          \n\t"
+#endif
+      "andi   %[b2],          %[b],           0xFFFF      \n\t"
+      "sra    %[b1],          %[b],           16          \n\t"
+      "sra    %[b2],          %[b2],          1           \n\t"
+      "mul    %[value32],     %[a1],          %[b1]       \n\t"
+      "mul    %[b2],          %[a1],          %[b2]       \n\t"
+      "addiu  %[b2],          %[b2],          0x4000      \n\t"
+      "sra    %[b2],          %[b2],          15          \n\t"
+      "addu   %[value32],     %[value32],     %[b2]       \n\t"
+      : [value32] "=&r"(value32), [b1] "=&r"(b1), [b2] "=&r"(b2), [a1] "=&r"(a1)
+      : [a] "r"(a), [b] "r"(b)
+      : "hi", "lo");
+  return value32;
+}
+
+#if defined(MIPS_DSP_R1_LE)
+static __inline int16_t WebRtcSpl_SatW32ToW16(int32_t value32) {
+  __asm __volatile(
+      "shll_s.w   %[value32], %[value32], 16      \n\t"
+      "sra        %[value32], %[value32], 16      \n\t"
+      : [value32] "+r"(value32)
+      :);
+  int16_t out16 = (int16_t)value32;
+  return out16;
+}
+
+static __inline int16_t WebRtcSpl_AddSatW16(int16_t a, int16_t b) {
+  int32_t value32 = 0;
+
+  __asm __volatile("addq_s.ph      %[value32],     %[a],   %[b]    \n\t"
+                   : [value32] "=r"(value32)
+                   : [a] "r"(a), [b] "r"(b));
+  return (int16_t)value32;
+}
+
+static __inline int32_t WebRtcSpl_AddSatW32(int32_t l_var1, int32_t l_var2) {
+  int32_t l_sum;
+
+  __asm __volatile(
+      "addq_s.w   %[l_sum],       %[l_var1],      %[l_var2]    \n\t"
+      : [l_sum] "=r"(l_sum)
+      : [l_var1] "r"(l_var1), [l_var2] "r"(l_var2));
+
+  return l_sum;
+}
+
+static __inline int16_t WebRtcSpl_SubSatW16(int16_t var1, int16_t var2) {
+  int32_t value32;
+
+  __asm __volatile("subq_s.ph  %[value32], %[var1],    %[var2]     \n\t"
+                   : [value32] "=r"(value32)
+                   : [var1] "r"(var1), [var2] "r"(var2));
+
+  return (int16_t)value32;
+}
+
+static __inline int32_t WebRtcSpl_SubSatW32(int32_t l_var1, int32_t l_var2) {
+  int32_t l_diff;
+
+  __asm __volatile(
+      "subq_s.w   %[l_diff],      %[l_var1],      %[l_var2]    \n\t"
+      : [l_diff] "=r"(l_diff)
+      : [l_var1] "r"(l_var1), [l_var2] "r"(l_var2));
+
+  return l_diff;
+}
+#endif
+
+static __inline int16_t WebRtcSpl_GetSizeInBits(uint32_t n) {
+  int bits = 0;
+  int i32 = 32;
+
+  __asm __volatile(
+      "clz    %[bits],    %[n]                    \n\t"
+      "subu   %[bits],    %[i32],     %[bits]     \n\t"
+      : [bits] "=&r"(bits)
+      : [n] "r"(n), [i32] "r"(i32));
+
+  return (int16_t)bits;
+}
+
+static __inline int16_t WebRtcSpl_NormW32(int32_t a) {
+  int zeros = 0;
+
+  __asm __volatile(
+      ".set       push                                \n\t"
+      ".set       noreorder                           \n\t"
+      "bnez       %[a],       1f                      \n\t"
+      " sra       %[zeros],   %[a],       31          \n\t"
+      "b          2f                                  \n\t"
+      " move      %[zeros],   $zero                   \n\t"
+      "1:                                              \n\t"
+      "xor        %[zeros],   %[a],       %[zeros]    \n\t"
+      "clz        %[zeros],   %[zeros]                \n\t"
+      "addiu      %[zeros],   %[zeros],   -1          \n\t"
+      "2:                                              \n\t"
+      ".set       pop                                 \n\t"
+      : [zeros] "=&r"(zeros)
+      : [a] "r"(a));
+
+  return (int16_t)zeros;
+}
+
+static __inline int16_t WebRtcSpl_NormU32(uint32_t a) {
+  int zeros = 0;
+
+  __asm __volatile("clz    %[zeros],   %[a]    \n\t"
+                   : [zeros] "=r"(zeros)
+                   : [a] "r"(a));
+
+  return (int16_t)(zeros & 0x1f);
+}
+
+static __inline int16_t WebRtcSpl_NormW16(int16_t a) {
+  int zeros = 0;
+  int a0 = a << 16;
+
+  __asm __volatile(
+      ".set       push                                \n\t"
+      ".set       noreorder                           \n\t"
+      "bnez       %[a0],      1f                      \n\t"
+      " sra       %[zeros],   %[a0],      31          \n\t"
+      "b          2f                                  \n\t"
+      " move      %[zeros],   $zero                   \n\t"
+      "1:                                              \n\t"
+      "xor        %[zeros],   %[a0],      %[zeros]    \n\t"
+      "clz        %[zeros],   %[zeros]                \n\t"
+      "addiu      %[zeros],   %[zeros],   -1          \n\t"
+      "2:                                              \n\t"
+      ".set       pop                                 \n\t"
+      : [zeros] "=&r"(zeros)
+      : [a0] "r"(a0));
+
+  return (int16_t)zeros;
+}
+
+static __inline int32_t WebRtc_MulAccumW16(int16_t a, int16_t b, int32_t c) {
+  int32_t res = 0, c1 = 0;
+  __asm __volatile(
+#if defined(MIPS32_R2_LE)
+      "seh    %[a],       %[a]            \n\t"
+      "seh    %[b],       %[b]            \n\t"
+#else
+      "sll    %[a],       %[a],   16      \n\t"
+      "sll    %[b],       %[b],   16      \n\t"
+      "sra    %[a],       %[a],   16      \n\t"
+      "sra    %[b],       %[b],   16      \n\t"
+#endif
+      "mul    %[res],     %[a],   %[b]    \n\t"
+      "addu   %[c1],      %[c],   %[res]  \n\t"
+      : [c1] "=r"(c1), [res] "=&r"(res)
+      : [a] "r"(a), [b] "r"(b), [c] "r"(c)
+      : "hi", "lo");
+  return (c1);
+}
+
+#endif  // COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_MIPS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/splitting_filter2.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/splitting_filter2.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/splitting_filter2.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/signal_processing/splitting_filter2.c	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,209 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+/*
+ * This file contains the splitting filter functions.
+ *
+ */
+
+#include "rtc_base/checks.h"
+#include "common_audio/signal_processing/include/signal_processing_library.h"
+
+// Maximum number of samples in a low/high-band frame.
+enum
+{
+    kMaxBandFrameLength = 320  // 10 ms at 64 kHz.
+};
+
+// QMF filter coefficients in Q16.
+static const uint16_t WebRtcSpl_kAllPassFilter1[3] = {6418, 36982, 57261};
+static const uint16_t WebRtcSpl_kAllPassFilter2[3] = {21333, 49062, 63010};
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+// WebRtcSpl_AllPassQMF(...)
+//
+// Allpass filter used by the analysis and synthesis parts of the QMF filter.
+//
+// Input:
+//    - in_data             : Input data sequence (Q10)
+//    - data_length         : Length of data sequence (>2)
+//    - filter_coefficients : Filter coefficients (length 3, Q16)
+//
+// Input & Output:
+//    - filter_state        : Filter state (length 6, Q10).
+//
+// Output:
+//    - out_data            : Output data sequence (Q10), length equal to
+//                            |data_length|
+//
+
+static void WebRtcSpl_AllPassQMF(int32_t* in_data,
+                                 size_t data_length,
+                                 int32_t* out_data,
+                                 const uint16_t* filter_coefficients,
+                                 int32_t* filter_state)
+{
+    // The procedure is to filter the input with three first order all pass filters
+    // (cascade operations).
+    //
+    //         a_3 + q^-1    a_2 + q^-1    a_1 + q^-1
+    // y[n] =  -----------   -----------   -----------   x[n]
+    //         1 + a_3q^-1   1 + a_2q^-1   1 + a_1q^-1
+    //
+    // The input vector |filter_coefficients| includes these three filter coefficients.
+    // The filter state contains the in_data state, in_data[-1], followed by
+    // the out_data state, out_data[-1]. This is repeated for each cascade.
+    // The first cascade filter will filter the |in_data| and store the output in
+    // |out_data|. The second will the take the |out_data| as input and make an
+    // intermediate storage in |in_data|, to save memory. The third, and final, cascade
+    // filter operation takes the |in_data| (which is the output from the previous cascade
+    // filter) and store the output in |out_data|.
+    // Note that the input vector values are changed during the process.
+    size_t k;
+    int32_t diff;
+    // First all-pass cascade; filter from in_data to out_data.
+
+    // Let y_i[n] indicate the output of cascade filter i (with filter coefficient a_i) at
+    // vector position n. Then the final output will be y[n] = y_3[n]
+
+    // First loop, use the states stored in memory.
+    // "diff" should be safe from wrap around since max values are 2^25
+    // diff = (x[0] - y_1[-1])
+    diff = WebRtcSpl_SubSatW32(in_data[0], filter_state[1]);
+    // y_1[0] =  x[-1] + a_1 * (x[0] - y_1[-1])
+    out_data[0] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[0], diff, filter_state[0]);
+
+    // For the remaining loops, use previous values.
+    for (k = 1; k < data_length; k++)
+    {
+        // diff = (x[n] - y_1[n-1])
+        diff = WebRtcSpl_SubSatW32(in_data[k], out_data[k - 1]);
+        // y_1[n] =  x[n-1] + a_1 * (x[n] - y_1[n-1])
+        out_data[k] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[0], diff, in_data[k - 1]);
+    }
+
+    // Update states.
+    filter_state[0] = in_data[data_length - 1]; // x[N-1], becomes x[-1] next time
+    filter_state[1] = out_data[data_length - 1]; // y_1[N-1], becomes y_1[-1] next time
+
+    // Second all-pass cascade; filter from out_data to in_data.
+    // diff = (y_1[0] - y_2[-1])
+    diff = WebRtcSpl_SubSatW32(out_data[0], filter_state[3]);
+    // y_2[0] =  y_1[-1] + a_2 * (y_1[0] - y_2[-1])
+    in_data[0] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[1], diff, filter_state[2]);
+    for (k = 1; k < data_length; k++)
+    {
+        // diff = (y_1[n] - y_2[n-1])
+        diff = WebRtcSpl_SubSatW32(out_data[k], in_data[k - 1]);
+        // y_2[0] =  y_1[-1] + a_2 * (y_1[0] - y_2[-1])
+        in_data[k] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[1], diff, out_data[k-1]);
+    }
+
+    filter_state[2] = out_data[data_length - 1]; // y_1[N-1], becomes y_1[-1] next time
+    filter_state[3] = in_data[data_length - 1]; // y_2[N-1], becomes y_2[-1] next time
+
+    // Third all-pass cascade; filter from in_data to out_data.
+    // diff = (y_2[0] - y[-1])
+    diff = WebRtcSpl_SubSatW32(in_data[0], filter_state[5]);
+    // y[0] =  y_2[-1] + a_3 * (y_2[0] - y[-1])
+    out_data[0] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[2], diff, filter_state[4]);
+    for (k = 1; k < data_length; k++)
+    {
+        // diff = (y_2[n] - y[n-1])
+        diff = WebRtcSpl_SubSatW32(in_data[k], out_data[k - 1]);
+        // y[n] =  y_2[n-1] + a_3 * (y_2[n] - y[n-1])
+        out_data[k] = WEBRTC_SPL_SCALEDIFF32(filter_coefficients[2], diff, in_data[k-1]);
+    }
+    filter_state[4] = in_data[data_length - 1]; // y_2[N-1], becomes y_2[-1] next time
+    filter_state[5] = out_data[data_length - 1]; // y[N-1], becomes y[-1] next time
+}
+
+void WebRtcSpl_AnalysisQMF(const int16_t* in_data, size_t in_data_length,
+                           int16_t* low_band, int16_t* high_band,
+                           int32_t* filter_state1, int32_t* filter_state2)
+{
+    size_t i;
+    int16_t k;
+    int32_t tmp;
+    int32_t half_in1[kMaxBandFrameLength];
+    int32_t half_in2[kMaxBandFrameLength];
+    int32_t filter1[kMaxBandFrameLength];
+    int32_t filter2[kMaxBandFrameLength];
+    const size_t band_length = in_data_length / 2;
+    RTC_DCHECK_EQ(0, in_data_length % 2);
+    RTC_DCHECK_LE(band_length, kMaxBandFrameLength);
+
+    // Split even and odd samples. Also shift them to Q10.
+    for (i = 0, k = 0; i < band_length; i++, k += 2)
+    {
+        half_in2[i] = ((int32_t)in_data[k]) * (1 << 10);
+        half_in1[i] = ((int32_t)in_data[k + 1]) * (1 << 10);
+    }
+
+    // All pass filter even and odd samples, independently.
+    WebRtcSpl_AllPassQMF(half_in1, band_length, filter1,
+                         WebRtcSpl_kAllPassFilter1, filter_state1);
+    WebRtcSpl_AllPassQMF(half_in2, band_length, filter2,
+                         WebRtcSpl_kAllPassFilter2, filter_state2);
+
+    // Take the sum and difference of filtered version of odd and even
+    // branches to get upper & lower band.
+    for (i = 0; i < band_length; i++)
+    {
+        tmp = (filter1[i] + filter2[i] + 1024) >> 11;
+        low_band[i] = WebRtcSpl_SatW32ToW16(tmp);
+
+        tmp = (filter1[i] - filter2[i] + 1024) >> 11;
+        high_band[i] = WebRtcSpl_SatW32ToW16(tmp);
+    }
+}
+
+void WebRtcSpl_SynthesisQMF(const int16_t* low_band, const int16_t* high_band,
+                            size_t band_length, int16_t* out_data,
+                            int32_t* filter_state1, int32_t* filter_state2)
+{
+    int32_t tmp;
+    int32_t half_in1[kMaxBandFrameLength];
+    int32_t half_in2[kMaxBandFrameLength];
+    int32_t filter1[kMaxBandFrameLength];
+    int32_t filter2[kMaxBandFrameLength];
+    size_t i;
+    int16_t k;
+    RTC_DCHECK_LE(band_length, kMaxBandFrameLength);
+
+    // Obtain the sum and difference channels out of upper and lower-band channels.
+    // Also shift to Q10 domain.
+    for (i = 0; i < band_length; i++)
+    {
+        tmp = (int32_t)low_band[i] + (int32_t)high_band[i];
+        half_in1[i] = tmp * (1 << 10);
+        tmp = (int32_t)low_band[i] - (int32_t)high_band[i];
+        half_in2[i] = tmp * (1 << 10);
+    }
+
+    // all-pass filter the sum and difference channels
+    WebRtcSpl_AllPassQMF(half_in1, band_length, filter1,
+                         WebRtcSpl_kAllPassFilter2, filter_state1);
+    WebRtcSpl_AllPassQMF(half_in2, band_length, filter2,
+                         WebRtcSpl_kAllPassFilter1, filter_state2);
+
+    // The filtered signals are even and odd samples of the output. Combine
+    // them. The signals are Q10 should shift them back to Q0 and take care of
+    // saturation.
+    for (i = 0, k = 0; i < band_length; i++)
+    {
+        tmp = (filter2[i] + 512) >> 10;
+        out_data[k++] = WebRtcSpl_SatW32ToW16(tmp);
+
+        tmp = (filter1[i] + 512) >> 10;
+        out_data[k++] = WebRtcSpl_SatW32ToW16(tmp);
+    }
+
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/BUILD.gn asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/BUILD.gn
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/BUILD.gn	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,58 @@
+# Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the ../../../LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+import("../../../webrtc.gni")
+
+rtc_library("fft_size_128") {
+  sources = [
+    "fft_size_128/ooura_fft.cc",
+    "fft_size_128/ooura_fft.h",
+    "fft_size_128/ooura_fft_tables_common.h",
+  ]
+  deps = [
+    "../../../rtc_base/system:arch",
+    "../../../system_wrappers",
+  ]
+  cflags = []
+
+  if (current_cpu == "x86" || current_cpu == "x64") {
+    sources += [
+      "fft_size_128/ooura_fft_sse2.cc",
+      "fft_size_128/ooura_fft_tables_neon_sse2.h",
+    ]
+    if (is_posix || is_fuchsia) {
+      cflags += [ "-msse2" ]
+    }
+  }
+
+  if (rtc_build_with_neon) {
+    sources += [
+      "fft_size_128/ooura_fft_neon.cc",
+      "fft_size_128/ooura_fft_tables_neon_sse2.h",
+    ]
+
+    deps += [ "../../../common_audio" ]
+
+    if (current_cpu != "arm64") {
+      # Enable compilation for the NEON instruction set.
+      suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+      cflags += [ "-mfpu=neon" ]
+    }
+  }
+
+  if (current_cpu == "mipsel" && mips_float_abi == "hard") {
+    sources += [ "fft_size_128/ooura_fft_mips.cc" ]
+  }
+}
+
+rtc_library("fft_size_256") {
+  sources = [
+    "fft_size_256/fft4g.cc",
+    "fft_size_256/fft4g.h",
+  ]
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,548 @@
+/*
+ * http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html
+ * Copyright Takuya OOURA, 1996-2001
+ *
+ * You may use, copy, modify and distribute this code for any purpose (include
+ * commercial use) and without fee. Please refer to this package when you modify
+ * this code.
+ *
+ * Changes by the WebRTC authors:
+ *    - Trivial type modifications.
+ *    - Minimal code subset to do rdft of length 128.
+ *    - Optimizations because of known length.
+ *    - Removed the global variables by moving the code in to a class in order
+ *      to make it thread safe.
+ *
+ *  All changes are covered by the WebRTC license and IP grant:
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft.h"
+
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_common.h"
+#include "rtc_base/system/arch.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+
+namespace webrtc {
+
+namespace {
+
+#if !(defined(MIPS_FPU_LE) || defined(WEBRTC_HAS_NEON))
+static void cft1st_128_C(float* a) {
+  const int n = 128;
+  int j, k1, k2;
+  float wk1r, wk1i, wk2r, wk2i, wk3r, wk3i;
+  float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
+
+  // The processing of the first set of elements was simplified in C to avoid
+  // some operations (multiplication by zero or one, addition of two elements
+  // multiplied by the same weight, ...).
+  x0r = a[0] + a[2];
+  x0i = a[1] + a[3];
+  x1r = a[0] - a[2];
+  x1i = a[1] - a[3];
+  x2r = a[4] + a[6];
+  x2i = a[5] + a[7];
+  x3r = a[4] - a[6];
+  x3i = a[5] - a[7];
+  a[0] = x0r + x2r;
+  a[1] = x0i + x2i;
+  a[4] = x0r - x2r;
+  a[5] = x0i - x2i;
+  a[2] = x1r - x3i;
+  a[3] = x1i + x3r;
+  a[6] = x1r + x3i;
+  a[7] = x1i - x3r;
+  wk1r = rdft_w[2];
+  x0r = a[8] + a[10];
+  x0i = a[9] + a[11];
+  x1r = a[8] - a[10];
+  x1i = a[9] - a[11];
+  x2r = a[12] + a[14];
+  x2i = a[13] + a[15];
+  x3r = a[12] - a[14];
+  x3i = a[13] - a[15];
+  a[8] = x0r + x2r;
+  a[9] = x0i + x2i;
+  a[12] = x2i - x0i;
+  a[13] = x0r - x2r;
+  x0r = x1r - x3i;
+  x0i = x1i + x3r;
+  a[10] = wk1r * (x0r - x0i);
+  a[11] = wk1r * (x0r + x0i);
+  x0r = x3i + x1r;
+  x0i = x3r - x1i;
+  a[14] = wk1r * (x0i - x0r);
+  a[15] = wk1r * (x0i + x0r);
+  k1 = 0;
+  for (j = 16; j < n; j += 16) {
+    k1 += 2;
+    k2 = 2 * k1;
+    wk2r = rdft_w[k1 + 0];
+    wk2i = rdft_w[k1 + 1];
+    wk1r = rdft_w[k2 + 0];
+    wk1i = rdft_w[k2 + 1];
+    wk3r = rdft_wk3ri_first[k1 + 0];
+    wk3i = rdft_wk3ri_first[k1 + 1];
+    x0r = a[j + 0] + a[j + 2];
+    x0i = a[j + 1] + a[j + 3];
+    x1r = a[j + 0] - a[j + 2];
+    x1i = a[j + 1] - a[j + 3];
+    x2r = a[j + 4] + a[j + 6];
+    x2i = a[j + 5] + a[j + 7];
+    x3r = a[j + 4] - a[j + 6];
+    x3i = a[j + 5] - a[j + 7];
+    a[j + 0] = x0r + x2r;
+    a[j + 1] = x0i + x2i;
+    x0r -= x2r;
+    x0i -= x2i;
+    a[j + 4] = wk2r * x0r - wk2i * x0i;
+    a[j + 5] = wk2r * x0i + wk2i * x0r;
+    x0r = x1r - x3i;
+    x0i = x1i + x3r;
+    a[j + 2] = wk1r * x0r - wk1i * x0i;
+    a[j + 3] = wk1r * x0i + wk1i * x0r;
+    x0r = x1r + x3i;
+    x0i = x1i - x3r;
+    a[j + 6] = wk3r * x0r - wk3i * x0i;
+    a[j + 7] = wk3r * x0i + wk3i * x0r;
+    wk1r = rdft_w[k2 + 2];
+    wk1i = rdft_w[k2 + 3];
+    wk3r = rdft_wk3ri_second[k1 + 0];
+    wk3i = rdft_wk3ri_second[k1 + 1];
+    x0r = a[j + 8] + a[j + 10];
+    x0i = a[j + 9] + a[j + 11];
+    x1r = a[j + 8] - a[j + 10];
+    x1i = a[j + 9] - a[j + 11];
+    x2r = a[j + 12] + a[j + 14];
+    x2i = a[j + 13] + a[j + 15];
+    x3r = a[j + 12] - a[j + 14];
+    x3i = a[j + 13] - a[j + 15];
+    a[j + 8] = x0r + x2r;
+    a[j + 9] = x0i + x2i;
+    x0r -= x2r;
+    x0i -= x2i;
+    a[j + 12] = -wk2i * x0r - wk2r * x0i;
+    a[j + 13] = -wk2i * x0i + wk2r * x0r;
+    x0r = x1r - x3i;
+    x0i = x1i + x3r;
+    a[j + 10] = wk1r * x0r - wk1i * x0i;
+    a[j + 11] = wk1r * x0i + wk1i * x0r;
+    x0r = x1r + x3i;
+    x0i = x1i - x3r;
+    a[j + 14] = wk3r * x0r - wk3i * x0i;
+    a[j + 15] = wk3r * x0i + wk3i * x0r;
+  }
+}
+
+static void cftmdl_128_C(float* a) {
+  const int l = 8;
+  const int n = 128;
+  const int m = 32;
+  int j0, j1, j2, j3, k, k1, k2, m2;
+  float wk1r, wk1i, wk2r, wk2i, wk3r, wk3i;
+  float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
+
+  for (j0 = 0; j0 < l; j0 += 2) {
+    j1 = j0 + 8;
+    j2 = j0 + 16;
+    j3 = j0 + 24;
+    x0r = a[j0 + 0] + a[j1 + 0];
+    x0i = a[j0 + 1] + a[j1 + 1];
+    x1r = a[j0 + 0] - a[j1 + 0];
+    x1i = a[j0 + 1] - a[j1 + 1];
+    x2r = a[j2 + 0] + a[j3 + 0];
+    x2i = a[j2 + 1] + a[j3 + 1];
+    x3r = a[j2 + 0] - a[j3 + 0];
+    x3i = a[j2 + 1] - a[j3 + 1];
+    a[j0 + 0] = x0r + x2r;
+    a[j0 + 1] = x0i + x2i;
+    a[j2 + 0] = x0r - x2r;
+    a[j2 + 1] = x0i - x2i;
+    a[j1 + 0] = x1r - x3i;
+    a[j1 + 1] = x1i + x3r;
+    a[j3 + 0] = x1r + x3i;
+    a[j3 + 1] = x1i - x3r;
+  }
+  wk1r = rdft_w[2];
+  for (j0 = m; j0 < l + m; j0 += 2) {
+    j1 = j0 + 8;
+    j2 = j0 + 16;
+    j3 = j0 + 24;
+    x0r = a[j0 + 0] + a[j1 + 0];
+    x0i = a[j0 + 1] + a[j1 + 1];
+    x1r = a[j0 + 0] - a[j1 + 0];
+    x1i = a[j0 + 1] - a[j1 + 1];
+    x2r = a[j2 + 0] + a[j3 + 0];
+    x2i = a[j2 + 1] + a[j3 + 1];
+    x3r = a[j2 + 0] - a[j3 + 0];
+    x3i = a[j2 + 1] - a[j3 + 1];
+    a[j0 + 0] = x0r + x2r;
+    a[j0 + 1] = x0i + x2i;
+    a[j2 + 0] = x2i - x0i;
+    a[j2 + 1] = x0r - x2r;
+    x0r = x1r - x3i;
+    x0i = x1i + x3r;
+    a[j1 + 0] = wk1r * (x0r - x0i);
+    a[j1 + 1] = wk1r * (x0r + x0i);
+    x0r = x3i + x1r;
+    x0i = x3r - x1i;
+    a[j3 + 0] = wk1r * (x0i - x0r);
+    a[j3 + 1] = wk1r * (x0i + x0r);
+  }
+  k1 = 0;
+  m2 = 2 * m;
+  for (k = m2; k < n; k += m2) {
+    k1 += 2;
+    k2 = 2 * k1;
+    wk2r = rdft_w[k1 + 0];
+    wk2i = rdft_w[k1 + 1];
+    wk1r = rdft_w[k2 + 0];
+    wk1i = rdft_w[k2 + 1];
+    wk3r = rdft_wk3ri_first[k1 + 0];
+    wk3i = rdft_wk3ri_first[k1 + 1];
+    for (j0 = k; j0 < l + k; j0 += 2) {
+      j1 = j0 + 8;
+      j2 = j0 + 16;
+      j3 = j0 + 24;
+      x0r = a[j0 + 0] + a[j1 + 0];
+      x0i = a[j0 + 1] + a[j1 + 1];
+      x1r = a[j0 + 0] - a[j1 + 0];
+      x1i = a[j0 + 1] - a[j1 + 1];
+      x2r = a[j2 + 0] + a[j3 + 0];
+      x2i = a[j2 + 1] + a[j3 + 1];
+      x3r = a[j2 + 0] - a[j3 + 0];
+      x3i = a[j2 + 1] - a[j3 + 1];
+      a[j0 + 0] = x0r + x2r;
+      a[j0 + 1] = x0i + x2i;
+      x0r -= x2r;
+      x0i -= x2i;
+      a[j2 + 0] = wk2r * x0r - wk2i * x0i;
+      a[j2 + 1] = wk2r * x0i + wk2i * x0r;
+      x0r = x1r - x3i;
+      x0i = x1i + x3r;
+      a[j1 + 0] = wk1r * x0r - wk1i * x0i;
+      a[j1 + 1] = wk1r * x0i + wk1i * x0r;
+      x0r = x1r + x3i;
+      x0i = x1i - x3r;
+      a[j3 + 0] = wk3r * x0r - wk3i * x0i;
+      a[j3 + 1] = wk3r * x0i + wk3i * x0r;
+    }
+    wk1r = rdft_w[k2 + 2];
+    wk1i = rdft_w[k2 + 3];
+    wk3r = rdft_wk3ri_second[k1 + 0];
+    wk3i = rdft_wk3ri_second[k1 + 1];
+    for (j0 = k + m; j0 < l + (k + m); j0 += 2) {
+      j1 = j0 + 8;
+      j2 = j0 + 16;
+      j3 = j0 + 24;
+      x0r = a[j0 + 0] + a[j1 + 0];
+      x0i = a[j0 + 1] + a[j1 + 1];
+      x1r = a[j0 + 0] - a[j1 + 0];
+      x1i = a[j0 + 1] - a[j1 + 1];
+      x2r = a[j2 + 0] + a[j3 + 0];
+      x2i = a[j2 + 1] + a[j3 + 1];
+      x3r = a[j2 + 0] - a[j3 + 0];
+      x3i = a[j2 + 1] - a[j3 + 1];
+      a[j0 + 0] = x0r + x2r;
+      a[j0 + 1] = x0i + x2i;
+      x0r -= x2r;
+      x0i -= x2i;
+      a[j2 + 0] = -wk2i * x0r - wk2r * x0i;
+      a[j2 + 1] = -wk2i * x0i + wk2r * x0r;
+      x0r = x1r - x3i;
+      x0i = x1i + x3r;
+      a[j1 + 0] = wk1r * x0r - wk1i * x0i;
+      a[j1 + 1] = wk1r * x0i + wk1i * x0r;
+      x0r = x1r + x3i;
+      x0i = x1i - x3r;
+      a[j3 + 0] = wk3r * x0r - wk3i * x0i;
+      a[j3 + 1] = wk3r * x0i + wk3i * x0r;
+    }
+  }
+}
+
+static void rftfsub_128_C(float* a) {
+  const float* c = rdft_w + 32;
+  int j1, j2, k1, k2;
+  float wkr, wki, xr, xi, yr, yi;
+
+  for (j1 = 1, j2 = 2; j2 < 64; j1 += 1, j2 += 2) {
+    k2 = 128 - j2;
+    k1 = 32 - j1;
+    wkr = 0.5f - c[k1];
+    wki = c[j1];
+    xr = a[j2 + 0] - a[k2 + 0];
+    xi = a[j2 + 1] + a[k2 + 1];
+    yr = wkr * xr - wki * xi;
+    yi = wkr * xi + wki * xr;
+    a[j2 + 0] -= yr;
+    a[j2 + 1] -= yi;
+    a[k2 + 0] += yr;
+    a[k2 + 1] -= yi;
+  }
+}
+
+static void rftbsub_128_C(float* a) {
+  const float* c = rdft_w + 32;
+  int j1, j2, k1, k2;
+  float wkr, wki, xr, xi, yr, yi;
+
+  a[1] = -a[1];
+  for (j1 = 1, j2 = 2; j2 < 64; j1 += 1, j2 += 2) {
+    k2 = 128 - j2;
+    k1 = 32 - j1;
+    wkr = 0.5f - c[k1];
+    wki = c[j1];
+    xr = a[j2 + 0] - a[k2 + 0];
+    xi = a[j2 + 1] + a[k2 + 1];
+    yr = wkr * xr + wki * xi;
+    yi = wkr * xi - wki * xr;
+    a[j2 + 0] = a[j2 + 0] - yr;
+    a[j2 + 1] = yi - a[j2 + 1];
+    a[k2 + 0] = yr + a[k2 + 0];
+    a[k2 + 1] = yi - a[k2 + 1];
+  }
+  a[65] = -a[65];
+}
+#endif
+
+}  // namespace
+
+OouraFft::OouraFft(bool sse2_available) {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+  use_sse2_ = sse2_available;
+#else
+  use_sse2_ = false;
+#endif
+}
+
+OouraFft::OouraFft() {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+  use_sse2_ = (GetCPUInfo(kSSE2) != 0);
+#else
+  use_sse2_ = false;
+#endif
+}
+
+OouraFft::~OouraFft() = default;
+
+void OouraFft::Fft(float* a) const {
+  float xi;
+  bitrv2_128(a);
+  cftfsub_128(a);
+  rftfsub_128(a);
+  xi = a[0] - a[1];
+  a[0] += a[1];
+  a[1] = xi;
+}
+void OouraFft::InverseFft(float* a) const {
+  a[1] = 0.5f * (a[0] - a[1]);
+  a[0] -= a[1];
+  rftbsub_128(a);
+  bitrv2_128(a);
+  cftbsub_128(a);
+}
+
+void OouraFft::cft1st_128(float* a) const {
+#if defined(MIPS_FPU_LE)
+  cft1st_128_mips(a);
+#elif defined(WEBRTC_HAS_NEON)
+  cft1st_128_neon(a);
+#elif defined(WEBRTC_ARCH_X86_FAMILY)
+  if (use_sse2_) {
+    cft1st_128_SSE2(a);
+  } else {
+    cft1st_128_C(a);
+  }
+#else
+  cft1st_128_C(a);
+#endif
+}
+void OouraFft::cftmdl_128(float* a) const {
+#if defined(MIPS_FPU_LE)
+  cftmdl_128_mips(a);
+#elif defined(WEBRTC_HAS_NEON)
+  cftmdl_128_neon(a);
+#elif defined(WEBRTC_ARCH_X86_FAMILY)
+  if (use_sse2_) {
+    cftmdl_128_SSE2(a);
+  } else {
+    cftmdl_128_C(a);
+  }
+#else
+  cftmdl_128_C(a);
+#endif
+}
+void OouraFft::rftfsub_128(float* a) const {
+#if defined(MIPS_FPU_LE)
+  rftfsub_128_mips(a);
+#elif defined(WEBRTC_HAS_NEON)
+  rftfsub_128_neon(a);
+#elif defined(WEBRTC_ARCH_X86_FAMILY)
+  if (use_sse2_) {
+    rftfsub_128_SSE2(a);
+  } else {
+    rftfsub_128_C(a);
+  }
+#else
+  rftfsub_128_C(a);
+#endif
+}
+
+void OouraFft::rftbsub_128(float* a) const {
+#if defined(MIPS_FPU_LE)
+  rftbsub_128_mips(a);
+#elif defined(WEBRTC_HAS_NEON)
+  rftbsub_128_neon(a);
+#elif defined(WEBRTC_ARCH_X86_FAMILY)
+  if (use_sse2_) {
+    rftbsub_128_SSE2(a);
+  } else {
+    rftbsub_128_C(a);
+  }
+#else
+  rftbsub_128_C(a);
+#endif
+}
+
+void OouraFft::cftbsub_128(float* a) const {
+  int j, j1, j2, j3, l;
+  float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
+
+  cft1st_128(a);
+  cftmdl_128(a);
+  l = 32;
+
+  for (j = 0; j < l; j += 2) {
+    j1 = j + l;
+    j2 = j1 + l;
+    j3 = j2 + l;
+    x0r = a[j] + a[j1];
+    x0i = -a[j + 1] - a[j1 + 1];
+    x1r = a[j] - a[j1];
+    x1i = -a[j + 1] + a[j1 + 1];
+    x2r = a[j2] + a[j3];
+    x2i = a[j2 + 1] + a[j3 + 1];
+    x3r = a[j2] - a[j3];
+    x3i = a[j2 + 1] - a[j3 + 1];
+    a[j] = x0r + x2r;
+    a[j + 1] = x0i - x2i;
+    a[j2] = x0r - x2r;
+    a[j2 + 1] = x0i + x2i;
+    a[j1] = x1r - x3i;
+    a[j1 + 1] = x1i - x3r;
+    a[j3] = x1r + x3i;
+    a[j3 + 1] = x1i + x3r;
+  }
+}
+
+void OouraFft::cftfsub_128(float* a) const {
+  int j, j1, j2, j3, l;
+  float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
+
+  cft1st_128(a);
+  cftmdl_128(a);
+  l = 32;
+  for (j = 0; j < l; j += 2) {
+    j1 = j + l;
+    j2 = j1 + l;
+    j3 = j2 + l;
+    x0r = a[j] + a[j1];
+    x0i = a[j + 1] + a[j1 + 1];
+    x1r = a[j] - a[j1];
+    x1i = a[j + 1] - a[j1 + 1];
+    x2r = a[j2] + a[j3];
+    x2i = a[j2 + 1] + a[j3 + 1];
+    x3r = a[j2] - a[j3];
+    x3i = a[j2 + 1] - a[j3 + 1];
+    a[j] = x0r + x2r;
+    a[j + 1] = x0i + x2i;
+    a[j2] = x0r - x2r;
+    a[j2 + 1] = x0i - x2i;
+    a[j1] = x1r - x3i;
+    a[j1 + 1] = x1i + x3r;
+    a[j3] = x1r + x3i;
+    a[j3 + 1] = x1i - x3r;
+  }
+}
+
+void OouraFft::bitrv2_128(float* a) const {
+  /*
+      Following things have been attempted but are no faster:
+      (a) Storing the swap indexes in a LUT (index calculations are done
+          for 'free' while waiting on memory/L1).
+      (b) Consolidate the load/store of two consecutive floats by a 64 bit
+          integer (execution is memory/L1 bound).
+      (c) Do a mix of floats and 64 bit integer to maximize register
+          utilization (execution is memory/L1 bound).
+      (d) Replacing ip[i] by ((k<<31)>>25) + ((k >> 1)<<5).
+      (e) Hard-coding of the offsets to completely eliminates index
+          calculations.
+  */
+
+  unsigned int j, j1, k, k1;
+  float xr, xi, yr, yi;
+
+  const int ip[4] = {0, 64, 32, 96};
+  for (k = 0; k < 4; k++) {
+    for (j = 0; j < k; j++) {
+      j1 = 2 * j + ip[k];
+      k1 = 2 * k + ip[j];
+      xr = a[j1 + 0];
+      xi = a[j1 + 1];
+      yr = a[k1 + 0];
+      yi = a[k1 + 1];
+      a[j1 + 0] = yr;
+      a[j1 + 1] = yi;
+      a[k1 + 0] = xr;
+      a[k1 + 1] = xi;
+      j1 += 8;
+      k1 += 16;
+      xr = a[j1 + 0];
+      xi = a[j1 + 1];
+      yr = a[k1 + 0];
+      yi = a[k1 + 1];
+      a[j1 + 0] = yr;
+      a[j1 + 1] = yi;
+      a[k1 + 0] = xr;
+      a[k1 + 1] = xi;
+      j1 += 8;
+      k1 -= 8;
+      xr = a[j1 + 0];
+      xi = a[j1 + 1];
+      yr = a[k1 + 0];
+      yi = a[k1 + 1];
+      a[j1 + 0] = yr;
+      a[j1 + 1] = yi;
+      a[k1 + 0] = xr;
+      a[k1 + 1] = xi;
+      j1 += 8;
+      k1 += 16;
+      xr = a[j1 + 0];
+      xi = a[j1 + 1];
+      yr = a[k1 + 0];
+      yi = a[k1 + 1];
+      a[j1 + 0] = yr;
+      a[j1 + 1] = yi;
+      a[k1 + 0] = xr;
+      a[k1 + 1] = xi;
+    }
+    j1 = 2 * k + 8 + ip[k];
+    k1 = j1 + 8;
+    xr = a[j1 + 0];
+    xi = a[j1 + 1];
+    yr = a[k1 + 0];
+    yi = a[k1 + 1];
+    a[j1 + 0] = yr;
+    a[j1 + 1] = yi;
+    a[k1 + 0] = xr;
+    a[k1 + 1] = xi;
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_
+#define MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_
+
+#include "rtc_base/system/arch.h"
+
+namespace webrtc {
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+void cft1st_128_SSE2(float* a);
+void cftmdl_128_SSE2(float* a);
+void rftfsub_128_SSE2(float* a);
+void rftbsub_128_SSE2(float* a);
+#endif
+
+#if defined(MIPS_FPU_LE)
+void cft1st_128_mips(float* a);
+void cftmdl_128_mips(float* a);
+void rftfsub_128_mips(float* a);
+void rftbsub_128_mips(float* a);
+#endif
+
+#if defined(WEBRTC_HAS_NEON)
+void cft1st_128_neon(float* a);
+void cftmdl_128_neon(float* a);
+void rftfsub_128_neon(float* a);
+void rftbsub_128_neon(float* a);
+#endif
+
+class OouraFft {
+ public:
+  // Ctor allowing the availability of SSE2 support to be specified.
+  explicit OouraFft(bool sse2_available);
+
+  // Deprecated: This Ctor will soon be removed.
+  OouraFft();
+  ~OouraFft();
+  void Fft(float* a) const;
+  void InverseFft(float* a) const;
+
+ private:
+  void cft1st_128(float* a) const;
+  void cftmdl_128(float* a) const;
+  void rftfsub_128(float* a) const;
+  void rftbsub_128(float* a) const;
+
+  void cftfsub_128(float* a) const;
+  void cftbsub_128(float* a) const;
+  void bitrv2_128(float* a) const;
+  bool use_sse2_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_mips.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_mips.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_mips.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_mips.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,1245 @@
+/*
+ *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft.h"
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_common.h"
+
+namespace webrtc {
+
+#if defined(MIPS_FPU_LE)
+void bitrv2_128_mips(float* a) {
+  // n is 128
+  float xr, xi, yr, yi;
+
+  xr = a[8];
+  xi = a[9];
+  yr = a[16];
+  yi = a[17];
+  a[8] = yr;
+  a[9] = yi;
+  a[16] = xr;
+  a[17] = xi;
+
+  xr = a[64];
+  xi = a[65];
+  yr = a[2];
+  yi = a[3];
+  a[64] = yr;
+  a[65] = yi;
+  a[2] = xr;
+  a[3] = xi;
+
+  xr = a[72];
+  xi = a[73];
+  yr = a[18];
+  yi = a[19];
+  a[72] = yr;
+  a[73] = yi;
+  a[18] = xr;
+  a[19] = xi;
+
+  xr = a[80];
+  xi = a[81];
+  yr = a[10];
+  yi = a[11];
+  a[80] = yr;
+  a[81] = yi;
+  a[10] = xr;
+  a[11] = xi;
+
+  xr = a[88];
+  xi = a[89];
+  yr = a[26];
+  yi = a[27];
+  a[88] = yr;
+  a[89] = yi;
+  a[26] = xr;
+  a[27] = xi;
+
+  xr = a[74];
+  xi = a[75];
+  yr = a[82];
+  yi = a[83];
+  a[74] = yr;
+  a[75] = yi;
+  a[82] = xr;
+  a[83] = xi;
+
+  xr = a[32];
+  xi = a[33];
+  yr = a[4];
+  yi = a[5];
+  a[32] = yr;
+  a[33] = yi;
+  a[4] = xr;
+  a[5] = xi;
+
+  xr = a[40];
+  xi = a[41];
+  yr = a[20];
+  yi = a[21];
+  a[40] = yr;
+  a[41] = yi;
+  a[20] = xr;
+  a[21] = xi;
+
+  xr = a[48];
+  xi = a[49];
+  yr = a[12];
+  yi = a[13];
+  a[48] = yr;
+  a[49] = yi;
+  a[12] = xr;
+  a[13] = xi;
+
+  xr = a[56];
+  xi = a[57];
+  yr = a[28];
+  yi = a[29];
+  a[56] = yr;
+  a[57] = yi;
+  a[28] = xr;
+  a[29] = xi;
+
+  xr = a[34];
+  xi = a[35];
+  yr = a[68];
+  yi = a[69];
+  a[34] = yr;
+  a[35] = yi;
+  a[68] = xr;
+  a[69] = xi;
+
+  xr = a[42];
+  xi = a[43];
+  yr = a[84];
+  yi = a[85];
+  a[42] = yr;
+  a[43] = yi;
+  a[84] = xr;
+  a[85] = xi;
+
+  xr = a[50];
+  xi = a[51];
+  yr = a[76];
+  yi = a[77];
+  a[50] = yr;
+  a[51] = yi;
+  a[76] = xr;
+  a[77] = xi;
+
+  xr = a[58];
+  xi = a[59];
+  yr = a[92];
+  yi = a[93];
+  a[58] = yr;
+  a[59] = yi;
+  a[92] = xr;
+  a[93] = xi;
+
+  xr = a[44];
+  xi = a[45];
+  yr = a[52];
+  yi = a[53];
+  a[44] = yr;
+  a[45] = yi;
+  a[52] = xr;
+  a[53] = xi;
+
+  xr = a[96];
+  xi = a[97];
+  yr = a[6];
+  yi = a[7];
+  a[96] = yr;
+  a[97] = yi;
+  a[6] = xr;
+  a[7] = xi;
+
+  xr = a[104];
+  xi = a[105];
+  yr = a[22];
+  yi = a[23];
+  a[104] = yr;
+  a[105] = yi;
+  a[22] = xr;
+  a[23] = xi;
+
+  xr = a[112];
+  xi = a[113];
+  yr = a[14];
+  yi = a[15];
+  a[112] = yr;
+  a[113] = yi;
+  a[14] = xr;
+  a[15] = xi;
+
+  xr = a[120];
+  xi = a[121];
+  yr = a[30];
+  yi = a[31];
+  a[120] = yr;
+  a[121] = yi;
+  a[30] = xr;
+  a[31] = xi;
+
+  xr = a[98];
+  xi = a[99];
+  yr = a[70];
+  yi = a[71];
+  a[98] = yr;
+  a[99] = yi;
+  a[70] = xr;
+  a[71] = xi;
+
+  xr = a[106];
+  xi = a[107];
+  yr = a[86];
+  yi = a[87];
+  a[106] = yr;
+  a[107] = yi;
+  a[86] = xr;
+  a[87] = xi;
+
+  xr = a[114];
+  xi = a[115];
+  yr = a[78];
+  yi = a[79];
+  a[114] = yr;
+  a[115] = yi;
+  a[78] = xr;
+  a[79] = xi;
+
+  xr = a[122];
+  xi = a[123];
+  yr = a[94];
+  yi = a[95];
+  a[122] = yr;
+  a[123] = yi;
+  a[94] = xr;
+  a[95] = xi;
+
+  xr = a[100];
+  xi = a[101];
+  yr = a[38];
+  yi = a[39];
+  a[100] = yr;
+  a[101] = yi;
+  a[38] = xr;
+  a[39] = xi;
+
+  xr = a[108];
+  xi = a[109];
+  yr = a[54];
+  yi = a[55];
+  a[108] = yr;
+  a[109] = yi;
+  a[54] = xr;
+  a[55] = xi;
+
+  xr = a[116];
+  xi = a[117];
+  yr = a[46];
+  yi = a[47];
+  a[116] = yr;
+  a[117] = yi;
+  a[46] = xr;
+  a[47] = xi;
+
+  xr = a[124];
+  xi = a[125];
+  yr = a[62];
+  yi = a[63];
+  a[124] = yr;
+  a[125] = yi;
+  a[62] = xr;
+  a[63] = xi;
+
+  xr = a[110];
+  xi = a[111];
+  yr = a[118];
+  yi = a[119];
+  a[110] = yr;
+  a[111] = yi;
+  a[118] = xr;
+  a[119] = xi;
+}
+
+void cft1st_128_mips(float* a) {
+  float f0, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14;
+  int a_ptr, p1_rdft, p2_rdft, count;
+  const float* first = rdft_wk3ri_first;
+  const float* second = rdft_wk3ri_second;
+
+  __asm __volatile(
+      ".set       push                                                    \n\t"
+      ".set       noreorder                                               \n\t"
+      // first 8
+      "lwc1       %[f0],        0(%[a])                                   \n\t"
+      "lwc1       %[f1],        4(%[a])                                   \n\t"
+      "lwc1       %[f2],        8(%[a])                                   \n\t"
+      "lwc1       %[f3],        12(%[a])                                  \n\t"
+      "lwc1       %[f4],        16(%[a])                                  \n\t"
+      "lwc1       %[f5],        20(%[a])                                  \n\t"
+      "lwc1       %[f6],        24(%[a])                                  \n\t"
+      "lwc1       %[f7],        28(%[a])                                  \n\t"
+      "add.s      %[f8],        %[f0],        %[f2]                       \n\t"
+      "sub.s      %[f0],        %[f0],        %[f2]                       \n\t"
+      "add.s      %[f2],        %[f4],        %[f6]                       \n\t"
+      "sub.s      %[f4],        %[f4],        %[f6]                       \n\t"
+      "add.s      %[f6],        %[f1],        %[f3]                       \n\t"
+      "sub.s      %[f1],        %[f1],        %[f3]                       \n\t"
+      "add.s      %[f3],        %[f5],        %[f7]                       \n\t"
+      "sub.s      %[f5],        %[f5],        %[f7]                       \n\t"
+      "add.s      %[f7],        %[f8],        %[f2]                       \n\t"
+      "sub.s      %[f8],        %[f8],        %[f2]                       \n\t"
+      "sub.s      %[f2],        %[f1],        %[f4]                       \n\t"
+      "add.s      %[f1],        %[f1],        %[f4]                       \n\t"
+      "add.s      %[f4],        %[f6],        %[f3]                       \n\t"
+      "sub.s      %[f6],        %[f6],        %[f3]                       \n\t"
+      "sub.s      %[f3],        %[f0],        %[f5]                       \n\t"
+      "add.s      %[f0],        %[f0],        %[f5]                       \n\t"
+      "swc1       %[f7],        0(%[a])                                   \n\t"
+      "swc1       %[f8],        16(%[a])                                  \n\t"
+      "swc1       %[f2],        28(%[a])                                  \n\t"
+      "swc1       %[f1],        12(%[a])                                  \n\t"
+      "swc1       %[f4],        4(%[a])                                   \n\t"
+      "swc1       %[f6],        20(%[a])                                  \n\t"
+      "swc1       %[f3],        8(%[a])                                   \n\t"
+      "swc1       %[f0],        24(%[a])                                  \n\t"
+      // second 8
+      "lwc1       %[f0],        32(%[a])                                  \n\t"
+      "lwc1       %[f1],        36(%[a])                                  \n\t"
+      "lwc1       %[f2],        40(%[a])                                  \n\t"
+      "lwc1       %[f3],        44(%[a])                                  \n\t"
+      "lwc1       %[f4],        48(%[a])                                  \n\t"
+      "lwc1       %[f5],        52(%[a])                                  \n\t"
+      "lwc1       %[f6],        56(%[a])                                  \n\t"
+      "lwc1       %[f7],        60(%[a])                                  \n\t"
+      "add.s      %[f8],        %[f4],        %[f6]                       \n\t"
+      "sub.s      %[f4],        %[f4],        %[f6]                       \n\t"
+      "add.s      %[f6],        %[f1],        %[f3]                       \n\t"
+      "sub.s      %[f1],        %[f1],        %[f3]                       \n\t"
+      "add.s      %[f3],        %[f0],        %[f2]                       \n\t"
+      "sub.s      %[f0],        %[f0],        %[f2]                       \n\t"
+      "add.s      %[f2],        %[f5],        %[f7]                       \n\t"
+      "sub.s      %[f5],        %[f5],        %[f7]                       \n\t"
+      "add.s      %[f7],        %[f4],        %[f1]                       \n\t"
+      "sub.s      %[f4],        %[f4],        %[f1]                       \n\t"
+      "add.s      %[f1],        %[f3],        %[f8]                       \n\t"
+      "sub.s      %[f3],        %[f3],        %[f8]                       \n\t"
+      "sub.s      %[f8],        %[f0],        %[f5]                       \n\t"
+      "add.s      %[f0],        %[f0],        %[f5]                       \n\t"
+      "add.s      %[f5],        %[f6],        %[f2]                       \n\t"
+      "sub.s      %[f6],        %[f2],        %[f6]                       \n\t"
+      "lwc1       %[f9],        8(%[rdft_w])                              \n\t"
+      "sub.s      %[f2],        %[f8],        %[f7]                       \n\t"
+      "add.s      %[f8],        %[f8],        %[f7]                       \n\t"
+      "sub.s      %[f7],        %[f4],        %[f0]                       \n\t"
+      "add.s      %[f4],        %[f4],        %[f0]                       \n\t"
+      // prepare for loop
+      "addiu      %[a_ptr],     %[a],         64                          \n\t"
+      "addiu      %[p1_rdft],   %[rdft_w],    8                           \n\t"
+      "addiu      %[p2_rdft],   %[rdft_w],    16                          \n\t"
+      "addiu      %[count],     $zero,        7                           \n\t"
+      // finish second 8
+      "mul.s      %[f2],        %[f9],        %[f2]                       \n\t"
+      "mul.s      %[f8],        %[f9],        %[f8]                       \n\t"
+      "mul.s      %[f7],        %[f9],        %[f7]                       \n\t"
+      "mul.s      %[f4],        %[f9],        %[f4]                       \n\t"
+      "swc1       %[f1],        32(%[a])                                  \n\t"
+      "swc1       %[f3],        52(%[a])                                  \n\t"
+      "swc1       %[f5],        36(%[a])                                  \n\t"
+      "swc1       %[f6],        48(%[a])                                  \n\t"
+      "swc1       %[f2],        40(%[a])                                  \n\t"
+      "swc1       %[f8],        44(%[a])                                  \n\t"
+      "swc1       %[f7],        56(%[a])                                  \n\t"
+      "swc1       %[f4],        60(%[a])                                  \n\t"
+      // loop
+      "1:                                                                  \n\t"
+      "lwc1       %[f0],        0(%[a_ptr])                               \n\t"
+      "lwc1       %[f1],        4(%[a_ptr])                               \n\t"
+      "lwc1       %[f2],        8(%[a_ptr])                               \n\t"
+      "lwc1       %[f3],        12(%[a_ptr])                              \n\t"
+      "lwc1       %[f4],        16(%[a_ptr])                              \n\t"
+      "lwc1       %[f5],        20(%[a_ptr])                              \n\t"
+      "lwc1       %[f6],        24(%[a_ptr])                              \n\t"
+      "lwc1       %[f7],        28(%[a_ptr])                              \n\t"
+      "add.s      %[f8],        %[f0],        %[f2]                       \n\t"
+      "sub.s      %[f0],        %[f0],        %[f2]                       \n\t"
+      "add.s      %[f2],        %[f4],        %[f6]                       \n\t"
+      "sub.s      %[f4],        %[f4],        %[f6]                       \n\t"
+      "add.s      %[f6],        %[f1],        %[f3]                       \n\t"
+      "sub.s      %[f1],        %[f1],        %[f3]                       \n\t"
+      "add.s      %[f3],        %[f5],        %[f7]                       \n\t"
+      "sub.s      %[f5],        %[f5],        %[f7]                       \n\t"
+      "lwc1       %[f10],       4(%[p1_rdft])                             \n\t"
+      "lwc1       %[f11],       0(%[p2_rdft])                             \n\t"
+      "lwc1       %[f12],       4(%[p2_rdft])                             \n\t"
+      "lwc1       %[f13],       8(%[first])                               \n\t"
+      "lwc1       %[f14],       12(%[first])                              \n\t"
+      "add.s      %[f7],        %[f8],        %[f2]                       \n\t"
+      "sub.s      %[f8],        %[f8],        %[f2]                       \n\t"
+      "add.s      %[f2],        %[f6],        %[f3]                       \n\t"
+      "sub.s      %[f6],        %[f6],        %[f3]                       \n\t"
+      "add.s      %[f3],        %[f0],        %[f5]                       \n\t"
+      "sub.s      %[f0],        %[f0],        %[f5]                       \n\t"
+      "add.s      %[f5],        %[f1],        %[f4]                       \n\t"
+      "sub.s      %[f1],        %[f1],        %[f4]                       \n\t"
+      "swc1       %[f7],        0(%[a_ptr])                               \n\t"
+      "swc1       %[f2],        4(%[a_ptr])                               \n\t"
+      "mul.s      %[f4],        %[f9],        %[f8]                       \n\t"
+#if defined(MIPS32_R2_LE)
+      "mul.s      %[f8],        %[f10],       %[f8]                       \n\t"
+      "mul.s      %[f7],        %[f11],       %[f0]                       \n\t"
+      "mul.s      %[f0],        %[f12],       %[f0]                       \n\t"
+      "mul.s      %[f2],        %[f13],       %[f3]                       \n\t"
+      "mul.s      %[f3],        %[f14],       %[f3]                       \n\t"
+      "nmsub.s    %[f4],        %[f4],        %[f10],       %[f6]         \n\t"
+      "madd.s     %[f8],        %[f8],        %[f9],        %[f6]         \n\t"
+      "nmsub.s    %[f7],        %[f7],        %[f12],       %[f5]         \n\t"
+      "madd.s     %[f0],        %[f0],        %[f11],       %[f5]         \n\t"
+      "nmsub.s    %[f2],        %[f2],        %[f14],       %[f1]         \n\t"
+      "madd.s     %[f3],        %[f3],        %[f13],       %[f1]         \n\t"
+#else
+      "mul.s      %[f7],        %[f10],       %[f6]                       \n\t"
+      "mul.s      %[f6],        %[f9],        %[f6]                       \n\t"
+      "mul.s      %[f8],        %[f10],       %[f8]                       \n\t"
+      "mul.s      %[f2],        %[f11],       %[f0]                       \n\t"
+      "mul.s      %[f11],       %[f11],       %[f5]                       \n\t"
+      "mul.s      %[f5],        %[f12],       %[f5]                       \n\t"
+      "mul.s      %[f0],        %[f12],       %[f0]                       \n\t"
+      "mul.s      %[f12],       %[f13],       %[f3]                       \n\t"
+      "mul.s      %[f13],       %[f13],       %[f1]                       \n\t"
+      "mul.s      %[f1],        %[f14],       %[f1]                       \n\t"
+      "mul.s      %[f3],        %[f14],       %[f3]                       \n\t"
+      "sub.s      %[f4],        %[f4],        %[f7]                       \n\t"
+      "add.s      %[f8],        %[f6],        %[f8]                       \n\t"
+      "sub.s      %[f7],        %[f2],        %[f5]                       \n\t"
+      "add.s      %[f0],        %[f11],       %[f0]                       \n\t"
+      "sub.s      %[f2],        %[f12],       %[f1]                       \n\t"
+      "add.s      %[f3],        %[f13],       %[f3]                       \n\t"
+#endif
+      "swc1       %[f4],        16(%[a_ptr])                              \n\t"
+      "swc1       %[f8],        20(%[a_ptr])                              \n\t"
+      "swc1       %[f7],        8(%[a_ptr])                               \n\t"
+      "swc1       %[f0],        12(%[a_ptr])                              \n\t"
+      "swc1       %[f2],        24(%[a_ptr])                              \n\t"
+      "swc1       %[f3],        28(%[a_ptr])                              \n\t"
+      "lwc1       %[f0],        32(%[a_ptr])                              \n\t"
+      "lwc1       %[f1],        36(%[a_ptr])                              \n\t"
+      "lwc1       %[f2],        40(%[a_ptr])                              \n\t"
+      "lwc1       %[f3],        44(%[a_ptr])                              \n\t"
+      "lwc1       %[f4],        48(%[a_ptr])                              \n\t"
+      "lwc1       %[f5],        52(%[a_ptr])                              \n\t"
+      "lwc1       %[f6],        56(%[a_ptr])                              \n\t"
+      "lwc1       %[f7],        60(%[a_ptr])                              \n\t"
+      "add.s      %[f8],        %[f0],        %[f2]                       \n\t"
+      "sub.s      %[f0],        %[f0],        %[f2]                       \n\t"
+      "add.s      %[f2],        %[f4],        %[f6]                       \n\t"
+      "sub.s      %[f4],        %[f4],        %[f6]                       \n\t"
+      "add.s      %[f6],        %[f1],        %[f3]                       \n\t"
+      "sub.s      %[f1],        %[f1],        %[f3]                       \n\t"
+      "add.s      %[f3],        %[f5],        %[f7]                       \n\t"
+      "sub.s      %[f5],        %[f5],        %[f7]                       \n\t"
+      "lwc1       %[f11],       8(%[p2_rdft])                             \n\t"
+      "lwc1       %[f12],       12(%[p2_rdft])                            \n\t"
+      "lwc1       %[f13],       8(%[second])                              \n\t"
+      "lwc1       %[f14],       12(%[second])                             \n\t"
+      "add.s      %[f7],        %[f8],        %[f2]                       \n\t"
+      "sub.s      %[f8],        %[f2],        %[f8]                       \n\t"
+      "add.s      %[f2],        %[f6],        %[f3]                       \n\t"
+      "sub.s      %[f6],        %[f3],        %[f6]                       \n\t"
+      "add.s      %[f3],        %[f0],        %[f5]                       \n\t"
+      "sub.s      %[f0],        %[f0],        %[f5]                       \n\t"
+      "add.s      %[f5],        %[f1],        %[f4]                       \n\t"
+      "sub.s      %[f1],        %[f1],        %[f4]                       \n\t"
+      "swc1       %[f7],        32(%[a_ptr])                              \n\t"
+      "swc1       %[f2],        36(%[a_ptr])                              \n\t"
+      "mul.s      %[f4],        %[f10],       %[f8]                       \n\t"
+#if defined(MIPS32_R2_LE)
+      "mul.s      %[f10],       %[f10],       %[f6]                       \n\t"
+      "mul.s      %[f7],        %[f11],       %[f0]                       \n\t"
+      "mul.s      %[f11],       %[f11],       %[f5]                       \n\t"
+      "mul.s      %[f2],        %[f13],       %[f3]                       \n\t"
+      "mul.s      %[f13],       %[f13],       %[f1]                       \n\t"
+      "madd.s     %[f4],        %[f4],        %[f9],        %[f6]         \n\t"
+      "nmsub.s    %[f10],       %[f10],       %[f9],        %[f8]         \n\t"
+      "nmsub.s    %[f7],        %[f7],        %[f12],       %[f5]         \n\t"
+      "madd.s     %[f11],       %[f11],       %[f12],       %[f0]         \n\t"
+      "nmsub.s    %[f2],        %[f2],        %[f14],       %[f1]         \n\t"
+      "madd.s     %[f13],       %[f13],       %[f14],       %[f3]         \n\t"
+#else
+      "mul.s      %[f2],        %[f9],        %[f6]                       \n\t"
+      "mul.s      %[f10],       %[f10],       %[f6]                       \n\t"
+      "mul.s      %[f9],        %[f9],        %[f8]                       \n\t"
+      "mul.s      %[f7],        %[f11],       %[f0]                       \n\t"
+      "mul.s      %[f8],        %[f12],       %[f5]                       \n\t"
+      "mul.s      %[f11],       %[f11],       %[f5]                       \n\t"
+      "mul.s      %[f12],       %[f12],       %[f0]                       \n\t"
+      "mul.s      %[f5],        %[f13],       %[f3]                       \n\t"
+      "mul.s      %[f0],        %[f14],       %[f1]                       \n\t"
+      "mul.s      %[f13],       %[f13],       %[f1]                       \n\t"
+      "mul.s      %[f14],       %[f14],       %[f3]                       \n\t"
+      "add.s      %[f4],        %[f4],        %[f2]                       \n\t"
+      "sub.s      %[f10],       %[f10],       %[f9]                       \n\t"
+      "sub.s      %[f7],        %[f7],        %[f8]                       \n\t"
+      "add.s      %[f11],       %[f11],       %[f12]                      \n\t"
+      "sub.s      %[f2],        %[f5],        %[f0]                       \n\t"
+      "add.s      %[f13],       %[f13],       %[f14]                      \n\t"
+#endif
+      "swc1       %[f4],        48(%[a_ptr])                              \n\t"
+      "swc1       %[f10],       52(%[a_ptr])                              \n\t"
+      "swc1       %[f7],        40(%[a_ptr])                              \n\t"
+      "swc1       %[f11],       44(%[a_ptr])                              \n\t"
+      "swc1       %[f2],        56(%[a_ptr])                              \n\t"
+      "swc1       %[f13],       60(%[a_ptr])                              \n\t"
+      "addiu      %[count],     %[count],     -1                          \n\t"
+      "lwc1       %[f9],        8(%[p1_rdft])                             \n\t"
+      "addiu      %[a_ptr],     %[a_ptr],     64                          \n\t"
+      "addiu      %[p1_rdft],   %[p1_rdft],   8                           \n\t"
+      "addiu      %[p2_rdft],   %[p2_rdft],   16                          \n\t"
+      "addiu      %[first],     %[first],     8                           \n\t"
+      "bgtz       %[count],     1b                                        \n\t"
+      " addiu     %[second],    %[second],    8                           \n\t"
+      ".set       pop                                                     \n\t"
+      : [f0] "=&f"(f0), [f1] "=&f"(f1), [f2] "=&f"(f2), [f3] "=&f"(f3),
+        [f4] "=&f"(f4), [f5] "=&f"(f5), [f6] "=&f"(f6), [f7] "=&f"(f7),
+        [f8] "=&f"(f8), [f9] "=&f"(f9), [f10] "=&f"(f10), [f11] "=&f"(f11),
+        [f12] "=&f"(f12), [f13] "=&f"(f13), [f14] "=&f"(f14),
+        [a_ptr] "=&r"(a_ptr), [p1_rdft] "=&r"(p1_rdft), [first] "+r"(first),
+        [p2_rdft] "=&r"(p2_rdft), [count] "=&r"(count), [second] "+r"(second)
+      : [a] "r"(a), [rdft_w] "r"(rdft_w)
+      : "memory");
+}
+
+void cftmdl_128_mips(float* a) {
+  float f0, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14;
+  int tmp_a, count;
+  __asm __volatile(
+      ".set       push                                      \n\t"
+      ".set       noreorder                                 \n\t"
+      "addiu      %[tmp_a],   %[a],         0               \n\t"
+      "addiu      %[count],   $zero,        4               \n\t"
+      "1:                                                    \n\t"
+      "addiu      %[count],   %[count],     -1              \n\t"
+      "lwc1       %[f0],      0(%[tmp_a])                   \n\t"
+      "lwc1       %[f2],      32(%[tmp_a])                  \n\t"
+      "lwc1       %[f4],      64(%[tmp_a])                  \n\t"
+      "lwc1       %[f6],      96(%[tmp_a])                  \n\t"
+      "lwc1       %[f1],      4(%[tmp_a])                   \n\t"
+      "lwc1       %[f3],      36(%[tmp_a])                  \n\t"
+      "lwc1       %[f5],      68(%[tmp_a])                  \n\t"
+      "lwc1       %[f7],      100(%[tmp_a])                 \n\t"
+      "add.s      %[f8],      %[f0],        %[f2]           \n\t"
+      "sub.s      %[f0],      %[f0],        %[f2]           \n\t"
+      "add.s      %[f2],      %[f4],        %[f6]           \n\t"
+      "sub.s      %[f4],      %[f4],        %[f6]           \n\t"
+      "add.s      %[f6],      %[f1],        %[f3]           \n\t"
+      "sub.s      %[f1],      %[f1],        %[f3]           \n\t"
+      "add.s      %[f3],      %[f5],        %[f7]           \n\t"
+      "sub.s      %[f5],      %[f5],        %[f7]           \n\t"
+      "add.s      %[f7],      %[f8],        %[f2]           \n\t"
+      "sub.s      %[f8],      %[f8],        %[f2]           \n\t"
+      "add.s      %[f2],      %[f1],        %[f4]           \n\t"
+      "sub.s      %[f1],      %[f1],        %[f4]           \n\t"
+      "add.s      %[f4],      %[f6],        %[f3]           \n\t"
+      "sub.s      %[f6],      %[f6],        %[f3]           \n\t"
+      "sub.s      %[f3],      %[f0],        %[f5]           \n\t"
+      "add.s      %[f0],      %[f0],        %[f5]           \n\t"
+      "swc1       %[f7],      0(%[tmp_a])                   \n\t"
+      "swc1       %[f8],      64(%[tmp_a])                  \n\t"
+      "swc1       %[f2],      36(%[tmp_a])                  \n\t"
+      "swc1       %[f1],      100(%[tmp_a])                 \n\t"
+      "swc1       %[f4],      4(%[tmp_a])                   \n\t"
+      "swc1       %[f6],      68(%[tmp_a])                  \n\t"
+      "swc1       %[f3],      32(%[tmp_a])                  \n\t"
+      "swc1       %[f0],      96(%[tmp_a])                  \n\t"
+      "bgtz       %[count],   1b                            \n\t"
+      " addiu     %[tmp_a],   %[tmp_a],     8               \n\t"
+      ".set       pop                                       \n\t"
+      : [f0] "=&f"(f0), [f1] "=&f"(f1), [f2] "=&f"(f2), [f3] "=&f"(f3),
+        [f4] "=&f"(f4), [f5] "=&f"(f5), [f6] "=&f"(f6), [f7] "=&f"(f7),
+        [f8] "=&f"(f8), [tmp_a] "=&r"(tmp_a), [count] "=&r"(count)
+      : [a] "r"(a)
+      : "memory");
+  f9 = rdft_w[2];
+  __asm __volatile(
+      ".set       push                                      \n\t"
+      ".set       noreorder                                 \n\t"
+      "addiu      %[tmp_a],   %[a],         128             \n\t"
+      "addiu      %[count],   $zero,        4               \n\t"
+      "1:                                                    \n\t"
+      "addiu      %[count],   %[count],     -1              \n\t"
+      "lwc1       %[f0],      0(%[tmp_a])                   \n\t"
+      "lwc1       %[f2],      32(%[tmp_a])                  \n\t"
+      "lwc1       %[f5],      68(%[tmp_a])                  \n\t"
+      "lwc1       %[f7],      100(%[tmp_a])                 \n\t"
+      "lwc1       %[f1],      4(%[tmp_a])                   \n\t"
+      "lwc1       %[f3],      36(%[tmp_a])                  \n\t"
+      "lwc1       %[f4],      64(%[tmp_a])                  \n\t"
+      "lwc1       %[f6],      96(%[tmp_a])                  \n\t"
+      "sub.s      %[f8],      %[f0],        %[f2]           \n\t"
+      "add.s      %[f0],      %[f0],        %[f2]           \n\t"
+      "sub.s      %[f2],      %[f5],        %[f7]           \n\t"
+      "add.s      %[f5],      %[f5],        %[f7]           \n\t"
+      "sub.s      %[f7],      %[f1],        %[f3]           \n\t"
+      "add.s      %[f1],      %[f1],        %[f3]           \n\t"
+      "sub.s      %[f3],      %[f4],        %[f6]           \n\t"
+      "add.s      %[f4],      %[f4],        %[f6]           \n\t"
+      "sub.s      %[f6],      %[f8],        %[f2]           \n\t"
+      "add.s      %[f8],      %[f8],        %[f2]           \n\t"
+      "add.s      %[f2],      %[f5],        %[f1]           \n\t"
+      "sub.s      %[f5],      %[f5],        %[f1]           \n\t"
+      "add.s      %[f1],      %[f3],        %[f7]           \n\t"
+      "sub.s      %[f3],      %[f3],        %[f7]           \n\t"
+      "add.s      %[f7],      %[f0],        %[f4]           \n\t"
+      "sub.s      %[f0],      %[f0],        %[f4]           \n\t"
+      "sub.s      %[f4],      %[f6],        %[f1]           \n\t"
+      "add.s      %[f6],      %[f6],        %[f1]           \n\t"
+      "sub.s      %[f1],      %[f3],        %[f8]           \n\t"
+      "add.s      %[f3],      %[f3],        %[f8]           \n\t"
+      "mul.s      %[f4],      %[f4],        %[f9]           \n\t"
+      "mul.s      %[f6],      %[f6],        %[f9]           \n\t"
+      "mul.s      %[f1],      %[f1],        %[f9]           \n\t"
+      "mul.s      %[f3],      %[f3],        %[f9]           \n\t"
+      "swc1       %[f7],      0(%[tmp_a])                   \n\t"
+      "swc1       %[f2],      4(%[tmp_a])                   \n\t"
+      "swc1       %[f5],      64(%[tmp_a])                  \n\t"
+      "swc1       %[f0],      68(%[tmp_a])                  \n\t"
+      "swc1       %[f4],      32(%[tmp_a])                  \n\t"
+      "swc1       %[f6],      36(%[tmp_a])                  \n\t"
+      "swc1       %[f1],      96(%[tmp_a])                  \n\t"
+      "swc1       %[f3],      100(%[tmp_a])                 \n\t"
+      "bgtz       %[count],   1b                            \n\t"
+      " addiu     %[tmp_a],   %[tmp_a],     8               \n\t"
+      ".set       pop                                       \n\t"
+      : [f0] "=&f"(f0), [f1] "=&f"(f1), [f2] "=&f"(f2), [f3] "=&f"(f3),
+        [f4] "=&f"(f4), [f5] "=&f"(f5), [f6] "=&f"(f6), [f7] "=&f"(f7),
+        [f8] "=&f"(f8), [tmp_a] "=&r"(tmp_a), [count] "=&r"(count)
+      : [a] "r"(a), [f9] "f"(f9)
+      : "memory");
+  f10 = rdft_w[3];
+  f11 = rdft_w[4];
+  f12 = rdft_w[5];
+  f13 = rdft_wk3ri_first[2];
+  f14 = rdft_wk3ri_first[3];
+
+  __asm __volatile(
+      ".set       push                                                    \n\t"
+      ".set       noreorder                                               \n\t"
+      "addiu      %[tmp_a],     %[a],         256                         \n\t"
+      "addiu      %[count],     $zero,        4                           \n\t"
+      "1:                                                                  \n\t"
+      "addiu      %[count],     %[count],     -1                          \n\t"
+      "lwc1       %[f0],        0(%[tmp_a])                               \n\t"
+      "lwc1       %[f2],        32(%[tmp_a])                              \n\t"
+      "lwc1       %[f4],        64(%[tmp_a])                              \n\t"
+      "lwc1       %[f6],        96(%[tmp_a])                              \n\t"
+      "lwc1       %[f1],        4(%[tmp_a])                               \n\t"
+      "lwc1       %[f3],        36(%[tmp_a])                              \n\t"
+      "lwc1       %[f5],        68(%[tmp_a])                              \n\t"
+      "lwc1       %[f7],        100(%[tmp_a])                             \n\t"
+      "add.s      %[f8],        %[f0],        %[f2]                       \n\t"
+      "sub.s      %[f0],        %[f0],        %[f2]                       \n\t"
+      "add.s      %[f2],        %[f4],        %[f6]                       \n\t"
+      "sub.s      %[f4],        %[f4],        %[f6]                       \n\t"
+      "add.s      %[f6],        %[f1],        %[f3]                       \n\t"
+      "sub.s      %[f1],        %[f1],        %[f3]                       \n\t"
+      "add.s      %[f3],        %[f5],        %[f7]                       \n\t"
+      "sub.s      %[f5],        %[f5],        %[f7]                       \n\t"
+      "sub.s      %[f7],        %[f8],        %[f2]                       \n\t"
+      "add.s      %[f8],        %[f8],        %[f2]                       \n\t"
+      "add.s      %[f2],        %[f1],        %[f4]                       \n\t"
+      "sub.s      %[f1],        %[f1],        %[f4]                       \n\t"
+      "sub.s      %[f4],        %[f6],        %[f3]                       \n\t"
+      "add.s      %[f6],        %[f6],        %[f3]                       \n\t"
+      "sub.s      %[f3],        %[f0],        %[f5]                       \n\t"
+      "add.s      %[f0],        %[f0],        %[f5]                       \n\t"
+      "swc1       %[f8],        0(%[tmp_a])                               \n\t"
+      "swc1       %[f6],        4(%[tmp_a])                               \n\t"
+      "mul.s      %[f5],        %[f9],        %[f7]                       \n\t"
+#if defined(MIPS32_R2_LE)
+      "mul.s      %[f7],        %[f10],       %[f7]                       \n\t"
+      "mul.s      %[f8],        %[f11],       %[f3]                       \n\t"
+      "mul.s      %[f3],        %[f12],       %[f3]                       \n\t"
+      "mul.s      %[f6],        %[f13],       %[f0]                       \n\t"
+      "mul.s      %[f0],        %[f14],       %[f0]                       \n\t"
+      "nmsub.s    %[f5],        %[f5],        %[f10],       %[f4]         \n\t"
+      "madd.s     %[f7],        %[f7],        %[f9],        %[f4]         \n\t"
+      "nmsub.s    %[f8],        %[f8],        %[f12],       %[f2]         \n\t"
+      "madd.s     %[f3],        %[f3],        %[f11],       %[f2]         \n\t"
+      "nmsub.s    %[f6],        %[f6],        %[f14],       %[f1]         \n\t"
+      "madd.s     %[f0],        %[f0],        %[f13],       %[f1]         \n\t"
+      "swc1       %[f5],        64(%[tmp_a])                              \n\t"
+      "swc1       %[f7],        68(%[tmp_a])                              \n\t"
+#else
+      "mul.s      %[f8],        %[f10],       %[f4]                       \n\t"
+      "mul.s      %[f4],        %[f9],        %[f4]                       \n\t"
+      "mul.s      %[f7],        %[f10],       %[f7]                       \n\t"
+      "mul.s      %[f6],        %[f11],       %[f3]                       \n\t"
+      "mul.s      %[f3],        %[f12],       %[f3]                       \n\t"
+      "sub.s      %[f5],        %[f5],        %[f8]                       \n\t"
+      "mul.s      %[f8],        %[f12],       %[f2]                       \n\t"
+      "mul.s      %[f2],        %[f11],       %[f2]                       \n\t"
+      "add.s      %[f7],        %[f4],        %[f7]                       \n\t"
+      "mul.s      %[f4],        %[f13],       %[f0]                       \n\t"
+      "mul.s      %[f0],        %[f14],       %[f0]                       \n\t"
+      "sub.s      %[f8],        %[f6],        %[f8]                       \n\t"
+      "mul.s      %[f6],        %[f14],       %[f1]                       \n\t"
+      "mul.s      %[f1],        %[f13],       %[f1]                       \n\t"
+      "add.s      %[f3],        %[f2],        %[f3]                       \n\t"
+      "swc1       %[f5],        64(%[tmp_a])                              \n\t"
+      "swc1       %[f7],        68(%[tmp_a])                              \n\t"
+      "sub.s      %[f6],        %[f4],        %[f6]                       \n\t"
+      "add.s      %[f0],        %[f1],        %[f0]                       \n\t"
+#endif
+      "swc1       %[f8],        32(%[tmp_a])                              \n\t"
+      "swc1       %[f3],        36(%[tmp_a])                              \n\t"
+      "swc1       %[f6],        96(%[tmp_a])                              \n\t"
+      "swc1       %[f0],        100(%[tmp_a])                             \n\t"
+      "bgtz       %[count],     1b                                        \n\t"
+      " addiu     %[tmp_a],     %[tmp_a],     8                           \n\t"
+      ".set       pop                                                     \n\t"
+      : [f0] "=&f"(f0), [f1] "=&f"(f1), [f2] "=&f"(f2), [f3] "=&f"(f3),
+        [f4] "=&f"(f4), [f5] "=&f"(f5), [f6] "=&f"(f6), [f7] "=&f"(f7),
+        [f8] "=&f"(f8), [tmp_a] "=&r"(tmp_a), [count] "=&r"(count)
+      : [a] "r"(a), [f9] "f"(f9), [f10] "f"(f10), [f11] "f"(f11),
+        [f12] "f"(f12), [f13] "f"(f13), [f14] "f"(f14)
+      : "memory");
+  f11 = rdft_w[6];
+  f12 = rdft_w[7];
+  f13 = rdft_wk3ri_second[2];
+  f14 = rdft_wk3ri_second[3];
+  __asm __volatile(
+      ".set       push                                                       "
+      "\n\t"
+      ".set       noreorder                                                  "
+      "\n\t"
+      "addiu      %[tmp_a],       %[a],           384                        "
+      "\n\t"
+      "addiu      %[count],       $zero,          4                          "
+      "\n\t"
+      "1:                                                                     "
+      "\n\t"
+      "addiu      %[count],       %[count],       -1                         "
+      "\n\t"
+      "lwc1       %[f0],          0(%[tmp_a])                                "
+      "\n\t"
+      "lwc1       %[f1],          4(%[tmp_a])                                "
+      "\n\t"
+      "lwc1       %[f2],          32(%[tmp_a])                               "
+      "\n\t"
+      "lwc1       %[f3],          36(%[tmp_a])                               "
+      "\n\t"
+      "lwc1       %[f4],          64(%[tmp_a])                               "
+      "\n\t"
+      "lwc1       %[f5],          68(%[tmp_a])                               "
+      "\n\t"
+      "lwc1       %[f6],          96(%[tmp_a])                               "
+      "\n\t"
+      "lwc1       %[f7],          100(%[tmp_a])                              "
+      "\n\t"
+      "add.s      %[f8],          %[f0],          %[f2]                      "
+      "\n\t"
+      "sub.s      %[f0],          %[f0],          %[f2]                      "
+      "\n\t"
+      "add.s      %[f2],          %[f4],          %[f6]                      "
+      "\n\t"
+      "sub.s      %[f4],          %[f4],          %[f6]                      "
+      "\n\t"
+      "add.s      %[f6],          %[f1],          %[f3]                      "
+      "\n\t"
+      "sub.s      %[f1],          %[f1],          %[f3]                      "
+      "\n\t"
+      "add.s      %[f3],          %[f5],          %[f7]                      "
+      "\n\t"
+      "sub.s      %[f5],          %[f5],          %[f7]                      "
+      "\n\t"
+      "sub.s      %[f7],          %[f2],          %[f8]                      "
+      "\n\t"
+      "add.s      %[f2],          %[f2],          %[f8]                      "
+      "\n\t"
+      "add.s      %[f8],          %[f1],          %[f4]                      "
+      "\n\t"
+      "sub.s      %[f1],          %[f1],          %[f4]                      "
+      "\n\t"
+      "sub.s      %[f4],          %[f3],          %[f6]                      "
+      "\n\t"
+      "add.s      %[f3],          %[f3],          %[f6]                      "
+      "\n\t"
+      "sub.s      %[f6],          %[f0],          %[f5]                      "
+      "\n\t"
+      "add.s      %[f0],          %[f0],          %[f5]                      "
+      "\n\t"
+      "swc1       %[f2],          0(%[tmp_a])                                "
+      "\n\t"
+      "swc1       %[f3],          4(%[tmp_a])                                "
+      "\n\t"
+      "mul.s      %[f5],          %[f10],         %[f7]                      "
+      "\n\t"
+#if defined(MIPS32_R2_LE)
+      "mul.s      %[f7],          %[f9],          %[f7]                      "
+      "\n\t"
+      "mul.s      %[f2],          %[f12],         %[f8]                      "
+      "\n\t"
+      "mul.s      %[f8],          %[f11],         %[f8]                      "
+      "\n\t"
+      "mul.s      %[f3],          %[f14],         %[f1]                      "
+      "\n\t"
+      "mul.s      %[f1],          %[f13],         %[f1]                      "
+      "\n\t"
+      "madd.s     %[f5],          %[f5],          %[f9],       %[f4]         "
+      "\n\t"
+      "msub.s     %[f7],          %[f7],          %[f10],      %[f4]         "
+      "\n\t"
+      "msub.s     %[f2],          %[f2],          %[f11],      %[f6]         "
+      "\n\t"
+      "madd.s     %[f8],          %[f8],          %[f12],      %[f6]         "
+      "\n\t"
+      "msub.s     %[f3],          %[f3],          %[f13],      %[f0]         "
+      "\n\t"
+      "madd.s     %[f1],          %[f1],          %[f14],      %[f0]         "
+      "\n\t"
+      "swc1       %[f5],          64(%[tmp_a])                               "
+      "\n\t"
+      "swc1       %[f7],          68(%[tmp_a])                               "
+      "\n\t"
+#else
+      "mul.s      %[f2],          %[f9],          %[f4]                      "
+      "\n\t"
+      "mul.s      %[f4],          %[f10],         %[f4]                      "
+      "\n\t"
+      "mul.s      %[f7],          %[f9],          %[f7]                      "
+      "\n\t"
+      "mul.s      %[f3],          %[f11],         %[f6]                      "
+      "\n\t"
+      "mul.s      %[f6],          %[f12],         %[f6]                      "
+      "\n\t"
+      "add.s      %[f5],          %[f5],          %[f2]                      "
+      "\n\t"
+      "sub.s      %[f7],          %[f4],          %[f7]                      "
+      "\n\t"
+      "mul.s      %[f2],          %[f12],         %[f8]                      "
+      "\n\t"
+      "mul.s      %[f8],          %[f11],         %[f8]                      "
+      "\n\t"
+      "mul.s      %[f4],          %[f14],         %[f1]                      "
+      "\n\t"
+      "mul.s      %[f1],          %[f13],         %[f1]                      "
+      "\n\t"
+      "sub.s      %[f2],          %[f3],          %[f2]                      "
+      "\n\t"
+      "mul.s      %[f3],          %[f13],         %[f0]                      "
+      "\n\t"
+      "mul.s      %[f0],          %[f14],         %[f0]                      "
+      "\n\t"
+      "add.s      %[f8],          %[f8],          %[f6]                      "
+      "\n\t"
+      "swc1       %[f5],          64(%[tmp_a])                               "
+      "\n\t"
+      "swc1       %[f7],          68(%[tmp_a])                               "
+      "\n\t"
+      "sub.s      %[f3],          %[f3],          %[f4]                      "
+      "\n\t"
+      "add.s      %[f1],          %[f1],          %[f0]                      "
+      "\n\t"
+#endif
+      "swc1       %[f2],          32(%[tmp_a])                               "
+      "\n\t"
+      "swc1       %[f8],          36(%[tmp_a])                               "
+      "\n\t"
+      "swc1       %[f3],          96(%[tmp_a])                               "
+      "\n\t"
+      "swc1       %[f1],          100(%[tmp_a])                              "
+      "\n\t"
+      "bgtz       %[count],       1b                                         "
+      "\n\t"
+      " addiu     %[tmp_a],       %[tmp_a],       8                          "
+      "\n\t"
+      ".set       pop                                                        "
+      "\n\t"
+      : [f0] "=&f"(f0), [f1] "=&f"(f1), [f2] "=&f"(f2), [f3] "=&f"(f3),
+        [f4] "=&f"(f4), [f5] "=&f"(f5), [f6] "=&f"(f6), [f7] "=&f"(f7),
+        [f8] "=&f"(f8), [tmp_a] "=&r"(tmp_a), [count] "=&r"(count)
+      : [a] "r"(a), [f9] "f"(f9), [f10] "f"(f10), [f11] "f"(f11),
+        [f12] "f"(f12), [f13] "f"(f13), [f14] "f"(f14)
+      : "memory");
+}
+
+void cftfsub_128_mips(float* a) {
+  float f0, f1, f2, f3, f4, f5, f6, f7, f8;
+  int tmp_a, count;
+
+  cft1st_128_mips(a);
+  cftmdl_128_mips(a);
+
+  __asm __volatile(
+      ".set       push                                      \n\t"
+      ".set       noreorder                                 \n\t"
+      "addiu      %[tmp_a],       %[a],         0           \n\t"
+      "addiu      %[count],       $zero,        16          \n\t"
+      "1:                                                    \n\t"
+      "addiu      %[count],       %[count],     -1          \n\t"
+      "lwc1       %[f0],          0(%[tmp_a])               \n\t"
+      "lwc1       %[f2],          128(%[tmp_a])             \n\t"
+      "lwc1       %[f4],          256(%[tmp_a])             \n\t"
+      "lwc1       %[f6],          384(%[tmp_a])             \n\t"
+      "lwc1       %[f1],          4(%[tmp_a])               \n\t"
+      "lwc1       %[f3],          132(%[tmp_a])             \n\t"
+      "lwc1       %[f5],          260(%[tmp_a])             \n\t"
+      "lwc1       %[f7],          388(%[tmp_a])             \n\t"
+      "add.s      %[f8],          %[f0],        %[f2]       \n\t"
+      "sub.s      %[f0],          %[f0],        %[f2]       \n\t"
+      "add.s      %[f2],          %[f4],        %[f6]       \n\t"
+      "sub.s      %[f4],          %[f4],        %[f6]       \n\t"
+      "add.s      %[f6],          %[f1],        %[f3]       \n\t"
+      "sub.s      %[f1],          %[f1],        %[f3]       \n\t"
+      "add.s      %[f3],          %[f5],        %[f7]       \n\t"
+      "sub.s      %[f5],          %[f5],        %[f7]       \n\t"
+      "add.s      %[f7],          %[f8],        %[f2]       \n\t"
+      "sub.s      %[f8],          %[f8],        %[f2]       \n\t"
+      "add.s      %[f2],          %[f1],        %[f4]       \n\t"
+      "sub.s      %[f1],          %[f1],        %[f4]       \n\t"
+      "add.s      %[f4],          %[f6],        %[f3]       \n\t"
+      "sub.s      %[f6],          %[f6],        %[f3]       \n\t"
+      "sub.s      %[f3],          %[f0],        %[f5]       \n\t"
+      "add.s      %[f0],          %[f0],        %[f5]       \n\t"
+      "swc1       %[f7],          0(%[tmp_a])               \n\t"
+      "swc1       %[f8],          256(%[tmp_a])             \n\t"
+      "swc1       %[f2],          132(%[tmp_a])             \n\t"
+      "swc1       %[f1],          388(%[tmp_a])             \n\t"
+      "swc1       %[f4],          4(%[tmp_a])               \n\t"
+      "swc1       %[f6],          260(%[tmp_a])             \n\t"
+      "swc1       %[f3],          128(%[tmp_a])             \n\t"
+      "swc1       %[f0],          384(%[tmp_a])             \n\t"
+      "bgtz       %[count],       1b                        \n\t"
+      " addiu     %[tmp_a],       %[tmp_a],   8             \n\t"
+      ".set       pop                                       \n\t"
+      : [f0] "=&f"(f0), [f1] "=&f"(f1), [f2] "=&f"(f2), [f3] "=&f"(f3),
+        [f4] "=&f"(f4), [f5] "=&f"(f5), [f6] "=&f"(f6), [f7] "=&f"(f7),
+        [f8] "=&f"(f8), [tmp_a] "=&r"(tmp_a), [count] "=&r"(count)
+      : [a] "r"(a)
+      : "memory");
+}
+
+void cftbsub_128_mips(float* a) {
+  float f0, f1, f2, f3, f4, f5, f6, f7, f8;
+  int tmp_a, count;
+
+  cft1st_128_mips(a);
+  cftmdl_128_mips(a);
+
+  __asm __volatile(
+      ".set       push                                        \n\t"
+      ".set       noreorder                                   \n\t"
+      "addiu      %[tmp_a],   %[a],           0               \n\t"
+      "addiu      %[count],   $zero,          16              \n\t"
+      "1:                                                      \n\t"
+      "addiu      %[count],   %[count],       -1              \n\t"
+      "lwc1       %[f0],      0(%[tmp_a])                     \n\t"
+      "lwc1       %[f2],      128(%[tmp_a])                   \n\t"
+      "lwc1       %[f4],      256(%[tmp_a])                   \n\t"
+      "lwc1       %[f6],      384(%[tmp_a])                   \n\t"
+      "lwc1       %[f1],      4(%[tmp_a])                     \n\t"
+      "lwc1       %[f3],      132(%[tmp_a])                   \n\t"
+      "lwc1       %[f5],      260(%[tmp_a])                   \n\t"
+      "lwc1       %[f7],      388(%[tmp_a])                   \n\t"
+      "add.s      %[f8],      %[f0],          %[f2]           \n\t"
+      "sub.s      %[f0],      %[f0],          %[f2]           \n\t"
+      "add.s      %[f2],      %[f4],          %[f6]           \n\t"
+      "sub.s      %[f4],      %[f4],          %[f6]           \n\t"
+      "add.s      %[f6],      %[f1],          %[f3]           \n\t"
+      "sub.s      %[f1],      %[f3],          %[f1]           \n\t"
+      "add.s      %[f3],      %[f5],          %[f7]           \n\t"
+      "sub.s      %[f5],      %[f5],          %[f7]           \n\t"
+      "add.s      %[f7],      %[f8],          %[f2]           \n\t"
+      "sub.s      %[f8],      %[f8],          %[f2]           \n\t"
+      "sub.s      %[f2],      %[f1],          %[f4]           \n\t"
+      "add.s      %[f1],      %[f1],          %[f4]           \n\t"
+      "add.s      %[f4],      %[f3],          %[f6]           \n\t"
+      "sub.s      %[f6],      %[f3],          %[f6]           \n\t"
+      "sub.s      %[f3],      %[f0],          %[f5]           \n\t"
+      "add.s      %[f0],      %[f0],          %[f5]           \n\t"
+      "neg.s      %[f4],      %[f4]                           \n\t"
+      "swc1       %[f7],      0(%[tmp_a])                     \n\t"
+      "swc1       %[f8],      256(%[tmp_a])                   \n\t"
+      "swc1       %[f2],      132(%[tmp_a])                   \n\t"
+      "swc1       %[f1],      388(%[tmp_a])                   \n\t"
+      "swc1       %[f6],      260(%[tmp_a])                   \n\t"
+      "swc1       %[f3],      128(%[tmp_a])                   \n\t"
+      "swc1       %[f0],      384(%[tmp_a])                   \n\t"
+      "swc1       %[f4],       4(%[tmp_a])                     \n\t"
+      "bgtz       %[count],   1b                              \n\t"
+      " addiu     %[tmp_a],   %[tmp_a],       8               \n\t"
+      ".set       pop                                         \n\t"
+      : [f0] "=&f"(f0), [f1] "=&f"(f1), [f2] "=&f"(f2), [f3] "=&f"(f3),
+        [f4] "=&f"(f4), [f5] "=&f"(f5), [f6] "=&f"(f6), [f7] "=&f"(f7),
+        [f8] "=&f"(f8), [tmp_a] "=&r"(tmp_a), [count] "=&r"(count)
+      : [a] "r"(a)
+      : "memory");
+}
+
+void rftfsub_128_mips(float* a) {
+  const float* c = rdft_w + 32;
+  const float f0 = 0.5f;
+  float* a1 = &a[2];
+  float* a2 = &a[126];
+  const float* c1 = &c[1];
+  const float* c2 = &c[31];
+  float f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15;
+  int count;
+
+  __asm __volatile(
+      ".set      push                                             \n\t"
+      ".set      noreorder                                        \n\t"
+      "lwc1      %[f6],       0(%[c2])                            \n\t"
+      "lwc1      %[f1],       0(%[a1])                            \n\t"
+      "lwc1      %[f2],       0(%[a2])                            \n\t"
+      "lwc1      %[f3],       4(%[a1])                            \n\t"
+      "lwc1      %[f4],       4(%[a2])                            \n\t"
+      "lwc1      %[f5],       0(%[c1])                            \n\t"
+      "sub.s     %[f6],       %[f0],        %[f6]                 \n\t"
+      "sub.s     %[f7],       %[f1],        %[f2]                 \n\t"
+      "add.s     %[f8],       %[f3],        %[f4]                 \n\t"
+      "addiu     %[count],    $zero,        15                    \n\t"
+      "mul.s     %[f9],       %[f6],        %[f7]                 \n\t"
+      "mul.s     %[f6],       %[f6],        %[f8]                 \n\t"
+#if !defined(MIPS32_R2_LE)
+      "mul.s     %[f8],       %[f5],        %[f8]                 \n\t"
+      "mul.s     %[f5],       %[f5],        %[f7]                 \n\t"
+      "sub.s     %[f9],       %[f9],        %[f8]                 \n\t"
+      "add.s     %[f6],       %[f6],        %[f5]                 \n\t"
+#else
+      "nmsub.s   %[f9],       %[f9],        %[f5],      %[f8]     \n\t"
+      "madd.s    %[f6],       %[f6],        %[f5],      %[f7]     \n\t"
+#endif
+      "sub.s     %[f1],       %[f1],        %[f9]                 \n\t"
+      "add.s     %[f2],       %[f2],        %[f9]                 \n\t"
+      "sub.s     %[f3],       %[f3],        %[f6]                 \n\t"
+      "sub.s     %[f4],       %[f4],        %[f6]                 \n\t"
+      "swc1      %[f1],       0(%[a1])                            \n\t"
+      "swc1      %[f2],       0(%[a2])                            \n\t"
+      "swc1      %[f3],       4(%[a1])                            \n\t"
+      "swc1      %[f4],       4(%[a2])                            \n\t"
+      "addiu     %[a1],       %[a1],        8                     \n\t"
+      "addiu     %[a2],       %[a2],        -8                    \n\t"
+      "addiu     %[c1],       %[c1],        4                     \n\t"
+      "addiu     %[c2],       %[c2],        -4                    \n\t"
+      "1:                                                          \n\t"
+      "lwc1      %[f6],       0(%[c2])                            \n\t"
+      "lwc1      %[f1],       0(%[a1])                            \n\t"
+      "lwc1      %[f2],       0(%[a2])                            \n\t"
+      "lwc1      %[f3],       4(%[a1])                            \n\t"
+      "lwc1      %[f4],       4(%[a2])                            \n\t"
+      "lwc1      %[f5],       0(%[c1])                            \n\t"
+      "sub.s     %[f6],       %[f0],        %[f6]                 \n\t"
+      "sub.s     %[f7],       %[f1],        %[f2]                 \n\t"
+      "add.s     %[f8],       %[f3],        %[f4]                 \n\t"
+      "lwc1      %[f10],      -4(%[c2])                           \n\t"
+      "lwc1      %[f11],      8(%[a1])                            \n\t"
+      "lwc1      %[f12],      -8(%[a2])                           \n\t"
+      "mul.s     %[f9],       %[f6],        %[f7]                 \n\t"
+      "mul.s     %[f6],       %[f6],        %[f8]                 \n\t"
+#if !defined(MIPS32_R2_LE)
+      "mul.s     %[f8],       %[f5],        %[f8]                 \n\t"
+      "mul.s     %[f5],       %[f5],        %[f7]                 \n\t"
+      "lwc1      %[f13],      12(%[a1])                           \n\t"
+      "lwc1      %[f14],      -4(%[a2])                           \n\t"
+      "lwc1      %[f15],      4(%[c1])                            \n\t"
+      "sub.s     %[f9],       %[f9],        %[f8]                 \n\t"
+      "add.s     %[f6],       %[f6],        %[f5]                 \n\t"
+#else
+      "lwc1      %[f13],      12(%[a1])                           \n\t"
+      "lwc1      %[f14],      -4(%[a2])                           \n\t"
+      "lwc1      %[f15],      4(%[c1])                            \n\t"
+      "nmsub.s   %[f9],       %[f9],        %[f5],      %[f8]     \n\t"
+      "madd.s    %[f6],       %[f6],        %[f5],      %[f7]     \n\t"
+#endif
+      "sub.s     %[f10],      %[f0],        %[f10]                \n\t"
+      "sub.s     %[f5],       %[f11],       %[f12]                \n\t"
+      "add.s     %[f7],       %[f13],       %[f14]                \n\t"
+      "sub.s     %[f1],       %[f1],        %[f9]                 \n\t"
+      "add.s     %[f2],       %[f2],        %[f9]                 \n\t"
+      "sub.s     %[f3],       %[f3],        %[f6]                 \n\t"
+      "mul.s     %[f8],       %[f10],       %[f5]                 \n\t"
+      "mul.s     %[f10],      %[f10],       %[f7]                 \n\t"
+#if !defined(MIPS32_R2_LE)
+      "mul.s     %[f9],       %[f15],       %[f7]                 \n\t"
+      "mul.s     %[f15],      %[f15],       %[f5]                 \n\t"
+      "sub.s     %[f4],       %[f4],        %[f6]                 \n\t"
+      "swc1      %[f1],       0(%[a1])                            \n\t"
+      "swc1      %[f2],       0(%[a2])                            \n\t"
+      "sub.s     %[f8],       %[f8],        %[f9]                 \n\t"
+      "add.s     %[f10],      %[f10],       %[f15]                \n\t"
+#else
+      "swc1      %[f1],       0(%[a1])                            \n\t"
+      "swc1      %[f2],       0(%[a2])                            \n\t"
+      "sub.s     %[f4],       %[f4],        %[f6]                 \n\t"
+      "nmsub.s   %[f8],       %[f8],        %[f15],     %[f7]     \n\t"
+      "madd.s    %[f10],      %[f10],       %[f15],     %[f5]     \n\t"
+#endif
+      "swc1      %[f3],       4(%[a1])                            \n\t"
+      "swc1      %[f4],       4(%[a2])                            \n\t"
+      "sub.s     %[f11],      %[f11],       %[f8]                 \n\t"
+      "add.s     %[f12],      %[f12],       %[f8]                 \n\t"
+      "sub.s     %[f13],      %[f13],       %[f10]                \n\t"
+      "sub.s     %[f14],      %[f14],       %[f10]                \n\t"
+      "addiu     %[c2],       %[c2],        -8                    \n\t"
+      "addiu     %[c1],       %[c1],        8                     \n\t"
+      "swc1      %[f11],      8(%[a1])                            \n\t"
+      "swc1      %[f12],      -8(%[a2])                           \n\t"
+      "swc1      %[f13],      12(%[a1])                           \n\t"
+      "swc1      %[f14],      -4(%[a2])                           \n\t"
+      "addiu     %[a1],       %[a1],        16                    \n\t"
+      "addiu     %[count],    %[count],     -1                    \n\t"
+      "bgtz      %[count],    1b                                  \n\t"
+      " addiu    %[a2],       %[a2],        -16                   \n\t"
+      ".set      pop                                              \n\t"
+      : [a1] "+r"(a1), [a2] "+r"(a2), [c1] "+r"(c1), [c2] "+r"(c2),
+        [f1] "=&f"(f1), [f2] "=&f"(f2), [f3] "=&f"(f3), [f4] "=&f"(f4),
+        [f5] "=&f"(f5), [f6] "=&f"(f6), [f7] "=&f"(f7), [f8] "=&f"(f8),
+        [f9] "=&f"(f9), [f10] "=&f"(f10), [f11] "=&f"(f11), [f12] "=&f"(f12),
+        [f13] "=&f"(f13), [f14] "=&f"(f14), [f15] "=&f"(f15),
+        [count] "=&r"(count)
+      : [f0] "f"(f0)
+      : "memory");
+}
+
+void rftbsub_128_mips(float* a) {
+  const float* c = rdft_w + 32;
+  const float f0 = 0.5f;
+  float* a1 = &a[2];
+  float* a2 = &a[126];
+  const float* c1 = &c[1];
+  const float* c2 = &c[31];
+  float f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15;
+  int count;
+
+  a[1] = -a[1];
+  a[65] = -a[65];
+
+  __asm __volatile(
+      ".set      push                                             \n\t"
+      ".set      noreorder                                        \n\t"
+      "lwc1      %[f6],       0(%[c2])                            \n\t"
+      "lwc1      %[f1],       0(%[a1])                            \n\t"
+      "lwc1      %[f2],       0(%[a2])                            \n\t"
+      "lwc1      %[f3],       4(%[a1])                            \n\t"
+      "lwc1      %[f4],       4(%[a2])                            \n\t"
+      "lwc1      %[f5],       0(%[c1])                            \n\t"
+      "sub.s     %[f6],       %[f0],        %[f6]                 \n\t"
+      "sub.s     %[f7],       %[f1],        %[f2]                 \n\t"
+      "add.s     %[f8],       %[f3],        %[f4]                 \n\t"
+      "addiu     %[count],    $zero,        15                    \n\t"
+      "mul.s     %[f9],       %[f6],        %[f7]                 \n\t"
+      "mul.s     %[f6],       %[f6],        %[f8]                 \n\t"
+#if !defined(MIPS32_R2_LE)
+      "mul.s     %[f8],       %[f5],        %[f8]                 \n\t"
+      "mul.s     %[f5],       %[f5],        %[f7]                 \n\t"
+      "add.s     %[f9],       %[f9],        %[f8]                 \n\t"
+      "sub.s     %[f6],       %[f6],        %[f5]                 \n\t"
+#else
+      "madd.s    %[f9],       %[f9],        %[f5],      %[f8]     \n\t"
+      "nmsub.s   %[f6],       %[f6],        %[f5],      %[f7]     \n\t"
+#endif
+      "sub.s     %[f1],       %[f1],        %[f9]                 \n\t"
+      "add.s     %[f2],       %[f2],        %[f9]                 \n\t"
+      "sub.s     %[f3],       %[f6],        %[f3]                 \n\t"
+      "sub.s     %[f4],       %[f6],        %[f4]                 \n\t"
+      "swc1      %[f1],       0(%[a1])                            \n\t"
+      "swc1      %[f2],       0(%[a2])                            \n\t"
+      "swc1      %[f3],       4(%[a1])                            \n\t"
+      "swc1      %[f4],       4(%[a2])                            \n\t"
+      "addiu     %[a1],       %[a1],        8                     \n\t"
+      "addiu     %[a2],       %[a2],        -8                    \n\t"
+      "addiu     %[c1],       %[c1],        4                     \n\t"
+      "addiu     %[c2],       %[c2],        -4                    \n\t"
+      "1:                                                          \n\t"
+      "lwc1      %[f6],       0(%[c2])                            \n\t"
+      "lwc1      %[f1],       0(%[a1])                            \n\t"
+      "lwc1      %[f2],       0(%[a2])                            \n\t"
+      "lwc1      %[f3],       4(%[a1])                            \n\t"
+      "lwc1      %[f4],       4(%[a2])                            \n\t"
+      "lwc1      %[f5],       0(%[c1])                            \n\t"
+      "sub.s     %[f6],       %[f0],        %[f6]                 \n\t"
+      "sub.s     %[f7],       %[f1],        %[f2]                 \n\t"
+      "add.s     %[f8],       %[f3],        %[f4]                 \n\t"
+      "lwc1      %[f10],      -4(%[c2])                           \n\t"
+      "lwc1      %[f11],      8(%[a1])                            \n\t"
+      "lwc1      %[f12],      -8(%[a2])                           \n\t"
+      "mul.s     %[f9],       %[f6],        %[f7]                 \n\t"
+      "mul.s     %[f6],       %[f6],        %[f8]                 \n\t"
+#if !defined(MIPS32_R2_LE)
+      "mul.s     %[f8],       %[f5],        %[f8]                 \n\t"
+      "mul.s     %[f5],       %[f5],        %[f7]                 \n\t"
+      "lwc1      %[f13],      12(%[a1])                           \n\t"
+      "lwc1      %[f14],      -4(%[a2])                           \n\t"
+      "lwc1      %[f15],      4(%[c1])                            \n\t"
+      "add.s     %[f9],       %[f9],        %[f8]                 \n\t"
+      "sub.s     %[f6],       %[f6],        %[f5]                 \n\t"
+#else
+      "lwc1      %[f13],      12(%[a1])                           \n\t"
+      "lwc1      %[f14],      -4(%[a2])                           \n\t"
+      "lwc1      %[f15],      4(%[c1])                            \n\t"
+      "madd.s    %[f9],       %[f9],        %[f5],      %[f8]     \n\t"
+      "nmsub.s   %[f6],       %[f6],        %[f5],      %[f7]     \n\t"
+#endif
+      "sub.s     %[f10],      %[f0],        %[f10]                \n\t"
+      "sub.s     %[f5],       %[f11],       %[f12]                \n\t"
+      "add.s     %[f7],       %[f13],       %[f14]                \n\t"
+      "sub.s     %[f1],       %[f1],        %[f9]                 \n\t"
+      "add.s     %[f2],       %[f2],        %[f9]                 \n\t"
+      "sub.s     %[f3],       %[f6],        %[f3]                 \n\t"
+      "mul.s     %[f8],       %[f10],       %[f5]                 \n\t"
+      "mul.s     %[f10],      %[f10],       %[f7]                 \n\t"
+#if !defined(MIPS32_R2_LE)
+      "mul.s     %[f9],       %[f15],       %[f7]                 \n\t"
+      "mul.s     %[f15],      %[f15],       %[f5]                 \n\t"
+      "sub.s     %[f4],       %[f6],        %[f4]                 \n\t"
+      "swc1      %[f1],       0(%[a1])                            \n\t"
+      "swc1      %[f2],       0(%[a2])                            \n\t"
+      "add.s     %[f8],       %[f8],        %[f9]                 \n\t"
+      "sub.s     %[f10],      %[f10],       %[f15]                \n\t"
+#else
+      "swc1      %[f1],       0(%[a1])                            \n\t"
+      "swc1      %[f2],       0(%[a2])                            \n\t"
+      "sub.s     %[f4],       %[f6],        %[f4]                 \n\t"
+      "madd.s    %[f8],       %[f8],        %[f15],     %[f7]     \n\t"
+      "nmsub.s   %[f10],      %[f10],       %[f15],     %[f5]     \n\t"
+#endif
+      "swc1      %[f3],       4(%[a1])                            \n\t"
+      "swc1      %[f4],       4(%[a2])                            \n\t"
+      "sub.s     %[f11],      %[f11],       %[f8]                 \n\t"
+      "add.s     %[f12],      %[f12],       %[f8]                 \n\t"
+      "sub.s     %[f13],      %[f10],       %[f13]                \n\t"
+      "sub.s     %[f14],      %[f10],       %[f14]                \n\t"
+      "addiu     %[c2],       %[c2],        -8                    \n\t"
+      "addiu     %[c1],       %[c1],        8                     \n\t"
+      "swc1      %[f11],      8(%[a1])                            \n\t"
+      "swc1      %[f12],      -8(%[a2])                           \n\t"
+      "swc1      %[f13],      12(%[a1])                           \n\t"
+      "swc1      %[f14],      -4(%[a2])                           \n\t"
+      "addiu     %[a1],       %[a1],        16                    \n\t"
+      "addiu     %[count],    %[count],     -1                    \n\t"
+      "bgtz      %[count],    1b                                  \n\t"
+      " addiu    %[a2],       %[a2],        -16                   \n\t"
+      ".set      pop                                              \n\t"
+      : [a1] "+r"(a1), [a2] "+r"(a2), [c1] "+r"(c1), [c2] "+r"(c2),
+        [f1] "=&f"(f1), [f2] "=&f"(f2), [f3] "=&f"(f3), [f4] "=&f"(f4),
+        [f5] "=&f"(f5), [f6] "=&f"(f6), [f7] "=&f"(f7), [f8] "=&f"(f8),
+        [f9] "=&f"(f9), [f10] "=&f"(f10), [f11] "=&f"(f11), [f12] "=&f"(f12),
+        [f13] "=&f"(f13), [f14] "=&f"(f14), [f15] "=&f"(f15),
+        [count] "=&r"(count)
+      : [f0] "f"(f0)
+      : "memory");
+}
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,351 @@
+/*
+ *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+/*
+ * The rdft AEC algorithm, neon version of speed-critical functions.
+ *
+ * Based on the sse2 version.
+ */
+
+#include <arm_neon.h>
+
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft.h"
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_common.h"
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_neon_sse2.h"
+
+namespace webrtc {
+
+#if defined(WEBRTC_HAS_NEON)
+void cft1st_128_neon(float* a) {
+  const float32x4_t vec_swap_sign = vld1q_f32((float32_t*)k_swap_sign);
+  int j, k2;
+
+  for (k2 = 0, j = 0; j < 128; j += 16, k2 += 4) {
+    float32x4_t a00v = vld1q_f32(&a[j + 0]);
+    float32x4_t a04v = vld1q_f32(&a[j + 4]);
+    float32x4_t a08v = vld1q_f32(&a[j + 8]);
+    float32x4_t a12v = vld1q_f32(&a[j + 12]);
+    float32x4_t a01v = vcombine_f32(vget_low_f32(a00v), vget_low_f32(a08v));
+    float32x4_t a23v = vcombine_f32(vget_high_f32(a00v), vget_high_f32(a08v));
+    float32x4_t a45v = vcombine_f32(vget_low_f32(a04v), vget_low_f32(a12v));
+    float32x4_t a67v = vcombine_f32(vget_high_f32(a04v), vget_high_f32(a12v));
+    const float32x4_t wk1rv = vld1q_f32(&rdft_wk1r[k2]);
+    const float32x4_t wk1iv = vld1q_f32(&rdft_wk1i[k2]);
+    const float32x4_t wk2rv = vld1q_f32(&rdft_wk2r[k2]);
+    const float32x4_t wk2iv = vld1q_f32(&rdft_wk2i[k2]);
+    const float32x4_t wk3rv = vld1q_f32(&rdft_wk3r[k2]);
+    const float32x4_t wk3iv = vld1q_f32(&rdft_wk3i[k2]);
+    float32x4_t x0v = vaddq_f32(a01v, a23v);
+    const float32x4_t x1v = vsubq_f32(a01v, a23v);
+    const float32x4_t x2v = vaddq_f32(a45v, a67v);
+    const float32x4_t x3v = vsubq_f32(a45v, a67v);
+    const float32x4_t x3w = vrev64q_f32(x3v);
+    float32x4_t x0w;
+    a01v = vaddq_f32(x0v, x2v);
+    x0v = vsubq_f32(x0v, x2v);
+    x0w = vrev64q_f32(x0v);
+    a45v = vmulq_f32(wk2rv, x0v);
+    a45v = vmlaq_f32(a45v, wk2iv, x0w);
+    x0v = vmlaq_f32(x1v, x3w, vec_swap_sign);
+    x0w = vrev64q_f32(x0v);
+    a23v = vmulq_f32(wk1rv, x0v);
+    a23v = vmlaq_f32(a23v, wk1iv, x0w);
+    x0v = vmlsq_f32(x1v, x3w, vec_swap_sign);
+    x0w = vrev64q_f32(x0v);
+    a67v = vmulq_f32(wk3rv, x0v);
+    a67v = vmlaq_f32(a67v, wk3iv, x0w);
+    a00v = vcombine_f32(vget_low_f32(a01v), vget_low_f32(a23v));
+    a04v = vcombine_f32(vget_low_f32(a45v), vget_low_f32(a67v));
+    a08v = vcombine_f32(vget_high_f32(a01v), vget_high_f32(a23v));
+    a12v = vcombine_f32(vget_high_f32(a45v), vget_high_f32(a67v));
+    vst1q_f32(&a[j + 0], a00v);
+    vst1q_f32(&a[j + 4], a04v);
+    vst1q_f32(&a[j + 8], a08v);
+    vst1q_f32(&a[j + 12], a12v);
+  }
+}
+
+void cftmdl_128_neon(float* a) {
+  int j;
+  const int l = 8;
+  const float32x4_t vec_swap_sign = vld1q_f32((float32_t*)k_swap_sign);
+  float32x4_t wk1rv = vld1q_f32(cftmdl_wk1r);
+
+  for (j = 0; j < l; j += 2) {
+    const float32x2_t a_00 = vld1_f32(&a[j + 0]);
+    const float32x2_t a_08 = vld1_f32(&a[j + 8]);
+    const float32x2_t a_32 = vld1_f32(&a[j + 32]);
+    const float32x2_t a_40 = vld1_f32(&a[j + 40]);
+    const float32x4_t a_00_32 = vcombine_f32(a_00, a_32);
+    const float32x4_t a_08_40 = vcombine_f32(a_08, a_40);
+    const float32x4_t x0r0_0i0_0r1_x0i1 = vaddq_f32(a_00_32, a_08_40);
+    const float32x4_t x1r0_1i0_1r1_x1i1 = vsubq_f32(a_00_32, a_08_40);
+    const float32x2_t a_16 = vld1_f32(&a[j + 16]);
+    const float32x2_t a_24 = vld1_f32(&a[j + 24]);
+    const float32x2_t a_48 = vld1_f32(&a[j + 48]);
+    const float32x2_t a_56 = vld1_f32(&a[j + 56]);
+    const float32x4_t a_16_48 = vcombine_f32(a_16, a_48);
+    const float32x4_t a_24_56 = vcombine_f32(a_24, a_56);
+    const float32x4_t x2r0_2i0_2r1_x2i1 = vaddq_f32(a_16_48, a_24_56);
+    const float32x4_t x3r0_3i0_3r1_x3i1 = vsubq_f32(a_16_48, a_24_56);
+    const float32x4_t xx0 = vaddq_f32(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
+    const float32x4_t xx1 = vsubq_f32(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
+    const float32x4_t x3i0_3r0_3i1_x3r1 = vrev64q_f32(x3r0_3i0_3r1_x3i1);
+    const float32x4_t x1_x3_add =
+        vmlaq_f32(x1r0_1i0_1r1_x1i1, vec_swap_sign, x3i0_3r0_3i1_x3r1);
+    const float32x4_t x1_x3_sub =
+        vmlsq_f32(x1r0_1i0_1r1_x1i1, vec_swap_sign, x3i0_3r0_3i1_x3r1);
+    const float32x2_t yy0_a = vdup_lane_f32(vget_high_f32(x1_x3_add), 0);
+    const float32x2_t yy0_s = vdup_lane_f32(vget_high_f32(x1_x3_sub), 0);
+    const float32x4_t yy0_as = vcombine_f32(yy0_a, yy0_s);
+    const float32x2_t yy1_a = vdup_lane_f32(vget_high_f32(x1_x3_add), 1);
+    const float32x2_t yy1_s = vdup_lane_f32(vget_high_f32(x1_x3_sub), 1);
+    const float32x4_t yy1_as = vcombine_f32(yy1_a, yy1_s);
+    const float32x4_t yy0 = vmlaq_f32(yy0_as, vec_swap_sign, yy1_as);
+    const float32x4_t yy4 = vmulq_f32(wk1rv, yy0);
+    const float32x4_t xx1_rev = vrev64q_f32(xx1);
+    const float32x4_t yy4_rev = vrev64q_f32(yy4);
+
+    vst1_f32(&a[j + 0], vget_low_f32(xx0));
+    vst1_f32(&a[j + 32], vget_high_f32(xx0));
+    vst1_f32(&a[j + 16], vget_low_f32(xx1));
+    vst1_f32(&a[j + 48], vget_high_f32(xx1_rev));
+
+    a[j + 48] = -a[j + 48];
+
+    vst1_f32(&a[j + 8], vget_low_f32(x1_x3_add));
+    vst1_f32(&a[j + 24], vget_low_f32(x1_x3_sub));
+    vst1_f32(&a[j + 40], vget_low_f32(yy4));
+    vst1_f32(&a[j + 56], vget_high_f32(yy4_rev));
+  }
+
+  {
+    const int k = 64;
+    const int k1 = 2;
+    const int k2 = 2 * k1;
+    const float32x4_t wk2rv = vld1q_f32(&rdft_wk2r[k2 + 0]);
+    const float32x4_t wk2iv = vld1q_f32(&rdft_wk2i[k2 + 0]);
+    const float32x4_t wk1iv = vld1q_f32(&rdft_wk1i[k2 + 0]);
+    const float32x4_t wk3rv = vld1q_f32(&rdft_wk3r[k2 + 0]);
+    const float32x4_t wk3iv = vld1q_f32(&rdft_wk3i[k2 + 0]);
+    wk1rv = vld1q_f32(&rdft_wk1r[k2 + 0]);
+    for (j = k; j < l + k; j += 2) {
+      const float32x2_t a_00 = vld1_f32(&a[j + 0]);
+      const float32x2_t a_08 = vld1_f32(&a[j + 8]);
+      const float32x2_t a_32 = vld1_f32(&a[j + 32]);
+      const float32x2_t a_40 = vld1_f32(&a[j + 40]);
+      const float32x4_t a_00_32 = vcombine_f32(a_00, a_32);
+      const float32x4_t a_08_40 = vcombine_f32(a_08, a_40);
+      const float32x4_t x0r0_0i0_0r1_x0i1 = vaddq_f32(a_00_32, a_08_40);
+      const float32x4_t x1r0_1i0_1r1_x1i1 = vsubq_f32(a_00_32, a_08_40);
+      const float32x2_t a_16 = vld1_f32(&a[j + 16]);
+      const float32x2_t a_24 = vld1_f32(&a[j + 24]);
+      const float32x2_t a_48 = vld1_f32(&a[j + 48]);
+      const float32x2_t a_56 = vld1_f32(&a[j + 56]);
+      const float32x4_t a_16_48 = vcombine_f32(a_16, a_48);
+      const float32x4_t a_24_56 = vcombine_f32(a_24, a_56);
+      const float32x4_t x2r0_2i0_2r1_x2i1 = vaddq_f32(a_16_48, a_24_56);
+      const float32x4_t x3r0_3i0_3r1_x3i1 = vsubq_f32(a_16_48, a_24_56);
+      const float32x4_t xx = vaddq_f32(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
+      const float32x4_t xx1 = vsubq_f32(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
+      const float32x4_t x3i0_3r0_3i1_x3r1 = vrev64q_f32(x3r0_3i0_3r1_x3i1);
+      const float32x4_t x1_x3_add =
+          vmlaq_f32(x1r0_1i0_1r1_x1i1, vec_swap_sign, x3i0_3r0_3i1_x3r1);
+      const float32x4_t x1_x3_sub =
+          vmlsq_f32(x1r0_1i0_1r1_x1i1, vec_swap_sign, x3i0_3r0_3i1_x3r1);
+      float32x4_t xx4 = vmulq_f32(wk2rv, xx1);
+      float32x4_t xx12 = vmulq_f32(wk1rv, x1_x3_add);
+      float32x4_t xx22 = vmulq_f32(wk3rv, x1_x3_sub);
+      xx4 = vmlaq_f32(xx4, wk2iv, vrev64q_f32(xx1));
+      xx12 = vmlaq_f32(xx12, wk1iv, vrev64q_f32(x1_x3_add));
+      xx22 = vmlaq_f32(xx22, wk3iv, vrev64q_f32(x1_x3_sub));
+
+      vst1_f32(&a[j + 0], vget_low_f32(xx));
+      vst1_f32(&a[j + 32], vget_high_f32(xx));
+      vst1_f32(&a[j + 16], vget_low_f32(xx4));
+      vst1_f32(&a[j + 48], vget_high_f32(xx4));
+      vst1_f32(&a[j + 8], vget_low_f32(xx12));
+      vst1_f32(&a[j + 40], vget_high_f32(xx12));
+      vst1_f32(&a[j + 24], vget_low_f32(xx22));
+      vst1_f32(&a[j + 56], vget_high_f32(xx22));
+    }
+  }
+}
+
+__inline static float32x4_t reverse_order_f32x4(float32x4_t in) {
+  // A B C D -> C D A B
+  const float32x4_t rev = vcombine_f32(vget_high_f32(in), vget_low_f32(in));
+  // C D A B -> D C B A
+  return vrev64q_f32(rev);
+}
+
+void rftfsub_128_neon(float* a) {
+  const float* c = rdft_w + 32;
+  int j1, j2;
+  const float32x4_t mm_half = vdupq_n_f32(0.5f);
+
+  // Vectorized code (four at once).
+  // Note: commented number are indexes for the first iteration of the loop.
+  for (j1 = 1, j2 = 2; j2 + 7 < 64; j1 += 4, j2 += 8) {
+    // Load 'wk'.
+    const float32x4_t c_j1 = vld1q_f32(&c[j1]);          //  1,  2,  3,  4,
+    const float32x4_t c_k1 = vld1q_f32(&c[29 - j1]);     // 28, 29, 30, 31,
+    const float32x4_t wkrt = vsubq_f32(mm_half, c_k1);   // 28, 29, 30, 31,
+    const float32x4_t wkr_ = reverse_order_f32x4(wkrt);  // 31, 30, 29, 28,
+    const float32x4_t wki_ = c_j1;                       //  1,  2,  3,  4,
+    // Load and shuffle 'a'.
+    //   2,   4,   6,   8,   3,   5,   7,   9
+    float32x4x2_t a_j2_p = vld2q_f32(&a[0 + j2]);
+    // 120, 122, 124, 126, 121, 123, 125, 127,
+    const float32x4x2_t k2_0_4 = vld2q_f32(&a[122 - j2]);
+    // 126, 124, 122, 120
+    const float32x4_t a_k2_p0 = reverse_order_f32x4(k2_0_4.val[0]);
+    // 127, 125, 123, 121
+    const float32x4_t a_k2_p1 = reverse_order_f32x4(k2_0_4.val[1]);
+    // Calculate 'x'.
+    const float32x4_t xr_ = vsubq_f32(a_j2_p.val[0], a_k2_p0);
+    // 2-126, 4-124, 6-122, 8-120,
+    const float32x4_t xi_ = vaddq_f32(a_j2_p.val[1], a_k2_p1);
+    // 3-127, 5-125, 7-123, 9-121,
+    // Calculate product into 'y'.
+    //    yr = wkr * xr - wki * xi;
+    //    yi = wkr * xi + wki * xr;
+    const float32x4_t a_ = vmulq_f32(wkr_, xr_);
+    const float32x4_t b_ = vmulq_f32(wki_, xi_);
+    const float32x4_t c_ = vmulq_f32(wkr_, xi_);
+    const float32x4_t d_ = vmulq_f32(wki_, xr_);
+    const float32x4_t yr_ = vsubq_f32(a_, b_);  // 2-126, 4-124, 6-122, 8-120,
+    const float32x4_t yi_ = vaddq_f32(c_, d_);  // 3-127, 5-125, 7-123, 9-121,
+                                                // Update 'a'.
+                                                //    a[j2 + 0] -= yr;
+                                                //    a[j2 + 1] -= yi;
+                                                //    a[k2 + 0] += yr;
+                                                //    a[k2 + 1] -= yi;
+    // 126, 124, 122, 120,
+    const float32x4_t a_k2_p0n = vaddq_f32(a_k2_p0, yr_);
+    // 127, 125, 123, 121,
+    const float32x4_t a_k2_p1n = vsubq_f32(a_k2_p1, yi_);
+    // Shuffle in right order and store.
+    const float32x4_t a_k2_p0nr = vrev64q_f32(a_k2_p0n);
+    const float32x4_t a_k2_p1nr = vrev64q_f32(a_k2_p1n);
+    // 124, 125, 126, 127, 120, 121, 122, 123
+    const float32x4x2_t a_k2_n = vzipq_f32(a_k2_p0nr, a_k2_p1nr);
+    //   2,   4,   6,   8,
+    a_j2_p.val[0] = vsubq_f32(a_j2_p.val[0], yr_);
+    //   3,   5,   7,   9,
+    a_j2_p.val[1] = vsubq_f32(a_j2_p.val[1], yi_);
+    //   2,   3,   4,   5,   6,   7,   8,   9,
+    vst2q_f32(&a[0 + j2], a_j2_p);
+
+    vst1q_f32(&a[122 - j2], a_k2_n.val[1]);
+    vst1q_f32(&a[126 - j2], a_k2_n.val[0]);
+  }
+
+  // Scalar code for the remaining items.
+  for (; j2 < 64; j1 += 1, j2 += 2) {
+    const int k2 = 128 - j2;
+    const int k1 = 32 - j1;
+    const float wkr = 0.5f - c[k1];
+    const float wki = c[j1];
+    const float xr = a[j2 + 0] - a[k2 + 0];
+    const float xi = a[j2 + 1] + a[k2 + 1];
+    const float yr = wkr * xr - wki * xi;
+    const float yi = wkr * xi + wki * xr;
+    a[j2 + 0] -= yr;
+    a[j2 + 1] -= yi;
+    a[k2 + 0] += yr;
+    a[k2 + 1] -= yi;
+  }
+}
+
+void rftbsub_128_neon(float* a) {
+  const float* c = rdft_w + 32;
+  int j1, j2;
+  const float32x4_t mm_half = vdupq_n_f32(0.5f);
+
+  a[1] = -a[1];
+  // Vectorized code (four at once).
+  //    Note: commented number are indexes for the first iteration of the loop.
+  for (j1 = 1, j2 = 2; j2 + 7 < 64; j1 += 4, j2 += 8) {
+    // Load 'wk'.
+    const float32x4_t c_j1 = vld1q_f32(&c[j1]);          //  1,  2,  3,  4,
+    const float32x4_t c_k1 = vld1q_f32(&c[29 - j1]);     // 28, 29, 30, 31,
+    const float32x4_t wkrt = vsubq_f32(mm_half, c_k1);   // 28, 29, 30, 31,
+    const float32x4_t wkr_ = reverse_order_f32x4(wkrt);  // 31, 30, 29, 28,
+    const float32x4_t wki_ = c_j1;                       //  1,  2,  3,  4,
+    // Load and shuffle 'a'.
+    //   2,   4,   6,   8,   3,   5,   7,   9
+    float32x4x2_t a_j2_p = vld2q_f32(&a[0 + j2]);
+    // 120, 122, 124, 126, 121, 123, 125, 127,
+    const float32x4x2_t k2_0_4 = vld2q_f32(&a[122 - j2]);
+    // 126, 124, 122, 120
+    const float32x4_t a_k2_p0 = reverse_order_f32x4(k2_0_4.val[0]);
+    // 127, 125, 123, 121
+    const float32x4_t a_k2_p1 = reverse_order_f32x4(k2_0_4.val[1]);
+    // Calculate 'x'.
+    const float32x4_t xr_ = vsubq_f32(a_j2_p.val[0], a_k2_p0);
+    // 2-126, 4-124, 6-122, 8-120,
+    const float32x4_t xi_ = vaddq_f32(a_j2_p.val[1], a_k2_p1);
+    // 3-127, 5-125, 7-123, 9-121,
+    // Calculate product into 'y'.
+    //    yr = wkr * xr - wki * xi;
+    //    yi = wkr * xi + wki * xr;
+    const float32x4_t a_ = vmulq_f32(wkr_, xr_);
+    const float32x4_t b_ = vmulq_f32(wki_, xi_);
+    const float32x4_t c_ = vmulq_f32(wkr_, xi_);
+    const float32x4_t d_ = vmulq_f32(wki_, xr_);
+    const float32x4_t yr_ = vaddq_f32(a_, b_);  // 2-126, 4-124, 6-122, 8-120,
+    const float32x4_t yi_ = vsubq_f32(c_, d_);  // 3-127, 5-125, 7-123, 9-121,
+                                                // Update 'a'.
+                                                //    a[j2 + 0] -= yr;
+                                                //    a[j2 + 1] -= yi;
+                                                //    a[k2 + 0] += yr;
+                                                //    a[k2 + 1] -= yi;
+    // 126, 124, 122, 120,
+    const float32x4_t a_k2_p0n = vaddq_f32(a_k2_p0, yr_);
+    // 127, 125, 123, 121,
+    const float32x4_t a_k2_p1n = vsubq_f32(yi_, a_k2_p1);
+    // Shuffle in right order and store.
+    //   2,   3,   4,   5,   6,   7,   8,   9,
+    const float32x4_t a_k2_p0nr = vrev64q_f32(a_k2_p0n);
+    const float32x4_t a_k2_p1nr = vrev64q_f32(a_k2_p1n);
+    // 124, 125, 126, 127, 120, 121, 122, 123
+    const float32x4x2_t a_k2_n = vzipq_f32(a_k2_p0nr, a_k2_p1nr);
+    //   2,   4,   6,   8,
+    a_j2_p.val[0] = vsubq_f32(a_j2_p.val[0], yr_);
+    //   3,   5,   7,   9,
+    a_j2_p.val[1] = vsubq_f32(yi_, a_j2_p.val[1]);
+    //   2,   3,   4,   5,   6,   7,   8,   9,
+    vst2q_f32(&a[0 + j2], a_j2_p);
+
+    vst1q_f32(&a[122 - j2], a_k2_n.val[1]);
+    vst1q_f32(&a[126 - j2], a_k2_n.val[0]);
+  }
+
+  // Scalar code for the remaining items.
+  for (; j2 < 64; j1 += 1, j2 += 2) {
+    const int k2 = 128 - j2;
+    const int k1 = 32 - j1;
+    const float wkr = 0.5f - c[k1];
+    const float wki = c[j1];
+    const float xr = a[j2 + 0] - a[k2 + 0];
+    const float xi = a[j2 + 1] + a[k2 + 1];
+    const float yr = wkr * xr + wki * xi;
+    const float yi = wkr * xi - wki * xr;
+    a[j2 + 0] = a[j2 + 0] - yr;
+    a[j2 + 1] = yi - a[j2 + 1];
+    a[k2 + 0] = yr + a[k2 + 0];
+    a[k2 + 1] = yi - a[k2 + 1];
+  }
+  a[65] = -a[65];
+}
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,439 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <emmintrin.h>
+#include <xmmintrin.h>
+
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft.h"
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_common.h"
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_neon_sse2.h"
+#include "rtc_base/system/arch.h"
+
+namespace webrtc {
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+
+namespace {
+// These intrinsics were unavailable before VS 2008.
+// TODO(andrew): move to a common file.
+#if defined(_MSC_VER) && _MSC_VER < 1500
+static __inline __m128 _mm_castsi128_ps(__m128i a) {
+  return *(__m128*)&a;
+}
+static __inline __m128i _mm_castps_si128(__m128 a) {
+  return *(__m128i*)&a;
+}
+#endif
+
+}  // namespace
+
+void cft1st_128_SSE2(float* a) {
+  const __m128 mm_swap_sign = _mm_load_ps(k_swap_sign);
+  int j, k2;
+
+  for (k2 = 0, j = 0; j < 128; j += 16, k2 += 4) {
+    __m128 a00v = _mm_loadu_ps(&a[j + 0]);
+    __m128 a04v = _mm_loadu_ps(&a[j + 4]);
+    __m128 a08v = _mm_loadu_ps(&a[j + 8]);
+    __m128 a12v = _mm_loadu_ps(&a[j + 12]);
+    __m128 a01v = _mm_shuffle_ps(a00v, a08v, _MM_SHUFFLE(1, 0, 1, 0));
+    __m128 a23v = _mm_shuffle_ps(a00v, a08v, _MM_SHUFFLE(3, 2, 3, 2));
+    __m128 a45v = _mm_shuffle_ps(a04v, a12v, _MM_SHUFFLE(1, 0, 1, 0));
+    __m128 a67v = _mm_shuffle_ps(a04v, a12v, _MM_SHUFFLE(3, 2, 3, 2));
+
+    const __m128 wk1rv = _mm_load_ps(&rdft_wk1r[k2]);
+    const __m128 wk1iv = _mm_load_ps(&rdft_wk1i[k2]);
+    const __m128 wk2rv = _mm_load_ps(&rdft_wk2r[k2]);
+    const __m128 wk2iv = _mm_load_ps(&rdft_wk2i[k2]);
+    const __m128 wk3rv = _mm_load_ps(&rdft_wk3r[k2]);
+    const __m128 wk3iv = _mm_load_ps(&rdft_wk3i[k2]);
+    __m128 x0v = _mm_add_ps(a01v, a23v);
+    const __m128 x1v = _mm_sub_ps(a01v, a23v);
+    const __m128 x2v = _mm_add_ps(a45v, a67v);
+    const __m128 x3v = _mm_sub_ps(a45v, a67v);
+    __m128 x0w;
+    a01v = _mm_add_ps(x0v, x2v);
+    x0v = _mm_sub_ps(x0v, x2v);
+    x0w = _mm_shuffle_ps(x0v, x0v, _MM_SHUFFLE(2, 3, 0, 1));
+    {
+      const __m128 a45_0v = _mm_mul_ps(wk2rv, x0v);
+      const __m128 a45_1v = _mm_mul_ps(wk2iv, x0w);
+      a45v = _mm_add_ps(a45_0v, a45_1v);
+    }
+    {
+      __m128 a23_0v, a23_1v;
+      const __m128 x3w = _mm_shuffle_ps(x3v, x3v, _MM_SHUFFLE(2, 3, 0, 1));
+      const __m128 x3s = _mm_mul_ps(mm_swap_sign, x3w);
+      x0v = _mm_add_ps(x1v, x3s);
+      x0w = _mm_shuffle_ps(x0v, x0v, _MM_SHUFFLE(2, 3, 0, 1));
+      a23_0v = _mm_mul_ps(wk1rv, x0v);
+      a23_1v = _mm_mul_ps(wk1iv, x0w);
+      a23v = _mm_add_ps(a23_0v, a23_1v);
+
+      x0v = _mm_sub_ps(x1v, x3s);
+      x0w = _mm_shuffle_ps(x0v, x0v, _MM_SHUFFLE(2, 3, 0, 1));
+    }
+    {
+      const __m128 a67_0v = _mm_mul_ps(wk3rv, x0v);
+      const __m128 a67_1v = _mm_mul_ps(wk3iv, x0w);
+      a67v = _mm_add_ps(a67_0v, a67_1v);
+    }
+
+    a00v = _mm_shuffle_ps(a01v, a23v, _MM_SHUFFLE(1, 0, 1, 0));
+    a04v = _mm_shuffle_ps(a45v, a67v, _MM_SHUFFLE(1, 0, 1, 0));
+    a08v = _mm_shuffle_ps(a01v, a23v, _MM_SHUFFLE(3, 2, 3, 2));
+    a12v = _mm_shuffle_ps(a45v, a67v, _MM_SHUFFLE(3, 2, 3, 2));
+    _mm_storeu_ps(&a[j + 0], a00v);
+    _mm_storeu_ps(&a[j + 4], a04v);
+    _mm_storeu_ps(&a[j + 8], a08v);
+    _mm_storeu_ps(&a[j + 12], a12v);
+  }
+}
+
+void cftmdl_128_SSE2(float* a) {
+  const int l = 8;
+  const __m128 mm_swap_sign = _mm_load_ps(k_swap_sign);
+  int j0;
+
+  __m128 wk1rv = _mm_load_ps(cftmdl_wk1r);
+  for (j0 = 0; j0 < l; j0 += 2) {
+    const __m128i a_00 = _mm_loadl_epi64((__m128i*)&a[j0 + 0]);
+    const __m128i a_08 = _mm_loadl_epi64((__m128i*)&a[j0 + 8]);
+    const __m128i a_32 = _mm_loadl_epi64((__m128i*)&a[j0 + 32]);
+    const __m128i a_40 = _mm_loadl_epi64((__m128i*)&a[j0 + 40]);
+    const __m128 a_00_32 =
+        _mm_shuffle_ps(_mm_castsi128_ps(a_00), _mm_castsi128_ps(a_32),
+                       _MM_SHUFFLE(1, 0, 1, 0));
+    const __m128 a_08_40 =
+        _mm_shuffle_ps(_mm_castsi128_ps(a_08), _mm_castsi128_ps(a_40),
+                       _MM_SHUFFLE(1, 0, 1, 0));
+    __m128 x0r0_0i0_0r1_x0i1 = _mm_add_ps(a_00_32, a_08_40);
+    const __m128 x1r0_1i0_1r1_x1i1 = _mm_sub_ps(a_00_32, a_08_40);
+
+    const __m128i a_16 = _mm_loadl_epi64((__m128i*)&a[j0 + 16]);
+    const __m128i a_24 = _mm_loadl_epi64((__m128i*)&a[j0 + 24]);
+    const __m128i a_48 = _mm_loadl_epi64((__m128i*)&a[j0 + 48]);
+    const __m128i a_56 = _mm_loadl_epi64((__m128i*)&a[j0 + 56]);
+    const __m128 a_16_48 =
+        _mm_shuffle_ps(_mm_castsi128_ps(a_16), _mm_castsi128_ps(a_48),
+                       _MM_SHUFFLE(1, 0, 1, 0));
+    const __m128 a_24_56 =
+        _mm_shuffle_ps(_mm_castsi128_ps(a_24), _mm_castsi128_ps(a_56),
+                       _MM_SHUFFLE(1, 0, 1, 0));
+    const __m128 x2r0_2i0_2r1_x2i1 = _mm_add_ps(a_16_48, a_24_56);
+    const __m128 x3r0_3i0_3r1_x3i1 = _mm_sub_ps(a_16_48, a_24_56);
+
+    const __m128 xx0 = _mm_add_ps(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
+    const __m128 xx1 = _mm_sub_ps(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
+
+    const __m128 x3i0_3r0_3i1_x3r1 = _mm_castsi128_ps(_mm_shuffle_epi32(
+        _mm_castps_si128(x3r0_3i0_3r1_x3i1), _MM_SHUFFLE(2, 3, 0, 1)));
+    const __m128 x3_swapped = _mm_mul_ps(mm_swap_sign, x3i0_3r0_3i1_x3r1);
+    const __m128 x1_x3_add = _mm_add_ps(x1r0_1i0_1r1_x1i1, x3_swapped);
+    const __m128 x1_x3_sub = _mm_sub_ps(x1r0_1i0_1r1_x1i1, x3_swapped);
+
+    const __m128 yy0 =
+        _mm_shuffle_ps(x1_x3_add, x1_x3_sub, _MM_SHUFFLE(2, 2, 2, 2));
+    const __m128 yy1 =
+        _mm_shuffle_ps(x1_x3_add, x1_x3_sub, _MM_SHUFFLE(3, 3, 3, 3));
+    const __m128 yy2 = _mm_mul_ps(mm_swap_sign, yy1);
+    const __m128 yy3 = _mm_add_ps(yy0, yy2);
+    const __m128 yy4 = _mm_mul_ps(wk1rv, yy3);
+
+    _mm_storel_epi64((__m128i*)&a[j0 + 0], _mm_castps_si128(xx0));
+    _mm_storel_epi64(
+        (__m128i*)&a[j0 + 32],
+        _mm_shuffle_epi32(_mm_castps_si128(xx0), _MM_SHUFFLE(3, 2, 3, 2)));
+
+    _mm_storel_epi64((__m128i*)&a[j0 + 16], _mm_castps_si128(xx1));
+    _mm_storel_epi64(
+        (__m128i*)&a[j0 + 48],
+        _mm_shuffle_epi32(_mm_castps_si128(xx1), _MM_SHUFFLE(2, 3, 2, 3)));
+    a[j0 + 48] = -a[j0 + 48];
+
+    _mm_storel_epi64((__m128i*)&a[j0 + 8], _mm_castps_si128(x1_x3_add));
+    _mm_storel_epi64((__m128i*)&a[j0 + 24], _mm_castps_si128(x1_x3_sub));
+
+    _mm_storel_epi64((__m128i*)&a[j0 + 40], _mm_castps_si128(yy4));
+    _mm_storel_epi64(
+        (__m128i*)&a[j0 + 56],
+        _mm_shuffle_epi32(_mm_castps_si128(yy4), _MM_SHUFFLE(2, 3, 2, 3)));
+  }
+
+  {
+    int k = 64;
+    int k1 = 2;
+    int k2 = 2 * k1;
+    const __m128 wk2rv = _mm_load_ps(&rdft_wk2r[k2 + 0]);
+    const __m128 wk2iv = _mm_load_ps(&rdft_wk2i[k2 + 0]);
+    const __m128 wk1iv = _mm_load_ps(&rdft_wk1i[k2 + 0]);
+    const __m128 wk3rv = _mm_load_ps(&rdft_wk3r[k2 + 0]);
+    const __m128 wk3iv = _mm_load_ps(&rdft_wk3i[k2 + 0]);
+    wk1rv = _mm_load_ps(&rdft_wk1r[k2 + 0]);
+    for (j0 = k; j0 < l + k; j0 += 2) {
+      const __m128i a_00 = _mm_loadl_epi64((__m128i*)&a[j0 + 0]);
+      const __m128i a_08 = _mm_loadl_epi64((__m128i*)&a[j0 + 8]);
+      const __m128i a_32 = _mm_loadl_epi64((__m128i*)&a[j0 + 32]);
+      const __m128i a_40 = _mm_loadl_epi64((__m128i*)&a[j0 + 40]);
+      const __m128 a_00_32 =
+          _mm_shuffle_ps(_mm_castsi128_ps(a_00), _mm_castsi128_ps(a_32),
+                         _MM_SHUFFLE(1, 0, 1, 0));
+      const __m128 a_08_40 =
+          _mm_shuffle_ps(_mm_castsi128_ps(a_08), _mm_castsi128_ps(a_40),
+                         _MM_SHUFFLE(1, 0, 1, 0));
+      __m128 x0r0_0i0_0r1_x0i1 = _mm_add_ps(a_00_32, a_08_40);
+      const __m128 x1r0_1i0_1r1_x1i1 = _mm_sub_ps(a_00_32, a_08_40);
+
+      const __m128i a_16 = _mm_loadl_epi64((__m128i*)&a[j0 + 16]);
+      const __m128i a_24 = _mm_loadl_epi64((__m128i*)&a[j0 + 24]);
+      const __m128i a_48 = _mm_loadl_epi64((__m128i*)&a[j0 + 48]);
+      const __m128i a_56 = _mm_loadl_epi64((__m128i*)&a[j0 + 56]);
+      const __m128 a_16_48 =
+          _mm_shuffle_ps(_mm_castsi128_ps(a_16), _mm_castsi128_ps(a_48),
+                         _MM_SHUFFLE(1, 0, 1, 0));
+      const __m128 a_24_56 =
+          _mm_shuffle_ps(_mm_castsi128_ps(a_24), _mm_castsi128_ps(a_56),
+                         _MM_SHUFFLE(1, 0, 1, 0));
+      const __m128 x2r0_2i0_2r1_x2i1 = _mm_add_ps(a_16_48, a_24_56);
+      const __m128 x3r0_3i0_3r1_x3i1 = _mm_sub_ps(a_16_48, a_24_56);
+
+      const __m128 xx = _mm_add_ps(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
+      const __m128 xx1 = _mm_sub_ps(x0r0_0i0_0r1_x0i1, x2r0_2i0_2r1_x2i1);
+      const __m128 xx2 = _mm_mul_ps(xx1, wk2rv);
+      const __m128 xx3 = _mm_mul_ps(
+          wk2iv, _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(xx1),
+                                                    _MM_SHUFFLE(2, 3, 0, 1))));
+      const __m128 xx4 = _mm_add_ps(xx2, xx3);
+
+      const __m128 x3i0_3r0_3i1_x3r1 = _mm_castsi128_ps(_mm_shuffle_epi32(
+          _mm_castps_si128(x3r0_3i0_3r1_x3i1), _MM_SHUFFLE(2, 3, 0, 1)));
+      const __m128 x3_swapped = _mm_mul_ps(mm_swap_sign, x3i0_3r0_3i1_x3r1);
+      const __m128 x1_x3_add = _mm_add_ps(x1r0_1i0_1r1_x1i1, x3_swapped);
+      const __m128 x1_x3_sub = _mm_sub_ps(x1r0_1i0_1r1_x1i1, x3_swapped);
+
+      const __m128 xx10 = _mm_mul_ps(x1_x3_add, wk1rv);
+      const __m128 xx11 = _mm_mul_ps(
+          wk1iv, _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(x1_x3_add),
+                                                    _MM_SHUFFLE(2, 3, 0, 1))));
+      const __m128 xx12 = _mm_add_ps(xx10, xx11);
+
+      const __m128 xx20 = _mm_mul_ps(x1_x3_sub, wk3rv);
+      const __m128 xx21 = _mm_mul_ps(
+          wk3iv, _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(x1_x3_sub),
+                                                    _MM_SHUFFLE(2, 3, 0, 1))));
+      const __m128 xx22 = _mm_add_ps(xx20, xx21);
+
+      _mm_storel_epi64((__m128i*)&a[j0 + 0], _mm_castps_si128(xx));
+      _mm_storel_epi64(
+          (__m128i*)&a[j0 + 32],
+          _mm_shuffle_epi32(_mm_castps_si128(xx), _MM_SHUFFLE(3, 2, 3, 2)));
+
+      _mm_storel_epi64((__m128i*)&a[j0 + 16], _mm_castps_si128(xx4));
+      _mm_storel_epi64(
+          (__m128i*)&a[j0 + 48],
+          _mm_shuffle_epi32(_mm_castps_si128(xx4), _MM_SHUFFLE(3, 2, 3, 2)));
+
+      _mm_storel_epi64((__m128i*)&a[j0 + 8], _mm_castps_si128(xx12));
+      _mm_storel_epi64(
+          (__m128i*)&a[j0 + 40],
+          _mm_shuffle_epi32(_mm_castps_si128(xx12), _MM_SHUFFLE(3, 2, 3, 2)));
+
+      _mm_storel_epi64((__m128i*)&a[j0 + 24], _mm_castps_si128(xx22));
+      _mm_storel_epi64(
+          (__m128i*)&a[j0 + 56],
+          _mm_shuffle_epi32(_mm_castps_si128(xx22), _MM_SHUFFLE(3, 2, 3, 2)));
+    }
+  }
+}
+
+void rftfsub_128_SSE2(float* a) {
+  const float* c = rdft_w + 32;
+  int j1, j2, k1, k2;
+  float wkr, wki, xr, xi, yr, yi;
+
+  static const ALIGN16_BEG float ALIGN16_END k_half[4] = {0.5f, 0.5f, 0.5f,
+                                                          0.5f};
+  const __m128 mm_half = _mm_load_ps(k_half);
+
+  // Vectorized code (four at once).
+  //    Note: commented number are indexes for the first iteration of the loop.
+  for (j1 = 1, j2 = 2; j2 + 7 < 64; j1 += 4, j2 += 8) {
+    // Load 'wk'.
+    const __m128 c_j1 = _mm_loadu_ps(&c[j1]);       //  1,  2,  3,  4,
+    const __m128 c_k1 = _mm_loadu_ps(&c[29 - j1]);  // 28, 29, 30, 31,
+    const __m128 wkrt = _mm_sub_ps(mm_half, c_k1);  // 28, 29, 30, 31,
+    const __m128 wkr_ =
+        _mm_shuffle_ps(wkrt, wkrt, _MM_SHUFFLE(0, 1, 2, 3));  // 31, 30, 29, 28,
+    const __m128 wki_ = c_j1;                                 //  1,  2,  3,  4,
+    // Load and shuffle 'a'.
+    const __m128 a_j2_0 = _mm_loadu_ps(&a[0 + j2]);    //   2,   3,   4,   5,
+    const __m128 a_j2_4 = _mm_loadu_ps(&a[4 + j2]);    //   6,   7,   8,   9,
+    const __m128 a_k2_0 = _mm_loadu_ps(&a[122 - j2]);  // 120, 121, 122, 123,
+    const __m128 a_k2_4 = _mm_loadu_ps(&a[126 - j2]);  // 124, 125, 126, 127,
+    const __m128 a_j2_p0 = _mm_shuffle_ps(
+        a_j2_0, a_j2_4, _MM_SHUFFLE(2, 0, 2, 0));  //   2,   4,   6,   8,
+    const __m128 a_j2_p1 = _mm_shuffle_ps(
+        a_j2_0, a_j2_4, _MM_SHUFFLE(3, 1, 3, 1));  //   3,   5,   7,   9,
+    const __m128 a_k2_p0 = _mm_shuffle_ps(
+        a_k2_4, a_k2_0, _MM_SHUFFLE(0, 2, 0, 2));  // 126, 124, 122, 120,
+    const __m128 a_k2_p1 = _mm_shuffle_ps(
+        a_k2_4, a_k2_0, _MM_SHUFFLE(1, 3, 1, 3));  // 127, 125, 123, 121,
+    // Calculate 'x'.
+    const __m128 xr_ = _mm_sub_ps(a_j2_p0, a_k2_p0);
+    // 2-126, 4-124, 6-122, 8-120,
+    const __m128 xi_ = _mm_add_ps(a_j2_p1, a_k2_p1);
+    // 3-127, 5-125, 7-123, 9-121,
+    // Calculate product into 'y'.
+    //    yr = wkr * xr - wki * xi;
+    //    yi = wkr * xi + wki * xr;
+    const __m128 a_ = _mm_mul_ps(wkr_, xr_);
+    const __m128 b_ = _mm_mul_ps(wki_, xi_);
+    const __m128 c_ = _mm_mul_ps(wkr_, xi_);
+    const __m128 d_ = _mm_mul_ps(wki_, xr_);
+    const __m128 yr_ = _mm_sub_ps(a_, b_);  // 2-126, 4-124, 6-122, 8-120,
+    const __m128 yi_ = _mm_add_ps(c_, d_);  // 3-127, 5-125, 7-123, 9-121,
+                                            // Update 'a'.
+                                            //    a[j2 + 0] -= yr;
+                                            //    a[j2 + 1] -= yi;
+                                            //    a[k2 + 0] += yr;
+    //    a[k2 + 1] -= yi;
+    const __m128 a_j2_p0n = _mm_sub_ps(a_j2_p0, yr_);  //   2,   4,   6,   8,
+    const __m128 a_j2_p1n = _mm_sub_ps(a_j2_p1, yi_);  //   3,   5,   7,   9,
+    const __m128 a_k2_p0n = _mm_add_ps(a_k2_p0, yr_);  // 126, 124, 122, 120,
+    const __m128 a_k2_p1n = _mm_sub_ps(a_k2_p1, yi_);  // 127, 125, 123, 121,
+    // Shuffle in right order and store.
+    const __m128 a_j2_0n = _mm_unpacklo_ps(a_j2_p0n, a_j2_p1n);
+    //   2,   3,   4,   5,
+    const __m128 a_j2_4n = _mm_unpackhi_ps(a_j2_p0n, a_j2_p1n);
+    //   6,   7,   8,   9,
+    const __m128 a_k2_0nt = _mm_unpackhi_ps(a_k2_p0n, a_k2_p1n);
+    // 122, 123, 120, 121,
+    const __m128 a_k2_4nt = _mm_unpacklo_ps(a_k2_p0n, a_k2_p1n);
+    // 126, 127, 124, 125,
+    const __m128 a_k2_0n = _mm_shuffle_ps(
+        a_k2_0nt, a_k2_0nt, _MM_SHUFFLE(1, 0, 3, 2));  // 120, 121, 122, 123,
+    const __m128 a_k2_4n = _mm_shuffle_ps(
+        a_k2_4nt, a_k2_4nt, _MM_SHUFFLE(1, 0, 3, 2));  // 124, 125, 126, 127,
+    _mm_storeu_ps(&a[0 + j2], a_j2_0n);
+    _mm_storeu_ps(&a[4 + j2], a_j2_4n);
+    _mm_storeu_ps(&a[122 - j2], a_k2_0n);
+    _mm_storeu_ps(&a[126 - j2], a_k2_4n);
+  }
+  // Scalar code for the remaining items.
+  for (; j2 < 64; j1 += 1, j2 += 2) {
+    k2 = 128 - j2;
+    k1 = 32 - j1;
+    wkr = 0.5f - c[k1];
+    wki = c[j1];
+    xr = a[j2 + 0] - a[k2 + 0];
+    xi = a[j2 + 1] + a[k2 + 1];
+    yr = wkr * xr - wki * xi;
+    yi = wkr * xi + wki * xr;
+    a[j2 + 0] -= yr;
+    a[j2 + 1] -= yi;
+    a[k2 + 0] += yr;
+    a[k2 + 1] -= yi;
+  }
+}
+
+void rftbsub_128_SSE2(float* a) {
+  const float* c = rdft_w + 32;
+  int j1, j2, k1, k2;
+  float wkr, wki, xr, xi, yr, yi;
+
+  static const ALIGN16_BEG float ALIGN16_END k_half[4] = {0.5f, 0.5f, 0.5f,
+                                                          0.5f};
+  const __m128 mm_half = _mm_load_ps(k_half);
+
+  a[1] = -a[1];
+  // Vectorized code (four at once).
+  //    Note: commented number are indexes for the first iteration of the loop.
+  for (j1 = 1, j2 = 2; j2 + 7 < 64; j1 += 4, j2 += 8) {
+    // Load 'wk'.
+    const __m128 c_j1 = _mm_loadu_ps(&c[j1]);       //  1,  2,  3,  4,
+    const __m128 c_k1 = _mm_loadu_ps(&c[29 - j1]);  // 28, 29, 30, 31,
+    const __m128 wkrt = _mm_sub_ps(mm_half, c_k1);  // 28, 29, 30, 31,
+    const __m128 wkr_ =
+        _mm_shuffle_ps(wkrt, wkrt, _MM_SHUFFLE(0, 1, 2, 3));  // 31, 30, 29, 28,
+    const __m128 wki_ = c_j1;                                 //  1,  2,  3,  4,
+    // Load and shuffle 'a'.
+    const __m128 a_j2_0 = _mm_loadu_ps(&a[0 + j2]);    //   2,   3,   4,   5,
+    const __m128 a_j2_4 = _mm_loadu_ps(&a[4 + j2]);    //   6,   7,   8,   9,
+    const __m128 a_k2_0 = _mm_loadu_ps(&a[122 - j2]);  // 120, 121, 122, 123,
+    const __m128 a_k2_4 = _mm_loadu_ps(&a[126 - j2]);  // 124, 125, 126, 127,
+    const __m128 a_j2_p0 = _mm_shuffle_ps(
+        a_j2_0, a_j2_4, _MM_SHUFFLE(2, 0, 2, 0));  //   2,   4,   6,   8,
+    const __m128 a_j2_p1 = _mm_shuffle_ps(
+        a_j2_0, a_j2_4, _MM_SHUFFLE(3, 1, 3, 1));  //   3,   5,   7,   9,
+    const __m128 a_k2_p0 = _mm_shuffle_ps(
+        a_k2_4, a_k2_0, _MM_SHUFFLE(0, 2, 0, 2));  // 126, 124, 122, 120,
+    const __m128 a_k2_p1 = _mm_shuffle_ps(
+        a_k2_4, a_k2_0, _MM_SHUFFLE(1, 3, 1, 3));  // 127, 125, 123, 121,
+    // Calculate 'x'.
+    const __m128 xr_ = _mm_sub_ps(a_j2_p0, a_k2_p0);
+    // 2-126, 4-124, 6-122, 8-120,
+    const __m128 xi_ = _mm_add_ps(a_j2_p1, a_k2_p1);
+    // 3-127, 5-125, 7-123, 9-121,
+    // Calculate product into 'y'.
+    //    yr = wkr * xr + wki * xi;
+    //    yi = wkr * xi - wki * xr;
+    const __m128 a_ = _mm_mul_ps(wkr_, xr_);
+    const __m128 b_ = _mm_mul_ps(wki_, xi_);
+    const __m128 c_ = _mm_mul_ps(wkr_, xi_);
+    const __m128 d_ = _mm_mul_ps(wki_, xr_);
+    const __m128 yr_ = _mm_add_ps(a_, b_);  // 2-126, 4-124, 6-122, 8-120,
+    const __m128 yi_ = _mm_sub_ps(c_, d_);  // 3-127, 5-125, 7-123, 9-121,
+                                            // Update 'a'.
+                                            //    a[j2 + 0] = a[j2 + 0] - yr;
+                                            //    a[j2 + 1] = yi - a[j2 + 1];
+                                            //    a[k2 + 0] = yr + a[k2 + 0];
+    //    a[k2 + 1] = yi - a[k2 + 1];
+    const __m128 a_j2_p0n = _mm_sub_ps(a_j2_p0, yr_);  //   2,   4,   6,   8,
+    const __m128 a_j2_p1n = _mm_sub_ps(yi_, a_j2_p1);  //   3,   5,   7,   9,
+    const __m128 a_k2_p0n = _mm_add_ps(a_k2_p0, yr_);  // 126, 124, 122, 120,
+    const __m128 a_k2_p1n = _mm_sub_ps(yi_, a_k2_p1);  // 127, 125, 123, 121,
+    // Shuffle in right order and store.
+    const __m128 a_j2_0n = _mm_unpacklo_ps(a_j2_p0n, a_j2_p1n);
+    //   2,   3,   4,   5,
+    const __m128 a_j2_4n = _mm_unpackhi_ps(a_j2_p0n, a_j2_p1n);
+    //   6,   7,   8,   9,
+    const __m128 a_k2_0nt = _mm_unpackhi_ps(a_k2_p0n, a_k2_p1n);
+    // 122, 123, 120, 121,
+    const __m128 a_k2_4nt = _mm_unpacklo_ps(a_k2_p0n, a_k2_p1n);
+    // 126, 127, 124, 125,
+    const __m128 a_k2_0n = _mm_shuffle_ps(
+        a_k2_0nt, a_k2_0nt, _MM_SHUFFLE(1, 0, 3, 2));  // 120, 121, 122, 123,
+    const __m128 a_k2_4n = _mm_shuffle_ps(
+        a_k2_4nt, a_k2_4nt, _MM_SHUFFLE(1, 0, 3, 2));  // 124, 125, 126, 127,
+    _mm_storeu_ps(&a[0 + j2], a_j2_0n);
+    _mm_storeu_ps(&a[4 + j2], a_j2_4n);
+    _mm_storeu_ps(&a[122 - j2], a_k2_0n);
+    _mm_storeu_ps(&a[126 - j2], a_k2_4n);
+  }
+  // Scalar code for the remaining items.
+  for (; j2 < 64; j1 += 1, j2 += 2) {
+    k2 = 128 - j2;
+    k1 = 32 - j1;
+    wkr = 0.5f - c[k1];
+    wki = c[j1];
+    xr = a[j2 + 0] - a[k2 + 0];
+    xi = a[j2 + 1] + a[k2 + 1];
+    yr = wkr * xr + wki * xi;
+    yi = wkr * xi - wki * xr;
+    a[j2 + 0] = a[j2 + 0] - yr;
+    a[j2 + 1] = yi - a[j2 + 1];
+    a[k2 + 0] = yr + a[k2 + 0];
+    a[k2 + 1] = yi - a[k2 + 1];
+  }
+  a[65] = -a[65];
+}
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_common.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_common.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_common.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_common.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_COMMON_H_
+#define MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_COMMON_H_
+
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft.h"
+
+namespace webrtc {
+
+// This tables used to be computed at run-time. For example, refer to:
+// https://code.google.com/p/webrtc/source/browse/trunk/webrtc/modules/audio_processing/utility/apm_rdft.c?r=6564
+// to see the initialization code.
+// Constants shared by all paths (C, SSE2, NEON).
+const float rdft_w[64] = {
+    1.0000000000f, 0.0000000000f, 0.7071067691f, 0.7071067691f, 0.9238795638f,
+    0.3826834559f, 0.3826834559f, 0.9238795638f, 0.9807852507f, 0.1950903237f,
+    0.5555702448f, 0.8314695954f, 0.8314695954f, 0.5555702448f, 0.1950903237f,
+    0.9807852507f, 0.9951847196f, 0.0980171412f, 0.6343933344f, 0.7730104327f,
+    0.8819212914f, 0.4713967443f, 0.2902846634f, 0.9569403529f, 0.9569403529f,
+    0.2902846634f, 0.4713967443f, 0.8819212914f, 0.7730104327f, 0.6343933344f,
+    0.0980171412f, 0.9951847196f, 0.7071067691f, 0.4993977249f, 0.4975923598f,
+    0.4945882559f, 0.4903926253f, 0.4850156307f, 0.4784701765f, 0.4707720280f,
+    0.4619397819f, 0.4519946277f, 0.4409606457f, 0.4288643003f, 0.4157347977f,
+    0.4016037583f, 0.3865052164f, 0.3704755902f, 0.3535533845f, 0.3357794881f,
+    0.3171966672f, 0.2978496552f, 0.2777851224f, 0.2570513785f, 0.2356983721f,
+    0.2137775421f, 0.1913417280f, 0.1684449315f, 0.1451423317f, 0.1214900985f,
+    0.0975451618f, 0.0733652338f, 0.0490085706f, 0.0245338380f,
+};
+
+// Constants used by the C and MIPS paths.
+const float rdft_wk3ri_first[16] = {
+    1.000000000f, 0.000000000f, 0.382683456f,  0.923879564f,
+    0.831469536f, 0.555570245f, -0.195090353f, 0.980785251f,
+    0.956940353f, 0.290284693f, 0.098017156f,  0.995184720f,
+    0.634393334f, 0.773010492f, -0.471396863f, 0.881921172f,
+};
+const float rdft_wk3ri_second[16] = {
+    -0.707106769f, 0.707106769f,  -0.923879564f, -0.382683456f,
+    -0.980785251f, 0.195090353f,  -0.555570245f, -0.831469536f,
+    -0.881921172f, 0.471396863f,  -0.773010492f, -0.634393334f,
+    -0.995184720f, -0.098017156f, -0.290284693f, -0.956940353f,
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_COMMON_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_neon_sse2.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_neon_sse2.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_neon_sse2.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_neon_sse2.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,98 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_NEON_SSE2_H_
+#define MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_NEON_SSE2_H_
+
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft.h"
+#include "rtc_base/system/arch.h"
+
+#ifdef _MSC_VER /* visual c++ */
+#define ALIGN16_BEG __declspec(align(16))
+#define ALIGN16_END
+#else /* gcc or icc */
+#define ALIGN16_BEG
+#define ALIGN16_END __attribute__((aligned(16)))
+#endif
+
+namespace webrtc {
+
+// These tables used to be computed at run-time. For example, refer to:
+// https://code.google.com/p/webrtc/source/browse/trunk/webrtc/modules/audio_processing/utility/apm_rdft.c?r=6564
+// to see the initialization code.
+#if defined(WEBRTC_ARCH_X86_FAMILY) || defined(WEBRTC_HAS_NEON)
+// Constants used by SSE2 and NEON but initialized in the C path.
+const ALIGN16_BEG float ALIGN16_END k_swap_sign[4] = {-1.f, 1.f, -1.f, 1.f};
+
+ALIGN16_BEG const float ALIGN16_END rdft_wk1r[32] = {
+    1.000000000f, 1.000000000f, 0.707106769f, 0.707106769f, 0.923879564f,
+    0.923879564f, 0.382683456f, 0.382683456f, 0.980785251f, 0.980785251f,
+    0.555570245f, 0.555570245f, 0.831469595f, 0.831469595f, 0.195090324f,
+    0.195090324f, 0.995184720f, 0.995184720f, 0.634393334f, 0.634393334f,
+    0.881921291f, 0.881921291f, 0.290284663f, 0.290284663f, 0.956940353f,
+    0.956940353f, 0.471396744f, 0.471396744f, 0.773010433f, 0.773010433f,
+    0.098017141f, 0.098017141f,
+};
+ALIGN16_BEG const float ALIGN16_END rdft_wk2r[32] = {
+    1.000000000f,  1.000000000f,  -0.000000000f, -0.000000000f, 0.707106769f,
+    0.707106769f,  -0.707106769f, -0.707106769f, 0.923879564f,  0.923879564f,
+    -0.382683456f, -0.382683456f, 0.382683456f,  0.382683456f,  -0.923879564f,
+    -0.923879564f, 0.980785251f,  0.980785251f,  -0.195090324f, -0.195090324f,
+    0.555570245f,  0.555570245f,  -0.831469595f, -0.831469595f, 0.831469595f,
+    0.831469595f,  -0.555570245f, -0.555570245f, 0.195090324f,  0.195090324f,
+    -0.980785251f, -0.980785251f,
+};
+ALIGN16_BEG const float ALIGN16_END rdft_wk3r[32] = {
+    1.000000000f,  1.000000000f,  -0.707106769f, -0.707106769f, 0.382683456f,
+    0.382683456f,  -0.923879564f, -0.923879564f, 0.831469536f,  0.831469536f,
+    -0.980785251f, -0.980785251f, -0.195090353f, -0.195090353f, -0.555570245f,
+    -0.555570245f, 0.956940353f,  0.956940353f,  -0.881921172f, -0.881921172f,
+    0.098017156f,  0.098017156f,  -0.773010492f, -0.773010492f, 0.634393334f,
+    0.634393334f,  -0.995184720f, -0.995184720f, -0.471396863f, -0.471396863f,
+    -0.290284693f, -0.290284693f,
+};
+ALIGN16_BEG const float ALIGN16_END rdft_wk1i[32] = {
+    -0.000000000f, 0.000000000f,  -0.707106769f, 0.707106769f,  -0.382683456f,
+    0.382683456f,  -0.923879564f, 0.923879564f,  -0.195090324f, 0.195090324f,
+    -0.831469595f, 0.831469595f,  -0.555570245f, 0.555570245f,  -0.980785251f,
+    0.980785251f,  -0.098017141f, 0.098017141f,  -0.773010433f, 0.773010433f,
+    -0.471396744f, 0.471396744f,  -0.956940353f, 0.956940353f,  -0.290284663f,
+    0.290284663f,  -0.881921291f, 0.881921291f,  -0.634393334f, 0.634393334f,
+    -0.995184720f, 0.995184720f,
+};
+ALIGN16_BEG const float ALIGN16_END rdft_wk2i[32] = {
+    -0.000000000f, 0.000000000f,  -1.000000000f, 1.000000000f,  -0.707106769f,
+    0.707106769f,  -0.707106769f, 0.707106769f,  -0.382683456f, 0.382683456f,
+    -0.923879564f, 0.923879564f,  -0.923879564f, 0.923879564f,  -0.382683456f,
+    0.382683456f,  -0.195090324f, 0.195090324f,  -0.980785251f, 0.980785251f,
+    -0.831469595f, 0.831469595f,  -0.555570245f, 0.555570245f,  -0.555570245f,
+    0.555570245f,  -0.831469595f, 0.831469595f,  -0.980785251f, 0.980785251f,
+    -0.195090324f, 0.195090324f,
+};
+ALIGN16_BEG const float ALIGN16_END rdft_wk3i[32] = {
+    -0.000000000f, 0.000000000f,  -0.707106769f, 0.707106769f,  -0.923879564f,
+    0.923879564f,  0.382683456f,  -0.382683456f, -0.555570245f, 0.555570245f,
+    -0.195090353f, 0.195090353f,  -0.980785251f, 0.980785251f,  0.831469536f,
+    -0.831469536f, -0.290284693f, 0.290284693f,  -0.471396863f, 0.471396863f,
+    -0.995184720f, 0.995184720f,  0.634393334f,  -0.634393334f, -0.773010492f,
+    0.773010492f,  0.098017156f,  -0.098017156f, -0.881921172f, 0.881921172f,
+    0.956940353f,  -0.956940353f,
+};
+ALIGN16_BEG const float ALIGN16_END cftmdl_wk1r[4] = {
+    0.707106769f,
+    0.707106769f,
+    0.707106769f,
+    -0.707106769f,
+};
+#endif
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_UTILITY_OOURA_FFT_TABLES_NEON_SSE2_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_256/fft4g.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_256/fft4g.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_256/fft4g.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_256/fft4g.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,866 @@
+/*
+ * http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html
+ * Copyright Takuya OOURA, 1996-2001
+ *
+ * You may use, copy, modify and distribute this code for any purpose (include
+ * commercial use) and without fee. Please refer to this package when you modify
+ * this code.
+ *
+ * Changes:
+ * Trivial type modifications by the WebRTC authors.
+ */
+
+/*
+Fast Fourier/Cosine/Sine Transform
+    dimension   :one
+    data length :power of 2
+    decimation  :frequency
+    radix       :4, 2
+    data        :inplace
+    table       :use
+functions
+    cdft: Complex Discrete Fourier Transform
+    rdft: Real Discrete Fourier Transform
+    ddct: Discrete Cosine Transform
+    ddst: Discrete Sine Transform
+    dfct: Cosine Transform of RDFT (Real Symmetric DFT)
+    dfst: Sine Transform of RDFT (Real Anti-symmetric DFT)
+function prototypes
+    void cdft(int, int, float *, int *, float *);
+    void rdft(size_t, int, float *, size_t *, float *);
+    void ddct(int, int, float *, int *, float *);
+    void ddst(int, int, float *, int *, float *);
+    void dfct(int, float *, float *, int *, float *);
+    void dfst(int, float *, float *, int *, float *);
+
+
+-------- Complex DFT (Discrete Fourier Transform) --------
+    [definition]
+        <case1>
+            X[k] = sum_j=0^n-1 x[j]*exp(2*pi*i*j*k/n), 0<=k<n
+        <case2>
+            X[k] = sum_j=0^n-1 x[j]*exp(-2*pi*i*j*k/n), 0<=k<n
+        (notes: sum_j=0^n-1 is a summation from j=0 to n-1)
+    [usage]
+        <case1>
+            ip[0] = 0; // first time only
+            cdft(2*n, 1, a, ip, w);
+        <case2>
+            ip[0] = 0; // first time only
+            cdft(2*n, -1, a, ip, w);
+    [parameters]
+        2*n            :data length (int)
+                        n >= 1, n = power of 2
+        a[0...2*n-1]   :input/output data (float *)
+                        input data
+                            a[2*j] = Re(x[j]),
+                            a[2*j+1] = Im(x[j]), 0<=j<n
+                        output data
+                            a[2*k] = Re(X[k]),
+                            a[2*k+1] = Im(X[k]), 0<=k<n
+        ip[0...*]      :work area for bit reversal (int *)
+                        length of ip >= 2+sqrt(n)
+                        strictly,
+                        length of ip >=
+                            2+(1<<(int)(log(n+0.5)/log(2))/2).
+                        ip[0],ip[1] are pointers of the cos/sin table.
+        w[0...n/2-1]   :cos/sin table (float *)
+                        w[],ip[] are initialized if ip[0] == 0.
+    [remark]
+        Inverse of
+            cdft(2*n, -1, a, ip, w);
+        is
+            cdft(2*n, 1, a, ip, w);
+            for (j = 0; j <= 2 * n - 1; j++) {
+                a[j] *= 1.0 / n;
+            }
+        .
+
+
+-------- Real DFT / Inverse of Real DFT --------
+    [definition]
+        <case1> RDFT
+            R[k] = sum_j=0^n-1 a[j]*cos(2*pi*j*k/n), 0<=k<=n/2
+            I[k] = sum_j=0^n-1 a[j]*sin(2*pi*j*k/n), 0<k<n/2
+        <case2> IRDFT (excluding scale)
+            a[k] = (R[0] + R[n/2]*cos(pi*k))/2 +
+                   sum_j=1^n/2-1 R[j]*cos(2*pi*j*k/n) +
+                   sum_j=1^n/2-1 I[j]*sin(2*pi*j*k/n), 0<=k<n
+    [usage]
+        <case1>
+            ip[0] = 0; // first time only
+            rdft(n, 1, a, ip, w);
+        <case2>
+            ip[0] = 0; // first time only
+            rdft(n, -1, a, ip, w);
+    [parameters]
+        n              :data length (size_t)
+                        n >= 2, n = power of 2
+        a[0...n-1]     :input/output data (float *)
+                        <case1>
+                            output data
+                                a[2*k] = R[k], 0<=k<n/2
+                                a[2*k+1] = I[k], 0<k<n/2
+                                a[1] = R[n/2]
+                        <case2>
+                            input data
+                                a[2*j] = R[j], 0<=j<n/2
+                                a[2*j+1] = I[j], 0<j<n/2
+                                a[1] = R[n/2]
+        ip[0...*]      :work area for bit reversal (size_t *)
+                        length of ip >= 2+sqrt(n/2)
+                        strictly,
+                        length of ip >=
+                            2+(1<<(int)(log(n/2+0.5)/log(2))/2).
+                        ip[0],ip[1] are pointers of the cos/sin table.
+        w[0...n/2-1]   :cos/sin table (float *)
+                        w[],ip[] are initialized if ip[0] == 0.
+    [remark]
+        Inverse of
+            rdft(n, 1, a, ip, w);
+        is
+            rdft(n, -1, a, ip, w);
+            for (j = 0; j <= n - 1; j++) {
+                a[j] *= 2.0 / n;
+            }
+        .
+
+
+-------- DCT (Discrete Cosine Transform) / Inverse of DCT --------
+    [definition]
+        <case1> IDCT (excluding scale)
+            C[k] = sum_j=0^n-1 a[j]*cos(pi*j*(k+1/2)/n), 0<=k<n
+        <case2> DCT
+            C[k] = sum_j=0^n-1 a[j]*cos(pi*(j+1/2)*k/n), 0<=k<n
+    [usage]
+        <case1>
+            ip[0] = 0; // first time only
+            ddct(n, 1, a, ip, w);
+        <case2>
+            ip[0] = 0; // first time only
+            ddct(n, -1, a, ip, w);
+    [parameters]
+        n              :data length (int)
+                        n >= 2, n = power of 2
+        a[0...n-1]     :input/output data (float *)
+                        output data
+                            a[k] = C[k], 0<=k<n
+        ip[0...*]      :work area for bit reversal (int *)
+                        length of ip >= 2+sqrt(n/2)
+                        strictly,
+                        length of ip >=
+                            2+(1<<(int)(log(n/2+0.5)/log(2))/2).
+                        ip[0],ip[1] are pointers of the cos/sin table.
+        w[0...n*5/4-1] :cos/sin table (float *)
+                        w[],ip[] are initialized if ip[0] == 0.
+    [remark]
+        Inverse of
+            ddct(n, -1, a, ip, w);
+        is
+            a[0] *= 0.5;
+            ddct(n, 1, a, ip, w);
+            for (j = 0; j <= n - 1; j++) {
+                a[j] *= 2.0 / n;
+            }
+        .
+
+
+-------- DST (Discrete Sine Transform) / Inverse of DST --------
+    [definition]
+        <case1> IDST (excluding scale)
+            S[k] = sum_j=1^n A[j]*sin(pi*j*(k+1/2)/n), 0<=k<n
+        <case2> DST
+            S[k] = sum_j=0^n-1 a[j]*sin(pi*(j+1/2)*k/n), 0<k<=n
+    [usage]
+        <case1>
+            ip[0] = 0; // first time only
+            ddst(n, 1, a, ip, w);
+        <case2>
+            ip[0] = 0; // first time only
+            ddst(n, -1, a, ip, w);
+    [parameters]
+        n              :data length (int)
+                        n >= 2, n = power of 2
+        a[0...n-1]     :input/output data (float *)
+                        <case1>
+                            input data
+                                a[j] = A[j], 0<j<n
+                                a[0] = A[n]
+                            output data
+                                a[k] = S[k], 0<=k<n
+                        <case2>
+                            output data
+                                a[k] = S[k], 0<k<n
+                                a[0] = S[n]
+        ip[0...*]      :work area for bit reversal (int *)
+                        length of ip >= 2+sqrt(n/2)
+                        strictly,
+                        length of ip >=
+                            2+(1<<(int)(log(n/2+0.5)/log(2))/2).
+                        ip[0],ip[1] are pointers of the cos/sin table.
+        w[0...n*5/4-1] :cos/sin table (float *)
+                        w[],ip[] are initialized if ip[0] == 0.
+    [remark]
+        Inverse of
+            ddst(n, -1, a, ip, w);
+        is
+            a[0] *= 0.5;
+            ddst(n, 1, a, ip, w);
+            for (j = 0; j <= n - 1; j++) {
+                a[j] *= 2.0 / n;
+            }
+        .
+
+
+-------- Cosine Transform of RDFT (Real Symmetric DFT) --------
+    [definition]
+        C[k] = sum_j=0^n a[j]*cos(pi*j*k/n), 0<=k<=n
+    [usage]
+        ip[0] = 0; // first time only
+        dfct(n, a, t, ip, w);
+    [parameters]
+        n              :data length - 1 (int)
+                        n >= 2, n = power of 2
+        a[0...n]       :input/output data (float *)
+                        output data
+                            a[k] = C[k], 0<=k<=n
+        t[0...n/2]     :work area (float *)
+        ip[0...*]      :work area for bit reversal (int *)
+                        length of ip >= 2+sqrt(n/4)
+                        strictly,
+                        length of ip >=
+                            2+(1<<(int)(log(n/4+0.5)/log(2))/2).
+                        ip[0],ip[1] are pointers of the cos/sin table.
+        w[0...n*5/8-1] :cos/sin table (float *)
+                        w[],ip[] are initialized if ip[0] == 0.
+    [remark]
+        Inverse of
+            a[0] *= 0.5;
+            a[n] *= 0.5;
+            dfct(n, a, t, ip, w);
+        is
+            a[0] *= 0.5;
+            a[n] *= 0.5;
+            dfct(n, a, t, ip, w);
+            for (j = 0; j <= n; j++) {
+                a[j] *= 2.0 / n;
+            }
+        .
+
+
+-------- Sine Transform of RDFT (Real Anti-symmetric DFT) --------
+    [definition]
+        S[k] = sum_j=1^n-1 a[j]*sin(pi*j*k/n), 0<k<n
+    [usage]
+        ip[0] = 0; // first time only
+        dfst(n, a, t, ip, w);
+    [parameters]
+        n              :data length + 1 (int)
+                        n >= 2, n = power of 2
+        a[0...n-1]     :input/output data (float *)
+                        output data
+                            a[k] = S[k], 0<k<n
+                        (a[0] is used for work area)
+        t[0...n/2-1]   :work area (float *)
+        ip[0...*]      :work area for bit reversal (int *)
+                        length of ip >= 2+sqrt(n/4)
+                        strictly,
+                        length of ip >=
+                            2+(1<<(int)(log(n/4+0.5)/log(2))/2).
+                        ip[0],ip[1] are pointers of the cos/sin table.
+        w[0...n*5/8-1] :cos/sin table (float *)
+                        w[],ip[] are initialized if ip[0] == 0.
+    [remark]
+        Inverse of
+            dfst(n, a, t, ip, w);
+        is
+            dfst(n, a, t, ip, w);
+            for (j = 1; j <= n - 1; j++) {
+                a[j] *= 2.0 / n;
+            }
+        .
+
+
+Appendix :
+    The cos/sin table is recalculated when the larger table required.
+    w[] and ip[] are compatible with all routines.
+*/
+
+#include <math.h>
+#include <stddef.h>
+
+#include "common_audio/third_party/ooura/fft_size_256/fft4g.h"
+
+namespace webrtc {
+
+namespace {
+
+void makewt(size_t nw, size_t* ip, float* w);
+void makect(size_t nc, size_t* ip, float* c);
+void bitrv2(size_t n, size_t* ip, float* a);
+void cftfsub(size_t n, float* a, float* w);
+void cftbsub(size_t n, float* a, float* w);
+void cft1st(size_t n, float* a, float* w);
+void cftmdl(size_t n, size_t l, float* a, float* w);
+void rftfsub(size_t n, float* a, size_t nc, float* c);
+void rftbsub(size_t n, float* a, size_t nc, float* c);
+
+/* -------- initializing routines -------- */
+
+void makewt(size_t nw, size_t* ip, float* w) {
+  size_t j, nwh;
+  float delta, x, y;
+
+  ip[0] = nw;
+  ip[1] = 1;
+  if (nw > 2) {
+    nwh = nw >> 1;
+    delta = atanf(1.0f) / nwh;
+    w[0] = 1;
+    w[1] = 0;
+    w[nwh] = (float)cos(delta * nwh);
+    w[nwh + 1] = w[nwh];
+    if (nwh > 2) {
+      for (j = 2; j < nwh; j += 2) {
+        x = (float)cos(delta * j);
+        y = (float)sin(delta * j);
+        w[j] = x;
+        w[j + 1] = y;
+        w[nw - j] = y;
+        w[nw - j + 1] = x;
+      }
+      bitrv2(nw, ip + 2, w);
+    }
+  }
+}
+
+void makect(size_t nc, size_t* ip, float* c) {
+  size_t j, nch;
+  float delta;
+
+  ip[1] = nc;
+  if (nc > 1) {
+    nch = nc >> 1;
+    delta = atanf(1.0f) / nch;
+    c[0] = (float)cos(delta * nch);
+    c[nch] = 0.5f * c[0];
+    for (j = 1; j < nch; j++) {
+      c[j] = 0.5f * (float)cos(delta * j);
+      c[nc - j] = 0.5f * (float)sin(delta * j);
+    }
+  }
+}
+
+/* -------- child routines -------- */
+
+void bitrv2(size_t n, size_t* ip, float* a) {
+  size_t j, j1, k, k1, l, m, m2;
+  float xr, xi, yr, yi;
+
+  ip[0] = 0;
+  l = n;
+  m = 1;
+  while ((m << 3) < l) {
+    l >>= 1;
+    for (j = 0; j < m; j++) {
+      ip[m + j] = ip[j] + l;
+    }
+    m <<= 1;
+  }
+  m2 = 2 * m;
+  if ((m << 3) == l) {
+    for (k = 0; k < m; k++) {
+      for (j = 0; j < k; j++) {
+        j1 = 2 * j + ip[k];
+        k1 = 2 * k + ip[j];
+        xr = a[j1];
+        xi = a[j1 + 1];
+        yr = a[k1];
+        yi = a[k1 + 1];
+        a[j1] = yr;
+        a[j1 + 1] = yi;
+        a[k1] = xr;
+        a[k1 + 1] = xi;
+        j1 += m2;
+        k1 += 2 * m2;
+        xr = a[j1];
+        xi = a[j1 + 1];
+        yr = a[k1];
+        yi = a[k1 + 1];
+        a[j1] = yr;
+        a[j1 + 1] = yi;
+        a[k1] = xr;
+        a[k1 + 1] = xi;
+        j1 += m2;
+        k1 -= m2;
+        xr = a[j1];
+        xi = a[j1 + 1];
+        yr = a[k1];
+        yi = a[k1 + 1];
+        a[j1] = yr;
+        a[j1 + 1] = yi;
+        a[k1] = xr;
+        a[k1 + 1] = xi;
+        j1 += m2;
+        k1 += 2 * m2;
+        xr = a[j1];
+        xi = a[j1 + 1];
+        yr = a[k1];
+        yi = a[k1 + 1];
+        a[j1] = yr;
+        a[j1 + 1] = yi;
+        a[k1] = xr;
+        a[k1 + 1] = xi;
+      }
+      j1 = 2 * k + m2 + ip[k];
+      k1 = j1 + m2;
+      xr = a[j1];
+      xi = a[j1 + 1];
+      yr = a[k1];
+      yi = a[k1 + 1];
+      a[j1] = yr;
+      a[j1 + 1] = yi;
+      a[k1] = xr;
+      a[k1 + 1] = xi;
+    }
+  } else {
+    for (k = 1; k < m; k++) {
+      for (j = 0; j < k; j++) {
+        j1 = 2 * j + ip[k];
+        k1 = 2 * k + ip[j];
+        xr = a[j1];
+        xi = a[j1 + 1];
+        yr = a[k1];
+        yi = a[k1 + 1];
+        a[j1] = yr;
+        a[j1 + 1] = yi;
+        a[k1] = xr;
+        a[k1 + 1] = xi;
+        j1 += m2;
+        k1 += m2;
+        xr = a[j1];
+        xi = a[j1 + 1];
+        yr = a[k1];
+        yi = a[k1 + 1];
+        a[j1] = yr;
+        a[j1 + 1] = yi;
+        a[k1] = xr;
+        a[k1 + 1] = xi;
+      }
+    }
+  }
+}
+
+void cftfsub(size_t n, float* a, float* w) {
+  size_t j, j1, j2, j3, l;
+  float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
+
+  l = 2;
+  if (n > 8) {
+    cft1st(n, a, w);
+    l = 8;
+    while ((l << 2) < n) {
+      cftmdl(n, l, a, w);
+      l <<= 2;
+    }
+  }
+  if ((l << 2) == n) {
+    for (j = 0; j < l; j += 2) {
+      j1 = j + l;
+      j2 = j1 + l;
+      j3 = j2 + l;
+      x0r = a[j] + a[j1];
+      x0i = a[j + 1] + a[j1 + 1];
+      x1r = a[j] - a[j1];
+      x1i = a[j + 1] - a[j1 + 1];
+      x2r = a[j2] + a[j3];
+      x2i = a[j2 + 1] + a[j3 + 1];
+      x3r = a[j2] - a[j3];
+      x3i = a[j2 + 1] - a[j3 + 1];
+      a[j] = x0r + x2r;
+      a[j + 1] = x0i + x2i;
+      a[j2] = x0r - x2r;
+      a[j2 + 1] = x0i - x2i;
+      a[j1] = x1r - x3i;
+      a[j1 + 1] = x1i + x3r;
+      a[j3] = x1r + x3i;
+      a[j3 + 1] = x1i - x3r;
+    }
+  } else {
+    for (j = 0; j < l; j += 2) {
+      j1 = j + l;
+      x0r = a[j] - a[j1];
+      x0i = a[j + 1] - a[j1 + 1];
+      a[j] += a[j1];
+      a[j + 1] += a[j1 + 1];
+      a[j1] = x0r;
+      a[j1 + 1] = x0i;
+    }
+  }
+}
+
+void cftbsub(size_t n, float* a, float* w) {
+  size_t j, j1, j2, j3, l;
+  float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
+
+  l = 2;
+  if (n > 8) {
+    cft1st(n, a, w);
+    l = 8;
+    while ((l << 2) < n) {
+      cftmdl(n, l, a, w);
+      l <<= 2;
+    }
+  }
+  if ((l << 2) == n) {
+    for (j = 0; j < l; j += 2) {
+      j1 = j + l;
+      j2 = j1 + l;
+      j3 = j2 + l;
+      x0r = a[j] + a[j1];
+      x0i = -a[j + 1] - a[j1 + 1];
+      x1r = a[j] - a[j1];
+      x1i = -a[j + 1] + a[j1 + 1];
+      x2r = a[j2] + a[j3];
+      x2i = a[j2 + 1] + a[j3 + 1];
+      x3r = a[j2] - a[j3];
+      x3i = a[j2 + 1] - a[j3 + 1];
+      a[j] = x0r + x2r;
+      a[j + 1] = x0i - x2i;
+      a[j2] = x0r - x2r;
+      a[j2 + 1] = x0i + x2i;
+      a[j1] = x1r - x3i;
+      a[j1 + 1] = x1i - x3r;
+      a[j3] = x1r + x3i;
+      a[j3 + 1] = x1i + x3r;
+    }
+  } else {
+    for (j = 0; j < l; j += 2) {
+      j1 = j + l;
+      x0r = a[j] - a[j1];
+      x0i = -a[j + 1] + a[j1 + 1];
+      a[j] += a[j1];
+      a[j + 1] = -a[j + 1] - a[j1 + 1];
+      a[j1] = x0r;
+      a[j1 + 1] = x0i;
+    }
+  }
+}
+
+void cft1st(size_t n, float* a, float* w) {
+  size_t j, k1, k2;
+  float wk1r, wk1i, wk2r, wk2i, wk3r, wk3i;
+  float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
+
+  x0r = a[0] + a[2];
+  x0i = a[1] + a[3];
+  x1r = a[0] - a[2];
+  x1i = a[1] - a[3];
+  x2r = a[4] + a[6];
+  x2i = a[5] + a[7];
+  x3r = a[4] - a[6];
+  x3i = a[5] - a[7];
+  a[0] = x0r + x2r;
+  a[1] = x0i + x2i;
+  a[4] = x0r - x2r;
+  a[5] = x0i - x2i;
+  a[2] = x1r - x3i;
+  a[3] = x1i + x3r;
+  a[6] = x1r + x3i;
+  a[7] = x1i - x3r;
+  wk1r = w[2];
+  x0r = a[8] + a[10];
+  x0i = a[9] + a[11];
+  x1r = a[8] - a[10];
+  x1i = a[9] - a[11];
+  x2r = a[12] + a[14];
+  x2i = a[13] + a[15];
+  x3r = a[12] - a[14];
+  x3i = a[13] - a[15];
+  a[8] = x0r + x2r;
+  a[9] = x0i + x2i;
+  a[12] = x2i - x0i;
+  a[13] = x0r - x2r;
+  x0r = x1r - x3i;
+  x0i = x1i + x3r;
+  a[10] = wk1r * (x0r - x0i);
+  a[11] = wk1r * (x0r + x0i);
+  x0r = x3i + x1r;
+  x0i = x3r - x1i;
+  a[14] = wk1r * (x0i - x0r);
+  a[15] = wk1r * (x0i + x0r);
+  k1 = 0;
+  for (j = 16; j < n; j += 16) {
+    k1 += 2;
+    k2 = 2 * k1;
+    wk2r = w[k1];
+    wk2i = w[k1 + 1];
+    wk1r = w[k2];
+    wk1i = w[k2 + 1];
+    wk3r = wk1r - 2 * wk2i * wk1i;
+    wk3i = 2 * wk2i * wk1r - wk1i;
+    x0r = a[j] + a[j + 2];
+    x0i = a[j + 1] + a[j + 3];
+    x1r = a[j] - a[j + 2];
+    x1i = a[j + 1] - a[j + 3];
+    x2r = a[j + 4] + a[j + 6];
+    x2i = a[j + 5] + a[j + 7];
+    x3r = a[j + 4] - a[j + 6];
+    x3i = a[j + 5] - a[j + 7];
+    a[j] = x0r + x2r;
+    a[j + 1] = x0i + x2i;
+    x0r -= x2r;
+    x0i -= x2i;
+    a[j + 4] = wk2r * x0r - wk2i * x0i;
+    a[j + 5] = wk2r * x0i + wk2i * x0r;
+    x0r = x1r - x3i;
+    x0i = x1i + x3r;
+    a[j + 2] = wk1r * x0r - wk1i * x0i;
+    a[j + 3] = wk1r * x0i + wk1i * x0r;
+    x0r = x1r + x3i;
+    x0i = x1i - x3r;
+    a[j + 6] = wk3r * x0r - wk3i * x0i;
+    a[j + 7] = wk3r * x0i + wk3i * x0r;
+    wk1r = w[k2 + 2];
+    wk1i = w[k2 + 3];
+    wk3r = wk1r - 2 * wk2r * wk1i;
+    wk3i = 2 * wk2r * wk1r - wk1i;
+    x0r = a[j + 8] + a[j + 10];
+    x0i = a[j + 9] + a[j + 11];
+    x1r = a[j + 8] - a[j + 10];
+    x1i = a[j + 9] - a[j + 11];
+    x2r = a[j + 12] + a[j + 14];
+    x2i = a[j + 13] + a[j + 15];
+    x3r = a[j + 12] - a[j + 14];
+    x3i = a[j + 13] - a[j + 15];
+    a[j + 8] = x0r + x2r;
+    a[j + 9] = x0i + x2i;
+    x0r -= x2r;
+    x0i -= x2i;
+    a[j + 12] = -wk2i * x0r - wk2r * x0i;
+    a[j + 13] = -wk2i * x0i + wk2r * x0r;
+    x0r = x1r - x3i;
+    x0i = x1i + x3r;
+    a[j + 10] = wk1r * x0r - wk1i * x0i;
+    a[j + 11] = wk1r * x0i + wk1i * x0r;
+    x0r = x1r + x3i;
+    x0i = x1i - x3r;
+    a[j + 14] = wk3r * x0r - wk3i * x0i;
+    a[j + 15] = wk3r * x0i + wk3i * x0r;
+  }
+}
+
+void cftmdl(size_t n, size_t l, float* a, float* w) {
+  size_t j, j1, j2, j3, k, k1, k2, m, m2;
+  float wk1r, wk1i, wk2r, wk2i, wk3r, wk3i;
+  float x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i;
+
+  m = l << 2;
+  for (j = 0; j < l; j += 2) {
+    j1 = j + l;
+    j2 = j1 + l;
+    j3 = j2 + l;
+    x0r = a[j] + a[j1];
+    x0i = a[j + 1] + a[j1 + 1];
+    x1r = a[j] - a[j1];
+    x1i = a[j + 1] - a[j1 + 1];
+    x2r = a[j2] + a[j3];
+    x2i = a[j2 + 1] + a[j3 + 1];
+    x3r = a[j2] - a[j3];
+    x3i = a[j2 + 1] - a[j3 + 1];
+    a[j] = x0r + x2r;
+    a[j + 1] = x0i + x2i;
+    a[j2] = x0r - x2r;
+    a[j2 + 1] = x0i - x2i;
+    a[j1] = x1r - x3i;
+    a[j1 + 1] = x1i + x3r;
+    a[j3] = x1r + x3i;
+    a[j3 + 1] = x1i - x3r;
+  }
+  wk1r = w[2];
+  for (j = m; j < l + m; j += 2) {
+    j1 = j + l;
+    j2 = j1 + l;
+    j3 = j2 + l;
+    x0r = a[j] + a[j1];
+    x0i = a[j + 1] + a[j1 + 1];
+    x1r = a[j] - a[j1];
+    x1i = a[j + 1] - a[j1 + 1];
+    x2r = a[j2] + a[j3];
+    x2i = a[j2 + 1] + a[j3 + 1];
+    x3r = a[j2] - a[j3];
+    x3i = a[j2 + 1] - a[j3 + 1];
+    a[j] = x0r + x2r;
+    a[j + 1] = x0i + x2i;
+    a[j2] = x2i - x0i;
+    a[j2 + 1] = x0r - x2r;
+    x0r = x1r - x3i;
+    x0i = x1i + x3r;
+    a[j1] = wk1r * (x0r - x0i);
+    a[j1 + 1] = wk1r * (x0r + x0i);
+    x0r = x3i + x1r;
+    x0i = x3r - x1i;
+    a[j3] = wk1r * (x0i - x0r);
+    a[j3 + 1] = wk1r * (x0i + x0r);
+  }
+  k1 = 0;
+  m2 = 2 * m;
+  for (k = m2; k < n; k += m2) {
+    k1 += 2;
+    k2 = 2 * k1;
+    wk2r = w[k1];
+    wk2i = w[k1 + 1];
+    wk1r = w[k2];
+    wk1i = w[k2 + 1];
+    wk3r = wk1r - 2 * wk2i * wk1i;
+    wk3i = 2 * wk2i * wk1r - wk1i;
+    for (j = k; j < l + k; j += 2) {
+      j1 = j + l;
+      j2 = j1 + l;
+      j3 = j2 + l;
+      x0r = a[j] + a[j1];
+      x0i = a[j + 1] + a[j1 + 1];
+      x1r = a[j] - a[j1];
+      x1i = a[j + 1] - a[j1 + 1];
+      x2r = a[j2] + a[j3];
+      x2i = a[j2 + 1] + a[j3 + 1];
+      x3r = a[j2] - a[j3];
+      x3i = a[j2 + 1] - a[j3 + 1];
+      a[j] = x0r + x2r;
+      a[j + 1] = x0i + x2i;
+      x0r -= x2r;
+      x0i -= x2i;
+      a[j2] = wk2r * x0r - wk2i * x0i;
+      a[j2 + 1] = wk2r * x0i + wk2i * x0r;
+      x0r = x1r - x3i;
+      x0i = x1i + x3r;
+      a[j1] = wk1r * x0r - wk1i * x0i;
+      a[j1 + 1] = wk1r * x0i + wk1i * x0r;
+      x0r = x1r + x3i;
+      x0i = x1i - x3r;
+      a[j3] = wk3r * x0r - wk3i * x0i;
+      a[j3 + 1] = wk3r * x0i + wk3i * x0r;
+    }
+    wk1r = w[k2 + 2];
+    wk1i = w[k2 + 3];
+    wk3r = wk1r - 2 * wk2r * wk1i;
+    wk3i = 2 * wk2r * wk1r - wk1i;
+    for (j = k + m; j < l + (k + m); j += 2) {
+      j1 = j + l;
+      j2 = j1 + l;
+      j3 = j2 + l;
+      x0r = a[j] + a[j1];
+      x0i = a[j + 1] + a[j1 + 1];
+      x1r = a[j] - a[j1];
+      x1i = a[j + 1] - a[j1 + 1];
+      x2r = a[j2] + a[j3];
+      x2i = a[j2 + 1] + a[j3 + 1];
+      x3r = a[j2] - a[j3];
+      x3i = a[j2 + 1] - a[j3 + 1];
+      a[j] = x0r + x2r;
+      a[j + 1] = x0i + x2i;
+      x0r -= x2r;
+      x0i -= x2i;
+      a[j2] = -wk2i * x0r - wk2r * x0i;
+      a[j2 + 1] = -wk2i * x0i + wk2r * x0r;
+      x0r = x1r - x3i;
+      x0i = x1i + x3r;
+      a[j1] = wk1r * x0r - wk1i * x0i;
+      a[j1 + 1] = wk1r * x0i + wk1i * x0r;
+      x0r = x1r + x3i;
+      x0i = x1i - x3r;
+      a[j3] = wk3r * x0r - wk3i * x0i;
+      a[j3 + 1] = wk3r * x0i + wk3i * x0r;
+    }
+  }
+}
+
+void rftfsub(size_t n, float* a, size_t nc, float* c) {
+  size_t j, k, kk, ks, m;
+  float wkr, wki, xr, xi, yr, yi;
+
+  m = n >> 1;
+  ks = 2 * nc / m;
+  kk = 0;
+  for (j = 2; j < m; j += 2) {
+    k = n - j;
+    kk += ks;
+    wkr = 0.5f - c[nc - kk];
+    wki = c[kk];
+    xr = a[j] - a[k];
+    xi = a[j + 1] + a[k + 1];
+    yr = wkr * xr - wki * xi;
+    yi = wkr * xi + wki * xr;
+    a[j] -= yr;
+    a[j + 1] -= yi;
+    a[k] += yr;
+    a[k + 1] -= yi;
+  }
+}
+
+void rftbsub(size_t n, float* a, size_t nc, float* c) {
+  size_t j, k, kk, ks, m;
+  float wkr, wki, xr, xi, yr, yi;
+
+  a[1] = -a[1];
+  m = n >> 1;
+  ks = 2 * nc / m;
+  kk = 0;
+  for (j = 2; j < m; j += 2) {
+    k = n - j;
+    kk += ks;
+    wkr = 0.5f - c[nc - kk];
+    wki = c[kk];
+    xr = a[j] - a[k];
+    xi = a[j + 1] + a[k + 1];
+    yr = wkr * xr + wki * xi;
+    yi = wkr * xi - wki * xr;
+    a[j] -= yr;
+    a[j + 1] = yi - a[j + 1];
+    a[k] += yr;
+    a[k + 1] = yi - a[k + 1];
+  }
+  a[m + 1] = -a[m + 1];
+}
+
+}  // namespace
+
+void WebRtc_rdft(size_t n, int isgn, float* a, size_t* ip, float* w) {
+  size_t nw, nc;
+  float xi;
+
+  nw = ip[0];
+  if (n > (nw << 2)) {
+    nw = n >> 2;
+    makewt(nw, ip, w);
+  }
+  nc = ip[1];
+  if (n > (nc << 2)) {
+    nc = n >> 2;
+    makect(nc, ip, w + nw);
+  }
+  if (isgn >= 0) {
+    if (n > 4) {
+      bitrv2(n, ip + 2, a);
+      cftfsub(n, a, w);
+      rftfsub(n, a, nc, w + nw);
+    } else if (n == 4) {
+      cftfsub(n, a, w);
+    }
+    xi = a[0] - a[1];
+    a[0] += a[1];
+    a[1] = xi;
+  } else {
+    a[1] = 0.5f * (a[0] - a[1]);
+    a[0] -= a[1];
+    if (n > 4) {
+      rftbsub(n, a, nc, w + nw);
+      bitrv2(n, ip + 2, a);
+      cftbsub(n, a, w);
+    } else if (n == 4) {
+      cftfsub(n, a, w);
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_256/fft4g.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_256/fft4g.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_256/fft4g.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/fft_size_256/fft4g.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,21 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the ../../../LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef COMMON_AUDIO_THIRD_PARTY_OOURA_FFT_SIZE_256_FFT4G_H_
+#define COMMON_AUDIO_THIRD_PARTY_OOURA_FFT_SIZE_256_FFT4G_H_
+
+namespace webrtc {
+
+// Refer to fft4g.c for documentation.
+void WebRtc_rdft(size_t n, int isgn, float* a, size_t* ip, float* w);
+
+}  // namespace webrtc
+
+#endif  // COMMON_AUDIO_THIRD_PARTY_OOURA_FFT_SIZE_256_FFT4G_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/LICENSE asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/LICENSE
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/LICENSE	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,8 @@
+/*
+ * http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html
+ * Copyright Takuya OOURA, 1996-2001
+ *
+ * You may use, copy, modify and distribute this code for any purpose (include
+ * commercial use) and without fee. Please refer to this package when you modify
+ * this code.
+ */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/README.chromium asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/README.chromium
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/README.chromium	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/ooura/README.chromium	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,13 @@
+Name: General Purpose FFT (Fast Fourier/Cosine/Sine Transform) Package
+Short Name: fft4g
+URL: http://www.kurims.kyoto-u.ac.jp/~ooura/fft.html
+Version: 0
+Date: 2018-06-19
+License: Custome license
+License File: LICENSE
+Security Critical: yes
+
+Description:
+This is a package to calculate Discrete Fourier/Cosine/Sine Transforms of
+1-dimensional sequences of length 2^N. This package contains C and Fortran
+FFT codes.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/BUILD.gn asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/BUILD.gn
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/BUILD.gn	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,24 @@
+# Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the ../../../LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+import("../../../webrtc.gni")
+
+rtc_library("spl_sqrt_floor") {
+  visibility = [ "../..:common_audio_c" ]
+  sources = [ "spl_sqrt_floor.h" ]
+  deps = []
+  if (current_cpu == "arm") {
+    sources += [ "spl_sqrt_floor_arm.S" ]
+
+    deps += [ "../../../rtc_base/system:asm_defines" ]
+  } else if (current_cpu == "mipsel") {
+    sources += [ "spl_sqrt_floor_mips.c" ]
+  } else {
+    sources += [ "spl_sqrt_floor.c" ]
+  }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/LICENSE asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/LICENSE
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/LICENSE	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+ * Written by Wilco Dijkstra, 1996. The following email exchange establishes the
+ * license.
+ *
+ * From: Wilco Dijkstra <Wilco.Dijkstra@ntlworld.com>
+ * Date: Fri, Jun 24, 2011 at 3:20 AM
+ * Subject: Re: sqrt routine
+ * To: Kevin Ma <kma@google.com>
+ * Hi Kevin,
+ * Thanks for asking. Those routines are public domain (originally posted to
+ * comp.sys.arm a long time ago), so you can use them freely for any purpose.
+ * Cheers,
+ * Wilco
+ *
+ * ----- Original Message -----
+ * From: "Kevin Ma" <kma@google.com>
+ * To: <Wilco.Dijkstra@ntlworld.com>
+ * Sent: Thursday, June 23, 2011 11:44 PM
+ * Subject: Fwd: sqrt routine
+ * Hi Wilco,
+ * I saw your sqrt routine from several web sites, including
+ * http://www.finesse.demon.co.uk/steven/sqrt.html.
+ * Just wonder if there's any copyright information with your Successive
+ * approximation routines, or if I can freely use it for any purpose.
+ * Thanks.
+ * Kevin
+ */
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/README.chromium asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/README.chromium
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/README.chromium	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/README.chromium	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,12 @@
+Name: sql sqrt floor
+Short Name: sql_sqrt_floor
+URL: http://www.pertinentdetail.org/sqrt
+Version: 0
+Date: 2018-03-22
+License: Custom license
+License File: LICENSE
+Security Critical: yes
+
+Description:
+Sqrt routine, originally was posted to the USENET group comp.sys.arm on
+20 Jun 1996.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_arm.S	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,110 @@
+@
+@ Written by Wilco Dijkstra, 1996. The following email exchange establishes the
+@ license.
+@
+@ From: Wilco Dijkstra <Wilco.Dijkstra@ntlworld.com>
+@ Date: Fri, Jun 24, 2011 at 3:20 AM
+@ Subject: Re: sqrt routine
+@ To: Kevin Ma <kma@google.com>
+@ Hi Kevin,
+@ Thanks for asking. Those routines are public domain (originally posted to
+@ comp.sys.arm a long time ago), so you can use them freely for any purpose.
+@ Cheers,
+@ Wilco
+@
+@ ----- Original Message -----
+@ From: "Kevin Ma" <kma@google.com>
+@ To: <Wilco.Dijkstra@ntlworld.com>
+@ Sent: Thursday, June 23, 2011 11:44 PM
+@ Subject: Fwd: sqrt routine
+@ Hi Wilco,
+@ I saw your sqrt routine from several web sites, including
+@ http://www.finesse.demon.co.uk/steven/sqrt.html.
+@ Just wonder if there's any copyright information with your Successive
+@ approximation routines, or if I can freely use it for any purpose.
+@ Thanks.
+@ Kevin
+
+@ Minor modifications in code style for WebRTC, 2012.
+@ Output is bit-exact with the reference C code in spl_sqrt_floor.c.
+
+@ Input :             r0 32 bit unsigned integer
+@ Output:             r0 = INT (SQRT (r0)), precision is 16 bits
+@ Registers touched:  r1, r2
+
+#include "rtc_base/system/asm_defines.h"
+
+GLOBAL_FUNCTION WebRtcSpl_SqrtFloor
+.align  2
+DEFINE_FUNCTION WebRtcSpl_SqrtFloor
+  mov    r1, #3 << 30
+  mov    r2, #1 << 30
+
+  @ unroll for i = 0 .. 15
+
+  cmp    r0, r2, ror #2 * 0
+  subhs  r0, r0, r2, ror #2 * 0
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 1
+  subhs  r0, r0, r2, ror #2 * 1
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 2
+  subhs  r0, r0, r2, ror #2 * 2
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 3
+  subhs  r0, r0, r2, ror #2 * 3
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 4
+  subhs  r0, r0, r2, ror #2 * 4
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 5
+  subhs  r0, r0, r2, ror #2 * 5
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 6
+  subhs  r0, r0, r2, ror #2 * 6
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 7
+  subhs  r0, r0, r2, ror #2 * 7
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 8
+  subhs  r0, r0, r2, ror #2 * 8
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 9
+  subhs  r0, r0, r2, ror #2 * 9
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 10
+  subhs  r0, r0, r2, ror #2 * 10
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 11
+  subhs  r0, r0, r2, ror #2 * 11
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 12
+  subhs  r0, r0, r2, ror #2 * 12
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 13
+  subhs  r0, r0, r2, ror #2 * 13
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 14
+  subhs  r0, r0, r2, ror #2 * 14
+  adc    r2, r1, r2, lsl #1
+
+  cmp    r0, r2, ror #2 * 15
+  subhs  r0, r0, r2, ror #2 * 15
+  adc    r2, r1, r2, lsl #1
+
+  bic    r0, r2, #3 << 30  @ for rounding add: cmp r0, r2  adc r2, #1
+  bx lr
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+ * Written by Wilco Dijkstra, 1996. The following email exchange establishes the
+ * license.
+ *
+ * From: Wilco Dijkstra <Wilco.Dijkstra@ntlworld.com>
+ * Date: Fri, Jun 24, 2011 at 3:20 AM
+ * Subject: Re: sqrt routine
+ * To: Kevin Ma <kma@google.com>
+ * Hi Kevin,
+ * Thanks for asking. Those routines are public domain (originally posted to
+ * comp.sys.arm a long time ago), so you can use them freely for any purpose.
+ * Cheers,
+ * Wilco
+ *
+ * ----- Original Message -----
+ * From: "Kevin Ma" <kma@google.com>
+ * To: <Wilco.Dijkstra@ntlworld.com>
+ * Sent: Thursday, June 23, 2011 11:44 PM
+ * Subject: Fwd: sqrt routine
+ * Hi Wilco,
+ * I saw your sqrt routine from several web sites, including
+ * http://www.finesse.demon.co.uk/steven/sqrt.html.
+ * Just wonder if there's any copyright information with your Successive
+ * approximation routines, or if I can freely use it for any purpose.
+ * Thanks.
+ * Kevin
+ */
+
+// Minor modifications in code style for WebRTC, 2012.
+
+#include "common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h"
+
+/*
+ * Algorithm:
+ * Successive approximation of the equation (root + delta) ^ 2 = N
+ * until delta < 1. If delta < 1 we have the integer part of SQRT (N).
+ * Use delta = 2^i for i = 15 .. 0.
+ *
+ * Output precision is 16 bits. Note for large input values (close to
+ * 0x7FFFFFFF), bit 15 (the highest bit of the low 16-bit half word)
+ * contains the MSB information (a non-sign value). Do with caution
+ * if you need to cast the output to int16_t type.
+ *
+ * If the input value is negative, it returns 0.
+ */
+
+#define WEBRTC_SPL_SQRT_ITER(N)                 \
+  try1 = root + (1 << (N));                     \
+  if (value >= try1 << (N))                     \
+  {                                             \
+    value -= try1 << (N);                       \
+    root |= 2 << (N);                           \
+  }
+
+int32_t WebRtcSpl_SqrtFloor(int32_t value)
+{
+  int32_t root = 0, try1;
+
+  WEBRTC_SPL_SQRT_ITER (15);
+  WEBRTC_SPL_SQRT_ITER (14);
+  WEBRTC_SPL_SQRT_ITER (13);
+  WEBRTC_SPL_SQRT_ITER (12);
+  WEBRTC_SPL_SQRT_ITER (11);
+  WEBRTC_SPL_SQRT_ITER (10);
+  WEBRTC_SPL_SQRT_ITER ( 9);
+  WEBRTC_SPL_SQRT_ITER ( 8);
+  WEBRTC_SPL_SQRT_ITER ( 7);
+  WEBRTC_SPL_SQRT_ITER ( 6);
+  WEBRTC_SPL_SQRT_ITER ( 5);
+  WEBRTC_SPL_SQRT_ITER ( 4);
+  WEBRTC_SPL_SQRT_ITER ( 3);
+  WEBRTC_SPL_SQRT_ITER ( 2);
+  WEBRTC_SPL_SQRT_ITER ( 1);
+  WEBRTC_SPL_SQRT_ITER ( 0);
+
+  return root >> 1;
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,29 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <stdint.h>
+
+//
+// WebRtcSpl_SqrtFloor(...)
+//
+// Returns the square root of the input value |value|. The precision of this
+// function is rounding down integer precision, i.e., sqrt(8) gives 2 as answer.
+// If |value| is a negative number then 0 is returned.
+//
+// Algorithm:
+//
+// An iterative 4 cylce/bit routine
+//
+// Input:
+//      - value     : Value to calculate sqrt of
+//
+// Return value     : Result of the sqrt calculation
+//
+int32_t WebRtcSpl_SqrtFloor(int32_t value);
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,207 @@
+/*
+ * Written by Wilco Dijkstra, 1996. The following email exchange establishes the
+ * license.
+ *
+ * From: Wilco Dijkstra <Wilco.Dijkstra@ntlworld.com>
+ * Date: Fri, Jun 24, 2011 at 3:20 AM
+ * Subject: Re: sqrt routine
+ * To: Kevin Ma <kma@google.com>
+ * Hi Kevin,
+ * Thanks for asking. Those routines are public domain (originally posted to
+ * comp.sys.arm a long time ago), so you can use them freely for any purpose.
+ * Cheers,
+ * Wilco
+ *
+ * ----- Original Message -----
+ * From: "Kevin Ma" <kma@google.com>
+ * To: <Wilco.Dijkstra@ntlworld.com>
+ * Sent: Thursday, June 23, 2011 11:44 PM
+ * Subject: Fwd: sqrt routine
+ * Hi Wilco,
+ * I saw your sqrt routine from several web sites, including
+ * http://www.finesse.demon.co.uk/steven/sqrt.html.
+ * Just wonder if there's any copyright information with your Successive
+ * approximation routines, or if I can freely use it for any purpose.
+ * Thanks.
+ * Kevin
+ */
+
+// Minor modifications in code style for WebRTC, 2012.
+// Code optimizations for MIPS, 2013.
+
+#include "common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.h"
+
+/*
+ * Algorithm:
+ * Successive approximation of the equation (root + delta) ^ 2 = N
+ * until delta < 1. If delta < 1 we have the integer part of SQRT (N).
+ * Use delta = 2^i for i = 15 .. 0.
+ *
+ * Output precision is 16 bits. Note for large input values (close to
+ * 0x7FFFFFFF), bit 15 (the highest bit of the low 16-bit half word)
+ * contains the MSB information (a non-sign value). Do with caution
+ * if you need to cast the output to int16_t type.
+ *
+ * If the input value is negative, it returns 0.
+ */
+
+
+int32_t WebRtcSpl_SqrtFloor(int32_t value)
+{
+  int32_t root = 0, tmp1, tmp2, tmp3, tmp4;
+
+  __asm __volatile(
+    ".set   push                                       \n\t"
+    ".set   noreorder                                  \n\t"
+
+    "lui    %[tmp1],      0x4000                       \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "sub    %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "lui    %[tmp1],      0x1                          \n\t"
+    "or     %[tmp4],      %[root],      %[tmp1]        \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x4000         \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      14                           \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x8000         \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x2000         \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      13                           \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x4000         \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x1000         \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      12                           \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x2000         \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x800          \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      11                           \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x1000         \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x400          \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      10                           \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x800          \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x200          \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      9                            \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],       0x400         \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x100          \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      8                            \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x200          \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x80           \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      7                            \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x100          \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x40           \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      6                            \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x80           \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x20           \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      5                            \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x40           \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x10           \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      4                            \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x20           \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x8            \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      3                            \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x10           \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x4            \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      2                            \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x8            \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x2            \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "sll    %[tmp1],      1                            \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "subu   %[tmp3],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x4            \n\t"
+    "movz   %[value],     %[tmp3],      %[tmp2]        \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    "addiu  %[tmp1],      $0,           0x1            \n\t"
+    "addu   %[tmp1],      %[tmp1],      %[root]        \n\t"
+    "slt    %[tmp2],      %[value],     %[tmp1]        \n\t"
+    "ori    %[tmp4],      %[root],      0x2            \n\t"
+    "movz   %[root],      %[tmp4],      %[tmp2]        \n\t"
+
+    ".set   pop                                        \n\t"
+
+    : [root] "+r" (root), [value] "+r" (value),
+      [tmp1] "=&r" (tmp1), [tmp2] "=&r" (tmp2),
+      [tmp3] "=&r" (tmp3), [tmp4] "=&r" (tmp4)
+    :
+  );
+
+  return root >> 1;
+}
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_avx2.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_avx2.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_avx2.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_avx2.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,187 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/adaptive_fir_filter.h"
+
+#include <immintrin.h>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace aec3 {
+
+// Computes and stores the frequency response of the filter.
+void ComputeFrequencyResponse_Avx2(
+    size_t num_partitions,
+    const std::vector<std::vector<FftData>>& H,
+    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2) {
+  for (auto& H2_ch : *H2) {
+    H2_ch.fill(0.f);
+  }
+
+  const size_t num_render_channels = H[0].size();
+  RTC_DCHECK_EQ(H.size(), H2->capacity());
+  for (size_t p = 0; p < num_partitions; ++p) {
+    RTC_DCHECK_EQ(kFftLengthBy2Plus1, (*H2)[p].size());
+    for (size_t ch = 0; ch < num_render_channels; ++ch) {
+      for (size_t j = 0; j < kFftLengthBy2; j += 8) {
+        __m256 re = _mm256_loadu_ps(&H[p][ch].re[j]);
+        __m256 re2 = _mm256_mul_ps(re, re);
+        __m256 im = _mm256_loadu_ps(&H[p][ch].im[j]);
+        re2 = _mm256_fmadd_ps(im, im, re2);
+        __m256 H2_k_j = _mm256_loadu_ps(&(*H2)[p][j]);
+        H2_k_j = _mm256_max_ps(H2_k_j, re2);
+        _mm256_storeu_ps(&(*H2)[p][j], H2_k_j);
+      }
+      float H2_new = H[p][ch].re[kFftLengthBy2] * H[p][ch].re[kFftLengthBy2] +
+                     H[p][ch].im[kFftLengthBy2] * H[p][ch].im[kFftLengthBy2];
+      (*H2)[p][kFftLengthBy2] = std::max((*H2)[p][kFftLengthBy2], H2_new);
+    }
+  }
+}
+
+// Adapts the filter partitions.
+void AdaptPartitions_Avx2(const RenderBuffer& render_buffer,
+                          const FftData& G,
+                          size_t num_partitions,
+                          std::vector<std::vector<FftData>>* H) {
+  rtc::ArrayView<const std::vector<FftData>> render_buffer_data =
+      render_buffer.GetFftBuffer();
+  const size_t num_render_channels = render_buffer_data[0].size();
+  const size_t lim1 = std::min(
+      render_buffer_data.size() - render_buffer.Position(), num_partitions);
+  const size_t lim2 = num_partitions;
+  constexpr size_t kNumEightBinBands = kFftLengthBy2 / 8;
+
+  size_t X_partition = render_buffer.Position();
+  size_t limit = lim1;
+  size_t p = 0;
+  do {
+    for (; p < limit; ++p, ++X_partition) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        FftData& H_p_ch = (*H)[p][ch];
+        const FftData& X = render_buffer_data[X_partition][ch];
+
+        for (size_t k = 0, n = 0; n < kNumEightBinBands; ++n, k += 8) {
+          const __m256 G_re = _mm256_loadu_ps(&G.re[k]);
+          const __m256 G_im = _mm256_loadu_ps(&G.im[k]);
+          const __m256 X_re = _mm256_loadu_ps(&X.re[k]);
+          const __m256 X_im = _mm256_loadu_ps(&X.im[k]);
+          const __m256 H_re = _mm256_loadu_ps(&H_p_ch.re[k]);
+          const __m256 H_im = _mm256_loadu_ps(&H_p_ch.im[k]);
+          const __m256 a = _mm256_mul_ps(X_re, G_re);
+          const __m256 b = _mm256_mul_ps(X_im, G_im);
+          const __m256 c = _mm256_mul_ps(X_re, G_im);
+          const __m256 d = _mm256_mul_ps(X_im, G_re);
+          const __m256 e = _mm256_add_ps(a, b);
+          const __m256 f = _mm256_sub_ps(c, d);
+          const __m256 g = _mm256_add_ps(H_re, e);
+          const __m256 h = _mm256_add_ps(H_im, f);
+          _mm256_storeu_ps(&H_p_ch.re[k], g);
+          _mm256_storeu_ps(&H_p_ch.im[k], h);
+        }
+      }
+    }
+    X_partition = 0;
+    limit = lim2;
+  } while (p < lim2);
+
+  X_partition = render_buffer.Position();
+  limit = lim1;
+  p = 0;
+  do {
+    for (; p < limit; ++p, ++X_partition) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        FftData& H_p_ch = (*H)[p][ch];
+        const FftData& X = render_buffer_data[X_partition][ch];
+
+        H_p_ch.re[kFftLengthBy2] += X.re[kFftLengthBy2] * G.re[kFftLengthBy2] +
+                                    X.im[kFftLengthBy2] * G.im[kFftLengthBy2];
+        H_p_ch.im[kFftLengthBy2] += X.re[kFftLengthBy2] * G.im[kFftLengthBy2] -
+                                    X.im[kFftLengthBy2] * G.re[kFftLengthBy2];
+      }
+    }
+
+    X_partition = 0;
+    limit = lim2;
+  } while (p < lim2);
+}
+
+// Produces the filter output (AVX2 variant).
+void ApplyFilter_Avx2(const RenderBuffer& render_buffer,
+                      size_t num_partitions,
+                      const std::vector<std::vector<FftData>>& H,
+                      FftData* S) {
+  RTC_DCHECK_GE(H.size(), H.size() - 1);
+  S->re.fill(0.f);
+  S->im.fill(0.f);
+
+  rtc::ArrayView<const std::vector<FftData>> render_buffer_data =
+      render_buffer.GetFftBuffer();
+  const size_t num_render_channels = render_buffer_data[0].size();
+  const size_t lim1 = std::min(
+      render_buffer_data.size() - render_buffer.Position(), num_partitions);
+  const size_t lim2 = num_partitions;
+  constexpr size_t kNumEightBinBands = kFftLengthBy2 / 8;
+
+  size_t X_partition = render_buffer.Position();
+  size_t p = 0;
+  size_t limit = lim1;
+  do {
+    for (; p < limit; ++p, ++X_partition) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        const FftData& H_p_ch = H[p][ch];
+        const FftData& X = render_buffer_data[X_partition][ch];
+        for (size_t k = 0, n = 0; n < kNumEightBinBands; ++n, k += 8) {
+          const __m256 X_re = _mm256_loadu_ps(&X.re[k]);
+          const __m256 X_im = _mm256_loadu_ps(&X.im[k]);
+          const __m256 H_re = _mm256_loadu_ps(&H_p_ch.re[k]);
+          const __m256 H_im = _mm256_loadu_ps(&H_p_ch.im[k]);
+          const __m256 S_re = _mm256_loadu_ps(&S->re[k]);
+          const __m256 S_im = _mm256_loadu_ps(&S->im[k]);
+          const __m256 a = _mm256_mul_ps(X_re, H_re);
+          const __m256 b = _mm256_mul_ps(X_im, H_im);
+          const __m256 c = _mm256_mul_ps(X_re, H_im);
+          const __m256 d = _mm256_mul_ps(X_im, H_re);
+          const __m256 e = _mm256_sub_ps(a, b);
+          const __m256 f = _mm256_add_ps(c, d);
+          const __m256 g = _mm256_add_ps(S_re, e);
+          const __m256 h = _mm256_add_ps(S_im, f);
+          _mm256_storeu_ps(&S->re[k], g);
+          _mm256_storeu_ps(&S->im[k], h);
+        }
+      }
+    }
+    limit = lim2;
+    X_partition = 0;
+  } while (p < lim2);
+
+  X_partition = render_buffer.Position();
+  p = 0;
+  limit = lim1;
+  do {
+    for (; p < limit; ++p, ++X_partition) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        const FftData& H_p_ch = H[p][ch];
+        const FftData& X = render_buffer_data[X_partition][ch];
+        S->re[kFftLengthBy2] += X.re[kFftLengthBy2] * H_p_ch.re[kFftLengthBy2] -
+                                X.im[kFftLengthBy2] * H_p_ch.im[kFftLengthBy2];
+        S->im[kFftLengthBy2] += X.re[kFftLengthBy2] * H_p_ch.im[kFftLengthBy2] +
+                                X.im[kFftLengthBy2] * H_p_ch.re[kFftLengthBy2];
+      }
+    }
+    limit = lim2;
+    X_partition = 0;
+  } while (p < lim2);
+}
+
+}  // namespace aec3
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,740 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/adaptive_fir_filter.h"
+
+// Defines WEBRTC_ARCH_X86_FAMILY, used below.
+#include "rtc_base/system/arch.h"
+
+#if defined(WEBRTC_HAS_NEON)
+#include <arm_neon.h>
+#endif
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+#include <emmintrin.h>
+#endif
+#include <math.h>
+
+#include <algorithm>
+#include <functional>
+
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace aec3 {
+
+// Computes and stores the frequency response of the filter.
+void ComputeFrequencyResponse(
+    size_t num_partitions,
+    const std::vector<std::vector<FftData>>& H,
+    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2) {
+  for (auto& H2_ch : *H2) {
+    H2_ch.fill(0.f);
+  }
+
+  const size_t num_render_channels = H[0].size();
+  RTC_DCHECK_EQ(H.size(), H2->capacity());
+  for (size_t p = 0; p < num_partitions; ++p) {
+    RTC_DCHECK_EQ(kFftLengthBy2Plus1, (*H2)[p].size());
+    for (size_t ch = 0; ch < num_render_channels; ++ch) {
+      for (size_t j = 0; j < kFftLengthBy2Plus1; ++j) {
+        float tmp =
+            H[p][ch].re[j] * H[p][ch].re[j] + H[p][ch].im[j] * H[p][ch].im[j];
+        (*H2)[p][j] = std::max((*H2)[p][j], tmp);
+      }
+    }
+  }
+}
+
+#if defined(WEBRTC_HAS_NEON)
+// Computes and stores the frequency response of the filter.
+void ComputeFrequencyResponse_Neon(
+    size_t num_partitions,
+    const std::vector<std::vector<FftData>>& H,
+    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2) {
+  for (auto& H2_ch : *H2) {
+    H2_ch.fill(0.f);
+  }
+
+  const size_t num_render_channels = H[0].size();
+  RTC_DCHECK_EQ(H.size(), H2->capacity());
+  for (size_t p = 0; p < num_partitions; ++p) {
+    RTC_DCHECK_EQ(kFftLengthBy2Plus1, (*H2)[p].size());
+    for (size_t ch = 0; ch < num_render_channels; ++ch) {
+      for (size_t j = 0; j < kFftLengthBy2; j += 4) {
+        const float32x4_t re = vld1q_f32(&H[p][ch].re[j]);
+        const float32x4_t im = vld1q_f32(&H[p][ch].im[j]);
+        float32x4_t H2_new = vmulq_f32(re, re);
+        H2_new = vmlaq_f32(H2_new, im, im);
+        float32x4_t H2_p_j = vld1q_f32(&(*H2)[p][j]);
+        H2_p_j = vmaxq_f32(H2_p_j, H2_new);
+        vst1q_f32(&(*H2)[p][j], H2_p_j);
+      }
+      float H2_new = H[p][ch].re[kFftLengthBy2] * H[p][ch].re[kFftLengthBy2] +
+                     H[p][ch].im[kFftLengthBy2] * H[p][ch].im[kFftLengthBy2];
+      (*H2)[p][kFftLengthBy2] = std::max((*H2)[p][kFftLengthBy2], H2_new);
+    }
+  }
+}
+#endif
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+// Computes and stores the frequency response of the filter.
+void ComputeFrequencyResponse_Sse2(
+    size_t num_partitions,
+    const std::vector<std::vector<FftData>>& H,
+    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2) {
+  for (auto& H2_ch : *H2) {
+    H2_ch.fill(0.f);
+  }
+
+  const size_t num_render_channels = H[0].size();
+  RTC_DCHECK_EQ(H.size(), H2->capacity());
+  // constexpr __mmmask8 kMaxMask = static_cast<__mmmask8>(256u);
+  for (size_t p = 0; p < num_partitions; ++p) {
+    RTC_DCHECK_EQ(kFftLengthBy2Plus1, (*H2)[p].size());
+    for (size_t ch = 0; ch < num_render_channels; ++ch) {
+      for (size_t j = 0; j < kFftLengthBy2; j += 4) {
+        const __m128 re = _mm_loadu_ps(&H[p][ch].re[j]);
+        const __m128 re2 = _mm_mul_ps(re, re);
+        const __m128 im = _mm_loadu_ps(&H[p][ch].im[j]);
+        const __m128 im2 = _mm_mul_ps(im, im);
+        const __m128 H2_new = _mm_add_ps(re2, im2);
+        __m128 H2_k_j = _mm_loadu_ps(&(*H2)[p][j]);
+        H2_k_j = _mm_max_ps(H2_k_j, H2_new);
+        _mm_storeu_ps(&(*H2)[p][j], H2_k_j);
+      }
+      float H2_new = H[p][ch].re[kFftLengthBy2] * H[p][ch].re[kFftLengthBy2] +
+                     H[p][ch].im[kFftLengthBy2] * H[p][ch].im[kFftLengthBy2];
+      (*H2)[p][kFftLengthBy2] = std::max((*H2)[p][kFftLengthBy2], H2_new);
+    }
+  }
+}
+#endif
+
+// Adapts the filter partitions as H(t+1)=H(t)+G(t)*conj(X(t)).
+void AdaptPartitions(const RenderBuffer& render_buffer,
+                     const FftData& G,
+                     size_t num_partitions,
+                     std::vector<std::vector<FftData>>* H) {
+  rtc::ArrayView<const std::vector<FftData>> render_buffer_data =
+      render_buffer.GetFftBuffer();
+  size_t index = render_buffer.Position();
+  const size_t num_render_channels = render_buffer_data[index].size();
+  for (size_t p = 0; p < num_partitions; ++p) {
+    for (size_t ch = 0; ch < num_render_channels; ++ch) {
+      const FftData& X_p_ch = render_buffer_data[index][ch];
+      FftData& H_p_ch = (*H)[p][ch];
+      for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+        H_p_ch.re[k] += X_p_ch.re[k] * G.re[k] + X_p_ch.im[k] * G.im[k];
+        H_p_ch.im[k] += X_p_ch.re[k] * G.im[k] - X_p_ch.im[k] * G.re[k];
+      }
+    }
+    index = index < (render_buffer_data.size() - 1) ? index + 1 : 0;
+  }
+}
+
+#if defined(WEBRTC_HAS_NEON)
+// Adapts the filter partitions. (Neon variant)
+void AdaptPartitions_Neon(const RenderBuffer& render_buffer,
+                          const FftData& G,
+                          size_t num_partitions,
+                          std::vector<std::vector<FftData>>* H) {
+  rtc::ArrayView<const std::vector<FftData>> render_buffer_data =
+      render_buffer.GetFftBuffer();
+  const size_t num_render_channels = render_buffer_data[0].size();
+  const size_t lim1 = std::min(
+      render_buffer_data.size() - render_buffer.Position(), num_partitions);
+  const size_t lim2 = num_partitions;
+  constexpr size_t kNumFourBinBands = kFftLengthBy2 / 4;
+
+  size_t X_partition = render_buffer.Position();
+  size_t limit = lim1;
+  size_t p = 0;
+  do {
+    for (; p < limit; ++p, ++X_partition) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        FftData& H_p_ch = (*H)[p][ch];
+        const FftData& X = render_buffer_data[X_partition][ch];
+        for (size_t k = 0, n = 0; n < kNumFourBinBands; ++n, k += 4) {
+          const float32x4_t G_re = vld1q_f32(&G.re[k]);
+          const float32x4_t G_im = vld1q_f32(&G.im[k]);
+          const float32x4_t X_re = vld1q_f32(&X.re[k]);
+          const float32x4_t X_im = vld1q_f32(&X.im[k]);
+          const float32x4_t H_re = vld1q_f32(&H_p_ch.re[k]);
+          const float32x4_t H_im = vld1q_f32(&H_p_ch.im[k]);
+          const float32x4_t a = vmulq_f32(X_re, G_re);
+          const float32x4_t e = vmlaq_f32(a, X_im, G_im);
+          const float32x4_t c = vmulq_f32(X_re, G_im);
+          const float32x4_t f = vmlsq_f32(c, X_im, G_re);
+          const float32x4_t g = vaddq_f32(H_re, e);
+          const float32x4_t h = vaddq_f32(H_im, f);
+          vst1q_f32(&H_p_ch.re[k], g);
+          vst1q_f32(&H_p_ch.im[k], h);
+        }
+      }
+    }
+
+    X_partition = 0;
+    limit = lim2;
+  } while (p < lim2);
+
+  X_partition = render_buffer.Position();
+  limit = lim1;
+  p = 0;
+  do {
+    for (; p < limit; ++p, ++X_partition) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        FftData& H_p_ch = (*H)[p][ch];
+        const FftData& X = render_buffer_data[X_partition][ch];
+
+        H_p_ch.re[kFftLengthBy2] += X.re[kFftLengthBy2] * G.re[kFftLengthBy2] +
+                                    X.im[kFftLengthBy2] * G.im[kFftLengthBy2];
+        H_p_ch.im[kFftLengthBy2] += X.re[kFftLengthBy2] * G.im[kFftLengthBy2] -
+                                    X.im[kFftLengthBy2] * G.re[kFftLengthBy2];
+      }
+    }
+    X_partition = 0;
+    limit = lim2;
+  } while (p < lim2);
+}
+#endif
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+// Adapts the filter partitions. (SSE2 variant)
+void AdaptPartitions_Sse2(const RenderBuffer& render_buffer,
+                          const FftData& G,
+                          size_t num_partitions,
+                          std::vector<std::vector<FftData>>* H) {
+  rtc::ArrayView<const std::vector<FftData>> render_buffer_data =
+      render_buffer.GetFftBuffer();
+  const size_t num_render_channels = render_buffer_data[0].size();
+  const size_t lim1 = std::min(
+      render_buffer_data.size() - render_buffer.Position(), num_partitions);
+  const size_t lim2 = num_partitions;
+  constexpr size_t kNumFourBinBands = kFftLengthBy2 / 4;
+
+  size_t X_partition = render_buffer.Position();
+  size_t limit = lim1;
+  size_t p = 0;
+  do {
+    for (; p < limit; ++p, ++X_partition) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        FftData& H_p_ch = (*H)[p][ch];
+        const FftData& X = render_buffer_data[X_partition][ch];
+
+        for (size_t k = 0, n = 0; n < kNumFourBinBands; ++n, k += 4) {
+          const __m128 G_re = _mm_loadu_ps(&G.re[k]);
+          const __m128 G_im = _mm_loadu_ps(&G.im[k]);
+          const __m128 X_re = _mm_loadu_ps(&X.re[k]);
+          const __m128 X_im = _mm_loadu_ps(&X.im[k]);
+          const __m128 H_re = _mm_loadu_ps(&H_p_ch.re[k]);
+          const __m128 H_im = _mm_loadu_ps(&H_p_ch.im[k]);
+          const __m128 a = _mm_mul_ps(X_re, G_re);
+          const __m128 b = _mm_mul_ps(X_im, G_im);
+          const __m128 c = _mm_mul_ps(X_re, G_im);
+          const __m128 d = _mm_mul_ps(X_im, G_re);
+          const __m128 e = _mm_add_ps(a, b);
+          const __m128 f = _mm_sub_ps(c, d);
+          const __m128 g = _mm_add_ps(H_re, e);
+          const __m128 h = _mm_add_ps(H_im, f);
+          _mm_storeu_ps(&H_p_ch.re[k], g);
+          _mm_storeu_ps(&H_p_ch.im[k], h);
+        }
+      }
+    }
+    X_partition = 0;
+    limit = lim2;
+  } while (p < lim2);
+
+  X_partition = render_buffer.Position();
+  limit = lim1;
+  p = 0;
+  do {
+    for (; p < limit; ++p, ++X_partition) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        FftData& H_p_ch = (*H)[p][ch];
+        const FftData& X = render_buffer_data[X_partition][ch];
+
+        H_p_ch.re[kFftLengthBy2] += X.re[kFftLengthBy2] * G.re[kFftLengthBy2] +
+                                    X.im[kFftLengthBy2] * G.im[kFftLengthBy2];
+        H_p_ch.im[kFftLengthBy2] += X.re[kFftLengthBy2] * G.im[kFftLengthBy2] -
+                                    X.im[kFftLengthBy2] * G.re[kFftLengthBy2];
+      }
+    }
+
+    X_partition = 0;
+    limit = lim2;
+  } while (p < lim2);
+}
+#endif
+
+// Produces the filter output.
+void ApplyFilter(const RenderBuffer& render_buffer,
+                 size_t num_partitions,
+                 const std::vector<std::vector<FftData>>& H,
+                 FftData* S) {
+  S->re.fill(0.f);
+  S->im.fill(0.f);
+
+  rtc::ArrayView<const std::vector<FftData>> render_buffer_data =
+      render_buffer.GetFftBuffer();
+  size_t index = render_buffer.Position();
+  const size_t num_render_channels = render_buffer_data[index].size();
+  for (size_t p = 0; p < num_partitions; ++p) {
+    RTC_DCHECK_EQ(num_render_channels, H[p].size());
+    for (size_t ch = 0; ch < num_render_channels; ++ch) {
+      const FftData& X_p_ch = render_buffer_data[index][ch];
+      const FftData& H_p_ch = H[p][ch];
+      for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+        S->re[k] += X_p_ch.re[k] * H_p_ch.re[k] - X_p_ch.im[k] * H_p_ch.im[k];
+        S->im[k] += X_p_ch.re[k] * H_p_ch.im[k] + X_p_ch.im[k] * H_p_ch.re[k];
+      }
+    }
+    index = index < (render_buffer_data.size() - 1) ? index + 1 : 0;
+  }
+}
+
+#if defined(WEBRTC_HAS_NEON)
+// Produces the filter output (Neon variant).
+void ApplyFilter_Neon(const RenderBuffer& render_buffer,
+                      size_t num_partitions,
+                      const std::vector<std::vector<FftData>>& H,
+                      FftData* S) {
+  // const RenderBuffer& render_buffer,
+  //                     rtc::ArrayView<const FftData> H,
+  //                     FftData* S) {
+  RTC_DCHECK_GE(H.size(), H.size() - 1);
+  S->Clear();
+
+  rtc::ArrayView<const std::vector<FftData>> render_buffer_data =
+      render_buffer.GetFftBuffer();
+  const size_t num_render_channels = render_buffer_data[0].size();
+  const size_t lim1 = std::min(
+      render_buffer_data.size() - render_buffer.Position(), num_partitions);
+  const size_t lim2 = num_partitions;
+  constexpr size_t kNumFourBinBands = kFftLengthBy2 / 4;
+
+  size_t X_partition = render_buffer.Position();
+  size_t p = 0;
+  size_t limit = lim1;
+  do {
+    for (; p < limit; ++p, ++X_partition) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        const FftData& H_p_ch = H[p][ch];
+        const FftData& X = render_buffer_data[X_partition][ch];
+        for (size_t k = 0, n = 0; n < kNumFourBinBands; ++n, k += 4) {
+          const float32x4_t X_re = vld1q_f32(&X.re[k]);
+          const float32x4_t X_im = vld1q_f32(&X.im[k]);
+          const float32x4_t H_re = vld1q_f32(&H_p_ch.re[k]);
+          const float32x4_t H_im = vld1q_f32(&H_p_ch.im[k]);
+          const float32x4_t S_re = vld1q_f32(&S->re[k]);
+          const float32x4_t S_im = vld1q_f32(&S->im[k]);
+          const float32x4_t a = vmulq_f32(X_re, H_re);
+          const float32x4_t e = vmlsq_f32(a, X_im, H_im);
+          const float32x4_t c = vmulq_f32(X_re, H_im);
+          const float32x4_t f = vmlaq_f32(c, X_im, H_re);
+          const float32x4_t g = vaddq_f32(S_re, e);
+          const float32x4_t h = vaddq_f32(S_im, f);
+          vst1q_f32(&S->re[k], g);
+          vst1q_f32(&S->im[k], h);
+        }
+      }
+    }
+    limit = lim2;
+    X_partition = 0;
+  } while (p < lim2);
+
+  X_partition = render_buffer.Position();
+  p = 0;
+  limit = lim1;
+  do {
+    for (; p < limit; ++p, ++X_partition) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        const FftData& H_p_ch = H[p][ch];
+        const FftData& X = render_buffer_data[X_partition][ch];
+        S->re[kFftLengthBy2] += X.re[kFftLengthBy2] * H_p_ch.re[kFftLengthBy2] -
+                                X.im[kFftLengthBy2] * H_p_ch.im[kFftLengthBy2];
+        S->im[kFftLengthBy2] += X.re[kFftLengthBy2] * H_p_ch.im[kFftLengthBy2] +
+                                X.im[kFftLengthBy2] * H_p_ch.re[kFftLengthBy2];
+      }
+    }
+    limit = lim2;
+    X_partition = 0;
+  } while (p < lim2);
+}
+#endif
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+// Produces the filter output (SSE2 variant).
+void ApplyFilter_Sse2(const RenderBuffer& render_buffer,
+                      size_t num_partitions,
+                      const std::vector<std::vector<FftData>>& H,
+                      FftData* S) {
+  // const RenderBuffer& render_buffer,
+  //                     rtc::ArrayView<const FftData> H,
+  //                     FftData* S) {
+  RTC_DCHECK_GE(H.size(), H.size() - 1);
+  S->re.fill(0.f);
+  S->im.fill(0.f);
+
+  rtc::ArrayView<const std::vector<FftData>> render_buffer_data =
+      render_buffer.GetFftBuffer();
+  const size_t num_render_channels = render_buffer_data[0].size();
+  const size_t lim1 = std::min(
+      render_buffer_data.size() - render_buffer.Position(), num_partitions);
+  const size_t lim2 = num_partitions;
+  constexpr size_t kNumFourBinBands = kFftLengthBy2 / 4;
+
+  size_t X_partition = render_buffer.Position();
+  size_t p = 0;
+  size_t limit = lim1;
+  do {
+    for (; p < limit; ++p, ++X_partition) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        const FftData& H_p_ch = H[p][ch];
+        const FftData& X = render_buffer_data[X_partition][ch];
+        for (size_t k = 0, n = 0; n < kNumFourBinBands; ++n, k += 4) {
+          const __m128 X_re = _mm_loadu_ps(&X.re[k]);
+          const __m128 X_im = _mm_loadu_ps(&X.im[k]);
+          const __m128 H_re = _mm_loadu_ps(&H_p_ch.re[k]);
+          const __m128 H_im = _mm_loadu_ps(&H_p_ch.im[k]);
+          const __m128 S_re = _mm_loadu_ps(&S->re[k]);
+          const __m128 S_im = _mm_loadu_ps(&S->im[k]);
+          const __m128 a = _mm_mul_ps(X_re, H_re);
+          const __m128 b = _mm_mul_ps(X_im, H_im);
+          const __m128 c = _mm_mul_ps(X_re, H_im);
+          const __m128 d = _mm_mul_ps(X_im, H_re);
+          const __m128 e = _mm_sub_ps(a, b);
+          const __m128 f = _mm_add_ps(c, d);
+          const __m128 g = _mm_add_ps(S_re, e);
+          const __m128 h = _mm_add_ps(S_im, f);
+          _mm_storeu_ps(&S->re[k], g);
+          _mm_storeu_ps(&S->im[k], h);
+        }
+      }
+    }
+    limit = lim2;
+    X_partition = 0;
+  } while (p < lim2);
+
+  X_partition = render_buffer.Position();
+  p = 0;
+  limit = lim1;
+  do {
+    for (; p < limit; ++p, ++X_partition) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        const FftData& H_p_ch = H[p][ch];
+        const FftData& X = render_buffer_data[X_partition][ch];
+        S->re[kFftLengthBy2] += X.re[kFftLengthBy2] * H_p_ch.re[kFftLengthBy2] -
+                                X.im[kFftLengthBy2] * H_p_ch.im[kFftLengthBy2];
+        S->im[kFftLengthBy2] += X.re[kFftLengthBy2] * H_p_ch.im[kFftLengthBy2] +
+                                X.im[kFftLengthBy2] * H_p_ch.re[kFftLengthBy2];
+      }
+    }
+    limit = lim2;
+    X_partition = 0;
+  } while (p < lim2);
+}
+#endif
+
+}  // namespace aec3
+
+namespace {
+
+// Ensures that the newly added filter partitions after a size increase are set
+// to zero.
+void ZeroFilter(size_t old_size,
+                size_t new_size,
+                std::vector<std::vector<FftData>>* H) {
+  RTC_DCHECK_GE(H->size(), old_size);
+  RTC_DCHECK_GE(H->size(), new_size);
+
+  for (size_t p = old_size; p < new_size; ++p) {
+    RTC_DCHECK_EQ((*H)[p].size(), (*H)[0].size());
+    for (size_t ch = 0; ch < (*H)[0].size(); ++ch) {
+      (*H)[p][ch].Clear();
+    }
+  }
+}
+
+}  // namespace
+
+AdaptiveFirFilter::AdaptiveFirFilter(size_t max_size_partitions,
+                                     size_t initial_size_partitions,
+                                     size_t size_change_duration_blocks,
+                                     size_t num_render_channels,
+                                     Aec3Optimization optimization,
+                                     ApmDataDumper* data_dumper)
+    : data_dumper_(data_dumper),
+      fft_(),
+      optimization_(optimization),
+      num_render_channels_(num_render_channels),
+      max_size_partitions_(max_size_partitions),
+      size_change_duration_blocks_(
+          static_cast<int>(size_change_duration_blocks)),
+      current_size_partitions_(initial_size_partitions),
+      target_size_partitions_(initial_size_partitions),
+      old_target_size_partitions_(initial_size_partitions),
+      H_(max_size_partitions_, std::vector<FftData>(num_render_channels_)) {
+  RTC_DCHECK(data_dumper_);
+  RTC_DCHECK_GE(max_size_partitions, initial_size_partitions);
+
+  RTC_DCHECK_LT(0, size_change_duration_blocks_);
+  one_by_size_change_duration_blocks_ = 1.f / size_change_duration_blocks_;
+
+  ZeroFilter(0, max_size_partitions_, &H_);
+
+  SetSizePartitions(current_size_partitions_, true);
+}
+
+AdaptiveFirFilter::~AdaptiveFirFilter() = default;
+
+void AdaptiveFirFilter::HandleEchoPathChange() {
+  // TODO(peah): Check the value and purpose of the code below.
+  ZeroFilter(current_size_partitions_, max_size_partitions_, &H_);
+}
+
+void AdaptiveFirFilter::SetSizePartitions(size_t size, bool immediate_effect) {
+  RTC_DCHECK_EQ(max_size_partitions_, H_.capacity());
+  RTC_DCHECK_LE(size, max_size_partitions_);
+
+  target_size_partitions_ = std::min(max_size_partitions_, size);
+  if (immediate_effect) {
+    size_t old_size_partitions_ = current_size_partitions_;
+    current_size_partitions_ = old_target_size_partitions_ =
+        target_size_partitions_;
+    ZeroFilter(old_size_partitions_, current_size_partitions_, &H_);
+
+    partition_to_constrain_ =
+        std::min(partition_to_constrain_, current_size_partitions_ - 1);
+    size_change_counter_ = 0;
+  } else {
+    size_change_counter_ = size_change_duration_blocks_;
+  }
+}
+
+void AdaptiveFirFilter::UpdateSize() {
+  RTC_DCHECK_GE(size_change_duration_blocks_, size_change_counter_);
+  size_t old_size_partitions_ = current_size_partitions_;
+  if (size_change_counter_ > 0) {
+    --size_change_counter_;
+
+    auto average = [](float from, float to, float from_weight) {
+      return from * from_weight + to * (1.f - from_weight);
+    };
+
+    float change_factor =
+        size_change_counter_ * one_by_size_change_duration_blocks_;
+
+    current_size_partitions_ = average(old_target_size_partitions_,
+                                       target_size_partitions_, change_factor);
+
+    partition_to_constrain_ =
+        std::min(partition_to_constrain_, current_size_partitions_ - 1);
+  } else {
+    current_size_partitions_ = old_target_size_partitions_ =
+        target_size_partitions_;
+  }
+  ZeroFilter(old_size_partitions_, current_size_partitions_, &H_);
+  RTC_DCHECK_LE(0, size_change_counter_);
+}
+
+void AdaptiveFirFilter::Filter(const RenderBuffer& render_buffer,
+                               FftData* S) const {
+  RTC_DCHECK(S);
+  switch (optimization_) {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+    case Aec3Optimization::kSse2:
+      aec3::ApplyFilter_Sse2(render_buffer, current_size_partitions_, H_, S);
+      break;
+    case Aec3Optimization::kAvx2:
+      aec3::ApplyFilter_Avx2(render_buffer, current_size_partitions_, H_, S);
+      break;
+#endif
+#if defined(WEBRTC_HAS_NEON)
+    case Aec3Optimization::kNeon:
+      aec3::ApplyFilter_Neon(render_buffer, current_size_partitions_, H_, S);
+      break;
+#endif
+    default:
+      aec3::ApplyFilter(render_buffer, current_size_partitions_, H_, S);
+  }
+}
+
+void AdaptiveFirFilter::Adapt(const RenderBuffer& render_buffer,
+                              const FftData& G) {
+  // Adapt the filter and update the filter size.
+  AdaptAndUpdateSize(render_buffer, G);
+
+  // Constrain the filter partitions in a cyclic manner.
+  Constrain();
+}
+
+void AdaptiveFirFilter::Adapt(const RenderBuffer& render_buffer,
+                              const FftData& G,
+                              std::vector<float>* impulse_response) {
+  // Adapt the filter and update the filter size.
+  AdaptAndUpdateSize(render_buffer, G);
+
+  // Constrain the filter partitions in a cyclic manner.
+  ConstrainAndUpdateImpulseResponse(impulse_response);
+}
+
+void AdaptiveFirFilter::ComputeFrequencyResponse(
+    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2) const {
+  RTC_DCHECK_GE(max_size_partitions_, H2->capacity());
+
+  H2->resize(current_size_partitions_);
+
+  switch (optimization_) {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+    case Aec3Optimization::kSse2:
+      aec3::ComputeFrequencyResponse_Sse2(current_size_partitions_, H_, H2);
+      break;
+    case Aec3Optimization::kAvx2:
+      aec3::ComputeFrequencyResponse_Avx2(current_size_partitions_, H_, H2);
+      break;
+#endif
+#if defined(WEBRTC_HAS_NEON)
+    case Aec3Optimization::kNeon:
+      aec3::ComputeFrequencyResponse_Neon(current_size_partitions_, H_, H2);
+      break;
+#endif
+    default:
+      aec3::ComputeFrequencyResponse(current_size_partitions_, H_, H2);
+  }
+}
+
+void AdaptiveFirFilter::AdaptAndUpdateSize(const RenderBuffer& render_buffer,
+                                           const FftData& G) {
+  // Update the filter size if needed.
+  UpdateSize();
+
+  // Adapt the filter.
+  switch (optimization_) {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+    case Aec3Optimization::kSse2:
+      aec3::AdaptPartitions_Sse2(render_buffer, G, current_size_partitions_,
+                                 &H_);
+      break;
+    case Aec3Optimization::kAvx2:
+      aec3::AdaptPartitions_Avx2(render_buffer, G, current_size_partitions_,
+                                 &H_);
+      break;
+#endif
+#if defined(WEBRTC_HAS_NEON)
+    case Aec3Optimization::kNeon:
+      aec3::AdaptPartitions_Neon(render_buffer, G, current_size_partitions_,
+                                 &H_);
+      break;
+#endif
+    default:
+      aec3::AdaptPartitions(render_buffer, G, current_size_partitions_, &H_);
+  }
+}
+
+// Constrains the partition of the frequency domain filter to be limited in
+// time via setting the relevant time-domain coefficients to zero and updates
+// the corresponding values in an externally stored impulse response estimate.
+void AdaptiveFirFilter::ConstrainAndUpdateImpulseResponse(
+    std::vector<float>* impulse_response) {
+  RTC_DCHECK_EQ(GetTimeDomainLength(max_size_partitions_),
+                impulse_response->capacity());
+  impulse_response->resize(GetTimeDomainLength(current_size_partitions_));
+  std::array<float, kFftLength> h;
+  impulse_response->resize(GetTimeDomainLength(current_size_partitions_));
+  std::fill(
+      impulse_response->begin() + partition_to_constrain_ * kFftLengthBy2,
+      impulse_response->begin() + (partition_to_constrain_ + 1) * kFftLengthBy2,
+      0.f);
+
+  for (size_t ch = 0; ch < num_render_channels_; ++ch) {
+    fft_.Ifft(H_[partition_to_constrain_][ch], &h);
+
+    static constexpr float kScale = 1.0f / kFftLengthBy2;
+    std::for_each(h.begin(), h.begin() + kFftLengthBy2,
+                  [](float& a) { a *= kScale; });
+    std::fill(h.begin() + kFftLengthBy2, h.end(), 0.f);
+
+    if (ch == 0) {
+      std::copy(
+          h.begin(), h.begin() + kFftLengthBy2,
+          impulse_response->begin() + partition_to_constrain_ * kFftLengthBy2);
+    } else {
+      for (size_t k = 0, j = partition_to_constrain_ * kFftLengthBy2;
+           k < kFftLengthBy2; ++k, ++j) {
+        if (fabsf((*impulse_response)[j]) < fabsf(h[k])) {
+          (*impulse_response)[j] = h[k];
+        }
+      }
+    }
+
+    fft_.Fft(&h, &H_[partition_to_constrain_][ch]);
+  }
+
+  partition_to_constrain_ =
+      partition_to_constrain_ < (current_size_partitions_ - 1)
+          ? partition_to_constrain_ + 1
+          : 0;
+}
+
+// Constrains the a partiton of the frequency domain filter to be limited in
+// time via setting the relevant time-domain coefficients to zero.
+void AdaptiveFirFilter::Constrain() {
+  std::array<float, kFftLength> h;
+  for (size_t ch = 0; ch < num_render_channels_; ++ch) {
+    fft_.Ifft(H_[partition_to_constrain_][ch], &h);
+
+    static constexpr float kScale = 1.0f / kFftLengthBy2;
+    std::for_each(h.begin(), h.begin() + kFftLengthBy2,
+                  [](float& a) { a *= kScale; });
+    std::fill(h.begin() + kFftLengthBy2, h.end(), 0.f);
+
+    fft_.Fft(&h, &H_[partition_to_constrain_][ch]);
+  }
+
+  partition_to_constrain_ =
+      partition_to_constrain_ < (current_size_partitions_ - 1)
+          ? partition_to_constrain_ + 1
+          : 0;
+}
+
+void AdaptiveFirFilter::ScaleFilter(float factor) {
+  for (auto& H_p : H_) {
+    for (auto& H_p_ch : H_p) {
+      for (auto& re : H_p_ch.re) {
+        re *= factor;
+      }
+      for (auto& im : H_p_ch.im) {
+        im *= factor;
+      }
+    }
+  }
+}
+
+// Set the filter coefficients.
+void AdaptiveFirFilter::SetFilter(size_t num_partitions,
+                                  const std::vector<std::vector<FftData>>& H) {
+  const size_t min_num_partitions =
+      std::min(current_size_partitions_, num_partitions);
+  for (size_t p = 0; p < min_num_partitions; ++p) {
+    RTC_DCHECK_EQ(H_[p].size(), H[p].size());
+    RTC_DCHECK_EQ(num_render_channels_, H_[p].size());
+
+    for (size_t ch = 0; ch < num_render_channels_; ++ch) {
+      std::copy(H[p][ch].re.begin(), H[p][ch].re.end(), H_[p][ch].re.begin());
+      std::copy(H[p][ch].im.begin(), H[p][ch].im.end(), H_[p][ch].im.begin());
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl_avx2.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl_avx2.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl_avx2.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl_avx2.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/adaptive_fir_filter_erl.h"
+
+#include <immintrin.h>
+
+namespace webrtc {
+
+namespace aec3 {
+
+// Computes and stores the echo return loss estimate of the filter, which is the
+// sum of the partition frequency responses.
+void ErlComputer_AVX2(
+    const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
+    rtc::ArrayView<float> erl) {
+  std::fill(erl.begin(), erl.end(), 0.f);
+  for (auto& H2_j : H2) {
+    for (size_t k = 0; k < kFftLengthBy2; k += 8) {
+      const __m256 H2_j_k = _mm256_loadu_ps(&H2_j[k]);
+      __m256 erl_k = _mm256_loadu_ps(&erl[k]);
+      erl_k = _mm256_add_ps(erl_k, H2_j_k);
+      _mm256_storeu_ps(&erl[k], erl_k);
+    }
+    erl[kFftLengthBy2] += H2_j[kFftLengthBy2];
+  }
+}
+
+}  // namespace aec3
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,102 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/adaptive_fir_filter_erl.h"
+
+#include <algorithm>
+#include <functional>
+
+#if defined(WEBRTC_HAS_NEON)
+#include <arm_neon.h>
+#endif
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+#include <emmintrin.h>
+#endif
+
+namespace webrtc {
+
+namespace aec3 {
+
+// Computes and stores the echo return loss estimate of the filter, which is the
+// sum of the partition frequency responses.
+void ErlComputer(const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
+                 rtc::ArrayView<float> erl) {
+  std::fill(erl.begin(), erl.end(), 0.f);
+  for (auto& H2_j : H2) {
+    std::transform(H2_j.begin(), H2_j.end(), erl.begin(), erl.begin(),
+                   std::plus<float>());
+  }
+}
+
+#if defined(WEBRTC_HAS_NEON)
+// Computes and stores the echo return loss estimate of the filter, which is the
+// sum of the partition frequency responses.
+void ErlComputer_NEON(
+    const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
+    rtc::ArrayView<float> erl) {
+  std::fill(erl.begin(), erl.end(), 0.f);
+  for (auto& H2_j : H2) {
+    for (size_t k = 0; k < kFftLengthBy2; k += 4) {
+      const float32x4_t H2_j_k = vld1q_f32(&H2_j[k]);
+      float32x4_t erl_k = vld1q_f32(&erl[k]);
+      erl_k = vaddq_f32(erl_k, H2_j_k);
+      vst1q_f32(&erl[k], erl_k);
+    }
+    erl[kFftLengthBy2] += H2_j[kFftLengthBy2];
+  }
+}
+#endif
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+// Computes and stores the echo return loss estimate of the filter, which is the
+// sum of the partition frequency responses.
+void ErlComputer_SSE2(
+    const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
+    rtc::ArrayView<float> erl) {
+  std::fill(erl.begin(), erl.end(), 0.f);
+  for (auto& H2_j : H2) {
+    for (size_t k = 0; k < kFftLengthBy2; k += 4) {
+      const __m128 H2_j_k = _mm_loadu_ps(&H2_j[k]);
+      __m128 erl_k = _mm_loadu_ps(&erl[k]);
+      erl_k = _mm_add_ps(erl_k, H2_j_k);
+      _mm_storeu_ps(&erl[k], erl_k);
+    }
+    erl[kFftLengthBy2] += H2_j[kFftLengthBy2];
+  }
+}
+#endif
+
+}  // namespace aec3
+
+void ComputeErl(const Aec3Optimization& optimization,
+                const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
+                rtc::ArrayView<float> erl) {
+  RTC_DCHECK_EQ(kFftLengthBy2Plus1, erl.size());
+  // Update the frequency response and echo return loss for the filter.
+  switch (optimization) {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+    case Aec3Optimization::kSse2:
+      aec3::ErlComputer_SSE2(H2, erl);
+      break;
+    case Aec3Optimization::kAvx2:
+      aec3::ErlComputer_AVX2(H2, erl);
+      break;
+#endif
+#if defined(WEBRTC_HAS_NEON)
+    case Aec3Optimization::kNeon:
+      aec3::ErlComputer_NEON(H2, erl);
+      break;
+#endif
+    default:
+      aec3::ErlComputer(H2, erl);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_ERL_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_ERL_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/system/arch.h"
+
+namespace webrtc {
+namespace aec3 {
+
+// Computes and stores the echo return loss estimate of the filter, which is the
+// sum of the partition frequency responses.
+void ErlComputer(const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
+                 rtc::ArrayView<float> erl);
+#if defined(WEBRTC_HAS_NEON)
+void ErlComputer_NEON(
+    const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
+    rtc::ArrayView<float> erl);
+#endif
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+void ErlComputer_SSE2(
+    const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
+    rtc::ArrayView<float> erl);
+
+void ErlComputer_AVX2(
+    const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
+    rtc::ArrayView<float> erl);
+#endif
+
+}  // namespace aec3
+
+// Computes the echo return loss based on a frequency response.
+void ComputeErl(const Aec3Optimization& optimization,
+                const std::vector<std::array<float, kFftLengthBy2Plus1>>& H2,
+                rtc::ArrayView<float> erl);
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_ERL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_erl_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,106 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/adaptive_fir_filter_erl.h"
+
+#include <array>
+#include <vector>
+
+#include "rtc_base/system/arch.h"
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+#include <emmintrin.h>
+#endif
+
+#include "system_wrappers/include/cpu_features_wrapper.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace aec3 {
+
+#if defined(WEBRTC_HAS_NEON)
+// Verifies that the optimized method for echo return loss computation is
+// bitexact to the reference counterpart.
+TEST(AdaptiveFirFilter, UpdateErlNeonOptimization) {
+  const size_t kNumPartitions = 12;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> H2(kNumPartitions);
+  std::array<float, kFftLengthBy2Plus1> erl;
+  std::array<float, kFftLengthBy2Plus1> erl_NEON;
+
+  for (size_t j = 0; j < H2.size(); ++j) {
+    for (size_t k = 0; k < H2[j].size(); ++k) {
+      H2[j][k] = k + j / 3.f;
+    }
+  }
+
+  ErlComputer(H2, erl);
+  ErlComputer_NEON(H2, erl_NEON);
+
+  for (size_t j = 0; j < erl.size(); ++j) {
+    EXPECT_FLOAT_EQ(erl[j], erl_NEON[j]);
+  }
+}
+
+#endif
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+// Verifies that the optimized method for echo return loss computation is
+// bitexact to the reference counterpart.
+TEST(AdaptiveFirFilter, UpdateErlSse2Optimization) {
+  bool use_sse2 = (GetCPUInfo(kSSE2) != 0);
+  if (use_sse2) {
+    const size_t kNumPartitions = 12;
+    std::vector<std::array<float, kFftLengthBy2Plus1>> H2(kNumPartitions);
+    std::array<float, kFftLengthBy2Plus1> erl;
+    std::array<float, kFftLengthBy2Plus1> erl_SSE2;
+
+    for (size_t j = 0; j < H2.size(); ++j) {
+      for (size_t k = 0; k < H2[j].size(); ++k) {
+        H2[j][k] = k + j / 3.f;
+      }
+    }
+
+    ErlComputer(H2, erl);
+    ErlComputer_SSE2(H2, erl_SSE2);
+
+    for (size_t j = 0; j < erl.size(); ++j) {
+      EXPECT_FLOAT_EQ(erl[j], erl_SSE2[j]);
+    }
+  }
+}
+
+// Verifies that the optimized method for echo return loss computation is
+// bitexact to the reference counterpart.
+TEST(AdaptiveFirFilter, UpdateErlAvx2Optimization) {
+  bool use_avx2 = (GetCPUInfo(kAVX2) != 0);
+  if (use_avx2) {
+    const size_t kNumPartitions = 12;
+    std::vector<std::array<float, kFftLengthBy2Plus1>> H2(kNumPartitions);
+    std::array<float, kFftLengthBy2Plus1> erl;
+    std::array<float, kFftLengthBy2Plus1> erl_AVX2;
+
+    for (size_t j = 0; j < H2.size(); ++j) {
+      for (size_t k = 0; k < H2[j].size(); ++k) {
+        H2[j][k] = k + j / 3.f;
+      }
+    }
+
+    ErlComputer(H2, erl);
+    ErlComputer_AVX2(H2, erl_AVX2);
+
+    for (size_t j = 0; j < erl.size(); ++j) {
+      EXPECT_FLOAT_EQ(erl[j], erl_AVX2[j]);
+    }
+  }
+}
+
+#endif
+
+}  // namespace aec3
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,191 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/aec3_fft.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/system/arch.h"
+
+namespace webrtc {
+namespace aec3 {
+// Computes and stores the frequency response of the filter.
+void ComputeFrequencyResponse(
+    size_t num_partitions,
+    const std::vector<std::vector<FftData>>& H,
+    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2);
+#if defined(WEBRTC_HAS_NEON)
+void ComputeFrequencyResponse_Neon(
+    size_t num_partitions,
+    const std::vector<std::vector<FftData>>& H,
+    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2);
+#endif
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+void ComputeFrequencyResponse_Sse2(
+    size_t num_partitions,
+    const std::vector<std::vector<FftData>>& H,
+    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2);
+
+void ComputeFrequencyResponse_Avx2(
+    size_t num_partitions,
+    const std::vector<std::vector<FftData>>& H,
+    std::vector<std::array<float, kFftLengthBy2Plus1>>* H2);
+#endif
+
+// Adapts the filter partitions.
+void AdaptPartitions(const RenderBuffer& render_buffer,
+                     const FftData& G,
+                     size_t num_partitions,
+                     std::vector<std::vector<FftData>>* H);
+#if defined(WEBRTC_HAS_NEON)
+void AdaptPartitions_Neon(const RenderBuffer& render_buffer,
+                          const FftData& G,
+                          size_t num_partitions,
+                          std::vector<std::vector<FftData>>* H);
+#endif
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+void AdaptPartitions_Sse2(const RenderBuffer& render_buffer,
+                          const FftData& G,
+                          size_t num_partitions,
+                          std::vector<std::vector<FftData>>* H);
+
+void AdaptPartitions_Avx2(const RenderBuffer& render_buffer,
+                          const FftData& G,
+                          size_t num_partitions,
+                          std::vector<std::vector<FftData>>* H);
+#endif
+
+// Produces the filter output.
+void ApplyFilter(const RenderBuffer& render_buffer,
+                 size_t num_partitions,
+                 const std::vector<std::vector<FftData>>& H,
+                 FftData* S);
+#if defined(WEBRTC_HAS_NEON)
+void ApplyFilter_Neon(const RenderBuffer& render_buffer,
+                      size_t num_partitions,
+                      const std::vector<std::vector<FftData>>& H,
+                      FftData* S);
+#endif
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+void ApplyFilter_Sse2(const RenderBuffer& render_buffer,
+                      size_t num_partitions,
+                      const std::vector<std::vector<FftData>>& H,
+                      FftData* S);
+
+void ApplyFilter_Avx2(const RenderBuffer& render_buffer,
+                      size_t num_partitions,
+                      const std::vector<std::vector<FftData>>& H,
+                      FftData* S);
+#endif
+
+}  // namespace aec3
+
+// Provides a frequency domain adaptive filter functionality.
+class AdaptiveFirFilter {
+ public:
+  AdaptiveFirFilter(size_t max_size_partitions,
+                    size_t initial_size_partitions,
+                    size_t size_change_duration_blocks,
+                    size_t num_render_channels,
+                    Aec3Optimization optimization,
+                    ApmDataDumper* data_dumper);
+
+  ~AdaptiveFirFilter();
+
+  AdaptiveFirFilter(const AdaptiveFirFilter&) = delete;
+  AdaptiveFirFilter& operator=(const AdaptiveFirFilter&) = delete;
+
+  // Produces the output of the filter.
+  void Filter(const RenderBuffer& render_buffer, FftData* S) const;
+
+  // Adapts the filter and updates an externally stored impulse response
+  // estimate.
+  void Adapt(const RenderBuffer& render_buffer,
+             const FftData& G,
+             std::vector<float>* impulse_response);
+
+  // Adapts the filter.
+  void Adapt(const RenderBuffer& render_buffer, const FftData& G);
+
+  // Receives reports that known echo path changes have occured and adjusts
+  // the filter adaptation accordingly.
+  void HandleEchoPathChange();
+
+  // Returns the filter size.
+  size_t SizePartitions() const { return current_size_partitions_; }
+
+  // Sets the filter size.
+  void SetSizePartitions(size_t size, bool immediate_effect);
+
+  // Computes the frequency responses for the filter partitions.
+  void ComputeFrequencyResponse(
+      std::vector<std::array<float, kFftLengthBy2Plus1>>* H2) const;
+
+  // Returns the maximum number of partitions for the filter.
+  size_t max_filter_size_partitions() const { return max_size_partitions_; }
+
+  void DumpFilter(const char* name_frequency_domain) {
+    for (size_t p = 0; p < max_size_partitions_; ++p) {
+      data_dumper_->DumpRaw(name_frequency_domain, H_[p][0].re);
+      data_dumper_->DumpRaw(name_frequency_domain, H_[p][0].im);
+    }
+  }
+
+  // Scale the filter impulse response and spectrum by a factor.
+  void ScaleFilter(float factor);
+
+  // Set the filter coefficients.
+  void SetFilter(size_t num_partitions,
+                 const std::vector<std::vector<FftData>>& H);
+
+  // Gets the filter coefficients.
+  const std::vector<std::vector<FftData>>& GetFilter() const { return H_; }
+
+ private:
+  // Adapts the filter and updates the filter size.
+  void AdaptAndUpdateSize(const RenderBuffer& render_buffer, const FftData& G);
+
+  // Constrain the filter partitions in a cyclic manner.
+  void Constrain();
+  // Constrains the filter in a cyclic manner and updates the corresponding
+  // values in the supplied impulse response.
+  void ConstrainAndUpdateImpulseResponse(std::vector<float>* impulse_response);
+
+  // Gradually Updates the current filter size towards the target size.
+  void UpdateSize();
+
+  ApmDataDumper* const data_dumper_;
+  const Aec3Fft fft_;
+  const Aec3Optimization optimization_;
+  const size_t num_render_channels_;
+  const size_t max_size_partitions_;
+  const int size_change_duration_blocks_;
+  float one_by_size_change_duration_blocks_;
+  size_t current_size_partitions_;
+  size_t target_size_partitions_;
+  size_t old_target_size_partitions_;
+  int size_change_counter_ = 0;
+  std::vector<std::vector<FftData>> H_;
+  size_t partition_to_constrain_ = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_ADAPTIVE_FIR_FILTER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/adaptive_fir_filter_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,605 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/adaptive_fir_filter.h"
+
+// Defines WEBRTC_ARCH_X86_FAMILY, used below.
+#include <math.h>
+
+#include <algorithm>
+#include <numeric>
+#include <string>
+
+#include "rtc_base/system/arch.h"
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+#include <emmintrin.h>
+#endif
+
+#include "modules/audio_processing/aec3/adaptive_fir_filter_erl.h"
+#include "modules/audio_processing/aec3/aec3_fft.h"
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "modules/audio_processing/aec3/coarse_filter_update_gain.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/aec3/render_signal_analyzer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "modules/audio_processing/test/echo_canceller_test_tools.h"
+#include "modules/audio_processing/utility/cascaded_biquad_filter.h"
+#include "rtc_base/arraysize.h"
+#include "rtc_base/numerics/safe_minmax.h"
+#include "rtc_base/random.h"
+#include "rtc_base/strings/string_builder.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace aec3 {
+namespace {
+
+std::string ProduceDebugText(size_t num_render_channels, size_t delay) {
+  rtc::StringBuilder ss;
+  ss << "delay: " << delay << ", ";
+  ss << "num_render_channels:" << num_render_channels;
+  return ss.Release();
+}
+
+}  // namespace
+
+class AdaptiveFirFilterOneTwoFourEightRenderChannels
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<size_t> {};
+
+INSTANTIATE_TEST_SUITE_P(MultiChannel,
+                         AdaptiveFirFilterOneTwoFourEightRenderChannels,
+                         ::testing::Values(1, 2, 4, 8));
+
+#if defined(WEBRTC_HAS_NEON)
+// Verifies that the optimized methods for filter adaptation are similar to
+// their reference counterparts.
+TEST_P(AdaptiveFirFilterOneTwoFourEightRenderChannels,
+       FilterAdaptationNeonOptimizations) {
+  const size_t num_render_channels = GetParam();
+  for (size_t num_partitions : {2, 5, 12, 30, 50}) {
+    constexpr int kSampleRateHz = 48000;
+    constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+
+    std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+        RenderDelayBuffer::Create(EchoCanceller3Config(), kSampleRateHz,
+                                  num_render_channels));
+    Random random_generator(42U);
+    std::vector<std::vector<std::vector<float>>> x(
+        kNumBands,
+        std::vector<std::vector<float>>(num_render_channels,
+                                        std::vector<float>(kBlockSize, 0.f)));
+    FftData S_C;
+    FftData S_Neon;
+    FftData G;
+    Aec3Fft fft;
+    std::vector<std::vector<FftData>> H_C(
+        num_partitions, std::vector<FftData>(num_render_channels));
+    std::vector<std::vector<FftData>> H_Neon(
+        num_partitions, std::vector<FftData>(num_render_channels));
+    for (size_t p = 0; p < num_partitions; ++p) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        H_C[p][ch].Clear();
+        H_Neon[p][ch].Clear();
+      }
+    }
+
+    for (size_t k = 0; k < 30; ++k) {
+      for (size_t band = 0; band < x.size(); ++band) {
+        for (size_t ch = 0; ch < x[band].size(); ++ch) {
+          RandomizeSampleVector(&random_generator, x[band][ch]);
+        }
+      }
+      render_delay_buffer->Insert(x);
+      if (k == 0) {
+        render_delay_buffer->Reset();
+      }
+      render_delay_buffer->PrepareCaptureProcessing();
+    }
+    auto* const render_buffer = render_delay_buffer->GetRenderBuffer();
+
+    for (size_t j = 0; j < G.re.size(); ++j) {
+      G.re[j] = j / 10001.f;
+    }
+    for (size_t j = 1; j < G.im.size() - 1; ++j) {
+      G.im[j] = j / 20001.f;
+    }
+    G.im[0] = 0.f;
+    G.im[G.im.size() - 1] = 0.f;
+
+    AdaptPartitions_Neon(*render_buffer, G, num_partitions, &H_Neon);
+    AdaptPartitions(*render_buffer, G, num_partitions, &H_C);
+    AdaptPartitions_Neon(*render_buffer, G, num_partitions, &H_Neon);
+    AdaptPartitions(*render_buffer, G, num_partitions, &H_C);
+
+    for (size_t p = 0; p < num_partitions; ++p) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        for (size_t j = 0; j < H_C[p][ch].re.size(); ++j) {
+          EXPECT_FLOAT_EQ(H_C[p][ch].re[j], H_Neon[p][ch].re[j]);
+          EXPECT_FLOAT_EQ(H_C[p][ch].im[j], H_Neon[p][ch].im[j]);
+        }
+      }
+    }
+
+    ApplyFilter_Neon(*render_buffer, num_partitions, H_Neon, &S_Neon);
+    ApplyFilter(*render_buffer, num_partitions, H_C, &S_C);
+    for (size_t j = 0; j < S_C.re.size(); ++j) {
+      EXPECT_NEAR(S_C.re[j], S_Neon.re[j], fabs(S_C.re[j] * 0.00001f));
+      EXPECT_NEAR(S_C.im[j], S_Neon.im[j], fabs(S_C.re[j] * 0.00001f));
+    }
+  }
+}
+
+// Verifies that the optimized method for frequency response computation is
+// bitexact to the reference counterpart.
+TEST_P(AdaptiveFirFilterOneTwoFourEightRenderChannels,
+       ComputeFrequencyResponseNeonOptimization) {
+  const size_t num_render_channels = GetParam();
+  for (size_t num_partitions : {2, 5, 12, 30, 50}) {
+    std::vector<std::vector<FftData>> H(
+        num_partitions, std::vector<FftData>(num_render_channels));
+    std::vector<std::array<float, kFftLengthBy2Plus1>> H2(num_partitions);
+    std::vector<std::array<float, kFftLengthBy2Plus1>> H2_Neon(num_partitions);
+
+    for (size_t p = 0; p < num_partitions; ++p) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        for (size_t k = 0; k < H[p][ch].re.size(); ++k) {
+          H[p][ch].re[k] = k + p / 3.f + ch;
+          H[p][ch].im[k] = p + k / 7.f - ch;
+        }
+      }
+    }
+
+    ComputeFrequencyResponse(num_partitions, H, &H2);
+    ComputeFrequencyResponse_Neon(num_partitions, H, &H2_Neon);
+
+    for (size_t p = 0; p < num_partitions; ++p) {
+      for (size_t k = 0; k < H2[p].size(); ++k) {
+        EXPECT_FLOAT_EQ(H2[p][k], H2_Neon[p][k]);
+      }
+    }
+  }
+}
+#endif
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+// Verifies that the optimized methods for filter adaptation are bitexact to
+// their reference counterparts.
+TEST_P(AdaptiveFirFilterOneTwoFourEightRenderChannels,
+       FilterAdaptationSse2Optimizations) {
+  const size_t num_render_channels = GetParam();
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+
+  bool use_sse2 = (GetCPUInfo(kSSE2) != 0);
+  if (use_sse2) {
+    for (size_t num_partitions : {2, 5, 12, 30, 50}) {
+      std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+          RenderDelayBuffer::Create(EchoCanceller3Config(), kSampleRateHz,
+                                    num_render_channels));
+      Random random_generator(42U);
+      std::vector<std::vector<std::vector<float>>> x(
+          kNumBands,
+          std::vector<std::vector<float>>(num_render_channels,
+                                          std::vector<float>(kBlockSize, 0.f)));
+      FftData S_C;
+      FftData S_Sse2;
+      FftData G;
+      Aec3Fft fft;
+      std::vector<std::vector<FftData>> H_C(
+          num_partitions, std::vector<FftData>(num_render_channels));
+      std::vector<std::vector<FftData>> H_Sse2(
+          num_partitions, std::vector<FftData>(num_render_channels));
+      for (size_t p = 0; p < num_partitions; ++p) {
+        for (size_t ch = 0; ch < num_render_channels; ++ch) {
+          H_C[p][ch].Clear();
+          H_Sse2[p][ch].Clear();
+        }
+      }
+
+      for (size_t k = 0; k < 500; ++k) {
+        for (size_t band = 0; band < x.size(); ++band) {
+          for (size_t ch = 0; ch < x[band].size(); ++ch) {
+            RandomizeSampleVector(&random_generator, x[band][ch]);
+          }
+        }
+        render_delay_buffer->Insert(x);
+        if (k == 0) {
+          render_delay_buffer->Reset();
+        }
+        render_delay_buffer->PrepareCaptureProcessing();
+        auto* const render_buffer = render_delay_buffer->GetRenderBuffer();
+
+        ApplyFilter_Sse2(*render_buffer, num_partitions, H_Sse2, &S_Sse2);
+        ApplyFilter(*render_buffer, num_partitions, H_C, &S_C);
+        for (size_t j = 0; j < S_C.re.size(); ++j) {
+          EXPECT_FLOAT_EQ(S_C.re[j], S_Sse2.re[j]);
+          EXPECT_FLOAT_EQ(S_C.im[j], S_Sse2.im[j]);
+        }
+
+        std::for_each(G.re.begin(), G.re.end(),
+                      [&](float& a) { a = random_generator.Rand<float>(); });
+        std::for_each(G.im.begin(), G.im.end(),
+                      [&](float& a) { a = random_generator.Rand<float>(); });
+
+        AdaptPartitions_Sse2(*render_buffer, G, num_partitions, &H_Sse2);
+        AdaptPartitions(*render_buffer, G, num_partitions, &H_C);
+
+        for (size_t p = 0; p < num_partitions; ++p) {
+          for (size_t ch = 0; ch < num_render_channels; ++ch) {
+            for (size_t j = 0; j < H_C[p][ch].re.size(); ++j) {
+              EXPECT_FLOAT_EQ(H_C[p][ch].re[j], H_Sse2[p][ch].re[j]);
+              EXPECT_FLOAT_EQ(H_C[p][ch].im[j], H_Sse2[p][ch].im[j]);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+// Verifies that the optimized methods for filter adaptation are bitexact to
+// their reference counterparts.
+TEST_P(AdaptiveFirFilterOneTwoFourEightRenderChannels,
+       FilterAdaptationAvx2Optimizations) {
+  const size_t num_render_channels = GetParam();
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+
+  bool use_avx2 = (GetCPUInfo(kAVX2) != 0);
+  if (use_avx2) {
+    for (size_t num_partitions : {2, 5, 12, 30, 50}) {
+      std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+          RenderDelayBuffer::Create(EchoCanceller3Config(), kSampleRateHz,
+                                    num_render_channels));
+      Random random_generator(42U);
+      std::vector<std::vector<std::vector<float>>> x(
+          kNumBands,
+          std::vector<std::vector<float>>(num_render_channels,
+                                          std::vector<float>(kBlockSize, 0.f)));
+      FftData S_C;
+      FftData S_Avx2;
+      FftData G;
+      Aec3Fft fft;
+      std::vector<std::vector<FftData>> H_C(
+          num_partitions, std::vector<FftData>(num_render_channels));
+      std::vector<std::vector<FftData>> H_Avx2(
+          num_partitions, std::vector<FftData>(num_render_channels));
+      for (size_t p = 0; p < num_partitions; ++p) {
+        for (size_t ch = 0; ch < num_render_channels; ++ch) {
+          H_C[p][ch].Clear();
+          H_Avx2[p][ch].Clear();
+        }
+      }
+
+      for (size_t k = 0; k < 500; ++k) {
+        for (size_t band = 0; band < x.size(); ++band) {
+          for (size_t ch = 0; ch < x[band].size(); ++ch) {
+            RandomizeSampleVector(&random_generator, x[band][ch]);
+          }
+        }
+        render_delay_buffer->Insert(x);
+        if (k == 0) {
+          render_delay_buffer->Reset();
+        }
+        render_delay_buffer->PrepareCaptureProcessing();
+        auto* const render_buffer = render_delay_buffer->GetRenderBuffer();
+
+        ApplyFilter_Avx2(*render_buffer, num_partitions, H_Avx2, &S_Avx2);
+        ApplyFilter(*render_buffer, num_partitions, H_C, &S_C);
+        for (size_t j = 0; j < S_C.re.size(); ++j) {
+          EXPECT_FLOAT_EQ(S_C.re[j], S_Avx2.re[j]);
+          EXPECT_FLOAT_EQ(S_C.im[j], S_Avx2.im[j]);
+        }
+
+        std::for_each(G.re.begin(), G.re.end(),
+                      [&](float& a) { a = random_generator.Rand<float>(); });
+        std::for_each(G.im.begin(), G.im.end(),
+                      [&](float& a) { a = random_generator.Rand<float>(); });
+
+        AdaptPartitions_Avx2(*render_buffer, G, num_partitions, &H_Avx2);
+        AdaptPartitions(*render_buffer, G, num_partitions, &H_C);
+
+        for (size_t p = 0; p < num_partitions; ++p) {
+          for (size_t ch = 0; ch < num_render_channels; ++ch) {
+            for (size_t j = 0; j < H_C[p][ch].re.size(); ++j) {
+              EXPECT_FLOAT_EQ(H_C[p][ch].re[j], H_Avx2[p][ch].re[j]);
+              EXPECT_FLOAT_EQ(H_C[p][ch].im[j], H_Avx2[p][ch].im[j]);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+// Verifies that the optimized method for frequency response computation is
+// bitexact to the reference counterpart.
+TEST_P(AdaptiveFirFilterOneTwoFourEightRenderChannels,
+       ComputeFrequencyResponseSse2Optimization) {
+  const size_t num_render_channels = GetParam();
+  bool use_sse2 = (GetCPUInfo(kSSE2) != 0);
+  if (use_sse2) {
+    for (size_t num_partitions : {2, 5, 12, 30, 50}) {
+      std::vector<std::vector<FftData>> H(
+          num_partitions, std::vector<FftData>(num_render_channels));
+      std::vector<std::array<float, kFftLengthBy2Plus1>> H2(num_partitions);
+      std::vector<std::array<float, kFftLengthBy2Plus1>> H2_Sse2(
+          num_partitions);
+
+      for (size_t p = 0; p < num_partitions; ++p) {
+        for (size_t ch = 0; ch < num_render_channels; ++ch) {
+          for (size_t k = 0; k < H[p][ch].re.size(); ++k) {
+            H[p][ch].re[k] = k + p / 3.f + ch;
+            H[p][ch].im[k] = p + k / 7.f - ch;
+          }
+        }
+      }
+
+      ComputeFrequencyResponse(num_partitions, H, &H2);
+      ComputeFrequencyResponse_Sse2(num_partitions, H, &H2_Sse2);
+
+      for (size_t p = 0; p < num_partitions; ++p) {
+        for (size_t k = 0; k < H2[p].size(); ++k) {
+          EXPECT_FLOAT_EQ(H2[p][k], H2_Sse2[p][k]);
+        }
+      }
+    }
+  }
+}
+
+// Verifies that the optimized method for frequency response computation is
+// bitexact to the reference counterpart.
+TEST_P(AdaptiveFirFilterOneTwoFourEightRenderChannels,
+       ComputeFrequencyResponseAvx2Optimization) {
+  const size_t num_render_channels = GetParam();
+  bool use_avx2 = (GetCPUInfo(kAVX2) != 0);
+  if (use_avx2) {
+    for (size_t num_partitions : {2, 5, 12, 30, 50}) {
+      std::vector<std::vector<FftData>> H(
+          num_partitions, std::vector<FftData>(num_render_channels));
+      std::vector<std::array<float, kFftLengthBy2Plus1>> H2(num_partitions);
+      std::vector<std::array<float, kFftLengthBy2Plus1>> H2_Avx2(
+          num_partitions);
+
+      for (size_t p = 0; p < num_partitions; ++p) {
+        for (size_t ch = 0; ch < num_render_channels; ++ch) {
+          for (size_t k = 0; k < H[p][ch].re.size(); ++k) {
+            H[p][ch].re[k] = k + p / 3.f + ch;
+            H[p][ch].im[k] = p + k / 7.f - ch;
+          }
+        }
+      }
+
+      ComputeFrequencyResponse(num_partitions, H, &H2);
+      ComputeFrequencyResponse_Avx2(num_partitions, H, &H2_Avx2);
+
+      for (size_t p = 0; p < num_partitions; ++p) {
+        for (size_t k = 0; k < H2[p].size(); ++k) {
+          EXPECT_FLOAT_EQ(H2[p][k], H2_Avx2[p][k]);
+        }
+      }
+    }
+  }
+}
+
+#endif
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+// Verifies that the check for non-null data dumper works.
+TEST(AdaptiveFirFilterDeathTest, NullDataDumper) {
+  EXPECT_DEATH(AdaptiveFirFilter(9, 9, 250, 1, DetectOptimization(), nullptr),
+               "");
+}
+
+// Verifies that the check for non-null filter output works.
+TEST(AdaptiveFirFilterDeathTest, NullFilterOutput) {
+  ApmDataDumper data_dumper(42);
+  AdaptiveFirFilter filter(9, 9, 250, 1, DetectOptimization(), &data_dumper);
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(EchoCanceller3Config(), 48000, 1));
+  EXPECT_DEATH(filter.Filter(*render_delay_buffer->GetRenderBuffer(), nullptr),
+               "");
+}
+
+#endif
+
+// Verifies that the filter statistics can be accessed when filter statistics
+// are turned on.
+TEST(AdaptiveFirFilterTest, FilterStatisticsAccess) {
+  ApmDataDumper data_dumper(42);
+  Aec3Optimization optimization = DetectOptimization();
+  AdaptiveFirFilter filter(9, 9, 250, 1, optimization, &data_dumper);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> H2(
+      filter.max_filter_size_partitions(),
+      std::array<float, kFftLengthBy2Plus1>());
+  for (auto& H2_k : H2) {
+    H2_k.fill(0.f);
+  }
+
+  std::array<float, kFftLengthBy2Plus1> erl;
+  ComputeErl(optimization, H2, erl);
+  filter.ComputeFrequencyResponse(&H2);
+}
+
+// Verifies that the filter size if correctly repported.
+TEST(AdaptiveFirFilterTest, FilterSize) {
+  ApmDataDumper data_dumper(42);
+  for (size_t filter_size = 1; filter_size < 5; ++filter_size) {
+    AdaptiveFirFilter filter(filter_size, filter_size, 250, 1,
+                             DetectOptimization(), &data_dumper);
+    EXPECT_EQ(filter_size, filter.SizePartitions());
+  }
+}
+
+class AdaptiveFirFilterMultiChannel
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<std::tuple<size_t, size_t>> {};
+
+INSTANTIATE_TEST_SUITE_P(MultiChannel,
+                         AdaptiveFirFilterMultiChannel,
+                         ::testing::Combine(::testing::Values(1, 4),
+                                            ::testing::Values(1, 8)));
+
+// Verifies that the filter is being able to properly filter a signal and to
+// adapt its coefficients.
+TEST_P(AdaptiveFirFilterMultiChannel, FilterAndAdapt) {
+  const size_t num_render_channels = std::get<0>(GetParam());
+  const size_t num_capture_channels = std::get<1>(GetParam());
+
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+  constexpr size_t kNumBlocksToProcessPerRenderChannel = 1000;
+
+  ApmDataDumper data_dumper(42);
+  EchoCanceller3Config config;
+
+  if (num_render_channels == 33) {
+    config.filter.refined = {13, 0.00005f, 0.0005f, 0.0001f, 2.f, 20075344.f};
+    config.filter.coarse = {13, 0.1f, 20075344.f};
+    config.filter.refined_initial = {12, 0.005f, 0.5f, 0.001f, 2.f, 20075344.f};
+    config.filter.coarse_initial = {12, 0.7f, 20075344.f};
+  }
+
+  AdaptiveFirFilter filter(
+      config.filter.refined.length_blocks, config.filter.refined.length_blocks,
+      config.filter.config_change_duration_blocks, num_render_channels,
+      DetectOptimization(), &data_dumper);
+  std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>> H2(
+      num_capture_channels, std::vector<std::array<float, kFftLengthBy2Plus1>>(
+                                filter.max_filter_size_partitions(),
+                                std::array<float, kFftLengthBy2Plus1>()));
+  std::vector<std::vector<float>> h(
+      num_capture_channels,
+      std::vector<float>(
+          GetTimeDomainLength(filter.max_filter_size_partitions()), 0.f));
+  Aec3Fft fft;
+  config.delay.default_delay = 1;
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, kSampleRateHz, num_render_channels));
+  CoarseFilterUpdateGain gain(config.filter.coarse,
+                              config.filter.config_change_duration_blocks);
+  Random random_generator(42U);
+  std::vector<std::vector<std::vector<float>>> x(
+      kNumBands, std::vector<std::vector<float>>(
+                     num_render_channels, std::vector<float>(kBlockSize, 0.f)));
+  std::vector<float> n(kBlockSize, 0.f);
+  std::vector<float> y(kBlockSize, 0.f);
+  AecState aec_state(EchoCanceller3Config{}, num_capture_channels);
+  RenderSignalAnalyzer render_signal_analyzer(config);
+  absl::optional<DelayEstimate> delay_estimate;
+  std::vector<float> e(kBlockSize, 0.f);
+  std::array<float, kFftLength> s_scratch;
+  std::vector<SubtractorOutput> output(num_capture_channels);
+  FftData S;
+  FftData G;
+  FftData E;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> Y2(num_capture_channels);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> E2_refined(
+      num_capture_channels);
+  std::array<float, kFftLengthBy2Plus1> E2_coarse;
+  // [B,A] = butter(2,100/8000,'high')
+  constexpr CascadedBiQuadFilter::BiQuadCoefficients
+      kHighPassFilterCoefficients = {{0.97261f, -1.94523f, 0.97261f},
+                                     {-1.94448f, 0.94598f}};
+  for (auto& Y2_ch : Y2) {
+    Y2_ch.fill(0.f);
+  }
+  for (auto& E2_refined_ch : E2_refined) {
+    E2_refined_ch.fill(0.f);
+  }
+  E2_coarse.fill(0.f);
+  for (auto& subtractor_output : output) {
+    subtractor_output.Reset();
+  }
+
+  constexpr float kScale = 1.0f / kFftLengthBy2;
+
+  for (size_t delay_samples : {0, 64, 150, 200, 301}) {
+    std::vector<DelayBuffer<float>> delay_buffer(
+        num_render_channels, DelayBuffer<float>(delay_samples));
+    std::vector<std::unique_ptr<CascadedBiQuadFilter>> x_hp_filter(
+        num_render_channels);
+    for (size_t ch = 0; ch < num_render_channels; ++ch) {
+      x_hp_filter[ch] = std::make_unique<CascadedBiQuadFilter>(
+          kHighPassFilterCoefficients, 1);
+    }
+    CascadedBiQuadFilter y_hp_filter(kHighPassFilterCoefficients, 1);
+
+    SCOPED_TRACE(ProduceDebugText(num_render_channels, delay_samples));
+    const size_t num_blocks_to_process =
+        kNumBlocksToProcessPerRenderChannel * num_render_channels;
+    for (size_t j = 0; j < num_blocks_to_process; ++j) {
+      std::fill(y.begin(), y.end(), 0.f);
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        RandomizeSampleVector(&random_generator, x[0][ch]);
+        std::array<float, kBlockSize> y_channel;
+        delay_buffer[ch].Delay(x[0][ch], y_channel);
+        for (size_t k = 0; k < y.size(); ++k) {
+          y[k] += y_channel[k] / num_render_channels;
+        }
+      }
+
+      RandomizeSampleVector(&random_generator, n);
+      const float noise_scaling = 1.f / 100.f / num_render_channels;
+      for (size_t k = 0; k < y.size(); ++k) {
+        y[k] += n[k] * noise_scaling;
+      }
+
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        x_hp_filter[ch]->Process(x[0][ch]);
+      }
+      y_hp_filter.Process(y);
+
+      render_delay_buffer->Insert(x);
+      if (j == 0) {
+        render_delay_buffer->Reset();
+      }
+      render_delay_buffer->PrepareCaptureProcessing();
+      auto* const render_buffer = render_delay_buffer->GetRenderBuffer();
+
+      render_signal_analyzer.Update(*render_buffer,
+                                    aec_state.MinDirectPathFilterDelay());
+
+      filter.Filter(*render_buffer, &S);
+      fft.Ifft(S, &s_scratch);
+      std::transform(y.begin(), y.end(), s_scratch.begin() + kFftLengthBy2,
+                     e.begin(),
+                     [&](float a, float b) { return a - b * kScale; });
+      std::for_each(e.begin(), e.end(),
+                    [](float& a) { a = rtc::SafeClamp(a, -32768.f, 32767.f); });
+      fft.ZeroPaddedFft(e, Aec3Fft::Window::kRectangular, &E);
+      for (auto& o : output) {
+        for (size_t k = 0; k < kBlockSize; ++k) {
+          o.s_refined[k] = kScale * s_scratch[k + kFftLengthBy2];
+        }
+      }
+
+      std::array<float, kFftLengthBy2Plus1> render_power;
+      render_buffer->SpectralSum(filter.SizePartitions(), &render_power);
+      gain.Compute(render_power, render_signal_analyzer, E,
+                   filter.SizePartitions(), false, &G);
+      filter.Adapt(*render_buffer, G, &h[0]);
+      aec_state.HandleEchoPathChange(EchoPathVariability(
+          false, EchoPathVariability::DelayAdjustment::kNone, false));
+
+      filter.ComputeFrequencyResponse(&H2[0]);
+      aec_state.Update(delay_estimate, H2, h, *render_buffer, E2_refined, Y2,
+                       output);
+    }
+    // Verify that the filter is able to perform well.
+    EXPECT_LT(1000 * std::inner_product(e.begin(), e.end(), e.begin(), 0.f),
+              std::inner_product(y.begin(), y.end(), y.begin(), 0.f));
+  }
+}
+
+}  // namespace aec3
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_common.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_common.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_common.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_common.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+
+#include <stdint.h>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/system/arch.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+
+namespace webrtc {
+
+Aec3Optimization DetectOptimization() {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+  if (GetCPUInfo(kAVX2) != 0) {
+    return Aec3Optimization::kAvx2;
+  } else if (GetCPUInfo(kSSE2) != 0) {
+    return Aec3Optimization::kSse2;
+  }
+#endif
+
+#if defined(WEBRTC_HAS_NEON)
+  return Aec3Optimization::kNeon;
+#endif
+
+  return Aec3Optimization::kNone;
+}
+
+float FastApproxLog2f(const float in) {
+  RTC_DCHECK_GT(in, .0f);
+  // Read and interpret float as uint32_t and then cast to float.
+  // This is done to extract the exponent (bits 30 - 23).
+  // "Right shift" of the exponent is then performed by multiplying
+  // with the constant (1/2^23). Finally, we subtract a constant to
+  // remove the bias (https://en.wikipedia.org/wiki/Exponent_bias).
+  union {
+    float dummy;
+    uint32_t a;
+  } x = {in};
+  float out = x.a;
+  out *= 1.1920929e-7f;  // 1/2^23
+  out -= 126.942695f;    // Remove bias.
+  return out;
+}
+
+float Log2TodB(const float in_log2) {
+  return 3.0102999566398121 * in_log2;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_common.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_common.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_common.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_common.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,114 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_AEC3_COMMON_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_AEC3_COMMON_H_
+
+#include <stddef.h>
+
+namespace webrtc {
+
+#ifdef _MSC_VER /* visual c++ */
+#define ALIGN16_BEG __declspec(align(16))
+#define ALIGN16_END
+#else /* gcc or icc */
+#define ALIGN16_BEG
+#define ALIGN16_END __attribute__((aligned(16)))
+#endif
+
+enum class Aec3Optimization { kNone, kSse2, kAvx2, kNeon };
+
+constexpr int kNumBlocksPerSecond = 250;
+
+constexpr int kMetricsReportingIntervalBlocks = 10 * kNumBlocksPerSecond;
+constexpr int kMetricsComputationBlocks = 3;
+constexpr int kMetricsCollectionBlocks =
+    kMetricsReportingIntervalBlocks - kMetricsComputationBlocks;
+
+constexpr size_t kFftLengthBy2 = 64;
+constexpr size_t kFftLengthBy2Plus1 = kFftLengthBy2 + 1;
+constexpr size_t kFftLengthBy2Minus1 = kFftLengthBy2 - 1;
+constexpr size_t kFftLength = 2 * kFftLengthBy2;
+constexpr size_t kFftLengthBy2Log2 = 6;
+
+constexpr int kRenderTransferQueueSizeFrames = 100;
+
+constexpr size_t kMaxNumBands = 3;
+constexpr size_t kFrameSize = 160;
+constexpr size_t kSubFrameLength = kFrameSize / 2;
+
+constexpr size_t kBlockSize = kFftLengthBy2;
+constexpr size_t kBlockSizeLog2 = kFftLengthBy2Log2;
+
+constexpr size_t kExtendedBlockSize = 2 * kFftLengthBy2;
+constexpr size_t kMatchedFilterWindowSizeSubBlocks = 32;
+constexpr size_t kMatchedFilterAlignmentShiftSizeSubBlocks =
+    kMatchedFilterWindowSizeSubBlocks * 3 / 4;
+
+// TODO(peah): Integrate this with how it is done inside audio_processing_impl.
+constexpr size_t NumBandsForRate(int sample_rate_hz) {
+  return static_cast<size_t>(sample_rate_hz / 16000);
+}
+
+constexpr bool ValidFullBandRate(int sample_rate_hz) {
+  return sample_rate_hz == 16000 || sample_rate_hz == 32000 ||
+         sample_rate_hz == 48000;
+}
+
+constexpr int GetTimeDomainLength(int filter_length_blocks) {
+  return filter_length_blocks * kFftLengthBy2;
+}
+
+constexpr size_t GetDownSampledBufferSize(size_t down_sampling_factor,
+                                          size_t num_matched_filters) {
+  return kBlockSize / down_sampling_factor *
+         (kMatchedFilterAlignmentShiftSizeSubBlocks * num_matched_filters +
+          kMatchedFilterWindowSizeSubBlocks + 1);
+}
+
+constexpr size_t GetRenderDelayBufferSize(size_t down_sampling_factor,
+                                          size_t num_matched_filters,
+                                          size_t filter_length_blocks) {
+  return GetDownSampledBufferSize(down_sampling_factor, num_matched_filters) /
+             (kBlockSize / down_sampling_factor) +
+         filter_length_blocks + 1;
+}
+
+// Detects what kind of optimizations to use for the code.
+Aec3Optimization DetectOptimization();
+
+// Computes the log2 of the input in a fast an approximate manner.
+float FastApproxLog2f(const float in);
+
+// Returns dB from a power quantity expressed in log2.
+float Log2TodB(const float in_log2);
+
+static_assert(1 << kBlockSizeLog2 == kBlockSize,
+              "Proper number of shifts for blocksize");
+
+static_assert(1 << kFftLengthBy2Log2 == kFftLengthBy2,
+              "Proper number of shifts for the fft length");
+
+static_assert(1 == NumBandsForRate(16000), "Number of bands for 16 kHz");
+static_assert(2 == NumBandsForRate(32000), "Number of bands for 32 kHz");
+static_assert(3 == NumBandsForRate(48000), "Number of bands for 48 kHz");
+
+static_assert(ValidFullBandRate(16000),
+              "Test that 16 kHz is a valid sample rate");
+static_assert(ValidFullBandRate(32000),
+              "Test that 32 kHz is a valid sample rate");
+static_assert(ValidFullBandRate(48000),
+              "Test that 48 kHz is a valid sample rate");
+static_assert(!ValidFullBandRate(8001),
+              "Test that 8001 Hz is not a valid sample rate");
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_AEC3_COMMON_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,144 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/aec3_fft.h"
+
+#include <algorithm>
+#include <functional>
+#include <iterator>
+
+#include "rtc_base/checks.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+
+namespace webrtc {
+
+namespace {
+
+const float kHanning64[kFftLengthBy2] = {
+    0.f,         0.00248461f, 0.00991376f, 0.0222136f,  0.03926189f,
+    0.06088921f, 0.08688061f, 0.11697778f, 0.15088159f, 0.1882551f,
+    0.22872687f, 0.27189467f, 0.31732949f, 0.36457977f, 0.41317591f,
+    0.46263495f, 0.51246535f, 0.56217185f, 0.61126047f, 0.65924333f,
+    0.70564355f, 0.75f,       0.79187184f, 0.83084292f, 0.86652594f,
+    0.89856625f, 0.92664544f, 0.95048443f, 0.96984631f, 0.98453864f,
+    0.99441541f, 0.99937846f, 0.99937846f, 0.99441541f, 0.98453864f,
+    0.96984631f, 0.95048443f, 0.92664544f, 0.89856625f, 0.86652594f,
+    0.83084292f, 0.79187184f, 0.75f,       0.70564355f, 0.65924333f,
+    0.61126047f, 0.56217185f, 0.51246535f, 0.46263495f, 0.41317591f,
+    0.36457977f, 0.31732949f, 0.27189467f, 0.22872687f, 0.1882551f,
+    0.15088159f, 0.11697778f, 0.08688061f, 0.06088921f, 0.03926189f,
+    0.0222136f,  0.00991376f, 0.00248461f, 0.f};
+
+// Hanning window from Matlab command win = sqrt(hanning(128)).
+const float kSqrtHanning128[kFftLength] = {
+    0.00000000000000f, 0.02454122852291f, 0.04906767432742f, 0.07356456359967f,
+    0.09801714032956f, 0.12241067519922f, 0.14673047445536f, 0.17096188876030f,
+    0.19509032201613f, 0.21910124015687f, 0.24298017990326f, 0.26671275747490f,
+    0.29028467725446f, 0.31368174039889f, 0.33688985339222f, 0.35989503653499f,
+    0.38268343236509f, 0.40524131400499f, 0.42755509343028f, 0.44961132965461f,
+    0.47139673682600f, 0.49289819222978f, 0.51410274419322f, 0.53499761988710f,
+    0.55557023301960f, 0.57580819141785f, 0.59569930449243f, 0.61523159058063f,
+    0.63439328416365f, 0.65317284295378f, 0.67155895484702f, 0.68954054473707f,
+    0.70710678118655f, 0.72424708295147f, 0.74095112535496f, 0.75720884650648f,
+    0.77301045336274f, 0.78834642762661f, 0.80320753148064f, 0.81758481315158f,
+    0.83146961230255f, 0.84485356524971f, 0.85772861000027f, 0.87008699110871f,
+    0.88192126434835f, 0.89322430119552f, 0.90398929312344f, 0.91420975570353f,
+    0.92387953251129f, 0.93299279883474f, 0.94154406518302f, 0.94952818059304f,
+    0.95694033573221f, 0.96377606579544f, 0.97003125319454f, 0.97570213003853f,
+    0.98078528040323f, 0.98527764238894f, 0.98917650996478f, 0.99247953459871f,
+    0.99518472667220f, 0.99729045667869f, 0.99879545620517f, 0.99969881869620f,
+    1.00000000000000f, 0.99969881869620f, 0.99879545620517f, 0.99729045667869f,
+    0.99518472667220f, 0.99247953459871f, 0.98917650996478f, 0.98527764238894f,
+    0.98078528040323f, 0.97570213003853f, 0.97003125319454f, 0.96377606579544f,
+    0.95694033573221f, 0.94952818059304f, 0.94154406518302f, 0.93299279883474f,
+    0.92387953251129f, 0.91420975570353f, 0.90398929312344f, 0.89322430119552f,
+    0.88192126434835f, 0.87008699110871f, 0.85772861000027f, 0.84485356524971f,
+    0.83146961230255f, 0.81758481315158f, 0.80320753148064f, 0.78834642762661f,
+    0.77301045336274f, 0.75720884650648f, 0.74095112535496f, 0.72424708295147f,
+    0.70710678118655f, 0.68954054473707f, 0.67155895484702f, 0.65317284295378f,
+    0.63439328416365f, 0.61523159058063f, 0.59569930449243f, 0.57580819141785f,
+    0.55557023301960f, 0.53499761988710f, 0.51410274419322f, 0.49289819222978f,
+    0.47139673682600f, 0.44961132965461f, 0.42755509343028f, 0.40524131400499f,
+    0.38268343236509f, 0.35989503653499f, 0.33688985339222f, 0.31368174039889f,
+    0.29028467725446f, 0.26671275747490f, 0.24298017990326f, 0.21910124015687f,
+    0.19509032201613f, 0.17096188876030f, 0.14673047445536f, 0.12241067519922f,
+    0.09801714032956f, 0.07356456359967f, 0.04906767432742f, 0.02454122852291f};
+
+bool IsSse2Available() {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+  return GetCPUInfo(kSSE2) != 0;
+#else
+  return false;
+#endif
+}
+
+}  // namespace
+
+Aec3Fft::Aec3Fft() : ooura_fft_(IsSse2Available()) {}
+
+// TODO(peah): Change x to be std::array once the rest of the code allows this.
+void Aec3Fft::ZeroPaddedFft(rtc::ArrayView<const float> x,
+                            Window window,
+                            FftData* X) const {
+  RTC_DCHECK(X);
+  RTC_DCHECK_EQ(kFftLengthBy2, x.size());
+  std::array<float, kFftLength> fft;
+  std::fill(fft.begin(), fft.begin() + kFftLengthBy2, 0.f);
+  switch (window) {
+    case Window::kRectangular:
+      std::copy(x.begin(), x.end(), fft.begin() + kFftLengthBy2);
+      break;
+    case Window::kHanning:
+      std::transform(x.begin(), x.end(), std::begin(kHanning64),
+                     fft.begin() + kFftLengthBy2,
+                     [](float a, float b) { return a * b; });
+      break;
+    case Window::kSqrtHanning:
+      RTC_NOTREACHED();
+      break;
+    default:
+      RTC_NOTREACHED();
+  }
+
+  Fft(&fft, X);
+}
+
+void Aec3Fft::PaddedFft(rtc::ArrayView<const float> x,
+                        rtc::ArrayView<const float> x_old,
+                        Window window,
+                        FftData* X) const {
+  RTC_DCHECK(X);
+  RTC_DCHECK_EQ(kFftLengthBy2, x.size());
+  RTC_DCHECK_EQ(kFftLengthBy2, x_old.size());
+  std::array<float, kFftLength> fft;
+
+  switch (window) {
+    case Window::kRectangular:
+      std::copy(x_old.begin(), x_old.end(), fft.begin());
+      std::copy(x.begin(), x.end(), fft.begin() + x_old.size());
+      break;
+    case Window::kHanning:
+      RTC_NOTREACHED();
+      break;
+    case Window::kSqrtHanning:
+      std::transform(x_old.begin(), x_old.end(), std::begin(kSqrtHanning128),
+                     fft.begin(), std::multiplies<float>());
+      std::transform(x.begin(), x.end(),
+                     std::begin(kSqrtHanning128) + x_old.size(),
+                     fft.begin() + x_old.size(), std::multiplies<float>());
+      break;
+    default:
+      RTC_NOTREACHED();
+  }
+
+  Fft(&fft, X);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_AEC3_FFT_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_AEC3_FFT_H_
+
+#include <array>
+
+#include "api/array_view.h"
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+// Wrapper class that provides 128 point real valued FFT functionality with the
+// FftData type.
+class Aec3Fft {
+ public:
+  enum class Window { kRectangular, kHanning, kSqrtHanning };
+
+  Aec3Fft();
+
+  // Computes the FFT. Note that both the input and output are modified.
+  void Fft(std::array<float, kFftLength>* x, FftData* X) const {
+    RTC_DCHECK(x);
+    RTC_DCHECK(X);
+    ooura_fft_.Fft(x->data());
+    X->CopyFromPackedArray(*x);
+  }
+  // Computes the inverse Fft.
+  void Ifft(const FftData& X, std::array<float, kFftLength>* x) const {
+    RTC_DCHECK(x);
+    X.CopyToPackedArray(x);
+    ooura_fft_.InverseFft(x->data());
+  }
+
+  // Windows the input using a Hanning window, and then adds padding of
+  // kFftLengthBy2 initial zeros before computing the Fft.
+  void ZeroPaddedFft(rtc::ArrayView<const float> x,
+                     Window window,
+                     FftData* X) const;
+
+  // Concatenates the kFftLengthBy2 values long x and x_old before computing the
+  // Fft. After that, x is copied to x_old.
+  void PaddedFft(rtc::ArrayView<const float> x,
+                 rtc::ArrayView<const float> x_old,
+                 FftData* X) const {
+    PaddedFft(x, x_old, Window::kRectangular, X);
+  }
+
+  // Padded Fft using a time-domain window.
+  void PaddedFft(rtc::ArrayView<const float> x,
+                 rtc::ArrayView<const float> x_old,
+                 Window window,
+                 FftData* X) const;
+
+ private:
+  const OouraFft ooura_fft_;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(Aec3Fft);
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_AEC3_FFT_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec3_fft_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,213 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/aec3_fft.h"
+
+#include <algorithm>
+
+#include "test/gmock.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies that the check for non-null input in Fft works.
+TEST(Aec3FftDeathTest, NullFftInput) {
+  Aec3Fft fft;
+  FftData X;
+  EXPECT_DEATH(fft.Fft(nullptr, &X), "");
+}
+
+// Verifies that the check for non-null input in Fft works.
+TEST(Aec3FftDeathTest, NullFftOutput) {
+  Aec3Fft fft;
+  std::array<float, kFftLength> x;
+  EXPECT_DEATH(fft.Fft(&x, nullptr), "");
+}
+
+// Verifies that the check for non-null output in Ifft works.
+TEST(Aec3FftDeathTest, NullIfftOutput) {
+  Aec3Fft fft;
+  FftData X;
+  EXPECT_DEATH(fft.Ifft(X, nullptr), "");
+}
+
+// Verifies that the check for non-null output in ZeroPaddedFft works.
+TEST(Aec3FftDeathTest, NullZeroPaddedFftOutput) {
+  Aec3Fft fft;
+  std::array<float, kFftLengthBy2> x;
+  EXPECT_DEATH(fft.ZeroPaddedFft(x, Aec3Fft::Window::kRectangular, nullptr),
+               "");
+}
+
+// Verifies that the check for input length in ZeroPaddedFft works.
+TEST(Aec3FftDeathTest, ZeroPaddedFftWrongInputLength) {
+  Aec3Fft fft;
+  FftData X;
+  std::array<float, kFftLengthBy2 - 1> x;
+  EXPECT_DEATH(fft.ZeroPaddedFft(x, Aec3Fft::Window::kRectangular, &X), "");
+}
+
+// Verifies that the check for non-null output in PaddedFft works.
+TEST(Aec3FftDeathTest, NullPaddedFftOutput) {
+  Aec3Fft fft;
+  std::array<float, kFftLengthBy2> x;
+  std::array<float, kFftLengthBy2> x_old;
+  EXPECT_DEATH(fft.PaddedFft(x, x_old, nullptr), "");
+}
+
+// Verifies that the check for input length in PaddedFft works.
+TEST(Aec3FftDeathTest, PaddedFftWrongInputLength) {
+  Aec3Fft fft;
+  FftData X;
+  std::array<float, kFftLengthBy2 - 1> x;
+  std::array<float, kFftLengthBy2> x_old;
+  EXPECT_DEATH(fft.PaddedFft(x, x_old, &X), "");
+}
+
+// Verifies that the check for length in the old value in PaddedFft works.
+TEST(Aec3FftDeathTest, PaddedFftWrongOldValuesLength) {
+  Aec3Fft fft;
+  FftData X;
+  std::array<float, kFftLengthBy2> x;
+  std::array<float, kFftLengthBy2 - 1> x_old;
+  EXPECT_DEATH(fft.PaddedFft(x, x_old, &X), "");
+}
+
+#endif
+
+// Verifies that Fft works as intended.
+TEST(Aec3Fft, Fft) {
+  Aec3Fft fft;
+  FftData X;
+  std::array<float, kFftLength> x;
+  x.fill(0.f);
+  fft.Fft(&x, &X);
+  EXPECT_THAT(X.re, ::testing::Each(0.f));
+  EXPECT_THAT(X.im, ::testing::Each(0.f));
+
+  x.fill(0.f);
+  x[0] = 1.f;
+  fft.Fft(&x, &X);
+  EXPECT_THAT(X.re, ::testing::Each(1.f));
+  EXPECT_THAT(X.im, ::testing::Each(0.f));
+
+  x.fill(1.f);
+  fft.Fft(&x, &X);
+  EXPECT_EQ(128.f, X.re[0]);
+  std::for_each(X.re.begin() + 1, X.re.end(),
+                [](float a) { EXPECT_EQ(0.f, a); });
+  EXPECT_THAT(X.im, ::testing::Each(0.f));
+}
+
+// Verifies that InverseFft works as intended.
+TEST(Aec3Fft, Ifft) {
+  Aec3Fft fft;
+  FftData X;
+  std::array<float, kFftLength> x;
+
+  X.re.fill(0.f);
+  X.im.fill(0.f);
+  fft.Ifft(X, &x);
+  EXPECT_THAT(x, ::testing::Each(0.f));
+
+  X.re.fill(1.f);
+  X.im.fill(0.f);
+  fft.Ifft(X, &x);
+  EXPECT_EQ(64.f, x[0]);
+  std::for_each(x.begin() + 1, x.end(), [](float a) { EXPECT_EQ(0.f, a); });
+
+  X.re.fill(0.f);
+  X.re[0] = 128;
+  X.im.fill(0.f);
+  fft.Ifft(X, &x);
+  EXPECT_THAT(x, ::testing::Each(64.f));
+}
+
+// Verifies that InverseFft and Fft work as intended.
+TEST(Aec3Fft, FftAndIfft) {
+  Aec3Fft fft;
+  FftData X;
+  std::array<float, kFftLength> x;
+  std::array<float, kFftLength> x_ref;
+
+  int v = 0;
+  for (int k = 0; k < 20; ++k) {
+    for (size_t j = 0; j < x.size(); ++j) {
+      x[j] = v++;
+      x_ref[j] = x[j] * 64.f;
+    }
+    fft.Fft(&x, &X);
+    fft.Ifft(X, &x);
+    for (size_t j = 0; j < x.size(); ++j) {
+      EXPECT_NEAR(x_ref[j], x[j], 0.001f);
+    }
+  }
+}
+
+// Verifies that ZeroPaddedFft work as intended.
+TEST(Aec3Fft, ZeroPaddedFft) {
+  Aec3Fft fft;
+  FftData X;
+  std::array<float, kFftLengthBy2> x_in;
+  std::array<float, kFftLength> x_ref;
+  std::array<float, kFftLength> x_out;
+
+  int v = 0;
+  x_ref.fill(0.f);
+  for (int k = 0; k < 20; ++k) {
+    for (size_t j = 0; j < x_in.size(); ++j) {
+      x_in[j] = v++;
+      x_ref[j + kFftLengthBy2] = x_in[j] * 64.f;
+    }
+    fft.ZeroPaddedFft(x_in, Aec3Fft::Window::kRectangular, &X);
+    fft.Ifft(X, &x_out);
+    for (size_t j = 0; j < x_out.size(); ++j) {
+      EXPECT_NEAR(x_ref[j], x_out[j], 0.1f);
+    }
+  }
+}
+
+// Verifies that ZeroPaddedFft work as intended.
+TEST(Aec3Fft, PaddedFft) {
+  Aec3Fft fft;
+  FftData X;
+  std::array<float, kFftLengthBy2> x_in;
+  std::array<float, kFftLength> x_out;
+  std::array<float, kFftLengthBy2> x_old;
+  std::array<float, kFftLengthBy2> x_old_ref;
+  std::array<float, kFftLength> x_ref;
+
+  int v = 0;
+  x_old.fill(0.f);
+  for (int k = 0; k < 20; ++k) {
+    for (size_t j = 0; j < x_in.size(); ++j) {
+      x_in[j] = v++;
+    }
+
+    std::copy(x_old.begin(), x_old.end(), x_ref.begin());
+    std::copy(x_in.begin(), x_in.end(), x_ref.begin() + kFftLengthBy2);
+    std::copy(x_in.begin(), x_in.end(), x_old_ref.begin());
+    std::for_each(x_ref.begin(), x_ref.end(), [](float& a) { a *= 64.f; });
+
+    fft.PaddedFft(x_in, x_old, &X);
+    std::copy(x_in.begin(), x_in.end(), x_old.begin());
+    fft.Ifft(X, &x_out);
+
+    for (size_t j = 0; j < x_out.size(); ++j) {
+      EXPECT_NEAR(x_ref[j], x_out[j], 0.1f);
+    }
+
+    EXPECT_EQ(x_old_ref, x_old);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,480 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/aec_state.h"
+
+#include <math.h>
+
+#include <algorithm>
+#include <numeric>
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/checks.h"
+#include "system_wrappers/include/field_trial.h"
+
+namespace webrtc {
+namespace {
+
+bool DeactivateInitialStateResetAtEchoPathChange() {
+  return field_trial::IsEnabled(
+      "WebRTC-Aec3DeactivateInitialStateResetKillSwitch");
+}
+
+bool FullResetAtEchoPathChange() {
+  return !field_trial::IsEnabled("WebRTC-Aec3AecStateFullResetKillSwitch");
+}
+
+bool SubtractorAnalyzerResetAtEchoPathChange() {
+  return !field_trial::IsEnabled(
+      "WebRTC-Aec3AecStateSubtractorAnalyzerResetKillSwitch");
+}
+
+void ComputeAvgRenderReverb(
+    const SpectrumBuffer& spectrum_buffer,
+    int delay_blocks,
+    float reverb_decay,
+    ReverbModel* reverb_model,
+    rtc::ArrayView<float, kFftLengthBy2Plus1> reverb_power_spectrum) {
+  RTC_DCHECK(reverb_model);
+  const size_t num_render_channels = spectrum_buffer.buffer[0].size();
+  int idx_at_delay =
+      spectrum_buffer.OffsetIndex(spectrum_buffer.read, delay_blocks);
+  int idx_past = spectrum_buffer.IncIndex(idx_at_delay);
+
+  std::array<float, kFftLengthBy2Plus1> X2_data;
+  rtc::ArrayView<const float> X2;
+  if (num_render_channels > 1) {
+    auto average_channels =
+        [](size_t num_render_channels,
+           rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+               spectrum_band_0,
+           rtc::ArrayView<float, kFftLengthBy2Plus1> render_power) {
+          std::fill(render_power.begin(), render_power.end(), 0.f);
+          for (size_t ch = 0; ch < num_render_channels; ++ch) {
+            for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+              render_power[k] += spectrum_band_0[ch][k];
+            }
+          }
+          const float normalizer = 1.f / num_render_channels;
+          for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+            render_power[k] *= normalizer;
+          }
+        };
+    average_channels(num_render_channels, spectrum_buffer.buffer[idx_past],
+                     X2_data);
+    reverb_model->UpdateReverbNoFreqShaping(
+        X2_data, /*power_spectrum_scaling=*/1.0f, reverb_decay);
+
+    average_channels(num_render_channels, spectrum_buffer.buffer[idx_at_delay],
+                     X2_data);
+    X2 = X2_data;
+  } else {
+    reverb_model->UpdateReverbNoFreqShaping(
+        spectrum_buffer.buffer[idx_past][/*channel=*/0],
+        /*power_spectrum_scaling=*/1.0f, reverb_decay);
+
+    X2 = spectrum_buffer.buffer[idx_at_delay][/*channel=*/0];
+  }
+
+  rtc::ArrayView<const float, kFftLengthBy2Plus1> reverb_power =
+      reverb_model->reverb();
+  for (size_t k = 0; k < X2.size(); ++k) {
+    reverb_power_spectrum[k] = X2[k] + reverb_power[k];
+  }
+}
+
+}  // namespace
+
+int AecState::instance_count_ = 0;
+
+void AecState::GetResidualEchoScaling(
+    rtc::ArrayView<float> residual_scaling) const {
+  bool filter_has_had_time_to_converge;
+  if (config_.filter.conservative_initial_phase) {
+    filter_has_had_time_to_converge =
+        strong_not_saturated_render_blocks_ >= 1.5f * kNumBlocksPerSecond;
+  } else {
+    filter_has_had_time_to_converge =
+        strong_not_saturated_render_blocks_ >= 0.8f * kNumBlocksPerSecond;
+  }
+  echo_audibility_.GetResidualEchoScaling(filter_has_had_time_to_converge,
+                                          residual_scaling);
+}
+
+AecState::AecState(const EchoCanceller3Config& config,
+                   size_t num_capture_channels)
+    : data_dumper_(
+          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
+      config_(config),
+      num_capture_channels_(num_capture_channels),
+      deactivate_initial_state_reset_at_echo_path_change_(
+          DeactivateInitialStateResetAtEchoPathChange()),
+      full_reset_at_echo_path_change_(FullResetAtEchoPathChange()),
+      subtractor_analyzer_reset_at_echo_path_change_(
+          SubtractorAnalyzerResetAtEchoPathChange()),
+      initial_state_(config_),
+      delay_state_(config_, num_capture_channels_),
+      transparent_state_(TransparentMode::Create(config_)),
+      filter_quality_state_(config_, num_capture_channels_),
+      erl_estimator_(2 * kNumBlocksPerSecond),
+      erle_estimator_(2 * kNumBlocksPerSecond, config_, num_capture_channels_),
+      filter_analyzer_(config_, num_capture_channels_),
+      echo_audibility_(
+          config_.echo_audibility.use_stationarity_properties_at_init),
+      reverb_model_estimator_(config_, num_capture_channels_),
+      subtractor_output_analyzer_(num_capture_channels_) {}
+
+AecState::~AecState() = default;
+
+void AecState::HandleEchoPathChange(
+    const EchoPathVariability& echo_path_variability) {
+  const auto full_reset = [&]() {
+    filter_analyzer_.Reset();
+    capture_signal_saturation_ = false;
+    strong_not_saturated_render_blocks_ = 0;
+    blocks_with_active_render_ = 0;
+    if (!deactivate_initial_state_reset_at_echo_path_change_) {
+      initial_state_.Reset();
+    }
+    if (transparent_state_) {
+      transparent_state_->Reset();
+    }
+    erle_estimator_.Reset(true);
+    erl_estimator_.Reset();
+    filter_quality_state_.Reset();
+  };
+
+  // TODO(peah): Refine the reset scheme according to the type of gain and
+  // delay adjustment.
+
+  if (full_reset_at_echo_path_change_ &&
+      echo_path_variability.delay_change !=
+          EchoPathVariability::DelayAdjustment::kNone) {
+    full_reset();
+  } else if (echo_path_variability.gain_change) {
+    erle_estimator_.Reset(false);
+  }
+  if (subtractor_analyzer_reset_at_echo_path_change_) {
+    subtractor_output_analyzer_.HandleEchoPathChange();
+  }
+}
+
+void AecState::Update(
+    const absl::optional<DelayEstimate>& external_delay,
+    rtc::ArrayView<const std::vector<std::array<float, kFftLengthBy2Plus1>>>
+        adaptive_filter_frequency_responses,
+    rtc::ArrayView<const std::vector<float>> adaptive_filter_impulse_responses,
+    const RenderBuffer& render_buffer,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> E2_refined,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+    rtc::ArrayView<const SubtractorOutput> subtractor_output) {
+  RTC_DCHECK_EQ(num_capture_channels_, Y2.size());
+  RTC_DCHECK_EQ(num_capture_channels_, subtractor_output.size());
+  RTC_DCHECK_EQ(num_capture_channels_,
+                adaptive_filter_frequency_responses.size());
+  RTC_DCHECK_EQ(num_capture_channels_,
+                adaptive_filter_impulse_responses.size());
+
+  // Analyze the filter outputs and filters.
+  bool any_filter_converged;
+  bool any_coarse_filter_converged;
+  bool all_filters_diverged;
+  subtractor_output_analyzer_.Update(subtractor_output, &any_filter_converged,
+                                     &any_coarse_filter_converged,
+                                     &all_filters_diverged);
+
+  bool any_filter_consistent;
+  float max_echo_path_gain;
+  filter_analyzer_.Update(adaptive_filter_impulse_responses, render_buffer,
+                          &any_filter_consistent, &max_echo_path_gain);
+
+  // Estimate the direct path delay of the filter.
+  if (config_.filter.use_linear_filter) {
+    delay_state_.Update(filter_analyzer_.FilterDelaysBlocks(), external_delay,
+                        strong_not_saturated_render_blocks_);
+  }
+
+  const std::vector<std::vector<float>>& aligned_render_block =
+      render_buffer.Block(-delay_state_.MinDirectPathFilterDelay())[0];
+
+  // Update render counters.
+  bool active_render = false;
+  for (size_t ch = 0; ch < aligned_render_block.size(); ++ch) {
+    const float render_energy = std::inner_product(
+        aligned_render_block[ch].begin(), aligned_render_block[ch].end(),
+        aligned_render_block[ch].begin(), 0.f);
+    if (render_energy > (config_.render_levels.active_render_limit *
+                         config_.render_levels.active_render_limit) *
+                            kFftLengthBy2) {
+      active_render = true;
+      break;
+    }
+  }
+  blocks_with_active_render_ += active_render ? 1 : 0;
+  strong_not_saturated_render_blocks_ +=
+      active_render && !SaturatedCapture() ? 1 : 0;
+
+  std::array<float, kFftLengthBy2Plus1> avg_render_spectrum_with_reverb;
+
+  ComputeAvgRenderReverb(render_buffer.GetSpectrumBuffer(),
+                         delay_state_.MinDirectPathFilterDelay(), ReverbDecay(),
+                         &avg_render_reverb_, avg_render_spectrum_with_reverb);
+
+  if (config_.echo_audibility.use_stationarity_properties) {
+    // Update the echo audibility evaluator.
+    echo_audibility_.Update(render_buffer, avg_render_reverb_.reverb(),
+                            delay_state_.MinDirectPathFilterDelay(),
+                            delay_state_.ExternalDelayReported());
+  }
+
+  // Update the ERL and ERLE measures.
+  if (initial_state_.TransitionTriggered()) {
+    erle_estimator_.Reset(false);
+  }
+
+  erle_estimator_.Update(render_buffer, adaptive_filter_frequency_responses,
+                         avg_render_spectrum_with_reverb, Y2, E2_refined,
+                         subtractor_output_analyzer_.ConvergedFilters());
+
+  erl_estimator_.Update(
+      subtractor_output_analyzer_.ConvergedFilters(),
+      render_buffer.Spectrum(delay_state_.MinDirectPathFilterDelay()), Y2);
+
+  // Detect and flag echo saturation.
+  if (config_.ep_strength.echo_can_saturate) {
+    saturation_detector_.Update(aligned_render_block, SaturatedCapture(),
+                                UsableLinearEstimate(), subtractor_output,
+                                max_echo_path_gain);
+  } else {
+    RTC_DCHECK(!saturation_detector_.SaturatedEcho());
+  }
+
+  // Update the decision on whether to use the initial state parameter set.
+  initial_state_.Update(active_render, SaturatedCapture());
+
+  // Detect whether the transparent mode should be activated.
+  if (transparent_state_) {
+    transparent_state_->Update(
+        delay_state_.MinDirectPathFilterDelay(), any_filter_consistent,
+        any_filter_converged, any_coarse_filter_converged, all_filters_diverged,
+        active_render, SaturatedCapture());
+  }
+
+  // Analyze the quality of the filter.
+  filter_quality_state_.Update(active_render, TransparentModeActive(),
+                               SaturatedCapture(), external_delay,
+                               any_filter_converged);
+
+  // Update the reverb estimate.
+  const bool stationary_block =
+      config_.echo_audibility.use_stationarity_properties &&
+      echo_audibility_.IsBlockStationary();
+
+  reverb_model_estimator_.Update(
+      filter_analyzer_.GetAdjustedFilters(),
+      adaptive_filter_frequency_responses,
+      erle_estimator_.GetInstLinearQualityEstimates(),
+      delay_state_.DirectPathFilterDelays(),
+      filter_quality_state_.UsableLinearFilterOutputs(), stationary_block);
+
+  erle_estimator_.Dump(data_dumper_);
+  reverb_model_estimator_.Dump(data_dumper_.get());
+  data_dumper_->DumpRaw("aec3_active_render", active_render);
+  data_dumper_->DumpRaw("aec3_erl", Erl());
+  data_dumper_->DumpRaw("aec3_erl_time_domain", ErlTimeDomain());
+  data_dumper_->DumpRaw("aec3_erle", Erle(/*onset_compensated=*/false)[0]);
+  data_dumper_->DumpRaw("aec3_erle_onset_compensated",
+                        Erle(/*onset_compensated=*/true)[0]);
+  data_dumper_->DumpRaw("aec3_usable_linear_estimate", UsableLinearEstimate());
+  data_dumper_->DumpRaw("aec3_transparent_mode", TransparentModeActive());
+  data_dumper_->DumpRaw("aec3_filter_delay",
+                        filter_analyzer_.MinFilterDelayBlocks());
+
+  data_dumper_->DumpRaw("aec3_any_filter_consistent", any_filter_consistent);
+  data_dumper_->DumpRaw("aec3_initial_state",
+                        initial_state_.InitialStateActive());
+  data_dumper_->DumpRaw("aec3_capture_saturation", SaturatedCapture());
+  data_dumper_->DumpRaw("aec3_echo_saturation", SaturatedEcho());
+  data_dumper_->DumpRaw("aec3_any_filter_converged", any_filter_converged);
+  data_dumper_->DumpRaw("aec3_any_coarse_filter_converged",
+                        any_coarse_filter_converged);
+  data_dumper_->DumpRaw("aec3_all_filters_diverged", all_filters_diverged);
+
+  data_dumper_->DumpRaw("aec3_external_delay_avaliable",
+                        external_delay ? 1 : 0);
+  data_dumper_->DumpRaw("aec3_filter_tail_freq_resp_est",
+                        GetReverbFrequencyResponse());
+  data_dumper_->DumpRaw("aec3_subtractor_y2", subtractor_output[0].y2);
+  data_dumper_->DumpRaw("aec3_subtractor_e2_coarse",
+                        subtractor_output[0].e2_coarse);
+  data_dumper_->DumpRaw("aec3_subtractor_e2_refined",
+                        subtractor_output[0].e2_refined);
+}
+
+AecState::InitialState::InitialState(const EchoCanceller3Config& config)
+    : conservative_initial_phase_(config.filter.conservative_initial_phase),
+      initial_state_seconds_(config.filter.initial_state_seconds) {
+  Reset();
+}
+void AecState::InitialState::InitialState::Reset() {
+  initial_state_ = true;
+  strong_not_saturated_render_blocks_ = 0;
+}
+void AecState::InitialState::InitialState::Update(bool active_render,
+                                                  bool saturated_capture) {
+  strong_not_saturated_render_blocks_ +=
+      active_render && !saturated_capture ? 1 : 0;
+
+  // Flag whether the initial state is still active.
+  bool prev_initial_state = initial_state_;
+  if (conservative_initial_phase_) {
+    initial_state_ =
+        strong_not_saturated_render_blocks_ < 5 * kNumBlocksPerSecond;
+  } else {
+    initial_state_ = strong_not_saturated_render_blocks_ <
+                     initial_state_seconds_ * kNumBlocksPerSecond;
+  }
+
+  // Flag whether the transition from the initial state has started.
+  transition_triggered_ = !initial_state_ && prev_initial_state;
+}
+
+AecState::FilterDelay::FilterDelay(const EchoCanceller3Config& config,
+                                   size_t num_capture_channels)
+    : delay_headroom_blocks_(config.delay.delay_headroom_samples / kBlockSize),
+      filter_delays_blocks_(num_capture_channels, delay_headroom_blocks_),
+      min_filter_delay_(delay_headroom_blocks_) {}
+
+void AecState::FilterDelay::Update(
+    rtc::ArrayView<const int> analyzer_filter_delay_estimates_blocks,
+    const absl::optional<DelayEstimate>& external_delay,
+    size_t blocks_with_proper_filter_adaptation) {
+  // Update the delay based on the external delay.
+  if (external_delay &&
+      (!external_delay_ || external_delay_->delay != external_delay->delay)) {
+    external_delay_ = external_delay;
+    external_delay_reported_ = true;
+  }
+
+  // Override the estimated delay if it is not certain that the filter has had
+  // time to converge.
+  const bool delay_estimator_may_not_have_converged =
+      blocks_with_proper_filter_adaptation < 2 * kNumBlocksPerSecond;
+  if (delay_estimator_may_not_have_converged && external_delay_) {
+    const int delay_guess = delay_headroom_blocks_;
+    std::fill(filter_delays_blocks_.begin(), filter_delays_blocks_.end(),
+              delay_guess);
+  } else {
+    RTC_DCHECK_EQ(filter_delays_blocks_.size(),
+                  analyzer_filter_delay_estimates_blocks.size());
+    std::copy(analyzer_filter_delay_estimates_blocks.begin(),
+              analyzer_filter_delay_estimates_blocks.end(),
+              filter_delays_blocks_.begin());
+  }
+
+  min_filter_delay_ = *std::min_element(filter_delays_blocks_.begin(),
+                                        filter_delays_blocks_.end());
+}
+
+AecState::FilteringQualityAnalyzer::FilteringQualityAnalyzer(
+    const EchoCanceller3Config& config,
+    size_t num_capture_channels)
+    : use_linear_filter_(config.filter.use_linear_filter),
+      usable_linear_filter_estimates_(num_capture_channels, false) {}
+
+void AecState::FilteringQualityAnalyzer::Reset() {
+  std::fill(usable_linear_filter_estimates_.begin(),
+            usable_linear_filter_estimates_.end(), false);
+  overall_usable_linear_estimates_ = false;
+  filter_update_blocks_since_reset_ = 0;
+}
+
+void AecState::FilteringQualityAnalyzer::Update(
+    bool active_render,
+    bool transparent_mode,
+    bool saturated_capture,
+    const absl::optional<DelayEstimate>& external_delay,
+    bool any_filter_converged) {
+  // Update blocks counter.
+  const bool filter_update = active_render && !saturated_capture;
+  filter_update_blocks_since_reset_ += filter_update ? 1 : 0;
+  filter_update_blocks_since_start_ += filter_update ? 1 : 0;
+
+  // Store convergence flag when observed.
+  convergence_seen_ = convergence_seen_ || any_filter_converged;
+
+  // Verify requirements for achieving a decent filter. The requirements for
+  // filter adaptation at call startup are more restrictive than after an
+  // in-call reset.
+  const bool sufficient_data_to_converge_at_startup =
+      filter_update_blocks_since_start_ > kNumBlocksPerSecond * 0.4f;
+  const bool sufficient_data_to_converge_at_reset =
+      sufficient_data_to_converge_at_startup &&
+      filter_update_blocks_since_reset_ > kNumBlocksPerSecond * 0.2f;
+
+  // The linear filter can only be used if it has had time to converge.
+  overall_usable_linear_estimates_ = sufficient_data_to_converge_at_startup &&
+                                     sufficient_data_to_converge_at_reset;
+
+  // The linear filter can only be used if an external delay or convergence have
+  // been identified
+  overall_usable_linear_estimates_ =
+      overall_usable_linear_estimates_ && (external_delay || convergence_seen_);
+
+  // If transparent mode is on, deactivate usign the linear filter.
+  overall_usable_linear_estimates_ =
+      overall_usable_linear_estimates_ && !transparent_mode;
+
+  if (use_linear_filter_) {
+    std::fill(usable_linear_filter_estimates_.begin(),
+              usable_linear_filter_estimates_.end(),
+              overall_usable_linear_estimates_);
+  }
+}
+
+void AecState::SaturationDetector::Update(
+    rtc::ArrayView<const std::vector<float>> x,
+    bool saturated_capture,
+    bool usable_linear_estimate,
+    rtc::ArrayView<const SubtractorOutput> subtractor_output,
+    float echo_path_gain) {
+  saturated_echo_ = false;
+  if (!saturated_capture) {
+    return;
+  }
+
+  if (usable_linear_estimate) {
+    constexpr float kSaturationThreshold = 20000.f;
+    for (size_t ch = 0; ch < subtractor_output.size(); ++ch) {
+      saturated_echo_ =
+          saturated_echo_ ||
+          (subtractor_output[ch].s_refined_max_abs > kSaturationThreshold ||
+           subtractor_output[ch].s_coarse_max_abs > kSaturationThreshold);
+    }
+  } else {
+    float max_sample = 0.f;
+    for (auto& channel : x) {
+      for (float sample : channel) {
+        max_sample = std::max(max_sample, fabsf(sample));
+      }
+    }
+
+    const float kMargin = 10.f;
+    float peak_echo_amplitude = max_sample * echo_path_gain * kMargin;
+    saturated_echo_ = saturated_echo_ || peak_echo_amplitude > 32000;
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,289 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <memory>
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/delay_estimate.h"
+#include "modules/audio_processing/aec3/echo_audibility.h"
+#include "modules/audio_processing/aec3/echo_path_variability.h"
+#include "modules/audio_processing/aec3/erl_estimator.h"
+#include "modules/audio_processing/aec3/erle_estimator.h"
+#include "modules/audio_processing/aec3/filter_analyzer.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "modules/audio_processing/aec3/reverb_model_estimator.h"
+#include "modules/audio_processing/aec3/subtractor_output.h"
+#include "modules/audio_processing/aec3/subtractor_output_analyzer.h"
+#include "modules/audio_processing/aec3/transparent_mode.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+
+// Handles the state and the conditions for the echo removal functionality.
+class AecState {
+ public:
+  AecState(const EchoCanceller3Config& config, size_t num_capture_channels);
+  ~AecState();
+
+  // Returns whether the echo subtractor can be used to determine the residual
+  // echo.
+  bool UsableLinearEstimate() const {
+    return filter_quality_state_.LinearFilterUsable() &&
+           config_.filter.use_linear_filter;
+  }
+
+  // Returns whether the echo subtractor output should be used as output.
+  bool UseLinearFilterOutput() const {
+    return filter_quality_state_.LinearFilterUsable() &&
+           config_.filter.use_linear_filter;
+  }
+
+  // Returns whether the render signal is currently active.
+  bool ActiveRender() const { return blocks_with_active_render_ > 200; }
+
+  // Returns the appropriate scaling of the residual echo to match the
+  // audibility.
+  void GetResidualEchoScaling(rtc::ArrayView<float> residual_scaling) const;
+
+  // Returns whether the stationary properties of the signals are used in the
+  // aec.
+  bool UseStationarityProperties() const {
+    return config_.echo_audibility.use_stationarity_properties;
+  }
+
+  // Returns the ERLE.
+  rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Erle(
+      bool onset_compensated) const {
+    return erle_estimator_.Erle(onset_compensated);
+  }
+
+  // Returns the fullband ERLE estimate in log2 units.
+  float FullBandErleLog2() const { return erle_estimator_.FullbandErleLog2(); }
+
+  // Returns the ERL.
+  const std::array<float, kFftLengthBy2Plus1>& Erl() const {
+    return erl_estimator_.Erl();
+  }
+
+  // Returns the time-domain ERL.
+  float ErlTimeDomain() const { return erl_estimator_.ErlTimeDomain(); }
+
+  // Returns the delay estimate based on the linear filter.
+  int MinDirectPathFilterDelay() const {
+    return delay_state_.MinDirectPathFilterDelay();
+  }
+
+  // Returns whether the capture signal is saturated.
+  bool SaturatedCapture() const { return capture_signal_saturation_; }
+
+  // Returns whether the echo signal is saturated.
+  bool SaturatedEcho() const { return saturation_detector_.SaturatedEcho(); }
+
+  // Updates the capture signal saturation.
+  void UpdateCaptureSaturation(bool capture_signal_saturation) {
+    capture_signal_saturation_ = capture_signal_saturation;
+  }
+
+  // Returns whether the transparent mode is active
+  bool TransparentModeActive() const {
+    return transparent_state_ && transparent_state_->Active();
+  }
+
+  // Takes appropriate action at an echo path change.
+  void HandleEchoPathChange(const EchoPathVariability& echo_path_variability);
+
+  // Returns the decay factor for the echo reverberation.
+  float ReverbDecay() const { return reverb_model_estimator_.ReverbDecay(); }
+
+  // Return the frequency response of the reverberant echo.
+  rtc::ArrayView<const float> GetReverbFrequencyResponse() const {
+    return reverb_model_estimator_.GetReverbFrequencyResponse();
+  }
+
+  // Returns whether the transition for going out of the initial stated has
+  // been triggered.
+  bool TransitionTriggered() const {
+    return initial_state_.TransitionTriggered();
+  }
+
+  // Updates the aec state.
+  // TODO(bugs.webrtc.org/10913): Compute multi-channel ERL.
+  void Update(
+      const absl::optional<DelayEstimate>& external_delay,
+      rtc::ArrayView<const std::vector<std::array<float, kFftLengthBy2Plus1>>>
+          adaptive_filter_frequency_responses,
+      rtc::ArrayView<const std::vector<float>>
+          adaptive_filter_impulse_responses,
+      const RenderBuffer& render_buffer,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> E2_refined,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+      rtc::ArrayView<const SubtractorOutput> subtractor_output);
+
+  // Returns filter length in blocks.
+  int FilterLengthBlocks() const {
+    // All filters have the same length, so arbitrarily return channel 0 length.
+    return filter_analyzer_.FilterLengthBlocks();
+  }
+
+ private:
+  static int instance_count_;
+  std::unique_ptr<ApmDataDumper> data_dumper_;
+  const EchoCanceller3Config config_;
+  const size_t num_capture_channels_;
+  const bool deactivate_initial_state_reset_at_echo_path_change_;
+  const bool full_reset_at_echo_path_change_;
+  const bool subtractor_analyzer_reset_at_echo_path_change_;
+
+  // Class for controlling the transition from the intial state, which in turn
+  // controls when the filter parameters for the initial state should be used.
+  class InitialState {
+   public:
+    explicit InitialState(const EchoCanceller3Config& config);
+    // Resets the state to again begin in the initial state.
+    void Reset();
+
+    // Updates the state based on new data.
+    void Update(bool active_render, bool saturated_capture);
+
+    // Returns whether the initial state is active or not.
+    bool InitialStateActive() const { return initial_state_; }
+
+    // Returns that the transition from the initial state has was started.
+    bool TransitionTriggered() const { return transition_triggered_; }
+
+   private:
+    const bool conservative_initial_phase_;
+    const float initial_state_seconds_;
+    bool transition_triggered_ = false;
+    bool initial_state_ = true;
+    size_t strong_not_saturated_render_blocks_ = 0;
+  } initial_state_;
+
+  // Class for choosing the direct-path delay relative to the beginning of the
+  // filter, as well as any other data related to the delay used within
+  // AecState.
+  class FilterDelay {
+   public:
+    FilterDelay(const EchoCanceller3Config& config,
+                size_t num_capture_channels);
+
+    // Returns whether an external delay has been reported to the AecState (from
+    // the delay estimator).
+    bool ExternalDelayReported() const { return external_delay_reported_; }
+
+    // Returns the delay in blocks relative to the beginning of the filter that
+    // corresponds to the direct path of the echo.
+    rtc::ArrayView<const int> DirectPathFilterDelays() const {
+      return filter_delays_blocks_;
+    }
+
+    // Returns the minimum delay among the direct path delays relative to the
+    // beginning of the filter
+    int MinDirectPathFilterDelay() const { return min_filter_delay_; }
+
+    // Updates the delay estimates based on new data.
+    void Update(
+        rtc::ArrayView<const int> analyzer_filter_delay_estimates_blocks,
+        const absl::optional<DelayEstimate>& external_delay,
+        size_t blocks_with_proper_filter_adaptation);
+
+   private:
+    const int delay_headroom_blocks_;
+    bool external_delay_reported_ = false;
+    std::vector<int> filter_delays_blocks_;
+    int min_filter_delay_;
+    absl::optional<DelayEstimate> external_delay_;
+  } delay_state_;
+
+  // Classifier for toggling transparent mode when there is no echo.
+  std::unique_ptr<TransparentMode> transparent_state_;
+
+  // Class for analyzing how well the linear filter is, and can be expected to,
+  // perform on the current signals. The purpose of this is for using to
+  // select the echo suppression functionality as well as the input to the echo
+  // suppressor.
+  class FilteringQualityAnalyzer {
+   public:
+    FilteringQualityAnalyzer(const EchoCanceller3Config& config,
+                             size_t num_capture_channels);
+
+    // Returns whether the linear filter can be used for the echo
+    // canceller output.
+    bool LinearFilterUsable() const { return overall_usable_linear_estimates_; }
+
+    // Returns whether an individual filter output can be used for the echo
+    // canceller output.
+    const std::vector<bool>& UsableLinearFilterOutputs() const {
+      return usable_linear_filter_estimates_;
+    }
+
+    // Resets the state of the analyzer.
+    void Reset();
+
+    // Updates the analysis based on new data.
+    void Update(bool active_render,
+                bool transparent_mode,
+                bool saturated_capture,
+                const absl::optional<DelayEstimate>& external_delay,
+                bool any_filter_converged);
+
+   private:
+    const bool use_linear_filter_;
+    bool overall_usable_linear_estimates_ = false;
+    size_t filter_update_blocks_since_reset_ = 0;
+    size_t filter_update_blocks_since_start_ = 0;
+    bool convergence_seen_ = false;
+    std::vector<bool> usable_linear_filter_estimates_;
+  } filter_quality_state_;
+
+  // Class for detecting whether the echo is to be considered to be
+  // saturated.
+  class SaturationDetector {
+   public:
+    // Returns whether the echo is to be considered saturated.
+    bool SaturatedEcho() const { return saturated_echo_; }
+
+    // Updates the detection decision based on new data.
+    void Update(rtc::ArrayView<const std::vector<float>> x,
+                bool saturated_capture,
+                bool usable_linear_estimate,
+                rtc::ArrayView<const SubtractorOutput> subtractor_output,
+                float echo_path_gain);
+
+   private:
+    bool saturated_echo_ = false;
+  } saturation_detector_;
+
+  ErlEstimator erl_estimator_;
+  ErleEstimator erle_estimator_;
+  size_t strong_not_saturated_render_blocks_ = 0;
+  size_t blocks_with_active_render_ = 0;
+  bool capture_signal_saturation_ = false;
+  FilterAnalyzer filter_analyzer_;
+  EchoAudibility echo_audibility_;
+  ReverbModelEstimator reverb_model_estimator_;
+  ReverbModel avg_render_reverb_;
+  SubtractorOutputAnalyzer subtractor_output_analyzer_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_AEC_STATE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/aec_state_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,299 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/aec_state.h"
+
+#include "modules/audio_processing/aec3/aec3_fft.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+void RunNormalUsageTest(size_t num_render_channels,
+                        size_t num_capture_channels) {
+  // TODO(bugs.webrtc.org/10913): Test with different content in different
+  // channels.
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+  ApmDataDumper data_dumper(42);
+  EchoCanceller3Config config;
+  AecState state(config, num_capture_channels);
+  absl::optional<DelayEstimate> delay_estimate =
+      DelayEstimate(DelayEstimate::Quality::kRefined, 10);
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, kSampleRateHz, num_render_channels));
+  std::vector<std::array<float, kFftLengthBy2Plus1>> E2_refined(
+      num_capture_channels);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> Y2(num_capture_channels);
+  std::vector<std::vector<std::vector<float>>> x(
+      kNumBands, std::vector<std::vector<float>>(
+                     num_render_channels, std::vector<float>(kBlockSize, 0.f)));
+  EchoPathVariability echo_path_variability(
+      false, EchoPathVariability::DelayAdjustment::kNone, false);
+  std::vector<std::array<float, kBlockSize>> y(num_capture_channels);
+  std::vector<SubtractorOutput> subtractor_output(num_capture_channels);
+  for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+    subtractor_output[ch].Reset();
+    subtractor_output[ch].s_refined.fill(100.f);
+    subtractor_output[ch].e_refined.fill(100.f);
+    y[ch].fill(1000.f);
+    E2_refined[ch].fill(0.f);
+    Y2[ch].fill(0.f);
+  }
+  Aec3Fft fft;
+  std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>>
+  converged_filter_frequency_response(
+      num_capture_channels,
+      std::vector<std::array<float, kFftLengthBy2Plus1>>(10));
+  for (auto& v_ch : converged_filter_frequency_response) {
+    for (auto& v : v_ch) {
+      v.fill(0.01f);
+    }
+  }
+  std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>>
+      diverged_filter_frequency_response = converged_filter_frequency_response;
+  converged_filter_frequency_response[0][2].fill(100.f);
+  converged_filter_frequency_response[0][2][0] = 1.f;
+  std::vector<std::vector<float>> impulse_response(
+      num_capture_channels,
+      std::vector<float>(
+          GetTimeDomainLength(config.filter.refined.length_blocks), 0.f));
+
+  // Verify that linear AEC usability is true when the filter is converged
+  for (size_t band = 0; band < kNumBands; ++band) {
+    for (size_t ch = 0; ch < num_render_channels; ++ch) {
+      std::fill(x[band][ch].begin(), x[band][ch].end(), 101.f);
+    }
+  }
+  for (int k = 0; k < 3000; ++k) {
+    render_delay_buffer->Insert(x);
+    for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+      subtractor_output[ch].ComputeMetrics(y[ch]);
+    }
+    state.Update(delay_estimate, converged_filter_frequency_response,
+                 impulse_response, *render_delay_buffer->GetRenderBuffer(),
+                 E2_refined, Y2, subtractor_output);
+  }
+  EXPECT_TRUE(state.UsableLinearEstimate());
+
+  // Verify that linear AEC usability becomes false after an echo path
+  // change is reported
+  for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+    subtractor_output[ch].ComputeMetrics(y[ch]);
+  }
+  state.HandleEchoPathChange(EchoPathVariability(
+      false, EchoPathVariability::DelayAdjustment::kNewDetectedDelay, false));
+  state.Update(delay_estimate, converged_filter_frequency_response,
+               impulse_response, *render_delay_buffer->GetRenderBuffer(),
+               E2_refined, Y2, subtractor_output);
+  EXPECT_FALSE(state.UsableLinearEstimate());
+
+  // Verify that the active render detection works as intended.
+  for (size_t ch = 0; ch < num_render_channels; ++ch) {
+    std::fill(x[0][ch].begin(), x[0][ch].end(), 101.f);
+  }
+  render_delay_buffer->Insert(x);
+  for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+    subtractor_output[ch].ComputeMetrics(y[ch]);
+  }
+  state.HandleEchoPathChange(EchoPathVariability(
+      true, EchoPathVariability::DelayAdjustment::kNewDetectedDelay, false));
+  state.Update(delay_estimate, converged_filter_frequency_response,
+               impulse_response, *render_delay_buffer->GetRenderBuffer(),
+               E2_refined, Y2, subtractor_output);
+  EXPECT_FALSE(state.ActiveRender());
+
+  for (int k = 0; k < 1000; ++k) {
+    render_delay_buffer->Insert(x);
+    for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+      subtractor_output[ch].ComputeMetrics(y[ch]);
+    }
+    state.Update(delay_estimate, converged_filter_frequency_response,
+                 impulse_response, *render_delay_buffer->GetRenderBuffer(),
+                 E2_refined, Y2, subtractor_output);
+  }
+  EXPECT_TRUE(state.ActiveRender());
+
+  // Verify that the ERL is properly estimated
+  for (auto& band : x) {
+    for (auto& channel : band) {
+      channel = std::vector<float>(kBlockSize, 0.f);
+    }
+  }
+
+  for (size_t ch = 0; ch < num_render_channels; ++ch) {
+    x[0][ch][0] = 5000.f;
+  }
+  for (size_t k = 0;
+       k < render_delay_buffer->GetRenderBuffer()->GetFftBuffer().size(); ++k) {
+    render_delay_buffer->Insert(x);
+    if (k == 0) {
+      render_delay_buffer->Reset();
+    }
+    render_delay_buffer->PrepareCaptureProcessing();
+  }
+
+  for (auto& Y2_ch : Y2) {
+    Y2_ch.fill(10.f * 10000.f * 10000.f);
+  }
+  for (size_t k = 0; k < 1000; ++k) {
+    for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+      subtractor_output[ch].ComputeMetrics(y[ch]);
+    }
+    state.Update(delay_estimate, converged_filter_frequency_response,
+                 impulse_response, *render_delay_buffer->GetRenderBuffer(),
+                 E2_refined, Y2, subtractor_output);
+  }
+
+  ASSERT_TRUE(state.UsableLinearEstimate());
+  const std::array<float, kFftLengthBy2Plus1>& erl = state.Erl();
+  EXPECT_EQ(erl[0], erl[1]);
+  for (size_t k = 1; k < erl.size() - 1; ++k) {
+    EXPECT_NEAR(k % 2 == 0 ? 10.f : 1000.f, erl[k], 0.1);
+  }
+  EXPECT_EQ(erl[erl.size() - 2], erl[erl.size() - 1]);
+
+  // Verify that the ERLE is properly estimated
+  for (auto& E2_refined_ch : E2_refined) {
+    E2_refined_ch.fill(1.f * 10000.f * 10000.f);
+  }
+  for (auto& Y2_ch : Y2) {
+    Y2_ch.fill(10.f * E2_refined[0][0]);
+  }
+  for (size_t k = 0; k < 1000; ++k) {
+    for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+      subtractor_output[ch].ComputeMetrics(y[ch]);
+    }
+    state.Update(delay_estimate, converged_filter_frequency_response,
+                 impulse_response, *render_delay_buffer->GetRenderBuffer(),
+                 E2_refined, Y2, subtractor_output);
+  }
+  ASSERT_TRUE(state.UsableLinearEstimate());
+  {
+    // Note that the render spectrum is built so it does not have energy in
+    // the odd bands but just in the even bands.
+    const auto& erle = state.Erle(/*onset_compensated=*/true)[0];
+    EXPECT_EQ(erle[0], erle[1]);
+    constexpr size_t kLowFrequencyLimit = 32;
+    for (size_t k = 2; k < kLowFrequencyLimit; k = k + 2) {
+      EXPECT_NEAR(4.f, erle[k], 0.1);
+    }
+    for (size_t k = kLowFrequencyLimit; k < erle.size() - 1; k = k + 2) {
+      EXPECT_NEAR(1.5f, erle[k], 0.1);
+    }
+    EXPECT_EQ(erle[erle.size() - 2], erle[erle.size() - 1]);
+  }
+  for (auto& E2_refined_ch : E2_refined) {
+    E2_refined_ch.fill(1.f * 10000.f * 10000.f);
+  }
+  for (auto& Y2_ch : Y2) {
+    Y2_ch.fill(5.f * E2_refined[0][0]);
+  }
+  for (size_t k = 0; k < 1000; ++k) {
+    for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+      subtractor_output[ch].ComputeMetrics(y[ch]);
+    }
+    state.Update(delay_estimate, converged_filter_frequency_response,
+                 impulse_response, *render_delay_buffer->GetRenderBuffer(),
+                 E2_refined, Y2, subtractor_output);
+  }
+
+  ASSERT_TRUE(state.UsableLinearEstimate());
+  {
+    const auto& erle = state.Erle(/*onset_compensated=*/true)[0];
+    EXPECT_EQ(erle[0], erle[1]);
+    constexpr size_t kLowFrequencyLimit = 32;
+    for (size_t k = 1; k < kLowFrequencyLimit; ++k) {
+      EXPECT_NEAR(k % 2 == 0 ? 4.f : 1.f, erle[k], 0.1);
+    }
+    for (size_t k = kLowFrequencyLimit; k < erle.size() - 1; ++k) {
+      EXPECT_NEAR(k % 2 == 0 ? 1.5f : 1.f, erle[k], 0.1);
+    }
+    EXPECT_EQ(erle[erle.size() - 2], erle[erle.size() - 1]);
+  }
+}
+
+}  // namespace
+
+class AecStateMultiChannel
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<std::tuple<size_t, size_t>> {};
+
+INSTANTIATE_TEST_SUITE_P(MultiChannel,
+                         AecStateMultiChannel,
+                         ::testing::Combine(::testing::Values(1, 2, 8),
+                                            ::testing::Values(1, 2, 8)));
+
+// Verify the general functionality of AecState
+TEST_P(AecStateMultiChannel, NormalUsage) {
+  const size_t num_render_channels = std::get<0>(GetParam());
+  const size_t num_capture_channels = std::get<1>(GetParam());
+  RunNormalUsageTest(num_render_channels, num_capture_channels);
+}
+
+// Verifies the delay for a converged filter is correctly identified.
+TEST(AecState, ConvergedFilterDelay) {
+  constexpr int kFilterLengthBlocks = 10;
+  constexpr size_t kNumCaptureChannels = 1;
+  EchoCanceller3Config config;
+  AecState state(config, kNumCaptureChannels);
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, 48000, 1));
+  absl::optional<DelayEstimate> delay_estimate;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> E2_refined(
+      kNumCaptureChannels);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> Y2(kNumCaptureChannels);
+  std::array<float, kBlockSize> x;
+  EchoPathVariability echo_path_variability(
+      false, EchoPathVariability::DelayAdjustment::kNone, false);
+  std::vector<SubtractorOutput> subtractor_output(kNumCaptureChannels);
+  for (auto& output : subtractor_output) {
+    output.Reset();
+    output.s_refined.fill(100.f);
+  }
+  std::array<float, kBlockSize> y;
+  x.fill(0.f);
+  y.fill(0.f);
+
+  std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>>
+  frequency_response(
+      kNumCaptureChannels,
+      std::vector<std::array<float, kFftLengthBy2Plus1>>(kFilterLengthBlocks));
+  for (auto& v_ch : frequency_response) {
+    for (auto& v : v_ch) {
+      v.fill(0.01f);
+    }
+  }
+
+  std::vector<std::vector<float>> impulse_response(
+      kNumCaptureChannels,
+      std::vector<float>(
+          GetTimeDomainLength(config.filter.refined.length_blocks), 0.f));
+
+  // Verify that the filter delay for a converged filter is properly
+  // identified.
+  for (int k = 0; k < kFilterLengthBlocks; ++k) {
+    for (auto& ir : impulse_response) {
+      std::fill(ir.begin(), ir.end(), 0.f);
+      ir[k * kBlockSize + 1] = 1.f;
+    }
+
+    state.HandleEchoPathChange(echo_path_variability);
+    subtractor_output[0].ComputeMetrics(y);
+    state.Update(delay_estimate, frequency_response, impulse_response,
+                 *render_delay_buffer->GetRenderBuffer(), E2_refined, Y2,
+                 subtractor_output);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,160 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "modules/audio_processing/aec3/alignment_mixer.h"
+
+#include <algorithm>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+AlignmentMixer::MixingVariant ChooseMixingVariant(bool downmix,
+                                                  bool adaptive_selection,
+                                                  int num_channels) {
+  RTC_DCHECK(!(adaptive_selection && downmix));
+  RTC_DCHECK_LT(0, num_channels);
+
+  if (num_channels == 1) {
+    return AlignmentMixer::MixingVariant::kFixed;
+  }
+  if (downmix) {
+    return AlignmentMixer::MixingVariant::kDownmix;
+  }
+  if (adaptive_selection) {
+    return AlignmentMixer::MixingVariant::kAdaptive;
+  }
+  return AlignmentMixer::MixingVariant::kFixed;
+}
+
+}  // namespace
+
+AlignmentMixer::AlignmentMixer(
+    size_t num_channels,
+    const EchoCanceller3Config::Delay::AlignmentMixing& config)
+    : AlignmentMixer(num_channels,
+                     config.downmix,
+                     config.adaptive_selection,
+                     config.activity_power_threshold,
+                     config.prefer_first_two_channels) {}
+
+AlignmentMixer::AlignmentMixer(size_t num_channels,
+                               bool downmix,
+                               bool adaptive_selection,
+                               float activity_power_threshold,
+                               bool prefer_first_two_channels)
+    : num_channels_(num_channels),
+      one_by_num_channels_(1.f / num_channels_),
+      excitation_energy_threshold_(kBlockSize * activity_power_threshold),
+      prefer_first_two_channels_(prefer_first_two_channels),
+      selection_variant_(
+          ChooseMixingVariant(downmix, adaptive_selection, num_channels_)) {
+  if (selection_variant_ == MixingVariant::kAdaptive) {
+    std::fill(strong_block_counters_.begin(), strong_block_counters_.end(), 0);
+    cumulative_energies_.resize(num_channels_);
+    std::fill(cumulative_energies_.begin(), cumulative_energies_.end(), 0.f);
+  }
+}
+
+void AlignmentMixer::ProduceOutput(rtc::ArrayView<const std::vector<float>> x,
+                                   rtc::ArrayView<float, kBlockSize> y) {
+  RTC_DCHECK_EQ(x.size(), num_channels_);
+  if (selection_variant_ == MixingVariant::kDownmix) {
+    Downmix(x, y);
+    return;
+  }
+
+  int ch = selection_variant_ == MixingVariant::kFixed ? 0 : SelectChannel(x);
+
+  RTC_DCHECK_GE(x.size(), ch);
+  std::copy(x[ch].begin(), x[ch].end(), y.begin());
+}
+
+void AlignmentMixer::Downmix(rtc::ArrayView<const std::vector<float>> x,
+                             rtc::ArrayView<float, kBlockSize> y) const {
+  RTC_DCHECK_EQ(x.size(), num_channels_);
+  RTC_DCHECK_GE(num_channels_, 2);
+  std::copy(x[0].begin(), x[0].end(), y.begin());
+  for (size_t ch = 1; ch < num_channels_; ++ch) {
+    for (size_t i = 0; i < kBlockSize; ++i) {
+      y[i] += x[ch][i];
+    }
+  }
+
+  for (size_t i = 0; i < kBlockSize; ++i) {
+    y[i] *= one_by_num_channels_;
+  }
+}
+
+int AlignmentMixer::SelectChannel(rtc::ArrayView<const std::vector<float>> x) {
+  RTC_DCHECK_EQ(x.size(), num_channels_);
+  RTC_DCHECK_GE(num_channels_, 2);
+  RTC_DCHECK_EQ(cumulative_energies_.size(), num_channels_);
+
+  constexpr size_t kBlocksToChooseLeftOrRight =
+      static_cast<size_t>(0.5f * kNumBlocksPerSecond);
+  const bool good_signal_in_left_or_right =
+      prefer_first_two_channels_ &&
+      (strong_block_counters_[0] > kBlocksToChooseLeftOrRight ||
+       strong_block_counters_[1] > kBlocksToChooseLeftOrRight);
+
+  const int num_ch_to_analyze =
+      good_signal_in_left_or_right ? 2 : num_channels_;
+
+  constexpr int kNumBlocksBeforeEnergySmoothing = 60 * kNumBlocksPerSecond;
+  ++block_counter_;
+
+  for (int ch = 0; ch < num_ch_to_analyze; ++ch) {
+    RTC_DCHECK_EQ(x[ch].size(), kBlockSize);
+    float x2_sum = 0.f;
+    for (size_t i = 0; i < kBlockSize; ++i) {
+      x2_sum += x[ch][i] * x[ch][i];
+    }
+
+    if (ch < 2 && x2_sum > excitation_energy_threshold_) {
+      ++strong_block_counters_[ch];
+    }
+
+    if (block_counter_ <= kNumBlocksBeforeEnergySmoothing) {
+      cumulative_energies_[ch] += x2_sum;
+    } else {
+      constexpr float kSmoothing = 1.f / (10 * kNumBlocksPerSecond);
+      cumulative_energies_[ch] +=
+          kSmoothing * (x2_sum - cumulative_energies_[ch]);
+    }
+  }
+
+  // Normalize the energies to allow the energy computations to from now be
+  // based on smoothing.
+  if (block_counter_ == kNumBlocksBeforeEnergySmoothing) {
+    constexpr float kOneByNumBlocksBeforeEnergySmoothing =
+        1.f / kNumBlocksBeforeEnergySmoothing;
+    for (int ch = 0; ch < num_ch_to_analyze; ++ch) {
+      cumulative_energies_[ch] *= kOneByNumBlocksBeforeEnergySmoothing;
+    }
+  }
+
+  int strongest_ch = 0;
+  for (int ch = 0; ch < num_ch_to_analyze; ++ch) {
+    if (cumulative_energies_[ch] > cumulative_energies_[strongest_ch]) {
+      strongest_ch = ch;
+    }
+  }
+
+  if ((good_signal_in_left_or_right && selected_channel_ > 1) ||
+      cumulative_energies_[strongest_ch] >
+          2.f * cumulative_energies_[selected_channel_]) {
+    selected_channel_ = strongest_ch;
+  }
+
+  return selected_channel_;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_ALIGNMENT_MIXER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_ALIGNMENT_MIXER_H_
+
+#include <vector>
+
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+
+namespace webrtc {
+
+// Performs channel conversion to mono for the purpose of providing a decent
+// mono input for the delay estimation. This is achieved by analyzing all
+// incoming channels and produce one single channel output.
+class AlignmentMixer {
+ public:
+  AlignmentMixer(size_t num_channels,
+                 const EchoCanceller3Config::Delay::AlignmentMixing& config);
+
+  AlignmentMixer(size_t num_channels,
+                 bool downmix,
+                 bool adaptive_selection,
+                 float excitation_limit,
+                 bool prefer_first_two_channels);
+
+  void ProduceOutput(rtc::ArrayView<const std::vector<float>> x,
+                     rtc::ArrayView<float, kBlockSize> y);
+
+  enum class MixingVariant { kDownmix, kAdaptive, kFixed };
+
+ private:
+  const size_t num_channels_;
+  const float one_by_num_channels_;
+  const float excitation_energy_threshold_;
+  const bool prefer_first_two_channels_;
+  const MixingVariant selection_variant_;
+  std::array<size_t, 2> strong_block_counters_;
+  std::vector<float> cumulative_energies_;
+  int selected_channel_ = 0;
+  size_t block_counter_ = 0;
+
+  void Downmix(const rtc::ArrayView<const std::vector<float>> x,
+               rtc::ArrayView<float, kBlockSize> y) const;
+  int SelectChannel(rtc::ArrayView<const std::vector<float>> x);
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_ALIGNMENT_MIXER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/alignment_mixer_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,196 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/alignment_mixer.h"
+
+#include <string>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
+
+using ::testing::AllOf;
+using ::testing::Each;
+
+namespace webrtc {
+namespace {
+std::string ProduceDebugText(bool initial_silence,
+                             bool huge_activity_threshold,
+                             bool prefer_first_two_channels,
+                             int num_channels,
+                             int strongest_ch) {
+  rtc::StringBuilder ss;
+  ss << ", Initial silence: " << initial_silence;
+  ss << ", Huge activity threshold: " << huge_activity_threshold;
+  ss << ", Prefer first two channels: " << prefer_first_two_channels;
+  ss << ", Number of channels: " << num_channels;
+  ss << ", Strongest channel: " << strongest_ch;
+  return ss.Release();
+}
+
+}  // namespace
+
+TEST(AlignmentMixer, GeneralAdaptiveMode) {
+  constexpr int kChannelOffset = 100;
+  constexpr int kMaxChannelsToTest = 8;
+  constexpr float kStrongestSignalScaling =
+      kMaxChannelsToTest * kChannelOffset * 100;
+
+  for (bool initial_silence : {false, true}) {
+    for (bool huge_activity_threshold : {false, true}) {
+      for (bool prefer_first_two_channels : {false, true}) {
+        for (int num_channels = 2; num_channels < 8; ++num_channels) {
+          for (int strongest_ch = 0; strongest_ch < num_channels;
+               ++strongest_ch) {
+            SCOPED_TRACE(ProduceDebugText(
+                initial_silence, huge_activity_threshold,
+                prefer_first_two_channels, num_channels, strongest_ch));
+            const float excitation_limit =
+                huge_activity_threshold ? 1000000000.f : 0.001f;
+            AlignmentMixer am(num_channels, /*downmix*/ false,
+                              /*adaptive_selection*/ true, excitation_limit,
+                              prefer_first_two_channels);
+
+            std::vector<std::vector<float>> x(
+                num_channels, std::vector<float>(kBlockSize, 0.f));
+            if (initial_silence) {
+              for (int ch = 0; ch < num_channels; ++ch) {
+                std::fill(x[ch].begin(), x[ch].end(), 0.f);
+              }
+              std::array<float, kBlockSize> y;
+              for (int frame = 0; frame < 10 * kNumBlocksPerSecond; ++frame) {
+                am.ProduceOutput(x, y);
+              }
+            }
+
+            for (int frame = 0; frame < 2 * kNumBlocksPerSecond; ++frame) {
+              const auto channel_value = [&](int frame_index,
+                                             int channel_index) {
+                return static_cast<float>(frame_index +
+                                          channel_index * kChannelOffset);
+              };
+
+              for (int ch = 0; ch < num_channels; ++ch) {
+                float scaling =
+                    ch == strongest_ch ? kStrongestSignalScaling : 1.f;
+                std::fill(x[ch].begin(), x[ch].end(),
+                          channel_value(frame, ch) * scaling);
+              }
+
+              std::array<float, kBlockSize> y;
+              y.fill(-1.f);
+              am.ProduceOutput(x, y);
+
+              if (frame > 1 * kNumBlocksPerSecond) {
+                if (!prefer_first_two_channels || huge_activity_threshold) {
+                  EXPECT_THAT(y, AllOf(Each(x[strongest_ch][0])));
+                } else {
+                  bool left_or_right_chosen;
+                  for (int ch = 0; ch < 2; ++ch) {
+                    left_or_right_chosen = true;
+                    for (size_t k = 0; k < kBlockSize; ++k) {
+                      if (y[k] != x[ch][k]) {
+                        left_or_right_chosen = false;
+                        break;
+                      }
+                    }
+                    if (left_or_right_chosen) {
+                      break;
+                    }
+                  }
+                  EXPECT_TRUE(left_or_right_chosen);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+TEST(AlignmentMixer, DownmixMode) {
+  for (int num_channels = 1; num_channels < 8; ++num_channels) {
+    AlignmentMixer am(num_channels, /*downmix*/ true,
+                      /*adaptive_selection*/ false, /*excitation_limit*/ 1.f,
+                      /*prefer_first_two_channels*/ false);
+
+    std::vector<std::vector<float>> x(num_channels,
+                                      std::vector<float>(kBlockSize, 0.f));
+    const auto channel_value = [](int frame_index, int channel_index) {
+      return static_cast<float>(frame_index + channel_index);
+    };
+    for (int frame = 0; frame < 10; ++frame) {
+      for (int ch = 0; ch < num_channels; ++ch) {
+        std::fill(x[ch].begin(), x[ch].end(), channel_value(frame, ch));
+      }
+
+      std::array<float, kBlockSize> y;
+      y.fill(-1.f);
+      am.ProduceOutput(x, y);
+
+      float expected_mixed_value = 0.f;
+      for (int ch = 0; ch < num_channels; ++ch) {
+        expected_mixed_value += channel_value(frame, ch);
+      }
+      expected_mixed_value *= 1.f / num_channels;
+
+      EXPECT_THAT(y, AllOf(Each(expected_mixed_value)));
+    }
+  }
+}
+
+TEST(AlignmentMixer, FixedMode) {
+  for (int num_channels = 1; num_channels < 8; ++num_channels) {
+    AlignmentMixer am(num_channels, /*downmix*/ false,
+                      /*adaptive_selection*/ false, /*excitation_limit*/ 1.f,
+                      /*prefer_first_two_channels*/ false);
+
+    std::vector<std::vector<float>> x(num_channels,
+                                      std::vector<float>(kBlockSize, 0.f));
+    const auto channel_value = [](int frame_index, int channel_index) {
+      return static_cast<float>(frame_index + channel_index);
+    };
+    for (int frame = 0; frame < 10; ++frame) {
+      for (int ch = 0; ch < num_channels; ++ch) {
+        std::fill(x[ch].begin(), x[ch].end(), channel_value(frame, ch));
+      }
+
+      std::array<float, kBlockSize> y;
+      y.fill(-1.f);
+      am.ProduceOutput(x, y);
+      EXPECT_THAT(y, AllOf(Each(x[0][0])));
+    }
+  }
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+TEST(AlignmentMixerDeathTest, ZeroNumChannels) {
+  EXPECT_DEATH(
+      AlignmentMixer(/*num_channels*/ 0, /*downmix*/ false,
+                     /*adaptive_selection*/ false, /*excitation_limit*/ 1.f,
+                     /*prefer_first_two_channels*/ false);
+      , "");
+}
+
+TEST(AlignmentMixerDeathTest, IncorrectVariant) {
+  EXPECT_DEATH(
+      AlignmentMixer(/*num_channels*/ 1, /*downmix*/ true,
+                     /*adaptive_selection*/ true, /*excitation_limit*/ 1.f,
+                     /*prefer_first_two_channels*/ false);
+      , "");
+}
+
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,121 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/api_call_jitter_metrics.h"
+
+#include <algorithm>
+#include <limits>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "system_wrappers/include/metrics.h"
+
+namespace webrtc {
+namespace {
+
+bool TimeToReportMetrics(int frames_since_last_report) {
+  constexpr int kNumFramesPerSecond = 100;
+  constexpr int kReportingIntervalFrames = 10 * kNumFramesPerSecond;
+  return frames_since_last_report == kReportingIntervalFrames;
+}
+
+}  // namespace
+
+ApiCallJitterMetrics::Jitter::Jitter()
+    : max_(0), min_(std::numeric_limits<int>::max()) {}
+
+void ApiCallJitterMetrics::Jitter::Update(int num_api_calls_in_a_row) {
+  min_ = std::min(min_, num_api_calls_in_a_row);
+  max_ = std::max(max_, num_api_calls_in_a_row);
+}
+
+void ApiCallJitterMetrics::Jitter::Reset() {
+  min_ = std::numeric_limits<int>::max();
+  max_ = 0;
+}
+
+void ApiCallJitterMetrics::Reset() {
+  render_jitter_.Reset();
+  capture_jitter_.Reset();
+  num_api_calls_in_a_row_ = 0;
+  frames_since_last_report_ = 0;
+  last_call_was_render_ = false;
+  proper_call_observed_ = false;
+}
+
+void ApiCallJitterMetrics::ReportRenderCall() {
+  if (!last_call_was_render_) {
+    // If the previous call was a capture and a proper call has been observed
+    // (containing both render and capture data), storing the last number of
+    // capture calls into the metrics.
+    if (proper_call_observed_) {
+      capture_jitter_.Update(num_api_calls_in_a_row_);
+    }
+
+    // Reset the call counter to start counting render calls.
+    num_api_calls_in_a_row_ = 0;
+  }
+  ++num_api_calls_in_a_row_;
+  last_call_was_render_ = true;
+}
+
+void ApiCallJitterMetrics::ReportCaptureCall() {
+  if (last_call_was_render_) {
+    // If the previous call was a render and a proper call has been observed
+    // (containing both render and capture data), storing the last number of
+    // render calls into the metrics.
+    if (proper_call_observed_) {
+      render_jitter_.Update(num_api_calls_in_a_row_);
+    }
+    // Reset the call counter to start counting capture calls.
+    num_api_calls_in_a_row_ = 0;
+
+    // If this statement is reached, at least one render and one capture call
+    // have been observed.
+    proper_call_observed_ = true;
+  }
+  ++num_api_calls_in_a_row_;
+  last_call_was_render_ = false;
+
+  // Only report and update jitter metrics for when a proper call, containing
+  // both render and capture data, has been observed.
+  if (proper_call_observed_ &&
+      TimeToReportMetrics(++frames_since_last_report_)) {
+    // Report jitter, where the base basic unit is frames.
+    constexpr int kMaxJitterToReport = 50;
+
+    // Report max and min jitter for render and capture, in units of 20 ms.
+    RTC_HISTOGRAM_COUNTS_LINEAR(
+        "WebRTC.Audio.EchoCanceller.MaxRenderJitter",
+        std::min(kMaxJitterToReport, render_jitter().max()), 1,
+        kMaxJitterToReport, kMaxJitterToReport);
+    RTC_HISTOGRAM_COUNTS_LINEAR(
+        "WebRTC.Audio.EchoCanceller.MinRenderJitter",
+        std::min(kMaxJitterToReport, render_jitter().min()), 1,
+        kMaxJitterToReport, kMaxJitterToReport);
+
+    RTC_HISTOGRAM_COUNTS_LINEAR(
+        "WebRTC.Audio.EchoCanceller.MaxCaptureJitter",
+        std::min(kMaxJitterToReport, capture_jitter().max()), 1,
+        kMaxJitterToReport, kMaxJitterToReport);
+    RTC_HISTOGRAM_COUNTS_LINEAR(
+        "WebRTC.Audio.EchoCanceller.MinCaptureJitter",
+        std::min(kMaxJitterToReport, capture_jitter().min()), 1,
+        kMaxJitterToReport, kMaxJitterToReport);
+
+    frames_since_last_report_ = 0;
+    Reset();
+  }
+}
+
+bool ApiCallJitterMetrics::WillReportMetricsAtNextCapture() const {
+  return TimeToReportMetrics(frames_since_last_report_ + 1);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_API_CALL_JITTER_METRICS_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_API_CALL_JITTER_METRICS_H_
+
+namespace webrtc {
+
+// Stores data for reporting metrics on the API call jitter.
+class ApiCallJitterMetrics {
+ public:
+  class Jitter {
+   public:
+    Jitter();
+    void Update(int num_api_calls_in_a_row);
+    void Reset();
+
+    int min() const { return min_; }
+    int max() const { return max_; }
+
+   private:
+    int max_;
+    int min_;
+  };
+
+  ApiCallJitterMetrics() { Reset(); }
+
+  // Update metrics for render API call.
+  void ReportRenderCall();
+
+  // Update and periodically report metrics for capture API call.
+  void ReportCaptureCall();
+
+  // Methods used only for testing.
+  const Jitter& render_jitter() const { return render_jitter_; }
+  const Jitter& capture_jitter() const { return capture_jitter_; }
+  bool WillReportMetricsAtNextCapture() const;
+
+ private:
+  void Reset();
+
+  Jitter render_jitter_;
+  Jitter capture_jitter_;
+
+  int num_api_calls_in_a_row_ = 0;
+  int frames_since_last_report_ = 0;
+  bool last_call_was_render_ = false;
+  bool proper_call_observed_ = false;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_API_CALL_JITTER_METRICS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/api_call_jitter_metrics_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,109 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/api_call_jitter_metrics.h"
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+// Verify constant jitter.
+TEST(ApiCallJitterMetrics, ConstantJitter) {
+  for (int jitter = 1; jitter < 20; ++jitter) {
+    ApiCallJitterMetrics metrics;
+    for (size_t k = 0; k < 30 * kNumBlocksPerSecond; ++k) {
+      for (int j = 0; j < jitter; ++j) {
+        metrics.ReportRenderCall();
+      }
+
+      for (int j = 0; j < jitter; ++j) {
+        metrics.ReportCaptureCall();
+
+        if (metrics.WillReportMetricsAtNextCapture()) {
+          EXPECT_EQ(jitter, metrics.render_jitter().min());
+          EXPECT_EQ(jitter, metrics.render_jitter().max());
+          EXPECT_EQ(jitter, metrics.capture_jitter().min());
+          EXPECT_EQ(jitter, metrics.capture_jitter().max());
+        }
+      }
+    }
+  }
+}
+
+// Verify peaky jitter for the render.
+TEST(ApiCallJitterMetrics, JitterPeakRender) {
+  constexpr int kMinJitter = 2;
+  constexpr int kJitterPeak = 10;
+  constexpr int kPeakInterval = 100;
+
+  ApiCallJitterMetrics metrics;
+  int render_surplus = 0;
+
+  for (size_t k = 0; k < 30 * kNumBlocksPerSecond; ++k) {
+    const int num_render_calls =
+        k % kPeakInterval == 0 ? kJitterPeak : kMinJitter;
+    for (int j = 0; j < num_render_calls; ++j) {
+      metrics.ReportRenderCall();
+      ++render_surplus;
+    }
+
+    ASSERT_LE(kMinJitter, render_surplus);
+    const int num_capture_calls =
+        render_surplus == kMinJitter ? kMinJitter : kMinJitter + 1;
+    for (int j = 0; j < num_capture_calls; ++j) {
+      metrics.ReportCaptureCall();
+
+      if (metrics.WillReportMetricsAtNextCapture()) {
+        EXPECT_EQ(kMinJitter, metrics.render_jitter().min());
+        EXPECT_EQ(kJitterPeak, metrics.render_jitter().max());
+        EXPECT_EQ(kMinJitter, metrics.capture_jitter().min());
+        EXPECT_EQ(kMinJitter + 1, metrics.capture_jitter().max());
+      }
+      --render_surplus;
+    }
+  }
+}
+
+// Verify peaky jitter for the capture.
+TEST(ApiCallJitterMetrics, JitterPeakCapture) {
+  constexpr int kMinJitter = 2;
+  constexpr int kJitterPeak = 10;
+  constexpr int kPeakInterval = 100;
+
+  ApiCallJitterMetrics metrics;
+  int capture_surplus = kMinJitter;
+
+  for (size_t k = 0; k < 30 * kNumBlocksPerSecond; ++k) {
+    ASSERT_LE(kMinJitter, capture_surplus);
+    const int num_render_calls =
+        capture_surplus == kMinJitter ? kMinJitter : kMinJitter + 1;
+    for (int j = 0; j < num_render_calls; ++j) {
+      metrics.ReportRenderCall();
+      --capture_surplus;
+    }
+
+    const int num_capture_calls =
+        k % kPeakInterval == 0 ? kJitterPeak : kMinJitter;
+    for (int j = 0; j < num_capture_calls; ++j) {
+      metrics.ReportCaptureCall();
+
+      if (metrics.WillReportMetricsAtNextCapture()) {
+        EXPECT_EQ(kMinJitter, metrics.render_jitter().min());
+        EXPECT_EQ(kMinJitter + 1, metrics.render_jitter().max());
+        EXPECT_EQ(kMinJitter, metrics.capture_jitter().min());
+        EXPECT_EQ(kJitterPeak, metrics.capture_jitter().max());
+      }
+      ++capture_surplus;
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_buffer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_buffer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_buffer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_buffer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/block_buffer.h"
+
+#include <algorithm>
+
+namespace webrtc {
+
+BlockBuffer::BlockBuffer(size_t size,
+                         size_t num_bands,
+                         size_t num_channels,
+                         size_t frame_length)
+    : size(static_cast<int>(size)),
+      buffer(size,
+             std::vector<std::vector<std::vector<float>>>(
+                 num_bands,
+                 std::vector<std::vector<float>>(
+                     num_channels,
+                     std::vector<float>(frame_length, 0.f)))) {
+  for (auto& block : buffer) {
+    for (auto& band : block) {
+      for (auto& channel : band) {
+        std::fill(channel.begin(), channel.end(), 0.f);
+      }
+    }
+  }
+}
+
+BlockBuffer::~BlockBuffer() = default;
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_BUFFER_H_
+
+#include <stddef.h>
+
+#include <vector>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+// Struct for bundling a circular buffer of two dimensional vector objects
+// together with the read and write indices.
+struct BlockBuffer {
+  BlockBuffer(size_t size,
+              size_t num_bands,
+              size_t num_channels,
+              size_t frame_length);
+  ~BlockBuffer();
+
+  int IncIndex(int index) const {
+    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
+    return index < size - 1 ? index + 1 : 0;
+  }
+
+  int DecIndex(int index) const {
+    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
+    return index > 0 ? index - 1 : size - 1;
+  }
+
+  int OffsetIndex(int index, int offset) const {
+    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
+    RTC_DCHECK_GE(size, offset);
+    return (size + index + offset) % size;
+  }
+
+  void UpdateWriteIndex(int offset) { write = OffsetIndex(write, offset); }
+  void IncWriteIndex() { write = IncIndex(write); }
+  void DecWriteIndex() { write = DecIndex(write); }
+  void UpdateReadIndex(int offset) { read = OffsetIndex(read, offset); }
+  void IncReadIndex() { read = IncIndex(read); }
+  void DecReadIndex() { read = DecIndex(read); }
+
+  const int size;
+  std::vector<std::vector<std::vector<std::vector<float>>>> buffer;
+  int write = 0;
+  int read = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_BLOCK_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "modules/audio_processing/aec3/block_delay_buffer.h"
+
+#include "api/array_view.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+BlockDelayBuffer::BlockDelayBuffer(size_t num_channels,
+                                   size_t num_bands,
+                                   size_t frame_length,
+                                   size_t delay_samples)
+    : frame_length_(frame_length),
+      delay_(delay_samples),
+      buf_(num_channels,
+           std::vector<std::vector<float>>(num_bands,
+                                           std::vector<float>(delay_, 0.f))) {}
+
+BlockDelayBuffer::~BlockDelayBuffer() = default;
+
+void BlockDelayBuffer::DelaySignal(AudioBuffer* frame) {
+  RTC_DCHECK_EQ(buf_.size(), frame->num_channels());
+  if (delay_ == 0) {
+    return;
+  }
+
+  const size_t num_bands = buf_[0].size();
+  const size_t num_channels = buf_.size();
+
+  const size_t i_start = last_insert_;
+  size_t i = 0;
+  for (size_t ch = 0; ch < num_channels; ++ch) {
+    RTC_DCHECK_EQ(buf_[ch].size(), frame->num_bands());
+    RTC_DCHECK_EQ(buf_[ch].size(), num_bands);
+    rtc::ArrayView<float* const> frame_ch(frame->split_bands(ch), num_bands);
+
+    for (size_t band = 0; band < num_bands; ++band) {
+      RTC_DCHECK_EQ(delay_, buf_[ch][band].size());
+      i = i_start;
+
+      for (size_t k = 0; k < frame_length_; ++k) {
+        const float tmp = buf_[ch][band][i];
+        buf_[ch][band][i] = frame_ch[band][k];
+        frame_ch[band][k] = tmp;
+
+        i = i < delay_ - 1 ? i + 1 : 0;
+      }
+    }
+  }
+
+  last_insert_ = i;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_DELAY_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_DELAY_BUFFER_H_
+
+#include <stddef.h>
+
+#include <vector>
+
+#include "modules/audio_processing/audio_buffer.h"
+
+namespace webrtc {
+
+// Class for applying a fixed delay to the samples in a signal partitioned using
+// the audiobuffer band-splitting scheme.
+class BlockDelayBuffer {
+ public:
+  BlockDelayBuffer(size_t num_channels,
+                   size_t num_bands,
+                   size_t frame_length,
+                   size_t delay_samples);
+  ~BlockDelayBuffer();
+
+  // Delays the samples by the specified delay.
+  void DelaySignal(AudioBuffer* frame);
+
+ private:
+  const size_t frame_length_;
+  const size_t delay_;
+  std::vector<std::vector<std::vector<float>>> buf_;
+  size_t last_insert_ = 0;
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_BLOCK_DELAY_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_delay_buffer_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/block_delay_buffer.h"
+
+#include <string>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/audio_buffer.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+namespace {
+
+float SampleValue(size_t sample_index) {
+  return sample_index % 32768;
+}
+
+// Populates the frame with linearly increasing sample values for each band.
+void PopulateInputFrame(size_t frame_length,
+                        size_t num_bands,
+                        size_t first_sample_index,
+                        float* const* frame) {
+  for (size_t k = 0; k < num_bands; ++k) {
+    for (size_t i = 0; i < frame_length; ++i) {
+      frame[k][i] = SampleValue(first_sample_index + i);
+    }
+  }
+}
+
+std::string ProduceDebugText(int sample_rate_hz, size_t delay) {
+  char log_stream_buffer[8 * 1024];
+  rtc::SimpleStringBuilder ss(log_stream_buffer);
+  ss << "Sample rate: " << sample_rate_hz;
+  ss << ", Delay: " << delay;
+  return ss.str();
+}
+
+}  // namespace
+
+class BlockDelayBufferTest
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<std::tuple<size_t, int, size_t>> {};
+
+INSTANTIATE_TEST_SUITE_P(
+    ParameterCombinations,
+    BlockDelayBufferTest,
+    ::testing::Combine(::testing::Values(0, 1, 27, 160, 4321, 7021),
+                       ::testing::Values(16000, 32000, 48000),
+                       ::testing::Values(1, 2, 4)));
+
+// Verifies that the correct signal delay is achived.
+TEST_P(BlockDelayBufferTest, CorrectDelayApplied) {
+  const size_t delay = std::get<0>(GetParam());
+  const int rate = std::get<1>(GetParam());
+  const size_t num_channels = std::get<2>(GetParam());
+
+  SCOPED_TRACE(ProduceDebugText(rate, delay));
+  size_t num_bands = NumBandsForRate(rate);
+  size_t subband_frame_length = 160;
+
+  BlockDelayBuffer delay_buffer(num_channels, num_bands, subband_frame_length,
+                                delay);
+
+  static constexpr size_t kNumFramesToProcess = 20;
+  for (size_t frame_index = 0; frame_index < kNumFramesToProcess;
+       ++frame_index) {
+    AudioBuffer audio_buffer(rate, num_channels, rate, num_channels, rate,
+                             num_channels);
+    if (rate > 16000) {
+      audio_buffer.SplitIntoFrequencyBands();
+    }
+    size_t first_sample_index = frame_index * subband_frame_length;
+    for (size_t ch = 0; ch < num_channels; ++ch) {
+      PopulateInputFrame(subband_frame_length, num_bands, first_sample_index,
+                         &audio_buffer.split_bands(ch)[0]);
+    }
+    delay_buffer.DelaySignal(&audio_buffer);
+
+    for (size_t ch = 0; ch < num_channels; ++ch) {
+      for (size_t band = 0; band < num_bands; ++band) {
+        size_t sample_index = first_sample_index;
+        for (size_t i = 0; i < subband_frame_length; ++i, ++sample_index) {
+          if (sample_index < delay) {
+            EXPECT_EQ(0.f, audio_buffer.split_bands(ch)[band][i]);
+          } else {
+            EXPECT_EQ(SampleValue(sample_index - delay),
+                      audio_buffer.split_bands(ch)[band][i]);
+          }
+        }
+      }
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,86 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/block_framer.h"
+
+#include <algorithm>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+BlockFramer::BlockFramer(size_t num_bands, size_t num_channels)
+    : num_bands_(num_bands),
+      num_channels_(num_channels),
+      buffer_(num_bands_,
+              std::vector<std::vector<float>>(
+                  num_channels,
+                  std::vector<float>(kBlockSize, 0.f))) {
+  RTC_DCHECK_LT(0, num_bands);
+  RTC_DCHECK_LT(0, num_channels);
+}
+
+BlockFramer::~BlockFramer() = default;
+
+// All the constants are chosen so that the buffer is either empty or has enough
+// samples for InsertBlockAndExtractSubFrame to produce a frame. In order to
+// achieve this, the InsertBlockAndExtractSubFrame and InsertBlock methods need
+// to be called in the correct order.
+void BlockFramer::InsertBlock(
+    const std::vector<std::vector<std::vector<float>>>& block) {
+  RTC_DCHECK_EQ(num_bands_, block.size());
+  for (size_t band = 0; band < num_bands_; ++band) {
+    RTC_DCHECK_EQ(num_channels_, block[band].size());
+    for (size_t channel = 0; channel < num_channels_; ++channel) {
+      RTC_DCHECK_EQ(kBlockSize, block[band][channel].size());
+      RTC_DCHECK_EQ(0, buffer_[band][channel].size());
+
+      buffer_[band][channel].insert(buffer_[band][channel].begin(),
+                                    block[band][channel].begin(),
+                                    block[band][channel].end());
+    }
+  }
+}
+
+void BlockFramer::InsertBlockAndExtractSubFrame(
+    const std::vector<std::vector<std::vector<float>>>& block,
+    std::vector<std::vector<rtc::ArrayView<float>>>* sub_frame) {
+  RTC_DCHECK(sub_frame);
+  RTC_DCHECK_EQ(num_bands_, block.size());
+  RTC_DCHECK_EQ(num_bands_, sub_frame->size());
+  for (size_t band = 0; band < num_bands_; ++band) {
+    RTC_DCHECK_EQ(num_channels_, block[band].size());
+    RTC_DCHECK_EQ(num_channels_, (*sub_frame)[0].size());
+    for (size_t channel = 0; channel < num_channels_; ++channel) {
+      RTC_DCHECK_LE(kSubFrameLength,
+                    buffer_[band][channel].size() + kBlockSize);
+      RTC_DCHECK_EQ(kBlockSize, block[band][channel].size());
+      RTC_DCHECK_GE(kBlockSize, buffer_[band][channel].size());
+      RTC_DCHECK_EQ(kSubFrameLength, (*sub_frame)[band][channel].size());
+
+      const int samples_to_frame =
+          kSubFrameLength - buffer_[band][channel].size();
+      std::copy(buffer_[band][channel].begin(), buffer_[band][channel].end(),
+                (*sub_frame)[band][channel].begin());
+      std::copy(
+          block[band][channel].begin(),
+          block[band][channel].begin() + samples_to_frame,
+          (*sub_frame)[band][channel].begin() + buffer_[band][channel].size());
+      buffer_[band][channel].clear();
+      buffer_[band][channel].insert(
+          buffer_[band][channel].begin(),
+          block[band][channel].begin() + samples_to_frame,
+          block[band][channel].end());
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_FRAMER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_FRAMER_H_
+
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+
+namespace webrtc {
+
+// Class for producing frames consisting of 2 subframes of 80 samples each
+// from 64 sample blocks. The class is designed to work together with the
+// FrameBlocker class which performs the reverse conversion. Used together with
+// that, this class produces output frames are the same rate as frames are
+// received by the FrameBlocker class. Note that the internal buffers will
+// overrun if any other rate of packets insertion is used.
+class BlockFramer {
+ public:
+  BlockFramer(size_t num_bands, size_t num_channels);
+  ~BlockFramer();
+  BlockFramer(const BlockFramer&) = delete;
+  BlockFramer& operator=(const BlockFramer&) = delete;
+
+  // Adds a 64 sample block into the data that will form the next output frame.
+  void InsertBlock(const std::vector<std::vector<std::vector<float>>>& block);
+  // Adds a 64 sample block and extracts an 80 sample subframe.
+  void InsertBlockAndExtractSubFrame(
+      const std::vector<std::vector<std::vector<float>>>& block,
+      std::vector<std::vector<rtc::ArrayView<float>>>* sub_frame);
+
+ private:
+  const size_t num_bands_;
+  const size_t num_channels_;
+  std::vector<std::vector<std::vector<float>>> buffer_;
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_BLOCK_FRAMER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_framer_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,386 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/block_framer.h"
+
+#include <string>
+#include <vector>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+void SetupSubFrameView(
+    std::vector<std::vector<std::vector<float>>>* sub_frame,
+    std::vector<std::vector<rtc::ArrayView<float>>>* sub_frame_view) {
+  for (size_t band = 0; band < sub_frame_view->size(); ++band) {
+    for (size_t channel = 0; channel < (*sub_frame_view)[band].size();
+         ++channel) {
+      (*sub_frame_view)[band][channel] =
+          rtc::ArrayView<float>((*sub_frame)[band][channel].data(),
+                                (*sub_frame)[band][channel].size());
+    }
+  }
+}
+
+float ComputeSampleValue(size_t chunk_counter,
+                         size_t chunk_size,
+                         size_t band,
+                         size_t channel,
+                         size_t sample_index,
+                         int offset) {
+  float value = static_cast<int>(100 + chunk_counter * chunk_size +
+                                 sample_index + channel) +
+                offset;
+  return 5000 * band + value;
+}
+
+bool VerifySubFrame(
+    size_t sub_frame_counter,
+    int offset,
+    const std::vector<std::vector<rtc::ArrayView<float>>>& sub_frame_view) {
+  for (size_t band = 0; band < sub_frame_view.size(); ++band) {
+    for (size_t channel = 0; channel < sub_frame_view[band].size(); ++channel) {
+      for (size_t sample = 0; sample < sub_frame_view[band][channel].size();
+           ++sample) {
+        const float reference_value = ComputeSampleValue(
+            sub_frame_counter, kSubFrameLength, band, channel, sample, offset);
+        if (reference_value != sub_frame_view[band][channel][sample]) {
+          return false;
+        }
+      }
+    }
+  }
+  return true;
+}
+
+void FillBlock(size_t block_counter,
+               std::vector<std::vector<std::vector<float>>>* block) {
+  for (size_t band = 0; band < block->size(); ++band) {
+    for (size_t channel = 0; channel < (*block)[band].size(); ++channel) {
+      for (size_t sample = 0; sample < (*block)[band][channel].size();
+           ++sample) {
+        (*block)[band][channel][sample] = ComputeSampleValue(
+            block_counter, kBlockSize, band, channel, sample, 0);
+      }
+    }
+  }
+}
+
+// Verifies that the BlockFramer is able to produce the expected frame content.
+void RunFramerTest(int sample_rate_hz, size_t num_channels) {
+  constexpr size_t kNumSubFramesToProcess = 10;
+  const size_t num_bands = NumBandsForRate(sample_rate_hz);
+
+  std::vector<std::vector<std::vector<float>>> block(
+      num_bands, std::vector<std::vector<float>>(
+                     num_channels, std::vector<float>(kBlockSize, 0.f)));
+  std::vector<std::vector<std::vector<float>>> output_sub_frame(
+      num_bands, std::vector<std::vector<float>>(
+                     num_channels, std::vector<float>(kSubFrameLength, 0.f)));
+  std::vector<std::vector<rtc::ArrayView<float>>> output_sub_frame_view(
+      num_bands, std::vector<rtc::ArrayView<float>>(num_channels));
+  SetupSubFrameView(&output_sub_frame, &output_sub_frame_view);
+  BlockFramer framer(num_bands, num_channels);
+
+  size_t block_index = 0;
+  for (size_t sub_frame_index = 0; sub_frame_index < kNumSubFramesToProcess;
+       ++sub_frame_index) {
+    FillBlock(block_index++, &block);
+    framer.InsertBlockAndExtractSubFrame(block, &output_sub_frame_view);
+    if (sub_frame_index > 1) {
+      EXPECT_TRUE(VerifySubFrame(sub_frame_index, -64, output_sub_frame_view));
+    }
+
+    if ((sub_frame_index + 1) % 4 == 0) {
+      FillBlock(block_index++, &block);
+      framer.InsertBlock(block);
+    }
+  }
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+// Verifies that the BlockFramer crashes if the InsertBlockAndExtractSubFrame
+// method is called for inputs with the wrong number of bands or band lengths.
+void RunWronglySizedInsertAndExtractParametersTest(
+    int sample_rate_hz,
+    size_t correct_num_channels,
+    size_t num_block_bands,
+    size_t num_block_channels,
+    size_t block_length,
+    size_t num_sub_frame_bands,
+    size_t num_sub_frame_channels,
+    size_t sub_frame_length) {
+  const size_t correct_num_bands = NumBandsForRate(sample_rate_hz);
+
+  std::vector<std::vector<std::vector<float>>> block(
+      num_block_bands,
+      std::vector<std::vector<float>>(num_block_channels,
+                                      std::vector<float>(block_length, 0.f)));
+  std::vector<std::vector<std::vector<float>>> output_sub_frame(
+      num_sub_frame_bands,
+      std::vector<std::vector<float>>(
+          num_sub_frame_channels, std::vector<float>(sub_frame_length, 0.f)));
+  std::vector<std::vector<rtc::ArrayView<float>>> output_sub_frame_view(
+      output_sub_frame.size(),
+      std::vector<rtc::ArrayView<float>>(num_sub_frame_channels));
+  SetupSubFrameView(&output_sub_frame, &output_sub_frame_view);
+  BlockFramer framer(correct_num_bands, correct_num_channels);
+  EXPECT_DEATH(
+      framer.InsertBlockAndExtractSubFrame(block, &output_sub_frame_view), "");
+}
+
+// Verifies that the BlockFramer crashes if the InsertBlock method is called for
+// inputs with the wrong number of bands or band lengths.
+void RunWronglySizedInsertParameterTest(int sample_rate_hz,
+                                        size_t correct_num_channels,
+                                        size_t num_block_bands,
+                                        size_t num_block_channels,
+                                        size_t block_length) {
+  const size_t correct_num_bands = NumBandsForRate(sample_rate_hz);
+
+  std::vector<std::vector<std::vector<float>>> correct_block(
+      correct_num_bands,
+      std::vector<std::vector<float>>(correct_num_channels,
+                                      std::vector<float>(kBlockSize, 0.f)));
+  std::vector<std::vector<std::vector<float>>> wrong_block(
+      num_block_bands,
+      std::vector<std::vector<float>>(num_block_channels,
+                                      std::vector<float>(block_length, 0.f)));
+  std::vector<std::vector<std::vector<float>>> output_sub_frame(
+      correct_num_bands,
+      std::vector<std::vector<float>>(
+          correct_num_channels, std::vector<float>(kSubFrameLength, 0.f)));
+  std::vector<std::vector<rtc::ArrayView<float>>> output_sub_frame_view(
+      output_sub_frame.size(),
+      std::vector<rtc::ArrayView<float>>(correct_num_channels));
+  SetupSubFrameView(&output_sub_frame, &output_sub_frame_view);
+  BlockFramer framer(correct_num_bands, correct_num_channels);
+  framer.InsertBlockAndExtractSubFrame(correct_block, &output_sub_frame_view);
+  framer.InsertBlockAndExtractSubFrame(correct_block, &output_sub_frame_view);
+  framer.InsertBlockAndExtractSubFrame(correct_block, &output_sub_frame_view);
+  framer.InsertBlockAndExtractSubFrame(correct_block, &output_sub_frame_view);
+
+  EXPECT_DEATH(framer.InsertBlock(wrong_block), "");
+}
+
+// Verifies that the BlockFramer crashes if the InsertBlock method is called
+// after a wrong number of previous InsertBlockAndExtractSubFrame method calls
+// have been made.
+
+void RunWronglyInsertOrderTest(int sample_rate_hz,
+                               size_t num_channels,
+                               size_t num_preceeding_api_calls) {
+  const size_t correct_num_bands = NumBandsForRate(sample_rate_hz);
+
+  std::vector<std::vector<std::vector<float>>> block(
+      correct_num_bands,
+      std::vector<std::vector<float>>(num_channels,
+                                      std::vector<float>(kBlockSize, 0.f)));
+  std::vector<std::vector<std::vector<float>>> output_sub_frame(
+      correct_num_bands,
+      std::vector<std::vector<float>>(
+          num_channels, std::vector<float>(kSubFrameLength, 0.f)));
+  std::vector<std::vector<rtc::ArrayView<float>>> output_sub_frame_view(
+      output_sub_frame.size(),
+      std::vector<rtc::ArrayView<float>>(num_channels));
+  SetupSubFrameView(&output_sub_frame, &output_sub_frame_view);
+  BlockFramer framer(correct_num_bands, num_channels);
+  for (size_t k = 0; k < num_preceeding_api_calls; ++k) {
+    framer.InsertBlockAndExtractSubFrame(block, &output_sub_frame_view);
+  }
+
+  EXPECT_DEATH(framer.InsertBlock(block), "");
+}
+#endif
+
+std::string ProduceDebugText(int sample_rate_hz, size_t num_channels) {
+  rtc::StringBuilder ss;
+  ss << "Sample rate: " << sample_rate_hz;
+  ss << ", number of channels: " << num_channels;
+  return ss.Release();
+}
+
+}  // namespace
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+TEST(BlockFramerDeathTest,
+     WrongNumberOfBandsInBlockForInsertBlockAndExtractSubFrame) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto correct_num_channels : {1, 2, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      const size_t wrong_num_bands = (correct_num_bands % 3) + 1;
+      RunWronglySizedInsertAndExtractParametersTest(
+          rate, correct_num_channels, wrong_num_bands, correct_num_channels,
+          kBlockSize, correct_num_bands, correct_num_channels, kSubFrameLength);
+    }
+  }
+}
+
+TEST(BlockFramerDeathTest,
+     WrongNumberOfChannelsInBlockForInsertBlockAndExtractSubFrame) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto correct_num_channels : {1, 2, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      const size_t wrong_num_channels = correct_num_channels + 1;
+      RunWronglySizedInsertAndExtractParametersTest(
+          rate, correct_num_channels, correct_num_bands, wrong_num_channels,
+          kBlockSize, correct_num_bands, correct_num_channels, kSubFrameLength);
+    }
+  }
+}
+
+TEST(BlockFramerDeathTest,
+     WrongNumberOfBandsInSubFrameForInsertBlockAndExtractSubFrame) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto correct_num_channels : {1, 2, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      const size_t wrong_num_bands = (correct_num_bands % 3) + 1;
+      RunWronglySizedInsertAndExtractParametersTest(
+          rate, correct_num_channels, correct_num_bands, correct_num_channels,
+          kBlockSize, wrong_num_bands, correct_num_channels, kSubFrameLength);
+    }
+  }
+}
+
+TEST(BlockFramerDeathTest,
+     WrongNumberOfChannelsInSubFrameForInsertBlockAndExtractSubFrame) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto correct_num_channels : {1, 2, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      const size_t wrong_num_channels = correct_num_channels + 1;
+      RunWronglySizedInsertAndExtractParametersTest(
+          rate, correct_num_channels, correct_num_bands, correct_num_channels,
+          kBlockSize, correct_num_bands, wrong_num_channels, kSubFrameLength);
+    }
+  }
+}
+
+TEST(BlockFramerDeathTest,
+     WrongNumberOfSamplesInBlockForInsertBlockAndExtractSubFrame) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto correct_num_channels : {1, 2, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      RunWronglySizedInsertAndExtractParametersTest(
+          rate, correct_num_channels, correct_num_bands, correct_num_channels,
+          kBlockSize - 1, correct_num_bands, correct_num_channels,
+          kSubFrameLength);
+    }
+  }
+}
+
+TEST(BlockFramerDeathTest,
+     WrongNumberOfSamplesInSubFrameForInsertBlockAndExtractSubFrame) {
+  const size_t correct_num_channels = 1;
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+    const size_t correct_num_bands = NumBandsForRate(rate);
+    RunWronglySizedInsertAndExtractParametersTest(
+        rate, correct_num_channels, correct_num_bands, correct_num_channels,
+        kBlockSize, correct_num_bands, correct_num_channels,
+        kSubFrameLength - 1);
+  }
+}
+
+TEST(BlockFramerDeathTest, WrongNumberOfBandsInBlockForInsertBlock) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto correct_num_channels : {1, 2, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      const size_t wrong_num_bands = (correct_num_bands % 3) + 1;
+      RunWronglySizedInsertParameterTest(rate, correct_num_channels,
+                                         wrong_num_bands, correct_num_channels,
+                                         kBlockSize);
+    }
+  }
+}
+
+TEST(BlockFramerDeathTest, WrongNumberOfChannelsInBlockForInsertBlock) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto correct_num_channels : {1, 2, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      const size_t wrong_num_channels = correct_num_channels + 1;
+      RunWronglySizedInsertParameterTest(rate, correct_num_channels,
+                                         correct_num_bands, wrong_num_channels,
+                                         kBlockSize);
+    }
+  }
+}
+
+TEST(BlockFramerDeathTest, WrongNumberOfSamplesInBlockForInsertBlock) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto correct_num_channels : {1, 2, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      RunWronglySizedInsertParameterTest(rate, correct_num_channels,
+                                         correct_num_bands,
+                                         correct_num_channels, kBlockSize - 1);
+    }
+  }
+}
+
+TEST(BlockFramerDeathTest, WrongNumberOfPreceedingApiCallsForInsertBlock) {
+  for (size_t num_channels : {1, 2, 8}) {
+    for (auto rate : {16000, 32000, 48000}) {
+      for (size_t num_calls = 0; num_calls < 4; ++num_calls) {
+        rtc::StringBuilder ss;
+        ss << "Sample rate: " << rate;
+        ss << ", Num channels: " << num_channels;
+        ss << ", Num preceeding InsertBlockAndExtractSubFrame calls: "
+           << num_calls;
+
+        SCOPED_TRACE(ss.str());
+        RunWronglyInsertOrderTest(rate, num_channels, num_calls);
+      }
+    }
+  }
+}
+
+// Verifies that the verification for 0 number of channels works.
+TEST(BlockFramerDeathTest, ZeroNumberOfChannelsParameter) {
+  EXPECT_DEATH(BlockFramer(16000, 0), "");
+}
+
+// Verifies that the verification for 0 number of bands works.
+TEST(BlockFramerDeathTest, ZeroNumberOfBandsParameter) {
+  EXPECT_DEATH(BlockFramer(0, 1), "");
+}
+
+// Verifies that the verification for null sub_frame pointer works.
+TEST(BlockFramerDeathTest, NullSubFrameParameter) {
+  EXPECT_DEATH(BlockFramer(1, 1).InsertBlockAndExtractSubFrame(
+                   std::vector<std::vector<std::vector<float>>>(
+                       1, std::vector<std::vector<float>>(
+                              1, std::vector<float>(kBlockSize, 0.f))),
+                   nullptr),
+               "");
+}
+
+#endif
+
+TEST(BlockFramer, FrameBitexactness) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto num_channels : {1, 2, 4, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, num_channels));
+      RunFramerTest(rate, num_channels);
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,297 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "modules/audio_processing/aec3/block_processor.h"
+
+#include <stddef.h>
+
+#include <memory>
+#include <utility>
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "api/audio/echo_control.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/block_processor_metrics.h"
+#include "modules/audio_processing/aec3/delay_estimate.h"
+#include "modules/audio_processing/aec3/echo_path_variability.h"
+#include "modules/audio_processing/aec3/echo_remover.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/aec3/render_delay_controller.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+
+namespace webrtc {
+namespace {
+
+enum class BlockProcessorApiCall { kCapture, kRender };
+
+class BlockProcessorImpl final : public BlockProcessor {
+ public:
+  BlockProcessorImpl(const EchoCanceller3Config& config,
+                     int sample_rate_hz,
+                     size_t num_render_channels,
+                     size_t num_capture_channels,
+                     std::unique_ptr<RenderDelayBuffer> render_buffer,
+                     std::unique_ptr<RenderDelayController> delay_controller,
+                     std::unique_ptr<EchoRemover> echo_remover);
+
+  BlockProcessorImpl() = delete;
+
+  ~BlockProcessorImpl() override;
+
+  void ProcessCapture(
+      bool echo_path_gain_change,
+      bool capture_signal_saturation,
+      std::vector<std::vector<std::vector<float>>>* linear_output,
+      std::vector<std::vector<std::vector<float>>>* capture_block) override;
+
+  void BufferRender(
+      const std::vector<std::vector<std::vector<float>>>& block) override;
+
+  void UpdateEchoLeakageStatus(bool leakage_detected) override;
+
+  void GetMetrics(EchoControl::Metrics* metrics) const override;
+
+  void SetAudioBufferDelay(int delay_ms) override;
+  void SetCaptureOutputUsage(bool capture_output_used) override;
+
+ private:
+  static int instance_count_;
+  std::unique_ptr<ApmDataDumper> data_dumper_;
+  const EchoCanceller3Config config_;
+  bool capture_properly_started_ = false;
+  bool render_properly_started_ = false;
+  const size_t sample_rate_hz_;
+  std::unique_ptr<RenderDelayBuffer> render_buffer_;
+  std::unique_ptr<RenderDelayController> delay_controller_;
+  std::unique_ptr<EchoRemover> echo_remover_;
+  BlockProcessorMetrics metrics_;
+  RenderDelayBuffer::BufferingEvent render_event_;
+  size_t capture_call_counter_ = 0;
+  absl::optional<DelayEstimate> estimated_delay_;
+};
+
+int BlockProcessorImpl::instance_count_ = 0;
+
+BlockProcessorImpl::BlockProcessorImpl(
+    const EchoCanceller3Config& config,
+    int sample_rate_hz,
+    size_t num_render_channels,
+    size_t num_capture_channels,
+    std::unique_ptr<RenderDelayBuffer> render_buffer,
+    std::unique_ptr<RenderDelayController> delay_controller,
+    std::unique_ptr<EchoRemover> echo_remover)
+    : data_dumper_(
+          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
+      config_(config),
+      sample_rate_hz_(sample_rate_hz),
+      render_buffer_(std::move(render_buffer)),
+      delay_controller_(std::move(delay_controller)),
+      echo_remover_(std::move(echo_remover)),
+      render_event_(RenderDelayBuffer::BufferingEvent::kNone) {
+  RTC_DCHECK(ValidFullBandRate(sample_rate_hz_));
+}
+
+BlockProcessorImpl::~BlockProcessorImpl() = default;
+
+void BlockProcessorImpl::ProcessCapture(
+    bool echo_path_gain_change,
+    bool capture_signal_saturation,
+    std::vector<std::vector<std::vector<float>>>* linear_output,
+    std::vector<std::vector<std::vector<float>>>* capture_block) {
+  RTC_DCHECK(capture_block);
+  RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), capture_block->size());
+  RTC_DCHECK_EQ(kBlockSize, (*capture_block)[0][0].size());
+
+  capture_call_counter_++;
+
+  data_dumper_->DumpRaw("aec3_processblock_call_order",
+                        static_cast<int>(BlockProcessorApiCall::kCapture));
+  data_dumper_->DumpWav("aec3_processblock_capture_input", kBlockSize,
+                        &(*capture_block)[0][0][0], 16000, 1);
+
+  if (render_properly_started_) {
+    if (!capture_properly_started_) {
+      capture_properly_started_ = true;
+      render_buffer_->Reset();
+      if (delay_controller_)
+        delay_controller_->Reset(true);
+    }
+  } else {
+    // If no render data has yet arrived, do not process the capture signal.
+    render_buffer_->HandleSkippedCaptureProcessing();
+    return;
+  }
+
+  EchoPathVariability echo_path_variability(
+      echo_path_gain_change, EchoPathVariability::DelayAdjustment::kNone,
+      false);
+
+  if (render_event_ == RenderDelayBuffer::BufferingEvent::kRenderOverrun &&
+      render_properly_started_) {
+    echo_path_variability.delay_change =
+        EchoPathVariability::DelayAdjustment::kBufferFlush;
+    if (delay_controller_)
+      delay_controller_->Reset(true);
+    RTC_LOG(LS_WARNING) << "Reset due to render buffer overrun at block  "
+                        << capture_call_counter_;
+  }
+  render_event_ = RenderDelayBuffer::BufferingEvent::kNone;
+
+  // Update the render buffers with any newly arrived render blocks and prepare
+  // the render buffers for reading the render data corresponding to the current
+  // capture block.
+  RenderDelayBuffer::BufferingEvent buffer_event =
+      render_buffer_->PrepareCaptureProcessing();
+  // Reset the delay controller at render buffer underrun.
+  if (buffer_event == RenderDelayBuffer::BufferingEvent::kRenderUnderrun) {
+    if (delay_controller_)
+      delay_controller_->Reset(false);
+  }
+
+  data_dumper_->DumpWav("aec3_processblock_capture_input2", kBlockSize,
+                        &(*capture_block)[0][0][0], 16000, 1);
+
+  bool has_delay_estimator = !config_.delay.use_external_delay_estimator;
+  if (has_delay_estimator) {
+    RTC_DCHECK(delay_controller_);
+    // Compute and apply the render delay required to achieve proper signal
+    // alignment.
+    estimated_delay_ = delay_controller_->GetDelay(
+        render_buffer_->GetDownsampledRenderBuffer(), render_buffer_->Delay(),
+        (*capture_block)[0]);
+
+    if (estimated_delay_) {
+      bool delay_change =
+          render_buffer_->AlignFromDelay(estimated_delay_->delay);
+      if (delay_change) {
+        rtc::LoggingSeverity log_level =
+            config_.delay.log_warning_on_delay_changes ? rtc::LS_WARNING
+                                                       : rtc::LS_INFO;
+        RTC_LOG_V(log_level) << "Delay changed to " << estimated_delay_->delay
+                             << " at block " << capture_call_counter_;
+        echo_path_variability.delay_change =
+            EchoPathVariability::DelayAdjustment::kNewDetectedDelay;
+      }
+    }
+
+    echo_path_variability.clock_drift = delay_controller_->HasClockdrift();
+
+  } else {
+    render_buffer_->AlignFromExternalDelay();
+  }
+
+  // Remove the echo from the capture signal.
+  if (has_delay_estimator || render_buffer_->HasReceivedBufferDelay()) {
+    echo_remover_->ProcessCapture(
+        echo_path_variability, capture_signal_saturation, estimated_delay_,
+        render_buffer_->GetRenderBuffer(), linear_output, capture_block);
+  }
+
+  // Update the metrics.
+  metrics_.UpdateCapture(false);
+}
+
+void BlockProcessorImpl::BufferRender(
+    const std::vector<std::vector<std::vector<float>>>& block) {
+  RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), block.size());
+  RTC_DCHECK_EQ(kBlockSize, block[0][0].size());
+  data_dumper_->DumpRaw("aec3_processblock_call_order",
+                        static_cast<int>(BlockProcessorApiCall::kRender));
+  data_dumper_->DumpWav("aec3_processblock_render_input", kBlockSize,
+                        &block[0][0][0], 16000, 1);
+  data_dumper_->DumpWav("aec3_processblock_render_input2", kBlockSize,
+                        &block[0][0][0], 16000, 1);
+
+  render_event_ = render_buffer_->Insert(block);
+
+  metrics_.UpdateRender(render_event_ !=
+                        RenderDelayBuffer::BufferingEvent::kNone);
+
+  render_properly_started_ = true;
+  if (delay_controller_)
+    delay_controller_->LogRenderCall();
+}
+
+void BlockProcessorImpl::UpdateEchoLeakageStatus(bool leakage_detected) {
+  echo_remover_->UpdateEchoLeakageStatus(leakage_detected);
+}
+
+void BlockProcessorImpl::GetMetrics(EchoControl::Metrics* metrics) const {
+  echo_remover_->GetMetrics(metrics);
+  constexpr int block_size_ms = 4;
+  absl::optional<size_t> delay = render_buffer_->Delay();
+  metrics->delay_ms = delay ? static_cast<int>(*delay) * block_size_ms : 0;
+}
+
+void BlockProcessorImpl::SetAudioBufferDelay(int delay_ms) {
+  render_buffer_->SetAudioBufferDelay(delay_ms);
+}
+
+void BlockProcessorImpl::SetCaptureOutputUsage(bool capture_output_used) {
+  echo_remover_->SetCaptureOutputUsage(capture_output_used);
+}
+
+}  // namespace
+
+BlockProcessor* BlockProcessor::Create(const EchoCanceller3Config& config,
+                                       int sample_rate_hz,
+                                       size_t num_render_channels,
+                                       size_t num_capture_channels) {
+  std::unique_ptr<RenderDelayBuffer> render_buffer(
+      RenderDelayBuffer::Create(config, sample_rate_hz, num_render_channels));
+  std::unique_ptr<RenderDelayController> delay_controller;
+  if (!config.delay.use_external_delay_estimator) {
+    delay_controller.reset(RenderDelayController::Create(config, sample_rate_hz,
+                                                         num_capture_channels));
+  }
+  std::unique_ptr<EchoRemover> echo_remover(EchoRemover::Create(
+      config, sample_rate_hz, num_render_channels, num_capture_channels));
+  return Create(config, sample_rate_hz, num_render_channels,
+                num_capture_channels, std::move(render_buffer),
+                std::move(delay_controller), std::move(echo_remover));
+}
+
+BlockProcessor* BlockProcessor::Create(
+    const EchoCanceller3Config& config,
+    int sample_rate_hz,
+    size_t num_render_channels,
+    size_t num_capture_channels,
+    std::unique_ptr<RenderDelayBuffer> render_buffer) {
+  std::unique_ptr<RenderDelayController> delay_controller;
+  if (!config.delay.use_external_delay_estimator) {
+    delay_controller.reset(RenderDelayController::Create(config, sample_rate_hz,
+                                                         num_capture_channels));
+  }
+  std::unique_ptr<EchoRemover> echo_remover(EchoRemover::Create(
+      config, sample_rate_hz, num_render_channels, num_capture_channels));
+  return Create(config, sample_rate_hz, num_render_channels,
+                num_capture_channels, std::move(render_buffer),
+                std::move(delay_controller), std::move(echo_remover));
+}
+
+BlockProcessor* BlockProcessor::Create(
+    const EchoCanceller3Config& config,
+    int sample_rate_hz,
+    size_t num_render_channels,
+    size_t num_capture_channels,
+    std::unique_ptr<RenderDelayBuffer> render_buffer,
+    std::unique_ptr<RenderDelayController> delay_controller,
+    std::unique_ptr<EchoRemover> echo_remover) {
+  return new BlockProcessorImpl(config, sample_rate_hz, num_render_channels,
+                                num_capture_channels, std::move(render_buffer),
+                                std::move(delay_controller),
+                                std::move(echo_remover));
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,82 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_
+
+#include <stddef.h>
+
+#include <memory>
+#include <vector>
+
+#include "api/audio/echo_canceller3_config.h"
+#include "api/audio/echo_control.h"
+#include "modules/audio_processing/aec3/echo_remover.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/aec3/render_delay_controller.h"
+
+namespace webrtc {
+
+// Class for performing echo cancellation on 64 sample blocks of audio data.
+class BlockProcessor {
+ public:
+  static BlockProcessor* Create(const EchoCanceller3Config& config,
+                                int sample_rate_hz,
+                                size_t num_render_channels,
+                                size_t num_capture_channels);
+  // Only used for testing purposes.
+  static BlockProcessor* Create(
+      const EchoCanceller3Config& config,
+      int sample_rate_hz,
+      size_t num_render_channels,
+      size_t num_capture_channels,
+      std::unique_ptr<RenderDelayBuffer> render_buffer);
+  static BlockProcessor* Create(
+      const EchoCanceller3Config& config,
+      int sample_rate_hz,
+      size_t num_render_channels,
+      size_t num_capture_channels,
+      std::unique_ptr<RenderDelayBuffer> render_buffer,
+      std::unique_ptr<RenderDelayController> delay_controller,
+      std::unique_ptr<EchoRemover> echo_remover);
+
+  virtual ~BlockProcessor() = default;
+
+  // Get current metrics.
+  virtual void GetMetrics(EchoControl::Metrics* metrics) const = 0;
+
+  // Provides an optional external estimate of the audio buffer delay.
+  virtual void SetAudioBufferDelay(int delay_ms) = 0;
+
+  // Processes a block of capture data.
+  virtual void ProcessCapture(
+      bool echo_path_gain_change,
+      bool capture_signal_saturation,
+      std::vector<std::vector<std::vector<float>>>* linear_output,
+      std::vector<std::vector<std::vector<float>>>* capture_block) = 0;
+
+  // Buffers a block of render data supplied by a FrameBlocker object.
+  virtual void BufferRender(
+      const std::vector<std::vector<std::vector<float>>>& render_block) = 0;
+
+  // Reports whether echo leakage has been detected in the echo canceller
+  // output.
+  virtual void UpdateEchoLeakageStatus(bool leakage_detected) = 0;
+
+  // Specifies whether the capture output will be used. The purpose of this is
+  // to allow the block processor to deactivate some of the processing when the
+  // resulting output is anyway not used, for instance when the endpoint is
+  // muted.
+  virtual void SetCaptureOutputUsage(bool capture_output_used) = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,104 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/block_processor_metrics.h"
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/checks.h"
+#include "system_wrappers/include/metrics.h"
+
+namespace webrtc {
+
+namespace {
+
+enum class RenderUnderrunCategory {
+  kNone,
+  kFew,
+  kSeveral,
+  kMany,
+  kConstant,
+  kNumCategories
+};
+
+enum class RenderOverrunCategory {
+  kNone,
+  kFew,
+  kSeveral,
+  kMany,
+  kConstant,
+  kNumCategories
+};
+
+}  // namespace
+
+void BlockProcessorMetrics::UpdateCapture(bool underrun) {
+  ++capture_block_counter_;
+  if (underrun) {
+    ++render_buffer_underruns_;
+  }
+
+  if (capture_block_counter_ == kMetricsReportingIntervalBlocks) {
+    metrics_reported_ = true;
+
+    RenderUnderrunCategory underrun_category;
+    if (render_buffer_underruns_ == 0) {
+      underrun_category = RenderUnderrunCategory::kNone;
+    } else if (render_buffer_underruns_ > (capture_block_counter_ >> 1)) {
+      underrun_category = RenderUnderrunCategory::kConstant;
+    } else if (render_buffer_underruns_ > 100) {
+      underrun_category = RenderUnderrunCategory::kMany;
+    } else if (render_buffer_underruns_ > 10) {
+      underrun_category = RenderUnderrunCategory::kSeveral;
+    } else {
+      underrun_category = RenderUnderrunCategory::kFew;
+    }
+    RTC_HISTOGRAM_ENUMERATION(
+        "WebRTC.Audio.EchoCanceller.RenderUnderruns",
+        static_cast<int>(underrun_category),
+        static_cast<int>(RenderUnderrunCategory::kNumCategories));
+
+    RenderOverrunCategory overrun_category;
+    if (render_buffer_overruns_ == 0) {
+      overrun_category = RenderOverrunCategory::kNone;
+    } else if (render_buffer_overruns_ > (buffer_render_calls_ >> 1)) {
+      overrun_category = RenderOverrunCategory::kConstant;
+    } else if (render_buffer_overruns_ > 100) {
+      overrun_category = RenderOverrunCategory::kMany;
+    } else if (render_buffer_overruns_ > 10) {
+      overrun_category = RenderOverrunCategory::kSeveral;
+    } else {
+      overrun_category = RenderOverrunCategory::kFew;
+    }
+    RTC_HISTOGRAM_ENUMERATION(
+        "WebRTC.Audio.EchoCanceller.RenderOverruns",
+        static_cast<int>(overrun_category),
+        static_cast<int>(RenderOverrunCategory::kNumCategories));
+
+    ResetMetrics();
+    capture_block_counter_ = 0;
+  } else {
+    metrics_reported_ = false;
+  }
+}
+
+void BlockProcessorMetrics::UpdateRender(bool overrun) {
+  ++buffer_render_calls_;
+  if (overrun) {
+    ++render_buffer_overruns_;
+  }
+}
+
+void BlockProcessorMetrics::ResetMetrics() {
+  render_buffer_underruns_ = 0;
+  render_buffer_overruns_ = 0;
+  buffer_render_calls_ = 0;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_
+
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+// Handles the reporting of metrics for the block_processor.
+class BlockProcessorMetrics {
+ public:
+  BlockProcessorMetrics() = default;
+
+  // Updates the metric with new capture data.
+  void UpdateCapture(bool underrun);
+
+  // Updates the metric with new render data.
+  void UpdateRender(bool overrun);
+
+  // Returns true if the metrics have just been reported, otherwise false.
+  bool MetricsReported() { return metrics_reported_; }
+
+ private:
+  // Resets the metrics.
+  void ResetMetrics();
+
+  int capture_block_counter_ = 0;
+  bool metrics_reported_ = false;
+  int render_buffer_underruns_ = 0;
+  int render_buffer_overruns_ = 0;
+  int buffer_render_calls_ = 0;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(BlockProcessorMetrics);
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_METRICS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_metrics_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/block_processor_metrics.h"
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+// Verify the general functionality of BlockProcessorMetrics.
+TEST(BlockProcessorMetrics, NormalUsage) {
+  BlockProcessorMetrics metrics;
+
+  for (int j = 0; j < 3; ++j) {
+    for (int k = 0; k < kMetricsReportingIntervalBlocks - 1; ++k) {
+      metrics.UpdateRender(false);
+      metrics.UpdateRender(false);
+      metrics.UpdateCapture(false);
+      EXPECT_FALSE(metrics.MetricsReported());
+    }
+    metrics.UpdateCapture(false);
+    EXPECT_TRUE(metrics.MetricsReported());
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/block_processor_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,386 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/block_processor.h"
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/mock/mock_echo_remover.h"
+#include "modules/audio_processing/aec3/mock/mock_render_delay_buffer.h"
+#include "modules/audio_processing/aec3/mock/mock_render_delay_controller.h"
+#include "modules/audio_processing/test/echo_canceller_test_tools.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/random.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+using ::testing::_;
+using ::testing::AtLeast;
+using ::testing::NiceMock;
+using ::testing::Return;
+using ::testing::StrictMock;
+
+// Verifies that the basic BlockProcessor functionality works and that the API
+// methods are callable.
+void RunBasicSetupAndApiCallTest(int sample_rate_hz, int num_iterations) {
+  constexpr size_t kNumRenderChannels = 1;
+  constexpr size_t kNumCaptureChannels = 1;
+
+  std::unique_ptr<BlockProcessor> block_processor(
+      BlockProcessor::Create(EchoCanceller3Config(), sample_rate_hz,
+                             kNumRenderChannels, kNumCaptureChannels));
+  std::vector<std::vector<std::vector<float>>> block(
+      NumBandsForRate(sample_rate_hz),
+      std::vector<std::vector<float>>(kNumRenderChannels,
+                                      std::vector<float>(kBlockSize, 1000.f)));
+  for (int k = 0; k < num_iterations; ++k) {
+    block_processor->BufferRender(block);
+    block_processor->ProcessCapture(false, false, nullptr, &block);
+    block_processor->UpdateEchoLeakageStatus(false);
+  }
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+void RunRenderBlockSizeVerificationTest(int sample_rate_hz) {
+  constexpr size_t kNumRenderChannels = 1;
+  constexpr size_t kNumCaptureChannels = 1;
+
+  std::unique_ptr<BlockProcessor> block_processor(
+      BlockProcessor::Create(EchoCanceller3Config(), sample_rate_hz,
+                             kNumRenderChannels, kNumCaptureChannels));
+  std::vector<std::vector<std::vector<float>>> block(
+      NumBandsForRate(sample_rate_hz),
+      std::vector<std::vector<float>>(kNumRenderChannels,
+                                      std::vector<float>(kBlockSize - 1, 0.f)));
+
+  EXPECT_DEATH(block_processor->BufferRender(block), "");
+}
+
+void RunCaptureBlockSizeVerificationTest(int sample_rate_hz) {
+  constexpr size_t kNumRenderChannels = 1;
+  constexpr size_t kNumCaptureChannels = 1;
+
+  std::unique_ptr<BlockProcessor> block_processor(
+      BlockProcessor::Create(EchoCanceller3Config(), sample_rate_hz,
+                             kNumRenderChannels, kNumCaptureChannels));
+  std::vector<std::vector<std::vector<float>>> block(
+      NumBandsForRate(sample_rate_hz),
+      std::vector<std::vector<float>>(kNumRenderChannels,
+                                      std::vector<float>(kBlockSize - 1, 0.f)));
+
+  EXPECT_DEATH(block_processor->ProcessCapture(false, false, nullptr, &block),
+               "");
+}
+
+void RunRenderNumBandsVerificationTest(int sample_rate_hz) {
+  constexpr size_t kNumRenderChannels = 1;
+  constexpr size_t kNumCaptureChannels = 1;
+
+  const size_t wrong_num_bands = NumBandsForRate(sample_rate_hz) < 3
+                                     ? NumBandsForRate(sample_rate_hz) + 1
+                                     : 1;
+  std::unique_ptr<BlockProcessor> block_processor(
+      BlockProcessor::Create(EchoCanceller3Config(), sample_rate_hz,
+                             kNumRenderChannels, kNumCaptureChannels));
+  std::vector<std::vector<std::vector<float>>> block(
+      wrong_num_bands,
+      std::vector<std::vector<float>>(kNumRenderChannels,
+                                      std::vector<float>(kBlockSize, 0.f)));
+
+  EXPECT_DEATH(block_processor->BufferRender(block), "");
+}
+
+void RunCaptureNumBandsVerificationTest(int sample_rate_hz) {
+  constexpr size_t kNumRenderChannels = 1;
+  constexpr size_t kNumCaptureChannels = 1;
+
+  const size_t wrong_num_bands = NumBandsForRate(sample_rate_hz) < 3
+                                     ? NumBandsForRate(sample_rate_hz) + 1
+                                     : 1;
+  std::unique_ptr<BlockProcessor> block_processor(
+      BlockProcessor::Create(EchoCanceller3Config(), sample_rate_hz,
+                             kNumRenderChannels, kNumCaptureChannels));
+  std::vector<std::vector<std::vector<float>>> block(
+      wrong_num_bands,
+      std::vector<std::vector<float>>(kNumRenderChannels,
+                                      std::vector<float>(kBlockSize, 0.f)));
+
+  EXPECT_DEATH(block_processor->ProcessCapture(false, false, nullptr, &block),
+               "");
+}
+#endif
+
+std::string ProduceDebugText(int sample_rate_hz) {
+  rtc::StringBuilder ss;
+  ss << "Sample rate: " << sample_rate_hz;
+  return ss.Release();
+}
+
+void FillSampleVector(int call_counter,
+                      int delay,
+                      rtc::ArrayView<float> samples) {
+  for (size_t i = 0; i < samples.size(); ++i) {
+    samples[i] = (call_counter - delay) * 10000.0f + i;
+  }
+}
+
+}  // namespace
+
+// Verifies that the delay controller functionality is properly integrated with
+// the render delay buffer inside block processor.
+// TODO(peah): Activate the unittest once the required code has been landed.
+TEST(BlockProcessor, DISABLED_DelayControllerIntegration) {
+  constexpr size_t kNumRenderChannels = 1;
+  constexpr size_t kNumCaptureChannels = 1;
+  constexpr size_t kNumBlocks = 310;
+  constexpr size_t kDelayInSamples = 640;
+  constexpr size_t kDelayHeadroom = 1;
+  constexpr size_t kDelayInBlocks =
+      kDelayInSamples / kBlockSize - kDelayHeadroom;
+  Random random_generator(42U);
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    std::unique_ptr<testing::StrictMock<webrtc::test::MockRenderDelayBuffer>>
+        render_delay_buffer_mock(
+            new StrictMock<webrtc::test::MockRenderDelayBuffer>(rate, 1));
+    EXPECT_CALL(*render_delay_buffer_mock, Insert(_))
+        .Times(kNumBlocks)
+        .WillRepeatedly(Return(RenderDelayBuffer::BufferingEvent::kNone));
+    EXPECT_CALL(*render_delay_buffer_mock, AlignFromDelay(kDelayInBlocks))
+        .Times(AtLeast(1));
+    EXPECT_CALL(*render_delay_buffer_mock, MaxDelay()).WillOnce(Return(30));
+    EXPECT_CALL(*render_delay_buffer_mock, Delay())
+        .Times(kNumBlocks + 1)
+        .WillRepeatedly(Return(0));
+    std::unique_ptr<BlockProcessor> block_processor(BlockProcessor::Create(
+        EchoCanceller3Config(), rate, kNumRenderChannels, kNumCaptureChannels,
+        std::move(render_delay_buffer_mock)));
+
+    std::vector<std::vector<std::vector<float>>> render_block(
+        NumBandsForRate(rate),
+        std::vector<std::vector<float>>(kNumRenderChannels,
+                                        std::vector<float>(kBlockSize, 0.f)));
+    std::vector<std::vector<std::vector<float>>> capture_block(
+        NumBandsForRate(rate),
+        std::vector<std::vector<float>>(kNumCaptureChannels,
+                                        std::vector<float>(kBlockSize, 0.f)));
+    DelayBuffer<float> signal_delay_buffer(kDelayInSamples);
+    for (size_t k = 0; k < kNumBlocks; ++k) {
+      RandomizeSampleVector(&random_generator, render_block[0][0]);
+      signal_delay_buffer.Delay(render_block[0][0], capture_block[0][0]);
+      block_processor->BufferRender(render_block);
+      block_processor->ProcessCapture(false, false, nullptr, &capture_block);
+    }
+  }
+}
+
+// Verifies that BlockProcessor submodules are called in a proper manner.
+TEST(BlockProcessor, DISABLED_SubmoduleIntegration) {
+  constexpr size_t kNumBlocks = 310;
+  constexpr size_t kNumRenderChannels = 1;
+  constexpr size_t kNumCaptureChannels = 1;
+
+  Random random_generator(42U);
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    std::unique_ptr<testing::StrictMock<webrtc::test::MockRenderDelayBuffer>>
+        render_delay_buffer_mock(
+            new StrictMock<webrtc::test::MockRenderDelayBuffer>(rate, 1));
+    std::unique_ptr<
+        ::testing::StrictMock<webrtc::test::MockRenderDelayController>>
+        render_delay_controller_mock(
+            new StrictMock<webrtc::test::MockRenderDelayController>());
+    std::unique_ptr<testing::StrictMock<webrtc::test::MockEchoRemover>>
+        echo_remover_mock(new StrictMock<webrtc::test::MockEchoRemover>());
+
+    EXPECT_CALL(*render_delay_buffer_mock, Insert(_))
+        .Times(kNumBlocks - 1)
+        .WillRepeatedly(Return(RenderDelayBuffer::BufferingEvent::kNone));
+    EXPECT_CALL(*render_delay_buffer_mock, PrepareCaptureProcessing())
+        .Times(kNumBlocks);
+    EXPECT_CALL(*render_delay_buffer_mock, AlignFromDelay(9)).Times(AtLeast(1));
+    EXPECT_CALL(*render_delay_buffer_mock, Delay())
+        .Times(kNumBlocks)
+        .WillRepeatedly(Return(0));
+    EXPECT_CALL(*render_delay_controller_mock, GetDelay(_, _, _))
+        .Times(kNumBlocks);
+    EXPECT_CALL(*echo_remover_mock, ProcessCapture(_, _, _, _, _, _))
+        .Times(kNumBlocks);
+    EXPECT_CALL(*echo_remover_mock, UpdateEchoLeakageStatus(_))
+        .Times(kNumBlocks);
+
+    std::unique_ptr<BlockProcessor> block_processor(BlockProcessor::Create(
+        EchoCanceller3Config(), rate, kNumRenderChannels, kNumCaptureChannels,
+        std::move(render_delay_buffer_mock),
+        std::move(render_delay_controller_mock), std::move(echo_remover_mock)));
+
+    std::vector<std::vector<std::vector<float>>> render_block(
+        NumBandsForRate(rate),
+        std::vector<std::vector<float>>(kNumRenderChannels,
+                                        std::vector<float>(kBlockSize, 0.f)));
+    std::vector<std::vector<std::vector<float>>> capture_block(
+        NumBandsForRate(rate),
+        std::vector<std::vector<float>>(kNumCaptureChannels,
+                                        std::vector<float>(kBlockSize, 0.f)));
+    DelayBuffer<float> signal_delay_buffer(640);
+    for (size_t k = 0; k < kNumBlocks; ++k) {
+      RandomizeSampleVector(&random_generator, render_block[0][0]);
+      signal_delay_buffer.Delay(render_block[0][0], capture_block[0][0]);
+      block_processor->BufferRender(render_block);
+      block_processor->ProcessCapture(false, false, nullptr, &capture_block);
+      block_processor->UpdateEchoLeakageStatus(false);
+    }
+  }
+}
+
+TEST(BlockProcessor, BasicSetupAndApiCalls) {
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    RunBasicSetupAndApiCallTest(rate, 1);
+  }
+}
+
+TEST(BlockProcessor, TestLongerCall) {
+  RunBasicSetupAndApiCallTest(16000, 20 * kNumBlocksPerSecond);
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+// TODO(gustaf): Re-enable the test once the issue with memory leaks during
+// DEATH tests on test bots has been fixed.
+TEST(BlockProcessorDeathTest, DISABLED_VerifyRenderBlockSizeCheck) {
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    RunRenderBlockSizeVerificationTest(rate);
+  }
+}
+
+TEST(BlockProcessorDeathTest, VerifyCaptureBlockSizeCheck) {
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    RunCaptureBlockSizeVerificationTest(rate);
+  }
+}
+
+TEST(BlockProcessorDeathTest, VerifyRenderNumBandsCheck) {
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    RunRenderNumBandsVerificationTest(rate);
+  }
+}
+
+// TODO(peah): Verify the check for correct number of bands in the capture
+// signal.
+TEST(BlockProcessorDeathTest, VerifyCaptureNumBandsCheck) {
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    RunCaptureNumBandsVerificationTest(rate);
+  }
+}
+
+// Verifiers that the verification for null ProcessCapture input works.
+TEST(BlockProcessorDeathTest, NullProcessCaptureParameter) {
+  EXPECT_DEATH(std::unique_ptr<BlockProcessor>(
+                   BlockProcessor::Create(EchoCanceller3Config(), 16000, 1, 1))
+                   ->ProcessCapture(false, false, nullptr, nullptr),
+               "");
+}
+
+// Verifies the check for correct sample rate.
+// TODO(peah): Re-enable the test once the issue with memory leaks during DEATH
+// tests on test bots has been fixed.
+TEST(BlockProcessor, DISABLED_WrongSampleRate) {
+  EXPECT_DEATH(std::unique_ptr<BlockProcessor>(
+                   BlockProcessor::Create(EchoCanceller3Config(), 8001, 1, 1)),
+               "");
+}
+
+#endif
+
+// Verifies that external delay estimator delays are applied correctly when a
+// call begins with a sequence of capture blocks.
+TEST(BlockProcessor, ExternalDelayAppliedCorrectlyWithInitialCaptureCalls) {
+  constexpr int kNumRenderChannels = 1;
+  constexpr int kNumCaptureChannels = 1;
+  constexpr int kSampleRateHz = 16000;
+
+  EchoCanceller3Config config;
+  config.delay.use_external_delay_estimator = true;
+
+  std::unique_ptr<RenderDelayBuffer> delay_buffer(
+      RenderDelayBuffer::Create(config, kSampleRateHz, kNumRenderChannels));
+
+  std::unique_ptr<testing::NiceMock<webrtc::test::MockEchoRemover>>
+      echo_remover_mock(new NiceMock<webrtc::test::MockEchoRemover>());
+  webrtc::test::MockEchoRemover* echo_remover_mock_pointer =
+      echo_remover_mock.get();
+
+  std::unique_ptr<BlockProcessor> block_processor(BlockProcessor::Create(
+      config, kSampleRateHz, kNumRenderChannels, kNumCaptureChannels,
+      std::move(delay_buffer), /*delay_controller=*/nullptr,
+      std::move(echo_remover_mock)));
+
+  std::vector<std::vector<std::vector<float>>> render_block(
+      NumBandsForRate(kSampleRateHz),
+      std::vector<std::vector<float>>(kNumRenderChannels,
+                                      std::vector<float>(kBlockSize, 0.f)));
+  std::vector<std::vector<std::vector<float>>> capture_block(
+      NumBandsForRate(kSampleRateHz),
+      std::vector<std::vector<float>>(kNumCaptureChannels,
+                                      std::vector<float>(kBlockSize, 0.f)));
+
+  // Process...
+  // - 10 capture calls, where no render data is available,
+  // - 10 render calls, populating the buffer,
+  // - 2 capture calls, verifying that the delay was applied correctly.
+  constexpr int kDelayInBlocks = 5;
+  constexpr int kDelayInMs = 20;
+  block_processor->SetAudioBufferDelay(kDelayInMs);
+
+  int capture_call_counter = 0;
+  int render_call_counter = 0;
+  for (size_t k = 0; k < 10; ++k) {
+    FillSampleVector(++capture_call_counter, kDelayInBlocks,
+                     capture_block[0][0]);
+    block_processor->ProcessCapture(false, false, nullptr, &capture_block);
+  }
+  for (size_t k = 0; k < 10; ++k) {
+    FillSampleVector(++render_call_counter, 0, render_block[0][0]);
+    block_processor->BufferRender(render_block);
+  }
+
+  EXPECT_CALL(*echo_remover_mock_pointer, ProcessCapture)
+      .WillRepeatedly(
+          [](EchoPathVariability /*echo_path_variability*/,
+             bool /*capture_signal_saturation*/,
+             const absl::optional<DelayEstimate>& /*external_delay*/,
+             RenderBuffer* render_buffer,
+             std::vector<std::vector<std::vector<float>>>* /*linear_output*/,
+             std::vector<std::vector<std::vector<float>>>* capture) {
+            const auto& render = render_buffer->Block(0);
+            for (size_t i = 0; i < kBlockSize; ++i) {
+              EXPECT_FLOAT_EQ(render[0][0][i], (*capture)[0][0][i]);
+            }
+          });
+
+  FillSampleVector(++capture_call_counter, kDelayInBlocks, capture_block[0][0]);
+  block_processor->ProcessCapture(false, false, nullptr, &capture_block);
+
+  FillSampleVector(++capture_call_counter, kDelayInBlocks, capture_block[0][0]);
+  block_processor->ProcessCapture(false, false, nullptr, &capture_block);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/BUILD.gn asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/BUILD.gn
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/BUILD.gn	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,370 @@
+# Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+import("../../../webrtc.gni")
+
+rtc_library("aec3") {
+  visibility = [ "*" ]
+  configs += [ "..:apm_debug_dump" ]
+  sources = [
+    "adaptive_fir_filter.cc",
+    "adaptive_fir_filter_erl.cc",
+    "aec3_common.cc",
+    "aec3_fft.cc",
+    "aec_state.cc",
+    "aec_state.h",
+    "alignment_mixer.cc",
+    "alignment_mixer.h",
+    "api_call_jitter_metrics.cc",
+    "api_call_jitter_metrics.h",
+    "block_buffer.cc",
+    "block_delay_buffer.cc",
+    "block_delay_buffer.h",
+    "block_framer.cc",
+    "block_framer.h",
+    "block_processor.cc",
+    "block_processor.h",
+    "block_processor_metrics.cc",
+    "block_processor_metrics.h",
+    "clockdrift_detector.cc",
+    "clockdrift_detector.h",
+    "coarse_filter_update_gain.cc",
+    "coarse_filter_update_gain.h",
+    "comfort_noise_generator.cc",
+    "comfort_noise_generator.h",
+    "decimator.cc",
+    "decimator.h",
+    "delay_estimate.h",
+    "dominant_nearend_detector.cc",
+    "dominant_nearend_detector.h",
+    "downsampled_render_buffer.cc",
+    "downsampled_render_buffer.h",
+    "echo_audibility.cc",
+    "echo_audibility.h",
+    "echo_canceller3.cc",
+    "echo_canceller3.h",
+    "echo_path_delay_estimator.cc",
+    "echo_path_delay_estimator.h",
+    "echo_path_variability.cc",
+    "echo_path_variability.h",
+    "echo_remover.cc",
+    "echo_remover.h",
+    "echo_remover_metrics.cc",
+    "echo_remover_metrics.h",
+    "erl_estimator.cc",
+    "erl_estimator.h",
+    "erle_estimator.cc",
+    "erle_estimator.h",
+    "fft_buffer.cc",
+    "filter_analyzer.cc",
+    "filter_analyzer.h",
+    "frame_blocker.cc",
+    "frame_blocker.h",
+    "fullband_erle_estimator.cc",
+    "fullband_erle_estimator.h",
+    "matched_filter.cc",
+    "matched_filter_lag_aggregator.cc",
+    "matched_filter_lag_aggregator.h",
+    "moving_average.cc",
+    "moving_average.h",
+    "nearend_detector.h",
+    "refined_filter_update_gain.cc",
+    "refined_filter_update_gain.h",
+    "render_buffer.cc",
+    "render_delay_buffer.cc",
+    "render_delay_buffer.h",
+    "render_delay_controller.cc",
+    "render_delay_controller.h",
+    "render_delay_controller_metrics.cc",
+    "render_delay_controller_metrics.h",
+    "render_signal_analyzer.cc",
+    "render_signal_analyzer.h",
+    "residual_echo_estimator.cc",
+    "residual_echo_estimator.h",
+    "reverb_decay_estimator.cc",
+    "reverb_decay_estimator.h",
+    "reverb_frequency_response.cc",
+    "reverb_frequency_response.h",
+    "reverb_model.cc",
+    "reverb_model.h",
+    "reverb_model_estimator.cc",
+    "reverb_model_estimator.h",
+    "signal_dependent_erle_estimator.cc",
+    "signal_dependent_erle_estimator.h",
+    "spectrum_buffer.cc",
+    "stationarity_estimator.cc",
+    "stationarity_estimator.h",
+    "subband_erle_estimator.cc",
+    "subband_erle_estimator.h",
+    "subband_nearend_detector.cc",
+    "subband_nearend_detector.h",
+    "subtractor.cc",
+    "subtractor.h",
+    "subtractor_output.cc",
+    "subtractor_output.h",
+    "subtractor_output_analyzer.cc",
+    "subtractor_output_analyzer.h",
+    "suppression_filter.cc",
+    "suppression_filter.h",
+    "suppression_gain.cc",
+    "suppression_gain.h",
+    "transparent_mode.cc",
+    "transparent_mode.h",
+  ]
+
+  defines = []
+  if (rtc_build_with_neon && current_cpu != "arm64") {
+    suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+    cflags = [ "-mfpu=neon" ]
+  }
+
+  deps = [
+    ":adaptive_fir_filter",
+    ":adaptive_fir_filter_erl",
+    ":aec3_common",
+    ":aec3_fft",
+    ":fft_data",
+    ":matched_filter",
+    ":render_buffer",
+    ":vector_math",
+    "..:apm_logging",
+    "..:audio_buffer",
+    "..:high_pass_filter",
+    "../../../api:array_view",
+    "../../../api/audio:aec3_config",
+    "../../../api/audio:echo_control",
+    "../../../common_audio:common_audio_c",
+    "../../../rtc_base:checks",
+    "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_minmax",
+    "../../../rtc_base/experiments:field_trial_parser",
+    "../../../rtc_base/system:arch",
+    "../../../system_wrappers",
+    "../../../system_wrappers:field_trial",
+    "../../../system_wrappers:metrics",
+    "../utility:cascaded_biquad_filter",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+
+  if (current_cpu == "x86" || current_cpu == "x64") {
+    deps += [ ":aec3_avx2" ]
+  }
+}
+
+rtc_source_set("aec3_common") {
+  sources = [ "aec3_common.h" ]
+}
+
+rtc_source_set("aec3_fft") {
+  sources = [ "aec3_fft.h" ]
+  deps = [
+    ":aec3_common",
+    ":fft_data",
+    "../../../api:array_view",
+    "../../../common_audio/third_party/ooura:fft_size_128",
+    "../../../rtc_base:checks",
+    "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base/system:arch",
+  ]
+}
+
+rtc_source_set("render_buffer") {
+  sources = [
+    "block_buffer.h",
+    "fft_buffer.h",
+    "render_buffer.h",
+    "spectrum_buffer.h",
+  ]
+  deps = [
+    ":aec3_common",
+    ":fft_data",
+    "../../../api:array_view",
+    "../../../rtc_base:checks",
+    "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base/system:arch",
+  ]
+}
+
+rtc_source_set("adaptive_fir_filter") {
+  sources = [ "adaptive_fir_filter.h" ]
+  deps = [
+    ":aec3_common",
+    ":aec3_fft",
+    ":fft_data",
+    ":render_buffer",
+    "..:apm_logging",
+    "../../../api:array_view",
+    "../../../rtc_base/system:arch",
+  ]
+}
+
+rtc_source_set("adaptive_fir_filter_erl") {
+  sources = [ "adaptive_fir_filter_erl.h" ]
+  deps = [
+    ":aec3_common",
+    "../../../api:array_view",
+    "../../../rtc_base/system:arch",
+  ]
+}
+
+rtc_source_set("matched_filter") {
+  sources = [ "matched_filter.h" ]
+  deps = [
+    ":aec3_common",
+    "../../../api:array_view",
+    "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base/system:arch",
+  ]
+}
+
+rtc_source_set("vector_math") {
+  sources = [ "vector_math.h" ]
+  deps = [
+    ":aec3_common",
+    "../../../api:array_view",
+    "../../../rtc_base:checks",
+    "../../../rtc_base/system:arch",
+  ]
+}
+
+rtc_source_set("fft_data") {
+  sources = [ "fft_data.h" ]
+  deps = [
+    ":aec3_common",
+    "../../../api:array_view",
+    "../../../rtc_base/system:arch",
+  ]
+}
+
+if (current_cpu == "x86" || current_cpu == "x64") {
+  rtc_library("aec3_avx2") {
+    configs += [ "..:apm_debug_dump" ]
+    sources = [
+      "adaptive_fir_filter_avx2.cc",
+      "adaptive_fir_filter_erl_avx2.cc",
+      "fft_data_avx2.cc",
+      "matched_filter_avx2.cc",
+      "vector_math_avx2.cc",
+    ]
+
+    if (is_win) {
+      cflags = [ "/arch:AVX2" ]
+    } else {
+      cflags = [
+        "-mavx2",
+        "-mfma",
+      ]
+    }
+
+    deps = [
+      ":adaptive_fir_filter",
+      ":adaptive_fir_filter_erl",
+      ":fft_data",
+      ":matched_filter",
+      ":vector_math",
+      "../../../api:array_view",
+      "../../../rtc_base:checks",
+    ]
+  }
+}
+
+if (rtc_include_tests) {
+  rtc_library("aec3_unittests") {
+    testonly = true
+
+    configs += [ "..:apm_debug_dump" ]
+    sources = [
+      "mock/mock_block_processor.cc",
+      "mock/mock_block_processor.h",
+      "mock/mock_echo_remover.cc",
+      "mock/mock_echo_remover.h",
+      "mock/mock_render_delay_buffer.cc",
+      "mock/mock_render_delay_buffer.h",
+      "mock/mock_render_delay_controller.cc",
+      "mock/mock_render_delay_controller.h",
+    ]
+
+    deps = [
+      ":adaptive_fir_filter",
+      ":adaptive_fir_filter_erl",
+      ":aec3",
+      ":aec3_common",
+      ":aec3_fft",
+      ":fft_data",
+      ":matched_filter",
+      ":render_buffer",
+      ":vector_math",
+      "..:apm_logging",
+      "..:audio_buffer",
+      "..:audio_processing",
+      "..:high_pass_filter",
+      "../../../api:array_view",
+      "../../../api/audio:aec3_config",
+      "../../../rtc_base:checks",
+      "../../../rtc_base:rtc_base_approved",
+      "../../../rtc_base:safe_minmax",
+      "../../../rtc_base/system:arch",
+      "../../../system_wrappers",
+      "../../../test:field_trial",
+      "../../../test:test_support",
+      "../utility:cascaded_biquad_filter",
+    ]
+    absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+
+    defines = []
+
+    if (rtc_enable_protobuf) {
+      sources += [
+        "adaptive_fir_filter_erl_unittest.cc",
+        "adaptive_fir_filter_unittest.cc",
+        "aec3_fft_unittest.cc",
+        "aec_state_unittest.cc",
+        "alignment_mixer_unittest.cc",
+        "api_call_jitter_metrics_unittest.cc",
+        "block_delay_buffer_unittest.cc",
+        "block_framer_unittest.cc",
+        "block_processor_metrics_unittest.cc",
+        "block_processor_unittest.cc",
+        "clockdrift_detector_unittest.cc",
+        "coarse_filter_update_gain_unittest.cc",
+        "comfort_noise_generator_unittest.cc",
+        "decimator_unittest.cc",
+        "echo_canceller3_unittest.cc",
+        "echo_path_delay_estimator_unittest.cc",
+        "echo_path_variability_unittest.cc",
+        "echo_remover_metrics_unittest.cc",
+        "echo_remover_unittest.cc",
+        "erl_estimator_unittest.cc",
+        "erle_estimator_unittest.cc",
+        "fft_data_unittest.cc",
+        "filter_analyzer_unittest.cc",
+        "frame_blocker_unittest.cc",
+        "matched_filter_lag_aggregator_unittest.cc",
+        "matched_filter_unittest.cc",
+        "moving_average_unittest.cc",
+        "refined_filter_update_gain_unittest.cc",
+        "render_buffer_unittest.cc",
+        "render_delay_buffer_unittest.cc",
+        "render_delay_controller_metrics_unittest.cc",
+        "render_delay_controller_unittest.cc",
+        "render_signal_analyzer_unittest.cc",
+        "residual_echo_estimator_unittest.cc",
+        "reverb_model_estimator_unittest.cc",
+        "signal_dependent_erle_estimator_unittest.cc",
+        "subtractor_unittest.cc",
+        "suppression_filter_unittest.cc",
+        "suppression_gain_unittest.cc",
+        "vector_math_unittest.cc",
+      ]
+    }
+
+    if (!build_with_chromium) {
+      deps += [ "..:audio_processing_unittests" ]
+    }
+  }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "modules/audio_processing/aec3/clockdrift_detector.h"
+
+namespace webrtc {
+
+ClockdriftDetector::ClockdriftDetector()
+    : level_(Level::kNone), stability_counter_(0) {
+  delay_history_.fill(0);
+}
+
+ClockdriftDetector::~ClockdriftDetector() = default;
+
+void ClockdriftDetector::Update(int delay_estimate) {
+  if (delay_estimate == delay_history_[0]) {
+    // Reset clockdrift level if delay estimate is stable for 7500 blocks (30
+    // seconds).
+    if (++stability_counter_ > 7500)
+      level_ = Level::kNone;
+    return;
+  }
+
+  stability_counter_ = 0;
+  const int d1 = delay_history_[0] - delay_estimate;
+  const int d2 = delay_history_[1] - delay_estimate;
+  const int d3 = delay_history_[2] - delay_estimate;
+
+  // Patterns recognized as positive clockdrift:
+  // [x-3], x-2, x-1, x.
+  // [x-3], x-1, x-2, x.
+  const bool probable_drift_up =
+      (d1 == -1 && d2 == -2) || (d1 == -2 && d2 == -1);
+  const bool drift_up = probable_drift_up && d3 == -3;
+
+  // Patterns recognized as negative clockdrift:
+  // [x+3], x+2, x+1, x.
+  // [x+3], x+1, x+2, x.
+  const bool probable_drift_down = (d1 == 1 && d2 == 2) || (d1 == 2 && d2 == 1);
+  const bool drift_down = probable_drift_down && d3 == 3;
+
+  // Set clockdrift level.
+  if (drift_up || drift_down) {
+    level_ = Level::kVerified;
+  } else if ((probable_drift_up || probable_drift_down) &&
+             level_ == Level::kNone) {
+    level_ = Level::kProbable;
+  }
+
+  // Shift delay history one step.
+  delay_history_[2] = delay_history_[1];
+  delay_history_[1] = delay_history_[0];
+  delay_history_[0] = delay_estimate;
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
+
+#include <stddef.h>
+
+#include <array>
+
+namespace webrtc {
+
+class ApmDataDumper;
+struct DownsampledRenderBuffer;
+struct EchoCanceller3Config;
+
+// Detects clockdrift by analyzing the estimated delay.
+class ClockdriftDetector {
+ public:
+  enum class Level { kNone, kProbable, kVerified, kNumCategories };
+  ClockdriftDetector();
+  ~ClockdriftDetector();
+  void Update(int delay_estimate);
+  Level ClockdriftLevel() const { return level_; }
+
+ private:
+  std::array<int, 3> delay_history_;
+  Level level_;
+  size_t stability_counter_;
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/clockdrift_detector_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/clockdrift_detector.h"
+
+#include "test/gtest.h"
+
+namespace webrtc {
+TEST(ClockdriftDetector, ClockdriftDetector) {
+  ClockdriftDetector c;
+  // No clockdrift at start.
+  EXPECT_TRUE(c.ClockdriftLevel() == ClockdriftDetector::Level::kNone);
+
+  // Monotonically increasing delay.
+  for (int i = 0; i < 100; i++)
+    c.Update(1000);
+  EXPECT_TRUE(c.ClockdriftLevel() == ClockdriftDetector::Level::kNone);
+  for (int i = 0; i < 100; i++)
+    c.Update(1001);
+  EXPECT_TRUE(c.ClockdriftLevel() == ClockdriftDetector::Level::kNone);
+  for (int i = 0; i < 100; i++)
+    c.Update(1002);
+  // Probable clockdrift.
+  EXPECT_TRUE(c.ClockdriftLevel() == ClockdriftDetector::Level::kProbable);
+  for (int i = 0; i < 100; i++)
+    c.Update(1003);
+  // Verified clockdrift.
+  EXPECT_TRUE(c.ClockdriftLevel() == ClockdriftDetector::Level::kVerified);
+
+  // Stable delay.
+  for (int i = 0; i < 10000; i++)
+    c.Update(1003);
+  // No clockdrift.
+  EXPECT_TRUE(c.ClockdriftLevel() == ClockdriftDetector::Level::kNone);
+
+  // Decreasing delay.
+  for (int i = 0; i < 100; i++)
+    c.Update(1001);
+  for (int i = 0; i < 100; i++)
+    c.Update(999);
+  // Probable clockdrift.
+  EXPECT_TRUE(c.ClockdriftLevel() == ClockdriftDetector::Level::kProbable);
+  for (int i = 0; i < 100; i++)
+    c.Update(1000);
+  for (int i = 0; i < 100; i++)
+    c.Update(998);
+  // Verified clockdrift.
+  EXPECT_TRUE(c.ClockdriftLevel() == ClockdriftDetector::Level::kVerified);
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,103 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/coarse_filter_update_gain.h"
+
+#include <algorithm>
+#include <functional>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+CoarseFilterUpdateGain::CoarseFilterUpdateGain(
+    const EchoCanceller3Config::Filter::CoarseConfiguration& config,
+    size_t config_change_duration_blocks)
+    : config_change_duration_blocks_(
+          static_cast<int>(config_change_duration_blocks)) {
+  SetConfig(config, true);
+  RTC_DCHECK_LT(0, config_change_duration_blocks_);
+  one_by_config_change_duration_blocks_ = 1.f / config_change_duration_blocks_;
+}
+
+void CoarseFilterUpdateGain::HandleEchoPathChange() {
+  poor_signal_excitation_counter_ = 0;
+  call_counter_ = 0;
+}
+
+void CoarseFilterUpdateGain::Compute(
+    const std::array<float, kFftLengthBy2Plus1>& render_power,
+    const RenderSignalAnalyzer& render_signal_analyzer,
+    const FftData& E_coarse,
+    size_t size_partitions,
+    bool saturated_capture_signal,
+    FftData* G) {
+  RTC_DCHECK(G);
+  ++call_counter_;
+
+  UpdateCurrentConfig();
+
+  if (render_signal_analyzer.PoorSignalExcitation()) {
+    poor_signal_excitation_counter_ = 0;
+  }
+
+  // Do not update the filter if the render is not sufficiently excited.
+  if (++poor_signal_excitation_counter_ < size_partitions ||
+      saturated_capture_signal || call_counter_ <= size_partitions) {
+    G->re.fill(0.f);
+    G->im.fill(0.f);
+    return;
+  }
+
+  // Compute mu.
+  std::array<float, kFftLengthBy2Plus1> mu;
+  const auto& X2 = render_power;
+  for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+    if (X2[k] > current_config_.noise_gate) {
+      mu[k] = current_config_.rate / X2[k];
+    } else {
+      mu[k] = 0.f;
+    }
+  }
+
+  // Avoid updating the filter close to narrow bands in the render signals.
+  render_signal_analyzer.MaskRegionsAroundNarrowBands(&mu);
+
+  // G = mu * E * X2.
+  for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+    G->re[k] = mu[k] * E_coarse.re[k];
+    G->im[k] = mu[k] * E_coarse.im[k];
+  }
+}
+
+void CoarseFilterUpdateGain::UpdateCurrentConfig() {
+  RTC_DCHECK_GE(config_change_duration_blocks_, config_change_counter_);
+  if (config_change_counter_ > 0) {
+    if (--config_change_counter_ > 0) {
+      auto average = [](float from, float to, float from_weight) {
+        return from * from_weight + to * (1.f - from_weight);
+      };
+
+      float change_factor =
+          config_change_counter_ * one_by_config_change_duration_blocks_;
+
+      current_config_.rate =
+          average(old_target_config_.rate, target_config_.rate, change_factor);
+      current_config_.noise_gate =
+          average(old_target_config_.noise_gate, target_config_.noise_gate,
+                  change_factor);
+    } else {
+      current_config_ = old_target_config_ = target_config_;
+    }
+  }
+  RTC_DCHECK_LE(0, config_change_counter_);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_COARSE_FILTER_UPDATE_GAIN_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_COARSE_FILTER_UPDATE_GAIN_H_
+
+#include <stddef.h>
+
+#include <array>
+
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "modules/audio_processing/aec3/render_signal_analyzer.h"
+
+namespace webrtc {
+
+// Provides functionality for computing the fixed gain for the coarse filter.
+class CoarseFilterUpdateGain {
+ public:
+  explicit CoarseFilterUpdateGain(
+      const EchoCanceller3Config::Filter::CoarseConfiguration& config,
+      size_t config_change_duration_blocks);
+
+  // Takes action in the case of a known echo path change.
+  void HandleEchoPathChange();
+
+  // Computes the gain.
+  void Compute(const std::array<float, kFftLengthBy2Plus1>& render_power,
+               const RenderSignalAnalyzer& render_signal_analyzer,
+               const FftData& E_coarse,
+               size_t size_partitions,
+               bool saturated_capture_signal,
+               FftData* G);
+
+  // Sets a new config.
+  void SetConfig(
+      const EchoCanceller3Config::Filter::CoarseConfiguration& config,
+      bool immediate_effect) {
+    if (immediate_effect) {
+      old_target_config_ = current_config_ = target_config_ = config;
+      config_change_counter_ = 0;
+    } else {
+      old_target_config_ = current_config_;
+      target_config_ = config;
+      config_change_counter_ = config_change_duration_blocks_;
+    }
+  }
+
+ private:
+  EchoCanceller3Config::Filter::CoarseConfiguration current_config_;
+  EchoCanceller3Config::Filter::CoarseConfiguration target_config_;
+  EchoCanceller3Config::Filter::CoarseConfiguration old_target_config_;
+  const int config_change_duration_blocks_;
+  float one_by_config_change_duration_blocks_;
+  // TODO(peah): Check whether this counter should instead be initialized to a
+  // large value.
+  size_t poor_signal_excitation_counter_ = 0;
+  size_t call_counter_ = 0;
+  int config_change_counter_ = 0;
+
+  void UpdateCurrentConfig();
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_COARSE_FILTER_UPDATE_GAIN_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/coarse_filter_update_gain_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,271 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/coarse_filter_update_gain.h"
+
+#include <algorithm>
+#include <memory>
+#include <numeric>
+#include <string>
+#include <vector>
+
+#include "modules/audio_processing/aec3/adaptive_fir_filter.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/test/echo_canceller_test_tools.h"
+#include "rtc_base/numerics/safe_minmax.h"
+#include "rtc_base/random.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+// Method for performing the simulations needed to test the refined filter
+// update gain functionality.
+void RunFilterUpdateTest(int num_blocks_to_process,
+                         size_t delay_samples,
+                         size_t num_render_channels,
+                         int filter_length_blocks,
+                         const std::vector<int>& blocks_with_saturation,
+                         std::array<float, kBlockSize>* e_last_block,
+                         std::array<float, kBlockSize>* y_last_block,
+                         FftData* G_last_block) {
+  ApmDataDumper data_dumper(42);
+  EchoCanceller3Config config;
+  config.filter.refined.length_blocks = filter_length_blocks;
+  AdaptiveFirFilter refined_filter(
+      config.filter.refined.length_blocks, config.filter.refined.length_blocks,
+      config.filter.config_change_duration_blocks, num_render_channels,
+      DetectOptimization(), &data_dumper);
+  AdaptiveFirFilter coarse_filter(
+      config.filter.coarse.length_blocks, config.filter.coarse.length_blocks,
+      config.filter.config_change_duration_blocks, num_render_channels,
+      DetectOptimization(), &data_dumper);
+  Aec3Fft fft;
+
+  constexpr int kSampleRateHz = 48000;
+  config.delay.default_delay = 1;
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, kSampleRateHz, num_render_channels));
+
+  CoarseFilterUpdateGain coarse_gain(
+      config.filter.coarse, config.filter.config_change_duration_blocks);
+  Random random_generator(42U);
+  std::vector<std::vector<std::vector<float>>> x(
+      NumBandsForRate(kSampleRateHz),
+      std::vector<std::vector<float>>(num_render_channels,
+                                      std::vector<float>(kBlockSize, 0.f)));
+  std::array<float, kBlockSize> y;
+  RenderSignalAnalyzer render_signal_analyzer(config);
+  std::array<float, kFftLength> s;
+  FftData S;
+  FftData G;
+  FftData E_coarse;
+  std::array<float, kBlockSize> e_coarse;
+
+  constexpr float kScale = 1.0f / kFftLengthBy2;
+
+  DelayBuffer<float> delay_buffer(delay_samples);
+  for (int k = 0; k < num_blocks_to_process; ++k) {
+    // Handle saturation.
+    bool saturation =
+        std::find(blocks_with_saturation.begin(), blocks_with_saturation.end(),
+                  k) != blocks_with_saturation.end();
+
+    // Create the render signal.
+    for (size_t band = 0; band < x.size(); ++band) {
+      for (size_t channel = 0; channel < x[band].size(); ++channel) {
+        RandomizeSampleVector(&random_generator, x[band][channel]);
+      }
+    }
+    delay_buffer.Delay(x[0][0], y);
+
+    render_delay_buffer->Insert(x);
+    if (k == 0) {
+      render_delay_buffer->Reset();
+    }
+    render_delay_buffer->PrepareCaptureProcessing();
+
+    render_signal_analyzer.Update(*render_delay_buffer->GetRenderBuffer(),
+                                  delay_samples / kBlockSize);
+
+    coarse_filter.Filter(*render_delay_buffer->GetRenderBuffer(), &S);
+    fft.Ifft(S, &s);
+    std::transform(y.begin(), y.end(), s.begin() + kFftLengthBy2,
+                   e_coarse.begin(),
+                   [&](float a, float b) { return a - b * kScale; });
+    std::for_each(e_coarse.begin(), e_coarse.end(),
+                  [](float& a) { a = rtc::SafeClamp(a, -32768.f, 32767.f); });
+    fft.ZeroPaddedFft(e_coarse, Aec3Fft::Window::kRectangular, &E_coarse);
+
+    std::array<float, kFftLengthBy2Plus1> render_power;
+    render_delay_buffer->GetRenderBuffer()->SpectralSum(
+        coarse_filter.SizePartitions(), &render_power);
+    coarse_gain.Compute(render_power, render_signal_analyzer, E_coarse,
+                        coarse_filter.SizePartitions(), saturation, &G);
+    coarse_filter.Adapt(*render_delay_buffer->GetRenderBuffer(), G);
+  }
+
+  std::copy(e_coarse.begin(), e_coarse.end(), e_last_block->begin());
+  std::copy(y.begin(), y.end(), y_last_block->begin());
+  std::copy(G.re.begin(), G.re.end(), G_last_block->re.begin());
+  std::copy(G.im.begin(), G.im.end(), G_last_block->im.begin());
+}
+
+std::string ProduceDebugText(int filter_length_blocks) {
+  rtc::StringBuilder ss;
+  ss << "Length: " << filter_length_blocks;
+  return ss.Release();
+}
+
+std::string ProduceDebugText(size_t delay, int filter_length_blocks) {
+  rtc::StringBuilder ss;
+  ss << "Delay: " << delay << ", ";
+  ss << ProduceDebugText(filter_length_blocks);
+  return ss.Release();
+}
+
+}  // namespace
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies that the check for non-null output gain parameter works.
+TEST(CoarseFilterUpdateGainDeathTest, NullDataOutputGain) {
+  ApmDataDumper data_dumper(42);
+  FftBuffer fft_buffer(1, 1);
+  RenderSignalAnalyzer analyzer(EchoCanceller3Config{});
+  FftData E;
+  const EchoCanceller3Config::Filter::CoarseConfiguration& config = {
+      12, 0.5f, 220075344.f};
+  CoarseFilterUpdateGain gain(config, 250);
+  std::array<float, kFftLengthBy2Plus1> render_power;
+  render_power.fill(0.f);
+  EXPECT_DEATH(gain.Compute(render_power, analyzer, E, 1, false, nullptr), "");
+}
+
+#endif
+
+class CoarseFilterUpdateGainOneTwoEightRenderChannels
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<size_t> {};
+
+INSTANTIATE_TEST_SUITE_P(MultiChannel,
+                         CoarseFilterUpdateGainOneTwoEightRenderChannels,
+                         ::testing::Values(1, 2, 8));
+
+// Verifies that the gain formed causes the filter using it to converge.
+TEST_P(CoarseFilterUpdateGainOneTwoEightRenderChannels,
+       GainCausesFilterToConverge) {
+  const size_t num_render_channels = GetParam();
+  std::vector<int> blocks_with_echo_path_changes;
+  std::vector<int> blocks_with_saturation;
+
+  for (size_t filter_length_blocks : {12, 20, 30}) {
+    for (size_t delay_samples : {0, 64, 150, 200, 301}) {
+      SCOPED_TRACE(ProduceDebugText(delay_samples, filter_length_blocks));
+
+      std::array<float, kBlockSize> e;
+      std::array<float, kBlockSize> y;
+      FftData G;
+
+      RunFilterUpdateTest(5000, delay_samples, num_render_channels,
+                          filter_length_blocks, blocks_with_saturation, &e, &y,
+                          &G);
+
+      // Verify that the refined filter is able to perform well.
+      // Use different criteria to take overmodelling into account.
+      if (filter_length_blocks == 12) {
+        EXPECT_LT(1000 * std::inner_product(e.begin(), e.end(), e.begin(), 0.f),
+                  std::inner_product(y.begin(), y.end(), y.begin(), 0.f));
+      } else {
+        EXPECT_LT(std::inner_product(e.begin(), e.end(), e.begin(), 0.f),
+                  std::inner_product(y.begin(), y.end(), y.begin(), 0.f));
+      }
+    }
+  }
+}
+
+// Verifies that the gain is zero when there is saturation.
+TEST_P(CoarseFilterUpdateGainOneTwoEightRenderChannels, SaturationBehavior) {
+  const size_t num_render_channels = GetParam();
+  std::vector<int> blocks_with_echo_path_changes;
+  std::vector<int> blocks_with_saturation;
+  for (int k = 99; k < 200; ++k) {
+    blocks_with_saturation.push_back(k);
+  }
+  for (size_t filter_length_blocks : {12, 20, 30}) {
+    SCOPED_TRACE(ProduceDebugText(filter_length_blocks));
+
+    std::array<float, kBlockSize> e;
+    std::array<float, kBlockSize> y;
+    FftData G_a;
+    FftData G_a_ref;
+    G_a_ref.re.fill(0.f);
+    G_a_ref.im.fill(0.f);
+
+    RunFilterUpdateTest(100, 65, num_render_channels, filter_length_blocks,
+                        blocks_with_saturation, &e, &y, &G_a);
+
+    EXPECT_EQ(G_a_ref.re, G_a.re);
+    EXPECT_EQ(G_a_ref.im, G_a.im);
+  }
+}
+
+class CoarseFilterUpdateGainOneTwoFourRenderChannels
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<size_t> {};
+
+INSTANTIATE_TEST_SUITE_P(
+    MultiChannel,
+    CoarseFilterUpdateGainOneTwoFourRenderChannels,
+    ::testing::Values(1, 2, 4),
+    [](const ::testing::TestParamInfo<
+        CoarseFilterUpdateGainOneTwoFourRenderChannels::ParamType>& info) {
+      return (rtc::StringBuilder() << "Render" << info.param).str();
+    });
+
+// Verifies that the magnitude of the gain on average decreases for a
+// persistently exciting signal.
+TEST_P(CoarseFilterUpdateGainOneTwoFourRenderChannels, DecreasingGain) {
+  const size_t num_render_channels = GetParam();
+  for (size_t filter_length_blocks : {12, 20, 30}) {
+    SCOPED_TRACE(ProduceDebugText(filter_length_blocks));
+    std::vector<int> blocks_with_echo_path_changes;
+    std::vector<int> blocks_with_saturation;
+
+    std::array<float, kBlockSize> e;
+    std::array<float, kBlockSize> y;
+    FftData G_a;
+    FftData G_b;
+    FftData G_c;
+    std::array<float, kFftLengthBy2Plus1> G_a_power;
+    std::array<float, kFftLengthBy2Plus1> G_b_power;
+    std::array<float, kFftLengthBy2Plus1> G_c_power;
+
+    RunFilterUpdateTest(100, 65, num_render_channels, filter_length_blocks,
+                        blocks_with_saturation, &e, &y, &G_a);
+    RunFilterUpdateTest(200, 65, num_render_channels, filter_length_blocks,
+                        blocks_with_saturation, &e, &y, &G_b);
+    RunFilterUpdateTest(300, 65, num_render_channels, filter_length_blocks,
+                        blocks_with_saturation, &e, &y, &G_c);
+
+    G_a.Spectrum(Aec3Optimization::kNone, G_a_power);
+    G_b.Spectrum(Aec3Optimization::kNone, G_b_power);
+    G_c.Spectrum(Aec3Optimization::kNone, G_c_power);
+
+    EXPECT_GT(std::accumulate(G_a_power.begin(), G_a_power.end(), 0.),
+              std::accumulate(G_b_power.begin(), G_b_power.end(), 0.));
+
+    EXPECT_GT(std::accumulate(G_b_power.begin(), G_b_power.end(), 0.),
+              std::accumulate(G_c_power.begin(), G_c_power.end(), 0.));
+  }
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,186 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/comfort_noise_generator.h"
+
+// Defines WEBRTC_ARCH_X86_FAMILY, used below.
+#include "rtc_base/system/arch.h"
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+#include <emmintrin.h>
+#endif
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdint>
+#include <functional>
+#include <numeric>
+
+#include "common_audio/signal_processing/include/signal_processing_library.h"
+#include "modules/audio_processing/aec3/vector_math.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace {
+
+// Computes the noise floor value that matches a WGN input of noise_floor_dbfs.
+float GetNoiseFloorFactor(float noise_floor_dbfs) {
+  // kdBfsNormalization = 20.f*log10(32768.f).
+  constexpr float kdBfsNormalization = 90.30899869919436f;
+  return 64.f * powf(10.f, (kdBfsNormalization + noise_floor_dbfs) * 0.1f);
+}
+
+// Table of sqrt(2) * sin(2*pi*i/32).
+constexpr float kSqrt2Sin[32] = {
+    +0.0000000f, +0.2758994f, +0.5411961f, +0.7856950f, +1.0000000f,
+    +1.1758756f, +1.3065630f, +1.3870398f, +1.4142136f, +1.3870398f,
+    +1.3065630f, +1.1758756f, +1.0000000f, +0.7856950f, +0.5411961f,
+    +0.2758994f, +0.0000000f, -0.2758994f, -0.5411961f, -0.7856950f,
+    -1.0000000f, -1.1758756f, -1.3065630f, -1.3870398f, -1.4142136f,
+    -1.3870398f, -1.3065630f, -1.1758756f, -1.0000000f, -0.7856950f,
+    -0.5411961f, -0.2758994f};
+
+void GenerateComfortNoise(Aec3Optimization optimization,
+                          const std::array<float, kFftLengthBy2Plus1>& N2,
+                          uint32_t* seed,
+                          FftData* lower_band_noise,
+                          FftData* upper_band_noise) {
+  FftData* N_low = lower_band_noise;
+  FftData* N_high = upper_band_noise;
+
+  // Compute square root spectrum.
+  std::array<float, kFftLengthBy2Plus1> N;
+  std::copy(N2.begin(), N2.end(), N.begin());
+  aec3::VectorMath(optimization).Sqrt(N);
+
+  // Compute the noise level for the upper bands.
+  constexpr float kOneByNumBands = 1.f / (kFftLengthBy2Plus1 / 2 + 1);
+  constexpr int kFftLengthBy2Plus1By2 = kFftLengthBy2Plus1 / 2;
+  const float high_band_noise_level =
+      std::accumulate(N.begin() + kFftLengthBy2Plus1By2, N.end(), 0.f) *
+      kOneByNumBands;
+
+  // The analysis and synthesis windowing cause loss of power when
+  // cross-fading the noise where frames are completely uncorrelated
+  // (generated with random phase), hence the factor sqrt(2).
+  // This is not the case for the speech signal where the input is overlapping
+  // (strong correlation).
+  N_low->re[0] = N_low->re[kFftLengthBy2] = N_high->re[0] =
+      N_high->re[kFftLengthBy2] = 0.f;
+  for (size_t k = 1; k < kFftLengthBy2; k++) {
+    constexpr int kIndexMask = 32 - 1;
+    // Generate a random 31-bit integer.
+    seed[0] = (seed[0] * 69069 + 1) & (0x80000000 - 1);
+    // Convert to a 5-bit index.
+    int i = seed[0] >> 26;
+
+    // y = sqrt(2) * sin(a)
+    const float x = kSqrt2Sin[i];
+    // x = sqrt(2) * cos(a) = sqrt(2) * sin(a + pi/2)
+    const float y = kSqrt2Sin[(i + 8) & kIndexMask];
+
+    // Form low-frequency noise via spectral shaping.
+    N_low->re[k] = N[k] * x;
+    N_low->im[k] = N[k] * y;
+
+    // Form the high-frequency noise via simple levelling.
+    N_high->re[k] = high_band_noise_level * x;
+    N_high->im[k] = high_band_noise_level * y;
+  }
+}
+
+}  // namespace
+
+ComfortNoiseGenerator::ComfortNoiseGenerator(const EchoCanceller3Config& config,
+                                             Aec3Optimization optimization,
+                                             size_t num_capture_channels)
+    : optimization_(optimization),
+      seed_(42),
+      num_capture_channels_(num_capture_channels),
+      noise_floor_(GetNoiseFloorFactor(config.comfort_noise.noise_floor_dbfs)),
+      N2_initial_(
+          std::make_unique<std::vector<std::array<float, kFftLengthBy2Plus1>>>(
+              num_capture_channels_)),
+      Y2_smoothed_(num_capture_channels_),
+      N2_(num_capture_channels_) {
+  for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+    (*N2_initial_)[ch].fill(0.f);
+    Y2_smoothed_[ch].fill(0.f);
+    N2_[ch].fill(1.0e6f);
+  }
+}
+
+ComfortNoiseGenerator::~ComfortNoiseGenerator() = default;
+
+void ComfortNoiseGenerator::Compute(
+    bool saturated_capture,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        capture_spectrum,
+    rtc::ArrayView<FftData> lower_band_noise,
+    rtc::ArrayView<FftData> upper_band_noise) {
+  const auto& Y2 = capture_spectrum;
+
+  if (!saturated_capture) {
+    // Smooth Y2.
+    for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+      std::transform(Y2_smoothed_[ch].begin(), Y2_smoothed_[ch].end(),
+                     Y2[ch].begin(), Y2_smoothed_[ch].begin(),
+                     [](float a, float b) { return a + 0.1f * (b - a); });
+    }
+
+    if (N2_counter_ > 50) {
+      // Update N2 from Y2_smoothed.
+      for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+        std::transform(N2_[ch].begin(), N2_[ch].end(), Y2_smoothed_[ch].begin(),
+                       N2_[ch].begin(), [](float a, float b) {
+                         return b < a ? (0.9f * b + 0.1f * a) * 1.0002f
+                                      : a * 1.0002f;
+                       });
+      }
+    }
+
+    if (N2_initial_) {
+      if (++N2_counter_ == 1000) {
+        N2_initial_.reset();
+      } else {
+        // Compute the N2_initial from N2.
+        for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+          std::transform(N2_[ch].begin(), N2_[ch].end(),
+                         (*N2_initial_)[ch].begin(), (*N2_initial_)[ch].begin(),
+                         [](float a, float b) {
+                           return a > b ? b + 0.001f * (a - b) : a;
+                         });
+        }
+      }
+    }
+
+    for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+      for (auto& n : N2_[ch]) {
+        n = std::max(n, noise_floor_);
+      }
+      if (N2_initial_) {
+        for (auto& n : (*N2_initial_)[ch]) {
+          n = std::max(n, noise_floor_);
+        }
+      }
+    }
+  }
+
+  // Choose N2 estimate to use.
+  const auto& N2 = N2_initial_ ? (*N2_initial_) : N2_;
+
+  for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+    GenerateComfortNoise(optimization_, N2[ch], &seed_, &lower_band_noise[ch],
+                         &upper_band_noise[ch]);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,78 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_
+
+#include <stdint.h>
+
+#include <array>
+#include <memory>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/system/arch.h"
+
+namespace webrtc {
+namespace aec3 {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+
+void EstimateComfortNoise_SSE2(const std::array<float, kFftLengthBy2Plus1>& N2,
+                               uint32_t* seed,
+                               FftData* lower_band_noise,
+                               FftData* upper_band_noise);
+#endif
+void EstimateComfortNoise(const std::array<float, kFftLengthBy2Plus1>& N2,
+                          uint32_t* seed,
+                          FftData* lower_band_noise,
+                          FftData* upper_band_noise);
+
+}  // namespace aec3
+
+// Generates the comfort noise.
+class ComfortNoiseGenerator {
+ public:
+  ComfortNoiseGenerator(const EchoCanceller3Config& config,
+                        Aec3Optimization optimization,
+                        size_t num_capture_channels);
+  ComfortNoiseGenerator() = delete;
+  ~ComfortNoiseGenerator();
+  ComfortNoiseGenerator(const ComfortNoiseGenerator&) = delete;
+
+  // Computes the comfort noise.
+  void Compute(bool saturated_capture,
+               rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+                   capture_spectrum,
+               rtc::ArrayView<FftData> lower_band_noise,
+               rtc::ArrayView<FftData> upper_band_noise);
+
+  // Returns the estimate of the background noise spectrum.
+  rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> NoiseSpectrum()
+      const {
+    return N2_;
+  }
+
+ private:
+  const Aec3Optimization optimization_;
+  uint32_t seed_;
+  const size_t num_capture_channels_;
+  const float noise_floor_;
+  std::unique_ptr<std::vector<std::array<float, kFftLengthBy2Plus1>>>
+      N2_initial_;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> Y2_smoothed_;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> N2_;
+  int N2_counter_ = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_COMFORT_NOISE_GENERATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/comfort_noise_generator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,72 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/comfort_noise_generator.h"
+
+#include <algorithm>
+#include <numeric>
+
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "rtc_base/random.h"
+#include "rtc_base/system/arch.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace aec3 {
+namespace {
+
+float Power(const FftData& N) {
+  std::array<float, kFftLengthBy2Plus1> N2;
+  N.Spectrum(Aec3Optimization::kNone, N2);
+  return std::accumulate(N2.begin(), N2.end(), 0.f) / N2.size();
+}
+
+}  // namespace
+
+TEST(ComfortNoiseGenerator, CorrectLevel) {
+  constexpr size_t kNumChannels = 5;
+  EchoCanceller3Config config;
+  ComfortNoiseGenerator cng(config, DetectOptimization(), kNumChannels);
+  AecState aec_state(config, kNumChannels);
+
+  std::vector<std::array<float, kFftLengthBy2Plus1>> N2(kNumChannels);
+  std::vector<FftData> n_lower(kNumChannels);
+  std::vector<FftData> n_upper(kNumChannels);
+
+  for (size_t ch = 0; ch < kNumChannels; ++ch) {
+    N2[ch].fill(1000.f * 1000.f / (ch + 1));
+    n_lower[ch].re.fill(0.f);
+    n_lower[ch].im.fill(0.f);
+    n_upper[ch].re.fill(0.f);
+    n_upper[ch].im.fill(0.f);
+  }
+
+  // Ensure instantaneous updata to nonzero noise.
+  cng.Compute(false, N2, n_lower, n_upper);
+
+  for (size_t ch = 0; ch < kNumChannels; ++ch) {
+    EXPECT_LT(0.f, Power(n_lower[ch]));
+    EXPECT_LT(0.f, Power(n_upper[ch]));
+  }
+
+  for (int k = 0; k < 10000; ++k) {
+    cng.Compute(false, N2, n_lower, n_upper);
+  }
+
+  for (size_t ch = 0; ch < kNumChannels; ++ch) {
+    EXPECT_NEAR(2.f * N2[ch][0], Power(n_lower[ch]), N2[ch][0] / 10.f);
+    EXPECT_NEAR(2.f * N2[ch][0], Power(n_upper[ch]), N2[ch][0] / 10.f);
+  }
+}
+
+}  // namespace aec3
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,91 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "modules/audio_processing/aec3/decimator.h"
+
+#include <array>
+#include <vector>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+// signal.butter(2, 3400/8000.0, 'lowpass', analog=False)
+const std::vector<CascadedBiQuadFilter::BiQuadParam> GetLowPassFilterDS2() {
+  return std::vector<CascadedBiQuadFilter::BiQuadParam>{
+      {{-1.f, 0.f}, {0.13833231f, 0.40743176f}, 0.22711796393486466f},
+      {{-1.f, 0.f}, {0.13833231f, 0.40743176f}, 0.22711796393486466f},
+      {{-1.f, 0.f}, {0.13833231f, 0.40743176f}, 0.22711796393486466f}};
+}
+
+// signal.ellip(6, 1, 40, 1800/8000, btype='lowpass', analog=False)
+const std::vector<CascadedBiQuadFilter::BiQuadParam> GetLowPassFilterDS4() {
+  return std::vector<CascadedBiQuadFilter::BiQuadParam>{
+      {{-0.08873842f, 0.99605496f}, {0.75916227f, 0.23841065f}, 0.26250696827f},
+      {{0.62273832f, 0.78243018f}, {0.74892112f, 0.5410152f}, 0.26250696827f},
+      {{0.71107693f, 0.70311421f}, {0.74895534f, 0.63924616f}, 0.26250696827f}};
+}
+
+// signal.cheby1(1, 6, [1000/8000, 2000/8000], btype='bandpass', analog=False)
+const std::vector<CascadedBiQuadFilter::BiQuadParam> GetBandPassFilterDS8() {
+  return std::vector<CascadedBiQuadFilter::BiQuadParam>{
+      {{1.f, 0.f}, {0.7601815f, 0.46423542f}, 0.10330478266505948f, true},
+      {{1.f, 0.f}, {0.7601815f, 0.46423542f}, 0.10330478266505948f, true},
+      {{1.f, 0.f}, {0.7601815f, 0.46423542f}, 0.10330478266505948f, true},
+      {{1.f, 0.f}, {0.7601815f, 0.46423542f}, 0.10330478266505948f, true},
+      {{1.f, 0.f}, {0.7601815f, 0.46423542f}, 0.10330478266505948f, true}};
+}
+
+// signal.butter(2, 1000/8000.0, 'highpass', analog=False)
+const std::vector<CascadedBiQuadFilter::BiQuadParam> GetHighPassFilter() {
+  return std::vector<CascadedBiQuadFilter::BiQuadParam>{
+      {{1.f, 0.f}, {0.72712179f, 0.21296904f}, 0.7570763753338849f}};
+}
+
+const std::vector<CascadedBiQuadFilter::BiQuadParam> GetPassThroughFilter() {
+  return std::vector<CascadedBiQuadFilter::BiQuadParam>{};
+}
+}  // namespace
+
+Decimator::Decimator(size_t down_sampling_factor)
+    : down_sampling_factor_(down_sampling_factor),
+      anti_aliasing_filter_(down_sampling_factor_ == 4
+                                ? GetLowPassFilterDS4()
+                                : (down_sampling_factor_ == 8
+                                       ? GetBandPassFilterDS8()
+                                       : GetLowPassFilterDS2())),
+      noise_reduction_filter_(down_sampling_factor_ == 8
+                                  ? GetPassThroughFilter()
+                                  : GetHighPassFilter()) {
+  RTC_DCHECK(down_sampling_factor_ == 2 || down_sampling_factor_ == 4 ||
+             down_sampling_factor_ == 8);
+}
+
+void Decimator::Decimate(rtc::ArrayView<const float> in,
+                         rtc::ArrayView<float> out) {
+  RTC_DCHECK_EQ(kBlockSize, in.size());
+  RTC_DCHECK_EQ(kBlockSize / down_sampling_factor_, out.size());
+  std::array<float, kBlockSize> x;
+
+  // Limit the frequency content of the signal to avoid aliasing.
+  anti_aliasing_filter_.Process(in, x);
+
+  // Reduce the impact of near-end noise.
+  noise_reduction_filter_.Process(x);
+
+  // Downsample the signal.
+  for (size_t j = 0, k = 0; j < out.size(); ++j, k += down_sampling_factor_) {
+    RTC_DCHECK_GT(kBlockSize, k);
+    out[j] = x[k];
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_DECIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_DECIMATOR_H_
+
+#include <array>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/utility/cascaded_biquad_filter.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+// Provides functionality for decimating a signal.
+class Decimator {
+ public:
+  explicit Decimator(size_t down_sampling_factor);
+
+  // Downsamples the signal.
+  void Decimate(rtc::ArrayView<const float> in, rtc::ArrayView<float> out);
+
+ private:
+  const size_t down_sampling_factor_;
+  CascadedBiQuadFilter anti_aliasing_filter_;
+  CascadedBiQuadFilter noise_reduction_filter_;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(Decimator);
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_DECIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/decimator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,135 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/decimator.h"
+
+#include <math.h>
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstring>
+#include <numeric>
+#include <string>
+#include <vector>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+namespace {
+
+std::string ProduceDebugText(int sample_rate_hz) {
+  rtc::StringBuilder ss;
+  ss << "Sample rate: " << sample_rate_hz;
+  return ss.Release();
+}
+
+constexpr size_t kDownSamplingFactors[] = {2, 4, 8};
+constexpr float kPi = 3.141592f;
+constexpr size_t kNumStartupBlocks = 50;
+constexpr size_t kNumBlocks = 1000;
+
+void ProduceDecimatedSinusoidalOutputPower(int sample_rate_hz,
+                                           size_t down_sampling_factor,
+                                           float sinusoidal_frequency_hz,
+                                           float* input_power,
+                                           float* output_power) {
+  float input[kBlockSize * kNumBlocks];
+  const size_t sub_block_size = kBlockSize / down_sampling_factor;
+
+  // Produce a sinusoid of the specified frequency.
+  for (size_t k = 0; k < kBlockSize * kNumBlocks; ++k) {
+    input[k] = 32767.f * std::sin(2.f * kPi * sinusoidal_frequency_hz * k /
+                                  sample_rate_hz);
+  }
+
+  Decimator decimator(down_sampling_factor);
+  std::vector<float> output(sub_block_size * kNumBlocks);
+
+  for (size_t k = 0; k < kNumBlocks; ++k) {
+    std::vector<float> sub_block(sub_block_size);
+    decimator.Decimate(
+        rtc::ArrayView<const float>(&input[k * kBlockSize], kBlockSize),
+        sub_block);
+
+    std::copy(sub_block.begin(), sub_block.end(),
+              output.begin() + k * sub_block_size);
+  }
+
+  ASSERT_GT(kNumBlocks, kNumStartupBlocks);
+  rtc::ArrayView<const float> input_to_evaluate(
+      &input[kNumStartupBlocks * kBlockSize],
+      (kNumBlocks - kNumStartupBlocks) * kBlockSize);
+  rtc::ArrayView<const float> output_to_evaluate(
+      &output[kNumStartupBlocks * sub_block_size],
+      (kNumBlocks - kNumStartupBlocks) * sub_block_size);
+  *input_power =
+      std::inner_product(input_to_evaluate.begin(), input_to_evaluate.end(),
+                         input_to_evaluate.begin(), 0.f) /
+      input_to_evaluate.size();
+  *output_power =
+      std::inner_product(output_to_evaluate.begin(), output_to_evaluate.end(),
+                         output_to_evaluate.begin(), 0.f) /
+      output_to_evaluate.size();
+}
+
+}  // namespace
+
+// Verifies that there is little aliasing from upper frequencies in the
+// downsampling.
+TEST(Decimator, NoLeakageFromUpperFrequencies) {
+  float input_power;
+  float output_power;
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto down_sampling_factor : kDownSamplingFactors) {
+      ProduceDebugText(rate);
+      ProduceDecimatedSinusoidalOutputPower(rate, down_sampling_factor,
+                                            3.f / 8.f * rate, &input_power,
+                                            &output_power);
+      EXPECT_GT(0.0001f * input_power, output_power);
+    }
+  }
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+// Verifies the check for the input size.
+TEST(DecimatorDeathTest, WrongInputSize) {
+  Decimator decimator(4);
+  std::vector<float> x(kBlockSize - 1, 0.f);
+  std::array<float, kBlockSize / 4> x_downsampled;
+  EXPECT_DEATH(decimator.Decimate(x, x_downsampled), "");
+}
+
+// Verifies the check for non-null output parameter.
+TEST(DecimatorDeathTest, NullOutput) {
+  Decimator decimator(4);
+  std::vector<float> x(kBlockSize, 0.f);
+  EXPECT_DEATH(decimator.Decimate(x, nullptr), "");
+}
+
+// Verifies the check for the output size.
+TEST(DecimatorDeathTest, WrongOutputSize) {
+  Decimator decimator(4);
+  std::vector<float> x(kBlockSize, 0.f);
+  std::array<float, kBlockSize / 4 - 1> x_downsampled;
+  EXPECT_DEATH(decimator.Decimate(x, x_downsampled), "");
+}
+
+// Verifies the check for the correct downsampling factor.
+TEST(DecimatorDeathTest, CorrectDownSamplingFactor) {
+  EXPECT_DEATH(Decimator(3), "");
+}
+
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/delay_estimate.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/delay_estimate.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/delay_estimate.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/delay_estimate.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_DELAY_ESTIMATE_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_DELAY_ESTIMATE_H_
+
+namespace webrtc {
+
+// Stores delay_estimates.
+struct DelayEstimate {
+  enum class Quality { kCoarse, kRefined };
+
+  DelayEstimate(Quality quality, size_t delay)
+      : quality(quality), delay(delay) {}
+
+  Quality quality;
+  size_t delay;
+  size_t blocks_since_last_change = 0;
+  size_t blocks_since_last_update = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_DELAY_ESTIMATE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/dominant_nearend_detector.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/dominant_nearend_detector.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/dominant_nearend_detector.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/dominant_nearend_detector.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/dominant_nearend_detector.h"
+
+#include <numeric>
+
+namespace webrtc {
+DominantNearendDetector::DominantNearendDetector(
+    const EchoCanceller3Config::Suppressor::DominantNearendDetection& config,
+    size_t num_capture_channels)
+    : enr_threshold_(config.enr_threshold),
+      enr_exit_threshold_(config.enr_exit_threshold),
+      snr_threshold_(config.snr_threshold),
+      hold_duration_(config.hold_duration),
+      trigger_threshold_(config.trigger_threshold),
+      use_during_initial_phase_(config.use_during_initial_phase),
+      num_capture_channels_(num_capture_channels),
+      trigger_counters_(num_capture_channels_),
+      hold_counters_(num_capture_channels_) {}
+
+void DominantNearendDetector::Update(
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        nearend_spectrum,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        residual_echo_spectrum,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        comfort_noise_spectrum,
+    bool initial_state) {
+  nearend_state_ = false;
+
+  auto low_frequency_energy = [](rtc::ArrayView<const float> spectrum) {
+    RTC_DCHECK_LE(16, spectrum.size());
+    return std::accumulate(spectrum.begin() + 1, spectrum.begin() + 16, 0.f);
+  };
+
+  for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+    const float ne_sum = low_frequency_energy(nearend_spectrum[ch]);
+    const float echo_sum = low_frequency_energy(residual_echo_spectrum[ch]);
+    const float noise_sum = low_frequency_energy(comfort_noise_spectrum[ch]);
+
+    // Detect strong active nearend if the nearend is sufficiently stronger than
+    // the echo and the nearend noise.
+    if ((!initial_state || use_during_initial_phase_) &&
+        echo_sum < enr_threshold_ * ne_sum &&
+        ne_sum > snr_threshold_ * noise_sum) {
+      if (++trigger_counters_[ch] >= trigger_threshold_) {
+        // After a period of strong active nearend activity, flag nearend mode.
+        hold_counters_[ch] = hold_duration_;
+        trigger_counters_[ch] = trigger_threshold_;
+      }
+    } else {
+      // Forget previously detected strong active nearend activity.
+      trigger_counters_[ch] = std::max(0, trigger_counters_[ch] - 1);
+    }
+
+    // Exit nearend-state early at strong echo.
+    if (echo_sum > enr_exit_threshold_ * ne_sum &&
+        echo_sum > snr_threshold_ * noise_sum) {
+      hold_counters_[ch] = 0;
+    }
+
+    // Remain in any nearend mode for a certain duration.
+    hold_counters_[ch] = std::max(0, hold_counters_[ch] - 1);
+    nearend_state_ = nearend_state_ || hold_counters_[ch] > 0;
+  }
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/dominant_nearend_detector.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/dominant_nearend_detector.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/dominant_nearend_detector.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/dominant_nearend_detector.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_DOMINANT_NEAREND_DETECTOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_DOMINANT_NEAREND_DETECTOR_H_
+
+#include <vector>
+
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/nearend_detector.h"
+
+namespace webrtc {
+// Class for selecting whether the suppressor is in the nearend or echo state.
+class DominantNearendDetector : public NearendDetector {
+ public:
+  DominantNearendDetector(
+      const EchoCanceller3Config::Suppressor::DominantNearendDetection& config,
+      size_t num_capture_channels);
+
+  // Returns whether the current state is the nearend state.
+  bool IsNearendState() const override { return nearend_state_; }
+
+  // Updates the state selection based on latest spectral estimates.
+  void Update(rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+                  nearend_spectrum,
+              rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+                  residual_echo_spectrum,
+              rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+                  comfort_noise_spectrum,
+              bool initial_state) override;
+
+ private:
+  const float enr_threshold_;
+  const float enr_exit_threshold_;
+  const float snr_threshold_;
+  const int hold_duration_;
+  const int trigger_threshold_;
+  const bool use_during_initial_phase_;
+  const size_t num_capture_channels_;
+
+  bool nearend_state_ = false;
+  std::vector<int> trigger_counters_;
+  std::vector<int> hold_counters_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_DOMINANT_NEAREND_DETECTOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/downsampled_render_buffer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/downsampled_render_buffer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/downsampled_render_buffer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/downsampled_render_buffer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
+
+#include <algorithm>
+
+namespace webrtc {
+
+DownsampledRenderBuffer::DownsampledRenderBuffer(size_t downsampled_buffer_size)
+    : size(static_cast<int>(downsampled_buffer_size)),
+      buffer(downsampled_buffer_size, 0.f) {
+  std::fill(buffer.begin(), buffer.end(), 0.f);
+}
+
+DownsampledRenderBuffer::~DownsampledRenderBuffer() = default;
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/downsampled_render_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/downsampled_render_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/downsampled_render_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/downsampled_render_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_
+
+#include <stddef.h>
+
+#include <vector>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+// Holds the circular buffer of the downsampled render data.
+struct DownsampledRenderBuffer {
+  explicit DownsampledRenderBuffer(size_t downsampled_buffer_size);
+  ~DownsampledRenderBuffer();
+
+  int IncIndex(int index) const {
+    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
+    return index < size - 1 ? index + 1 : 0;
+  }
+
+  int DecIndex(int index) const {
+    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
+    return index > 0 ? index - 1 : size - 1;
+  }
+
+  int OffsetIndex(int index, int offset) const {
+    RTC_DCHECK_GE(buffer.size(), offset);
+    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
+    return (size + index + offset) % size;
+  }
+
+  void UpdateWriteIndex(int offset) { write = OffsetIndex(write, offset); }
+  void IncWriteIndex() { write = IncIndex(write); }
+  void DecWriteIndex() { write = DecIndex(write); }
+  void UpdateReadIndex(int offset) { read = OffsetIndex(read, offset); }
+  void IncReadIndex() { read = IncIndex(read); }
+  void DecReadIndex() { read = DecIndex(read); }
+
+  const int size;
+  std::vector<float> buffer;
+  int write = 0;
+  int read = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_DOWNSAMPLED_RENDER_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_audibility.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_audibility.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_audibility.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_audibility.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,118 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/echo_audibility.h"
+
+#include <algorithm>
+#include <cmath>
+#include <utility>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/block_buffer.h"
+#include "modules/audio_processing/aec3/spectrum_buffer.h"
+#include "modules/audio_processing/aec3/stationarity_estimator.h"
+
+namespace webrtc {
+
+EchoAudibility::EchoAudibility(bool use_render_stationarity_at_init)
+    : use_render_stationarity_at_init_(use_render_stationarity_at_init) {
+  Reset();
+}
+
+EchoAudibility::~EchoAudibility() = default;
+
+void EchoAudibility::Update(const RenderBuffer& render_buffer,
+                            rtc::ArrayView<const float> average_reverb,
+                            int delay_blocks,
+                            bool external_delay_seen) {
+  UpdateRenderNoiseEstimator(render_buffer.GetSpectrumBuffer(),
+                             render_buffer.GetBlockBuffer(),
+                             external_delay_seen);
+
+  if (external_delay_seen || use_render_stationarity_at_init_) {
+    UpdateRenderStationarityFlags(render_buffer, average_reverb, delay_blocks);
+  }
+}
+
+void EchoAudibility::Reset() {
+  render_stationarity_.Reset();
+  non_zero_render_seen_ = false;
+  render_spectrum_write_prev_ = absl::nullopt;
+}
+
+void EchoAudibility::UpdateRenderStationarityFlags(
+    const RenderBuffer& render_buffer,
+    rtc::ArrayView<const float> average_reverb,
+    int min_channel_delay_blocks) {
+  const SpectrumBuffer& spectrum_buffer = render_buffer.GetSpectrumBuffer();
+  int idx_at_delay = spectrum_buffer.OffsetIndex(spectrum_buffer.read,
+                                                 min_channel_delay_blocks);
+
+  int num_lookahead = render_buffer.Headroom() - min_channel_delay_blocks + 1;
+  num_lookahead = std::max(0, num_lookahead);
+
+  render_stationarity_.UpdateStationarityFlags(spectrum_buffer, average_reverb,
+                                               idx_at_delay, num_lookahead);
+}
+
+void EchoAudibility::UpdateRenderNoiseEstimator(
+    const SpectrumBuffer& spectrum_buffer,
+    const BlockBuffer& block_buffer,
+    bool external_delay_seen) {
+  if (!render_spectrum_write_prev_) {
+    render_spectrum_write_prev_ = spectrum_buffer.write;
+    render_block_write_prev_ = block_buffer.write;
+    return;
+  }
+  int render_spectrum_write_current = spectrum_buffer.write;
+  if (!non_zero_render_seen_ && !external_delay_seen) {
+    non_zero_render_seen_ = !IsRenderTooLow(block_buffer);
+  }
+  if (non_zero_render_seen_) {
+    for (int idx = render_spectrum_write_prev_.value();
+         idx != render_spectrum_write_current;
+         idx = spectrum_buffer.DecIndex(idx)) {
+      render_stationarity_.UpdateNoiseEstimator(spectrum_buffer.buffer[idx]);
+    }
+  }
+  render_spectrum_write_prev_ = render_spectrum_write_current;
+}
+
+bool EchoAudibility::IsRenderTooLow(const BlockBuffer& block_buffer) {
+  const int num_render_channels =
+      static_cast<int>(block_buffer.buffer[0][0].size());
+  bool too_low = false;
+  const int render_block_write_current = block_buffer.write;
+  if (render_block_write_current == render_block_write_prev_) {
+    too_low = true;
+  } else {
+    for (int idx = render_block_write_prev_; idx != render_block_write_current;
+         idx = block_buffer.IncIndex(idx)) {
+      float max_abs_over_channels = 0.f;
+      for (int ch = 0; ch < num_render_channels; ++ch) {
+        auto block = block_buffer.buffer[idx][0][ch];
+        auto r = std::minmax_element(block.cbegin(), block.cend());
+        float max_abs_channel =
+            std::max(std::fabs(*r.first), std::fabs(*r.second));
+        max_abs_over_channels =
+            std::max(max_abs_over_channels, max_abs_channel);
+      }
+      if (max_abs_over_channels < 10.f) {
+        too_low = true;  // Discards all blocks if one of them is too low.
+        break;
+      }
+    }
+  }
+  render_block_write_prev_ = render_block_write_current;
+  return too_low;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_audibility.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_audibility.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_audibility.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_audibility.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,86 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_AUDIBILITY_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_AUDIBILITY_H_
+
+#include <stddef.h>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/block_buffer.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "modules/audio_processing/aec3/spectrum_buffer.h"
+#include "modules/audio_processing/aec3/stationarity_estimator.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+class EchoAudibility {
+ public:
+  explicit EchoAudibility(bool use_render_stationarity_at_init);
+  ~EchoAudibility();
+
+  EchoAudibility(const EchoAudibility&) = delete;
+  EchoAudibility& operator=(const EchoAudibility&) = delete;
+
+  // Feed new render data to the echo audibility estimator.
+  void Update(const RenderBuffer& render_buffer,
+              rtc::ArrayView<const float> average_reverb,
+              int min_channel_delay_blocks,
+              bool external_delay_seen);
+  // Get the residual echo scaling.
+  void GetResidualEchoScaling(bool filter_has_had_time_to_converge,
+                              rtc::ArrayView<float> residual_scaling) const {
+    for (size_t band = 0; band < residual_scaling.size(); ++band) {
+      if (render_stationarity_.IsBandStationary(band) &&
+          (filter_has_had_time_to_converge ||
+           use_render_stationarity_at_init_)) {
+        residual_scaling[band] = 0.f;
+      } else {
+        residual_scaling[band] = 1.0f;
+      }
+    }
+  }
+
+  // Returns true if the current render block is estimated as stationary.
+  bool IsBlockStationary() const {
+    return render_stationarity_.IsBlockStationary();
+  }
+
+ private:
+  // Reset the EchoAudibility class.
+  void Reset();
+
+  // Updates the render stationarity flags for the current frame.
+  void UpdateRenderStationarityFlags(const RenderBuffer& render_buffer,
+                                     rtc::ArrayView<const float> average_reverb,
+                                     int delay_blocks);
+
+  // Updates the noise estimator with the new render data since the previous
+  // call to this method.
+  void UpdateRenderNoiseEstimator(const SpectrumBuffer& spectrum_buffer,
+                                  const BlockBuffer& block_buffer,
+                                  bool external_delay_seen);
+
+  // Returns a bool being true if the render signal contains just close to zero
+  // values.
+  bool IsRenderTooLow(const BlockBuffer& block_buffer);
+
+  absl::optional<int> render_spectrum_write_prev_;
+  int render_block_write_prev_;
+  bool non_zero_render_seen_;
+  const bool use_render_stationarity_at_init_;
+  StationarityEstimator render_stationarity_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_ECHO_AUDIBILITY_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,887 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "modules/audio_processing/aec3/echo_canceller3.h"
+
+#include <algorithm>
+#include <utility>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/high_pass_filter.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/experiments/field_trial_parser.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/field_trial.h"
+
+namespace webrtc {
+
+namespace {
+
+enum class EchoCanceller3ApiCall { kCapture, kRender };
+
+bool DetectSaturation(rtc::ArrayView<const float> y) {
+  for (auto y_k : y) {
+    if (y_k >= 32700.0f || y_k <= -32700.0f) {
+      return true;
+    }
+  }
+  return false;
+}
+
+// Retrieves a value from a field trial if it is available. If no value is
+// present, the default value is returned. If the retrieved value is beyond the
+// specified limits, the default value is returned instead.
+void RetrieveFieldTrialValue(const char* trial_name,
+                             float min,
+                             float max,
+                             float* value_to_update) {
+  const std::string field_trial_str = field_trial::FindFullName(trial_name);
+
+  FieldTrialParameter<double> field_trial_param(/*key=*/"", *value_to_update);
+
+  ParseFieldTrial({&field_trial_param}, field_trial_str);
+  float field_trial_value = static_cast<float>(field_trial_param.Get());
+
+  if (field_trial_value >= min && field_trial_value <= max) {
+    *value_to_update = field_trial_value;
+  }
+}
+
+void RetrieveFieldTrialValue(const char* trial_name,
+                             int min,
+                             int max,
+                             int* value_to_update) {
+  const std::string field_trial_str = field_trial::FindFullName(trial_name);
+
+  FieldTrialParameter<int> field_trial_param(/*key=*/"", *value_to_update);
+
+  ParseFieldTrial({&field_trial_param}, field_trial_str);
+  float field_trial_value = field_trial_param.Get();
+
+  if (field_trial_value >= min && field_trial_value <= max) {
+    *value_to_update = field_trial_value;
+  }
+}
+
+void FillSubFrameView(
+    AudioBuffer* frame,
+    size_t sub_frame_index,
+    std::vector<std::vector<rtc::ArrayView<float>>>* sub_frame_view) {
+  RTC_DCHECK_GE(1, sub_frame_index);
+  RTC_DCHECK_LE(0, sub_frame_index);
+  RTC_DCHECK_EQ(frame->num_bands(), sub_frame_view->size());
+  RTC_DCHECK_EQ(frame->num_channels(), (*sub_frame_view)[0].size());
+  for (size_t band = 0; band < sub_frame_view->size(); ++band) {
+    for (size_t channel = 0; channel < (*sub_frame_view)[0].size(); ++channel) {
+      (*sub_frame_view)[band][channel] = rtc::ArrayView<float>(
+          &frame->split_bands(channel)[band][sub_frame_index * kSubFrameLength],
+          kSubFrameLength);
+    }
+  }
+}
+
+void FillSubFrameView(
+    std::vector<std::vector<std::vector<float>>>* frame,
+    size_t sub_frame_index,
+    std::vector<std::vector<rtc::ArrayView<float>>>* sub_frame_view) {
+  RTC_DCHECK_GE(1, sub_frame_index);
+  RTC_DCHECK_EQ(frame->size(), sub_frame_view->size());
+  RTC_DCHECK_EQ((*frame)[0].size(), (*sub_frame_view)[0].size());
+  for (size_t band = 0; band < frame->size(); ++band) {
+    for (size_t channel = 0; channel < (*frame)[band].size(); ++channel) {
+      (*sub_frame_view)[band][channel] = rtc::ArrayView<float>(
+          &(*frame)[band][channel][sub_frame_index * kSubFrameLength],
+          kSubFrameLength);
+    }
+  }
+}
+
+void ProcessCaptureFrameContent(
+    AudioBuffer* linear_output,
+    AudioBuffer* capture,
+    bool level_change,
+    bool saturated_microphone_signal,
+    size_t sub_frame_index,
+    FrameBlocker* capture_blocker,
+    BlockFramer* linear_output_framer,
+    BlockFramer* output_framer,
+    BlockProcessor* block_processor,
+    std::vector<std::vector<std::vector<float>>>* linear_output_block,
+    std::vector<std::vector<rtc::ArrayView<float>>>*
+        linear_output_sub_frame_view,
+    std::vector<std::vector<std::vector<float>>>* capture_block,
+    std::vector<std::vector<rtc::ArrayView<float>>>* capture_sub_frame_view) {
+  FillSubFrameView(capture, sub_frame_index, capture_sub_frame_view);
+
+  if (linear_output) {
+    RTC_DCHECK(linear_output_framer);
+    RTC_DCHECK(linear_output_block);
+    RTC_DCHECK(linear_output_sub_frame_view);
+    FillSubFrameView(linear_output, sub_frame_index,
+                     linear_output_sub_frame_view);
+  }
+
+  capture_blocker->InsertSubFrameAndExtractBlock(*capture_sub_frame_view,
+                                                 capture_block);
+  block_processor->ProcessCapture(level_change, saturated_microphone_signal,
+                                  linear_output_block, capture_block);
+  output_framer->InsertBlockAndExtractSubFrame(*capture_block,
+                                               capture_sub_frame_view);
+
+  if (linear_output) {
+    RTC_DCHECK(linear_output_framer);
+    linear_output_framer->InsertBlockAndExtractSubFrame(
+        *linear_output_block, linear_output_sub_frame_view);
+  }
+}
+
+void ProcessRemainingCaptureFrameContent(
+    bool level_change,
+    bool saturated_microphone_signal,
+    FrameBlocker* capture_blocker,
+    BlockFramer* linear_output_framer,
+    BlockFramer* output_framer,
+    BlockProcessor* block_processor,
+    std::vector<std::vector<std::vector<float>>>* linear_output_block,
+    std::vector<std::vector<std::vector<float>>>* block) {
+  if (!capture_blocker->IsBlockAvailable()) {
+    return;
+  }
+
+  capture_blocker->ExtractBlock(block);
+  block_processor->ProcessCapture(level_change, saturated_microphone_signal,
+                                  linear_output_block, block);
+  output_framer->InsertBlock(*block);
+
+  if (linear_output_framer) {
+    RTC_DCHECK(linear_output_block);
+    linear_output_framer->InsertBlock(*linear_output_block);
+  }
+}
+
+void BufferRenderFrameContent(
+    std::vector<std::vector<std::vector<float>>>* render_frame,
+    size_t sub_frame_index,
+    FrameBlocker* render_blocker,
+    BlockProcessor* block_processor,
+    std::vector<std::vector<std::vector<float>>>* block,
+    std::vector<std::vector<rtc::ArrayView<float>>>* sub_frame_view) {
+  FillSubFrameView(render_frame, sub_frame_index, sub_frame_view);
+  render_blocker->InsertSubFrameAndExtractBlock(*sub_frame_view, block);
+  block_processor->BufferRender(*block);
+}
+
+void BufferRemainingRenderFrameContent(
+    FrameBlocker* render_blocker,
+    BlockProcessor* block_processor,
+    std::vector<std::vector<std::vector<float>>>* block) {
+  if (!render_blocker->IsBlockAvailable()) {
+    return;
+  }
+  render_blocker->ExtractBlock(block);
+  block_processor->BufferRender(*block);
+}
+
+void CopyBufferIntoFrame(const AudioBuffer& buffer,
+                         size_t num_bands,
+                         size_t num_channels,
+                         std::vector<std::vector<std::vector<float>>>* frame) {
+  RTC_DCHECK_EQ(num_bands, frame->size());
+  RTC_DCHECK_EQ(num_channels, (*frame)[0].size());
+  RTC_DCHECK_EQ(AudioBuffer::kSplitBandSize, (*frame)[0][0].size());
+  for (size_t band = 0; band < num_bands; ++band) {
+    for (size_t channel = 0; channel < num_channels; ++channel) {
+      rtc::ArrayView<const float> buffer_view(
+          &buffer.split_bands_const(channel)[band][0],
+          AudioBuffer::kSplitBandSize);
+      std::copy(buffer_view.begin(), buffer_view.end(),
+                (*frame)[band][channel].begin());
+    }
+  }
+}
+
+}  // namespace
+
+// TODO(webrtc:5298): Move this to a separate file.
+EchoCanceller3Config AdjustConfig(const EchoCanceller3Config& config) {
+  EchoCanceller3Config adjusted_cfg = config;
+
+  if (field_trial::IsEnabled("WebRTC-Aec3AntiHowlingMinimizationKillSwitch")) {
+    adjusted_cfg.suppressor.high_bands_suppression
+        .anti_howling_activation_threshold = 25.f;
+    adjusted_cfg.suppressor.high_bands_suppression.anti_howling_gain = 0.01f;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3UseShortConfigChangeDuration")) {
+    adjusted_cfg.filter.config_change_duration_blocks = 10;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3UseZeroInitialStateDuration")) {
+    adjusted_cfg.filter.initial_state_seconds = 0.f;
+  } else if (field_trial::IsEnabled(
+                 "WebRTC-Aec3UseDot1SecondsInitialStateDuration")) {
+    adjusted_cfg.filter.initial_state_seconds = .1f;
+  } else if (field_trial::IsEnabled(
+                 "WebRTC-Aec3UseDot2SecondsInitialStateDuration")) {
+    adjusted_cfg.filter.initial_state_seconds = .2f;
+  } else if (field_trial::IsEnabled(
+                 "WebRTC-Aec3UseDot3SecondsInitialStateDuration")) {
+    adjusted_cfg.filter.initial_state_seconds = .3f;
+  } else if (field_trial::IsEnabled(
+                 "WebRTC-Aec3UseDot6SecondsInitialStateDuration")) {
+    adjusted_cfg.filter.initial_state_seconds = .6f;
+  } else if (field_trial::IsEnabled(
+                 "WebRTC-Aec3UseDot9SecondsInitialStateDuration")) {
+    adjusted_cfg.filter.initial_state_seconds = .9f;
+  } else if (field_trial::IsEnabled(
+                 "WebRTC-Aec3Use1Dot2SecondsInitialStateDuration")) {
+    adjusted_cfg.filter.initial_state_seconds = 1.2f;
+  } else if (field_trial::IsEnabled(
+                 "WebRTC-Aec3Use1Dot6SecondsInitialStateDuration")) {
+    adjusted_cfg.filter.initial_state_seconds = 1.6f;
+  } else if (field_trial::IsEnabled(
+                 "WebRTC-Aec3Use2Dot0SecondsInitialStateDuration")) {
+    adjusted_cfg.filter.initial_state_seconds = 2.0f;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3HighPassFilterEchoReference")) {
+    adjusted_cfg.filter.high_pass_filter_echo_reference = true;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3EchoSaturationDetectionKillSwitch")) {
+    adjusted_cfg.ep_strength.echo_can_saturate = false;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3UseDot2ReverbDefaultLen")) {
+    adjusted_cfg.ep_strength.default_len = 0.2f;
+  } else if (field_trial::IsEnabled("WebRTC-Aec3UseDot3ReverbDefaultLen")) {
+    adjusted_cfg.ep_strength.default_len = 0.3f;
+  } else if (field_trial::IsEnabled("WebRTC-Aec3UseDot4ReverbDefaultLen")) {
+    adjusted_cfg.ep_strength.default_len = 0.4f;
+  } else if (field_trial::IsEnabled("WebRTC-Aec3UseDot5ReverbDefaultLen")) {
+    adjusted_cfg.ep_strength.default_len = 0.5f;
+  } else if (field_trial::IsEnabled("WebRTC-Aec3UseDot6ReverbDefaultLen")) {
+    adjusted_cfg.ep_strength.default_len = 0.6f;
+  } else if (field_trial::IsEnabled("WebRTC-Aec3UseDot7ReverbDefaultLen")) {
+    adjusted_cfg.ep_strength.default_len = 0.7f;
+  } else if (field_trial::IsEnabled("WebRTC-Aec3UseDot8ReverbDefaultLen")) {
+    adjusted_cfg.ep_strength.default_len = 0.8f;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3ShortHeadroomKillSwitch")) {
+    // Two blocks headroom.
+    adjusted_cfg.delay.delay_headroom_samples = kBlockSize * 2;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3ClampInstQualityToZeroKillSwitch")) {
+    adjusted_cfg.erle.clamp_quality_estimate_to_zero = false;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3ClampInstQualityToOneKillSwitch")) {
+    adjusted_cfg.erle.clamp_quality_estimate_to_one = false;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3OnsetDetectionKillSwitch")) {
+    adjusted_cfg.erle.onset_detection = false;
+  }
+
+  if (field_trial::IsEnabled(
+          "WebRTC-Aec3EnforceRenderDelayEstimationDownmixing")) {
+    adjusted_cfg.delay.render_alignment_mixing.downmix = true;
+    adjusted_cfg.delay.render_alignment_mixing.adaptive_selection = false;
+  }
+
+  if (field_trial::IsEnabled(
+          "WebRTC-Aec3EnforceCaptureDelayEstimationDownmixing")) {
+    adjusted_cfg.delay.capture_alignment_mixing.downmix = true;
+    adjusted_cfg.delay.capture_alignment_mixing.adaptive_selection = false;
+  }
+
+  if (field_trial::IsEnabled(
+          "WebRTC-Aec3EnforceCaptureDelayEstimationLeftRightPrioritization")) {
+    adjusted_cfg.delay.capture_alignment_mixing.prefer_first_two_channels =
+        true;
+  }
+
+  if (field_trial::IsEnabled(
+          "WebRTC-"
+          "Aec3RenderDelayEstimationLeftRightPrioritizationKillSwitch")) {
+    adjusted_cfg.delay.capture_alignment_mixing.prefer_first_two_channels =
+        false;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3SensitiveDominantNearendActivation")) {
+    adjusted_cfg.suppressor.dominant_nearend_detection.enr_threshold = 0.5f;
+  } else if (field_trial::IsEnabled(
+                 "WebRTC-Aec3VerySensitiveDominantNearendActivation")) {
+    adjusted_cfg.suppressor.dominant_nearend_detection.enr_threshold = 0.75f;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3TransparentAntiHowlingGain")) {
+    adjusted_cfg.suppressor.high_bands_suppression.anti_howling_gain = 1.f;
+  }
+
+  if (field_trial::IsEnabled(
+          "WebRTC-Aec3EnforceMoreTransparentNormalSuppressorTuning")) {
+    adjusted_cfg.suppressor.normal_tuning.mask_lf.enr_transparent = 0.4f;
+    adjusted_cfg.suppressor.normal_tuning.mask_lf.enr_suppress = 0.5f;
+  }
+
+  if (field_trial::IsEnabled(
+          "WebRTC-Aec3EnforceMoreTransparentNearendSuppressorTuning")) {
+    adjusted_cfg.suppressor.nearend_tuning.mask_lf.enr_transparent = 1.29f;
+    adjusted_cfg.suppressor.nearend_tuning.mask_lf.enr_suppress = 1.3f;
+  }
+
+  if (field_trial::IsEnabled(
+          "WebRTC-Aec3EnforceMoreTransparentNormalSuppressorHfTuning")) {
+    adjusted_cfg.suppressor.normal_tuning.mask_hf.enr_transparent = 0.3f;
+    adjusted_cfg.suppressor.normal_tuning.mask_hf.enr_suppress = 0.4f;
+  }
+
+  if (field_trial::IsEnabled(
+          "WebRTC-Aec3EnforceMoreTransparentNearendSuppressorHfTuning")) {
+    adjusted_cfg.suppressor.nearend_tuning.mask_hf.enr_transparent = 1.09f;
+    adjusted_cfg.suppressor.nearend_tuning.mask_hf.enr_suppress = 1.1f;
+  }
+
+  if (field_trial::IsEnabled(
+          "WebRTC-Aec3EnforceRapidlyAdjustingNormalSuppressorTunings")) {
+    adjusted_cfg.suppressor.normal_tuning.max_inc_factor = 2.5f;
+  }
+
+  if (field_trial::IsEnabled(
+          "WebRTC-Aec3EnforceRapidlyAdjustingNearendSuppressorTunings")) {
+    adjusted_cfg.suppressor.nearend_tuning.max_inc_factor = 2.5f;
+  }
+
+  if (field_trial::IsEnabled(
+          "WebRTC-Aec3EnforceSlowlyAdjustingNormalSuppressorTunings")) {
+    adjusted_cfg.suppressor.normal_tuning.max_dec_factor_lf = .2f;
+  }
+
+  if (field_trial::IsEnabled(
+          "WebRTC-Aec3EnforceSlowlyAdjustingNearendSuppressorTunings")) {
+    adjusted_cfg.suppressor.nearend_tuning.max_dec_factor_lf = .2f;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3EnforceConservativeHfSuppression")) {
+    adjusted_cfg.suppressor.conservative_hf_suppression = true;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3EnforceStationarityProperties")) {
+    adjusted_cfg.echo_audibility.use_stationarity_properties = true;
+  }
+
+  if (field_trial::IsEnabled(
+          "WebRTC-Aec3EnforceStationarityPropertiesAtInit")) {
+    adjusted_cfg.echo_audibility.use_stationarity_properties_at_init = true;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3EnforceLowActiveRenderLimit")) {
+    adjusted_cfg.render_levels.active_render_limit = 50.f;
+  } else if (field_trial::IsEnabled(
+                 "WebRTC-Aec3EnforceVeryLowActiveRenderLimit")) {
+    adjusted_cfg.render_levels.active_render_limit = 30.f;
+  }
+
+  if (field_trial::IsEnabled("WebRTC-Aec3NonlinearModeReverbKillSwitch")) {
+    adjusted_cfg.echo_model.model_reverb_in_nonlinear_mode = false;
+  }
+
+  // Field-trial based override for the whole suppressor tuning.
+  const std::string suppressor_tuning_override_trial_name =
+      field_trial::FindFullName("WebRTC-Aec3SuppressorTuningOverride");
+
+  FieldTrialParameter<double> nearend_tuning_mask_lf_enr_transparent(
+      "nearend_tuning_mask_lf_enr_transparent",
+      adjusted_cfg.suppressor.nearend_tuning.mask_lf.enr_transparent);
+  FieldTrialParameter<double> nearend_tuning_mask_lf_enr_suppress(
+      "nearend_tuning_mask_lf_enr_suppress",
+      adjusted_cfg.suppressor.nearend_tuning.mask_lf.enr_suppress);
+  FieldTrialParameter<double> nearend_tuning_mask_hf_enr_transparent(
+      "nearend_tuning_mask_hf_enr_transparent",
+      adjusted_cfg.suppressor.nearend_tuning.mask_hf.enr_transparent);
+  FieldTrialParameter<double> nearend_tuning_mask_hf_enr_suppress(
+      "nearend_tuning_mask_hf_enr_suppress",
+      adjusted_cfg.suppressor.nearend_tuning.mask_hf.enr_suppress);
+  FieldTrialParameter<double> nearend_tuning_max_inc_factor(
+      "nearend_tuning_max_inc_factor",
+      adjusted_cfg.suppressor.nearend_tuning.max_inc_factor);
+  FieldTrialParameter<double> nearend_tuning_max_dec_factor_lf(
+      "nearend_tuning_max_dec_factor_lf",
+      adjusted_cfg.suppressor.nearend_tuning.max_dec_factor_lf);
+  FieldTrialParameter<double> normal_tuning_mask_lf_enr_transparent(
+      "normal_tuning_mask_lf_enr_transparent",
+      adjusted_cfg.suppressor.normal_tuning.mask_lf.enr_transparent);
+  FieldTrialParameter<double> normal_tuning_mask_lf_enr_suppress(
+      "normal_tuning_mask_lf_enr_suppress",
+      adjusted_cfg.suppressor.normal_tuning.mask_lf.enr_suppress);
+  FieldTrialParameter<double> normal_tuning_mask_hf_enr_transparent(
+      "normal_tuning_mask_hf_enr_transparent",
+      adjusted_cfg.suppressor.normal_tuning.mask_hf.enr_transparent);
+  FieldTrialParameter<double> normal_tuning_mask_hf_enr_suppress(
+      "normal_tuning_mask_hf_enr_suppress",
+      adjusted_cfg.suppressor.normal_tuning.mask_hf.enr_suppress);
+  FieldTrialParameter<double> normal_tuning_max_inc_factor(
+      "normal_tuning_max_inc_factor",
+      adjusted_cfg.suppressor.normal_tuning.max_inc_factor);
+  FieldTrialParameter<double> normal_tuning_max_dec_factor_lf(
+      "normal_tuning_max_dec_factor_lf",
+      adjusted_cfg.suppressor.normal_tuning.max_dec_factor_lf);
+  FieldTrialParameter<double> dominant_nearend_detection_enr_threshold(
+      "dominant_nearend_detection_enr_threshold",
+      adjusted_cfg.suppressor.dominant_nearend_detection.enr_threshold);
+  FieldTrialParameter<double> dominant_nearend_detection_enr_exit_threshold(
+      "dominant_nearend_detection_enr_exit_threshold",
+      adjusted_cfg.suppressor.dominant_nearend_detection.enr_exit_threshold);
+  FieldTrialParameter<double> dominant_nearend_detection_snr_threshold(
+      "dominant_nearend_detection_snr_threshold",
+      adjusted_cfg.suppressor.dominant_nearend_detection.snr_threshold);
+  FieldTrialParameter<int> dominant_nearend_detection_hold_duration(
+      "dominant_nearend_detection_hold_duration",
+      adjusted_cfg.suppressor.dominant_nearend_detection.hold_duration);
+  FieldTrialParameter<int> dominant_nearend_detection_trigger_threshold(
+      "dominant_nearend_detection_trigger_threshold",
+      adjusted_cfg.suppressor.dominant_nearend_detection.trigger_threshold);
+  FieldTrialParameter<double> ep_strength_default_len(
+      "ep_strength_default_len", adjusted_cfg.ep_strength.default_len);
+
+  ParseFieldTrial(
+      {&nearend_tuning_mask_lf_enr_transparent,
+       &nearend_tuning_mask_lf_enr_suppress,
+       &nearend_tuning_mask_hf_enr_transparent,
+       &nearend_tuning_mask_hf_enr_suppress, &nearend_tuning_max_inc_factor,
+       &nearend_tuning_max_dec_factor_lf,
+       &normal_tuning_mask_lf_enr_transparent,
+       &normal_tuning_mask_lf_enr_suppress,
+       &normal_tuning_mask_hf_enr_transparent,
+       &normal_tuning_mask_hf_enr_suppress, &normal_tuning_max_inc_factor,
+       &normal_tuning_max_dec_factor_lf,
+       &dominant_nearend_detection_enr_threshold,
+       &dominant_nearend_detection_enr_exit_threshold,
+       &dominant_nearend_detection_snr_threshold,
+       &dominant_nearend_detection_hold_duration,
+       &dominant_nearend_detection_trigger_threshold, &ep_strength_default_len},
+      suppressor_tuning_override_trial_name);
+
+  adjusted_cfg.suppressor.nearend_tuning.mask_lf.enr_transparent =
+      static_cast<float>(nearend_tuning_mask_lf_enr_transparent.Get());
+  adjusted_cfg.suppressor.nearend_tuning.mask_lf.enr_suppress =
+      static_cast<float>(nearend_tuning_mask_lf_enr_suppress.Get());
+  adjusted_cfg.suppressor.nearend_tuning.mask_hf.enr_transparent =
+      static_cast<float>(nearend_tuning_mask_hf_enr_transparent.Get());
+  adjusted_cfg.suppressor.nearend_tuning.mask_hf.enr_suppress =
+      static_cast<float>(nearend_tuning_mask_hf_enr_suppress.Get());
+  adjusted_cfg.suppressor.nearend_tuning.max_inc_factor =
+      static_cast<float>(nearend_tuning_max_inc_factor.Get());
+  adjusted_cfg.suppressor.nearend_tuning.max_dec_factor_lf =
+      static_cast<float>(nearend_tuning_max_dec_factor_lf.Get());
+  adjusted_cfg.suppressor.normal_tuning.mask_lf.enr_transparent =
+      static_cast<float>(normal_tuning_mask_lf_enr_transparent.Get());
+  adjusted_cfg.suppressor.normal_tuning.mask_lf.enr_suppress =
+      static_cast<float>(normal_tuning_mask_lf_enr_suppress.Get());
+  adjusted_cfg.suppressor.normal_tuning.mask_hf.enr_transparent =
+      static_cast<float>(normal_tuning_mask_hf_enr_transparent.Get());
+  adjusted_cfg.suppressor.normal_tuning.mask_hf.enr_suppress =
+      static_cast<float>(normal_tuning_mask_hf_enr_suppress.Get());
+  adjusted_cfg.suppressor.normal_tuning.max_inc_factor =
+      static_cast<float>(normal_tuning_max_inc_factor.Get());
+  adjusted_cfg.suppressor.normal_tuning.max_dec_factor_lf =
+      static_cast<float>(normal_tuning_max_dec_factor_lf.Get());
+  adjusted_cfg.suppressor.dominant_nearend_detection.enr_threshold =
+      static_cast<float>(dominant_nearend_detection_enr_threshold.Get());
+  adjusted_cfg.suppressor.dominant_nearend_detection.enr_exit_threshold =
+      static_cast<float>(dominant_nearend_detection_enr_exit_threshold.Get());
+  adjusted_cfg.suppressor.dominant_nearend_detection.snr_threshold =
+      static_cast<float>(dominant_nearend_detection_snr_threshold.Get());
+  adjusted_cfg.suppressor.dominant_nearend_detection.hold_duration =
+      dominant_nearend_detection_hold_duration.Get();
+  adjusted_cfg.suppressor.dominant_nearend_detection.trigger_threshold =
+      dominant_nearend_detection_trigger_threshold.Get();
+  adjusted_cfg.ep_strength.default_len =
+      static_cast<float>(ep_strength_default_len.Get());
+
+  // Field trial-based overrides of individual suppressor parameters.
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorNearendLfMaskTransparentOverride", 0.f, 10.f,
+      &adjusted_cfg.suppressor.nearend_tuning.mask_lf.enr_transparent);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorNearendLfMaskSuppressOverride", 0.f, 10.f,
+      &adjusted_cfg.suppressor.nearend_tuning.mask_lf.enr_suppress);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorNearendHfMaskTransparentOverride", 0.f, 10.f,
+      &adjusted_cfg.suppressor.nearend_tuning.mask_hf.enr_transparent);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorNearendHfMaskSuppressOverride", 0.f, 10.f,
+      &adjusted_cfg.suppressor.nearend_tuning.mask_hf.enr_suppress);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorNearendMaxIncFactorOverride", 0.f, 10.f,
+      &adjusted_cfg.suppressor.nearend_tuning.max_inc_factor);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorNearendMaxDecFactorLfOverride", 0.f, 10.f,
+      &adjusted_cfg.suppressor.nearend_tuning.max_dec_factor_lf);
+
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorNormalLfMaskTransparentOverride", 0.f, 10.f,
+      &adjusted_cfg.suppressor.normal_tuning.mask_lf.enr_transparent);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorNormalLfMaskSuppressOverride", 0.f, 10.f,
+      &adjusted_cfg.suppressor.normal_tuning.mask_lf.enr_suppress);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorNormalHfMaskTransparentOverride", 0.f, 10.f,
+      &adjusted_cfg.suppressor.normal_tuning.mask_hf.enr_transparent);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorNormalHfMaskSuppressOverride", 0.f, 10.f,
+      &adjusted_cfg.suppressor.normal_tuning.mask_hf.enr_suppress);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorNormalMaxIncFactorOverride", 0.f, 10.f,
+      &adjusted_cfg.suppressor.normal_tuning.max_inc_factor);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorNormalMaxDecFactorLfOverride", 0.f, 10.f,
+      &adjusted_cfg.suppressor.normal_tuning.max_dec_factor_lf);
+
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorDominantNearendEnrThresholdOverride", 0.f, 100.f,
+      &adjusted_cfg.suppressor.dominant_nearend_detection.enr_threshold);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorDominantNearendEnrExitThresholdOverride", 0.f,
+      100.f,
+      &adjusted_cfg.suppressor.dominant_nearend_detection.enr_exit_threshold);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorDominantNearendSnrThresholdOverride", 0.f, 100.f,
+      &adjusted_cfg.suppressor.dominant_nearend_detection.snr_threshold);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorDominantNearendHoldDurationOverride", 0, 1000,
+      &adjusted_cfg.suppressor.dominant_nearend_detection.hold_duration);
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorDominantNearendTriggerThresholdOverride", 0, 1000,
+      &adjusted_cfg.suppressor.dominant_nearend_detection.trigger_threshold);
+
+  RetrieveFieldTrialValue(
+      "WebRTC-Aec3SuppressorAntiHowlingGainOverride", 0.f, 10.f,
+      &adjusted_cfg.suppressor.high_bands_suppression.anti_howling_gain);
+
+  RetrieveFieldTrialValue("WebRTC-Aec3SuppressorEpStrengthDefaultLenOverride",
+                          -1.f, 1.f, &adjusted_cfg.ep_strength.default_len);
+
+  return adjusted_cfg;
+}
+
+class EchoCanceller3::RenderWriter {
+ public:
+  RenderWriter(ApmDataDumper* data_dumper,
+               const EchoCanceller3Config& config,
+               SwapQueue<std::vector<std::vector<std::vector<float>>>,
+                         Aec3RenderQueueItemVerifier>* render_transfer_queue,
+               size_t num_bands,
+               size_t num_channels);
+
+  RenderWriter() = delete;
+  RenderWriter(const RenderWriter&) = delete;
+  RenderWriter& operator=(const RenderWriter&) = delete;
+
+  ~RenderWriter();
+  void Insert(const AudioBuffer& input);
+
+ private:
+  ApmDataDumper* data_dumper_;
+  const size_t num_bands_;
+  const size_t num_channels_;
+  std::unique_ptr<HighPassFilter> high_pass_filter_;
+  std::vector<std::vector<std::vector<float>>> render_queue_input_frame_;
+  SwapQueue<std::vector<std::vector<std::vector<float>>>,
+            Aec3RenderQueueItemVerifier>* render_transfer_queue_;
+};
+
+EchoCanceller3::RenderWriter::RenderWriter(
+    ApmDataDumper* data_dumper,
+    const EchoCanceller3Config& config,
+    SwapQueue<std::vector<std::vector<std::vector<float>>>,
+              Aec3RenderQueueItemVerifier>* render_transfer_queue,
+    size_t num_bands,
+    size_t num_channels)
+    : data_dumper_(data_dumper),
+      num_bands_(num_bands),
+      num_channels_(num_channels),
+      render_queue_input_frame_(
+          num_bands_,
+          std::vector<std::vector<float>>(
+              num_channels_,
+              std::vector<float>(AudioBuffer::kSplitBandSize, 0.f))),
+      render_transfer_queue_(render_transfer_queue) {
+  RTC_DCHECK(data_dumper);
+  if (config.filter.high_pass_filter_echo_reference) {
+    high_pass_filter_ = std::make_unique<HighPassFilter>(16000, num_channels);
+  }
+}
+
+EchoCanceller3::RenderWriter::~RenderWriter() = default;
+
+void EchoCanceller3::RenderWriter::Insert(const AudioBuffer& input) {
+  RTC_DCHECK_EQ(AudioBuffer::kSplitBandSize, input.num_frames_per_band());
+  RTC_DCHECK_EQ(num_bands_, input.num_bands());
+  RTC_DCHECK_EQ(num_channels_, input.num_channels());
+
+  // TODO(bugs.webrtc.org/8759) Temporary work-around.
+  if (num_bands_ != input.num_bands())
+    return;
+
+  data_dumper_->DumpWav("aec3_render_input", AudioBuffer::kSplitBandSize,
+                        &input.split_bands_const(0)[0][0], 16000, 1);
+
+  CopyBufferIntoFrame(input, num_bands_, num_channels_,
+                      &render_queue_input_frame_);
+  if (high_pass_filter_) {
+    high_pass_filter_->Process(&render_queue_input_frame_[0]);
+  }
+
+  static_cast<void>(render_transfer_queue_->Insert(&render_queue_input_frame_));
+}
+
+int EchoCanceller3::instance_count_ = 0;
+
+EchoCanceller3::EchoCanceller3(const EchoCanceller3Config& config,
+                               int sample_rate_hz,
+                               size_t num_render_channels,
+                               size_t num_capture_channels)
+    : EchoCanceller3(AdjustConfig(config),
+                     sample_rate_hz,
+                     num_render_channels,
+                     num_capture_channels,
+                     std::unique_ptr<BlockProcessor>(
+                         BlockProcessor::Create(AdjustConfig(config),
+                                                sample_rate_hz,
+                                                num_render_channels,
+                                                num_capture_channels))) {}
+EchoCanceller3::EchoCanceller3(const EchoCanceller3Config& config,
+                               int sample_rate_hz,
+                               size_t num_render_channels,
+                               size_t num_capture_channels,
+                               std::unique_ptr<BlockProcessor> block_processor)
+    : data_dumper_(
+          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
+      config_(config),
+      sample_rate_hz_(sample_rate_hz),
+      num_bands_(NumBandsForRate(sample_rate_hz_)),
+      num_render_channels_(num_render_channels),
+      num_capture_channels_(num_capture_channels),
+      output_framer_(num_bands_, num_capture_channels_),
+      capture_blocker_(num_bands_, num_capture_channels_),
+      render_blocker_(num_bands_, num_render_channels_),
+      render_transfer_queue_(
+          kRenderTransferQueueSizeFrames,
+          std::vector<std::vector<std::vector<float>>>(
+              num_bands_,
+              std::vector<std::vector<float>>(
+                  num_render_channels_,
+                  std::vector<float>(AudioBuffer::kSplitBandSize, 0.f))),
+          Aec3RenderQueueItemVerifier(num_bands_,
+                                      num_render_channels_,
+                                      AudioBuffer::kSplitBandSize)),
+      block_processor_(std::move(block_processor)),
+      render_queue_output_frame_(
+          num_bands_,
+          std::vector<std::vector<float>>(
+              num_render_channels_,
+              std::vector<float>(AudioBuffer::kSplitBandSize, 0.f))),
+      render_block_(
+          num_bands_,
+          std::vector<std::vector<float>>(num_render_channels_,
+                                          std::vector<float>(kBlockSize, 0.f))),
+      capture_block_(
+          num_bands_,
+          std::vector<std::vector<float>>(num_capture_channels_,
+                                          std::vector<float>(kBlockSize, 0.f))),
+      render_sub_frame_view_(
+          num_bands_,
+          std::vector<rtc::ArrayView<float>>(num_render_channels_)),
+      capture_sub_frame_view_(
+          num_bands_,
+          std::vector<rtc::ArrayView<float>>(num_capture_channels_)) {
+  RTC_DCHECK(ValidFullBandRate(sample_rate_hz_));
+
+  if (config_.delay.fixed_capture_delay_samples > 0) {
+    block_delay_buffer_.reset(new BlockDelayBuffer(
+        num_capture_channels_, num_bands_, AudioBuffer::kSplitBandSize,
+        config_.delay.fixed_capture_delay_samples));
+  }
+
+  render_writer_.reset(new RenderWriter(data_dumper_.get(), config_,
+                                        &render_transfer_queue_, num_bands_,
+                                        num_render_channels_));
+
+  RTC_DCHECK_EQ(num_bands_, std::max(sample_rate_hz_, 16000) / 16000);
+  RTC_DCHECK_GE(kMaxNumBands, num_bands_);
+
+  if (config_.filter.export_linear_aec_output) {
+    linear_output_framer_.reset(new BlockFramer(1, num_capture_channels_));
+    linear_output_block_ =
+        std::make_unique<std::vector<std::vector<std::vector<float>>>>(
+            1, std::vector<std::vector<float>>(
+                   num_capture_channels_, std::vector<float>(kBlockSize, 0.f)));
+    linear_output_sub_frame_view_ =
+        std::vector<std::vector<rtc::ArrayView<float>>>(
+            1, std::vector<rtc::ArrayView<float>>(num_capture_channels_));
+  }
+}
+
+EchoCanceller3::~EchoCanceller3() = default;
+
+void EchoCanceller3::AnalyzeRender(const AudioBuffer& render) {
+  RTC_DCHECK_RUNS_SERIALIZED(&render_race_checker_);
+
+  RTC_DCHECK_EQ(render.num_channels(), num_render_channels_);
+  data_dumper_->DumpRaw("aec3_call_order",
+                        static_cast<int>(EchoCanceller3ApiCall::kRender));
+
+  return render_writer_->Insert(render);
+}
+
+void EchoCanceller3::AnalyzeCapture(const AudioBuffer& capture) {
+  RTC_DCHECK_RUNS_SERIALIZED(&capture_race_checker_);
+  data_dumper_->DumpWav("aec3_capture_analyze_input", capture.num_frames(),
+                        capture.channels_const()[0], sample_rate_hz_, 1);
+  saturated_microphone_signal_ = false;
+  for (size_t channel = 0; channel < capture.num_channels(); ++channel) {
+    saturated_microphone_signal_ |=
+        DetectSaturation(rtc::ArrayView<const float>(
+            capture.channels_const()[channel], capture.num_frames()));
+    if (saturated_microphone_signal_) {
+      break;
+    }
+  }
+}
+
+void EchoCanceller3::ProcessCapture(AudioBuffer* capture, bool level_change) {
+  ProcessCapture(capture, nullptr, level_change);
+}
+
+void EchoCanceller3::ProcessCapture(AudioBuffer* capture,
+                                    AudioBuffer* linear_output,
+                                    bool level_change) {
+  RTC_DCHECK_RUNS_SERIALIZED(&capture_race_checker_);
+  RTC_DCHECK(capture);
+  RTC_DCHECK_EQ(num_bands_, capture->num_bands());
+  RTC_DCHECK_EQ(AudioBuffer::kSplitBandSize, capture->num_frames_per_band());
+  RTC_DCHECK_EQ(capture->num_channels(), num_capture_channels_);
+  data_dumper_->DumpRaw("aec3_call_order",
+                        static_cast<int>(EchoCanceller3ApiCall::kCapture));
+
+  if (linear_output && !linear_output_framer_) {
+    RTC_LOG(LS_ERROR) << "Trying to retrieve the linear AEC output without "
+                         "properly configuring AEC3.";
+    RTC_NOTREACHED();
+  }
+
+  // Report capture call in the metrics and periodically update API call
+  // metrics.
+  api_call_metrics_.ReportCaptureCall();
+
+  // Optionally delay the capture signal.
+  if (config_.delay.fixed_capture_delay_samples > 0) {
+    RTC_DCHECK(block_delay_buffer_);
+    block_delay_buffer_->DelaySignal(capture);
+  }
+
+  rtc::ArrayView<float> capture_lower_band = rtc::ArrayView<float>(
+      &capture->split_bands(0)[0][0], AudioBuffer::kSplitBandSize);
+
+  data_dumper_->DumpWav("aec3_capture_input", capture_lower_band, 16000, 1);
+
+  EmptyRenderQueue();
+
+  ProcessCaptureFrameContent(linear_output, capture, level_change,
+                             saturated_microphone_signal_, 0, &capture_blocker_,
+                             linear_output_framer_.get(), &output_framer_,
+                             block_processor_.get(), linear_output_block_.get(),
+                             &linear_output_sub_frame_view_, &capture_block_,
+                             &capture_sub_frame_view_);
+
+  ProcessCaptureFrameContent(linear_output, capture, level_change,
+                             saturated_microphone_signal_, 1, &capture_blocker_,
+                             linear_output_framer_.get(), &output_framer_,
+                             block_processor_.get(), linear_output_block_.get(),
+                             &linear_output_sub_frame_view_, &capture_block_,
+                             &capture_sub_frame_view_);
+
+  ProcessRemainingCaptureFrameContent(
+      level_change, saturated_microphone_signal_, &capture_blocker_,
+      linear_output_framer_.get(), &output_framer_, block_processor_.get(),
+      linear_output_block_.get(), &capture_block_);
+
+  data_dumper_->DumpWav("aec3_capture_output", AudioBuffer::kSplitBandSize,
+                        &capture->split_bands(0)[0][0], 16000, 1);
+}
+
+EchoControl::Metrics EchoCanceller3::GetMetrics() const {
+  RTC_DCHECK_RUNS_SERIALIZED(&capture_race_checker_);
+  Metrics metrics;
+  block_processor_->GetMetrics(&metrics);
+  return metrics;
+}
+
+void EchoCanceller3::SetAudioBufferDelay(int delay_ms) {
+  RTC_DCHECK_RUNS_SERIALIZED(&capture_race_checker_);
+  block_processor_->SetAudioBufferDelay(delay_ms);
+}
+
+void EchoCanceller3::SetCaptureOutputUsage(bool capture_output_used) {
+  RTC_DCHECK_RUNS_SERIALIZED(&capture_race_checker_);
+  block_processor_->SetCaptureOutputUsage(capture_output_used);
+}
+
+bool EchoCanceller3::ActiveProcessing() const {
+  return true;
+}
+
+EchoCanceller3Config EchoCanceller3::CreateDefaultConfig(
+    size_t num_render_channels,
+    size_t num_capture_channels) {
+  EchoCanceller3Config cfg;
+  if (num_render_channels > 1) {
+    // Use shorter and more rapidly adapting coarse filter to compensate for
+    // thge increased number of total filter parameters to adapt.
+    cfg.filter.coarse.length_blocks = 11;
+    cfg.filter.coarse.rate = 0.95f;
+    cfg.filter.coarse_initial.length_blocks = 11;
+    cfg.filter.coarse_initial.rate = 0.95f;
+
+    // Use more concervative suppressor behavior for non-nearend speech.
+    cfg.suppressor.normal_tuning.max_dec_factor_lf = 0.35f;
+    cfg.suppressor.normal_tuning.max_inc_factor = 1.5f;
+  }
+  return cfg;
+}
+
+void EchoCanceller3::EmptyRenderQueue() {
+  RTC_DCHECK_RUNS_SERIALIZED(&capture_race_checker_);
+  bool frame_to_buffer =
+      render_transfer_queue_.Remove(&render_queue_output_frame_);
+  while (frame_to_buffer) {
+    // Report render call in the metrics.
+    api_call_metrics_.ReportRenderCall();
+
+    BufferRenderFrameContent(&render_queue_output_frame_, 0, &render_blocker_,
+                             block_processor_.get(), &render_block_,
+                             &render_sub_frame_view_);
+
+    BufferRenderFrameContent(&render_queue_output_frame_, 1, &render_blocker_,
+                             block_processor_.get(), &render_block_,
+                             &render_sub_frame_view_);
+
+    BufferRemainingRenderFrameContent(&render_blocker_, block_processor_.get(),
+                                      &render_block_);
+
+    frame_to_buffer =
+        render_transfer_queue_.Remove(&render_queue_output_frame_);
+  }
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,202 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_
+
+#include <stddef.h>
+
+#include <memory>
+#include <vector>
+
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "api/audio/echo_control.h"
+#include "modules/audio_processing/aec3/api_call_jitter_metrics.h"
+#include "modules/audio_processing/aec3/block_delay_buffer.h"
+#include "modules/audio_processing/aec3/block_framer.h"
+#include "modules/audio_processing/aec3/block_processor.h"
+#include "modules/audio_processing/aec3/frame_blocker.h"
+#include "modules/audio_processing/audio_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/race_checker.h"
+#include "rtc_base/swap_queue.h"
+#include "rtc_base/thread_annotations.h"
+
+namespace webrtc {
+
+// Method for adjusting config parameter dependencies.
+// Only to be used externally to AEC3 for testing purposes.
+// TODO(webrtc:5298): Move this to a separate file.
+EchoCanceller3Config AdjustConfig(const EchoCanceller3Config& config);
+
+// Functor for verifying the invariance of the frames being put into the render
+// queue.
+class Aec3RenderQueueItemVerifier {
+ public:
+  Aec3RenderQueueItemVerifier(size_t num_bands,
+                              size_t num_channels,
+                              size_t frame_length)
+      : num_bands_(num_bands),
+        num_channels_(num_channels),
+        frame_length_(frame_length) {}
+
+  bool operator()(const std::vector<std::vector<std::vector<float>>>& v) const {
+    if (v.size() != num_bands_) {
+      return false;
+    }
+    for (const auto& band : v) {
+      if (band.size() != num_channels_) {
+        return false;
+      }
+      for (const auto& channel : band) {
+        if (channel.size() != frame_length_) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
+ private:
+  const size_t num_bands_;
+  const size_t num_channels_;
+  const size_t frame_length_;
+};
+
+// Main class for the echo canceller3.
+// It does 4 things:
+// -Receives 10 ms frames of band-split audio.
+// -Provides the lower level echo canceller functionality with
+// blocks of 64 samples of audio data.
+// -Partially handles the jitter in the render and capture API
+// call sequence.
+//
+// The class is supposed to be used in a non-concurrent manner apart from the
+// AnalyzeRender call which can be called concurrently with the other methods.
+class EchoCanceller3 : public EchoControl {
+ public:
+  // Normal c-tor to use.
+  EchoCanceller3(const EchoCanceller3Config& config,
+                 int sample_rate_hz,
+                 size_t num_render_channels,
+                 size_t num_capture_channels);
+  // Testing c-tor that is used only for testing purposes.
+  EchoCanceller3(const EchoCanceller3Config& config,
+                 int sample_rate_hz,
+                 size_t num_render_channels,
+                 size_t num_capture_channels,
+                 std::unique_ptr<BlockProcessor> block_processor);
+  ~EchoCanceller3() override;
+  EchoCanceller3(const EchoCanceller3&) = delete;
+  EchoCanceller3& operator=(const EchoCanceller3&) = delete;
+
+  // Analyzes and stores an internal copy of the split-band domain render
+  // signal.
+  void AnalyzeRender(AudioBuffer* render) override { AnalyzeRender(*render); }
+  // Analyzes the full-band domain capture signal to detect signal saturation.
+  void AnalyzeCapture(AudioBuffer* capture) override {
+    AnalyzeCapture(*capture);
+  }
+  // Processes the split-band domain capture signal in order to remove any echo
+  // present in the signal.
+  void ProcessCapture(AudioBuffer* capture, bool level_change) override;
+  // As above, but also returns the linear filter output.
+  void ProcessCapture(AudioBuffer* capture,
+                      AudioBuffer* linear_output,
+                      bool level_change) override;
+  // Collect current metrics from the echo canceller.
+  Metrics GetMetrics() const override;
+  // Provides an optional external estimate of the audio buffer delay.
+  void SetAudioBufferDelay(int delay_ms) override;
+
+  // Specifies whether the capture output will be used. The purpose of this is
+  // to allow the echo controller to deactivate some of the processing when the
+  // resulting output is anyway not used, for instance when the endpoint is
+  // muted.
+  void SetCaptureOutputUsage(bool capture_output_used) override;
+
+  bool ActiveProcessing() const override;
+
+  // Signals whether an external detector has detected echo leakage from the
+  // echo canceller.
+  // Note that in the case echo leakage has been flagged, it should be unflagged
+  // once it is no longer occurring.
+  void UpdateEchoLeakageStatus(bool leakage_detected) {
+    RTC_DCHECK_RUNS_SERIALIZED(&capture_race_checker_);
+    block_processor_->UpdateEchoLeakageStatus(leakage_detected);
+  }
+
+  // Produces a default configuration that is suitable for a certain combination
+  // of render and capture channels.
+  static EchoCanceller3Config CreateDefaultConfig(size_t num_render_channels,
+                                                  size_t num_capture_channels);
+
+ private:
+  class RenderWriter;
+
+  // Empties the render SwapQueue.
+  void EmptyRenderQueue();
+
+  // Analyzes and stores an internal copy of the split-band domain render
+  // signal.
+  void AnalyzeRender(const AudioBuffer& render);
+  // Analyzes the full-band domain capture signal to detect signal saturation.
+  void AnalyzeCapture(const AudioBuffer& capture);
+
+  rtc::RaceChecker capture_race_checker_;
+  rtc::RaceChecker render_race_checker_;
+
+  // State that is accessed by the AnalyzeRender call.
+  std::unique_ptr<RenderWriter> render_writer_
+      RTC_GUARDED_BY(render_race_checker_);
+
+  // State that may be accessed by the capture thread.
+  static int instance_count_;
+  std::unique_ptr<ApmDataDumper> data_dumper_;
+  const EchoCanceller3Config config_;
+  const int sample_rate_hz_;
+  const int num_bands_;
+  const size_t num_render_channels_;
+  const size_t num_capture_channels_;
+  std::unique_ptr<BlockFramer> linear_output_framer_
+      RTC_GUARDED_BY(capture_race_checker_);
+  BlockFramer output_framer_ RTC_GUARDED_BY(capture_race_checker_);
+  FrameBlocker capture_blocker_ RTC_GUARDED_BY(capture_race_checker_);
+  FrameBlocker render_blocker_ RTC_GUARDED_BY(capture_race_checker_);
+  SwapQueue<std::vector<std::vector<std::vector<float>>>,
+            Aec3RenderQueueItemVerifier>
+      render_transfer_queue_;
+  std::unique_ptr<BlockProcessor> block_processor_
+      RTC_GUARDED_BY(capture_race_checker_);
+  std::vector<std::vector<std::vector<float>>> render_queue_output_frame_
+      RTC_GUARDED_BY(capture_race_checker_);
+  bool saturated_microphone_signal_ RTC_GUARDED_BY(capture_race_checker_) =
+      false;
+  std::vector<std::vector<std::vector<float>>> render_block_
+      RTC_GUARDED_BY(capture_race_checker_);
+  std::unique_ptr<std::vector<std::vector<std::vector<float>>>>
+      linear_output_block_ RTC_GUARDED_BY(capture_race_checker_);
+  std::vector<std::vector<std::vector<float>>> capture_block_
+      RTC_GUARDED_BY(capture_race_checker_);
+  std::vector<std::vector<rtc::ArrayView<float>>> render_sub_frame_view_
+      RTC_GUARDED_BY(capture_race_checker_);
+  std::vector<std::vector<rtc::ArrayView<float>>> linear_output_sub_frame_view_
+      RTC_GUARDED_BY(capture_race_checker_);
+  std::vector<std::vector<rtc::ArrayView<float>>> capture_sub_frame_view_
+      RTC_GUARDED_BY(capture_race_checker_);
+  std::unique_ptr<BlockDelayBuffer> block_delay_buffer_
+      RTC_GUARDED_BY(capture_race_checker_);
+  ApiCallJitterMetrics api_call_metrics_ RTC_GUARDED_BY(capture_race_checker_);
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_ECHO_CANCELLER3_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_canceller3_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,930 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/echo_canceller3.h"
+
+#include <deque>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/block_processor.h"
+#include "modules/audio_processing/aec3/frame_blocker.h"
+#include "modules/audio_processing/aec3/mock/mock_block_processor.h"
+#include "modules/audio_processing/audio_buffer.h"
+#include "modules/audio_processing/high_pass_filter.h"
+#include "modules/audio_processing/utility/cascaded_biquad_filter.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/field_trial.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+using ::testing::_;
+using ::testing::StrictMock;
+
+// Populates the frame with linearly increasing sample values for each band,
+// with a band-specific offset, in order to allow simple bitexactness
+// verification for each band.
+void PopulateInputFrame(size_t frame_length,
+                        size_t num_bands,
+                        size_t frame_index,
+                        float* const* frame,
+                        int offset) {
+  for (size_t k = 0; k < num_bands; ++k) {
+    for (size_t i = 0; i < frame_length; ++i) {
+      float value = static_cast<int>(frame_index * frame_length + i) + offset;
+      frame[k][i] = (value > 0 ? 5000 * k + value : 0);
+    }
+  }
+}
+
+// Populates the frame with linearly increasing sample values.
+void PopulateInputFrame(size_t frame_length,
+                        size_t frame_index,
+                        float* frame,
+                        int offset) {
+  for (size_t i = 0; i < frame_length; ++i) {
+    float value = static_cast<int>(frame_index * frame_length + i) + offset;
+    frame[i] = std::max(value, 0.f);
+  }
+}
+
+// Verifies the that samples in the output frame are identical to the samples
+// that were produced for the input frame, with an offset in order to compensate
+// for buffering delays.
+bool VerifyOutputFrameBitexactness(size_t frame_length,
+                                   size_t num_bands,
+                                   size_t frame_index,
+                                   const float* const* frame,
+                                   int offset) {
+  float reference_frame_data[kMaxNumBands][2 * kSubFrameLength];
+  float* reference_frame[kMaxNumBands];
+  for (size_t k = 0; k < num_bands; ++k) {
+    reference_frame[k] = &reference_frame_data[k][0];
+  }
+
+  PopulateInputFrame(frame_length, num_bands, frame_index, reference_frame,
+                     offset);
+  for (size_t k = 0; k < num_bands; ++k) {
+    for (size_t i = 0; i < frame_length; ++i) {
+      if (reference_frame[k][i] != frame[k][i]) {
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
+
+bool VerifyOutputFrameBitexactness(rtc::ArrayView<const float> reference,
+                                   rtc::ArrayView<const float> frame,
+                                   int offset) {
+  for (size_t k = 0; k < frame.size(); ++k) {
+    int reference_index = static_cast<int>(k) + offset;
+    if (reference_index >= 0) {
+      if (reference[reference_index] != frame[k]) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+// Class for testing that the capture data is properly received by the block
+// processor and that the processor data is properly passed to the
+// EchoCanceller3 output.
+class CaptureTransportVerificationProcessor : public BlockProcessor {
+ public:
+  explicit CaptureTransportVerificationProcessor(size_t num_bands) {}
+
+  CaptureTransportVerificationProcessor() = delete;
+  CaptureTransportVerificationProcessor(
+      const CaptureTransportVerificationProcessor&) = delete;
+  CaptureTransportVerificationProcessor& operator=(
+      const CaptureTransportVerificationProcessor&) = delete;
+
+  ~CaptureTransportVerificationProcessor() override = default;
+
+  void ProcessCapture(
+      bool level_change,
+      bool saturated_microphone_signal,
+      std::vector<std::vector<std::vector<float>>>* linear_output,
+      std::vector<std::vector<std::vector<float>>>* capture_block) override {}
+
+  void BufferRender(
+      const std::vector<std::vector<std::vector<float>>>& block) override {}
+
+  void UpdateEchoLeakageStatus(bool leakage_detected) override {}
+
+  void GetMetrics(EchoControl::Metrics* metrics) const override {}
+
+  void SetAudioBufferDelay(int delay_ms) override {}
+
+  void SetCaptureOutputUsage(bool capture_output_used) {}
+};
+
+// Class for testing that the render data is properly received by the block
+// processor.
+class RenderTransportVerificationProcessor : public BlockProcessor {
+ public:
+  explicit RenderTransportVerificationProcessor(size_t num_bands) {}
+
+  RenderTransportVerificationProcessor() = delete;
+  RenderTransportVerificationProcessor(
+      const RenderTransportVerificationProcessor&) = delete;
+  RenderTransportVerificationProcessor& operator=(
+      const RenderTransportVerificationProcessor&) = delete;
+
+  ~RenderTransportVerificationProcessor() override = default;
+
+  void ProcessCapture(
+      bool level_change,
+      bool saturated_microphone_signal,
+      std::vector<std::vector<std::vector<float>>>* linear_output,
+      std::vector<std::vector<std::vector<float>>>* capture_block) override {
+    std::vector<std::vector<std::vector<float>>> render_block =
+        received_render_blocks_.front();
+    received_render_blocks_.pop_front();
+    capture_block->swap(render_block);
+  }
+
+  void BufferRender(
+      const std::vector<std::vector<std::vector<float>>>& block) override {
+    received_render_blocks_.push_back(block);
+  }
+
+  void UpdateEchoLeakageStatus(bool leakage_detected) override {}
+
+  void GetMetrics(EchoControl::Metrics* metrics) const override {}
+
+  void SetAudioBufferDelay(int delay_ms) override {}
+
+  void SetCaptureOutputUsage(bool capture_output_used) {}
+
+ private:
+  std::deque<std::vector<std::vector<std::vector<float>>>>
+      received_render_blocks_;
+};
+
+class EchoCanceller3Tester {
+ public:
+  explicit EchoCanceller3Tester(int sample_rate_hz)
+      : sample_rate_hz_(sample_rate_hz),
+        num_bands_(NumBandsForRate(sample_rate_hz_)),
+        frame_length_(160),
+        fullband_frame_length_(rtc::CheckedDivExact(sample_rate_hz_, 100)),
+        capture_buffer_(fullband_frame_length_ * 100,
+                        1,
+                        fullband_frame_length_ * 100,
+                        1,
+                        fullband_frame_length_ * 100,
+                        1),
+        render_buffer_(fullband_frame_length_ * 100,
+                       1,
+                       fullband_frame_length_ * 100,
+                       1,
+                       fullband_frame_length_ * 100,
+                       1) {}
+
+  EchoCanceller3Tester() = delete;
+  EchoCanceller3Tester(const EchoCanceller3Tester&) = delete;
+  EchoCanceller3Tester& operator=(const EchoCanceller3Tester&) = delete;
+
+  // Verifies that the capture data is properly received by the block processor
+  // and that the processor data is properly passed to the EchoCanceller3
+  // output.
+  void RunCaptureTransportVerificationTest() {
+    EchoCanceller3 aec3(
+        EchoCanceller3Config(), sample_rate_hz_, 1, 1,
+        std::unique_ptr<BlockProcessor>(
+            new CaptureTransportVerificationProcessor(num_bands_)));
+
+    for (size_t frame_index = 0; frame_index < kNumFramesToProcess;
+         ++frame_index) {
+      aec3.AnalyzeCapture(&capture_buffer_);
+      OptionalBandSplit();
+      PopulateInputFrame(frame_length_, num_bands_, frame_index,
+                         &capture_buffer_.split_bands(0)[0], 0);
+      PopulateInputFrame(frame_length_, frame_index,
+                         &render_buffer_.channels()[0][0], 0);
+
+      aec3.AnalyzeRender(&render_buffer_);
+      aec3.ProcessCapture(&capture_buffer_, false);
+      EXPECT_TRUE(VerifyOutputFrameBitexactness(
+          frame_length_, num_bands_, frame_index,
+          &capture_buffer_.split_bands(0)[0], -64));
+    }
+  }
+
+  // Test method for testing that the render data is properly received by the
+  // block processor.
+  void RunRenderTransportVerificationTest() {
+    EchoCanceller3 aec3(
+        EchoCanceller3Config(), sample_rate_hz_, 1, 1,
+        std::unique_ptr<BlockProcessor>(
+            new RenderTransportVerificationProcessor(num_bands_)));
+
+    std::vector<std::vector<float>> render_input(1);
+    std::vector<float> capture_output;
+    for (size_t frame_index = 0; frame_index < kNumFramesToProcess;
+         ++frame_index) {
+      aec3.AnalyzeCapture(&capture_buffer_);
+      OptionalBandSplit();
+      PopulateInputFrame(frame_length_, num_bands_, frame_index,
+                         &capture_buffer_.split_bands(0)[0], 100);
+      PopulateInputFrame(frame_length_, num_bands_, frame_index,
+                         &render_buffer_.split_bands(0)[0], 0);
+
+      for (size_t k = 0; k < frame_length_; ++k) {
+        render_input[0].push_back(render_buffer_.split_bands(0)[0][k]);
+      }
+      aec3.AnalyzeRender(&render_buffer_);
+      aec3.ProcessCapture(&capture_buffer_, false);
+      for (size_t k = 0; k < frame_length_; ++k) {
+        capture_output.push_back(capture_buffer_.split_bands(0)[0][k]);
+      }
+    }
+
+    EXPECT_TRUE(
+        VerifyOutputFrameBitexactness(render_input[0], capture_output, -64));
+  }
+
+  // Verifies that information about echo path changes are properly propagated
+  // to the block processor.
+  // The cases tested are:
+  // -That no set echo path change flags are received when there is no echo path
+  // change.
+  // -That set echo path change flags are received and continues to be received
+  // as long as echo path changes are flagged.
+  // -That set echo path change flags are no longer received when echo path
+  // change events stop being flagged.
+  enum class EchoPathChangeTestVariant { kNone, kOneSticky, kOneNonSticky };
+
+  void RunEchoPathChangeVerificationTest(
+      EchoPathChangeTestVariant echo_path_change_test_variant) {
+    constexpr size_t kNumFullBlocksPerFrame = 160 / kBlockSize;
+    constexpr size_t kExpectedNumBlocksToProcess =
+        (kNumFramesToProcess * 160) / kBlockSize;
+    std::unique_ptr<testing::StrictMock<webrtc::test::MockBlockProcessor>>
+        block_processor_mock(
+            new StrictMock<webrtc::test::MockBlockProcessor>());
+    EXPECT_CALL(*block_processor_mock, BufferRender(_))
+        .Times(kExpectedNumBlocksToProcess);
+    EXPECT_CALL(*block_processor_mock, UpdateEchoLeakageStatus(_)).Times(0);
+
+    switch (echo_path_change_test_variant) {
+      case EchoPathChangeTestVariant::kNone:
+        EXPECT_CALL(*block_processor_mock, ProcessCapture(false, _, _, _))
+            .Times(kExpectedNumBlocksToProcess);
+        break;
+      case EchoPathChangeTestVariant::kOneSticky:
+        EXPECT_CALL(*block_processor_mock, ProcessCapture(true, _, _, _))
+            .Times(kExpectedNumBlocksToProcess);
+        break;
+      case EchoPathChangeTestVariant::kOneNonSticky:
+        EXPECT_CALL(*block_processor_mock, ProcessCapture(true, _, _, _))
+            .Times(kNumFullBlocksPerFrame);
+        EXPECT_CALL(*block_processor_mock, ProcessCapture(false, _, _, _))
+            .Times(kExpectedNumBlocksToProcess - kNumFullBlocksPerFrame);
+        break;
+    }
+
+    EchoCanceller3 aec3(EchoCanceller3Config(), sample_rate_hz_, 1, 1,
+                        std::move(block_processor_mock));
+
+    for (size_t frame_index = 0; frame_index < kNumFramesToProcess;
+         ++frame_index) {
+      bool echo_path_change = false;
+      switch (echo_path_change_test_variant) {
+        case EchoPathChangeTestVariant::kNone:
+          break;
+        case EchoPathChangeTestVariant::kOneSticky:
+          echo_path_change = true;
+          break;
+        case EchoPathChangeTestVariant::kOneNonSticky:
+          if (frame_index == 0) {
+            echo_path_change = true;
+          }
+          break;
+      }
+
+      aec3.AnalyzeCapture(&capture_buffer_);
+      OptionalBandSplit();
+
+      PopulateInputFrame(frame_length_, num_bands_, frame_index,
+                         &capture_buffer_.split_bands(0)[0], 0);
+      PopulateInputFrame(frame_length_, frame_index,
+                         &render_buffer_.channels()[0][0], 0);
+
+      aec3.AnalyzeRender(&render_buffer_);
+      aec3.ProcessCapture(&capture_buffer_, echo_path_change);
+    }
+  }
+
+  // Test for verifying that echo leakage information is being properly passed
+  // to the processor.
+  // The cases tested are:
+  // -That no method calls are received when they should not.
+  // -That false values are received each time they are flagged.
+  // -That true values are received each time they are flagged.
+  // -That a false value is received when flagged after a true value has been
+  // flagged.
+  enum class EchoLeakageTestVariant {
+    kNone,
+    kFalseSticky,
+    kTrueSticky,
+    kTrueNonSticky
+  };
+
+  void RunEchoLeakageVerificationTest(
+      EchoLeakageTestVariant leakage_report_variant) {
+    constexpr size_t kExpectedNumBlocksToProcess =
+        (kNumFramesToProcess * 160) / kBlockSize;
+    std::unique_ptr<testing::StrictMock<webrtc::test::MockBlockProcessor>>
+        block_processor_mock(
+            new StrictMock<webrtc::test::MockBlockProcessor>());
+    EXPECT_CALL(*block_processor_mock, BufferRender(_))
+        .Times(kExpectedNumBlocksToProcess);
+    EXPECT_CALL(*block_processor_mock, ProcessCapture(_, _, _, _))
+        .Times(kExpectedNumBlocksToProcess);
+
+    switch (leakage_report_variant) {
+      case EchoLeakageTestVariant::kNone:
+        EXPECT_CALL(*block_processor_mock, UpdateEchoLeakageStatus(_)).Times(0);
+        break;
+      case EchoLeakageTestVariant::kFalseSticky:
+        EXPECT_CALL(*block_processor_mock, UpdateEchoLeakageStatus(false))
+            .Times(1);
+        break;
+      case EchoLeakageTestVariant::kTrueSticky:
+        EXPECT_CALL(*block_processor_mock, UpdateEchoLeakageStatus(true))
+            .Times(1);
+        break;
+      case EchoLeakageTestVariant::kTrueNonSticky: {
+        ::testing::InSequence s;
+        EXPECT_CALL(*block_processor_mock, UpdateEchoLeakageStatus(true))
+            .Times(1);
+        EXPECT_CALL(*block_processor_mock, UpdateEchoLeakageStatus(false))
+            .Times(kNumFramesToProcess - 1);
+      } break;
+    }
+
+    EchoCanceller3 aec3(EchoCanceller3Config(), sample_rate_hz_, 1, 1,
+                        std::move(block_processor_mock));
+
+    for (size_t frame_index = 0; frame_index < kNumFramesToProcess;
+         ++frame_index) {
+      switch (leakage_report_variant) {
+        case EchoLeakageTestVariant::kNone:
+          break;
+        case EchoLeakageTestVariant::kFalseSticky:
+          if (frame_index == 0) {
+            aec3.UpdateEchoLeakageStatus(false);
+          }
+          break;
+        case EchoLeakageTestVariant::kTrueSticky:
+          if (frame_index == 0) {
+            aec3.UpdateEchoLeakageStatus(true);
+          }
+          break;
+        case EchoLeakageTestVariant::kTrueNonSticky:
+          if (frame_index == 0) {
+            aec3.UpdateEchoLeakageStatus(true);
+          } else {
+            aec3.UpdateEchoLeakageStatus(false);
+          }
+          break;
+      }
+
+      aec3.AnalyzeCapture(&capture_buffer_);
+      OptionalBandSplit();
+
+      PopulateInputFrame(frame_length_, num_bands_, frame_index,
+                         &capture_buffer_.split_bands(0)[0], 0);
+      PopulateInputFrame(frame_length_, frame_index,
+                         &render_buffer_.channels()[0][0], 0);
+
+      aec3.AnalyzeRender(&render_buffer_);
+      aec3.ProcessCapture(&capture_buffer_, false);
+    }
+  }
+
+  // This verifies that saturation information is properly passed to the
+  // BlockProcessor.
+  // The cases tested are:
+  // -That no saturation event is passed to the processor if there is no
+  // saturation.
+  // -That one frame with one negative saturated sample value is reported to be
+  // saturated and that following non-saturated frames are properly reported as
+  // not being saturated.
+  // -That one frame with one positive saturated sample value is reported to be
+  // saturated and that following non-saturated frames are properly reported as
+  // not being saturated.
+  enum class SaturationTestVariant { kNone, kOneNegative, kOnePositive };
+
+  void RunCaptureSaturationVerificationTest(
+      SaturationTestVariant saturation_variant) {
+    const size_t kNumFullBlocksPerFrame = 160 / kBlockSize;
+    const size_t kExpectedNumBlocksToProcess =
+        (kNumFramesToProcess * 160) / kBlockSize;
+    std::unique_ptr<testing::StrictMock<webrtc::test::MockBlockProcessor>>
+        block_processor_mock(
+            new StrictMock<webrtc::test::MockBlockProcessor>());
+    EXPECT_CALL(*block_processor_mock, BufferRender(_))
+        .Times(kExpectedNumBlocksToProcess);
+    EXPECT_CALL(*block_processor_mock, UpdateEchoLeakageStatus(_)).Times(0);
+
+    switch (saturation_variant) {
+      case SaturationTestVariant::kNone:
+        EXPECT_CALL(*block_processor_mock, ProcessCapture(_, false, _, _))
+            .Times(kExpectedNumBlocksToProcess);
+        break;
+      case SaturationTestVariant::kOneNegative: {
+        ::testing::InSequence s;
+        EXPECT_CALL(*block_processor_mock, ProcessCapture(_, true, _, _))
+            .Times(kNumFullBlocksPerFrame);
+        EXPECT_CALL(*block_processor_mock, ProcessCapture(_, false, _, _))
+            .Times(kExpectedNumBlocksToProcess - kNumFullBlocksPerFrame);
+      } break;
+      case SaturationTestVariant::kOnePositive: {
+        ::testing::InSequence s;
+        EXPECT_CALL(*block_processor_mock, ProcessCapture(_, true, _, _))
+            .Times(kNumFullBlocksPerFrame);
+        EXPECT_CALL(*block_processor_mock, ProcessCapture(_, false, _, _))
+            .Times(kExpectedNumBlocksToProcess - kNumFullBlocksPerFrame);
+      } break;
+    }
+
+    EchoCanceller3 aec3(EchoCanceller3Config(), sample_rate_hz_, 1, 1,
+                        std::move(block_processor_mock));
+    for (size_t frame_index = 0; frame_index < kNumFramesToProcess;
+         ++frame_index) {
+      for (int k = 0; k < fullband_frame_length_; ++k) {
+        capture_buffer_.channels()[0][k] = 0.f;
+      }
+      switch (saturation_variant) {
+        case SaturationTestVariant::kNone:
+          break;
+        case SaturationTestVariant::kOneNegative:
+          if (frame_index == 0) {
+            capture_buffer_.channels()[0][10] = -32768.f;
+          }
+          break;
+        case SaturationTestVariant::kOnePositive:
+          if (frame_index == 0) {
+            capture_buffer_.channels()[0][10] = 32767.f;
+          }
+          break;
+      }
+
+      aec3.AnalyzeCapture(&capture_buffer_);
+      OptionalBandSplit();
+
+      PopulateInputFrame(frame_length_, num_bands_, frame_index,
+                         &capture_buffer_.split_bands(0)[0], 0);
+      PopulateInputFrame(frame_length_, num_bands_, frame_index,
+                         &render_buffer_.split_bands(0)[0], 0);
+
+      aec3.AnalyzeRender(&render_buffer_);
+      aec3.ProcessCapture(&capture_buffer_, false);
+    }
+  }
+
+  // This test verifies that the swapqueue is able to handle jitter in the
+  // capture and render API calls.
+  void RunRenderSwapQueueVerificationTest() {
+    const EchoCanceller3Config config;
+    EchoCanceller3 aec3(
+        config, sample_rate_hz_, 1, 1,
+        std::unique_ptr<BlockProcessor>(
+            new RenderTransportVerificationProcessor(num_bands_)));
+
+    std::vector<std::vector<float>> render_input(1);
+    std::vector<float> capture_output;
+
+    for (size_t frame_index = 0; frame_index < kRenderTransferQueueSizeFrames;
+         ++frame_index) {
+      if (sample_rate_hz_ > 16000) {
+        render_buffer_.SplitIntoFrequencyBands();
+      }
+      PopulateInputFrame(frame_length_, num_bands_, frame_index,
+                         &render_buffer_.split_bands(0)[0], 0);
+
+      if (sample_rate_hz_ > 16000) {
+        render_buffer_.SplitIntoFrequencyBands();
+      }
+
+      for (size_t k = 0; k < frame_length_; ++k) {
+        render_input[0].push_back(render_buffer_.split_bands(0)[0][k]);
+      }
+      aec3.AnalyzeRender(&render_buffer_);
+    }
+
+    for (size_t frame_index = 0; frame_index < kRenderTransferQueueSizeFrames;
+         ++frame_index) {
+      aec3.AnalyzeCapture(&capture_buffer_);
+      if (sample_rate_hz_ > 16000) {
+        capture_buffer_.SplitIntoFrequencyBands();
+      }
+
+      PopulateInputFrame(frame_length_, num_bands_, frame_index,
+                         &capture_buffer_.split_bands(0)[0], 0);
+
+      aec3.ProcessCapture(&capture_buffer_, false);
+      for (size_t k = 0; k < frame_length_; ++k) {
+        capture_output.push_back(capture_buffer_.split_bands(0)[0][k]);
+      }
+    }
+
+    EXPECT_TRUE(
+        VerifyOutputFrameBitexactness(render_input[0], capture_output, -64));
+  }
+
+  // This test verifies that a buffer overrun in the render swapqueue is
+  // properly reported.
+  void RunRenderPipelineSwapQueueOverrunReturnValueTest() {
+    EchoCanceller3 aec3(EchoCanceller3Config(), sample_rate_hz_, 1, 1);
+
+    constexpr size_t kRenderTransferQueueSize = 30;
+    for (size_t k = 0; k < 2; ++k) {
+      for (size_t frame_index = 0; frame_index < kRenderTransferQueueSize;
+           ++frame_index) {
+        if (sample_rate_hz_ > 16000) {
+          render_buffer_.SplitIntoFrequencyBands();
+        }
+        PopulateInputFrame(frame_length_, frame_index,
+                           &render_buffer_.channels()[0][0], 0);
+
+        aec3.AnalyzeRender(&render_buffer_);
+      }
+    }
+  }
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+  // Verifies the that the check for the number of bands in the AnalyzeRender
+  // input is correct by adjusting the sample rates of EchoCanceller3 and the
+  // input AudioBuffer to have a different number of bands.
+  void RunAnalyzeRenderNumBandsCheckVerification() {
+    // Set aec3_sample_rate_hz to be different from sample_rate_hz_ in such a
+    // way that the number of bands for the rates are different.
+    const int aec3_sample_rate_hz = sample_rate_hz_ == 48000 ? 32000 : 48000;
+    EchoCanceller3 aec3(EchoCanceller3Config(), aec3_sample_rate_hz, 1, 1);
+    PopulateInputFrame(frame_length_, 0, &render_buffer_.channels_f()[0][0], 0);
+
+    EXPECT_DEATH(aec3.AnalyzeRender(&render_buffer_), "");
+  }
+
+  // Verifies the that the check for the number of bands in the ProcessCapture
+  // input is correct by adjusting the sample rates of EchoCanceller3 and the
+  // input AudioBuffer to have a different number of bands.
+  void RunProcessCaptureNumBandsCheckVerification() {
+    // Set aec3_sample_rate_hz to be different from sample_rate_hz_ in such a
+    // way that the number of bands for the rates are different.
+    const int aec3_sample_rate_hz = sample_rate_hz_ == 48000 ? 32000 : 48000;
+    EchoCanceller3 aec3(EchoCanceller3Config(), aec3_sample_rate_hz, 1, 1);
+    PopulateInputFrame(frame_length_, num_bands_, 0,
+                       &capture_buffer_.split_bands_f(0)[0], 100);
+    EXPECT_DEATH(aec3.ProcessCapture(&capture_buffer_, false), "");
+  }
+
+#endif
+
+ private:
+  void OptionalBandSplit() {
+    if (sample_rate_hz_ > 16000) {
+      capture_buffer_.SplitIntoFrequencyBands();
+      render_buffer_.SplitIntoFrequencyBands();
+    }
+  }
+
+  static constexpr size_t kNumFramesToProcess = 20;
+  const int sample_rate_hz_;
+  const size_t num_bands_;
+  const size_t frame_length_;
+  const int fullband_frame_length_;
+  AudioBuffer capture_buffer_;
+  AudioBuffer render_buffer_;
+};
+
+std::string ProduceDebugText(int sample_rate_hz) {
+  rtc::StringBuilder ss;
+  ss << "Sample rate: " << sample_rate_hz;
+  return ss.Release();
+}
+
+std::string ProduceDebugText(int sample_rate_hz, int variant) {
+  rtc::StringBuilder ss;
+  ss << "Sample rate: " << sample_rate_hz << ", variant: " << variant;
+  return ss.Release();
+}
+
+}  // namespace
+
+TEST(EchoCanceller3Buffering, CaptureBitexactness) {
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    EchoCanceller3Tester(rate).RunCaptureTransportVerificationTest();
+  }
+}
+
+TEST(EchoCanceller3Buffering, RenderBitexactness) {
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    EchoCanceller3Tester(rate).RunRenderTransportVerificationTest();
+  }
+}
+
+TEST(EchoCanceller3Buffering, RenderSwapQueue) {
+  EchoCanceller3Tester(16000).RunRenderSwapQueueVerificationTest();
+}
+
+TEST(EchoCanceller3Buffering, RenderSwapQueueOverrunReturnValue) {
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    EchoCanceller3Tester(rate)
+        .RunRenderPipelineSwapQueueOverrunReturnValueTest();
+  }
+}
+
+TEST(EchoCanceller3Messaging, CaptureSaturation) {
+  auto variants = {EchoCanceller3Tester::SaturationTestVariant::kNone,
+                   EchoCanceller3Tester::SaturationTestVariant::kOneNegative,
+                   EchoCanceller3Tester::SaturationTestVariant::kOnePositive};
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto variant : variants) {
+      SCOPED_TRACE(ProduceDebugText(rate, static_cast<int>(variant)));
+      EchoCanceller3Tester(rate).RunCaptureSaturationVerificationTest(variant);
+    }
+  }
+}
+
+TEST(EchoCanceller3Messaging, EchoPathChange) {
+  auto variants = {
+      EchoCanceller3Tester::EchoPathChangeTestVariant::kNone,
+      EchoCanceller3Tester::EchoPathChangeTestVariant::kOneSticky,
+      EchoCanceller3Tester::EchoPathChangeTestVariant::kOneNonSticky};
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto variant : variants) {
+      SCOPED_TRACE(ProduceDebugText(rate, static_cast<int>(variant)));
+      EchoCanceller3Tester(rate).RunEchoPathChangeVerificationTest(variant);
+    }
+  }
+}
+
+TEST(EchoCanceller3Messaging, EchoLeakage) {
+  auto variants = {
+      EchoCanceller3Tester::EchoLeakageTestVariant::kNone,
+      EchoCanceller3Tester::EchoLeakageTestVariant::kFalseSticky,
+      EchoCanceller3Tester::EchoLeakageTestVariant::kTrueSticky,
+      EchoCanceller3Tester::EchoLeakageTestVariant::kTrueNonSticky};
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto variant : variants) {
+      SCOPED_TRACE(ProduceDebugText(rate, static_cast<int>(variant)));
+      EchoCanceller3Tester(rate).RunEchoLeakageVerificationTest(variant);
+    }
+  }
+}
+
+// Tests the parameter functionality for the field trial override for the
+// default_len parameter.
+TEST(EchoCanceller3FieldTrials, Aec3SuppressorEpStrengthDefaultLenOverride) {
+  EchoCanceller3Config default_config;
+  EchoCanceller3Config adjusted_config = AdjustConfig(default_config);
+  ASSERT_EQ(default_config.ep_strength.default_len,
+            adjusted_config.ep_strength.default_len);
+
+  webrtc::test::ScopedFieldTrials field_trials(
+      "WebRTC-Aec3SuppressorEpStrengthDefaultLenOverride/-0.02/");
+  adjusted_config = AdjustConfig(default_config);
+
+  ASSERT_NE(default_config.ep_strength.default_len,
+            adjusted_config.ep_strength.default_len);
+  EXPECT_FLOAT_EQ(-0.02f, adjusted_config.ep_strength.default_len);
+}
+
+// Tests the parameter functionality for the field trial override for the
+// anti-howling gain.
+TEST(EchoCanceller3FieldTrials, Aec3SuppressorAntiHowlingGainOverride) {
+  EchoCanceller3Config default_config;
+  EchoCanceller3Config adjusted_config = AdjustConfig(default_config);
+  ASSERT_EQ(
+      default_config.suppressor.high_bands_suppression.anti_howling_gain,
+      adjusted_config.suppressor.high_bands_suppression.anti_howling_gain);
+
+  webrtc::test::ScopedFieldTrials field_trials(
+      "WebRTC-Aec3SuppressorAntiHowlingGainOverride/0.02/");
+  adjusted_config = AdjustConfig(default_config);
+
+  ASSERT_NE(
+      default_config.suppressor.high_bands_suppression.anti_howling_gain,
+      adjusted_config.suppressor.high_bands_suppression.anti_howling_gain);
+  EXPECT_FLOAT_EQ(
+      0.02f,
+      adjusted_config.suppressor.high_bands_suppression.anti_howling_gain);
+}
+
+// Tests the field trial override for the enforcement of a low active render
+// limit.
+TEST(EchoCanceller3FieldTrials, Aec3EnforceLowActiveRenderLimit) {
+  EchoCanceller3Config default_config;
+  EchoCanceller3Config adjusted_config = AdjustConfig(default_config);
+  ASSERT_EQ(default_config.render_levels.active_render_limit,
+            adjusted_config.render_levels.active_render_limit);
+
+  webrtc::test::ScopedFieldTrials field_trials(
+      "WebRTC-Aec3EnforceLowActiveRenderLimit/Enabled/");
+  adjusted_config = AdjustConfig(default_config);
+
+  ASSERT_NE(default_config.render_levels.active_render_limit,
+            adjusted_config.render_levels.active_render_limit);
+  EXPECT_FLOAT_EQ(50.f, adjusted_config.render_levels.active_render_limit);
+}
+
+// Testing the field trial-based override of the suppressor parameters for a
+// joint passing of all parameters.
+TEST(EchoCanceller3FieldTrials, Aec3SuppressorTuningOverrideAllParams) {
+  webrtc::test::ScopedFieldTrials field_trials(
+      "WebRTC-Aec3SuppressorTuningOverride/"
+      "nearend_tuning_mask_lf_enr_transparent:0.1,nearend_tuning_mask_lf_enr_"
+      "suppress:0.2,nearend_tuning_mask_hf_enr_transparent:0.3,nearend_tuning_"
+      "mask_hf_enr_suppress:0.4,nearend_tuning_max_inc_factor:0.5,nearend_"
+      "tuning_max_dec_factor_lf:0.6,normal_tuning_mask_lf_enr_transparent:0.7,"
+      "normal_tuning_mask_lf_enr_suppress:0.8,normal_tuning_mask_hf_enr_"
+      "transparent:0.9,normal_tuning_mask_hf_enr_suppress:1.0,normal_tuning_"
+      "max_inc_factor:1.1,normal_tuning_max_dec_factor_lf:1.2,dominant_nearend_"
+      "detection_enr_threshold:1.3,dominant_nearend_detection_enr_exit_"
+      "threshold:1.4,dominant_nearend_detection_snr_threshold:1.5,dominant_"
+      "nearend_detection_hold_duration:10,dominant_nearend_detection_trigger_"
+      "threshold:11,ep_strength_default_len:1.6/");
+
+  EchoCanceller3Config default_config;
+  EchoCanceller3Config adjusted_config = AdjustConfig(default_config);
+
+  ASSERT_NE(adjusted_config.suppressor.nearend_tuning.mask_lf.enr_transparent,
+            default_config.suppressor.nearend_tuning.mask_lf.enr_transparent);
+  ASSERT_NE(adjusted_config.suppressor.nearend_tuning.mask_lf.enr_suppress,
+            default_config.suppressor.nearend_tuning.mask_lf.enr_suppress);
+  ASSERT_NE(adjusted_config.suppressor.nearend_tuning.mask_hf.enr_transparent,
+            default_config.suppressor.nearend_tuning.mask_hf.enr_transparent);
+  ASSERT_NE(adjusted_config.suppressor.nearend_tuning.mask_hf.enr_suppress,
+            default_config.suppressor.nearend_tuning.mask_hf.enr_suppress);
+  ASSERT_NE(adjusted_config.suppressor.nearend_tuning.max_inc_factor,
+            default_config.suppressor.nearend_tuning.max_inc_factor);
+  ASSERT_NE(adjusted_config.suppressor.nearend_tuning.max_dec_factor_lf,
+            default_config.suppressor.nearend_tuning.max_dec_factor_lf);
+  ASSERT_NE(adjusted_config.suppressor.normal_tuning.mask_lf.enr_transparent,
+            default_config.suppressor.normal_tuning.mask_lf.enr_transparent);
+  ASSERT_NE(adjusted_config.suppressor.normal_tuning.mask_lf.enr_suppress,
+            default_config.suppressor.normal_tuning.mask_lf.enr_suppress);
+  ASSERT_NE(adjusted_config.suppressor.normal_tuning.mask_hf.enr_transparent,
+            default_config.suppressor.normal_tuning.mask_hf.enr_transparent);
+  ASSERT_NE(adjusted_config.suppressor.normal_tuning.mask_hf.enr_suppress,
+            default_config.suppressor.normal_tuning.mask_hf.enr_suppress);
+  ASSERT_NE(adjusted_config.suppressor.normal_tuning.max_inc_factor,
+            default_config.suppressor.normal_tuning.max_inc_factor);
+  ASSERT_NE(adjusted_config.suppressor.normal_tuning.max_dec_factor_lf,
+            default_config.suppressor.normal_tuning.max_dec_factor_lf);
+  ASSERT_NE(adjusted_config.suppressor.dominant_nearend_detection.enr_threshold,
+            default_config.suppressor.dominant_nearend_detection.enr_threshold);
+  ASSERT_NE(
+      adjusted_config.suppressor.dominant_nearend_detection.enr_exit_threshold,
+      default_config.suppressor.dominant_nearend_detection.enr_exit_threshold);
+  ASSERT_NE(adjusted_config.suppressor.dominant_nearend_detection.snr_threshold,
+            default_config.suppressor.dominant_nearend_detection.snr_threshold);
+  ASSERT_NE(adjusted_config.suppressor.dominant_nearend_detection.hold_duration,
+            default_config.suppressor.dominant_nearend_detection.hold_duration);
+  ASSERT_NE(
+      adjusted_config.suppressor.dominant_nearend_detection.trigger_threshold,
+      default_config.suppressor.dominant_nearend_detection.trigger_threshold);
+  ASSERT_NE(adjusted_config.ep_strength.default_len,
+            default_config.ep_strength.default_len);
+
+  EXPECT_FLOAT_EQ(
+      adjusted_config.suppressor.nearend_tuning.mask_lf.enr_transparent, 0.1);
+  EXPECT_FLOAT_EQ(
+      adjusted_config.suppressor.nearend_tuning.mask_lf.enr_suppress, 0.2);
+  EXPECT_FLOAT_EQ(
+      adjusted_config.suppressor.nearend_tuning.mask_hf.enr_transparent, 0.3);
+  EXPECT_FLOAT_EQ(
+      adjusted_config.suppressor.nearend_tuning.mask_hf.enr_suppress, 0.4);
+  EXPECT_FLOAT_EQ(adjusted_config.suppressor.nearend_tuning.max_inc_factor,
+                  0.5);
+  EXPECT_FLOAT_EQ(adjusted_config.suppressor.nearend_tuning.max_dec_factor_lf,
+                  0.6);
+  EXPECT_FLOAT_EQ(
+      adjusted_config.suppressor.normal_tuning.mask_lf.enr_transparent, 0.7);
+  EXPECT_FLOAT_EQ(adjusted_config.suppressor.normal_tuning.mask_lf.enr_suppress,
+                  0.8);
+  EXPECT_FLOAT_EQ(
+      adjusted_config.suppressor.normal_tuning.mask_hf.enr_transparent, 0.9);
+  EXPECT_FLOAT_EQ(adjusted_config.suppressor.normal_tuning.mask_hf.enr_suppress,
+                  1.0);
+  EXPECT_FLOAT_EQ(adjusted_config.suppressor.normal_tuning.max_inc_factor, 1.1);
+  EXPECT_FLOAT_EQ(adjusted_config.suppressor.normal_tuning.max_dec_factor_lf,
+                  1.2);
+  EXPECT_FLOAT_EQ(
+      adjusted_config.suppressor.dominant_nearend_detection.enr_threshold, 1.3);
+  EXPECT_FLOAT_EQ(
+      adjusted_config.suppressor.dominant_nearend_detection.enr_exit_threshold,
+      1.4);
+  EXPECT_FLOAT_EQ(
+      adjusted_config.suppressor.dominant_nearend_detection.snr_threshold, 1.5);
+  EXPECT_EQ(adjusted_config.suppressor.dominant_nearend_detection.hold_duration,
+            10);
+  EXPECT_EQ(
+      adjusted_config.suppressor.dominant_nearend_detection.trigger_threshold,
+      11);
+  EXPECT_FLOAT_EQ(adjusted_config.ep_strength.default_len, 1.6);
+}
+
+// Testing the field trial-based override of the suppressor parameters for
+// passing one parameter.
+TEST(EchoCanceller3FieldTrials, Aec3SuppressorTuningOverrideOneParam) {
+  webrtc::test::ScopedFieldTrials field_trials(
+      "WebRTC-Aec3SuppressorTuningOverride/nearend_tuning_max_inc_factor:0.5/");
+
+  EchoCanceller3Config default_config;
+  EchoCanceller3Config adjusted_config = AdjustConfig(default_config);
+
+  ASSERT_EQ(adjusted_config.suppressor.nearend_tuning.mask_lf.enr_transparent,
+            default_config.suppressor.nearend_tuning.mask_lf.enr_transparent);
+  ASSERT_EQ(adjusted_config.suppressor.nearend_tuning.mask_lf.enr_suppress,
+            default_config.suppressor.nearend_tuning.mask_lf.enr_suppress);
+  ASSERT_EQ(adjusted_config.suppressor.nearend_tuning.mask_hf.enr_transparent,
+            default_config.suppressor.nearend_tuning.mask_hf.enr_transparent);
+  ASSERT_EQ(adjusted_config.suppressor.nearend_tuning.mask_hf.enr_suppress,
+            default_config.suppressor.nearend_tuning.mask_hf.enr_suppress);
+  ASSERT_EQ(adjusted_config.suppressor.nearend_tuning.max_dec_factor_lf,
+            default_config.suppressor.nearend_tuning.max_dec_factor_lf);
+  ASSERT_EQ(adjusted_config.suppressor.normal_tuning.mask_lf.enr_transparent,
+            default_config.suppressor.normal_tuning.mask_lf.enr_transparent);
+  ASSERT_EQ(adjusted_config.suppressor.normal_tuning.mask_lf.enr_suppress,
+            default_config.suppressor.normal_tuning.mask_lf.enr_suppress);
+  ASSERT_EQ(adjusted_config.suppressor.normal_tuning.mask_hf.enr_transparent,
+            default_config.suppressor.normal_tuning.mask_hf.enr_transparent);
+  ASSERT_EQ(adjusted_config.suppressor.normal_tuning.mask_hf.enr_suppress,
+            default_config.suppressor.normal_tuning.mask_hf.enr_suppress);
+  ASSERT_EQ(adjusted_config.suppressor.normal_tuning.max_inc_factor,
+            default_config.suppressor.normal_tuning.max_inc_factor);
+  ASSERT_EQ(adjusted_config.suppressor.normal_tuning.max_dec_factor_lf,
+            default_config.suppressor.normal_tuning.max_dec_factor_lf);
+  ASSERT_EQ(adjusted_config.suppressor.dominant_nearend_detection.enr_threshold,
+            default_config.suppressor.dominant_nearend_detection.enr_threshold);
+  ASSERT_EQ(
+      adjusted_config.suppressor.dominant_nearend_detection.enr_exit_threshold,
+      default_config.suppressor.dominant_nearend_detection.enr_exit_threshold);
+  ASSERT_EQ(adjusted_config.suppressor.dominant_nearend_detection.snr_threshold,
+            default_config.suppressor.dominant_nearend_detection.snr_threshold);
+  ASSERT_EQ(adjusted_config.suppressor.dominant_nearend_detection.hold_duration,
+            default_config.suppressor.dominant_nearend_detection.hold_duration);
+  ASSERT_EQ(
+      adjusted_config.suppressor.dominant_nearend_detection.trigger_threshold,
+      default_config.suppressor.dominant_nearend_detection.trigger_threshold);
+
+  ASSERT_NE(adjusted_config.suppressor.nearend_tuning.max_inc_factor,
+            default_config.suppressor.nearend_tuning.max_inc_factor);
+
+  EXPECT_FLOAT_EQ(adjusted_config.suppressor.nearend_tuning.max_inc_factor,
+                  0.5);
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+TEST(EchoCanceller3InputCheckDeathTest, WrongCaptureNumBandsCheckVerification) {
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    EchoCanceller3Tester(rate).RunProcessCaptureNumBandsCheckVerification();
+  }
+}
+
+// Verifiers that the verification for null input to the capture processing api
+// call works.
+TEST(EchoCanceller3InputCheckDeathTest, NullCaptureProcessingParameter) {
+  EXPECT_DEATH(EchoCanceller3(EchoCanceller3Config(), 16000, 1, 1)
+                   .ProcessCapture(nullptr, false),
+               "");
+}
+
+// Verifies the check for correct sample rate.
+// TODO(peah): Re-enable the test once the issue with memory leaks during DEATH
+// tests on test bots has been fixed.
+TEST(EchoCanceller3InputCheckDeathTest, DISABLED_WrongSampleRate) {
+  ApmDataDumper data_dumper(0);
+  EXPECT_DEATH(EchoCanceller3(EchoCanceller3Config(), 8001, 1, 1), "");
+}
+
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,125 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "modules/audio_processing/aec3/echo_path_delay_estimator.h"
+
+#include <array>
+
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+EchoPathDelayEstimator::EchoPathDelayEstimator(
+    ApmDataDumper* data_dumper,
+    const EchoCanceller3Config& config,
+    size_t num_capture_channels)
+    : data_dumper_(data_dumper),
+      down_sampling_factor_(config.delay.down_sampling_factor),
+      sub_block_size_(down_sampling_factor_ != 0
+                          ? kBlockSize / down_sampling_factor_
+                          : kBlockSize),
+      capture_mixer_(num_capture_channels,
+                     config.delay.capture_alignment_mixing),
+      capture_decimator_(down_sampling_factor_),
+      matched_filter_(
+          data_dumper_,
+          DetectOptimization(),
+          sub_block_size_,
+          kMatchedFilterWindowSizeSubBlocks,
+          config.delay.num_filters,
+          kMatchedFilterAlignmentShiftSizeSubBlocks,
+          config.delay.down_sampling_factor == 8
+              ? config.render_levels.poor_excitation_render_limit_ds8
+              : config.render_levels.poor_excitation_render_limit,
+          config.delay.delay_estimate_smoothing,
+          config.delay.delay_candidate_detection_threshold),
+      matched_filter_lag_aggregator_(data_dumper_,
+                                     matched_filter_.GetMaxFilterLag(),
+                                     config.delay.delay_selection_thresholds) {
+  RTC_DCHECK(data_dumper);
+  RTC_DCHECK(down_sampling_factor_ > 0);
+}
+
+EchoPathDelayEstimator::~EchoPathDelayEstimator() = default;
+
+void EchoPathDelayEstimator::Reset(bool reset_delay_confidence) {
+  Reset(true, reset_delay_confidence);
+}
+
+absl::optional<DelayEstimate> EchoPathDelayEstimator::EstimateDelay(
+    const DownsampledRenderBuffer& render_buffer,
+    const std::vector<std::vector<float>>& capture) {
+  RTC_DCHECK_EQ(kBlockSize, capture[0].size());
+
+  std::array<float, kBlockSize> downsampled_capture_data;
+  rtc::ArrayView<float> downsampled_capture(downsampled_capture_data.data(),
+                                            sub_block_size_);
+
+  std::array<float, kBlockSize> downmixed_capture;
+  capture_mixer_.ProduceOutput(capture, downmixed_capture);
+  capture_decimator_.Decimate(downmixed_capture, downsampled_capture);
+  data_dumper_->DumpWav("aec3_capture_decimator_output",
+                        downsampled_capture.size(), downsampled_capture.data(),
+                        16000 / down_sampling_factor_, 1);
+  matched_filter_.Update(render_buffer, downsampled_capture);
+
+  absl::optional<DelayEstimate> aggregated_matched_filter_lag =
+      matched_filter_lag_aggregator_.Aggregate(
+          matched_filter_.GetLagEstimates());
+
+  // Run clockdrift detection.
+  if (aggregated_matched_filter_lag &&
+      (*aggregated_matched_filter_lag).quality ==
+          DelayEstimate::Quality::kRefined)
+    clockdrift_detector_.Update((*aggregated_matched_filter_lag).delay);
+
+  // TODO(peah): Move this logging outside of this class once EchoCanceller3
+  // development is done.
+  data_dumper_->DumpRaw(
+      "aec3_echo_path_delay_estimator_delay",
+      aggregated_matched_filter_lag
+          ? static_cast<int>(aggregated_matched_filter_lag->delay *
+                             down_sampling_factor_)
+          : -1);
+
+  // Return the detected delay in samples as the aggregated matched filter lag
+  // compensated by the down sampling factor for the signal being correlated.
+  if (aggregated_matched_filter_lag) {
+    aggregated_matched_filter_lag->delay *= down_sampling_factor_;
+  }
+
+  if (old_aggregated_lag_ && aggregated_matched_filter_lag &&
+      old_aggregated_lag_->delay == aggregated_matched_filter_lag->delay) {
+    ++consistent_estimate_counter_;
+  } else {
+    consistent_estimate_counter_ = 0;
+  }
+  old_aggregated_lag_ = aggregated_matched_filter_lag;
+  constexpr size_t kNumBlocksPerSecondBy2 = kNumBlocksPerSecond / 2;
+  if (consistent_estimate_counter_ > kNumBlocksPerSecondBy2) {
+    Reset(false, false);
+  }
+
+  return aggregated_matched_filter_lag;
+}
+
+void EchoPathDelayEstimator::Reset(bool reset_lag_aggregator,
+                                   bool reset_delay_confidence) {
+  if (reset_lag_aggregator) {
+    matched_filter_lag_aggregator_.Reset(reset_delay_confidence);
+  }
+  matched_filter_.Reset();
+  old_aggregated_lag_ = absl::nullopt;
+  consistent_estimate_counter_ = 0;
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,79 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_
+
+#include <stddef.h>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/alignment_mixer.h"
+#include "modules/audio_processing/aec3/clockdrift_detector.h"
+#include "modules/audio_processing/aec3/decimator.h"
+#include "modules/audio_processing/aec3/delay_estimate.h"
+#include "modules/audio_processing/aec3/matched_filter.h"
+#include "modules/audio_processing/aec3/matched_filter_lag_aggregator.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+struct DownsampledRenderBuffer;
+struct EchoCanceller3Config;
+
+// Estimates the delay of the echo path.
+class EchoPathDelayEstimator {
+ public:
+  EchoPathDelayEstimator(ApmDataDumper* data_dumper,
+                         const EchoCanceller3Config& config,
+                         size_t num_capture_channels);
+  ~EchoPathDelayEstimator();
+
+  // Resets the estimation. If the delay confidence is reset, the reset behavior
+  // is as if the call is restarted.
+  void Reset(bool reset_delay_confidence);
+
+  // Produce a delay estimate if such is avaliable.
+  absl::optional<DelayEstimate> EstimateDelay(
+      const DownsampledRenderBuffer& render_buffer,
+      const std::vector<std::vector<float>>& capture);
+
+  // Log delay estimator properties.
+  void LogDelayEstimationProperties(int sample_rate_hz, size_t shift) const {
+    matched_filter_.LogFilterProperties(sample_rate_hz, shift,
+                                        down_sampling_factor_);
+  }
+
+  // Returns the level of detected clockdrift.
+  ClockdriftDetector::Level Clockdrift() const {
+    return clockdrift_detector_.ClockdriftLevel();
+  }
+
+ private:
+  ApmDataDumper* const data_dumper_;
+  const size_t down_sampling_factor_;
+  const size_t sub_block_size_;
+  AlignmentMixer capture_mixer_;
+  Decimator capture_decimator_;
+  MatchedFilter matched_filter_;
+  MatchedFilterLagAggregator matched_filter_lag_aggregator_;
+  absl::optional<DelayEstimate> old_aggregated_lag_;
+  size_t consistent_estimate_counter_ = 0;
+  ClockdriftDetector clockdrift_detector_;
+
+  // Internal reset method with more granularity.
+  void Reset(bool reset_lag_aggregator, bool reset_delay_confidence);
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(EchoPathDelayEstimator);
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_DELAY_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_delay_estimator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,203 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/echo_path_delay_estimator.h"
+
+#include <algorithm>
+#include <string>
+
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "modules/audio_processing/test/echo_canceller_test_tools.h"
+#include "rtc_base/random.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+std::string ProduceDebugText(size_t delay, size_t down_sampling_factor) {
+  rtc::StringBuilder ss;
+  ss << "Delay: " << delay;
+  ss << ", Down sampling factor: " << down_sampling_factor;
+  return ss.Release();
+}
+
+}  // namespace
+
+class EchoPathDelayEstimatorMultiChannel
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<std::tuple<size_t, size_t>> {};
+
+INSTANTIATE_TEST_SUITE_P(MultiChannel,
+                         EchoPathDelayEstimatorMultiChannel,
+                         ::testing::Combine(::testing::Values(1, 2, 3, 6, 8),
+                                            ::testing::Values(1, 2, 4)));
+
+// Verifies that the basic API calls work.
+TEST_P(EchoPathDelayEstimatorMultiChannel, BasicApiCalls) {
+  const size_t num_render_channels = std::get<0>(GetParam());
+  const size_t num_capture_channels = std::get<1>(GetParam());
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+  ApmDataDumper data_dumper(0);
+  EchoCanceller3Config config;
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, kSampleRateHz, num_render_channels));
+  EchoPathDelayEstimator estimator(&data_dumper, config, num_capture_channels);
+  std::vector<std::vector<std::vector<float>>> render(
+      kNumBands, std::vector<std::vector<float>>(
+                     num_render_channels, std::vector<float>(kBlockSize)));
+  std::vector<std::vector<float>> capture(num_capture_channels,
+                                          std::vector<float>(kBlockSize));
+  for (size_t k = 0; k < 100; ++k) {
+    render_delay_buffer->Insert(render);
+    estimator.EstimateDelay(render_delay_buffer->GetDownsampledRenderBuffer(),
+                            capture);
+  }
+}
+
+// Verifies that the delay estimator produces correct delay for artificially
+// delayed signals.
+TEST(EchoPathDelayEstimator, DelayEstimation) {
+  constexpr size_t kNumRenderChannels = 1;
+  constexpr size_t kNumCaptureChannels = 1;
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+
+  Random random_generator(42U);
+  std::vector<std::vector<std::vector<float>>> render(
+      kNumBands, std::vector<std::vector<float>>(
+                     kNumRenderChannels, std::vector<float>(kBlockSize)));
+  std::vector<std::vector<float>> capture(kNumCaptureChannels,
+                                          std::vector<float>(kBlockSize));
+  ApmDataDumper data_dumper(0);
+  constexpr size_t kDownSamplingFactors[] = {2, 4, 8};
+  for (auto down_sampling_factor : kDownSamplingFactors) {
+    EchoCanceller3Config config;
+    config.delay.down_sampling_factor = down_sampling_factor;
+    config.delay.num_filters = 10;
+    for (size_t delay_samples : {30, 64, 150, 200, 800, 4000}) {
+      SCOPED_TRACE(ProduceDebugText(delay_samples, down_sampling_factor));
+      std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+          RenderDelayBuffer::Create(config, kSampleRateHz, kNumRenderChannels));
+      DelayBuffer<float> signal_delay_buffer(delay_samples);
+      EchoPathDelayEstimator estimator(&data_dumper, config,
+                                       kNumCaptureChannels);
+
+      absl::optional<DelayEstimate> estimated_delay_samples;
+      for (size_t k = 0; k < (500 + (delay_samples) / kBlockSize); ++k) {
+        RandomizeSampleVector(&random_generator, render[0][0]);
+        signal_delay_buffer.Delay(render[0][0], capture[0]);
+        render_delay_buffer->Insert(render);
+
+        if (k == 0) {
+          render_delay_buffer->Reset();
+        }
+
+        render_delay_buffer->PrepareCaptureProcessing();
+
+        auto estimate = estimator.EstimateDelay(
+            render_delay_buffer->GetDownsampledRenderBuffer(), capture);
+
+        if (estimate) {
+          estimated_delay_samples = estimate;
+        }
+      }
+
+      if (estimated_delay_samples) {
+        // Allow estimated delay to be off by one sample in the down-sampled
+        // domain.
+        size_t delay_ds = delay_samples / down_sampling_factor;
+        size_t estimated_delay_ds =
+            estimated_delay_samples->delay / down_sampling_factor;
+        EXPECT_NEAR(delay_ds, estimated_delay_ds, 1);
+      } else {
+        ADD_FAILURE();
+      }
+    }
+  }
+}
+
+// Verifies that the delay estimator does not produce delay estimates for render
+// signals of low level.
+TEST(EchoPathDelayEstimator, NoDelayEstimatesForLowLevelRenderSignals) {
+  constexpr size_t kNumRenderChannels = 1;
+  constexpr size_t kNumCaptureChannels = 1;
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+  Random random_generator(42U);
+  EchoCanceller3Config config;
+  std::vector<std::vector<std::vector<float>>> render(
+      kNumBands, std::vector<std::vector<float>>(
+                     kNumRenderChannels, std::vector<float>(kBlockSize)));
+  std::vector<std::vector<float>> capture(kNumCaptureChannels,
+                                          std::vector<float>(kBlockSize));
+  ApmDataDumper data_dumper(0);
+  EchoPathDelayEstimator estimator(&data_dumper, config, kNumCaptureChannels);
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(EchoCanceller3Config(), kSampleRateHz,
+                                kNumRenderChannels));
+  for (size_t k = 0; k < 100; ++k) {
+    RandomizeSampleVector(&random_generator, render[0][0]);
+    for (auto& render_k : render[0][0]) {
+      render_k *= 100.f / 32767.f;
+    }
+    std::copy(render[0][0].begin(), render[0][0].end(), capture[0].begin());
+    render_delay_buffer->Insert(render);
+    render_delay_buffer->PrepareCaptureProcessing();
+    EXPECT_FALSE(estimator.EstimateDelay(
+        render_delay_buffer->GetDownsampledRenderBuffer(), capture));
+  }
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies the check for the render blocksize.
+// TODO(peah): Re-enable the test once the issue with memory leaks during DEATH
+// tests on test bots has been fixed.
+TEST(EchoPathDelayEstimatorDeathTest, DISABLED_WrongRenderBlockSize) {
+  ApmDataDumper data_dumper(0);
+  EchoCanceller3Config config;
+  EchoPathDelayEstimator estimator(&data_dumper, config, 1);
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, 48000, 1));
+  std::vector<std::vector<float>> capture(1, std::vector<float>(kBlockSize));
+  EXPECT_DEATH(estimator.EstimateDelay(
+                   render_delay_buffer->GetDownsampledRenderBuffer(), capture),
+               "");
+}
+
+// Verifies the check for the capture blocksize.
+// TODO(peah): Re-enable the test once the issue with memory leaks during DEATH
+// tests on test bots has been fixed.
+TEST(EchoPathDelayEstimatorDeathTest, WrongCaptureBlockSize) {
+  ApmDataDumper data_dumper(0);
+  EchoCanceller3Config config;
+  EchoPathDelayEstimator estimator(&data_dumper, config, 1);
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, 48000, 1));
+  std::vector<std::vector<float>> capture(1,
+                                          std::vector<float>(kBlockSize - 1));
+  EXPECT_DEATH(estimator.EstimateDelay(
+                   render_delay_buffer->GetDownsampledRenderBuffer(), capture),
+               "");
+}
+
+// Verifies the check for non-null data dumper.
+TEST(EchoPathDelayEstimatorDeathTest, NullDataDumper) {
+  EXPECT_DEATH(EchoPathDelayEstimator(nullptr, EchoCanceller3Config(), 1), "");
+}
+
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,22 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/echo_path_variability.h"
+
+namespace webrtc {
+
+EchoPathVariability::EchoPathVariability(bool gain_change,
+                                         DelayAdjustment delay_change,
+                                         bool clock_drift)
+    : gain_change(gain_change),
+      delay_change(delay_change),
+      clock_drift(clock_drift) {}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_VARIABILITY_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_VARIABILITY_H_
+
+namespace webrtc {
+
+struct EchoPathVariability {
+  enum class DelayAdjustment {
+    kNone,
+    kBufferFlush,
+    kNewDetectedDelay
+  };
+
+  EchoPathVariability(bool gain_change,
+                      DelayAdjustment delay_change,
+                      bool clock_drift);
+
+  bool AudioPathChanged() const {
+    return gain_change || delay_change != DelayAdjustment::kNone;
+  }
+  bool gain_change;
+  DelayAdjustment delay_change;
+  bool clock_drift;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_ECHO_PATH_VARIABILITY_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_path_variability_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/echo_path_variability.h"
+
+#include "test/gtest.h"
+
+namespace webrtc {
+
+TEST(EchoPathVariability, CorrectBehavior) {
+  // Test correct passing and reporting of the gain change information.
+  EchoPathVariability v(
+      true, EchoPathVariability::DelayAdjustment::kNewDetectedDelay, false);
+  EXPECT_TRUE(v.gain_change);
+  EXPECT_TRUE(v.delay_change ==
+              EchoPathVariability::DelayAdjustment::kNewDetectedDelay);
+  EXPECT_TRUE(v.AudioPathChanged());
+  EXPECT_FALSE(v.clock_drift);
+
+  v = EchoPathVariability(true, EchoPathVariability::DelayAdjustment::kNone,
+                          false);
+  EXPECT_TRUE(v.gain_change);
+  EXPECT_TRUE(v.delay_change == EchoPathVariability::DelayAdjustment::kNone);
+  EXPECT_TRUE(v.AudioPathChanged());
+  EXPECT_FALSE(v.clock_drift);
+
+  v = EchoPathVariability(
+      false, EchoPathVariability::DelayAdjustment::kNewDetectedDelay, false);
+  EXPECT_FALSE(v.gain_change);
+  EXPECT_TRUE(v.delay_change ==
+              EchoPathVariability::DelayAdjustment::kNewDetectedDelay);
+  EXPECT_TRUE(v.AudioPathChanged());
+  EXPECT_FALSE(v.clock_drift);
+
+  v = EchoPathVariability(false, EchoPathVariability::DelayAdjustment::kNone,
+                          false);
+  EXPECT_FALSE(v.gain_change);
+  EXPECT_TRUE(v.delay_change == EchoPathVariability::DelayAdjustment::kNone);
+  EXPECT_FALSE(v.AudioPathChanged());
+  EXPECT_FALSE(v.clock_drift);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,517 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "modules/audio_processing/aec3/echo_remover.h"
+
+#include <math.h>
+#include <stddef.h>
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <memory>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/aec3_fft.h"
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "modules/audio_processing/aec3/comfort_noise_generator.h"
+#include "modules/audio_processing/aec3/echo_path_variability.h"
+#include "modules/audio_processing/aec3/echo_remover_metrics.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "modules/audio_processing/aec3/render_signal_analyzer.h"
+#include "modules/audio_processing/aec3/residual_echo_estimator.h"
+#include "modules/audio_processing/aec3/subtractor.h"
+#include "modules/audio_processing/aec3/subtractor_output.h"
+#include "modules/audio_processing/aec3/suppression_filter.h"
+#include "modules/audio_processing/aec3/suppression_gain.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+
+namespace webrtc {
+
+namespace {
+
+// Maximum number of channels for which the capture channel data is stored on
+// the stack. If the number of channels are larger than this, they are stored
+// using scratch memory that is pre-allocated on the heap. The reason for this
+// partitioning is not to waste heap space for handling the more common numbers
+// of channels, while at the same time not limiting the support for higher
+// numbers of channels by enforcing the capture channel data to be stored on the
+// stack using a fixed maximum value.
+constexpr size_t kMaxNumChannelsOnStack = 2;
+
+// Chooses the number of channels to store on the heap when that is required due
+// to the number of capture channels being larger than the pre-defined number
+// of channels to store on the stack.
+size_t NumChannelsOnHeap(size_t num_capture_channels) {
+  return num_capture_channels > kMaxNumChannelsOnStack ? num_capture_channels
+                                                       : 0;
+}
+
+void LinearEchoPower(const FftData& E,
+                     const FftData& Y,
+                     std::array<float, kFftLengthBy2Plus1>* S2) {
+  for (size_t k = 0; k < E.re.size(); ++k) {
+    (*S2)[k] = (Y.re[k] - E.re[k]) * (Y.re[k] - E.re[k]) +
+               (Y.im[k] - E.im[k]) * (Y.im[k] - E.im[k]);
+  }
+}
+
+// Fades between two input signals using a fix-sized transition.
+void SignalTransition(rtc::ArrayView<const float> from,
+                      rtc::ArrayView<const float> to,
+                      rtc::ArrayView<float> out) {
+  if (from == to) {
+    RTC_DCHECK_EQ(to.size(), out.size());
+    std::copy(to.begin(), to.end(), out.begin());
+  } else {
+    constexpr size_t kTransitionSize = 30;
+    constexpr float kOneByTransitionSizePlusOne = 1.f / (kTransitionSize + 1);
+
+    RTC_DCHECK_EQ(from.size(), to.size());
+    RTC_DCHECK_EQ(from.size(), out.size());
+    RTC_DCHECK_LE(kTransitionSize, out.size());
+
+    for (size_t k = 0; k < kTransitionSize; ++k) {
+      float a = (k + 1) * kOneByTransitionSizePlusOne;
+      out[k] = a * to[k] + (1.f - a) * from[k];
+    }
+
+    std::copy(to.begin() + kTransitionSize, to.end(),
+              out.begin() + kTransitionSize);
+  }
+}
+
+// Computes a windowed (square root Hanning) padded FFT and updates the related
+// memory.
+void WindowedPaddedFft(const Aec3Fft& fft,
+                       rtc::ArrayView<const float> v,
+                       rtc::ArrayView<float> v_old,
+                       FftData* V) {
+  fft.PaddedFft(v, v_old, Aec3Fft::Window::kSqrtHanning, V);
+  std::copy(v.begin(), v.end(), v_old.begin());
+}
+
+// Class for removing the echo from the capture signal.
+class EchoRemoverImpl final : public EchoRemover {
+ public:
+  EchoRemoverImpl(const EchoCanceller3Config& config,
+                  int sample_rate_hz,
+                  size_t num_render_channels,
+                  size_t num_capture_channels);
+  ~EchoRemoverImpl() override;
+  EchoRemoverImpl(const EchoRemoverImpl&) = delete;
+  EchoRemoverImpl& operator=(const EchoRemoverImpl&) = delete;
+
+  void GetMetrics(EchoControl::Metrics* metrics) const override;
+
+  // Removes the echo from a block of samples from the capture signal. The
+  // supplied render signal is assumed to be pre-aligned with the capture
+  // signal.
+  void ProcessCapture(
+      EchoPathVariability echo_path_variability,
+      bool capture_signal_saturation,
+      const absl::optional<DelayEstimate>& external_delay,
+      RenderBuffer* render_buffer,
+      std::vector<std::vector<std::vector<float>>>* linear_output,
+      std::vector<std::vector<std::vector<float>>>* capture) override;
+
+  // Updates the status on whether echo leakage is detected in the output of the
+  // echo remover.
+  void UpdateEchoLeakageStatus(bool leakage_detected) override {
+    echo_leakage_detected_ = leakage_detected;
+  }
+
+  void SetCaptureOutputUsage(bool capture_output_used) override {
+    capture_output_used_ = capture_output_used;
+  }
+
+ private:
+  // Selects which of the coarse and refined linear filter outputs that is most
+  // appropriate to pass to the suppressor and forms the linear filter output by
+  // smoothly transition between those.
+  void FormLinearFilterOutput(const SubtractorOutput& subtractor_output,
+                              rtc::ArrayView<float> output);
+
+  static int instance_count_;
+  const EchoCanceller3Config config_;
+  const Aec3Fft fft_;
+  std::unique_ptr<ApmDataDumper> data_dumper_;
+  const Aec3Optimization optimization_;
+  const int sample_rate_hz_;
+  const size_t num_render_channels_;
+  const size_t num_capture_channels_;
+  const bool use_coarse_filter_output_;
+  Subtractor subtractor_;
+  SuppressionGain suppression_gain_;
+  ComfortNoiseGenerator cng_;
+  SuppressionFilter suppression_filter_;
+  RenderSignalAnalyzer render_signal_analyzer_;
+  ResidualEchoEstimator residual_echo_estimator_;
+  bool echo_leakage_detected_ = false;
+  bool capture_output_used_ = true;
+  AecState aec_state_;
+  EchoRemoverMetrics metrics_;
+  std::vector<std::array<float, kFftLengthBy2>> e_old_;
+  std::vector<std::array<float, kFftLengthBy2>> y_old_;
+  size_t block_counter_ = 0;
+  int gain_change_hangover_ = 0;
+  bool refined_filter_output_last_selected_ = true;
+
+  std::vector<std::array<float, kFftLengthBy2>> e_heap_;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> Y2_heap_;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> E2_heap_;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> R2_heap_;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> S2_linear_heap_;
+  std::vector<FftData> Y_heap_;
+  std::vector<FftData> E_heap_;
+  std::vector<FftData> comfort_noise_heap_;
+  std::vector<FftData> high_band_comfort_noise_heap_;
+  std::vector<SubtractorOutput> subtractor_output_heap_;
+};
+
+int EchoRemoverImpl::instance_count_ = 0;
+
+EchoRemoverImpl::EchoRemoverImpl(const EchoCanceller3Config& config,
+                                 int sample_rate_hz,
+                                 size_t num_render_channels,
+                                 size_t num_capture_channels)
+    : config_(config),
+      fft_(),
+      data_dumper_(
+          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
+      optimization_(DetectOptimization()),
+      sample_rate_hz_(sample_rate_hz),
+      num_render_channels_(num_render_channels),
+      num_capture_channels_(num_capture_channels),
+      use_coarse_filter_output_(
+          config_.filter.enable_coarse_filter_output_usage),
+      subtractor_(config,
+                  num_render_channels_,
+                  num_capture_channels_,
+                  data_dumper_.get(),
+                  optimization_),
+      suppression_gain_(config_,
+                        optimization_,
+                        sample_rate_hz,
+                        num_capture_channels),
+      cng_(config_, optimization_, num_capture_channels_),
+      suppression_filter_(optimization_,
+                          sample_rate_hz_,
+                          num_capture_channels_),
+      render_signal_analyzer_(config_),
+      residual_echo_estimator_(config_, num_render_channels),
+      aec_state_(config_, num_capture_channels_),
+      e_old_(num_capture_channels_, {0.f}),
+      y_old_(num_capture_channels_, {0.f}),
+      e_heap_(NumChannelsOnHeap(num_capture_channels_), {0.f}),
+      Y2_heap_(NumChannelsOnHeap(num_capture_channels_)),
+      E2_heap_(NumChannelsOnHeap(num_capture_channels_)),
+      R2_heap_(NumChannelsOnHeap(num_capture_channels_)),
+      S2_linear_heap_(NumChannelsOnHeap(num_capture_channels_)),
+      Y_heap_(NumChannelsOnHeap(num_capture_channels_)),
+      E_heap_(NumChannelsOnHeap(num_capture_channels_)),
+      comfort_noise_heap_(NumChannelsOnHeap(num_capture_channels_)),
+      high_band_comfort_noise_heap_(NumChannelsOnHeap(num_capture_channels_)),
+      subtractor_output_heap_(NumChannelsOnHeap(num_capture_channels_)) {
+  RTC_DCHECK(ValidFullBandRate(sample_rate_hz));
+}
+
+EchoRemoverImpl::~EchoRemoverImpl() = default;
+
+void EchoRemoverImpl::GetMetrics(EchoControl::Metrics* metrics) const {
+  // Echo return loss (ERL) is inverted to go from gain to attenuation.
+  metrics->echo_return_loss = -10.0 * std::log10(aec_state_.ErlTimeDomain());
+  metrics->echo_return_loss_enhancement =
+      Log2TodB(aec_state_.FullBandErleLog2());
+}
+
+void EchoRemoverImpl::ProcessCapture(
+    EchoPathVariability echo_path_variability,
+    bool capture_signal_saturation,
+    const absl::optional<DelayEstimate>& external_delay,
+    RenderBuffer* render_buffer,
+    std::vector<std::vector<std::vector<float>>>* linear_output,
+    std::vector<std::vector<std::vector<float>>>* capture) {
+  ++block_counter_;
+  const std::vector<std::vector<std::vector<float>>>& x =
+      render_buffer->Block(0);
+  std::vector<std::vector<std::vector<float>>>* y = capture;
+  RTC_DCHECK(render_buffer);
+  RTC_DCHECK(y);
+  RTC_DCHECK_EQ(x.size(), NumBandsForRate(sample_rate_hz_));
+  RTC_DCHECK_EQ(y->size(), NumBandsForRate(sample_rate_hz_));
+  RTC_DCHECK_EQ(x[0].size(), num_render_channels_);
+  RTC_DCHECK_EQ((*y)[0].size(), num_capture_channels_);
+  RTC_DCHECK_EQ(x[0][0].size(), kBlockSize);
+  RTC_DCHECK_EQ((*y)[0][0].size(), kBlockSize);
+
+  // Stack allocated data to use when the number of channels is low.
+  std::array<std::array<float, kFftLengthBy2>, kMaxNumChannelsOnStack> e_stack;
+  std::array<std::array<float, kFftLengthBy2Plus1>, kMaxNumChannelsOnStack>
+      Y2_stack;
+  std::array<std::array<float, kFftLengthBy2Plus1>, kMaxNumChannelsOnStack>
+      E2_stack;
+  std::array<std::array<float, kFftLengthBy2Plus1>, kMaxNumChannelsOnStack>
+      R2_stack;
+  std::array<std::array<float, kFftLengthBy2Plus1>, kMaxNumChannelsOnStack>
+      S2_linear_stack;
+  std::array<FftData, kMaxNumChannelsOnStack> Y_stack;
+  std::array<FftData, kMaxNumChannelsOnStack> E_stack;
+  std::array<FftData, kMaxNumChannelsOnStack> comfort_noise_stack;
+  std::array<FftData, kMaxNumChannelsOnStack> high_band_comfort_noise_stack;
+  std::array<SubtractorOutput, kMaxNumChannelsOnStack> subtractor_output_stack;
+
+  rtc::ArrayView<std::array<float, kFftLengthBy2>> e(e_stack.data(),
+                                                     num_capture_channels_);
+  rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> Y2(
+      Y2_stack.data(), num_capture_channels_);
+  rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> E2(
+      E2_stack.data(), num_capture_channels_);
+  rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> R2(
+      R2_stack.data(), num_capture_channels_);
+  rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> S2_linear(
+      S2_linear_stack.data(), num_capture_channels_);
+  rtc::ArrayView<FftData> Y(Y_stack.data(), num_capture_channels_);
+  rtc::ArrayView<FftData> E(E_stack.data(), num_capture_channels_);
+  rtc::ArrayView<FftData> comfort_noise(comfort_noise_stack.data(),
+                                        num_capture_channels_);
+  rtc::ArrayView<FftData> high_band_comfort_noise(
+      high_band_comfort_noise_stack.data(), num_capture_channels_);
+  rtc::ArrayView<SubtractorOutput> subtractor_output(
+      subtractor_output_stack.data(), num_capture_channels_);
+  if (NumChannelsOnHeap(num_capture_channels_) > 0) {
+    // If the stack-allocated space is too small, use the heap for storing the
+    // microphone data.
+    e = rtc::ArrayView<std::array<float, kFftLengthBy2>>(e_heap_.data(),
+                                                         num_capture_channels_);
+    Y2 = rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>>(
+        Y2_heap_.data(), num_capture_channels_);
+    E2 = rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>>(
+        E2_heap_.data(), num_capture_channels_);
+    R2 = rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>>(
+        R2_heap_.data(), num_capture_channels_);
+    S2_linear = rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>>(
+        S2_linear_heap_.data(), num_capture_channels_);
+    Y = rtc::ArrayView<FftData>(Y_heap_.data(), num_capture_channels_);
+    E = rtc::ArrayView<FftData>(E_heap_.data(), num_capture_channels_);
+    comfort_noise = rtc::ArrayView<FftData>(comfort_noise_heap_.data(),
+                                            num_capture_channels_);
+    high_band_comfort_noise = rtc::ArrayView<FftData>(
+        high_band_comfort_noise_heap_.data(), num_capture_channels_);
+    subtractor_output = rtc::ArrayView<SubtractorOutput>(
+        subtractor_output_heap_.data(), num_capture_channels_);
+  }
+
+  data_dumper_->DumpWav("aec3_echo_remover_capture_input", kBlockSize,
+                        &(*y)[0][0][0], 16000, 1);
+  data_dumper_->DumpWav("aec3_echo_remover_render_input", kBlockSize,
+                        &x[0][0][0], 16000, 1);
+  data_dumper_->DumpRaw("aec3_echo_remover_capture_input", (*y)[0][0]);
+  data_dumper_->DumpRaw("aec3_echo_remover_render_input", x[0][0]);
+
+  aec_state_.UpdateCaptureSaturation(capture_signal_saturation);
+
+  if (echo_path_variability.AudioPathChanged()) {
+    // Ensure that the gain change is only acted on once per frame.
+    if (echo_path_variability.gain_change) {
+      if (gain_change_hangover_ == 0) {
+        constexpr int kMaxBlocksPerFrame = 3;
+        gain_change_hangover_ = kMaxBlocksPerFrame;
+        rtc::LoggingSeverity log_level =
+            config_.delay.log_warning_on_delay_changes ? rtc::LS_WARNING
+                                                       : rtc::LS_VERBOSE;
+        RTC_LOG_V(log_level)
+            << "Gain change detected at block " << block_counter_;
+      } else {
+        echo_path_variability.gain_change = false;
+      }
+    }
+
+    subtractor_.HandleEchoPathChange(echo_path_variability);
+    aec_state_.HandleEchoPathChange(echo_path_variability);
+
+    if (echo_path_variability.delay_change !=
+        EchoPathVariability::DelayAdjustment::kNone) {
+      suppression_gain_.SetInitialState(true);
+    }
+  }
+  if (gain_change_hangover_ > 0) {
+    --gain_change_hangover_;
+  }
+
+  // Analyze the render signal.
+  render_signal_analyzer_.Update(*render_buffer,
+                                 aec_state_.MinDirectPathFilterDelay());
+
+  // State transition.
+  if (aec_state_.TransitionTriggered()) {
+    subtractor_.ExitInitialState();
+    suppression_gain_.SetInitialState(false);
+  }
+
+  // Perform linear echo cancellation.
+  subtractor_.Process(*render_buffer, (*y)[0], render_signal_analyzer_,
+                      aec_state_, subtractor_output);
+
+  // Compute spectra.
+  for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+    FormLinearFilterOutput(subtractor_output[ch], e[ch]);
+    WindowedPaddedFft(fft_, (*y)[0][ch], y_old_[ch], &Y[ch]);
+    WindowedPaddedFft(fft_, e[ch], e_old_[ch], &E[ch]);
+    LinearEchoPower(E[ch], Y[ch], &S2_linear[ch]);
+    Y[ch].Spectrum(optimization_, Y2[ch]);
+    E[ch].Spectrum(optimization_, E2[ch]);
+  }
+
+  // Optionally return the linear filter output.
+  if (linear_output) {
+    RTC_DCHECK_GE(1, linear_output->size());
+    RTC_DCHECK_EQ(num_capture_channels_, linear_output[0].size());
+    for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+      RTC_DCHECK_EQ(kBlockSize, (*linear_output)[0][ch].size());
+      std::copy(e[ch].begin(), e[ch].end(), (*linear_output)[0][ch].begin());
+    }
+  }
+
+  // Update the AEC state information.
+  aec_state_.Update(external_delay, subtractor_.FilterFrequencyResponses(),
+                    subtractor_.FilterImpulseResponses(), *render_buffer, E2,
+                    Y2, subtractor_output);
+
+  // Choose the linear output.
+  const auto& Y_fft = aec_state_.UseLinearFilterOutput() ? E : Y;
+
+  data_dumper_->DumpWav("aec3_output_linear", kBlockSize, &(*y)[0][0][0], 16000,
+                        1);
+  data_dumper_->DumpWav("aec3_output_linear2", kBlockSize, &e[0][0], 16000, 1);
+
+  // Estimate the comfort noise.
+  cng_.Compute(aec_state_.SaturatedCapture(), Y2, comfort_noise,
+               high_band_comfort_noise);
+
+  // Only do the below processing if the output of the audio processing module
+  // is used.
+  std::array<float, kFftLengthBy2Plus1> G;
+  if (capture_output_used_) {
+    // Estimate the residual echo power.
+    residual_echo_estimator_.Estimate(aec_state_, *render_buffer, S2_linear, Y2,
+                                      suppression_gain_.IsDominantNearend(),
+                                      R2);
+
+    // Suppressor nearend estimate.
+    if (aec_state_.UsableLinearEstimate()) {
+      // E2 is bound by Y2.
+      for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+        std::transform(E2[ch].begin(), E2[ch].end(), Y2[ch].begin(),
+                       E2[ch].begin(),
+                       [](float a, float b) { return std::min(a, b); });
+      }
+    }
+    const auto& nearend_spectrum = aec_state_.UsableLinearEstimate() ? E2 : Y2;
+
+    // Suppressor echo estimate.
+    const auto& echo_spectrum =
+        aec_state_.UsableLinearEstimate() ? S2_linear : R2;
+
+    // Determine if the suppressor should assume clock drift.
+    const bool clock_drift = config_.echo_removal_control.has_clock_drift ||
+                             echo_path_variability.clock_drift;
+
+    // Compute preferred gains.
+    float high_bands_gain;
+    suppression_gain_.GetGain(nearend_spectrum, echo_spectrum, R2,
+                              cng_.NoiseSpectrum(), render_signal_analyzer_,
+                              aec_state_, x, clock_drift, &high_bands_gain, &G);
+
+    suppression_filter_.ApplyGain(comfort_noise, high_band_comfort_noise, G,
+                                  high_bands_gain, Y_fft, y);
+
+  } else {
+    G.fill(0.f);
+  }
+
+  // Update the metrics.
+  metrics_.Update(aec_state_, cng_.NoiseSpectrum()[0], G);
+
+  // Debug outputs for the purpose of development and analysis.
+  data_dumper_->DumpWav("aec3_echo_estimate", kBlockSize,
+                        &subtractor_output[0].s_refined[0], 16000, 1);
+  data_dumper_->DumpRaw("aec3_output", (*y)[0][0]);
+  data_dumper_->DumpRaw("aec3_narrow_render",
+                        render_signal_analyzer_.NarrowPeakBand() ? 1 : 0);
+  data_dumper_->DumpRaw("aec3_N2", cng_.NoiseSpectrum()[0]);
+  data_dumper_->DumpRaw("aec3_suppressor_gain", G);
+  data_dumper_->DumpWav("aec3_output",
+                        rtc::ArrayView<const float>(&(*y)[0][0][0], kBlockSize),
+                        16000, 1);
+  data_dumper_->DumpRaw("aec3_using_subtractor_output[0]",
+                        aec_state_.UseLinearFilterOutput() ? 1 : 0);
+  data_dumper_->DumpRaw("aec3_E2", E2[0]);
+  data_dumper_->DumpRaw("aec3_S2_linear", S2_linear[0]);
+  data_dumper_->DumpRaw("aec3_Y2", Y2[0]);
+  data_dumper_->DumpRaw(
+      "aec3_X2", render_buffer->Spectrum(
+                     aec_state_.MinDirectPathFilterDelay())[/*channel=*/0]);
+  data_dumper_->DumpRaw("aec3_R2", R2[0]);
+  data_dumper_->DumpRaw("aec3_filter_delay",
+                        aec_state_.MinDirectPathFilterDelay());
+  data_dumper_->DumpRaw("aec3_capture_saturation",
+                        aec_state_.SaturatedCapture() ? 1 : 0);
+}
+
+void EchoRemoverImpl::FormLinearFilterOutput(
+    const SubtractorOutput& subtractor_output,
+    rtc::ArrayView<float> output) {
+  RTC_DCHECK_EQ(subtractor_output.e_refined.size(), output.size());
+  RTC_DCHECK_EQ(subtractor_output.e_coarse.size(), output.size());
+  bool use_refined_output = true;
+  if (use_coarse_filter_output_) {
+    // As the output of the refined adaptive filter generally should be better
+    // than the coarse filter output, add a margin and threshold for when
+    // choosing the coarse filter output.
+    if (subtractor_output.e2_coarse < 0.9f * subtractor_output.e2_refined &&
+        subtractor_output.y2 > 30.f * 30.f * kBlockSize &&
+        (subtractor_output.s2_refined > 60.f * 60.f * kBlockSize ||
+         subtractor_output.s2_coarse > 60.f * 60.f * kBlockSize)) {
+      use_refined_output = false;
+    } else {
+      // If the refined filter is diverged, choose the filter output that has
+      // the lowest power.
+      if (subtractor_output.e2_coarse < subtractor_output.e2_refined &&
+          subtractor_output.y2 < subtractor_output.e2_refined) {
+        use_refined_output = false;
+      }
+    }
+  }
+
+  SignalTransition(refined_filter_output_last_selected_
+                       ? subtractor_output.e_refined
+                       : subtractor_output.e_coarse,
+                   use_refined_output ? subtractor_output.e_refined
+                                      : subtractor_output.e_coarse,
+                   output);
+  refined_filter_output_last_selected_ = use_refined_output;
+}
+
+}  // namespace
+
+EchoRemover* EchoRemover::Create(const EchoCanceller3Config& config,
+                                 int sample_rate_hz,
+                                 size_t num_render_channels,
+                                 size_t num_capture_channels) {
+  return new EchoRemoverImpl(config, sample_rate_hz, num_render_channels,
+                             num_capture_channels);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_H_
+
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "api/audio/echo_control.h"
+#include "modules/audio_processing/aec3/delay_estimate.h"
+#include "modules/audio_processing/aec3/echo_path_variability.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+
+namespace webrtc {
+
+// Class for removing the echo from the capture signal.
+class EchoRemover {
+ public:
+  static EchoRemover* Create(const EchoCanceller3Config& config,
+                             int sample_rate_hz,
+                             size_t num_render_channels,
+                             size_t num_capture_channels);
+  virtual ~EchoRemover() = default;
+
+  // Get current metrics.
+  virtual void GetMetrics(EchoControl::Metrics* metrics) const = 0;
+
+  // Removes the echo from a block of samples from the capture signal. The
+  // supplied render signal is assumed to be pre-aligned with the capture
+  // signal.
+  virtual void ProcessCapture(
+      EchoPathVariability echo_path_variability,
+      bool capture_signal_saturation,
+      const absl::optional<DelayEstimate>& external_delay,
+      RenderBuffer* render_buffer,
+      std::vector<std::vector<std::vector<float>>>* linear_output,
+      std::vector<std::vector<std::vector<float>>>* capture) = 0;
+
+  // Updates the status on whether echo leakage is detected in the output of the
+  // echo remover.
+  virtual void UpdateEchoLeakageStatus(bool leakage_detected) = 0;
+
+  // Specifies whether the capture output will be used. The purpose of this is
+  // to allow the echo remover to deactivate some of the processing when the
+  // resulting output is anyway not used, for instance when the endpoint is
+  // muted.
+  virtual void SetCaptureOutputUsage(bool capture_output_used) = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,157 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/echo_remover_metrics.h"
+
+#include <math.h>
+#include <stddef.h>
+
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_minmax.h"
+#include "system_wrappers/include/metrics.h"
+
+namespace webrtc {
+
+EchoRemoverMetrics::DbMetric::DbMetric() : DbMetric(0.f, 0.f, 0.f) {}
+EchoRemoverMetrics::DbMetric::DbMetric(float sum_value,
+                                       float floor_value,
+                                       float ceil_value)
+    : sum_value(sum_value), floor_value(floor_value), ceil_value(ceil_value) {}
+
+void EchoRemoverMetrics::DbMetric::Update(float value) {
+  sum_value += value;
+  floor_value = std::min(floor_value, value);
+  ceil_value = std::max(ceil_value, value);
+}
+
+void EchoRemoverMetrics::DbMetric::UpdateInstant(float value) {
+  sum_value = value;
+  floor_value = std::min(floor_value, value);
+  ceil_value = std::max(ceil_value, value);
+}
+
+EchoRemoverMetrics::EchoRemoverMetrics() {
+  ResetMetrics();
+}
+
+void EchoRemoverMetrics::ResetMetrics() {
+  erl_time_domain_ = DbMetric(0.f, 10000.f, 0.000f);
+  erle_time_domain_ = DbMetric(0.f, 0.f, 1000.f);
+  saturated_capture_ = false;
+}
+
+void EchoRemoverMetrics::Update(
+    const AecState& aec_state,
+    const std::array<float, kFftLengthBy2Plus1>& comfort_noise_spectrum,
+    const std::array<float, kFftLengthBy2Plus1>& suppressor_gain) {
+  metrics_reported_ = false;
+  if (++block_counter_ <= kMetricsCollectionBlocks) {
+    erl_time_domain_.UpdateInstant(aec_state.ErlTimeDomain());
+    erle_time_domain_.UpdateInstant(aec_state.FullBandErleLog2());
+    saturated_capture_ = saturated_capture_ || aec_state.SaturatedCapture();
+  } else {
+    // Report the metrics over several frames in order to lower the impact of
+    // the logarithms involved on the computational complexity.
+    switch (block_counter_) {
+      case kMetricsCollectionBlocks + 1:
+        RTC_HISTOGRAM_BOOLEAN(
+            "WebRTC.Audio.EchoCanceller.UsableLinearEstimate",
+            static_cast<int>(aec_state.UsableLinearEstimate() ? 1 : 0));
+        RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.EchoCanceller.FilterDelay",
+                                    aec_state.MinDirectPathFilterDelay(), 0, 30,
+                                    31);
+        RTC_HISTOGRAM_BOOLEAN("WebRTC.Audio.EchoCanceller.CaptureSaturation",
+                              static_cast<int>(saturated_capture_ ? 1 : 0));
+        break;
+      case kMetricsCollectionBlocks + 2:
+        RTC_HISTOGRAM_COUNTS_LINEAR(
+            "WebRTC.Audio.EchoCanceller.Erl.Value",
+            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 30.f, 1.f,
+                                                erl_time_domain_.sum_value),
+            0, 59, 30);
+        RTC_HISTOGRAM_COUNTS_LINEAR(
+            "WebRTC.Audio.EchoCanceller.Erl.Max",
+            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 30.f, 1.f,
+                                                erl_time_domain_.ceil_value),
+            0, 59, 30);
+        RTC_HISTOGRAM_COUNTS_LINEAR(
+            "WebRTC.Audio.EchoCanceller.Erl.Min",
+            aec3::TransformDbMetricForReporting(true, 0.f, 59.f, 30.f, 1.f,
+                                                erl_time_domain_.floor_value),
+            0, 59, 30);
+        break;
+      case kMetricsCollectionBlocks + 3:
+        RTC_HISTOGRAM_COUNTS_LINEAR(
+            "WebRTC.Audio.EchoCanceller.Erle.Value",
+            aec3::TransformDbMetricForReporting(false, 0.f, 19.f, 0.f, 1.f,
+                                                erle_time_domain_.sum_value),
+            0, 19, 20);
+        RTC_HISTOGRAM_COUNTS_LINEAR(
+            "WebRTC.Audio.EchoCanceller.Erle.Max",
+            aec3::TransformDbMetricForReporting(false, 0.f, 19.f, 0.f, 1.f,
+                                                erle_time_domain_.ceil_value),
+            0, 19, 20);
+        RTC_HISTOGRAM_COUNTS_LINEAR(
+            "WebRTC.Audio.EchoCanceller.Erle.Min",
+            aec3::TransformDbMetricForReporting(false, 0.f, 19.f, 0.f, 1.f,
+                                                erle_time_domain_.floor_value),
+            0, 19, 20);
+        metrics_reported_ = true;
+        RTC_DCHECK_EQ(kMetricsReportingIntervalBlocks, block_counter_);
+        block_counter_ = 0;
+        ResetMetrics();
+        break;
+      default:
+        RTC_NOTREACHED();
+        break;
+    }
+  }
+}
+
+namespace aec3 {
+
+void UpdateDbMetric(const std::array<float, kFftLengthBy2Plus1>& value,
+                    std::array<EchoRemoverMetrics::DbMetric, 2>* statistic) {
+  RTC_DCHECK(statistic);
+  // Truncation is intended in the band width computation.
+  constexpr int kNumBands = 2;
+  constexpr int kBandWidth = 65 / kNumBands;
+  constexpr float kOneByBandWidth = 1.f / kBandWidth;
+  RTC_DCHECK_EQ(kNumBands, statistic->size());
+  RTC_DCHECK_EQ(65, value.size());
+  for (size_t k = 0; k < statistic->size(); ++k) {
+    float average_band =
+        std::accumulate(value.begin() + kBandWidth * k,
+                        value.begin() + kBandWidth * (k + 1), 0.f) *
+        kOneByBandWidth;
+    (*statistic)[k].Update(average_band);
+  }
+}
+
+int TransformDbMetricForReporting(bool negate,
+                                  float min_value,
+                                  float max_value,
+                                  float offset,
+                                  float scaling,
+                                  float value) {
+  float new_value = 10.f * std::log10(value * scaling + 1e-10f) + offset;
+  if (negate) {
+    new_value = -new_value;
+  }
+  return static_cast<int>(rtc::SafeClamp(new_value, min_value, max_value));
+}
+
+}  // namespace aec3
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,78 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_
+
+#include <array>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+// Handles the reporting of metrics for the echo remover.
+class EchoRemoverMetrics {
+ public:
+  struct DbMetric {
+    DbMetric();
+    DbMetric(float sum_value, float floor_value, float ceil_value);
+    void Update(float value);
+    void UpdateInstant(float value);
+    float sum_value;
+    float floor_value;
+    float ceil_value;
+  };
+
+  EchoRemoverMetrics();
+
+  // Updates the metric with new data.
+  void Update(
+      const AecState& aec_state,
+      const std::array<float, kFftLengthBy2Plus1>& comfort_noise_spectrum,
+      const std::array<float, kFftLengthBy2Plus1>& suppressor_gain);
+
+  // Returns true if the metrics have just been reported, otherwise false.
+  bool MetricsReported() { return metrics_reported_; }
+
+ private:
+  // Resets the metrics.
+  void ResetMetrics();
+
+  int block_counter_ = 0;
+  DbMetric erl_time_domain_;
+  DbMetric erle_time_domain_;
+  bool saturated_capture_ = false;
+  bool metrics_reported_ = false;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(EchoRemoverMetrics);
+};
+
+namespace aec3 {
+
+// Updates a banded metric of type DbMetric with the values in the supplied
+// array.
+void UpdateDbMetric(const std::array<float, kFftLengthBy2Plus1>& value,
+                    std::array<EchoRemoverMetrics::DbMetric, 2>* statistic);
+
+// Transforms a DbMetric from the linear domain into the logarithmic domain.
+int TransformDbMetricForReporting(bool negate,
+                                  float min_value,
+                                  float max_value,
+                                  float offset,
+                                  float scaling,
+                                  float value);
+
+}  // namespace aec3
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_ECHO_REMOVER_METRICS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_metrics_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,156 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/echo_remover_metrics.h"
+
+#include <math.h>
+
+#include <cmath>
+
+#include "modules/audio_processing/aec3/aec3_fft.h"
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies the check for non-null input.
+TEST(UpdateDbMetricDeathTest, NullValue) {
+  std::array<float, kFftLengthBy2Plus1> value;
+  value.fill(0.f);
+  EXPECT_DEATH(aec3::UpdateDbMetric(value, nullptr), "");
+}
+
+#endif
+
+// Verifies the updating functionality of UpdateDbMetric.
+TEST(UpdateDbMetric, Updating) {
+  std::array<float, kFftLengthBy2Plus1> value;
+  std::array<EchoRemoverMetrics::DbMetric, 2> statistic;
+  statistic.fill(EchoRemoverMetrics::DbMetric(0.f, 100.f, -100.f));
+  constexpr float kValue0 = 10.f;
+  constexpr float kValue1 = 20.f;
+  std::fill(value.begin(), value.begin() + 32, kValue0);
+  std::fill(value.begin() + 32, value.begin() + 64, kValue1);
+
+  aec3::UpdateDbMetric(value, &statistic);
+  EXPECT_FLOAT_EQ(kValue0, statistic[0].sum_value);
+  EXPECT_FLOAT_EQ(kValue0, statistic[0].ceil_value);
+  EXPECT_FLOAT_EQ(kValue0, statistic[0].floor_value);
+  EXPECT_FLOAT_EQ(kValue1, statistic[1].sum_value);
+  EXPECT_FLOAT_EQ(kValue1, statistic[1].ceil_value);
+  EXPECT_FLOAT_EQ(kValue1, statistic[1].floor_value);
+
+  aec3::UpdateDbMetric(value, &statistic);
+  EXPECT_FLOAT_EQ(2.f * kValue0, statistic[0].sum_value);
+  EXPECT_FLOAT_EQ(kValue0, statistic[0].ceil_value);
+  EXPECT_FLOAT_EQ(kValue0, statistic[0].floor_value);
+  EXPECT_FLOAT_EQ(2.f * kValue1, statistic[1].sum_value);
+  EXPECT_FLOAT_EQ(kValue1, statistic[1].ceil_value);
+  EXPECT_FLOAT_EQ(kValue1, statistic[1].floor_value);
+}
+
+// Verifies that the TransformDbMetricForReporting method produces the desired
+// output for values for dBFS.
+TEST(TransformDbMetricForReporting, DbFsScaling) {
+  std::array<float, kBlockSize> x;
+  FftData X;
+  std::array<float, kFftLengthBy2Plus1> X2;
+  Aec3Fft fft;
+  x.fill(1000.f);
+  fft.ZeroPaddedFft(x, Aec3Fft::Window::kRectangular, &X);
+  X.Spectrum(Aec3Optimization::kNone, X2);
+
+  float offset = -10.f * std::log10(32768.f * 32768.f);
+  EXPECT_NEAR(offset, -90.3f, 0.1f);
+  EXPECT_EQ(
+      static_cast<int>(30.3f),
+      aec3::TransformDbMetricForReporting(
+          true, 0.f, 90.f, offset, 1.f / (kBlockSize * kBlockSize), X2[0]));
+}
+
+// Verifies that the TransformDbMetricForReporting method is able to properly
+// limit the output.
+TEST(TransformDbMetricForReporting, Limits) {
+  EXPECT_EQ(0, aec3::TransformDbMetricForReporting(false, 0.f, 10.f, 0.f, 1.f,
+                                                   0.001f));
+  EXPECT_EQ(10, aec3::TransformDbMetricForReporting(false, 0.f, 10.f, 0.f, 1.f,
+                                                    100.f));
+}
+
+// Verifies that the TransformDbMetricForReporting method is able to properly
+// negate output.
+TEST(TransformDbMetricForReporting, Negate) {
+  EXPECT_EQ(10, aec3::TransformDbMetricForReporting(true, -20.f, 20.f, 0.f, 1.f,
+                                                    0.1f));
+  EXPECT_EQ(-10, aec3::TransformDbMetricForReporting(true, -20.f, 20.f, 0.f,
+                                                     1.f, 10.f));
+}
+
+// Verify the Update functionality of DbMetric.
+TEST(DbMetric, Update) {
+  EchoRemoverMetrics::DbMetric metric(0.f, 20.f, -20.f);
+  constexpr int kNumValues = 100;
+  constexpr float kValue = 10.f;
+  for (int k = 0; k < kNumValues; ++k) {
+    metric.Update(kValue);
+  }
+  EXPECT_FLOAT_EQ(kValue * kNumValues, metric.sum_value);
+  EXPECT_FLOAT_EQ(kValue, metric.ceil_value);
+  EXPECT_FLOAT_EQ(kValue, metric.floor_value);
+}
+
+// Verify the Update functionality of DbMetric.
+TEST(DbMetric, UpdateInstant) {
+  EchoRemoverMetrics::DbMetric metric(0.f, 20.f, -20.f);
+  constexpr float kMinValue = -77.f;
+  constexpr float kMaxValue = 33.f;
+  constexpr float kLastValue = (kMinValue + kMaxValue) / 2.0f;
+  for (float value = kMinValue; value <= kMaxValue; value++)
+    metric.UpdateInstant(value);
+  metric.UpdateInstant(kLastValue);
+  EXPECT_FLOAT_EQ(kLastValue, metric.sum_value);
+  EXPECT_FLOAT_EQ(kMaxValue, metric.ceil_value);
+  EXPECT_FLOAT_EQ(kMinValue, metric.floor_value);
+}
+
+// Verify the constructor functionality of DbMetric.
+TEST(DbMetric, Constructor) {
+  EchoRemoverMetrics::DbMetric metric;
+  EXPECT_FLOAT_EQ(0.f, metric.sum_value);
+  EXPECT_FLOAT_EQ(0.f, metric.ceil_value);
+  EXPECT_FLOAT_EQ(0.f, metric.floor_value);
+
+  metric = EchoRemoverMetrics::DbMetric(1.f, 2.f, 3.f);
+  EXPECT_FLOAT_EQ(1.f, metric.sum_value);
+  EXPECT_FLOAT_EQ(2.f, metric.floor_value);
+  EXPECT_FLOAT_EQ(3.f, metric.ceil_value);
+}
+
+// Verify the general functionality of EchoRemoverMetrics.
+TEST(EchoRemoverMetrics, NormalUsage) {
+  EchoRemoverMetrics metrics;
+  AecState aec_state(EchoCanceller3Config{}, 1);
+  std::array<float, kFftLengthBy2Plus1> comfort_noise_spectrum;
+  std::array<float, kFftLengthBy2Plus1> suppressor_gain;
+  comfort_noise_spectrum.fill(10.f);
+  suppressor_gain.fill(1.f);
+  for (int j = 0; j < 3; ++j) {
+    for (int k = 0; k < kMetricsReportingIntervalBlocks - 1; ++k) {
+      metrics.Update(aec_state, comfort_noise_spectrum, suppressor_gain);
+      EXPECT_FALSE(metrics.MetricsReported());
+    }
+    metrics.Update(aec_state, comfort_noise_spectrum, suppressor_gain);
+    EXPECT_TRUE(metrics.MetricsReported());
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/echo_remover_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,243 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/echo_remover.h"
+
+#include <algorithm>
+#include <memory>
+#include <numeric>
+#include <string>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "modules/audio_processing/test/echo_canceller_test_tools.h"
+#include "rtc_base/random.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+std::string ProduceDebugText(int sample_rate_hz) {
+  rtc::StringBuilder ss;
+  ss << "Sample rate: " << sample_rate_hz;
+  return ss.Release();
+}
+
+std::string ProduceDebugText(int sample_rate_hz, int delay) {
+  rtc::StringBuilder ss(ProduceDebugText(sample_rate_hz));
+  ss << ", Delay: " << delay;
+  return ss.Release();
+}
+
+}  // namespace
+
+class EchoRemoverMultiChannel
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<std::tuple<size_t, size_t>> {};
+
+INSTANTIATE_TEST_SUITE_P(MultiChannel,
+                         EchoRemoverMultiChannel,
+                         ::testing::Combine(::testing::Values(1, 2, 8),
+                                            ::testing::Values(1, 2, 8)));
+
+// Verifies the basic API call sequence
+TEST_P(EchoRemoverMultiChannel, BasicApiCalls) {
+  const size_t num_render_channels = std::get<0>(GetParam());
+  const size_t num_capture_channels = std::get<1>(GetParam());
+  absl::optional<DelayEstimate> delay_estimate;
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    std::unique_ptr<EchoRemover> remover(
+        EchoRemover::Create(EchoCanceller3Config(), rate, num_render_channels,
+                            num_capture_channels));
+    std::unique_ptr<RenderDelayBuffer> render_buffer(RenderDelayBuffer::Create(
+        EchoCanceller3Config(), rate, num_render_channels));
+
+    std::vector<std::vector<std::vector<float>>> render(
+        NumBandsForRate(rate),
+        std::vector<std::vector<float>>(num_render_channels,
+                                        std::vector<float>(kBlockSize, 0.f)));
+    std::vector<std::vector<std::vector<float>>> capture(
+        NumBandsForRate(rate),
+        std::vector<std::vector<float>>(num_capture_channels,
+                                        std::vector<float>(kBlockSize, 0.f)));
+    for (size_t k = 0; k < 100; ++k) {
+      EchoPathVariability echo_path_variability(
+          k % 3 == 0 ? true : false,
+          k % 5 == 0 ? EchoPathVariability::DelayAdjustment::kNewDetectedDelay
+                     : EchoPathVariability::DelayAdjustment::kNone,
+          false);
+      render_buffer->Insert(render);
+      render_buffer->PrepareCaptureProcessing();
+
+      remover->ProcessCapture(echo_path_variability, k % 2 == 0 ? true : false,
+                              delay_estimate, render_buffer->GetRenderBuffer(),
+                              nullptr, &capture);
+    }
+  }
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies the check for the samplerate.
+// TODO(peah): Re-enable the test once the issue with memory leaks during DEATH
+// tests on test bots has been fixed.
+TEST(EchoRemoverDeathTest, DISABLED_WrongSampleRate) {
+  EXPECT_DEATH(std::unique_ptr<EchoRemover>(
+                   EchoRemover::Create(EchoCanceller3Config(), 8001, 1, 1)),
+               "");
+}
+
+// Verifies the check for the capture block size.
+TEST(EchoRemoverDeathTest, WrongCaptureBlockSize) {
+  absl::optional<DelayEstimate> delay_estimate;
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    std::unique_ptr<EchoRemover> remover(
+        EchoRemover::Create(EchoCanceller3Config(), rate, 1, 1));
+    std::unique_ptr<RenderDelayBuffer> render_buffer(
+        RenderDelayBuffer::Create(EchoCanceller3Config(), rate, 1));
+    std::vector<std::vector<std::vector<float>>> capture(
+        NumBandsForRate(rate), std::vector<std::vector<float>>(
+                                   1, std::vector<float>(kBlockSize - 1, 0.f)));
+    EchoPathVariability echo_path_variability(
+        false, EchoPathVariability::DelayAdjustment::kNone, false);
+    EXPECT_DEATH(remover->ProcessCapture(
+                     echo_path_variability, false, delay_estimate,
+                     render_buffer->GetRenderBuffer(), nullptr, &capture),
+                 "");
+  }
+}
+
+// Verifies the check for the number of capture bands.
+// TODO(peah): Re-enable the test once the issue with memory leaks during DEATH
+// tests on test bots has been fixed.c
+TEST(EchoRemoverDeathTest, DISABLED_WrongCaptureNumBands) {
+  absl::optional<DelayEstimate> delay_estimate;
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    std::unique_ptr<EchoRemover> remover(
+        EchoRemover::Create(EchoCanceller3Config(), rate, 1, 1));
+    std::unique_ptr<RenderDelayBuffer> render_buffer(
+        RenderDelayBuffer::Create(EchoCanceller3Config(), rate, 1));
+    std::vector<std::vector<std::vector<float>>> capture(
+        NumBandsForRate(rate == 48000 ? 16000 : rate + 16000),
+        std::vector<std::vector<float>>(1,
+                                        std::vector<float>(kBlockSize, 0.f)));
+    EchoPathVariability echo_path_variability(
+        false, EchoPathVariability::DelayAdjustment::kNone, false);
+    EXPECT_DEATH(remover->ProcessCapture(
+                     echo_path_variability, false, delay_estimate,
+                     render_buffer->GetRenderBuffer(), nullptr, &capture),
+                 "");
+  }
+}
+
+// Verifies the check for non-null capture block.
+TEST(EchoRemoverDeathTest, NullCapture) {
+  absl::optional<DelayEstimate> delay_estimate;
+  std::unique_ptr<EchoRemover> remover(
+      EchoRemover::Create(EchoCanceller3Config(), 16000, 1, 1));
+  std::unique_ptr<RenderDelayBuffer> render_buffer(
+      RenderDelayBuffer::Create(EchoCanceller3Config(), 16000, 1));
+  EchoPathVariability echo_path_variability(
+      false, EchoPathVariability::DelayAdjustment::kNone, false);
+  EXPECT_DEATH(remover->ProcessCapture(
+                   echo_path_variability, false, delay_estimate,
+                   render_buffer->GetRenderBuffer(), nullptr, nullptr),
+               "");
+}
+
+#endif
+
+// Performs a sanity check that the echo_remover is able to properly
+// remove echoes.
+TEST(EchoRemover, BasicEchoRemoval) {
+  constexpr int kNumBlocksToProcess = 500;
+  Random random_generator(42U);
+  absl::optional<DelayEstimate> delay_estimate;
+  for (size_t num_channels : {1, 2, 4}) {
+    for (auto rate : {16000, 32000, 48000}) {
+      std::vector<std::vector<std::vector<float>>> x(
+          NumBandsForRate(rate),
+          std::vector<std::vector<float>>(num_channels,
+                                          std::vector<float>(kBlockSize, 0.f)));
+      std::vector<std::vector<std::vector<float>>> y(
+          NumBandsForRate(rate),
+          std::vector<std::vector<float>>(num_channels,
+                                          std::vector<float>(kBlockSize, 0.f)));
+      EchoPathVariability echo_path_variability(
+          false, EchoPathVariability::DelayAdjustment::kNone, false);
+      for (size_t delay_samples : {0, 64, 150, 200, 301}) {
+        SCOPED_TRACE(ProduceDebugText(rate, delay_samples));
+        EchoCanceller3Config config;
+        std::unique_ptr<EchoRemover> remover(
+            EchoRemover::Create(config, rate, num_channels, num_channels));
+        std::unique_ptr<RenderDelayBuffer> render_buffer(
+            RenderDelayBuffer::Create(config, rate, num_channels));
+        render_buffer->AlignFromDelay(delay_samples / kBlockSize);
+
+        std::vector<std::vector<std::unique_ptr<DelayBuffer<float>>>>
+            delay_buffers(x.size());
+        for (size_t band = 0; band < delay_buffers.size(); ++band) {
+          delay_buffers[band].resize(x[0].size());
+        }
+
+        for (size_t band = 0; band < x.size(); ++band) {
+          for (size_t channel = 0; channel < x[0].size(); ++channel) {
+            delay_buffers[band][channel].reset(
+                new DelayBuffer<float>(delay_samples));
+          }
+        }
+
+        float input_energy = 0.f;
+        float output_energy = 0.f;
+        for (int k = 0; k < kNumBlocksToProcess; ++k) {
+          const bool silence = k < 100 || (k % 100 >= 10);
+
+          for (size_t band = 0; band < x.size(); ++band) {
+            for (size_t channel = 0; channel < x[0].size(); ++channel) {
+              if (silence) {
+                std::fill(x[band][channel].begin(), x[band][channel].end(),
+                          0.f);
+              } else {
+                RandomizeSampleVector(&random_generator, x[band][channel]);
+              }
+              delay_buffers[band][channel]->Delay(x[band][channel],
+                                                  y[band][channel]);
+            }
+          }
+
+          if (k > kNumBlocksToProcess / 2) {
+            input_energy = std::inner_product(y[0][0].begin(), y[0][0].end(),
+                                              y[0][0].begin(), input_energy);
+          }
+
+          render_buffer->Insert(x);
+          render_buffer->PrepareCaptureProcessing();
+
+          remover->ProcessCapture(echo_path_variability, false, delay_estimate,
+                                  render_buffer->GetRenderBuffer(), nullptr,
+                                  &y);
+
+          if (k > kNumBlocksToProcess / 2) {
+            output_energy = std::inner_product(y[0][0].begin(), y[0][0].end(),
+                                               y[0][0].begin(), output_energy);
+          }
+        }
+        EXPECT_GT(input_energy, 10.f * output_energy);
+      }
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,89 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/erle_estimator.h"
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+ErleEstimator::ErleEstimator(size_t startup_phase_length_blocks,
+                             const EchoCanceller3Config& config,
+                             size_t num_capture_channels)
+    : startup_phase_length_blocks_(startup_phase_length_blocks),
+      fullband_erle_estimator_(config.erle, num_capture_channels),
+      subband_erle_estimator_(config, num_capture_channels) {
+  if (config.erle.num_sections > 1) {
+    signal_dependent_erle_estimator_ =
+        std::make_unique<SignalDependentErleEstimator>(config,
+                                                       num_capture_channels);
+  }
+  Reset(true);
+}
+
+ErleEstimator::~ErleEstimator() = default;
+
+void ErleEstimator::Reset(bool delay_change) {
+  fullband_erle_estimator_.Reset();
+  subband_erle_estimator_.Reset();
+  if (signal_dependent_erle_estimator_) {
+    signal_dependent_erle_estimator_->Reset();
+  }
+  if (delay_change) {
+    blocks_since_reset_ = 0;
+  }
+}
+
+void ErleEstimator::Update(
+    const RenderBuffer& render_buffer,
+    rtc::ArrayView<const std::vector<std::array<float, kFftLengthBy2Plus1>>>
+        filter_frequency_responses,
+    rtc::ArrayView<const float, kFftLengthBy2Plus1>
+        avg_render_spectrum_with_reverb,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> capture_spectra,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        subtractor_spectra,
+    const std::vector<bool>& converged_filters) {
+  RTC_DCHECK_EQ(subband_erle_estimator_.Erle(/*onset_compensated=*/true).size(),
+                capture_spectra.size());
+  RTC_DCHECK_EQ(subband_erle_estimator_.Erle(/*onset_compensated=*/true).size(),
+                subtractor_spectra.size());
+  const auto& X2_reverb = avg_render_spectrum_with_reverb;
+  const auto& Y2 = capture_spectra;
+  const auto& E2 = subtractor_spectra;
+
+  if (++blocks_since_reset_ < startup_phase_length_blocks_) {
+    return;
+  }
+
+  subband_erle_estimator_.Update(X2_reverb, Y2, E2, converged_filters);
+
+  if (signal_dependent_erle_estimator_) {
+    signal_dependent_erle_estimator_->Update(
+        render_buffer, filter_frequency_responses, X2_reverb, Y2, E2,
+        subband_erle_estimator_.Erle(/*onset_compensated=*/false),
+        subband_erle_estimator_.Erle(/*onset_compensated=*/true),
+        converged_filters);
+  }
+
+  fullband_erle_estimator_.Update(X2_reverb, Y2, E2, converged_filters);
+}
+
+void ErleEstimator::Dump(
+    const std::unique_ptr<ApmDataDumper>& data_dumper) const {
+  fullband_erle_estimator_.Dump(data_dumper);
+  subband_erle_estimator_.Dump(data_dumper);
+  if (signal_dependent_erle_estimator_) {
+    signal_dependent_erle_estimator_->Dump(data_dumper);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,100 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <memory>
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/fullband_erle_estimator.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "modules/audio_processing/aec3/signal_dependent_erle_estimator.h"
+#include "modules/audio_processing/aec3/subband_erle_estimator.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+
+namespace webrtc {
+
+// Estimates the echo return loss enhancement. One estimate is done per subband
+// and another one is done using the aggreation of energy over all the subbands.
+class ErleEstimator {
+ public:
+  ErleEstimator(size_t startup_phase_length_blocks,
+                const EchoCanceller3Config& config,
+                size_t num_capture_channels);
+  ~ErleEstimator();
+
+  // Resets the fullband ERLE estimator and the subbands ERLE estimators.
+  void Reset(bool delay_change);
+
+  // Updates the ERLE estimates.
+  void Update(
+      const RenderBuffer& render_buffer,
+      rtc::ArrayView<const std::vector<std::array<float, kFftLengthBy2Plus1>>>
+          filter_frequency_responses,
+      rtc::ArrayView<const float, kFftLengthBy2Plus1>
+          avg_render_spectrum_with_reverb,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+          capture_spectra,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+          subtractor_spectra,
+      const std::vector<bool>& converged_filters);
+
+  // Returns the most recent subband ERLE estimates.
+  rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Erle(
+      bool onset_compensated) const {
+    return signal_dependent_erle_estimator_
+               ? signal_dependent_erle_estimator_->Erle(onset_compensated)
+               : subband_erle_estimator_.Erle(onset_compensated);
+  }
+
+  // Returns the subband ERLE that are estimated during onsets (only used for
+  // testing).
+  rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> ErleDuringOnsets()
+      const {
+    return subband_erle_estimator_.ErleDuringOnsets();
+  }
+
+  // Returns the fullband ERLE estimate.
+  float FullbandErleLog2() const {
+    return fullband_erle_estimator_.FullbandErleLog2();
+  }
+
+  // Returns an estimation of the current linear filter quality based on the
+  // current and past fullband ERLE estimates. The returned value is a float
+  // vector with content between 0 and 1 where 1 indicates that, at this current
+  // time instant, the linear filter is reaching its maximum subtraction
+  // performance.
+  rtc::ArrayView<const absl::optional<float>> GetInstLinearQualityEstimates()
+      const {
+    return fullband_erle_estimator_.GetInstLinearQualityEstimates();
+  }
+
+  void Dump(const std::unique_ptr<ApmDataDumper>& data_dumper) const;
+
+ private:
+  const size_t startup_phase_length_blocks_;
+  FullBandErleEstimator fullband_erle_estimator_;
+  SubbandErleEstimator subband_erle_estimator_;
+  std::unique_ptr<SignalDependentErleEstimator>
+      signal_dependent_erle_estimator_;
+  size_t blocks_since_reset_ = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_ERLE_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erle_estimator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,272 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/erle_estimator.h"
+
+#include <cmath>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/aec3/spectrum_buffer.h"
+#include "rtc_base/random.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+namespace {
+constexpr int kLowFrequencyLimit = kFftLengthBy2 / 2;
+constexpr float kTrueErle = 10.f;
+constexpr float kTrueErleOnsets = 1.0f;
+constexpr float kEchoPathGain = 3.f;
+
+void VerifyErleBands(
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> erle,
+    float reference_lf,
+    float reference_hf) {
+  for (size_t ch = 0; ch < erle.size(); ++ch) {
+    std::for_each(
+        erle[ch].begin(), erle[ch].begin() + kLowFrequencyLimit,
+        [reference_lf](float a) { EXPECT_NEAR(reference_lf, a, 0.001); });
+    std::for_each(
+        erle[ch].begin() + kLowFrequencyLimit, erle[ch].end(),
+        [reference_hf](float a) { EXPECT_NEAR(reference_hf, a, 0.001); });
+  }
+}
+
+void VerifyErle(
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> erle,
+    float erle_time_domain,
+    float reference_lf,
+    float reference_hf) {
+  VerifyErleBands(erle, reference_lf, reference_hf);
+  EXPECT_NEAR(kTrueErle, erle_time_domain, 0.5);
+}
+
+void FormFarendTimeFrame(std::vector<std::vector<std::vector<float>>>* x) {
+  const std::array<float, kBlockSize> frame = {
+      7459.88, 17209.6, 17383,   20768.9, 16816.7, 18386.3, 4492.83, 9675.85,
+      6665.52, 14808.6, 9342.3,  7483.28, 19261.7, 4145.98, 1622.18, 13475.2,
+      7166.32, 6856.61, 21937,   7263.14, 9569.07, 14919,   8413.32, 7551.89,
+      7848.65, 6011.27, 13080.6, 15865.2, 12656,   17459.6, 4263.93, 4503.03,
+      9311.79, 21095.8, 12657.9, 13906.6, 19267.2, 11338.1, 16828.9, 11501.6,
+      11405,   15031.4, 14541.6, 19765.5, 18346.3, 19350.2, 3157.47, 18095.8,
+      1743.68, 21328.2, 19727.5, 7295.16, 10332.4, 11055.5, 20107.4, 14708.4,
+      12416.2, 16434,   2454.69, 9840.8,  6867.23, 1615.75, 6059.9,  8394.19};
+  for (size_t band = 0; band < x->size(); ++band) {
+    for (size_t channel = 0; channel < (*x)[band].size(); ++channel) {
+      RTC_DCHECK_GE((*x)[band][channel].size(), frame.size());
+      std::copy(frame.begin(), frame.end(), (*x)[band][channel].begin());
+    }
+  }
+}
+
+void FormFarendFrame(const RenderBuffer& render_buffer,
+                     float erle,
+                     std::array<float, kFftLengthBy2Plus1>* X2,
+                     rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> E2,
+                     rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> Y2) {
+  const auto& spectrum_buffer = render_buffer.GetSpectrumBuffer();
+  const int num_render_channels = spectrum_buffer.buffer[0].size();
+  const int num_capture_channels = Y2.size();
+
+  X2->fill(0.f);
+  for (int ch = 0; ch < num_render_channels; ++ch) {
+    for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+      (*X2)[k] += spectrum_buffer.buffer[spectrum_buffer.write][ch][k] /
+                  num_render_channels;
+    }
+  }
+
+  for (int ch = 0; ch < num_capture_channels; ++ch) {
+    std::transform(X2->begin(), X2->end(), Y2[ch].begin(),
+                   [](float a) { return a * kEchoPathGain * kEchoPathGain; });
+    std::transform(Y2[ch].begin(), Y2[ch].end(), E2[ch].begin(),
+                   [erle](float a) { return a / erle; });
+  }
+}
+
+void FormNearendFrame(
+    std::vector<std::vector<std::vector<float>>>* x,
+    std::array<float, kFftLengthBy2Plus1>* X2,
+    rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> E2,
+    rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> Y2) {
+  for (size_t band = 0; band < x->size(); ++band) {
+    for (size_t ch = 0; ch < (*x)[band].size(); ++ch) {
+      std::fill((*x)[band][ch].begin(), (*x)[band][ch].end(), 0.f);
+    }
+  }
+
+  X2->fill(0.f);
+  for (size_t ch = 0; ch < Y2.size(); ++ch) {
+    Y2[ch].fill(500.f * 1000.f * 1000.f);
+    E2[ch].fill(Y2[ch][0]);
+  }
+}
+
+void GetFilterFreq(
+    size_t delay_headroom_samples,
+    rtc::ArrayView<std::vector<std::array<float, kFftLengthBy2Plus1>>>
+        filter_frequency_response) {
+  const size_t delay_headroom_blocks = delay_headroom_samples / kBlockSize;
+  for (size_t ch = 0; ch < filter_frequency_response[0].size(); ++ch) {
+    for (auto& block_freq_resp : filter_frequency_response) {
+      block_freq_resp[ch].fill(0.f);
+    }
+
+    for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+      filter_frequency_response[delay_headroom_blocks][ch][k] = kEchoPathGain;
+    }
+  }
+}
+
+}  // namespace
+
+class ErleEstimatorMultiChannel
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<std::tuple<size_t, size_t>> {};
+
+INSTANTIATE_TEST_SUITE_P(MultiChannel,
+                         ErleEstimatorMultiChannel,
+                         ::testing::Combine(::testing::Values(1, 2, 4, 8),
+                                            ::testing::Values(1, 2, 8)));
+
+TEST_P(ErleEstimatorMultiChannel, VerifyErleIncreaseAndHold) {
+  const size_t num_render_channels = std::get<0>(GetParam());
+  const size_t num_capture_channels = std::get<1>(GetParam());
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+
+  std::array<float, kFftLengthBy2Plus1> X2;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> E2(num_capture_channels);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> Y2(num_capture_channels);
+  std::vector<bool> converged_filters(num_capture_channels, true);
+
+  EchoCanceller3Config config;
+  config.erle.onset_detection = true;
+
+  std::vector<std::vector<std::vector<float>>> x(
+      kNumBands, std::vector<std::vector<float>>(
+                     num_render_channels, std::vector<float>(kBlockSize, 0.f)));
+  std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>>
+  filter_frequency_response(
+      config.filter.refined.length_blocks,
+      std::vector<std::array<float, kFftLengthBy2Plus1>>(num_capture_channels));
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, kSampleRateHz, num_render_channels));
+
+  GetFilterFreq(config.delay.delay_headroom_samples, filter_frequency_response);
+
+  ErleEstimator estimator(0, config, num_capture_channels);
+
+  FormFarendTimeFrame(&x);
+  render_delay_buffer->Insert(x);
+  render_delay_buffer->PrepareCaptureProcessing();
+  // Verifies that the ERLE estimate is properly increased to higher values.
+  FormFarendFrame(*render_delay_buffer->GetRenderBuffer(), kTrueErle, &X2, E2,
+                  Y2);
+  for (size_t k = 0; k < 1000; ++k) {
+    render_delay_buffer->Insert(x);
+    render_delay_buffer->PrepareCaptureProcessing();
+    estimator.Update(*render_delay_buffer->GetRenderBuffer(),
+                     filter_frequency_response, X2, Y2, E2, converged_filters);
+  }
+  VerifyErle(estimator.Erle(/*onset_compensated=*/true),
+             std::pow(2.f, estimator.FullbandErleLog2()), config.erle.max_l,
+             config.erle.max_h);
+
+  FormNearendFrame(&x, &X2, E2, Y2);
+  // Verifies that the ERLE is not immediately decreased during nearend
+  // activity.
+  for (size_t k = 0; k < 50; ++k) {
+    render_delay_buffer->Insert(x);
+    render_delay_buffer->PrepareCaptureProcessing();
+    estimator.Update(*render_delay_buffer->GetRenderBuffer(),
+                     filter_frequency_response, X2, Y2, E2, converged_filters);
+  }
+  VerifyErle(estimator.Erle(/*onset_compensated=*/true),
+             std::pow(2.f, estimator.FullbandErleLog2()), config.erle.max_l,
+             config.erle.max_h);
+}
+
+TEST_P(ErleEstimatorMultiChannel, VerifyErleTrackingOnOnsets) {
+  const size_t num_render_channels = std::get<0>(GetParam());
+  const size_t num_capture_channels = std::get<1>(GetParam());
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+
+  std::array<float, kFftLengthBy2Plus1> X2;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> E2(num_capture_channels);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> Y2(num_capture_channels);
+  std::vector<bool> converged_filters(num_capture_channels, true);
+  EchoCanceller3Config config;
+  config.erle.onset_detection = true;
+  std::vector<std::vector<std::vector<float>>> x(
+      kNumBands, std::vector<std::vector<float>>(
+                     num_render_channels, std::vector<float>(kBlockSize, 0.f)));
+  std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>>
+  filter_frequency_response(
+      config.filter.refined.length_blocks,
+      std::vector<std::array<float, kFftLengthBy2Plus1>>(num_capture_channels));
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, kSampleRateHz, num_render_channels));
+
+  GetFilterFreq(config.delay.delay_headroom_samples, filter_frequency_response);
+
+  ErleEstimator estimator(/*startup_phase_length_blocks=*/0, config,
+                          num_capture_channels);
+
+  FormFarendTimeFrame(&x);
+  render_delay_buffer->Insert(x);
+  render_delay_buffer->PrepareCaptureProcessing();
+
+  for (size_t burst = 0; burst < 20; ++burst) {
+    FormFarendFrame(*render_delay_buffer->GetRenderBuffer(), kTrueErleOnsets,
+                    &X2, E2, Y2);
+    for (size_t k = 0; k < 10; ++k) {
+      render_delay_buffer->Insert(x);
+      render_delay_buffer->PrepareCaptureProcessing();
+      estimator.Update(*render_delay_buffer->GetRenderBuffer(),
+                       filter_frequency_response, X2, Y2, E2,
+                       converged_filters);
+    }
+    FormFarendFrame(*render_delay_buffer->GetRenderBuffer(), kTrueErle, &X2, E2,
+                    Y2);
+    for (size_t k = 0; k < 1000; ++k) {
+      render_delay_buffer->Insert(x);
+      render_delay_buffer->PrepareCaptureProcessing();
+      estimator.Update(*render_delay_buffer->GetRenderBuffer(),
+                       filter_frequency_response, X2, Y2, E2,
+                       converged_filters);
+    }
+    FormNearendFrame(&x, &X2, E2, Y2);
+    for (size_t k = 0; k < 300; ++k) {
+      render_delay_buffer->Insert(x);
+      render_delay_buffer->PrepareCaptureProcessing();
+      estimator.Update(*render_delay_buffer->GetRenderBuffer(),
+                       filter_frequency_response, X2, Y2, E2,
+                       converged_filters);
+    }
+  }
+  VerifyErleBands(estimator.ErleDuringOnsets(), config.erle.min,
+                  config.erle.min);
+  FormNearendFrame(&x, &X2, E2, Y2);
+  for (size_t k = 0; k < 1000; k++) {
+    estimator.Update(*render_delay_buffer->GetRenderBuffer(),
+                     filter_frequency_response, X2, Y2, E2, converged_filters);
+  }
+  // Verifies that during ne activity, Erle converges to the Erle for
+  // onsets.
+  VerifyErle(estimator.Erle(/*onset_compensated=*/true),
+             std::pow(2.f, estimator.FullbandErleLog2()), config.erle.min,
+             config.erle.min);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,146 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/erl_estimator.h"
+
+#include <algorithm>
+#include <numeric>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace {
+
+constexpr float kMinErl = 0.01f;
+constexpr float kMaxErl = 1000.f;
+
+}  // namespace
+
+ErlEstimator::ErlEstimator(size_t startup_phase_length_blocks_)
+    : startup_phase_length_blocks__(startup_phase_length_blocks_) {
+  erl_.fill(kMaxErl);
+  hold_counters_.fill(0);
+  erl_time_domain_ = kMaxErl;
+  hold_counter_time_domain_ = 0;
+}
+
+ErlEstimator::~ErlEstimator() = default;
+
+void ErlEstimator::Reset() {
+  blocks_since_reset_ = 0;
+}
+
+void ErlEstimator::Update(
+    const std::vector<bool>& converged_filters,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> render_spectra,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        capture_spectra) {
+  const size_t num_capture_channels = converged_filters.size();
+  RTC_DCHECK_EQ(capture_spectra.size(), num_capture_channels);
+
+  // Corresponds to WGN of power -46 dBFS.
+  constexpr float kX2Min = 44015068.0f;
+
+  const auto first_converged_iter =
+      std::find(converged_filters.begin(), converged_filters.end(), true);
+  const bool any_filter_converged =
+      first_converged_iter != converged_filters.end();
+
+  if (++blocks_since_reset_ < startup_phase_length_blocks__ ||
+      !any_filter_converged) {
+    return;
+  }
+
+  // Use the maximum spectrum across capture and the maximum across render.
+  std::array<float, kFftLengthBy2Plus1> max_capture_spectrum_data;
+  std::array<float, kFftLengthBy2Plus1> max_capture_spectrum =
+      capture_spectra[/*channel=*/0];
+  if (num_capture_channels > 1) {
+    // Initialize using the first channel with a converged filter.
+    const size_t first_converged =
+        std::distance(converged_filters.begin(), first_converged_iter);
+    RTC_DCHECK_GE(first_converged, 0);
+    RTC_DCHECK_LT(first_converged, num_capture_channels);
+    max_capture_spectrum_data = capture_spectra[first_converged];
+
+    for (size_t ch = first_converged + 1; ch < num_capture_channels; ++ch) {
+      if (!converged_filters[ch]) {
+        continue;
+      }
+      for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+        max_capture_spectrum_data[k] =
+            std::max(max_capture_spectrum_data[k], capture_spectra[ch][k]);
+      }
+    }
+    max_capture_spectrum = max_capture_spectrum_data;
+  }
+
+  const size_t num_render_channels = render_spectra.size();
+  std::array<float, kFftLengthBy2Plus1> max_render_spectrum_data;
+  rtc::ArrayView<const float, kFftLengthBy2Plus1> max_render_spectrum =
+      render_spectra[/*channel=*/0];
+  if (num_render_channels > 1) {
+    std::copy(render_spectra[0].begin(), render_spectra[0].end(),
+              max_render_spectrum_data.begin());
+    for (size_t ch = 1; ch < num_render_channels; ++ch) {
+      for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+        max_render_spectrum_data[k] =
+            std::max(max_render_spectrum_data[k], render_spectra[ch][k]);
+      }
+    }
+    max_render_spectrum = max_render_spectrum_data;
+  }
+
+  const auto& X2 = max_render_spectrum;
+  const auto& Y2 = max_capture_spectrum;
+
+  // Update the estimates in a maximum statistics manner.
+  for (size_t k = 1; k < kFftLengthBy2; ++k) {
+    if (X2[k] > kX2Min) {
+      const float new_erl = Y2[k] / X2[k];
+      if (new_erl < erl_[k]) {
+        hold_counters_[k - 1] = 1000;
+        erl_[k] += 0.1f * (new_erl - erl_[k]);
+        erl_[k] = std::max(erl_[k], kMinErl);
+      }
+    }
+  }
+
+  std::for_each(hold_counters_.begin(), hold_counters_.end(),
+                [](int& a) { --a; });
+  std::transform(hold_counters_.begin(), hold_counters_.end(), erl_.begin() + 1,
+                 erl_.begin() + 1, [](int a, float b) {
+                   return a > 0 ? b : std::min(kMaxErl, 2.f * b);
+                 });
+
+  erl_[0] = erl_[1];
+  erl_[kFftLengthBy2] = erl_[kFftLengthBy2 - 1];
+
+  // Compute ERL over all frequency bins.
+  const float X2_sum = std::accumulate(X2.begin(), X2.end(), 0.0f);
+
+  if (X2_sum > kX2Min * X2.size()) {
+    const float Y2_sum = std::accumulate(Y2.begin(), Y2.end(), 0.0f);
+    const float new_erl = Y2_sum / X2_sum;
+    if (new_erl < erl_time_domain_) {
+      hold_counter_time_domain_ = 1000;
+      erl_time_domain_ += 0.1f * (new_erl - erl_time_domain_);
+      erl_time_domain_ = std::max(erl_time_domain_, kMinErl);
+    }
+  }
+
+  --hold_counter_time_domain_;
+  erl_time_domain_ = (hold_counter_time_domain_ > 0)
+                         ? erl_time_domain_
+                         : std::min(kMaxErl, 2.f * erl_time_domain_);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+// Estimates the echo return loss based on the signal spectra.
+class ErlEstimator {
+ public:
+  explicit ErlEstimator(size_t startup_phase_length_blocks_);
+  ~ErlEstimator();
+
+  // Resets the ERL estimation.
+  void Reset();
+
+  // Updates the ERL estimate.
+  void Update(const std::vector<bool>& converged_filters,
+              rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+                  render_spectra,
+              rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+                  capture_spectra);
+
+  // Returns the most recent ERL estimate.
+  const std::array<float, kFftLengthBy2Plus1>& Erl() const { return erl_; }
+  float ErlTimeDomain() const { return erl_time_domain_; }
+
+ private:
+  const size_t startup_phase_length_blocks__;
+  std::array<float, kFftLengthBy2Plus1> erl_;
+  std::array<int, kFftLengthBy2Minus1> hold_counters_;
+  float erl_time_domain_;
+  int hold_counter_time_domain_;
+  size_t blocks_since_reset_ = 0;
+  RTC_DISALLOW_COPY_AND_ASSIGN(ErlEstimator);
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_ERL_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/erl_estimator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,104 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/erl_estimator.h"
+
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+namespace {
+std::string ProduceDebugText(size_t num_render_channels,
+                             size_t num_capture_channels) {
+  rtc::StringBuilder ss;
+  ss << "Render channels: " << num_render_channels;
+  ss << ", Capture channels: " << num_capture_channels;
+  return ss.Release();
+}
+
+void VerifyErl(const std::array<float, kFftLengthBy2Plus1>& erl,
+               float erl_time_domain,
+               float reference) {
+  std::for_each(erl.begin(), erl.end(),
+                [reference](float a) { EXPECT_NEAR(reference, a, 0.001); });
+  EXPECT_NEAR(reference, erl_time_domain, 0.001);
+}
+
+}  // namespace
+
+class ErlEstimatorMultiChannel
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<std::tuple<size_t, size_t>> {};
+
+INSTANTIATE_TEST_SUITE_P(MultiChannel,
+                         ErlEstimatorMultiChannel,
+                         ::testing::Combine(::testing::Values(1, 2, 8),
+                                            ::testing::Values(1, 2, 8)));
+
+// Verifies that the correct ERL estimates are achieved.
+TEST_P(ErlEstimatorMultiChannel, Estimates) {
+  const size_t num_render_channels = std::get<0>(GetParam());
+  const size_t num_capture_channels = std::get<1>(GetParam());
+  SCOPED_TRACE(ProduceDebugText(num_render_channels, num_capture_channels));
+  std::vector<std::array<float, kFftLengthBy2Plus1>> X2(num_render_channels);
+  for (auto& X2_ch : X2) {
+    X2_ch.fill(0.f);
+  }
+  std::vector<std::array<float, kFftLengthBy2Plus1>> Y2(num_capture_channels);
+  for (auto& Y2_ch : Y2) {
+    Y2_ch.fill(0.f);
+  }
+  std::vector<bool> converged_filters(num_capture_channels, false);
+  const size_t converged_idx = num_capture_channels - 1;
+  converged_filters[converged_idx] = true;
+
+  ErlEstimator estimator(0);
+
+  // Verifies that the ERL estimate is properly reduced to lower values.
+  for (auto& X2_ch : X2) {
+    X2_ch.fill(500 * 1000.f * 1000.f);
+  }
+  Y2[converged_idx].fill(10 * X2[0][0]);
+  for (size_t k = 0; k < 200; ++k) {
+    estimator.Update(converged_filters, X2, Y2);
+  }
+  VerifyErl(estimator.Erl(), estimator.ErlTimeDomain(), 10.f);
+
+  // Verifies that the ERL is not immediately increased when the ERL in the
+  // data increases.
+  Y2[converged_idx].fill(10000 * X2[0][0]);
+  for (size_t k = 0; k < 998; ++k) {
+    estimator.Update(converged_filters, X2, Y2);
+  }
+  VerifyErl(estimator.Erl(), estimator.ErlTimeDomain(), 10.f);
+
+  // Verifies that the rate of increase is 3 dB.
+  estimator.Update(converged_filters, X2, Y2);
+  VerifyErl(estimator.Erl(), estimator.ErlTimeDomain(), 20.f);
+
+  // Verifies that the maximum ERL is achieved when there are no low RLE
+  // estimates.
+  for (size_t k = 0; k < 1000; ++k) {
+    estimator.Update(converged_filters, X2, Y2);
+  }
+  VerifyErl(estimator.Erl(), estimator.ErlTimeDomain(), 1000.f);
+
+  // Verifies that the ERL estimate is is not updated for low-level signals
+  for (auto& X2_ch : X2) {
+    X2_ch.fill(1000.f * 1000.f);
+  }
+  Y2[converged_idx].fill(10 * X2[0][0]);
+  for (size_t k = 0; k < 200; ++k) {
+    estimator.Update(converged_filters, X2, Y2);
+  }
+  VerifyErl(estimator.Erl(), estimator.ErlTimeDomain(), 1000.f);
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_buffer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_buffer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_buffer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_buffer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/fft_buffer.h"
+
+namespace webrtc {
+
+FftBuffer::FftBuffer(size_t size, size_t num_channels)
+    : size(static_cast<int>(size)),
+      buffer(size, std::vector<FftData>(num_channels)) {
+  for (auto& block : buffer) {
+    for (auto& channel_fft_data : block) {
+      channel_fft_data.Clear();
+    }
+  }
+}
+
+FftBuffer::~FftBuffer() = default;
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_FFT_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_FFT_BUFFER_H_
+
+#include <stddef.h>
+
+#include <vector>
+
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+// Struct for bundling a circular buffer of FftData objects together with the
+// read and write indices.
+struct FftBuffer {
+  FftBuffer(size_t size, size_t num_channels);
+  ~FftBuffer();
+
+  int IncIndex(int index) const {
+    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
+    return index < size - 1 ? index + 1 : 0;
+  }
+
+  int DecIndex(int index) const {
+    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
+    return index > 0 ? index - 1 : size - 1;
+  }
+
+  int OffsetIndex(int index, int offset) const {
+    RTC_DCHECK_GE(buffer.size(), offset);
+    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
+    return (size + index + offset) % size;
+  }
+
+  void UpdateWriteIndex(int offset) { write = OffsetIndex(write, offset); }
+  void IncWriteIndex() { write = IncIndex(write); }
+  void DecWriteIndex() { write = DecIndex(write); }
+  void UpdateReadIndex(int offset) { read = OffsetIndex(read, offset); }
+  void IncReadIndex() { read = IncIndex(read); }
+  void DecReadIndex() { read = DecIndex(read); }
+
+  const int size;
+  std::vector<std::vector<FftData>> buffer;
+  int write = 0;
+  int read = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_FFT_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data_avx2.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data_avx2.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data_avx2.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data_avx2.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/fft_data.h"
+
+#include <immintrin.h>
+
+#include "api/array_view.h"
+
+namespace webrtc {
+
+// Computes the power spectrum of the data.
+void FftData::SpectrumAVX2(rtc::ArrayView<float> power_spectrum) const {
+  RTC_DCHECK_EQ(kFftLengthBy2Plus1, power_spectrum.size());
+  for (size_t k = 0; k < kFftLengthBy2; k += 8) {
+    __m256 r = _mm256_loadu_ps(&re[k]);
+    __m256 i = _mm256_loadu_ps(&im[k]);
+    __m256 ii = _mm256_mul_ps(i, i);
+    ii = _mm256_fmadd_ps(r, r, ii);
+    _mm256_storeu_ps(&power_spectrum[k], ii);
+  }
+  power_spectrum[kFftLengthBy2] = re[kFftLengthBy2] * re[kFftLengthBy2] +
+                                  im[kFftLengthBy2] * im[kFftLengthBy2];
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,104 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_
+
+// Defines WEBRTC_ARCH_X86_FAMILY, used below.
+#include "rtc_base/system/arch.h"
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+#include <emmintrin.h>
+#endif
+#include <algorithm>
+#include <array>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+
+namespace webrtc {
+
+// Struct that holds imaginary data produced from 128 point real-valued FFTs.
+struct FftData {
+  // Copies the data in src.
+  void Assign(const FftData& src) {
+    std::copy(src.re.begin(), src.re.end(), re.begin());
+    std::copy(src.im.begin(), src.im.end(), im.begin());
+    im[0] = im[kFftLengthBy2] = 0;
+  }
+
+  // Clears all the imaginary.
+  void Clear() {
+    re.fill(0.f);
+    im.fill(0.f);
+  }
+
+  // Computes the power spectrum of the data.
+  void SpectrumAVX2(rtc::ArrayView<float> power_spectrum) const;
+
+  // Computes the power spectrum of the data.
+  void Spectrum(Aec3Optimization optimization,
+                rtc::ArrayView<float> power_spectrum) const {
+    RTC_DCHECK_EQ(kFftLengthBy2Plus1, power_spectrum.size());
+    switch (optimization) {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+      case Aec3Optimization::kSse2: {
+        constexpr int kNumFourBinBands = kFftLengthBy2 / 4;
+        constexpr int kLimit = kNumFourBinBands * 4;
+        for (size_t k = 0; k < kLimit; k += 4) {
+          const __m128 r = _mm_loadu_ps(&re[k]);
+          const __m128 i = _mm_loadu_ps(&im[k]);
+          const __m128 ii = _mm_mul_ps(i, i);
+          const __m128 rr = _mm_mul_ps(r, r);
+          const __m128 rrii = _mm_add_ps(rr, ii);
+          _mm_storeu_ps(&power_spectrum[k], rrii);
+        }
+        power_spectrum[kFftLengthBy2] = re[kFftLengthBy2] * re[kFftLengthBy2] +
+                                        im[kFftLengthBy2] * im[kFftLengthBy2];
+      } break;
+      case Aec3Optimization::kAvx2:
+        SpectrumAVX2(power_spectrum);
+        break;
+#endif
+      default:
+        std::transform(re.begin(), re.end(), im.begin(), power_spectrum.begin(),
+                       [](float a, float b) { return a * a + b * b; });
+    }
+  }
+
+  // Copy the data from an interleaved array.
+  void CopyFromPackedArray(const std::array<float, kFftLength>& v) {
+    re[0] = v[0];
+    re[kFftLengthBy2] = v[1];
+    im[0] = im[kFftLengthBy2] = 0;
+    for (size_t k = 1, j = 2; k < kFftLengthBy2; ++k) {
+      re[k] = v[j++];
+      im[k] = v[j++];
+    }
+  }
+
+  // Copies the data into an interleaved array.
+  void CopyToPackedArray(std::array<float, kFftLength>* v) const {
+    RTC_DCHECK(v);
+    (*v)[0] = re[0];
+    (*v)[1] = re[kFftLengthBy2];
+    for (size_t k = 1, j = 2; k < kFftLengthBy2; ++k) {
+      (*v)[j++] = re[k];
+      (*v)[j++] = im[k];
+    }
+  }
+
+  std::array<float, kFftLengthBy2Plus1> re;
+  std::array<float, kFftLengthBy2Plus1> im;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_FFT_DATA_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fft_data_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,186 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/fft_data.h"
+
+#include "rtc_base/system/arch.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+// Verifies that the optimized methods are bitexact to their reference
+// counterparts.
+TEST(FftData, TestSse2Optimizations) {
+  if (GetCPUInfo(kSSE2) != 0) {
+    FftData x;
+
+    for (size_t k = 0; k < x.re.size(); ++k) {
+      x.re[k] = k + 1;
+    }
+
+    x.im[0] = x.im[x.im.size() - 1] = 0.f;
+    for (size_t k = 1; k < x.im.size() - 1; ++k) {
+      x.im[k] = 2.f * (k + 1);
+    }
+
+    std::array<float, kFftLengthBy2Plus1> spectrum;
+    std::array<float, kFftLengthBy2Plus1> spectrum_sse2;
+    x.Spectrum(Aec3Optimization::kNone, spectrum);
+    x.Spectrum(Aec3Optimization::kSse2, spectrum_sse2);
+    EXPECT_EQ(spectrum, spectrum_sse2);
+  }
+}
+
+// Verifies that the optimized methods are bitexact to their reference
+// counterparts.
+TEST(FftData, TestAvx2Optimizations) {
+  if (GetCPUInfo(kAVX2) != 0) {
+    FftData x;
+
+    for (size_t k = 0; k < x.re.size(); ++k) {
+      x.re[k] = k + 1;
+    }
+
+    x.im[0] = x.im[x.im.size() - 1] = 0.f;
+    for (size_t k = 1; k < x.im.size() - 1; ++k) {
+      x.im[k] = 2.f * (k + 1);
+    }
+
+    std::array<float, kFftLengthBy2Plus1> spectrum;
+    std::array<float, kFftLengthBy2Plus1> spectrum_avx2;
+    x.Spectrum(Aec3Optimization::kNone, spectrum);
+    x.Spectrum(Aec3Optimization::kAvx2, spectrum_avx2);
+    EXPECT_EQ(spectrum, spectrum_avx2);
+  }
+}
+#endif
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies the check for null output in CopyToPackedArray.
+TEST(FftDataDeathTest, NonNullCopyToPackedArrayOutput) {
+  EXPECT_DEATH(FftData().CopyToPackedArray(nullptr), "");
+}
+
+// Verifies the check for null output in Spectrum.
+TEST(FftDataDeathTest, NonNullSpectrumOutput) {
+  EXPECT_DEATH(FftData().Spectrum(Aec3Optimization::kNone, nullptr), "");
+}
+
+#endif
+
+// Verifies that the Assign method properly copies the data from the source and
+// ensures that the imaginary components for the DC and Nyquist bins are 0.
+TEST(FftData, Assign) {
+  FftData x;
+  FftData y;
+
+  x.re.fill(1.f);
+  x.im.fill(2.f);
+  y.Assign(x);
+  EXPECT_EQ(x.re, y.re);
+  EXPECT_EQ(0.f, y.im[0]);
+  EXPECT_EQ(0.f, y.im[x.im.size() - 1]);
+  for (size_t k = 1; k < x.im.size() - 1; ++k) {
+    EXPECT_EQ(x.im[k], y.im[k]);
+  }
+}
+
+// Verifies that the Clear method properly clears all the data.
+TEST(FftData, Clear) {
+  FftData x_ref;
+  FftData x;
+
+  x_ref.re.fill(0.f);
+  x_ref.im.fill(0.f);
+
+  x.re.fill(1.f);
+  x.im.fill(2.f);
+  x.Clear();
+
+  EXPECT_EQ(x_ref.re, x.re);
+  EXPECT_EQ(x_ref.im, x.im);
+}
+
+// Verifies that the spectrum is correctly computed.
+TEST(FftData, Spectrum) {
+  FftData x;
+
+  for (size_t k = 0; k < x.re.size(); ++k) {
+    x.re[k] = k + 1;
+  }
+
+  x.im[0] = x.im[x.im.size() - 1] = 0.f;
+  for (size_t k = 1; k < x.im.size() - 1; ++k) {
+    x.im[k] = 2.f * (k + 1);
+  }
+
+  std::array<float, kFftLengthBy2Plus1> spectrum;
+  x.Spectrum(Aec3Optimization::kNone, spectrum);
+
+  EXPECT_EQ(x.re[0] * x.re[0], spectrum[0]);
+  EXPECT_EQ(x.re[spectrum.size() - 1] * x.re[spectrum.size() - 1],
+            spectrum[spectrum.size() - 1]);
+  for (size_t k = 1; k < spectrum.size() - 1; ++k) {
+    EXPECT_EQ(x.re[k] * x.re[k] + x.im[k] * x.im[k], spectrum[k]);
+  }
+}
+
+// Verifies that the functionality in CopyToPackedArray works as intended.
+TEST(FftData, CopyToPackedArray) {
+  FftData x;
+  std::array<float, kFftLength> x_packed;
+
+  for (size_t k = 0; k < x.re.size(); ++k) {
+    x.re[k] = k + 1;
+  }
+
+  x.im[0] = x.im[x.im.size() - 1] = 0.f;
+  for (size_t k = 1; k < x.im.size() - 1; ++k) {
+    x.im[k] = 2.f * (k + 1);
+  }
+
+  x.CopyToPackedArray(&x_packed);
+
+  EXPECT_EQ(x.re[0], x_packed[0]);
+  EXPECT_EQ(x.re[x.re.size() - 1], x_packed[1]);
+  for (size_t k = 1; k < x_packed.size() / 2; ++k) {
+    EXPECT_EQ(x.re[k], x_packed[2 * k]);
+    EXPECT_EQ(x.im[k], x_packed[2 * k + 1]);
+  }
+}
+
+// Verifies that the functionality in CopyFromPackedArray works as intended
+// (relies on that the functionality in CopyToPackedArray has been verified in
+// the test above).
+TEST(FftData, CopyFromPackedArray) {
+  FftData x_ref;
+  FftData x;
+  std::array<float, kFftLength> x_packed;
+
+  for (size_t k = 0; k < x_ref.re.size(); ++k) {
+    x_ref.re[k] = k + 1;
+  }
+
+  x_ref.im[0] = x_ref.im[x_ref.im.size() - 1] = 0.f;
+  for (size_t k = 1; k < x_ref.im.size() - 1; ++k) {
+    x_ref.im[k] = 2.f * (k + 1);
+  }
+
+  x_ref.CopyToPackedArray(&x_packed);
+  x.CopyFromPackedArray(x_packed);
+
+  EXPECT_EQ(x_ref.re, x.re);
+  EXPECT_EQ(x_ref.im, x.im);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,280 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/filter_analyzer.h"
+
+#include <math.h>
+
+#include <algorithm>
+#include <array>
+#include <numeric>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+size_t FindPeakIndex(rtc::ArrayView<const float> filter_time_domain,
+                     size_t peak_index_in,
+                     size_t start_sample,
+                     size_t end_sample) {
+  size_t peak_index_out = peak_index_in;
+  float max_h2 =
+      filter_time_domain[peak_index_out] * filter_time_domain[peak_index_out];
+  for (size_t k = start_sample; k <= end_sample; ++k) {
+    float tmp = filter_time_domain[k] * filter_time_domain[k];
+    if (tmp > max_h2) {
+      peak_index_out = k;
+      max_h2 = tmp;
+    }
+  }
+
+  return peak_index_out;
+}
+
+}  // namespace
+
+int FilterAnalyzer::instance_count_ = 0;
+
+FilterAnalyzer::FilterAnalyzer(const EchoCanceller3Config& config,
+                               size_t num_capture_channels)
+    : data_dumper_(
+          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
+      bounded_erl_(config.ep_strength.bounded_erl),
+      default_gain_(config.ep_strength.default_gain),
+      h_highpass_(num_capture_channels,
+                  std::vector<float>(
+                      GetTimeDomainLength(config.filter.refined.length_blocks),
+                      0.f)),
+      filter_analysis_states_(num_capture_channels,
+                              FilterAnalysisState(config)),
+      filter_delays_blocks_(num_capture_channels, 0) {
+  Reset();
+}
+
+FilterAnalyzer::~FilterAnalyzer() = default;
+
+void FilterAnalyzer::Reset() {
+  blocks_since_reset_ = 0;
+  ResetRegion();
+  for (auto& state : filter_analysis_states_) {
+    state.Reset(default_gain_);
+  }
+  std::fill(filter_delays_blocks_.begin(), filter_delays_blocks_.end(), 0);
+}
+
+void FilterAnalyzer::Update(
+    rtc::ArrayView<const std::vector<float>> filters_time_domain,
+    const RenderBuffer& render_buffer,
+    bool* any_filter_consistent,
+    float* max_echo_path_gain) {
+  RTC_DCHECK(any_filter_consistent);
+  RTC_DCHECK(max_echo_path_gain);
+  RTC_DCHECK_EQ(filters_time_domain.size(), filter_analysis_states_.size());
+  RTC_DCHECK_EQ(filters_time_domain.size(), h_highpass_.size());
+
+  ++blocks_since_reset_;
+  SetRegionToAnalyze(filters_time_domain[0].size());
+  AnalyzeRegion(filters_time_domain, render_buffer);
+
+  // Aggregate the results for all capture channels.
+  auto& st_ch0 = filter_analysis_states_[0];
+  *any_filter_consistent = st_ch0.consistent_estimate;
+  *max_echo_path_gain = st_ch0.gain;
+  min_filter_delay_blocks_ = filter_delays_blocks_[0];
+  for (size_t ch = 1; ch < filters_time_domain.size(); ++ch) {
+    auto& st_ch = filter_analysis_states_[ch];
+    *any_filter_consistent =
+        *any_filter_consistent || st_ch.consistent_estimate;
+    *max_echo_path_gain = std::max(*max_echo_path_gain, st_ch.gain);
+    min_filter_delay_blocks_ =
+        std::min(min_filter_delay_blocks_, filter_delays_blocks_[ch]);
+  }
+}
+
+void FilterAnalyzer::AnalyzeRegion(
+    rtc::ArrayView<const std::vector<float>> filters_time_domain,
+    const RenderBuffer& render_buffer) {
+  // Preprocess the filter to avoid issues with low-frequency components in the
+  // filter.
+  PreProcessFilters(filters_time_domain);
+  data_dumper_->DumpRaw("aec3_linear_filter_processed_td", h_highpass_[0]);
+
+  constexpr float kOneByBlockSize = 1.f / kBlockSize;
+  for (size_t ch = 0; ch < filters_time_domain.size(); ++ch) {
+    RTC_DCHECK_LT(region_.start_sample_, filters_time_domain[ch].size());
+    RTC_DCHECK_LT(region_.end_sample_, filters_time_domain[ch].size());
+
+    auto& st_ch = filter_analysis_states_[ch];
+    RTC_DCHECK_EQ(h_highpass_[ch].size(), filters_time_domain[ch].size());
+    RTC_DCHECK_GT(h_highpass_[ch].size(), 0);
+    st_ch.peak_index = std::min(st_ch.peak_index, h_highpass_[ch].size() - 1);
+
+    st_ch.peak_index =
+        FindPeakIndex(h_highpass_[ch], st_ch.peak_index, region_.start_sample_,
+                      region_.end_sample_);
+    filter_delays_blocks_[ch] = st_ch.peak_index >> kBlockSizeLog2;
+    UpdateFilterGain(h_highpass_[ch], &st_ch);
+    st_ch.filter_length_blocks =
+        filters_time_domain[ch].size() * kOneByBlockSize;
+
+    st_ch.consistent_estimate = st_ch.consistent_filter_detector.Detect(
+        h_highpass_[ch], region_,
+        render_buffer.Block(-filter_delays_blocks_[ch])[0], st_ch.peak_index,
+        filter_delays_blocks_[ch]);
+  }
+}
+
+void FilterAnalyzer::UpdateFilterGain(
+    rtc::ArrayView<const float> filter_time_domain,
+    FilterAnalysisState* st) {
+  bool sufficient_time_to_converge =
+      blocks_since_reset_ > 5 * kNumBlocksPerSecond;
+
+  if (sufficient_time_to_converge && st->consistent_estimate) {
+    st->gain = fabsf(filter_time_domain[st->peak_index]);
+  } else {
+    // TODO(peah): Verify whether this check against a float is ok.
+    if (st->gain) {
+      st->gain = std::max(st->gain, fabsf(filter_time_domain[st->peak_index]));
+    }
+  }
+
+  if (bounded_erl_ && st->gain) {
+    st->gain = std::max(st->gain, 0.01f);
+  }
+}
+
+void FilterAnalyzer::PreProcessFilters(
+    rtc::ArrayView<const std::vector<float>> filters_time_domain) {
+  for (size_t ch = 0; ch < filters_time_domain.size(); ++ch) {
+    RTC_DCHECK_LT(region_.start_sample_, filters_time_domain[ch].size());
+    RTC_DCHECK_LT(region_.end_sample_, filters_time_domain[ch].size());
+
+    RTC_DCHECK_GE(h_highpass_[ch].capacity(), filters_time_domain[ch].size());
+    h_highpass_[ch].resize(filters_time_domain[ch].size());
+    // Minimum phase high-pass filter with cutoff frequency at about 600 Hz.
+    constexpr std::array<float, 3> h = {
+        {0.7929742f, -0.36072128f, -0.47047766f}};
+
+    std::fill(h_highpass_[ch].begin() + region_.start_sample_,
+              h_highpass_[ch].begin() + region_.end_sample_ + 1, 0.f);
+    for (size_t k = std::max(h.size() - 1, region_.start_sample_);
+         k <= region_.end_sample_; ++k) {
+      for (size_t j = 0; j < h.size(); ++j) {
+        h_highpass_[ch][k] += filters_time_domain[ch][k - j] * h[j];
+      }
+    }
+  }
+}
+
+void FilterAnalyzer::ResetRegion() {
+  region_.start_sample_ = 0;
+  region_.end_sample_ = 0;
+}
+
+void FilterAnalyzer::SetRegionToAnalyze(size_t filter_size) {
+  constexpr size_t kNumberBlocksToUpdate = 1;
+  auto& r = region_;
+  r.start_sample_ = r.end_sample_ >= filter_size - 1 ? 0 : r.end_sample_ + 1;
+  r.end_sample_ =
+      std::min(r.start_sample_ + kNumberBlocksToUpdate * kBlockSize - 1,
+               filter_size - 1);
+
+  // Check range.
+  RTC_DCHECK_LT(r.start_sample_, filter_size);
+  RTC_DCHECK_LT(r.end_sample_, filter_size);
+  RTC_DCHECK_LE(r.start_sample_, r.end_sample_);
+}
+
+FilterAnalyzer::ConsistentFilterDetector::ConsistentFilterDetector(
+    const EchoCanceller3Config& config)
+    : active_render_threshold_(config.render_levels.active_render_limit *
+                               config.render_levels.active_render_limit *
+                               kFftLengthBy2) {
+  Reset();
+}
+
+void FilterAnalyzer::ConsistentFilterDetector::Reset() {
+  significant_peak_ = false;
+  filter_floor_accum_ = 0.f;
+  filter_secondary_peak_ = 0.f;
+  filter_floor_low_limit_ = 0;
+  filter_floor_high_limit_ = 0;
+  consistent_estimate_counter_ = 0;
+  consistent_delay_reference_ = -10;
+}
+
+bool FilterAnalyzer::ConsistentFilterDetector::Detect(
+    rtc::ArrayView<const float> filter_to_analyze,
+    const FilterRegion& region,
+    rtc::ArrayView<const std::vector<float>> x_block,
+    size_t peak_index,
+    int delay_blocks) {
+  if (region.start_sample_ == 0) {
+    filter_floor_accum_ = 0.f;
+    filter_secondary_peak_ = 0.f;
+    filter_floor_low_limit_ = peak_index < 64 ? 0 : peak_index - 64;
+    filter_floor_high_limit_ =
+        peak_index > filter_to_analyze.size() - 129 ? 0 : peak_index + 128;
+  }
+
+  for (size_t k = region.start_sample_;
+       k < std::min(region.end_sample_ + 1, filter_floor_low_limit_); ++k) {
+    float abs_h = fabsf(filter_to_analyze[k]);
+    filter_floor_accum_ += abs_h;
+    filter_secondary_peak_ = std::max(filter_secondary_peak_, abs_h);
+  }
+
+  for (size_t k = std::max(filter_floor_high_limit_, region.start_sample_);
+       k <= region.end_sample_; ++k) {
+    float abs_h = fabsf(filter_to_analyze[k]);
+    filter_floor_accum_ += abs_h;
+    filter_secondary_peak_ = std::max(filter_secondary_peak_, abs_h);
+  }
+
+  if (region.end_sample_ == filter_to_analyze.size() - 1) {
+    float filter_floor = filter_floor_accum_ /
+                         (filter_floor_low_limit_ + filter_to_analyze.size() -
+                          filter_floor_high_limit_);
+
+    float abs_peak = fabsf(filter_to_analyze[peak_index]);
+    significant_peak_ = abs_peak > 10.f * filter_floor &&
+                        abs_peak > 2.f * filter_secondary_peak_;
+  }
+
+  if (significant_peak_) {
+    bool active_render_block = false;
+    for (auto& x_channel : x_block) {
+      const float x_energy = std::inner_product(
+          x_channel.begin(), x_channel.end(), x_channel.begin(), 0.f);
+      if (x_energy > active_render_threshold_) {
+        active_render_block = true;
+        break;
+      }
+    }
+
+    if (consistent_delay_reference_ == delay_blocks) {
+      if (active_render_block) {
+        ++consistent_estimate_counter_;
+      }
+    } else {
+      consistent_estimate_counter_ = 0;
+      consistent_delay_reference_ = delay_blocks;
+    }
+  }
+  return consistent_estimate_counter_ > 1.5f * kNumBlocksPerSecond;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,149 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_FILTER_ANALYZER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_FILTER_ANALYZER_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <memory>
+#include <vector>
+
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+class RenderBuffer;
+
+// Class for analyzing the properties of an adaptive filter.
+class FilterAnalyzer {
+ public:
+  FilterAnalyzer(const EchoCanceller3Config& config,
+                 size_t num_capture_channels);
+  ~FilterAnalyzer();
+
+  FilterAnalyzer(const FilterAnalyzer&) = delete;
+  FilterAnalyzer& operator=(const FilterAnalyzer&) = delete;
+
+  // Resets the analysis.
+  void Reset();
+
+  // Updates the estimates with new input data.
+  void Update(rtc::ArrayView<const std::vector<float>> filters_time_domain,
+              const RenderBuffer& render_buffer,
+              bool* any_filter_consistent,
+              float* max_echo_path_gain);
+
+  // Returns the delay in blocks for each filter.
+  rtc::ArrayView<const int> FilterDelaysBlocks() const {
+    return filter_delays_blocks_;
+  }
+
+  // Returns the minimum delay of all filters in terms of blocks.
+  int MinFilterDelayBlocks() const { return min_filter_delay_blocks_; }
+
+  // Returns the number of blocks for the current used filter.
+  int FilterLengthBlocks() const {
+    return filter_analysis_states_[0].filter_length_blocks;
+  }
+
+  // Returns the preprocessed filter.
+  rtc::ArrayView<const std::vector<float>> GetAdjustedFilters() const {
+    return h_highpass_;
+  }
+
+  // Public for testing purposes only.
+  void SetRegionToAnalyze(size_t filter_size);
+
+ private:
+  struct FilterAnalysisState;
+
+  void AnalyzeRegion(
+      rtc::ArrayView<const std::vector<float>> filters_time_domain,
+      const RenderBuffer& render_buffer);
+
+  void UpdateFilterGain(rtc::ArrayView<const float> filters_time_domain,
+                        FilterAnalysisState* st);
+  void PreProcessFilters(
+      rtc::ArrayView<const std::vector<float>> filters_time_domain);
+
+  void ResetRegion();
+
+  struct FilterRegion {
+    size_t start_sample_;
+    size_t end_sample_;
+  };
+
+  // This class checks whether the shape of the impulse response has been
+  // consistent over time.
+  class ConsistentFilterDetector {
+   public:
+    explicit ConsistentFilterDetector(const EchoCanceller3Config& config);
+    void Reset();
+    bool Detect(rtc::ArrayView<const float> filter_to_analyze,
+                const FilterRegion& region,
+                rtc::ArrayView<const std::vector<float>> x_block,
+                size_t peak_index,
+                int delay_blocks);
+
+   private:
+    bool significant_peak_;
+    float filter_floor_accum_;
+    float filter_secondary_peak_;
+    size_t filter_floor_low_limit_;
+    size_t filter_floor_high_limit_;
+    const float active_render_threshold_;
+    size_t consistent_estimate_counter_ = 0;
+    int consistent_delay_reference_ = -10;
+  };
+
+  struct FilterAnalysisState {
+    explicit FilterAnalysisState(const EchoCanceller3Config& config)
+        : filter_length_blocks(config.filter.refined_initial.length_blocks),
+          consistent_filter_detector(config) {
+      Reset(config.ep_strength.default_gain);
+    }
+
+    void Reset(float default_gain) {
+      peak_index = 0;
+      gain = default_gain;
+      consistent_filter_detector.Reset();
+    }
+
+    float gain;
+    size_t peak_index;
+    int filter_length_blocks;
+    bool consistent_estimate = false;
+    ConsistentFilterDetector consistent_filter_detector;
+  };
+
+  static int instance_count_;
+  std::unique_ptr<ApmDataDumper> data_dumper_;
+  const bool bounded_erl_;
+  const float default_gain_;
+  std::vector<std::vector<float>> h_highpass_;
+
+  size_t blocks_since_reset_ = 0;
+  FilterRegion region_;
+
+  std::vector<FilterAnalysisState> filter_analysis_states_;
+  std::vector<int> filter_delays_blocks_;
+
+  int min_filter_delay_blocks_ = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_FILTER_ANALYZER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/filter_analyzer_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/filter_analyzer.h"
+
+#include <algorithm>
+
+#include "test/gmock.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+// Verifies that the filter analyzer handles filter resizes properly.
+TEST(FilterAnalyzer, FilterResize) {
+  EchoCanceller3Config c;
+  std::vector<float> filter(65, 0.f);
+  for (size_t num_capture_channels : {1, 2, 4}) {
+    FilterAnalyzer fa(c, num_capture_channels);
+    fa.SetRegionToAnalyze(filter.size());
+    fa.SetRegionToAnalyze(filter.size());
+    filter.resize(32);
+    fa.SetRegionToAnalyze(filter.size());
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,88 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/frame_blocker.h"
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+FrameBlocker::FrameBlocker(size_t num_bands, size_t num_channels)
+    : num_bands_(num_bands),
+      num_channels_(num_channels),
+      buffer_(num_bands_, std::vector<std::vector<float>>(num_channels)) {
+  RTC_DCHECK_LT(0, num_bands);
+  RTC_DCHECK_LT(0, num_channels);
+  for (auto& band : buffer_) {
+    for (auto& channel : band) {
+      channel.reserve(kBlockSize);
+      RTC_DCHECK(channel.empty());
+    }
+  }
+}
+
+FrameBlocker::~FrameBlocker() = default;
+
+void FrameBlocker::InsertSubFrameAndExtractBlock(
+    const std::vector<std::vector<rtc::ArrayView<float>>>& sub_frame,
+    std::vector<std::vector<std::vector<float>>>* block) {
+  RTC_DCHECK(block);
+  RTC_DCHECK_EQ(num_bands_, block->size());
+  RTC_DCHECK_EQ(num_bands_, sub_frame.size());
+  for (size_t band = 0; band < num_bands_; ++band) {
+    RTC_DCHECK_EQ(num_channels_, (*block)[band].size());
+    RTC_DCHECK_EQ(num_channels_, sub_frame[band].size());
+    for (size_t channel = 0; channel < num_channels_; ++channel) {
+      RTC_DCHECK_GE(kBlockSize - 16, buffer_[band][channel].size());
+      RTC_DCHECK_EQ(kBlockSize, (*block)[band][channel].size());
+      RTC_DCHECK_EQ(kSubFrameLength, sub_frame[band][channel].size());
+      const int samples_to_block = kBlockSize - buffer_[band][channel].size();
+      (*block)[band][channel].clear();
+      (*block)[band][channel].insert((*block)[band][channel].begin(),
+                                     buffer_[band][channel].begin(),
+                                     buffer_[band][channel].end());
+      (*block)[band][channel].insert(
+          (*block)[band][channel].begin() + buffer_[band][channel].size(),
+          sub_frame[band][channel].begin(),
+          sub_frame[band][channel].begin() + samples_to_block);
+      buffer_[band][channel].clear();
+      buffer_[band][channel].insert(
+          buffer_[band][channel].begin(),
+          sub_frame[band][channel].begin() + samples_to_block,
+          sub_frame[band][channel].end());
+    }
+  }
+}
+
+bool FrameBlocker::IsBlockAvailable() const {
+  return kBlockSize == buffer_[0][0].size();
+}
+
+void FrameBlocker::ExtractBlock(
+    std::vector<std::vector<std::vector<float>>>* block) {
+  RTC_DCHECK(block);
+  RTC_DCHECK_EQ(num_bands_, block->size());
+  RTC_DCHECK(IsBlockAvailable());
+  for (size_t band = 0; band < num_bands_; ++band) {
+    RTC_DCHECK_EQ(num_channels_, (*block)[band].size());
+    for (size_t channel = 0; channel < num_channels_; ++channel) {
+      RTC_DCHECK_EQ(kBlockSize, buffer_[band][channel].size());
+      RTC_DCHECK_EQ(kBlockSize, (*block)[band][channel].size());
+      (*block)[band][channel].clear();
+      (*block)[band][channel].insert((*block)[band][channel].begin(),
+                                     buffer_[band][channel].begin(),
+                                     buffer_[band][channel].end());
+      buffer_[band][channel].clear();
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_FRAME_BLOCKER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_FRAME_BLOCKER_H_
+
+#include <stddef.h>
+
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+
+namespace webrtc {
+
+// Class for producing 64 sample multiband blocks from frames consisting of 2
+// subframes of 80 samples.
+class FrameBlocker {
+ public:
+  FrameBlocker(size_t num_bands, size_t num_channels);
+  ~FrameBlocker();
+  FrameBlocker(const FrameBlocker&) = delete;
+  FrameBlocker& operator=(const FrameBlocker&) = delete;
+
+  // Inserts one 80 sample multiband subframe from the multiband frame and
+  // extracts one 64 sample multiband block.
+  void InsertSubFrameAndExtractBlock(
+      const std::vector<std::vector<rtc::ArrayView<float>>>& sub_frame,
+      std::vector<std::vector<std::vector<float>>>* block);
+  // Reports whether a multiband block of 64 samples is available for
+  // extraction.
+  bool IsBlockAvailable() const;
+  // Extracts a multiband block of 64 samples.
+  void ExtractBlock(std::vector<std::vector<std::vector<float>>>* block);
+
+ private:
+  const size_t num_bands_;
+  const size_t num_channels_;
+  std::vector<std::vector<std::vector<float>>> buffer_;
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_FRAME_BLOCKER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/frame_blocker_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,472 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/frame_blocker.h"
+
+#include <string>
+#include <vector>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/block_framer.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+float ComputeSampleValue(size_t chunk_counter,
+                         size_t chunk_size,
+                         size_t band,
+                         size_t channel,
+                         size_t sample_index,
+                         int offset) {
+  float value =
+      static_cast<int>(chunk_counter * chunk_size + sample_index + channel) +
+      offset;
+  return value > 0 ? 5000 * band + value : 0;
+}
+
+void FillSubFrame(size_t sub_frame_counter,
+                  int offset,
+                  std::vector<std::vector<std::vector<float>>>* sub_frame) {
+  for (size_t band = 0; band < sub_frame->size(); ++band) {
+    for (size_t channel = 0; channel < (*sub_frame)[band].size(); ++channel) {
+      for (size_t sample = 0; sample < (*sub_frame)[band][channel].size();
+           ++sample) {
+        (*sub_frame)[band][channel][sample] = ComputeSampleValue(
+            sub_frame_counter, kSubFrameLength, band, channel, sample, offset);
+      }
+    }
+  }
+}
+
+void FillSubFrameView(
+    size_t sub_frame_counter,
+    int offset,
+    std::vector<std::vector<std::vector<float>>>* sub_frame,
+    std::vector<std::vector<rtc::ArrayView<float>>>* sub_frame_view) {
+  FillSubFrame(sub_frame_counter, offset, sub_frame);
+  for (size_t band = 0; band < sub_frame_view->size(); ++band) {
+    for (size_t channel = 0; channel < (*sub_frame_view)[band].size();
+         ++channel) {
+      (*sub_frame_view)[band][channel] = rtc::ArrayView<float>(
+          &(*sub_frame)[band][channel][0], (*sub_frame)[band][channel].size());
+    }
+  }
+}
+
+bool VerifySubFrame(
+    size_t sub_frame_counter,
+    int offset,
+    const std::vector<std::vector<rtc::ArrayView<float>>>& sub_frame_view) {
+  std::vector<std::vector<std::vector<float>>> reference_sub_frame(
+      sub_frame_view.size(),
+      std::vector<std::vector<float>>(
+          sub_frame_view[0].size(),
+          std::vector<float>(sub_frame_view[0][0].size(), 0.f)));
+  FillSubFrame(sub_frame_counter, offset, &reference_sub_frame);
+  for (size_t band = 0; band < sub_frame_view.size(); ++band) {
+    for (size_t channel = 0; channel < sub_frame_view[band].size(); ++channel) {
+      for (size_t sample = 0; sample < sub_frame_view[band][channel].size();
+           ++sample) {
+        if (reference_sub_frame[band][channel][sample] !=
+            sub_frame_view[band][channel][sample]) {
+          return false;
+        }
+      }
+    }
+  }
+  return true;
+}
+
+bool VerifyBlock(size_t block_counter,
+                 int offset,
+                 const std::vector<std::vector<std::vector<float>>>& block) {
+  for (size_t band = 0; band < block.size(); ++band) {
+    for (size_t channel = 0; channel < block[band].size(); ++channel) {
+      for (size_t sample = 0; sample < block[band][channel].size(); ++sample) {
+        const float reference_value = ComputeSampleValue(
+            block_counter, kBlockSize, band, channel, sample, offset);
+        if (reference_value != block[band][channel][sample]) {
+          return false;
+        }
+      }
+    }
+  }
+  return true;
+}
+
+// Verifies that the FrameBlocker properly forms blocks out of the frames.
+void RunBlockerTest(int sample_rate_hz, size_t num_channels) {
+  constexpr size_t kNumSubFramesToProcess = 20;
+  const size_t num_bands = NumBandsForRate(sample_rate_hz);
+
+  std::vector<std::vector<std::vector<float>>> block(
+      num_bands, std::vector<std::vector<float>>(
+                     num_channels, std::vector<float>(kBlockSize, 0.f)));
+  std::vector<std::vector<std::vector<float>>> input_sub_frame(
+      num_bands, std::vector<std::vector<float>>(
+                     num_channels, std::vector<float>(kSubFrameLength, 0.f)));
+  std::vector<std::vector<rtc::ArrayView<float>>> input_sub_frame_view(
+      num_bands, std::vector<rtc::ArrayView<float>>(num_channels));
+  FrameBlocker blocker(num_bands, num_channels);
+
+  size_t block_counter = 0;
+  for (size_t sub_frame_index = 0; sub_frame_index < kNumSubFramesToProcess;
+       ++sub_frame_index) {
+    FillSubFrameView(sub_frame_index, 0, &input_sub_frame,
+                     &input_sub_frame_view);
+
+    blocker.InsertSubFrameAndExtractBlock(input_sub_frame_view, &block);
+    VerifyBlock(block_counter++, 0, block);
+
+    if ((sub_frame_index + 1) % 4 == 0) {
+      EXPECT_TRUE(blocker.IsBlockAvailable());
+    } else {
+      EXPECT_FALSE(blocker.IsBlockAvailable());
+    }
+    if (blocker.IsBlockAvailable()) {
+      blocker.ExtractBlock(&block);
+      VerifyBlock(block_counter++, 0, block);
+    }
+  }
+}
+
+// Verifies that the FrameBlocker and BlockFramer work well together and produce
+// the expected output.
+void RunBlockerAndFramerTest(int sample_rate_hz, size_t num_channels) {
+  const size_t kNumSubFramesToProcess = 20;
+  const size_t num_bands = NumBandsForRate(sample_rate_hz);
+
+  std::vector<std::vector<std::vector<float>>> block(
+      num_bands, std::vector<std::vector<float>>(
+                     num_channels, std::vector<float>(kBlockSize, 0.f)));
+  std::vector<std::vector<std::vector<float>>> input_sub_frame(
+      num_bands, std::vector<std::vector<float>>(
+                     num_channels, std::vector<float>(kSubFrameLength, 0.f)));
+  std::vector<std::vector<std::vector<float>>> output_sub_frame(
+      num_bands, std::vector<std::vector<float>>(
+                     num_channels, std::vector<float>(kSubFrameLength, 0.f)));
+  std::vector<std::vector<rtc::ArrayView<float>>> output_sub_frame_view(
+      num_bands, std::vector<rtc::ArrayView<float>>(num_channels));
+  std::vector<std::vector<rtc::ArrayView<float>>> input_sub_frame_view(
+      num_bands, std::vector<rtc::ArrayView<float>>(num_channels));
+  FrameBlocker blocker(num_bands, num_channels);
+  BlockFramer framer(num_bands, num_channels);
+
+  for (size_t sub_frame_index = 0; sub_frame_index < kNumSubFramesToProcess;
+       ++sub_frame_index) {
+    FillSubFrameView(sub_frame_index, 0, &input_sub_frame,
+                     &input_sub_frame_view);
+    FillSubFrameView(sub_frame_index, 0, &output_sub_frame,
+                     &output_sub_frame_view);
+
+    blocker.InsertSubFrameAndExtractBlock(input_sub_frame_view, &block);
+    framer.InsertBlockAndExtractSubFrame(block, &output_sub_frame_view);
+
+    if ((sub_frame_index + 1) % 4 == 0) {
+      EXPECT_TRUE(blocker.IsBlockAvailable());
+    } else {
+      EXPECT_FALSE(blocker.IsBlockAvailable());
+    }
+    if (blocker.IsBlockAvailable()) {
+      blocker.ExtractBlock(&block);
+      framer.InsertBlock(block);
+    }
+    if (sub_frame_index > 1) {
+      EXPECT_TRUE(VerifySubFrame(sub_frame_index, -64, output_sub_frame_view));
+    }
+  }
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+// Verifies that the FrameBlocker crashes if the InsertSubFrameAndExtractBlock
+// method is called for inputs with the wrong number of bands or band lengths.
+void RunWronglySizedInsertAndExtractParametersTest(
+    int sample_rate_hz,
+    size_t correct_num_channels,
+    size_t num_block_bands,
+    size_t num_block_channels,
+    size_t block_length,
+    size_t num_sub_frame_bands,
+    size_t num_sub_frame_channels,
+    size_t sub_frame_length) {
+  const size_t correct_num_bands = NumBandsForRate(sample_rate_hz);
+
+  std::vector<std::vector<std::vector<float>>> block(
+      num_block_bands,
+      std::vector<std::vector<float>>(num_block_channels,
+                                      std::vector<float>(block_length, 0.f)));
+  std::vector<std::vector<std::vector<float>>> input_sub_frame(
+      num_sub_frame_bands,
+      std::vector<std::vector<float>>(
+          num_sub_frame_channels, std::vector<float>(sub_frame_length, 0.f)));
+  std::vector<std::vector<rtc::ArrayView<float>>> input_sub_frame_view(
+      input_sub_frame.size(),
+      std::vector<rtc::ArrayView<float>>(num_sub_frame_channels));
+  FillSubFrameView(0, 0, &input_sub_frame, &input_sub_frame_view);
+  FrameBlocker blocker(correct_num_bands, correct_num_channels);
+  EXPECT_DEATH(
+      blocker.InsertSubFrameAndExtractBlock(input_sub_frame_view, &block), "");
+}
+
+// Verifies that the FrameBlocker crashes if the ExtractBlock method is called
+// for inputs with the wrong number of bands or band lengths.
+void RunWronglySizedExtractParameterTest(int sample_rate_hz,
+                                         size_t correct_num_channels,
+                                         size_t num_block_bands,
+                                         size_t num_block_channels,
+                                         size_t block_length) {
+  const size_t correct_num_bands = NumBandsForRate(sample_rate_hz);
+
+  std::vector<std::vector<std::vector<float>>> correct_block(
+      correct_num_bands,
+      std::vector<std::vector<float>>(correct_num_channels,
+                                      std::vector<float>(kBlockSize, 0.f)));
+  std::vector<std::vector<std::vector<float>>> wrong_block(
+      num_block_bands,
+      std::vector<std::vector<float>>(num_block_channels,
+                                      std::vector<float>(block_length, 0.f)));
+  std::vector<std::vector<std::vector<float>>> input_sub_frame(
+      correct_num_bands,
+      std::vector<std::vector<float>>(
+          correct_num_channels, std::vector<float>(kSubFrameLength, 0.f)));
+  std::vector<std::vector<rtc::ArrayView<float>>> input_sub_frame_view(
+      input_sub_frame.size(),
+      std::vector<rtc::ArrayView<float>>(correct_num_channels));
+  FillSubFrameView(0, 0, &input_sub_frame, &input_sub_frame_view);
+  FrameBlocker blocker(correct_num_bands, correct_num_channels);
+  blocker.InsertSubFrameAndExtractBlock(input_sub_frame_view, &correct_block);
+  blocker.InsertSubFrameAndExtractBlock(input_sub_frame_view, &correct_block);
+  blocker.InsertSubFrameAndExtractBlock(input_sub_frame_view, &correct_block);
+  blocker.InsertSubFrameAndExtractBlock(input_sub_frame_view, &correct_block);
+
+  EXPECT_DEATH(blocker.ExtractBlock(&wrong_block), "");
+}
+
+// Verifies that the FrameBlocker crashes if the ExtractBlock method is called
+// after a wrong number of previous InsertSubFrameAndExtractBlock method calls
+// have been made.
+void RunWrongExtractOrderTest(int sample_rate_hz,
+                              size_t num_channels,
+                              size_t num_preceeding_api_calls) {
+  const size_t num_bands = NumBandsForRate(sample_rate_hz);
+
+  std::vector<std::vector<std::vector<float>>> block(
+      num_bands, std::vector<std::vector<float>>(
+                     num_channels, std::vector<float>(kBlockSize, 0.f)));
+  std::vector<std::vector<std::vector<float>>> input_sub_frame(
+      num_bands, std::vector<std::vector<float>>(
+                     num_channels, std::vector<float>(kSubFrameLength, 0.f)));
+  std::vector<std::vector<rtc::ArrayView<float>>> input_sub_frame_view(
+      input_sub_frame.size(), std::vector<rtc::ArrayView<float>>(num_channels));
+  FillSubFrameView(0, 0, &input_sub_frame, &input_sub_frame_view);
+  FrameBlocker blocker(num_bands, num_channels);
+  for (size_t k = 0; k < num_preceeding_api_calls; ++k) {
+    blocker.InsertSubFrameAndExtractBlock(input_sub_frame_view, &block);
+  }
+
+  EXPECT_DEATH(blocker.ExtractBlock(&block), "");
+}
+#endif
+
+std::string ProduceDebugText(int sample_rate_hz, size_t num_channels) {
+  rtc::StringBuilder ss;
+  ss << "Sample rate: " << sample_rate_hz;
+  ss << ", number of channels: " << num_channels;
+  return ss.Release();
+}
+
+}  // namespace
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+TEST(FrameBlockerDeathTest,
+     WrongNumberOfBandsInBlockForInsertSubFrameAndExtractBlock) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t correct_num_channels : {1, 2, 4, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      const size_t wrong_num_bands = (correct_num_bands % 3) + 1;
+      RunWronglySizedInsertAndExtractParametersTest(
+          rate, correct_num_channels, wrong_num_bands, correct_num_channels,
+          kBlockSize, correct_num_bands, correct_num_channels, kSubFrameLength);
+    }
+  }
+}
+
+TEST(FrameBlockerDeathTest,
+     WrongNumberOfChannelsInBlockForInsertSubFrameAndExtractBlock) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t correct_num_channels : {1, 2, 4, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      const size_t wrong_num_channels = correct_num_channels + 1;
+      RunWronglySizedInsertAndExtractParametersTest(
+          rate, correct_num_channels, correct_num_bands, wrong_num_channels,
+          kBlockSize, correct_num_bands, correct_num_channels, kSubFrameLength);
+    }
+  }
+}
+
+TEST(FrameBlockerDeathTest,
+     WrongNumberOfBandsInSubFrameForInsertSubFrameAndExtractBlock) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t correct_num_channels : {1, 2, 4, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      const size_t wrong_num_bands = (correct_num_bands % 3) + 1;
+      RunWronglySizedInsertAndExtractParametersTest(
+          rate, correct_num_channels, correct_num_bands, correct_num_channels,
+          kBlockSize, wrong_num_bands, correct_num_channels, kSubFrameLength);
+    }
+  }
+}
+
+TEST(FrameBlockerDeathTest,
+     WrongNumberOfChannelsInSubFrameForInsertSubFrameAndExtractBlock) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t correct_num_channels : {1, 2, 4, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      const size_t wrong_num_channels = correct_num_channels + 1;
+      RunWronglySizedInsertAndExtractParametersTest(
+          rate, correct_num_channels, correct_num_bands, wrong_num_channels,
+          kBlockSize, correct_num_bands, wrong_num_channels, kSubFrameLength);
+    }
+  }
+}
+
+TEST(FrameBlockerDeathTest,
+     WrongNumberOfSamplesInBlockForInsertSubFrameAndExtractBlock) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t correct_num_channels : {1, 2, 4, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      RunWronglySizedInsertAndExtractParametersTest(
+          rate, correct_num_channels, correct_num_bands, correct_num_channels,
+          kBlockSize - 1, correct_num_bands, correct_num_channels,
+          kSubFrameLength);
+    }
+  }
+}
+
+TEST(FrameBlockerDeathTest,
+     WrongNumberOfSamplesInSubFrameForInsertSubFrameAndExtractBlock) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t correct_num_channels : {1, 2, 4, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      RunWronglySizedInsertAndExtractParametersTest(
+          rate, correct_num_channels, correct_num_bands, correct_num_channels,
+          kBlockSize, correct_num_bands, correct_num_channels,
+          kSubFrameLength - 1);
+    }
+  }
+}
+
+TEST(FrameBlockerDeathTest, WrongNumberOfBandsInBlockForExtractBlock) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t correct_num_channels : {1, 2, 4, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      const size_t wrong_num_bands = (correct_num_bands % 3) + 1;
+      RunWronglySizedExtractParameterTest(rate, correct_num_channels,
+                                          wrong_num_bands, correct_num_channels,
+                                          kBlockSize);
+    }
+  }
+}
+
+TEST(FrameBlockerDeathTest, WrongNumberOfChannelsInBlockForExtractBlock) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t correct_num_channels : {1, 2, 4, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      const size_t wrong_num_channels = correct_num_channels + 1;
+      RunWronglySizedExtractParameterTest(rate, correct_num_channels,
+                                          correct_num_bands, wrong_num_channels,
+                                          kBlockSize);
+    }
+  }
+}
+
+TEST(FrameBlockerDeathTest, WrongNumberOfSamplesInBlockForExtractBlock) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t correct_num_channels : {1, 2, 4, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, correct_num_channels));
+      const size_t correct_num_bands = NumBandsForRate(rate);
+      RunWronglySizedExtractParameterTest(rate, correct_num_channels,
+                                          correct_num_bands,
+                                          correct_num_channels, kBlockSize - 1);
+    }
+  }
+}
+
+TEST(FrameBlockerDeathTest, WrongNumberOfPreceedingApiCallsForExtractBlock) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t num_channels : {1, 2, 4, 8}) {
+      for (size_t num_calls = 0; num_calls < 4; ++num_calls) {
+        rtc::StringBuilder ss;
+        ss << "Sample rate: " << rate;
+        ss << "Num channels: " << num_channels;
+        ss << ", Num preceeding InsertSubFrameAndExtractBlock calls: "
+           << num_calls;
+
+        SCOPED_TRACE(ss.str());
+        RunWrongExtractOrderTest(rate, num_channels, num_calls);
+      }
+    }
+  }
+}
+
+// Verifies that the verification for 0 number of channels works.
+TEST(FrameBlockerDeathTest, ZeroNumberOfChannelsParameter) {
+  EXPECT_DEATH(FrameBlocker(16000, 0), "");
+}
+
+// Verifies that the verification for 0 number of bands works.
+TEST(FrameBlockerDeathTest, ZeroNumberOfBandsParameter) {
+  EXPECT_DEATH(FrameBlocker(0, 1), "");
+}
+
+// Verifiers that the verification for null sub_frame pointer works.
+TEST(FrameBlockerDeathTest, NullBlockParameter) {
+  std::vector<std::vector<std::vector<float>>> sub_frame(
+      1, std::vector<std::vector<float>>(
+             1, std::vector<float>(kSubFrameLength, 0.f)));
+  std::vector<std::vector<rtc::ArrayView<float>>> sub_frame_view(
+      sub_frame.size());
+  FillSubFrameView(0, 0, &sub_frame, &sub_frame_view);
+  EXPECT_DEATH(
+      FrameBlocker(1, 1).InsertSubFrameAndExtractBlock(sub_frame_view, nullptr),
+      "");
+}
+
+#endif
+
+TEST(FrameBlocker, BlockBitexactness) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t num_channels : {1, 2, 4, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, num_channels));
+      RunBlockerTest(rate, num_channels);
+    }
+  }
+}
+
+TEST(FrameBlocker, BlockerAndFramer) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t num_channels : {1, 2, 4, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate, num_channels));
+      RunBlockerAndFramerTest(rate, num_channels);
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fullband_erle_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fullband_erle_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fullband_erle_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fullband_erle_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,191 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/fullband_erle_estimator.h"
+
+#include <algorithm>
+#include <memory>
+#include <numeric>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_minmax.h"
+
+namespace webrtc {
+
+namespace {
+constexpr float kEpsilon = 1e-3f;
+constexpr float kX2BandEnergyThreshold = 44015068.0f;
+constexpr int kBlocksToHoldErle = 100;
+constexpr int kPointsToAccumulate = 6;
+}  // namespace
+
+FullBandErleEstimator::FullBandErleEstimator(
+    const EchoCanceller3Config::Erle& config,
+    size_t num_capture_channels)
+    : min_erle_log2_(FastApproxLog2f(config.min + kEpsilon)),
+      max_erle_lf_log2_(FastApproxLog2f(config.max_l + kEpsilon)),
+      hold_counters_instantaneous_erle_(num_capture_channels, 0),
+      erle_time_domain_log2_(num_capture_channels, min_erle_log2_),
+      instantaneous_erle_(num_capture_channels, ErleInstantaneous(config)),
+      linear_filters_qualities_(num_capture_channels) {
+  Reset();
+}
+
+FullBandErleEstimator::~FullBandErleEstimator() = default;
+
+void FullBandErleEstimator::Reset() {
+  for (auto& instantaneous_erle_ch : instantaneous_erle_) {
+    instantaneous_erle_ch.Reset();
+  }
+
+  UpdateQualityEstimates();
+  std::fill(erle_time_domain_log2_.begin(), erle_time_domain_log2_.end(),
+            min_erle_log2_);
+  std::fill(hold_counters_instantaneous_erle_.begin(),
+            hold_counters_instantaneous_erle_.end(), 0);
+}
+
+void FullBandErleEstimator::Update(
+    rtc::ArrayView<const float> X2,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> E2,
+    const std::vector<bool>& converged_filters) {
+  for (size_t ch = 0; ch < Y2.size(); ++ch) {
+    if (converged_filters[ch]) {
+      // Computes the fullband ERLE.
+      const float X2_sum = std::accumulate(X2.begin(), X2.end(), 0.0f);
+      if (X2_sum > kX2BandEnergyThreshold * X2.size()) {
+        const float Y2_sum =
+            std::accumulate(Y2[ch].begin(), Y2[ch].end(), 0.0f);
+        const float E2_sum =
+            std::accumulate(E2[ch].begin(), E2[ch].end(), 0.0f);
+        if (instantaneous_erle_[ch].Update(Y2_sum, E2_sum)) {
+          hold_counters_instantaneous_erle_[ch] = kBlocksToHoldErle;
+          erle_time_domain_log2_[ch] +=
+              0.05f * ((instantaneous_erle_[ch].GetInstErleLog2().value()) -
+                       erle_time_domain_log2_[ch]);
+          erle_time_domain_log2_[ch] =
+              std::max(erle_time_domain_log2_[ch], min_erle_log2_);
+        }
+      }
+    }
+    --hold_counters_instantaneous_erle_[ch];
+    if (hold_counters_instantaneous_erle_[ch] == 0) {
+      instantaneous_erle_[ch].ResetAccumulators();
+    }
+  }
+
+  UpdateQualityEstimates();
+}
+
+void FullBandErleEstimator::Dump(
+    const std::unique_ptr<ApmDataDumper>& data_dumper) const {
+  data_dumper->DumpRaw("aec3_fullband_erle_log2", FullbandErleLog2());
+  instantaneous_erle_[0].Dump(data_dumper);
+}
+
+void FullBandErleEstimator::UpdateQualityEstimates() {
+  for (size_t ch = 0; ch < instantaneous_erle_.size(); ++ch) {
+    linear_filters_qualities_[ch] =
+        instantaneous_erle_[ch].GetQualityEstimate();
+  }
+}
+
+FullBandErleEstimator::ErleInstantaneous::ErleInstantaneous(
+    const EchoCanceller3Config::Erle& config)
+    : clamp_inst_quality_to_zero_(config.clamp_quality_estimate_to_zero),
+      clamp_inst_quality_to_one_(config.clamp_quality_estimate_to_one) {
+  Reset();
+}
+
+FullBandErleEstimator::ErleInstantaneous::~ErleInstantaneous() = default;
+
+bool FullBandErleEstimator::ErleInstantaneous::Update(const float Y2_sum,
+                                                      const float E2_sum) {
+  bool update_estimates = false;
+  E2_acum_ += E2_sum;
+  Y2_acum_ += Y2_sum;
+  num_points_++;
+  if (num_points_ == kPointsToAccumulate) {
+    if (E2_acum_ > 0.f) {
+      update_estimates = true;
+      erle_log2_ = FastApproxLog2f(Y2_acum_ / E2_acum_ + kEpsilon);
+    }
+    num_points_ = 0;
+    E2_acum_ = 0.f;
+    Y2_acum_ = 0.f;
+  }
+
+  if (update_estimates) {
+    UpdateMaxMin();
+    UpdateQualityEstimate();
+  }
+  return update_estimates;
+}
+
+void FullBandErleEstimator::ErleInstantaneous::Reset() {
+  ResetAccumulators();
+  max_erle_log2_ = -10.f;  // -30 dB.
+  min_erle_log2_ = 33.f;   // 100 dB.
+  inst_quality_estimate_ = 0.f;
+}
+
+void FullBandErleEstimator::ErleInstantaneous::ResetAccumulators() {
+  erle_log2_ = absl::nullopt;
+  inst_quality_estimate_ = 0.f;
+  num_points_ = 0;
+  E2_acum_ = 0.f;
+  Y2_acum_ = 0.f;
+}
+
+void FullBandErleEstimator::ErleInstantaneous::Dump(
+    const std::unique_ptr<ApmDataDumper>& data_dumper) const {
+  data_dumper->DumpRaw("aec3_fullband_erle_inst_log2",
+                       erle_log2_ ? *erle_log2_ : -10.f);
+  data_dumper->DumpRaw(
+      "aec3_erle_instantaneous_quality",
+      GetQualityEstimate() ? GetQualityEstimate().value() : 0.f);
+  data_dumper->DumpRaw("aec3_fullband_erle_max_log2", max_erle_log2_);
+  data_dumper->DumpRaw("aec3_fullband_erle_min_log2", min_erle_log2_);
+}
+
+void FullBandErleEstimator::ErleInstantaneous::UpdateMaxMin() {
+  RTC_DCHECK(erle_log2_);
+  // Adding the forgetting factors for the maximum and minimum and capping the
+  // result to the incoming value.
+  max_erle_log2_ -= 0.0004f;  // Forget factor, approx 1dB every 3 sec.
+  max_erle_log2_ = std::max(max_erle_log2_, erle_log2_.value());
+  min_erle_log2_ += 0.0004f;  // Forget factor, approx 1dB every 3 sec.
+  min_erle_log2_ = std::min(min_erle_log2_, erle_log2_.value());
+}
+
+void FullBandErleEstimator::ErleInstantaneous::UpdateQualityEstimate() {
+  const float alpha = 0.07f;
+  float quality_estimate = 0.f;
+  RTC_DCHECK(erle_log2_);
+  // TODO(peah): Currently, the estimate can become be less than 0; this should
+  // be corrected.
+  if (max_erle_log2_ > min_erle_log2_) {
+    quality_estimate = (erle_log2_.value() - min_erle_log2_) /
+                       (max_erle_log2_ - min_erle_log2_);
+  }
+  if (quality_estimate > inst_quality_estimate_) {
+    inst_quality_estimate_ = quality_estimate;
+  } else {
+    inst_quality_estimate_ +=
+        alpha * (quality_estimate - inst_quality_estimate_);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fullband_erle_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fullband_erle_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fullband_erle_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/fullband_erle_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,118 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_FULLBAND_ERLE_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_FULLBAND_ERLE_ESTIMATOR_H_
+
+#include <memory>
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+
+namespace webrtc {
+
+// Estimates the echo return loss enhancement using the energy of all the
+// freuquency bands.
+class FullBandErleEstimator {
+ public:
+  FullBandErleEstimator(const EchoCanceller3Config::Erle& config,
+                        size_t num_capture_channels);
+  ~FullBandErleEstimator();
+  // Resets the ERLE estimator.
+  void Reset();
+
+  // Updates the ERLE estimator.
+  void Update(rtc::ArrayView<const float> X2,
+              rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+              rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> E2,
+              const std::vector<bool>& converged_filters);
+
+  // Returns the fullband ERLE estimates in log2 units.
+  float FullbandErleLog2() const {
+    float min_erle = erle_time_domain_log2_[0];
+    for (size_t ch = 1; ch < erle_time_domain_log2_.size(); ++ch) {
+      min_erle = std::min(min_erle, erle_time_domain_log2_[ch]);
+    }
+    return min_erle;
+  }
+
+  // Returns an estimation of the current linear filter quality. It returns a
+  // float number between 0 and 1 mapping 1 to the highest possible quality.
+  rtc::ArrayView<const absl::optional<float>> GetInstLinearQualityEstimates()
+      const {
+    return linear_filters_qualities_;
+  }
+
+  void Dump(const std::unique_ptr<ApmDataDumper>& data_dumper) const;
+
+ private:
+  void UpdateQualityEstimates();
+
+  class ErleInstantaneous {
+   public:
+    explicit ErleInstantaneous(const EchoCanceller3Config::Erle& config);
+    ~ErleInstantaneous();
+
+    // Updates the estimator with a new point, returns true
+    // if the instantaneous ERLE was updated due to having enough
+    // points for performing the estimate.
+    bool Update(const float Y2_sum, const float E2_sum);
+    // Resets the instantaneous ERLE estimator to its initial state.
+    void Reset();
+    // Resets the members related with an instantaneous estimate.
+    void ResetAccumulators();
+    // Returns the instantaneous ERLE in log2 units.
+    absl::optional<float> GetInstErleLog2() const { return erle_log2_; }
+    // Gets an indication between 0 and 1 of the performance of the linear
+    // filter for the current time instant.
+    absl::optional<float> GetQualityEstimate() const {
+      if (erle_log2_) {
+        float value = inst_quality_estimate_;
+        if (clamp_inst_quality_to_zero_) {
+          value = std::max(0.f, value);
+        }
+        if (clamp_inst_quality_to_one_) {
+          value = std::min(1.f, value);
+        }
+        return absl::optional<float>(value);
+      }
+      return absl::nullopt;
+    }
+    void Dump(const std::unique_ptr<ApmDataDumper>& data_dumper) const;
+
+   private:
+    void UpdateMaxMin();
+    void UpdateQualityEstimate();
+    const bool clamp_inst_quality_to_zero_;
+    const bool clamp_inst_quality_to_one_;
+    absl::optional<float> erle_log2_;
+    float inst_quality_estimate_;
+    float max_erle_log2_;
+    float min_erle_log2_;
+    float Y2_acum_;
+    float E2_acum_;
+    int num_points_;
+  };
+
+  const float min_erle_log2_;
+  const float max_erle_lf_log2_;
+  std::vector<int> hold_counters_instantaneous_erle_;
+  std::vector<float> erle_time_domain_log2_;
+  std::vector<ErleInstantaneous> instantaneous_erle_;
+  std::vector<absl::optional<float>> linear_filters_qualities_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_FULLBAND_ERLE_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_avx2.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_avx2.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_avx2.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_avx2.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,132 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/matched_filter.h"
+
+#include <immintrin.h>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace aec3 {
+
+void MatchedFilterCore_AVX2(size_t x_start_index,
+                            float x2_sum_threshold,
+                            float smoothing,
+                            rtc::ArrayView<const float> x,
+                            rtc::ArrayView<const float> y,
+                            rtc::ArrayView<float> h,
+                            bool* filters_updated,
+                            float* error_sum) {
+  const int h_size = static_cast<int>(h.size());
+  const int x_size = static_cast<int>(x.size());
+  RTC_DCHECK_EQ(0, h_size % 8);
+
+  // Process for all samples in the sub-block.
+  for (size_t i = 0; i < y.size(); ++i) {
+    // Apply the matched filter as filter * x, and compute x * x.
+
+    RTC_DCHECK_GT(x_size, x_start_index);
+    const float* x_p = &x[x_start_index];
+    const float* h_p = &h[0];
+
+    // Initialize values for the accumulation.
+    __m256 s_256 = _mm256_set1_ps(0);
+    __m256 x2_sum_256 = _mm256_set1_ps(0);
+    float x2_sum = 0.f;
+    float s = 0;
+
+    // Compute loop chunk sizes until, and after, the wraparound of the circular
+    // buffer for x.
+    const int chunk1 =
+        std::min(h_size, static_cast<int>(x_size - x_start_index));
+
+    // Perform the loop in two chunks.
+    const int chunk2 = h_size - chunk1;
+    for (int limit : {chunk1, chunk2}) {
+      // Perform 256 bit vector operations.
+      const int limit_by_8 = limit >> 3;
+      for (int k = limit_by_8; k > 0; --k, h_p += 8, x_p += 8) {
+        // Load the data into 256 bit vectors.
+        __m256 x_k = _mm256_loadu_ps(x_p);
+        __m256 h_k = _mm256_loadu_ps(h_p);
+        // Compute and accumulate x * x and h * x.
+        x2_sum_256 = _mm256_fmadd_ps(x_k, x_k, x2_sum_256);
+        s_256 = _mm256_fmadd_ps(h_k, x_k, s_256);
+      }
+
+      // Perform non-vector operations for any remaining items.
+      for (int k = limit - limit_by_8 * 8; k > 0; --k, ++h_p, ++x_p) {
+        const float x_k = *x_p;
+        x2_sum += x_k * x_k;
+        s += *h_p * x_k;
+      }
+
+      x_p = &x[0];
+    }
+
+    // Sum components together.
+    __m128 x2_sum_128 = _mm_add_ps(_mm256_extractf128_ps(x2_sum_256, 0),
+                                   _mm256_extractf128_ps(x2_sum_256, 1));
+    __m128 s_128 = _mm_add_ps(_mm256_extractf128_ps(s_256, 0),
+                              _mm256_extractf128_ps(s_256, 1));
+    // Combine the accumulated vector and scalar values.
+    float* v = reinterpret_cast<float*>(&x2_sum_128);
+    x2_sum += v[0] + v[1] + v[2] + v[3];
+    v = reinterpret_cast<float*>(&s_128);
+    s += v[0] + v[1] + v[2] + v[3];
+
+    // Compute the matched filter error.
+    float e = y[i] - s;
+    const bool saturation = y[i] >= 32000.f || y[i] <= -32000.f;
+    (*error_sum) += e * e;
+
+    // Update the matched filter estimate in an NLMS manner.
+    if (x2_sum > x2_sum_threshold && !saturation) {
+      RTC_DCHECK_LT(0.f, x2_sum);
+      const float alpha = smoothing * e / x2_sum;
+      const __m256 alpha_256 = _mm256_set1_ps(alpha);
+
+      // filter = filter + smoothing * (y - filter * x) * x / x * x.
+      float* h_p = &h[0];
+      x_p = &x[x_start_index];
+
+      // Perform the loop in two chunks.
+      for (int limit : {chunk1, chunk2}) {
+        // Perform 256 bit vector operations.
+        const int limit_by_8 = limit >> 3;
+        for (int k = limit_by_8; k > 0; --k, h_p += 8, x_p += 8) {
+          // Load the data into 256 bit vectors.
+          __m256 h_k = _mm256_loadu_ps(h_p);
+          __m256 x_k = _mm256_loadu_ps(x_p);
+          // Compute h = h + alpha * x.
+          h_k = _mm256_fmadd_ps(x_k, alpha_256, h_k);
+
+          // Store the result.
+          _mm256_storeu_ps(h_p, h_k);
+        }
+
+        // Perform non-vector operations for any remaining items.
+        for (int k = limit - limit_by_8 * 8; k > 0; --k, ++h_p, ++x_p) {
+          *h_p += alpha * *x_p;
+        }
+
+        x_p = &x[0];
+      }
+
+      *filters_updated = true;
+    }
+
+    x_start_index = x_start_index > 0 ? x_start_index - 1 : x_size - 1;
+  }
+}
+
+}  // namespace aec3
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,464 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "modules/audio_processing/aec3/matched_filter.h"
+
+// Defines WEBRTC_ARCH_X86_FAMILY, used below.
+#include "rtc_base/system/arch.h"
+
+#if defined(WEBRTC_HAS_NEON)
+#include <arm_neon.h>
+#endif
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+#include <emmintrin.h>
+#endif
+#include <algorithm>
+#include <cstddef>
+#include <initializer_list>
+#include <iterator>
+#include <numeric>
+
+#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+
+namespace webrtc {
+namespace aec3 {
+
+#if defined(WEBRTC_HAS_NEON)
+
+void MatchedFilterCore_NEON(size_t x_start_index,
+                            float x2_sum_threshold,
+                            float smoothing,
+                            rtc::ArrayView<const float> x,
+                            rtc::ArrayView<const float> y,
+                            rtc::ArrayView<float> h,
+                            bool* filters_updated,
+                            float* error_sum) {
+  const int h_size = static_cast<int>(h.size());
+  const int x_size = static_cast<int>(x.size());
+  RTC_DCHECK_EQ(0, h_size % 4);
+
+  // Process for all samples in the sub-block.
+  for (size_t i = 0; i < y.size(); ++i) {
+    // Apply the matched filter as filter * x, and compute x * x.
+
+    RTC_DCHECK_GT(x_size, x_start_index);
+    const float* x_p = &x[x_start_index];
+    const float* h_p = &h[0];
+
+    // Initialize values for the accumulation.
+    float32x4_t s_128 = vdupq_n_f32(0);
+    float32x4_t x2_sum_128 = vdupq_n_f32(0);
+    float x2_sum = 0.f;
+    float s = 0;
+
+    // Compute loop chunk sizes until, and after, the wraparound of the circular
+    // buffer for x.
+    const int chunk1 =
+        std::min(h_size, static_cast<int>(x_size - x_start_index));
+
+    // Perform the loop in two chunks.
+    const int chunk2 = h_size - chunk1;
+    for (int limit : {chunk1, chunk2}) {
+      // Perform 128 bit vector operations.
+      const int limit_by_4 = limit >> 2;
+      for (int k = limit_by_4; k > 0; --k, h_p += 4, x_p += 4) {
+        // Load the data into 128 bit vectors.
+        const float32x4_t x_k = vld1q_f32(x_p);
+        const float32x4_t h_k = vld1q_f32(h_p);
+        // Compute and accumulate x * x and h * x.
+        x2_sum_128 = vmlaq_f32(x2_sum_128, x_k, x_k);
+        s_128 = vmlaq_f32(s_128, h_k, x_k);
+      }
+
+      // Perform non-vector operations for any remaining items.
+      for (int k = limit - limit_by_4 * 4; k > 0; --k, ++h_p, ++x_p) {
+        const float x_k = *x_p;
+        x2_sum += x_k * x_k;
+        s += *h_p * x_k;
+      }
+
+      x_p = &x[0];
+    }
+
+    // Combine the accumulated vector and scalar values.
+    float* v = reinterpret_cast<float*>(&x2_sum_128);
+    x2_sum += v[0] + v[1] + v[2] + v[3];
+    v = reinterpret_cast<float*>(&s_128);
+    s += v[0] + v[1] + v[2] + v[3];
+
+    // Compute the matched filter error.
+    float e = y[i] - s;
+    const bool saturation = y[i] >= 32000.f || y[i] <= -32000.f;
+    (*error_sum) += e * e;
+
+    // Update the matched filter estimate in an NLMS manner.
+    if (x2_sum > x2_sum_threshold && !saturation) {
+      RTC_DCHECK_LT(0.f, x2_sum);
+      const float alpha = smoothing * e / x2_sum;
+      const float32x4_t alpha_128 = vmovq_n_f32(alpha);
+
+      // filter = filter + smoothing * (y - filter * x) * x / x * x.
+      float* h_p = &h[0];
+      x_p = &x[x_start_index];
+
+      // Perform the loop in two chunks.
+      for (int limit : {chunk1, chunk2}) {
+        // Perform 128 bit vector operations.
+        const int limit_by_4 = limit >> 2;
+        for (int k = limit_by_4; k > 0; --k, h_p += 4, x_p += 4) {
+          // Load the data into 128 bit vectors.
+          float32x4_t h_k = vld1q_f32(h_p);
+          const float32x4_t x_k = vld1q_f32(x_p);
+          // Compute h = h + alpha * x.
+          h_k = vmlaq_f32(h_k, alpha_128, x_k);
+
+          // Store the result.
+          vst1q_f32(h_p, h_k);
+        }
+
+        // Perform non-vector operations for any remaining items.
+        for (int k = limit - limit_by_4 * 4; k > 0; --k, ++h_p, ++x_p) {
+          *h_p += alpha * *x_p;
+        }
+
+        x_p = &x[0];
+      }
+
+      *filters_updated = true;
+    }
+
+    x_start_index = x_start_index > 0 ? x_start_index - 1 : x_size - 1;
+  }
+}
+
+#endif
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+
+void MatchedFilterCore_SSE2(size_t x_start_index,
+                            float x2_sum_threshold,
+                            float smoothing,
+                            rtc::ArrayView<const float> x,
+                            rtc::ArrayView<const float> y,
+                            rtc::ArrayView<float> h,
+                            bool* filters_updated,
+                            float* error_sum) {
+  const int h_size = static_cast<int>(h.size());
+  const int x_size = static_cast<int>(x.size());
+  RTC_DCHECK_EQ(0, h_size % 4);
+
+  // Process for all samples in the sub-block.
+  for (size_t i = 0; i < y.size(); ++i) {
+    // Apply the matched filter as filter * x, and compute x * x.
+
+    RTC_DCHECK_GT(x_size, x_start_index);
+    const float* x_p = &x[x_start_index];
+    const float* h_p = &h[0];
+
+    // Initialize values for the accumulation.
+    __m128 s_128 = _mm_set1_ps(0);
+    __m128 x2_sum_128 = _mm_set1_ps(0);
+    float x2_sum = 0.f;
+    float s = 0;
+
+    // Compute loop chunk sizes until, and after, the wraparound of the circular
+    // buffer for x.
+    const int chunk1 =
+        std::min(h_size, static_cast<int>(x_size - x_start_index));
+
+    // Perform the loop in two chunks.
+    const int chunk2 = h_size - chunk1;
+    for (int limit : {chunk1, chunk2}) {
+      // Perform 128 bit vector operations.
+      const int limit_by_4 = limit >> 2;
+      for (int k = limit_by_4; k > 0; --k, h_p += 4, x_p += 4) {
+        // Load the data into 128 bit vectors.
+        const __m128 x_k = _mm_loadu_ps(x_p);
+        const __m128 h_k = _mm_loadu_ps(h_p);
+        const __m128 xx = _mm_mul_ps(x_k, x_k);
+        // Compute and accumulate x * x and h * x.
+        x2_sum_128 = _mm_add_ps(x2_sum_128, xx);
+        const __m128 hx = _mm_mul_ps(h_k, x_k);
+        s_128 = _mm_add_ps(s_128, hx);
+      }
+
+      // Perform non-vector operations for any remaining items.
+      for (int k = limit - limit_by_4 * 4; k > 0; --k, ++h_p, ++x_p) {
+        const float x_k = *x_p;
+        x2_sum += x_k * x_k;
+        s += *h_p * x_k;
+      }
+
+      x_p = &x[0];
+    }
+
+    // Combine the accumulated vector and scalar values.
+    float* v = reinterpret_cast<float*>(&x2_sum_128);
+    x2_sum += v[0] + v[1] + v[2] + v[3];
+    v = reinterpret_cast<float*>(&s_128);
+    s += v[0] + v[1] + v[2] + v[3];
+
+    // Compute the matched filter error.
+    float e = y[i] - s;
+    const bool saturation = y[i] >= 32000.f || y[i] <= -32000.f;
+    (*error_sum) += e * e;
+
+    // Update the matched filter estimate in an NLMS manner.
+    if (x2_sum > x2_sum_threshold && !saturation) {
+      RTC_DCHECK_LT(0.f, x2_sum);
+      const float alpha = smoothing * e / x2_sum;
+      const __m128 alpha_128 = _mm_set1_ps(alpha);
+
+      // filter = filter + smoothing * (y - filter * x) * x / x * x.
+      float* h_p = &h[0];
+      x_p = &x[x_start_index];
+
+      // Perform the loop in two chunks.
+      for (int limit : {chunk1, chunk2}) {
+        // Perform 128 bit vector operations.
+        const int limit_by_4 = limit >> 2;
+        for (int k = limit_by_4; k > 0; --k, h_p += 4, x_p += 4) {
+          // Load the data into 128 bit vectors.
+          __m128 h_k = _mm_loadu_ps(h_p);
+          const __m128 x_k = _mm_loadu_ps(x_p);
+
+          // Compute h = h + alpha * x.
+          const __m128 alpha_x = _mm_mul_ps(alpha_128, x_k);
+          h_k = _mm_add_ps(h_k, alpha_x);
+
+          // Store the result.
+          _mm_storeu_ps(h_p, h_k);
+        }
+
+        // Perform non-vector operations for any remaining items.
+        for (int k = limit - limit_by_4 * 4; k > 0; --k, ++h_p, ++x_p) {
+          *h_p += alpha * *x_p;
+        }
+
+        x_p = &x[0];
+      }
+
+      *filters_updated = true;
+    }
+
+    x_start_index = x_start_index > 0 ? x_start_index - 1 : x_size - 1;
+  }
+}
+#endif
+
+void MatchedFilterCore(size_t x_start_index,
+                       float x2_sum_threshold,
+                       float smoothing,
+                       rtc::ArrayView<const float> x,
+                       rtc::ArrayView<const float> y,
+                       rtc::ArrayView<float> h,
+                       bool* filters_updated,
+                       float* error_sum) {
+  // Process for all samples in the sub-block.
+  for (size_t i = 0; i < y.size(); ++i) {
+    // Apply the matched filter as filter * x, and compute x * x.
+    float x2_sum = 0.f;
+    float s = 0;
+    size_t x_index = x_start_index;
+    for (size_t k = 0; k < h.size(); ++k) {
+      x2_sum += x[x_index] * x[x_index];
+      s += h[k] * x[x_index];
+      x_index = x_index < (x.size() - 1) ? x_index + 1 : 0;
+    }
+
+    // Compute the matched filter error.
+    float e = y[i] - s;
+    const bool saturation = y[i] >= 32000.f || y[i] <= -32000.f;
+    (*error_sum) += e * e;
+
+    // Update the matched filter estimate in an NLMS manner.
+    if (x2_sum > x2_sum_threshold && !saturation) {
+      RTC_DCHECK_LT(0.f, x2_sum);
+      const float alpha = smoothing * e / x2_sum;
+
+      // filter = filter + smoothing * (y - filter * x) * x / x * x.
+      size_t x_index = x_start_index;
+      for (size_t k = 0; k < h.size(); ++k) {
+        h[k] += alpha * x[x_index];
+        x_index = x_index < (x.size() - 1) ? x_index + 1 : 0;
+      }
+      *filters_updated = true;
+    }
+
+    x_start_index = x_start_index > 0 ? x_start_index - 1 : x.size() - 1;
+  }
+}
+
+}  // namespace aec3
+
+MatchedFilter::MatchedFilter(ApmDataDumper* data_dumper,
+                             Aec3Optimization optimization,
+                             size_t sub_block_size,
+                             size_t window_size_sub_blocks,
+                             int num_matched_filters,
+                             size_t alignment_shift_sub_blocks,
+                             float excitation_limit,
+                             float smoothing,
+                             float matching_filter_threshold)
+    : data_dumper_(data_dumper),
+      optimization_(optimization),
+      sub_block_size_(sub_block_size),
+      filter_intra_lag_shift_(alignment_shift_sub_blocks * sub_block_size_),
+      filters_(
+          num_matched_filters,
+          std::vector<float>(window_size_sub_blocks * sub_block_size_, 0.f)),
+      lag_estimates_(num_matched_filters),
+      filters_offsets_(num_matched_filters, 0),
+      excitation_limit_(excitation_limit),
+      smoothing_(smoothing),
+      matching_filter_threshold_(matching_filter_threshold) {
+  RTC_DCHECK(data_dumper);
+  RTC_DCHECK_LT(0, window_size_sub_blocks);
+  RTC_DCHECK((kBlockSize % sub_block_size) == 0);
+  RTC_DCHECK((sub_block_size % 4) == 0);
+}
+
+MatchedFilter::~MatchedFilter() = default;
+
+void MatchedFilter::Reset() {
+  for (auto& f : filters_) {
+    std::fill(f.begin(), f.end(), 0.f);
+  }
+
+  for (auto& l : lag_estimates_) {
+    l = MatchedFilter::LagEstimate();
+  }
+}
+
+void MatchedFilter::Update(const DownsampledRenderBuffer& render_buffer,
+                           rtc::ArrayView<const float> capture) {
+  RTC_DCHECK_EQ(sub_block_size_, capture.size());
+  auto& y = capture;
+
+  const float x2_sum_threshold =
+      filters_[0].size() * excitation_limit_ * excitation_limit_;
+
+  // Apply all matched filters.
+  size_t alignment_shift = 0;
+  for (size_t n = 0; n < filters_.size(); ++n) {
+    float error_sum = 0.f;
+    bool filters_updated = false;
+
+    size_t x_start_index =
+        (render_buffer.read + alignment_shift + sub_block_size_ - 1) %
+        render_buffer.buffer.size();
+
+    switch (optimization_) {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+      case Aec3Optimization::kSse2:
+        aec3::MatchedFilterCore_SSE2(x_start_index, x2_sum_threshold,
+                                     smoothing_, render_buffer.buffer, y,
+                                     filters_[n], &filters_updated, &error_sum);
+        break;
+      case Aec3Optimization::kAvx2:
+        aec3::MatchedFilterCore_AVX2(x_start_index, x2_sum_threshold,
+                                     smoothing_, render_buffer.buffer, y,
+                                     filters_[n], &filters_updated, &error_sum);
+        break;
+#endif
+#if defined(WEBRTC_HAS_NEON)
+      case Aec3Optimization::kNeon:
+        aec3::MatchedFilterCore_NEON(x_start_index, x2_sum_threshold,
+                                     smoothing_, render_buffer.buffer, y,
+                                     filters_[n], &filters_updated, &error_sum);
+        break;
+#endif
+      default:
+        aec3::MatchedFilterCore(x_start_index, x2_sum_threshold, smoothing_,
+                                render_buffer.buffer, y, filters_[n],
+                                &filters_updated, &error_sum);
+    }
+
+    // Compute anchor for the matched filter error.
+    const float error_sum_anchor =
+        std::inner_product(y.begin(), y.end(), y.begin(), 0.f);
+
+    // Estimate the lag in the matched filter as the distance to the portion in
+    // the filter that contributes the most to the matched filter output. This
+    // is detected as the peak of the matched filter.
+    const size_t lag_estimate = std::distance(
+        filters_[n].begin(),
+        std::max_element(
+            filters_[n].begin(), filters_[n].end(),
+            [](float a, float b) -> bool { return a * a < b * b; }));
+
+    // Update the lag estimates for the matched filter.
+    lag_estimates_[n] = LagEstimate(
+        error_sum_anchor - error_sum,
+        (lag_estimate > 2 && lag_estimate < (filters_[n].size() - 10) &&
+         error_sum < matching_filter_threshold_ * error_sum_anchor),
+        lag_estimate + alignment_shift, filters_updated);
+
+    RTC_DCHECK_GE(10, filters_.size());
+    switch (n) {
+      case 0:
+        data_dumper_->DumpRaw("aec3_correlator_0_h", filters_[0]);
+        break;
+      case 1:
+        data_dumper_->DumpRaw("aec3_correlator_1_h", filters_[1]);
+        break;
+      case 2:
+        data_dumper_->DumpRaw("aec3_correlator_2_h", filters_[2]);
+        break;
+      case 3:
+        data_dumper_->DumpRaw("aec3_correlator_3_h", filters_[3]);
+        break;
+      case 4:
+        data_dumper_->DumpRaw("aec3_correlator_4_h", filters_[4]);
+        break;
+      case 5:
+        data_dumper_->DumpRaw("aec3_correlator_5_h", filters_[5]);
+        break;
+      case 6:
+        data_dumper_->DumpRaw("aec3_correlator_6_h", filters_[6]);
+        break;
+      case 7:
+        data_dumper_->DumpRaw("aec3_correlator_7_h", filters_[7]);
+        break;
+      case 8:
+        data_dumper_->DumpRaw("aec3_correlator_8_h", filters_[8]);
+        break;
+      case 9:
+        data_dumper_->DumpRaw("aec3_correlator_9_h", filters_[9]);
+        break;
+      default:
+        RTC_NOTREACHED();
+    }
+
+    alignment_shift += filter_intra_lag_shift_;
+  }
+}
+
+void MatchedFilter::LogFilterProperties(int sample_rate_hz,
+                                        size_t shift,
+                                        size_t downsampling_factor) const {
+  size_t alignment_shift = 0;
+  constexpr int kFsBy1000 = 16;
+  for (size_t k = 0; k < filters_.size(); ++k) {
+    int start = static_cast<int>(alignment_shift * downsampling_factor);
+    int end = static_cast<int>((alignment_shift + filters_[k].size()) *
+                               downsampling_factor);
+    RTC_LOG(LS_VERBOSE) << "Filter " << k << ": start: "
+                        << (start - static_cast<int>(shift)) / kFsBy1000
+                        << " ms, end: "
+                        << (end - static_cast<int>(shift)) / kFsBy1000
+                        << " ms.";
+    alignment_shift += filter_intra_lag_shift_;
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,149 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_
+
+#include <stddef.h>
+
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/system/arch.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+struct DownsampledRenderBuffer;
+
+namespace aec3 {
+
+#if defined(WEBRTC_HAS_NEON)
+
+// Filter core for the matched filter that is optimized for NEON.
+void MatchedFilterCore_NEON(size_t x_start_index,
+                            float x2_sum_threshold,
+                            float smoothing,
+                            rtc::ArrayView<const float> x,
+                            rtc::ArrayView<const float> y,
+                            rtc::ArrayView<float> h,
+                            bool* filters_updated,
+                            float* error_sum);
+
+#endif
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+
+// Filter core for the matched filter that is optimized for SSE2.
+void MatchedFilterCore_SSE2(size_t x_start_index,
+                            float x2_sum_threshold,
+                            float smoothing,
+                            rtc::ArrayView<const float> x,
+                            rtc::ArrayView<const float> y,
+                            rtc::ArrayView<float> h,
+                            bool* filters_updated,
+                            float* error_sum);
+
+// Filter core for the matched filter that is optimized for AVX2.
+void MatchedFilterCore_AVX2(size_t x_start_index,
+                            float x2_sum_threshold,
+                            float smoothing,
+                            rtc::ArrayView<const float> x,
+                            rtc::ArrayView<const float> y,
+                            rtc::ArrayView<float> h,
+                            bool* filters_updated,
+                            float* error_sum);
+
+#endif
+
+// Filter core for the matched filter.
+void MatchedFilterCore(size_t x_start_index,
+                       float x2_sum_threshold,
+                       float smoothing,
+                       rtc::ArrayView<const float> x,
+                       rtc::ArrayView<const float> y,
+                       rtc::ArrayView<float> h,
+                       bool* filters_updated,
+                       float* error_sum);
+
+}  // namespace aec3
+
+// Produces recursively updated cross-correlation estimates for several signal
+// shifts where the intra-shift spacing is uniform.
+class MatchedFilter {
+ public:
+  // Stores properties for the lag estimate corresponding to a particular signal
+  // shift.
+  struct LagEstimate {
+    LagEstimate() = default;
+    LagEstimate(float accuracy, bool reliable, size_t lag, bool updated)
+        : accuracy(accuracy), reliable(reliable), lag(lag), updated(updated) {}
+
+    float accuracy = 0.f;
+    bool reliable = false;
+    size_t lag = 0;
+    bool updated = false;
+  };
+
+  MatchedFilter(ApmDataDumper* data_dumper,
+                Aec3Optimization optimization,
+                size_t sub_block_size,
+                size_t window_size_sub_blocks,
+                int num_matched_filters,
+                size_t alignment_shift_sub_blocks,
+                float excitation_limit,
+                float smoothing,
+                float matching_filter_threshold);
+
+  MatchedFilter() = delete;
+  MatchedFilter(const MatchedFilter&) = delete;
+  MatchedFilter& operator=(const MatchedFilter&) = delete;
+
+  ~MatchedFilter();
+
+  // Updates the correlation with the values in the capture buffer.
+  void Update(const DownsampledRenderBuffer& render_buffer,
+              rtc::ArrayView<const float> capture);
+
+  // Resets the matched filter.
+  void Reset();
+
+  // Returns the current lag estimates.
+  rtc::ArrayView<const MatchedFilter::LagEstimate> GetLagEstimates() const {
+    return lag_estimates_;
+  }
+
+  // Returns the maximum filter lag.
+  size_t GetMaxFilterLag() const {
+    return filters_.size() * filter_intra_lag_shift_ + filters_[0].size();
+  }
+
+  // Log matched filter properties.
+  void LogFilterProperties(int sample_rate_hz,
+                           size_t shift,
+                           size_t downsampling_factor) const;
+
+ private:
+  ApmDataDumper* const data_dumper_;
+  const Aec3Optimization optimization_;
+  const size_t sub_block_size_;
+  const size_t filter_intra_lag_shift_;
+  std::vector<std::vector<float>> filters_;
+  std::vector<LagEstimate> lag_estimates_;
+  std::vector<size_t> filters_offsets_;
+  const float excitation_limit_;
+  const float smoothing_;
+  const float matching_filter_threshold_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,97 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "modules/audio_processing/aec3/matched_filter_lag_aggregator.h"
+
+#include <algorithm>
+#include <iterator>
+
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+MatchedFilterLagAggregator::MatchedFilterLagAggregator(
+    ApmDataDumper* data_dumper,
+    size_t max_filter_lag,
+    const EchoCanceller3Config::Delay::DelaySelectionThresholds& thresholds)
+    : data_dumper_(data_dumper),
+      histogram_(max_filter_lag + 1, 0),
+      thresholds_(thresholds) {
+  RTC_DCHECK(data_dumper);
+  RTC_DCHECK_LE(thresholds_.initial, thresholds_.converged);
+  histogram_data_.fill(0);
+}
+
+MatchedFilterLagAggregator::~MatchedFilterLagAggregator() = default;
+
+void MatchedFilterLagAggregator::Reset(bool hard_reset) {
+  std::fill(histogram_.begin(), histogram_.end(), 0);
+  histogram_data_.fill(0);
+  histogram_data_index_ = 0;
+  if (hard_reset) {
+    significant_candidate_found_ = false;
+  }
+}
+
+absl::optional<DelayEstimate> MatchedFilterLagAggregator::Aggregate(
+    rtc::ArrayView<const MatchedFilter::LagEstimate> lag_estimates) {
+  // Choose the strongest lag estimate as the best one.
+  float best_accuracy = 0.f;
+  int best_lag_estimate_index = -1;
+  for (size_t k = 0; k < lag_estimates.size(); ++k) {
+    if (lag_estimates[k].updated && lag_estimates[k].reliable) {
+      if (lag_estimates[k].accuracy > best_accuracy) {
+        best_accuracy = lag_estimates[k].accuracy;
+        best_lag_estimate_index = static_cast<int>(k);
+      }
+    }
+  }
+
+  // TODO(peah): Remove this logging once all development is done.
+  data_dumper_->DumpRaw("aec3_echo_path_delay_estimator_best_index",
+                        best_lag_estimate_index);
+  data_dumper_->DumpRaw("aec3_echo_path_delay_estimator_histogram", histogram_);
+
+  if (best_lag_estimate_index != -1) {
+    RTC_DCHECK_GT(histogram_.size(), histogram_data_[histogram_data_index_]);
+    RTC_DCHECK_LE(0, histogram_data_[histogram_data_index_]);
+    --histogram_[histogram_data_[histogram_data_index_]];
+
+    histogram_data_[histogram_data_index_] =
+        lag_estimates[best_lag_estimate_index].lag;
+
+    RTC_DCHECK_GT(histogram_.size(), histogram_data_[histogram_data_index_]);
+    RTC_DCHECK_LE(0, histogram_data_[histogram_data_index_]);
+    ++histogram_[histogram_data_[histogram_data_index_]];
+
+    histogram_data_index_ =
+        (histogram_data_index_ + 1) % histogram_data_.size();
+
+    const int candidate =
+        std::distance(histogram_.begin(),
+                      std::max_element(histogram_.begin(), histogram_.end()));
+
+    significant_candidate_found_ =
+        significant_candidate_found_ ||
+        histogram_[candidate] > thresholds_.converged;
+    if (histogram_[candidate] > thresholds_.converged ||
+        (histogram_[candidate] > thresholds_.initial &&
+         !significant_candidate_found_)) {
+      DelayEstimate::Quality quality = significant_candidate_found_
+                                           ? DelayEstimate::Quality::kRefined
+                                           : DelayEstimate::Quality::kCoarse;
+      return DelayEstimate(quality, candidate);
+    }
+  }
+
+  return absl::nullopt;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_LAG_AGGREGATOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_LAG_AGGREGATOR_H_
+
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/delay_estimate.h"
+#include "modules/audio_processing/aec3/matched_filter.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+
+// Aggregates lag estimates produced by the MatchedFilter class into a single
+// reliable combined lag estimate.
+class MatchedFilterLagAggregator {
+ public:
+  MatchedFilterLagAggregator(
+      ApmDataDumper* data_dumper,
+      size_t max_filter_lag,
+      const EchoCanceller3Config::Delay::DelaySelectionThresholds& thresholds);
+
+  MatchedFilterLagAggregator() = delete;
+  MatchedFilterLagAggregator(const MatchedFilterLagAggregator&) = delete;
+  MatchedFilterLagAggregator& operator=(const MatchedFilterLagAggregator&) =
+      delete;
+
+  ~MatchedFilterLagAggregator();
+
+  // Resets the aggregator.
+  void Reset(bool hard_reset);
+
+  // Aggregates the provided lag estimates.
+  absl::optional<DelayEstimate> Aggregate(
+      rtc::ArrayView<const MatchedFilter::LagEstimate> lag_estimates);
+
+ private:
+  ApmDataDumper* const data_dumper_;
+  std::vector<int> histogram_;
+  std::array<int, 250> histogram_data_;
+  int histogram_data_index_ = 0;
+  bool significant_candidate_found_ = false;
+  const EchoCanceller3Config::Delay::DelaySelectionThresholds thresholds_;
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_MATCHED_FILTER_LAG_AGGREGATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_lag_aggregator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,156 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/matched_filter_lag_aggregator.h"
+
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+constexpr size_t kNumLagsBeforeDetection = 26;
+
+}  // namespace
+
+// Verifies that the most accurate lag estimate is chosen.
+TEST(MatchedFilterLagAggregator, MostAccurateLagChosen) {
+  constexpr size_t kLag1 = 5;
+  constexpr size_t kLag2 = 10;
+  ApmDataDumper data_dumper(0);
+  EchoCanceller3Config config;
+  std::vector<MatchedFilter::LagEstimate> lag_estimates(2);
+  MatchedFilterLagAggregator aggregator(
+      &data_dumper, std::max(kLag1, kLag2),
+      config.delay.delay_selection_thresholds);
+  lag_estimates[0] = MatchedFilter::LagEstimate(1.f, true, kLag1, true);
+  lag_estimates[1] = MatchedFilter::LagEstimate(0.5f, true, kLag2, true);
+
+  for (size_t k = 0; k < kNumLagsBeforeDetection; ++k) {
+    aggregator.Aggregate(lag_estimates);
+  }
+
+  absl::optional<DelayEstimate> aggregated_lag =
+      aggregator.Aggregate(lag_estimates);
+  EXPECT_TRUE(aggregated_lag);
+  EXPECT_EQ(kLag1, aggregated_lag->delay);
+
+  lag_estimates[0] = MatchedFilter::LagEstimate(0.5f, true, kLag1, true);
+  lag_estimates[1] = MatchedFilter::LagEstimate(1.f, true, kLag2, true);
+
+  for (size_t k = 0; k < kNumLagsBeforeDetection; ++k) {
+    aggregated_lag = aggregator.Aggregate(lag_estimates);
+    EXPECT_TRUE(aggregated_lag);
+    EXPECT_EQ(kLag1, aggregated_lag->delay);
+  }
+
+  aggregated_lag = aggregator.Aggregate(lag_estimates);
+  aggregated_lag = aggregator.Aggregate(lag_estimates);
+  EXPECT_TRUE(aggregated_lag);
+  EXPECT_EQ(kLag2, aggregated_lag->delay);
+}
+
+// Verifies that varying lag estimates causes lag estimates to not be deemed
+// reliable.
+TEST(MatchedFilterLagAggregator,
+     LagEstimateInvarianceRequiredForAggregatedLag) {
+  ApmDataDumper data_dumper(0);
+  EchoCanceller3Config config;
+  std::vector<MatchedFilter::LagEstimate> lag_estimates(1);
+  MatchedFilterLagAggregator aggregator(
+      &data_dumper, 100, config.delay.delay_selection_thresholds);
+
+  absl::optional<DelayEstimate> aggregated_lag;
+  for (size_t k = 0; k < kNumLagsBeforeDetection; ++k) {
+    lag_estimates[0] = MatchedFilter::LagEstimate(1.f, true, 10, true);
+    aggregated_lag = aggregator.Aggregate(lag_estimates);
+  }
+  EXPECT_TRUE(aggregated_lag);
+
+  for (size_t k = 0; k < kNumLagsBeforeDetection * 100; ++k) {
+    lag_estimates[0] = MatchedFilter::LagEstimate(1.f, true, k % 100, true);
+    aggregated_lag = aggregator.Aggregate(lag_estimates);
+  }
+  EXPECT_FALSE(aggregated_lag);
+
+  for (size_t k = 0; k < kNumLagsBeforeDetection * 100; ++k) {
+    lag_estimates[0] = MatchedFilter::LagEstimate(1.f, true, k % 100, true);
+    aggregated_lag = aggregator.Aggregate(lag_estimates);
+    EXPECT_FALSE(aggregated_lag);
+  }
+}
+
+// Verifies that lag estimate updates are required to produce an updated lag
+// aggregate.
+TEST(MatchedFilterLagAggregator,
+     DISABLED_LagEstimateUpdatesRequiredForAggregatedLag) {
+  constexpr size_t kLag = 5;
+  ApmDataDumper data_dumper(0);
+  EchoCanceller3Config config;
+  std::vector<MatchedFilter::LagEstimate> lag_estimates(1);
+  MatchedFilterLagAggregator aggregator(
+      &data_dumper, kLag, config.delay.delay_selection_thresholds);
+  for (size_t k = 0; k < kNumLagsBeforeDetection * 10; ++k) {
+    lag_estimates[0] = MatchedFilter::LagEstimate(1.f, true, kLag, false);
+    absl::optional<DelayEstimate> aggregated_lag =
+        aggregator.Aggregate(lag_estimates);
+    EXPECT_FALSE(aggregated_lag);
+    EXPECT_EQ(kLag, aggregated_lag->delay);
+  }
+}
+
+// Verifies that an aggregated lag is persistent if the lag estimates do not
+// change and that an aggregated lag is not produced without gaining lag
+// estimate confidence.
+TEST(MatchedFilterLagAggregator, DISABLED_PersistentAggregatedLag) {
+  constexpr size_t kLag1 = 5;
+  constexpr size_t kLag2 = 10;
+  ApmDataDumper data_dumper(0);
+  EchoCanceller3Config config;
+  std::vector<MatchedFilter::LagEstimate> lag_estimates(1);
+  MatchedFilterLagAggregator aggregator(
+      &data_dumper, std::max(kLag1, kLag2),
+      config.delay.delay_selection_thresholds);
+  absl::optional<DelayEstimate> aggregated_lag;
+  for (size_t k = 0; k < kNumLagsBeforeDetection; ++k) {
+    lag_estimates[0] = MatchedFilter::LagEstimate(1.f, true, kLag1, true);
+    aggregated_lag = aggregator.Aggregate(lag_estimates);
+  }
+  EXPECT_TRUE(aggregated_lag);
+  EXPECT_EQ(kLag1, aggregated_lag->delay);
+
+  for (size_t k = 0; k < kNumLagsBeforeDetection * 40; ++k) {
+    lag_estimates[0] = MatchedFilter::LagEstimate(1.f, false, kLag2, true);
+    aggregated_lag = aggregator.Aggregate(lag_estimates);
+    EXPECT_TRUE(aggregated_lag);
+    EXPECT_EQ(kLag1, aggregated_lag->delay);
+  }
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies the check for non-null data dumper.
+TEST(MatchedFilterLagAggregatorDeathTest, NullDataDumper) {
+  EchoCanceller3Config config;
+  EXPECT_DEATH(MatchedFilterLagAggregator(
+                   nullptr, 10, config.delay.delay_selection_thresholds),
+               "");
+}
+
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/matched_filter_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,463 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/matched_filter.h"
+
+// Defines WEBRTC_ARCH_X86_FAMILY, used below.
+#include "rtc_base/system/arch.h"
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+#include <emmintrin.h>
+#endif
+#include <algorithm>
+#include <string>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/decimator.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "modules/audio_processing/test/echo_canceller_test_tools.h"
+#include "rtc_base/random.h"
+#include "rtc_base/strings/string_builder.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace aec3 {
+namespace {
+
+std::string ProduceDebugText(size_t delay, size_t down_sampling_factor) {
+  rtc::StringBuilder ss;
+  ss << "Delay: " << delay;
+  ss << ", Down sampling factor: " << down_sampling_factor;
+  return ss.Release();
+}
+
+constexpr size_t kNumMatchedFilters = 10;
+constexpr size_t kDownSamplingFactors[] = {2, 4, 8};
+constexpr size_t kWindowSizeSubBlocks = 32;
+constexpr size_t kAlignmentShiftSubBlocks = kWindowSizeSubBlocks * 3 / 4;
+
+}  // namespace
+
+#if defined(WEBRTC_HAS_NEON)
+// Verifies that the optimized methods for NEON are similar to their reference
+// counterparts.
+TEST(MatchedFilter, TestNeonOptimizations) {
+  Random random_generator(42U);
+  constexpr float kSmoothing = 0.7f;
+  for (auto down_sampling_factor : kDownSamplingFactors) {
+    const size_t sub_block_size = kBlockSize / down_sampling_factor;
+
+    std::vector<float> x(2000);
+    RandomizeSampleVector(&random_generator, x);
+    std::vector<float> y(sub_block_size);
+    std::vector<float> h_NEON(512);
+    std::vector<float> h(512);
+    int x_index = 0;
+    for (int k = 0; k < 1000; ++k) {
+      RandomizeSampleVector(&random_generator, y);
+
+      bool filters_updated = false;
+      float error_sum = 0.f;
+      bool filters_updated_NEON = false;
+      float error_sum_NEON = 0.f;
+
+      MatchedFilterCore_NEON(x_index, h.size() * 150.f * 150.f, kSmoothing, x,
+                             y, h_NEON, &filters_updated_NEON, &error_sum_NEON);
+
+      MatchedFilterCore(x_index, h.size() * 150.f * 150.f, kSmoothing, x, y, h,
+                        &filters_updated, &error_sum);
+
+      EXPECT_EQ(filters_updated, filters_updated_NEON);
+      EXPECT_NEAR(error_sum, error_sum_NEON, error_sum / 100000.f);
+
+      for (size_t j = 0; j < h.size(); ++j) {
+        EXPECT_NEAR(h[j], h_NEON[j], 0.00001f);
+      }
+
+      x_index = (x_index + sub_block_size) % x.size();
+    }
+  }
+}
+#endif
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+// Verifies that the optimized methods for SSE2 are bitexact to their reference
+// counterparts.
+TEST(MatchedFilter, TestSse2Optimizations) {
+  bool use_sse2 = (GetCPUInfo(kSSE2) != 0);
+  if (use_sse2) {
+    Random random_generator(42U);
+    constexpr float kSmoothing = 0.7f;
+    for (auto down_sampling_factor : kDownSamplingFactors) {
+      const size_t sub_block_size = kBlockSize / down_sampling_factor;
+      std::vector<float> x(2000);
+      RandomizeSampleVector(&random_generator, x);
+      std::vector<float> y(sub_block_size);
+      std::vector<float> h_SSE2(512);
+      std::vector<float> h(512);
+      int x_index = 0;
+      for (int k = 0; k < 1000; ++k) {
+        RandomizeSampleVector(&random_generator, y);
+
+        bool filters_updated = false;
+        float error_sum = 0.f;
+        bool filters_updated_SSE2 = false;
+        float error_sum_SSE2 = 0.f;
+
+        MatchedFilterCore_SSE2(x_index, h.size() * 150.f * 150.f, kSmoothing, x,
+                               y, h_SSE2, &filters_updated_SSE2,
+                               &error_sum_SSE2);
+
+        MatchedFilterCore(x_index, h.size() * 150.f * 150.f, kSmoothing, x, y,
+                          h, &filters_updated, &error_sum);
+
+        EXPECT_EQ(filters_updated, filters_updated_SSE2);
+        EXPECT_NEAR(error_sum, error_sum_SSE2, error_sum / 100000.f);
+
+        for (size_t j = 0; j < h.size(); ++j) {
+          EXPECT_NEAR(h[j], h_SSE2[j], 0.00001f);
+        }
+
+        x_index = (x_index + sub_block_size) % x.size();
+      }
+    }
+  }
+}
+
+TEST(MatchedFilter, TestAvx2Optimizations) {
+  bool use_avx2 = (GetCPUInfo(kAVX2) != 0);
+  if (use_avx2) {
+    Random random_generator(42U);
+    constexpr float kSmoothing = 0.7f;
+    for (auto down_sampling_factor : kDownSamplingFactors) {
+      const size_t sub_block_size = kBlockSize / down_sampling_factor;
+      std::vector<float> x(2000);
+      RandomizeSampleVector(&random_generator, x);
+      std::vector<float> y(sub_block_size);
+      std::vector<float> h_AVX2(512);
+      std::vector<float> h(512);
+      int x_index = 0;
+      for (int k = 0; k < 1000; ++k) {
+        RandomizeSampleVector(&random_generator, y);
+
+        bool filters_updated = false;
+        float error_sum = 0.f;
+        bool filters_updated_AVX2 = false;
+        float error_sum_AVX2 = 0.f;
+
+        MatchedFilterCore_AVX2(x_index, h.size() * 150.f * 150.f, kSmoothing, x,
+                               y, h_AVX2, &filters_updated_AVX2,
+                               &error_sum_AVX2);
+
+        MatchedFilterCore(x_index, h.size() * 150.f * 150.f, kSmoothing, x, y,
+                          h, &filters_updated, &error_sum);
+
+        EXPECT_EQ(filters_updated, filters_updated_AVX2);
+        EXPECT_NEAR(error_sum, error_sum_AVX2, error_sum / 100000.f);
+
+        for (size_t j = 0; j < h.size(); ++j) {
+          EXPECT_NEAR(h[j], h_AVX2[j], 0.00001f);
+        }
+
+        x_index = (x_index + sub_block_size) % x.size();
+      }
+    }
+  }
+}
+
+#endif
+
+// Verifies that the matched filter produces proper lag estimates for
+// artificially
+// delayed signals.
+TEST(MatchedFilter, LagEstimation) {
+  Random random_generator(42U);
+  constexpr size_t kNumChannels = 1;
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+
+  for (auto down_sampling_factor : kDownSamplingFactors) {
+    const size_t sub_block_size = kBlockSize / down_sampling_factor;
+
+    std::vector<std::vector<std::vector<float>>> render(
+        kNumBands, std::vector<std::vector<float>>(
+                       kNumChannels, std::vector<float>(kBlockSize, 0.f)));
+    std::vector<std::vector<float>> capture(
+        1, std::vector<float>(kBlockSize, 0.f));
+    ApmDataDumper data_dumper(0);
+    for (size_t delay_samples : {5, 64, 150, 200, 800, 1000}) {
+      SCOPED_TRACE(ProduceDebugText(delay_samples, down_sampling_factor));
+      EchoCanceller3Config config;
+      config.delay.down_sampling_factor = down_sampling_factor;
+      config.delay.num_filters = kNumMatchedFilters;
+      Decimator capture_decimator(down_sampling_factor);
+      DelayBuffer<float> signal_delay_buffer(down_sampling_factor *
+                                             delay_samples);
+      MatchedFilter filter(&data_dumper, DetectOptimization(), sub_block_size,
+                           kWindowSizeSubBlocks, kNumMatchedFilters,
+                           kAlignmentShiftSubBlocks, 150,
+                           config.delay.delay_estimate_smoothing,
+                           config.delay.delay_candidate_detection_threshold);
+
+      std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+          RenderDelayBuffer::Create(config, kSampleRateHz, kNumChannels));
+
+      // Analyze the correlation between render and capture.
+      for (size_t k = 0; k < (600 + delay_samples / sub_block_size); ++k) {
+        for (size_t band = 0; band < kNumBands; ++band) {
+          for (size_t channel = 0; channel < kNumChannels; ++channel) {
+            RandomizeSampleVector(&random_generator, render[band][channel]);
+          }
+        }
+        signal_delay_buffer.Delay(render[0][0], capture[0]);
+        render_delay_buffer->Insert(render);
+
+        if (k == 0) {
+          render_delay_buffer->Reset();
+        }
+
+        render_delay_buffer->PrepareCaptureProcessing();
+        std::array<float, kBlockSize> downsampled_capture_data;
+        rtc::ArrayView<float> downsampled_capture(
+            downsampled_capture_data.data(), sub_block_size);
+        capture_decimator.Decimate(capture[0], downsampled_capture);
+        filter.Update(render_delay_buffer->GetDownsampledRenderBuffer(),
+                      downsampled_capture);
+      }
+
+      // Obtain the lag estimates.
+      auto lag_estimates = filter.GetLagEstimates();
+
+      // Find which lag estimate should be the most accurate.
+      absl::optional<size_t> expected_most_accurate_lag_estimate;
+      size_t alignment_shift_sub_blocks = 0;
+      for (size_t k = 0; k < config.delay.num_filters; ++k) {
+        if ((alignment_shift_sub_blocks + 3 * kWindowSizeSubBlocks / 4) *
+                sub_block_size >
+            delay_samples) {
+          expected_most_accurate_lag_estimate = k > 0 ? k - 1 : 0;
+          break;
+        }
+        alignment_shift_sub_blocks += kAlignmentShiftSubBlocks;
+      }
+      ASSERT_TRUE(expected_most_accurate_lag_estimate);
+
+      // Verify that the expected most accurate lag estimate is the most
+      // accurate estimate.
+      for (size_t k = 0; k < kNumMatchedFilters; ++k) {
+        if (k != *expected_most_accurate_lag_estimate &&
+            k != (*expected_most_accurate_lag_estimate + 1)) {
+          EXPECT_TRUE(
+              lag_estimates[*expected_most_accurate_lag_estimate].accuracy >
+                  lag_estimates[k].accuracy ||
+              !lag_estimates[k].reliable ||
+              !lag_estimates[*expected_most_accurate_lag_estimate].reliable);
+        }
+      }
+
+      // Verify that all lag estimates are updated as expected for signals
+      // containing strong noise.
+      for (auto& le : lag_estimates) {
+        EXPECT_TRUE(le.updated);
+      }
+
+      // Verify that the expected most accurate lag estimate is reliable.
+      EXPECT_TRUE(
+          lag_estimates[*expected_most_accurate_lag_estimate].reliable ||
+          lag_estimates[std::min(*expected_most_accurate_lag_estimate + 1,
+                                 lag_estimates.size() - 1)]
+              .reliable);
+
+      // Verify that the expected most accurate lag estimate is correct.
+      if (lag_estimates[*expected_most_accurate_lag_estimate].reliable) {
+        EXPECT_TRUE(delay_samples ==
+                    lag_estimates[*expected_most_accurate_lag_estimate].lag);
+      } else {
+        EXPECT_TRUE(
+            delay_samples ==
+            lag_estimates[std::min(*expected_most_accurate_lag_estimate + 1,
+                                   lag_estimates.size() - 1)]
+                .lag);
+      }
+    }
+  }
+}
+
+// Verifies that the matched filter does not produce reliable and accurate
+// estimates for uncorrelated render and capture signals.
+TEST(MatchedFilter, LagNotReliableForUncorrelatedRenderAndCapture) {
+  constexpr size_t kNumChannels = 1;
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+  Random random_generator(42U);
+  for (auto down_sampling_factor : kDownSamplingFactors) {
+    EchoCanceller3Config config;
+    config.delay.down_sampling_factor = down_sampling_factor;
+    config.delay.num_filters = kNumMatchedFilters;
+    const size_t sub_block_size = kBlockSize / down_sampling_factor;
+
+    std::vector<std::vector<std::vector<float>>> render(
+        kNumBands, std::vector<std::vector<float>>(
+                       kNumChannels, std::vector<float>(kBlockSize, 0.f)));
+    std::array<float, kBlockSize> capture_data;
+    rtc::ArrayView<float> capture(capture_data.data(), sub_block_size);
+    std::fill(capture.begin(), capture.end(), 0.f);
+    ApmDataDumper data_dumper(0);
+    std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+        RenderDelayBuffer::Create(config, kSampleRateHz, kNumChannels));
+    MatchedFilter filter(&data_dumper, DetectOptimization(), sub_block_size,
+                         kWindowSizeSubBlocks, kNumMatchedFilters,
+                         kAlignmentShiftSubBlocks, 150,
+                         config.delay.delay_estimate_smoothing,
+                         config.delay.delay_candidate_detection_threshold);
+
+    // Analyze the correlation between render and capture.
+    for (size_t k = 0; k < 100; ++k) {
+      RandomizeSampleVector(&random_generator, render[0][0]);
+      RandomizeSampleVector(&random_generator, capture);
+      render_delay_buffer->Insert(render);
+      filter.Update(render_delay_buffer->GetDownsampledRenderBuffer(), capture);
+    }
+
+    // Obtain the lag estimates.
+    auto lag_estimates = filter.GetLagEstimates();
+    EXPECT_EQ(kNumMatchedFilters, lag_estimates.size());
+
+    // Verify that no lag estimates are reliable.
+    for (auto& le : lag_estimates) {
+      EXPECT_FALSE(le.reliable);
+    }
+  }
+}
+
+// Verifies that the matched filter does not produce updated lag estimates for
+// render signals of low level.
+TEST(MatchedFilter, LagNotUpdatedForLowLevelRender) {
+  Random random_generator(42U);
+  constexpr size_t kNumChannels = 1;
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+
+  for (auto down_sampling_factor : kDownSamplingFactors) {
+    const size_t sub_block_size = kBlockSize / down_sampling_factor;
+
+    std::vector<std::vector<std::vector<float>>> render(
+        kNumBands, std::vector<std::vector<float>>(
+                       kNumChannels, std::vector<float>(kBlockSize, 0.f)));
+    std::vector<std::vector<float>> capture(
+        1, std::vector<float>(kBlockSize, 0.f));
+    ApmDataDumper data_dumper(0);
+    EchoCanceller3Config config;
+    MatchedFilter filter(&data_dumper, DetectOptimization(), sub_block_size,
+                         kWindowSizeSubBlocks, kNumMatchedFilters,
+                         kAlignmentShiftSubBlocks, 150,
+                         config.delay.delay_estimate_smoothing,
+                         config.delay.delay_candidate_detection_threshold);
+    std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+        RenderDelayBuffer::Create(EchoCanceller3Config(), kSampleRateHz,
+                                  kNumChannels));
+    Decimator capture_decimator(down_sampling_factor);
+
+    // Analyze the correlation between render and capture.
+    for (size_t k = 0; k < 100; ++k) {
+      RandomizeSampleVector(&random_generator, render[0][0]);
+      for (auto& render_k : render[0][0]) {
+        render_k *= 149.f / 32767.f;
+      }
+      std::copy(render[0][0].begin(), render[0][0].end(), capture[0].begin());
+      std::array<float, kBlockSize> downsampled_capture_data;
+      rtc::ArrayView<float> downsampled_capture(downsampled_capture_data.data(),
+                                                sub_block_size);
+      capture_decimator.Decimate(capture[0], downsampled_capture);
+      filter.Update(render_delay_buffer->GetDownsampledRenderBuffer(),
+                    downsampled_capture);
+    }
+
+    // Obtain the lag estimates.
+    auto lag_estimates = filter.GetLagEstimates();
+    EXPECT_EQ(kNumMatchedFilters, lag_estimates.size());
+
+    // Verify that no lag estimates are updated and that no lag estimates are
+    // reliable.
+    for (auto& le : lag_estimates) {
+      EXPECT_FALSE(le.updated);
+      EXPECT_FALSE(le.reliable);
+    }
+  }
+}
+
+// Verifies that the correct number of lag estimates are produced for a certain
+// number of alignment shifts.
+TEST(MatchedFilter, NumberOfLagEstimates) {
+  ApmDataDumper data_dumper(0);
+  EchoCanceller3Config config;
+  for (auto down_sampling_factor : kDownSamplingFactors) {
+    const size_t sub_block_size = kBlockSize / down_sampling_factor;
+    for (size_t num_matched_filters = 0; num_matched_filters < 10;
+         ++num_matched_filters) {
+      MatchedFilter filter(&data_dumper, DetectOptimization(), sub_block_size,
+                           32, num_matched_filters, 1, 150,
+                           config.delay.delay_estimate_smoothing,
+                           config.delay.delay_candidate_detection_threshold);
+      EXPECT_EQ(num_matched_filters, filter.GetLagEstimates().size());
+    }
+  }
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies the check for non-zero windows size.
+TEST(MatchedFilterDeathTest, ZeroWindowSize) {
+  ApmDataDumper data_dumper(0);
+  EchoCanceller3Config config;
+  EXPECT_DEATH(MatchedFilter(&data_dumper, DetectOptimization(), 16, 0, 1, 1,
+                             150, config.delay.delay_estimate_smoothing,
+                             config.delay.delay_candidate_detection_threshold),
+               "");
+}
+
+// Verifies the check for non-null data dumper.
+TEST(MatchedFilterDeathTest, NullDataDumper) {
+  EchoCanceller3Config config;
+  EXPECT_DEATH(MatchedFilter(nullptr, DetectOptimization(), 16, 1, 1, 1, 150,
+                             config.delay.delay_estimate_smoothing,
+                             config.delay.delay_candidate_detection_threshold),
+               "");
+}
+
+// Verifies the check for that the sub block size is a multiple of 4.
+// TODO(peah): Activate the unittest once the required code has been landed.
+TEST(MatchedFilterDeathTest, DISABLED_BlockSizeMultipleOf4) {
+  ApmDataDumper data_dumper(0);
+  EchoCanceller3Config config;
+  EXPECT_DEATH(MatchedFilter(&data_dumper, DetectOptimization(), 15, 1, 1, 1,
+                             150, config.delay.delay_estimate_smoothing,
+                             config.delay.delay_candidate_detection_threshold),
+               "");
+}
+
+// Verifies the check for that there is an integer number of sub blocks that add
+// up to a block size.
+// TODO(peah): Activate the unittest once the required code has been landed.
+TEST(MatchedFilterDeathTest, DISABLED_SubBlockSizeAddsUpToBlockSize) {
+  ApmDataDumper data_dumper(0);
+  EchoCanceller3Config config;
+  EXPECT_DEATH(MatchedFilter(&data_dumper, DetectOptimization(), 12, 1, 1, 1,
+                             150, config.delay.delay_estimate_smoothing,
+                             config.delay.delay_candidate_detection_threshold),
+               "");
+}
+
+#endif
+
+}  // namespace aec3
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_block_processor.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_block_processor.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_block_processor.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_block_processor.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,20 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/mock/mock_block_processor.h"
+
+namespace webrtc {
+namespace test {
+
+MockBlockProcessor::MockBlockProcessor() = default;
+MockBlockProcessor::~MockBlockProcessor() = default;
+
+}  // namespace test
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_block_processor.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_block_processor.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_block_processor.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_block_processor.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_BLOCK_PROCESSOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_BLOCK_PROCESSOR_H_
+
+#include <vector>
+
+#include "modules/audio_processing/aec3/block_processor.h"
+#include "test/gmock.h"
+
+namespace webrtc {
+namespace test {
+
+class MockBlockProcessor : public BlockProcessor {
+ public:
+  MockBlockProcessor();
+  virtual ~MockBlockProcessor();
+
+  MOCK_METHOD(void,
+              ProcessCapture,
+              (bool level_change,
+               bool saturated_microphone_signal,
+               std::vector<std::vector<std::vector<float>>>* linear_output,
+               std::vector<std::vector<std::vector<float>>>* capture_block),
+              (override));
+  MOCK_METHOD(void,
+              BufferRender,
+              (const std::vector<std::vector<std::vector<float>>>& block),
+              (override));
+  MOCK_METHOD(void,
+              UpdateEchoLeakageStatus,
+              (bool leakage_detected),
+              (override));
+  MOCK_METHOD(void,
+              GetMetrics,
+              (EchoControl::Metrics * metrics),
+              (const, override));
+  MOCK_METHOD(void, SetAudioBufferDelay, (int delay_ms), (override));
+  MOCK_METHOD(void,
+              SetCaptureOutputUsage,
+              (bool capture_output_used),
+              (override));
+};
+
+}  // namespace test
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_BLOCK_PROCESSOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_echo_remover.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_echo_remover.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_echo_remover.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_echo_remover.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,20 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/mock/mock_echo_remover.h"
+
+namespace webrtc {
+namespace test {
+
+MockEchoRemover::MockEchoRemover() = default;
+MockEchoRemover::~MockEchoRemover() = default;
+
+}  // namespace test
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_echo_remover.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_echo_remover.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_echo_remover.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_echo_remover.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_ECHO_REMOVER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_ECHO_REMOVER_H_
+
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "modules/audio_processing/aec3/echo_path_variability.h"
+#include "modules/audio_processing/aec3/echo_remover.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "test/gmock.h"
+
+namespace webrtc {
+namespace test {
+
+class MockEchoRemover : public EchoRemover {
+ public:
+  MockEchoRemover();
+  virtual ~MockEchoRemover();
+
+  MOCK_METHOD(void,
+              ProcessCapture,
+              (EchoPathVariability echo_path_variability,
+               bool capture_signal_saturation,
+               const absl::optional<DelayEstimate>& delay_estimate,
+               RenderBuffer* render_buffer,
+               std::vector<std::vector<std::vector<float>>>* linear_output,
+               std::vector<std::vector<std::vector<float>>>* capture),
+              (override));
+  MOCK_METHOD(void,
+              UpdateEchoLeakageStatus,
+              (bool leakage_detected),
+              (override));
+  MOCK_METHOD(void,
+              GetMetrics,
+              (EchoControl::Metrics * metrics),
+              (const, override));
+  MOCK_METHOD(void,
+              SetCaptureOutputUsage,
+              (bool capture_output_used),
+              (override));
+};
+
+}  // namespace test
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_ECHO_REMOVER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_buffer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_buffer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_buffer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_buffer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/mock/mock_render_delay_buffer.h"
+
+namespace webrtc {
+namespace test {
+
+MockRenderDelayBuffer::MockRenderDelayBuffer(int sample_rate_hz,
+                                             size_t num_channels)
+    : block_buffer_(GetRenderDelayBufferSize(4, 4, 12),
+                    NumBandsForRate(sample_rate_hz),
+                    num_channels,
+                    kBlockSize),
+      spectrum_buffer_(block_buffer_.buffer.size(), num_channels),
+      fft_buffer_(block_buffer_.buffer.size(), num_channels),
+      render_buffer_(&block_buffer_, &spectrum_buffer_, &fft_buffer_),
+      downsampled_render_buffer_(GetDownSampledBufferSize(4, 4)) {
+  ON_CALL(*this, GetRenderBuffer())
+      .WillByDefault(
+          ::testing::Invoke(this, &MockRenderDelayBuffer::FakeGetRenderBuffer));
+  ON_CALL(*this, GetDownsampledRenderBuffer())
+      .WillByDefault(::testing::Invoke(
+          this, &MockRenderDelayBuffer::FakeGetDownsampledRenderBuffer));
+}
+
+MockRenderDelayBuffer::~MockRenderDelayBuffer() = default;
+
+}  // namespace test
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,67 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_BUFFER_H_
+
+#include <vector>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "test/gmock.h"
+
+namespace webrtc {
+namespace test {
+
+class MockRenderDelayBuffer : public RenderDelayBuffer {
+ public:
+  MockRenderDelayBuffer(int sample_rate_hz, size_t num_channels);
+  virtual ~MockRenderDelayBuffer();
+
+  MOCK_METHOD(void, Reset, (), (override));
+  MOCK_METHOD(RenderDelayBuffer::BufferingEvent,
+              Insert,
+              (const std::vector<std::vector<std::vector<float>>>& block),
+              (override));
+  MOCK_METHOD(void, HandleSkippedCaptureProcessing, (), (override));
+  MOCK_METHOD(RenderDelayBuffer::BufferingEvent,
+              PrepareCaptureProcessing,
+              (),
+              (override));
+  MOCK_METHOD(bool, AlignFromDelay, (size_t delay), (override));
+  MOCK_METHOD(void, AlignFromExternalDelay, (), (override));
+  MOCK_METHOD(size_t, Delay, (), (const, override));
+  MOCK_METHOD(size_t, MaxDelay, (), (const, override));
+  MOCK_METHOD(RenderBuffer*, GetRenderBuffer, (), (override));
+  MOCK_METHOD(const DownsampledRenderBuffer&,
+              GetDownsampledRenderBuffer,
+              (),
+              (const, override));
+  MOCK_METHOD(void, SetAudioBufferDelay, (int delay_ms), (override));
+  MOCK_METHOD(bool, HasReceivedBufferDelay, (), (override));
+
+ private:
+  RenderBuffer* FakeGetRenderBuffer() { return &render_buffer_; }
+  const DownsampledRenderBuffer& FakeGetDownsampledRenderBuffer() const {
+    return downsampled_render_buffer_;
+  }
+  BlockBuffer block_buffer_;
+  SpectrumBuffer spectrum_buffer_;
+  FftBuffer fft_buffer_;
+  RenderBuffer render_buffer_;
+  DownsampledRenderBuffer downsampled_render_buffer_;
+};
+
+}  // namespace test
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_controller.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_controller.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_controller.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_controller.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,20 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/mock/mock_render_delay_controller.h"
+
+namespace webrtc {
+namespace test {
+
+MockRenderDelayController::MockRenderDelayController() = default;
+MockRenderDelayController::~MockRenderDelayController() = default;
+
+}  // namespace test
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_controller.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_controller.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_controller.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/mock/mock_render_delay_controller.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_CONTROLLER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_CONTROLLER_H_
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
+#include "modules/audio_processing/aec3/render_delay_controller.h"
+#include "test/gmock.h"
+
+namespace webrtc {
+namespace test {
+
+class MockRenderDelayController : public RenderDelayController {
+ public:
+  MockRenderDelayController();
+  virtual ~MockRenderDelayController();
+
+  MOCK_METHOD(void, Reset, (bool reset_delay_statistics), (override));
+  MOCK_METHOD(void, LogRenderCall, (), (override));
+  MOCK_METHOD(absl::optional<DelayEstimate>,
+              GetDelay,
+              (const DownsampledRenderBuffer& render_buffer,
+               size_t render_delay_buffer_delay,
+               const std::vector<std::vector<float>>& capture),
+              (override));
+  MOCK_METHOD(bool, HasClockdrift, (), (const, override));
+};
+
+}  // namespace test
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_MOCK_MOCK_RENDER_DELAY_CONTROLLER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,60 @@
+
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/moving_average.h"
+
+#include <algorithm>
+#include <functional>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace aec3 {
+
+MovingAverage::MovingAverage(size_t num_elem, size_t mem_len)
+    : num_elem_(num_elem),
+      mem_len_(mem_len - 1),
+      scaling_(1.0f / static_cast<float>(mem_len)),
+      memory_(num_elem * mem_len_, 0.f),
+      mem_index_(0) {
+  RTC_DCHECK(num_elem_ > 0);
+  RTC_DCHECK(mem_len > 0);
+}
+
+MovingAverage::~MovingAverage() = default;
+
+void MovingAverage::Average(rtc::ArrayView<const float> input,
+                            rtc::ArrayView<float> output) {
+  RTC_DCHECK(input.size() == num_elem_);
+  RTC_DCHECK(output.size() == num_elem_);
+
+  // Sum all contributions.
+  std::copy(input.begin(), input.end(), output.begin());
+  for (auto i = memory_.begin(); i < memory_.end(); i += num_elem_) {
+    std::transform(i, i + num_elem_, output.begin(), output.begin(),
+                   std::plus<float>());
+  }
+
+  // Divide by mem_len_.
+  for (float& o : output) {
+    o *= scaling_;
+  }
+
+  // Update memory.
+  if (mem_len_ > 0) {
+    std::copy(input.begin(), input.end(),
+              memory_.begin() + mem_index_ * num_elem_);
+    mem_index_ = (mem_index_ + 1) % mem_len_;
+  }
+}
+
+}  // namespace aec3
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_MOVING_AVERAGE_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_MOVING_AVERAGE_H_
+
+#include <stddef.h>
+
+#include <vector>
+
+#include "api/array_view.h"
+
+namespace webrtc {
+namespace aec3 {
+
+class MovingAverage {
+ public:
+  // Creates an instance of MovingAverage that accepts inputs of length num_elem
+  // and averages over mem_len inputs.
+  MovingAverage(size_t num_elem, size_t mem_len);
+  ~MovingAverage();
+
+  // Computes the average of input and mem_len-1 previous inputs and stores the
+  // result in output.
+  void Average(rtc::ArrayView<const float> input, rtc::ArrayView<float> output);
+
+ private:
+  const size_t num_elem_;
+  const size_t mem_len_;
+  const float scaling_;
+  std::vector<float> memory_;
+  size_t mem_index_;
+};
+
+}  // namespace aec3
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_MOVING_AVERAGE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/moving_average_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,89 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/moving_average.h"
+
+#include "test/gtest.h"
+
+namespace webrtc {
+
+TEST(MovingAverage, Average) {
+  constexpr size_t num_elem = 4;
+  constexpr size_t mem_len = 3;
+  constexpr float e = 1e-6f;
+  aec3::MovingAverage ma(num_elem, mem_len);
+  std::array<float, num_elem> data1 = {1, 2, 3, 4};
+  std::array<float, num_elem> data2 = {5, 1, 9, 7};
+  std::array<float, num_elem> data3 = {3, 3, 5, 6};
+  std::array<float, num_elem> data4 = {8, 4, 2, 1};
+  std::array<float, num_elem> output;
+
+  ma.Average(data1, output);
+  EXPECT_NEAR(output[0], data1[0] / 3.0f, e);
+  EXPECT_NEAR(output[1], data1[1] / 3.0f, e);
+  EXPECT_NEAR(output[2], data1[2] / 3.0f, e);
+  EXPECT_NEAR(output[3], data1[3] / 3.0f, e);
+
+  ma.Average(data2, output);
+  EXPECT_NEAR(output[0], (data1[0] + data2[0]) / 3.0f, e);
+  EXPECT_NEAR(output[1], (data1[1] + data2[1]) / 3.0f, e);
+  EXPECT_NEAR(output[2], (data1[2] + data2[2]) / 3.0f, e);
+  EXPECT_NEAR(output[3], (data1[3] + data2[3]) / 3.0f, e);
+
+  ma.Average(data3, output);
+  EXPECT_NEAR(output[0], (data1[0] + data2[0] + data3[0]) / 3.0f, e);
+  EXPECT_NEAR(output[1], (data1[1] + data2[1] + data3[1]) / 3.0f, e);
+  EXPECT_NEAR(output[2], (data1[2] + data2[2] + data3[2]) / 3.0f, e);
+  EXPECT_NEAR(output[3], (data1[3] + data2[3] + data3[3]) / 3.0f, e);
+
+  ma.Average(data4, output);
+  EXPECT_NEAR(output[0], (data2[0] + data3[0] + data4[0]) / 3.0f, e);
+  EXPECT_NEAR(output[1], (data2[1] + data3[1] + data4[1]) / 3.0f, e);
+  EXPECT_NEAR(output[2], (data2[2] + data3[2] + data4[2]) / 3.0f, e);
+  EXPECT_NEAR(output[3], (data2[3] + data3[3] + data4[3]) / 3.0f, e);
+}
+
+TEST(MovingAverage, PassThrough) {
+  constexpr size_t num_elem = 4;
+  constexpr size_t mem_len = 1;
+  constexpr float e = 1e-6f;
+  aec3::MovingAverage ma(num_elem, mem_len);
+  std::array<float, num_elem> data1 = {1, 2, 3, 4};
+  std::array<float, num_elem> data2 = {5, 1, 9, 7};
+  std::array<float, num_elem> data3 = {3, 3, 5, 6};
+  std::array<float, num_elem> data4 = {8, 4, 2, 1};
+  std::array<float, num_elem> output;
+
+  ma.Average(data1, output);
+  EXPECT_NEAR(output[0], data1[0], e);
+  EXPECT_NEAR(output[1], data1[1], e);
+  EXPECT_NEAR(output[2], data1[2], e);
+  EXPECT_NEAR(output[3], data1[3], e);
+
+  ma.Average(data2, output);
+  EXPECT_NEAR(output[0], data2[0], e);
+  EXPECT_NEAR(output[1], data2[1], e);
+  EXPECT_NEAR(output[2], data2[2], e);
+  EXPECT_NEAR(output[3], data2[3], e);
+
+  ma.Average(data3, output);
+  EXPECT_NEAR(output[0], data3[0], e);
+  EXPECT_NEAR(output[1], data3[1], e);
+  EXPECT_NEAR(output[2], data3[2], e);
+  EXPECT_NEAR(output[3], data3[3], e);
+
+  ma.Average(data4, output);
+  EXPECT_NEAR(output[0], data4[0], e);
+  EXPECT_NEAR(output[1], data4[1], e);
+  EXPECT_NEAR(output[2], data4[2], e);
+  EXPECT_NEAR(output[3], data4[3], e);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/nearend_detector.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/nearend_detector.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/nearend_detector.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/nearend_detector.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_NEAREND_DETECTOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_NEAREND_DETECTOR_H_
+
+#include <vector>
+
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+
+namespace webrtc {
+// Class for selecting whether the suppressor is in the nearend or echo state.
+class NearendDetector {
+ public:
+  virtual ~NearendDetector() {}
+
+  // Returns whether the current state is the nearend state.
+  virtual bool IsNearendState() const = 0;
+
+  // Updates the state selection based on latest spectral estimates.
+  virtual void Update(
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+          nearend_spectrum,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+          residual_echo_spectrum,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+          comfort_noise_spectrum,
+      bool initial_state) = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_NEAREND_DETECTOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,175 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/refined_filter_update_gain.h"
+
+#include <algorithm>
+#include <functional>
+
+#include "modules/audio_processing/aec3/adaptive_fir_filter.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/echo_path_variability.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "modules/audio_processing/aec3/render_signal_analyzer.h"
+#include "modules/audio_processing/aec3/subtractor_output.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+constexpr float kHErrorInitial = 10000.f;
+constexpr int kPoorExcitationCounterInitial = 1000;
+
+}  // namespace
+
+int RefinedFilterUpdateGain::instance_count_ = 0;
+
+RefinedFilterUpdateGain::RefinedFilterUpdateGain(
+    const EchoCanceller3Config::Filter::RefinedConfiguration& config,
+    size_t config_change_duration_blocks)
+    : data_dumper_(
+          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
+      config_change_duration_blocks_(
+          static_cast<int>(config_change_duration_blocks)),
+      poor_excitation_counter_(kPoorExcitationCounterInitial) {
+  SetConfig(config, true);
+  H_error_.fill(kHErrorInitial);
+  RTC_DCHECK_LT(0, config_change_duration_blocks_);
+  one_by_config_change_duration_blocks_ = 1.f / config_change_duration_blocks_;
+}
+
+RefinedFilterUpdateGain::~RefinedFilterUpdateGain() {}
+
+void RefinedFilterUpdateGain::HandleEchoPathChange(
+    const EchoPathVariability& echo_path_variability) {
+  if (echo_path_variability.gain_change) {
+    // TODO(bugs.webrtc.org/9526) Handle gain changes.
+  }
+
+  if (echo_path_variability.delay_change !=
+      EchoPathVariability::DelayAdjustment::kNone) {
+    H_error_.fill(kHErrorInitial);
+  }
+
+  if (!echo_path_variability.gain_change) {
+    poor_excitation_counter_ = kPoorExcitationCounterInitial;
+    call_counter_ = 0;
+  }
+}
+
+void RefinedFilterUpdateGain::Compute(
+    const std::array<float, kFftLengthBy2Plus1>& render_power,
+    const RenderSignalAnalyzer& render_signal_analyzer,
+    const SubtractorOutput& subtractor_output,
+    rtc::ArrayView<const float> erl,
+    size_t size_partitions,
+    bool saturated_capture_signal,
+    bool disallow_leakage_diverged,
+    FftData* gain_fft) {
+  RTC_DCHECK(gain_fft);
+  // Introducing shorter notation to improve readability.
+  const FftData& E_refined = subtractor_output.E_refined;
+  const auto& E2_refined = subtractor_output.E2_refined;
+  const auto& E2_coarse = subtractor_output.E2_coarse;
+  FftData* G = gain_fft;
+  const auto& X2 = render_power;
+
+  ++call_counter_;
+
+  UpdateCurrentConfig();
+
+  if (render_signal_analyzer.PoorSignalExcitation()) {
+    poor_excitation_counter_ = 0;
+  }
+
+  // Do not update the filter if the render is not sufficiently excited.
+  if (++poor_excitation_counter_ < size_partitions ||
+      saturated_capture_signal || call_counter_ <= size_partitions) {
+    G->re.fill(0.f);
+    G->im.fill(0.f);
+  } else {
+    // Corresponds to WGN of power -39 dBFS.
+    std::array<float, kFftLengthBy2Plus1> mu;
+    // mu = H_error / (0.5* H_error* X2 + n * E2).
+    for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+      if (X2[k] >= current_config_.noise_gate) {
+        mu[k] = H_error_[k] /
+                (0.5f * H_error_[k] * X2[k] + size_partitions * E2_refined[k]);
+      } else {
+        mu[k] = 0.f;
+      }
+    }
+
+    // Avoid updating the filter close to narrow bands in the render signals.
+    render_signal_analyzer.MaskRegionsAroundNarrowBands(&mu);
+
+    // H_error = H_error - 0.5 * mu * X2 * H_error.
+    for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+      H_error_[k] -= 0.5f * mu[k] * X2[k] * H_error_[k];
+    }
+
+    // G = mu * E.
+    for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+      G->re[k] = mu[k] * E_refined.re[k];
+      G->im[k] = mu[k] * E_refined.im[k];
+    }
+  }
+
+  // H_error = H_error + factor * erl.
+  for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+    if (E2_refined[k] <= E2_coarse[k] || disallow_leakage_diverged) {
+      H_error_[k] += current_config_.leakage_converged * erl[k];
+    } else {
+      H_error_[k] += current_config_.leakage_diverged * erl[k];
+    }
+
+    H_error_[k] = std::max(H_error_[k], current_config_.error_floor);
+    H_error_[k] = std::min(H_error_[k], current_config_.error_ceil);
+  }
+
+  data_dumper_->DumpRaw("aec3_refined_gain_H_error", H_error_);
+}
+
+void RefinedFilterUpdateGain::UpdateCurrentConfig() {
+  RTC_DCHECK_GE(config_change_duration_blocks_, config_change_counter_);
+  if (config_change_counter_ > 0) {
+    if (--config_change_counter_ > 0) {
+      auto average = [](float from, float to, float from_weight) {
+        return from * from_weight + to * (1.f - from_weight);
+      };
+
+      float change_factor =
+          config_change_counter_ * one_by_config_change_duration_blocks_;
+
+      current_config_.leakage_converged =
+          average(old_target_config_.leakage_converged,
+                  target_config_.leakage_converged, change_factor);
+      current_config_.leakage_diverged =
+          average(old_target_config_.leakage_diverged,
+                  target_config_.leakage_diverged, change_factor);
+      current_config_.error_floor =
+          average(old_target_config_.error_floor, target_config_.error_floor,
+                  change_factor);
+      current_config_.error_ceil =
+          average(old_target_config_.error_ceil, target_config_.error_ceil,
+                  change_factor);
+      current_config_.noise_gate =
+          average(old_target_config_.noise_gate, target_config_.noise_gate,
+                  change_factor);
+    } else {
+      current_config_ = old_target_config_ = target_config_;
+    }
+  }
+  RTC_DCHECK_LE(0, config_change_counter_);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_REFINED_FILTER_UPDATE_GAIN_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_REFINED_FILTER_UPDATE_GAIN_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <memory>
+
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+
+namespace webrtc {
+
+class AdaptiveFirFilter;
+class ApmDataDumper;
+struct EchoPathVariability;
+struct FftData;
+class RenderSignalAnalyzer;
+struct SubtractorOutput;
+
+// Provides functionality for  computing the adaptive gain for the refined
+// filter.
+class RefinedFilterUpdateGain {
+ public:
+  RefinedFilterUpdateGain(
+      const EchoCanceller3Config::Filter::RefinedConfiguration& config,
+      size_t config_change_duration_blocks);
+  ~RefinedFilterUpdateGain();
+
+  RefinedFilterUpdateGain(const RefinedFilterUpdateGain&) = delete;
+  RefinedFilterUpdateGain& operator=(const RefinedFilterUpdateGain&) = delete;
+
+  // Takes action in the case of a known echo path change.
+  void HandleEchoPathChange(const EchoPathVariability& echo_path_variability);
+
+  // Computes the gain.
+  void Compute(const std::array<float, kFftLengthBy2Plus1>& render_power,
+               const RenderSignalAnalyzer& render_signal_analyzer,
+               const SubtractorOutput& subtractor_output,
+               rtc::ArrayView<const float> erl,
+               size_t size_partitions,
+               bool saturated_capture_signal,
+               bool disallow_leakage_diverged,
+               FftData* gain_fft);
+
+  // Sets a new config.
+  void SetConfig(
+      const EchoCanceller3Config::Filter::RefinedConfiguration& config,
+      bool immediate_effect) {
+    if (immediate_effect) {
+      old_target_config_ = current_config_ = target_config_ = config;
+      config_change_counter_ = 0;
+    } else {
+      old_target_config_ = current_config_;
+      target_config_ = config;
+      config_change_counter_ = config_change_duration_blocks_;
+    }
+  }
+
+ private:
+  static int instance_count_;
+  std::unique_ptr<ApmDataDumper> data_dumper_;
+  const int config_change_duration_blocks_;
+  float one_by_config_change_duration_blocks_;
+  EchoCanceller3Config::Filter::RefinedConfiguration current_config_;
+  EchoCanceller3Config::Filter::RefinedConfiguration target_config_;
+  EchoCanceller3Config::Filter::RefinedConfiguration old_target_config_;
+  std::array<float, kFftLengthBy2Plus1> H_error_;
+  size_t poor_excitation_counter_;
+  size_t call_counter_ = 0;
+  int config_change_counter_ = 0;
+
+  // Updates the current config towards the target config.
+  void UpdateCurrentConfig();
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_REFINED_FILTER_UPDATE_GAIN_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/refined_filter_update_gain_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,394 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/refined_filter_update_gain.h"
+
+#include <algorithm>
+#include <numeric>
+#include <string>
+#include <vector>
+
+#include "modules/audio_processing/aec3/adaptive_fir_filter.h"
+#include "modules/audio_processing/aec3/adaptive_fir_filter_erl.h"
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "modules/audio_processing/aec3/coarse_filter_update_gain.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/aec3/render_signal_analyzer.h"
+#include "modules/audio_processing/aec3/subtractor_output.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "modules/audio_processing/test/echo_canceller_test_tools.h"
+#include "rtc_base/numerics/safe_minmax.h"
+#include "rtc_base/random.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+// Method for performing the simulations needed to test the refined filter
+// update gain functionality.
+void RunFilterUpdateTest(int num_blocks_to_process,
+                         size_t delay_samples,
+                         int filter_length_blocks,
+                         const std::vector<int>& blocks_with_echo_path_changes,
+                         const std::vector<int>& blocks_with_saturation,
+                         bool use_silent_render_in_second_half,
+                         std::array<float, kBlockSize>* e_last_block,
+                         std::array<float, kBlockSize>* y_last_block,
+                         FftData* G_last_block) {
+  ApmDataDumper data_dumper(42);
+  Aec3Optimization optimization = DetectOptimization();
+  constexpr size_t kNumRenderChannels = 1;
+  constexpr size_t kNumCaptureChannels = 1;
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+
+  EchoCanceller3Config config;
+  config.filter.refined.length_blocks = filter_length_blocks;
+  config.filter.coarse.length_blocks = filter_length_blocks;
+  AdaptiveFirFilter refined_filter(
+      config.filter.refined.length_blocks, config.filter.refined.length_blocks,
+      config.filter.config_change_duration_blocks, kNumRenderChannels,
+      optimization, &data_dumper);
+  AdaptiveFirFilter coarse_filter(
+      config.filter.coarse.length_blocks, config.filter.coarse.length_blocks,
+      config.filter.config_change_duration_blocks, kNumRenderChannels,
+      optimization, &data_dumper);
+  std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>> H2(
+      kNumCaptureChannels, std::vector<std::array<float, kFftLengthBy2Plus1>>(
+                               refined_filter.max_filter_size_partitions(),
+                               std::array<float, kFftLengthBy2Plus1>()));
+  for (auto& H2_ch : H2) {
+    for (auto& H2_k : H2_ch) {
+      H2_k.fill(0.f);
+    }
+  }
+  std::vector<std::vector<float>> h(
+      kNumCaptureChannels,
+      std::vector<float>(
+          GetTimeDomainLength(refined_filter.max_filter_size_partitions()),
+          0.f));
+
+  Aec3Fft fft;
+  std::array<float, kBlockSize> x_old;
+  x_old.fill(0.f);
+  CoarseFilterUpdateGain coarse_gain(
+      config.filter.coarse, config.filter.config_change_duration_blocks);
+  RefinedFilterUpdateGain refined_gain(
+      config.filter.refined, config.filter.config_change_duration_blocks);
+  Random random_generator(42U);
+  std::vector<std::vector<std::vector<float>>> x(
+      kNumBands, std::vector<std::vector<float>>(
+                     kNumRenderChannels, std::vector<float>(kBlockSize, 0.f)));
+  std::vector<float> y(kBlockSize, 0.f);
+  config.delay.default_delay = 1;
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, kSampleRateHz, kNumRenderChannels));
+  AecState aec_state(config, kNumCaptureChannels);
+  RenderSignalAnalyzer render_signal_analyzer(config);
+  absl::optional<DelayEstimate> delay_estimate;
+  std::array<float, kFftLength> s_scratch;
+  std::array<float, kBlockSize> s;
+  FftData S;
+  FftData G;
+  std::vector<SubtractorOutput> output(kNumCaptureChannels);
+  for (auto& subtractor_output : output) {
+    subtractor_output.Reset();
+  }
+  FftData& E_refined = output[0].E_refined;
+  FftData E_coarse;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> Y2(kNumCaptureChannels);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> E2_refined(
+      kNumCaptureChannels);
+  std::array<float, kBlockSize>& e_refined = output[0].e_refined;
+  std::array<float, kBlockSize>& e_coarse = output[0].e_coarse;
+  for (auto& Y2_ch : Y2) {
+    Y2_ch.fill(0.f);
+  }
+
+  constexpr float kScale = 1.0f / kFftLengthBy2;
+
+  DelayBuffer<float> delay_buffer(delay_samples);
+  for (int k = 0; k < num_blocks_to_process; ++k) {
+    // Handle echo path changes.
+    if (std::find(blocks_with_echo_path_changes.begin(),
+                  blocks_with_echo_path_changes.end(),
+                  k) != blocks_with_echo_path_changes.end()) {
+      refined_filter.HandleEchoPathChange();
+    }
+
+    // Handle saturation.
+    const bool saturation =
+        std::find(blocks_with_saturation.begin(), blocks_with_saturation.end(),
+                  k) != blocks_with_saturation.end();
+
+    // Create the render signal.
+    if (use_silent_render_in_second_half && k > num_blocks_to_process / 2) {
+      for (size_t band = 0; band < x.size(); ++band) {
+        for (size_t channel = 0; channel < x[band].size(); ++channel) {
+          std::fill(x[band][channel].begin(), x[band][channel].end(), 0.f);
+        }
+      }
+    } else {
+      for (size_t band = 0; band < x.size(); ++band) {
+        for (size_t channel = 0; channel < x[band].size(); ++channel) {
+          RandomizeSampleVector(&random_generator, x[band][channel]);
+        }
+      }
+    }
+    delay_buffer.Delay(x[0][0], y);
+
+    render_delay_buffer->Insert(x);
+    if (k == 0) {
+      render_delay_buffer->Reset();
+    }
+    render_delay_buffer->PrepareCaptureProcessing();
+
+    render_signal_analyzer.Update(*render_delay_buffer->GetRenderBuffer(),
+                                  aec_state.MinDirectPathFilterDelay());
+
+    // Apply the refined filter.
+    refined_filter.Filter(*render_delay_buffer->GetRenderBuffer(), &S);
+    fft.Ifft(S, &s_scratch);
+    std::transform(y.begin(), y.end(), s_scratch.begin() + kFftLengthBy2,
+                   e_refined.begin(),
+                   [&](float a, float b) { return a - b * kScale; });
+    std::for_each(e_refined.begin(), e_refined.end(),
+                  [](float& a) { a = rtc::SafeClamp(a, -32768.f, 32767.f); });
+    fft.ZeroPaddedFft(e_refined, Aec3Fft::Window::kRectangular, &E_refined);
+    for (size_t k = 0; k < kBlockSize; ++k) {
+      s[k] = kScale * s_scratch[k + kFftLengthBy2];
+    }
+
+    // Apply the coarse filter.
+    coarse_filter.Filter(*render_delay_buffer->GetRenderBuffer(), &S);
+    fft.Ifft(S, &s_scratch);
+    std::transform(y.begin(), y.end(), s_scratch.begin() + kFftLengthBy2,
+                   e_coarse.begin(),
+                   [&](float a, float b) { return a - b * kScale; });
+    std::for_each(e_coarse.begin(), e_coarse.end(),
+                  [](float& a) { a = rtc::SafeClamp(a, -32768.f, 32767.f); });
+    fft.ZeroPaddedFft(e_coarse, Aec3Fft::Window::kRectangular, &E_coarse);
+
+    // Compute spectra for future use.
+    E_refined.Spectrum(Aec3Optimization::kNone, output[0].E2_refined);
+    E_coarse.Spectrum(Aec3Optimization::kNone, output[0].E2_coarse);
+
+    // Adapt the coarse filter.
+    std::array<float, kFftLengthBy2Plus1> render_power;
+    render_delay_buffer->GetRenderBuffer()->SpectralSum(
+        coarse_filter.SizePartitions(), &render_power);
+    coarse_gain.Compute(render_power, render_signal_analyzer, E_coarse,
+                        coarse_filter.SizePartitions(), saturation, &G);
+    coarse_filter.Adapt(*render_delay_buffer->GetRenderBuffer(), G);
+
+    // Adapt the refined filter
+    render_delay_buffer->GetRenderBuffer()->SpectralSum(
+        refined_filter.SizePartitions(), &render_power);
+
+    std::array<float, kFftLengthBy2Plus1> erl;
+    ComputeErl(optimization, H2[0], erl);
+    refined_gain.Compute(render_power, render_signal_analyzer, output[0], erl,
+                         refined_filter.SizePartitions(), saturation, false,
+                         &G);
+    refined_filter.Adapt(*render_delay_buffer->GetRenderBuffer(), G, &h[0]);
+
+    // Update the delay.
+    aec_state.HandleEchoPathChange(EchoPathVariability(
+        false, EchoPathVariability::DelayAdjustment::kNone, false));
+    refined_filter.ComputeFrequencyResponse(&H2[0]);
+    std::copy(output[0].E2_refined.begin(), output[0].E2_refined.end(),
+              E2_refined[0].begin());
+    aec_state.Update(delay_estimate, H2, h,
+                     *render_delay_buffer->GetRenderBuffer(), E2_refined, Y2,
+                     output);
+  }
+
+  std::copy(e_refined.begin(), e_refined.end(), e_last_block->begin());
+  std::copy(y.begin(), y.end(), y_last_block->begin());
+  std::copy(G.re.begin(), G.re.end(), G_last_block->re.begin());
+  std::copy(G.im.begin(), G.im.end(), G_last_block->im.begin());
+}
+
+std::string ProduceDebugText(int filter_length_blocks) {
+  rtc::StringBuilder ss;
+  ss << "Length: " << filter_length_blocks;
+  return ss.Release();
+}
+
+std::string ProduceDebugText(size_t delay, int filter_length_blocks) {
+  rtc::StringBuilder ss;
+  ss << "Delay: " << delay << ", ";
+  ss << ProduceDebugText(filter_length_blocks);
+  return ss.Release();
+}
+
+}  // namespace
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies that the check for non-null output gain parameter works.
+TEST(RefinedFilterUpdateGainDeathTest, NullDataOutputGain) {
+  ApmDataDumper data_dumper(42);
+  EchoCanceller3Config config;
+  RenderSignalAnalyzer analyzer(config);
+  SubtractorOutput output;
+  RefinedFilterUpdateGain gain(config.filter.refined,
+                               config.filter.config_change_duration_blocks);
+  std::array<float, kFftLengthBy2Plus1> render_power;
+  render_power.fill(0.f);
+  std::array<float, kFftLengthBy2Plus1> erl;
+  erl.fill(0.f);
+  EXPECT_DEATH(
+      gain.Compute(render_power, analyzer, output, erl,
+                   config.filter.refined.length_blocks, false, false, nullptr),
+      "");
+}
+
+#endif
+
+// Verifies that the gain formed causes the filter using it to converge.
+TEST(RefinedFilterUpdateGain, GainCausesFilterToConverge) {
+  std::vector<int> blocks_with_echo_path_changes;
+  std::vector<int> blocks_with_saturation;
+  for (size_t filter_length_blocks : {12, 20, 30}) {
+    for (size_t delay_samples : {0, 64, 150, 200, 301}) {
+      SCOPED_TRACE(ProduceDebugText(delay_samples, filter_length_blocks));
+
+      std::array<float, kBlockSize> e;
+      std::array<float, kBlockSize> y;
+      FftData G;
+
+      RunFilterUpdateTest(600, delay_samples, filter_length_blocks,
+                          blocks_with_echo_path_changes, blocks_with_saturation,
+                          false, &e, &y, &G);
+
+      // Verify that the refined filter is able to perform well.
+      // Use different criteria to take overmodelling into account.
+      if (filter_length_blocks == 12) {
+        EXPECT_LT(1000 * std::inner_product(e.begin(), e.end(), e.begin(), 0.f),
+                  std::inner_product(y.begin(), y.end(), y.begin(), 0.f));
+      } else {
+        EXPECT_LT(std::inner_product(e.begin(), e.end(), e.begin(), 0.f),
+                  std::inner_product(y.begin(), y.end(), y.begin(), 0.f));
+      }
+    }
+  }
+}
+
+// Verifies that the magnitude of the gain on average decreases for a
+// persistently exciting signal.
+TEST(RefinedFilterUpdateGain, DecreasingGain) {
+  std::vector<int> blocks_with_echo_path_changes;
+  std::vector<int> blocks_with_saturation;
+
+  std::array<float, kBlockSize> e;
+  std::array<float, kBlockSize> y;
+  FftData G_a;
+  FftData G_b;
+  FftData G_c;
+  std::array<float, kFftLengthBy2Plus1> G_a_power;
+  std::array<float, kFftLengthBy2Plus1> G_b_power;
+  std::array<float, kFftLengthBy2Plus1> G_c_power;
+
+  RunFilterUpdateTest(250, 65, 12, blocks_with_echo_path_changes,
+                      blocks_with_saturation, false, &e, &y, &G_a);
+  RunFilterUpdateTest(500, 65, 12, blocks_with_echo_path_changes,
+                      blocks_with_saturation, false, &e, &y, &G_b);
+  RunFilterUpdateTest(750, 65, 12, blocks_with_echo_path_changes,
+                      blocks_with_saturation, false, &e, &y, &G_c);
+
+  G_a.Spectrum(Aec3Optimization::kNone, G_a_power);
+  G_b.Spectrum(Aec3Optimization::kNone, G_b_power);
+  G_c.Spectrum(Aec3Optimization::kNone, G_c_power);
+
+  EXPECT_GT(std::accumulate(G_a_power.begin(), G_a_power.end(), 0.),
+            std::accumulate(G_b_power.begin(), G_b_power.end(), 0.));
+
+  EXPECT_GT(std::accumulate(G_b_power.begin(), G_b_power.end(), 0.),
+            std::accumulate(G_c_power.begin(), G_c_power.end(), 0.));
+}
+
+// Verifies that the gain is zero when there is saturation and that the internal
+// error estimates cause the gain to increase after a period of saturation.
+TEST(RefinedFilterUpdateGain, SaturationBehavior) {
+  std::vector<int> blocks_with_echo_path_changes;
+  std::vector<int> blocks_with_saturation;
+  for (int k = 99; k < 200; ++k) {
+    blocks_with_saturation.push_back(k);
+  }
+
+  for (size_t filter_length_blocks : {12, 20, 30}) {
+    SCOPED_TRACE(ProduceDebugText(filter_length_blocks));
+    std::array<float, kBlockSize> e;
+    std::array<float, kBlockSize> y;
+    FftData G_a;
+    FftData G_b;
+    FftData G_a_ref;
+    G_a_ref.re.fill(0.f);
+    G_a_ref.im.fill(0.f);
+
+    std::array<float, kFftLengthBy2Plus1> G_a_power;
+    std::array<float, kFftLengthBy2Plus1> G_b_power;
+
+    RunFilterUpdateTest(100, 65, filter_length_blocks,
+                        blocks_with_echo_path_changes, blocks_with_saturation,
+                        false, &e, &y, &G_a);
+
+    EXPECT_EQ(G_a_ref.re, G_a.re);
+    EXPECT_EQ(G_a_ref.im, G_a.im);
+
+    RunFilterUpdateTest(99, 65, filter_length_blocks,
+                        blocks_with_echo_path_changes, blocks_with_saturation,
+                        false, &e, &y, &G_a);
+    RunFilterUpdateTest(201, 65, filter_length_blocks,
+                        blocks_with_echo_path_changes, blocks_with_saturation,
+                        false, &e, &y, &G_b);
+
+    G_a.Spectrum(Aec3Optimization::kNone, G_a_power);
+    G_b.Spectrum(Aec3Optimization::kNone, G_b_power);
+
+    EXPECT_LT(std::accumulate(G_a_power.begin(), G_a_power.end(), 0.),
+              std::accumulate(G_b_power.begin(), G_b_power.end(), 0.));
+  }
+}
+
+// Verifies that the gain increases after an echo path change.
+// TODO(peah): Correct and reactivate this test.
+TEST(RefinedFilterUpdateGain, DISABLED_EchoPathChangeBehavior) {
+  for (size_t filter_length_blocks : {12, 20, 30}) {
+    SCOPED_TRACE(ProduceDebugText(filter_length_blocks));
+    std::vector<int> blocks_with_echo_path_changes;
+    std::vector<int> blocks_with_saturation;
+    blocks_with_echo_path_changes.push_back(99);
+
+    std::array<float, kBlockSize> e;
+    std::array<float, kBlockSize> y;
+    FftData G_a;
+    FftData G_b;
+    std::array<float, kFftLengthBy2Plus1> G_a_power;
+    std::array<float, kFftLengthBy2Plus1> G_b_power;
+
+    RunFilterUpdateTest(100, 65, filter_length_blocks,
+                        blocks_with_echo_path_changes, blocks_with_saturation,
+                        false, &e, &y, &G_a);
+    RunFilterUpdateTest(101, 65, filter_length_blocks,
+                        blocks_with_echo_path_changes, blocks_with_saturation,
+                        false, &e, &y, &G_b);
+
+    G_a.Spectrum(Aec3Optimization::kNone, G_a_power);
+    G_b.Spectrum(Aec3Optimization::kNone, G_b_power);
+
+    EXPECT_LT(std::accumulate(G_a_power.begin(), G_a_power.end(), 0.),
+              std::accumulate(G_b_power.begin(), G_b_power.end(), 0.));
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/render_buffer.h"
+
+#include <algorithm>
+#include <functional>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+RenderBuffer::RenderBuffer(BlockBuffer* block_buffer,
+                           SpectrumBuffer* spectrum_buffer,
+                           FftBuffer* fft_buffer)
+    : block_buffer_(block_buffer),
+      spectrum_buffer_(spectrum_buffer),
+      fft_buffer_(fft_buffer) {
+  RTC_DCHECK(block_buffer_);
+  RTC_DCHECK(spectrum_buffer_);
+  RTC_DCHECK(fft_buffer_);
+  RTC_DCHECK_EQ(block_buffer_->buffer.size(), fft_buffer_->buffer.size());
+  RTC_DCHECK_EQ(spectrum_buffer_->buffer.size(), fft_buffer_->buffer.size());
+  RTC_DCHECK_EQ(spectrum_buffer_->read, fft_buffer_->read);
+  RTC_DCHECK_EQ(spectrum_buffer_->write, fft_buffer_->write);
+}
+
+RenderBuffer::~RenderBuffer() = default;
+
+void RenderBuffer::SpectralSum(
+    size_t num_spectra,
+    std::array<float, kFftLengthBy2Plus1>* X2) const {
+  X2->fill(0.f);
+  int position = spectrum_buffer_->read;
+  for (size_t j = 0; j < num_spectra; ++j) {
+    for (const auto& channel_spectrum : spectrum_buffer_->buffer[position]) {
+      std::transform(X2->begin(), X2->end(), channel_spectrum.begin(),
+                     X2->begin(), std::plus<float>());
+    }
+    position = spectrum_buffer_->IncIndex(position);
+  }
+}
+
+void RenderBuffer::SpectralSums(
+    size_t num_spectra_shorter,
+    size_t num_spectra_longer,
+    std::array<float, kFftLengthBy2Plus1>* X2_shorter,
+    std::array<float, kFftLengthBy2Plus1>* X2_longer) const {
+  RTC_DCHECK_LE(num_spectra_shorter, num_spectra_longer);
+  X2_shorter->fill(0.f);
+  int position = spectrum_buffer_->read;
+  size_t j = 0;
+  for (; j < num_spectra_shorter; ++j) {
+    for (const auto& channel_spectrum : spectrum_buffer_->buffer[position]) {
+      std::transform(X2_shorter->begin(), X2_shorter->end(),
+                     channel_spectrum.begin(), X2_shorter->begin(),
+                     std::plus<float>());
+    }
+    position = spectrum_buffer_->IncIndex(position);
+  }
+  std::copy(X2_shorter->begin(), X2_shorter->end(), X2_longer->begin());
+  for (; j < num_spectra_longer; ++j) {
+    for (const auto& channel_spectrum : spectrum_buffer_->buffer[position]) {
+      std::transform(X2_longer->begin(), X2_longer->end(),
+                     channel_spectrum.begin(), X2_longer->begin(),
+                     std::plus<float>());
+    }
+    position = spectrum_buffer_->IncIndex(position);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,116 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/block_buffer.h"
+#include "modules/audio_processing/aec3/fft_buffer.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "modules/audio_processing/aec3/spectrum_buffer.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+// Provides a buffer of the render data for the echo remover.
+class RenderBuffer {
+ public:
+  RenderBuffer(BlockBuffer* block_buffer,
+               SpectrumBuffer* spectrum_buffer,
+               FftBuffer* fft_buffer);
+
+  RenderBuffer() = delete;
+  RenderBuffer(const RenderBuffer&) = delete;
+  RenderBuffer& operator=(const RenderBuffer&) = delete;
+
+  ~RenderBuffer();
+
+  // Get a block.
+  const std::vector<std::vector<std::vector<float>>>& Block(
+      int buffer_offset_blocks) const {
+    int position =
+        block_buffer_->OffsetIndex(block_buffer_->read, buffer_offset_blocks);
+    return block_buffer_->buffer[position];
+  }
+
+  // Get the spectrum from one of the FFTs in the buffer.
+  rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Spectrum(
+      int buffer_offset_ffts) const {
+    int position = spectrum_buffer_->OffsetIndex(spectrum_buffer_->read,
+                                                 buffer_offset_ffts);
+    return spectrum_buffer_->buffer[position];
+  }
+
+  // Returns the circular fft buffer.
+  rtc::ArrayView<const std::vector<FftData>> GetFftBuffer() const {
+    return fft_buffer_->buffer;
+  }
+
+  // Returns the current position in the circular buffer.
+  size_t Position() const {
+    RTC_DCHECK_EQ(spectrum_buffer_->read, fft_buffer_->read);
+    RTC_DCHECK_EQ(spectrum_buffer_->write, fft_buffer_->write);
+    return fft_buffer_->read;
+  }
+
+  // Returns the sum of the spectrums for a certain number of FFTs.
+  void SpectralSum(size_t num_spectra,
+                   std::array<float, kFftLengthBy2Plus1>* X2) const;
+
+  // Returns the sums of the spectrums for two numbers of FFTs.
+  void SpectralSums(size_t num_spectra_shorter,
+                    size_t num_spectra_longer,
+                    std::array<float, kFftLengthBy2Plus1>* X2_shorter,
+                    std::array<float, kFftLengthBy2Plus1>* X2_longer) const;
+
+  // Gets the recent activity seen in the render signal.
+  bool GetRenderActivity() const { return render_activity_; }
+
+  // Specifies the recent activity seen in the render signal.
+  void SetRenderActivity(bool activity) { render_activity_ = activity; }
+
+  // Returns the headroom between the write and the read positions in the
+  // buffer.
+  int Headroom() const {
+    // The write and read indices are decreased over time.
+    int headroom =
+        fft_buffer_->write < fft_buffer_->read
+            ? fft_buffer_->read - fft_buffer_->write
+            : fft_buffer_->size - fft_buffer_->write + fft_buffer_->read;
+
+    RTC_DCHECK_LE(0, headroom);
+    RTC_DCHECK_GE(fft_buffer_->size, headroom);
+
+    return headroom;
+  }
+
+  // Returns a reference to the spectrum buffer.
+  const SpectrumBuffer& GetSpectrumBuffer() const { return *spectrum_buffer_; }
+
+  // Returns a reference to the block buffer.
+  const BlockBuffer& GetBlockBuffer() const { return *block_buffer_; }
+
+ private:
+  const BlockBuffer* const block_buffer_;
+  const SpectrumBuffer* const spectrum_buffer_;
+  const FftBuffer* const fft_buffer_;
+  bool render_activity_ = false;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_RENDER_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_buffer_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/render_buffer.h"
+
+#include <algorithm>
+#include <functional>
+#include <vector>
+
+#include "test/gtest.h"
+
+namespace webrtc {
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies the check for non-null fft buffer.
+TEST(RenderBufferDeathTest, NullExternalFftBuffer) {
+  BlockBuffer block_buffer(10, 3, 1, kBlockSize);
+  SpectrumBuffer spectrum_buffer(10, 1);
+  EXPECT_DEATH(RenderBuffer(&block_buffer, &spectrum_buffer, nullptr), "");
+}
+
+// Verifies the check for non-null spectrum buffer.
+TEST(RenderBufferDeathTest, NullExternalSpectrumBuffer) {
+  FftBuffer fft_buffer(10, 1);
+  BlockBuffer block_buffer(10, 3, 1, kBlockSize);
+  EXPECT_DEATH(RenderBuffer(&block_buffer, nullptr, &fft_buffer), "");
+}
+
+// Verifies the check for non-null block buffer.
+TEST(RenderBufferDeathTest, NullExternalBlockBuffer) {
+  FftBuffer fft_buffer(10, 1);
+  SpectrumBuffer spectrum_buffer(10, 1);
+  EXPECT_DEATH(RenderBuffer(nullptr, &spectrum_buffer, &fft_buffer), "");
+}
+
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,523 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+
+#include <string.h>
+
+#include <algorithm>
+#include <cmath>
+#include <memory>
+#include <numeric>
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/aec3_fft.h"
+#include "modules/audio_processing/aec3/alignment_mixer.h"
+#include "modules/audio_processing/aec3/block_buffer.h"
+#include "modules/audio_processing/aec3/decimator.h"
+#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
+#include "modules/audio_processing/aec3/fft_buffer.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "modules/audio_processing/aec3/spectrum_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/field_trial.h"
+
+namespace webrtc {
+namespace {
+
+bool UpdateCaptureCallCounterOnSkippedBlocks() {
+  return !field_trial::IsEnabled(
+      "WebRTC-Aec3RenderBufferCallCounterUpdateKillSwitch");
+}
+
+class RenderDelayBufferImpl final : public RenderDelayBuffer {
+ public:
+  RenderDelayBufferImpl(const EchoCanceller3Config& config,
+                        int sample_rate_hz,
+                        size_t num_render_channels);
+  RenderDelayBufferImpl() = delete;
+  ~RenderDelayBufferImpl() override;
+
+  void Reset() override;
+  BufferingEvent Insert(
+      const std::vector<std::vector<std::vector<float>>>& block) override;
+  BufferingEvent PrepareCaptureProcessing() override;
+  void HandleSkippedCaptureProcessing() override;
+  bool AlignFromDelay(size_t delay) override;
+  void AlignFromExternalDelay() override;
+  size_t Delay() const override { return ComputeDelay(); }
+  size_t MaxDelay() const override {
+    return blocks_.buffer.size() - 1 - buffer_headroom_;
+  }
+  RenderBuffer* GetRenderBuffer() override { return &echo_remover_buffer_; }
+
+  const DownsampledRenderBuffer& GetDownsampledRenderBuffer() const override {
+    return low_rate_;
+  }
+
+  int BufferLatency() const;
+  void SetAudioBufferDelay(int delay_ms) override;
+  bool HasReceivedBufferDelay() override;
+
+ private:
+  static int instance_count_;
+  std::unique_ptr<ApmDataDumper> data_dumper_;
+  const Aec3Optimization optimization_;
+  const EchoCanceller3Config config_;
+  const bool update_capture_call_counter_on_skipped_blocks_;
+  const float render_linear_amplitude_gain_;
+  const rtc::LoggingSeverity delay_log_level_;
+  size_t down_sampling_factor_;
+  const int sub_block_size_;
+  BlockBuffer blocks_;
+  SpectrumBuffer spectra_;
+  FftBuffer ffts_;
+  absl::optional<size_t> delay_;
+  RenderBuffer echo_remover_buffer_;
+  DownsampledRenderBuffer low_rate_;
+  AlignmentMixer render_mixer_;
+  Decimator render_decimator_;
+  const Aec3Fft fft_;
+  std::vector<float> render_ds_;
+  const int buffer_headroom_;
+  bool last_call_was_render_ = false;
+  int num_api_calls_in_a_row_ = 0;
+  int max_observed_jitter_ = 1;
+  int64_t capture_call_counter_ = 0;
+  int64_t render_call_counter_ = 0;
+  bool render_activity_ = false;
+  size_t render_activity_counter_ = 0;
+  absl::optional<int> external_audio_buffer_delay_;
+  bool external_audio_buffer_delay_verified_after_reset_ = false;
+  size_t min_latency_blocks_ = 0;
+  size_t excess_render_detection_counter_ = 0;
+
+  int MapDelayToTotalDelay(size_t delay) const;
+  int ComputeDelay() const;
+  void ApplyTotalDelay(int delay);
+  void InsertBlock(const std::vector<std::vector<std::vector<float>>>& block,
+                   int previous_write);
+  bool DetectActiveRender(rtc::ArrayView<const float> x) const;
+  bool DetectExcessRenderBlocks();
+  void IncrementWriteIndices();
+  void IncrementLowRateReadIndices();
+  void IncrementReadIndices();
+  bool RenderOverrun();
+  bool RenderUnderrun();
+};
+
+int RenderDelayBufferImpl::instance_count_ = 0;
+
+RenderDelayBufferImpl::RenderDelayBufferImpl(const EchoCanceller3Config& config,
+                                             int sample_rate_hz,
+                                             size_t num_render_channels)
+    : data_dumper_(
+          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
+      optimization_(DetectOptimization()),
+      config_(config),
+      update_capture_call_counter_on_skipped_blocks_(
+          UpdateCaptureCallCounterOnSkippedBlocks()),
+      render_linear_amplitude_gain_(
+          std::pow(10.0f, config_.render_levels.render_power_gain_db / 20.f)),
+      delay_log_level_(config_.delay.log_warning_on_delay_changes
+                           ? rtc::LS_WARNING
+                           : rtc::LS_VERBOSE),
+      down_sampling_factor_(config.delay.down_sampling_factor),
+      sub_block_size_(static_cast<int>(down_sampling_factor_ > 0
+                                           ? kBlockSize / down_sampling_factor_
+                                           : kBlockSize)),
+      blocks_(GetRenderDelayBufferSize(down_sampling_factor_,
+                                       config.delay.num_filters,
+                                       config.filter.refined.length_blocks),
+              NumBandsForRate(sample_rate_hz),
+              num_render_channels,
+              kBlockSize),
+      spectra_(blocks_.buffer.size(), num_render_channels),
+      ffts_(blocks_.buffer.size(), num_render_channels),
+      delay_(config_.delay.default_delay),
+      echo_remover_buffer_(&blocks_, &spectra_, &ffts_),
+      low_rate_(GetDownSampledBufferSize(down_sampling_factor_,
+                                         config.delay.num_filters)),
+      render_mixer_(num_render_channels, config.delay.render_alignment_mixing),
+      render_decimator_(down_sampling_factor_),
+      fft_(),
+      render_ds_(sub_block_size_, 0.f),
+      buffer_headroom_(config.filter.refined.length_blocks) {
+  RTC_DCHECK_EQ(blocks_.buffer.size(), ffts_.buffer.size());
+  RTC_DCHECK_EQ(spectra_.buffer.size(), ffts_.buffer.size());
+  for (size_t i = 0; i < blocks_.buffer.size(); ++i) {
+    RTC_DCHECK_EQ(blocks_.buffer[i][0].size(), ffts_.buffer[i].size());
+    RTC_DCHECK_EQ(spectra_.buffer[i].size(), ffts_.buffer[i].size());
+  }
+
+  Reset();
+}
+
+RenderDelayBufferImpl::~RenderDelayBufferImpl() = default;
+
+// Resets the buffer delays and clears the reported delays.
+void RenderDelayBufferImpl::Reset() {
+  last_call_was_render_ = false;
+  num_api_calls_in_a_row_ = 1;
+  min_latency_blocks_ = 0;
+  excess_render_detection_counter_ = 0;
+
+  // Initialize the read index to one sub-block before the write index.
+  low_rate_.read = low_rate_.OffsetIndex(low_rate_.write, sub_block_size_);
+
+  // Check for any external audio buffer delay and whether it is feasible.
+  if (external_audio_buffer_delay_) {
+    const int headroom = 2;
+    size_t audio_buffer_delay_to_set;
+    // Minimum delay is 1 (like the low-rate render buffer).
+    if (*external_audio_buffer_delay_ <= headroom) {
+      audio_buffer_delay_to_set = 1;
+    } else {
+      audio_buffer_delay_to_set = *external_audio_buffer_delay_ - headroom;
+    }
+
+    audio_buffer_delay_to_set = std::min(audio_buffer_delay_to_set, MaxDelay());
+
+    // When an external delay estimate is available, use that delay as the
+    // initial render buffer delay.
+    ApplyTotalDelay(audio_buffer_delay_to_set);
+    delay_ = ComputeDelay();
+
+    external_audio_buffer_delay_verified_after_reset_ = false;
+  } else {
+    // If an external delay estimate is not available, use that delay as the
+    // initial delay. Set the render buffer delays to the default delay.
+    ApplyTotalDelay(config_.delay.default_delay);
+
+    // Unset the delays which are set by AlignFromDelay.
+    delay_ = absl::nullopt;
+  }
+}
+
+// Inserts a new block into the render buffers.
+RenderDelayBuffer::BufferingEvent RenderDelayBufferImpl::Insert(
+    const std::vector<std::vector<std::vector<float>>>& block) {
+  ++render_call_counter_;
+  if (delay_) {
+    if (!last_call_was_render_) {
+      last_call_was_render_ = true;
+      num_api_calls_in_a_row_ = 1;
+    } else {
+      if (++num_api_calls_in_a_row_ > max_observed_jitter_) {
+        max_observed_jitter_ = num_api_calls_in_a_row_;
+        RTC_LOG_V(delay_log_level_)
+            << "New max number api jitter observed at render block "
+            << render_call_counter_ << ":  " << num_api_calls_in_a_row_
+            << " blocks";
+      }
+    }
+  }
+
+  // Increase the write indices to where the new blocks should be written.
+  const int previous_write = blocks_.write;
+  IncrementWriteIndices();
+
+  // Allow overrun and do a reset when render overrun occurrs due to more render
+  // data being inserted than capture data is received.
+  BufferingEvent event =
+      RenderOverrun() ? BufferingEvent::kRenderOverrun : BufferingEvent::kNone;
+
+  // Detect and update render activity.
+  if (!render_activity_) {
+    render_activity_counter_ += DetectActiveRender(block[0][0]) ? 1 : 0;
+    render_activity_ = render_activity_counter_ >= 20;
+  }
+
+  // Insert the new render block into the specified position.
+  InsertBlock(block, previous_write);
+
+  if (event != BufferingEvent::kNone) {
+    Reset();
+  }
+
+  return event;
+}
+
+void RenderDelayBufferImpl::HandleSkippedCaptureProcessing() {
+  if (update_capture_call_counter_on_skipped_blocks_) {
+    ++capture_call_counter_;
+  }
+}
+
+// Prepares the render buffers for processing another capture block.
+RenderDelayBuffer::BufferingEvent
+RenderDelayBufferImpl::PrepareCaptureProcessing() {
+  RenderDelayBuffer::BufferingEvent event = BufferingEvent::kNone;
+  ++capture_call_counter_;
+
+  if (delay_) {
+    if (last_call_was_render_) {
+      last_call_was_render_ = false;
+      num_api_calls_in_a_row_ = 1;
+    } else {
+      if (++num_api_calls_in_a_row_ > max_observed_jitter_) {
+        max_observed_jitter_ = num_api_calls_in_a_row_;
+        RTC_LOG_V(delay_log_level_)
+            << "New max number api jitter observed at capture block "
+            << capture_call_counter_ << ":  " << num_api_calls_in_a_row_
+            << " blocks";
+      }
+    }
+  }
+
+  if (DetectExcessRenderBlocks()) {
+    // Too many render blocks compared to capture blocks. Risk of delay ending
+    // up before the filter used by the delay estimator.
+    RTC_LOG_V(delay_log_level_)
+        << "Excess render blocks detected at block " << capture_call_counter_;
+    Reset();
+    event = BufferingEvent::kRenderOverrun;
+  } else if (RenderUnderrun()) {
+    // Don't increment the read indices of the low rate buffer if there is a
+    // render underrun.
+    RTC_LOG_V(delay_log_level_)
+        << "Render buffer underrun detected at block " << capture_call_counter_;
+    IncrementReadIndices();
+    // Incrementing the buffer index without increasing the low rate buffer
+    // index means that the delay is reduced by one.
+    if (delay_ && *delay_ > 0)
+      delay_ = *delay_ - 1;
+    event = BufferingEvent::kRenderUnderrun;
+  } else {
+    // Increment the read indices in the render buffers to point to the most
+    // recent block to use in the capture processing.
+    IncrementLowRateReadIndices();
+    IncrementReadIndices();
+  }
+
+  echo_remover_buffer_.SetRenderActivity(render_activity_);
+  if (render_activity_) {
+    render_activity_counter_ = 0;
+    render_activity_ = false;
+  }
+
+  return event;
+}
+
+// Sets the delay and returns a bool indicating whether the delay was changed.
+bool RenderDelayBufferImpl::AlignFromDelay(size_t delay) {
+  RTC_DCHECK(!config_.delay.use_external_delay_estimator);
+  if (!external_audio_buffer_delay_verified_after_reset_ &&
+      external_audio_buffer_delay_ && delay_) {
+    int difference = static_cast<int>(delay) - static_cast<int>(*delay_);
+    RTC_LOG_V(delay_log_level_)
+        << "Mismatch between first estimated delay after reset "
+           "and externally reported audio buffer delay: "
+        << difference << " blocks";
+    external_audio_buffer_delay_verified_after_reset_ = true;
+  }
+  if (delay_ && *delay_ == delay) {
+    return false;
+  }
+  delay_ = delay;
+
+  // Compute the total delay and limit the delay to the allowed range.
+  int total_delay = MapDelayToTotalDelay(*delay_);
+  total_delay =
+      std::min(MaxDelay(), static_cast<size_t>(std::max(total_delay, 0)));
+
+  // Apply the delay to the buffers.
+  ApplyTotalDelay(total_delay);
+  return true;
+}
+
+void RenderDelayBufferImpl::SetAudioBufferDelay(int delay_ms) {
+  if (!external_audio_buffer_delay_) {
+    RTC_LOG_V(delay_log_level_)
+        << "Receiving a first externally reported audio buffer delay of "
+        << delay_ms << " ms.";
+  }
+
+  // Convert delay from milliseconds to blocks (rounded down).
+  external_audio_buffer_delay_ = delay_ms / 4;
+}
+
+bool RenderDelayBufferImpl::HasReceivedBufferDelay() {
+  return external_audio_buffer_delay_.has_value();
+}
+
+// Maps the externally computed delay to the delay used internally.
+int RenderDelayBufferImpl::MapDelayToTotalDelay(
+    size_t external_delay_blocks) const {
+  const int latency_blocks = BufferLatency();
+  return latency_blocks + static_cast<int>(external_delay_blocks);
+}
+
+// Returns the delay (not including call jitter).
+int RenderDelayBufferImpl::ComputeDelay() const {
+  const int latency_blocks = BufferLatency();
+  int internal_delay = spectra_.read >= spectra_.write
+                           ? spectra_.read - spectra_.write
+                           : spectra_.size + spectra_.read - spectra_.write;
+
+  return internal_delay - latency_blocks;
+}
+
+// Set the read indices according to the delay.
+void RenderDelayBufferImpl::ApplyTotalDelay(int delay) {
+  RTC_LOG_V(delay_log_level_)
+      << "Applying total delay of " << delay << " blocks.";
+  blocks_.read = blocks_.OffsetIndex(blocks_.write, -delay);
+  spectra_.read = spectra_.OffsetIndex(spectra_.write, delay);
+  ffts_.read = ffts_.OffsetIndex(ffts_.write, delay);
+}
+
+void RenderDelayBufferImpl::AlignFromExternalDelay() {
+  RTC_DCHECK(config_.delay.use_external_delay_estimator);
+  if (external_audio_buffer_delay_) {
+    const int64_t delay = render_call_counter_ - capture_call_counter_ +
+                          *external_audio_buffer_delay_;
+    const int64_t delay_with_headroom =
+        delay - config_.delay.delay_headroom_samples / kBlockSize;
+    ApplyTotalDelay(delay_with_headroom);
+  }
+}
+
+// Inserts a block into the render buffers.
+void RenderDelayBufferImpl::InsertBlock(
+    const std::vector<std::vector<std::vector<float>>>& block,
+    int previous_write) {
+  auto& b = blocks_;
+  auto& lr = low_rate_;
+  auto& ds = render_ds_;
+  auto& f = ffts_;
+  auto& s = spectra_;
+  const size_t num_bands = b.buffer[b.write].size();
+  const size_t num_render_channels = b.buffer[b.write][0].size();
+  RTC_DCHECK_EQ(block.size(), b.buffer[b.write].size());
+  for (size_t band = 0; band < num_bands; ++band) {
+    RTC_DCHECK_EQ(block[band].size(), num_render_channels);
+    RTC_DCHECK_EQ(b.buffer[b.write][band].size(), num_render_channels);
+    for (size_t ch = 0; ch < num_render_channels; ++ch) {
+      RTC_DCHECK_EQ(block[band][ch].size(), b.buffer[b.write][band][ch].size());
+      std::copy(block[band][ch].begin(), block[band][ch].end(),
+                b.buffer[b.write][band][ch].begin());
+    }
+  }
+
+  if (render_linear_amplitude_gain_ != 1.f) {
+    for (size_t band = 0; band < num_bands; ++band) {
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        for (size_t k = 0; k < 64; ++k) {
+          b.buffer[b.write][band][ch][k] *= render_linear_amplitude_gain_;
+        }
+      }
+    }
+  }
+
+  std::array<float, kBlockSize> downmixed_render;
+  render_mixer_.ProduceOutput(b.buffer[b.write][0], downmixed_render);
+  render_decimator_.Decimate(downmixed_render, ds);
+  data_dumper_->DumpWav("aec3_render_decimator_output", ds.size(), ds.data(),
+                        16000 / down_sampling_factor_, 1);
+  std::copy(ds.rbegin(), ds.rend(), lr.buffer.begin() + lr.write);
+  for (size_t channel = 0; channel < b.buffer[b.write][0].size(); ++channel) {
+    fft_.PaddedFft(b.buffer[b.write][0][channel],
+                   b.buffer[previous_write][0][channel],
+                   &f.buffer[f.write][channel]);
+    f.buffer[f.write][channel].Spectrum(optimization_,
+                                        s.buffer[s.write][channel]);
+  }
+}
+
+bool RenderDelayBufferImpl::DetectActiveRender(
+    rtc::ArrayView<const float> x) const {
+  const float x_energy = std::inner_product(x.begin(), x.end(), x.begin(), 0.f);
+  return x_energy > (config_.render_levels.active_render_limit *
+                     config_.render_levels.active_render_limit) *
+                        kFftLengthBy2;
+}
+
+bool RenderDelayBufferImpl::DetectExcessRenderBlocks() {
+  bool excess_render_detected = false;
+  const size_t latency_blocks = static_cast<size_t>(BufferLatency());
+  // The recently seen minimum latency in blocks. Should be close to 0.
+  min_latency_blocks_ = std::min(min_latency_blocks_, latency_blocks);
+  // After processing a configurable number of blocks the minimum latency is
+  // checked.
+  if (++excess_render_detection_counter_ >=
+      config_.buffering.excess_render_detection_interval_blocks) {
+    // If the minimum latency is not lower than the threshold there have been
+    // more render than capture frames.
+    excess_render_detected = min_latency_blocks_ >
+                             config_.buffering.max_allowed_excess_render_blocks;
+    // Reset the counter and let the minimum latency be the current latency.
+    min_latency_blocks_ = latency_blocks;
+    excess_render_detection_counter_ = 0;
+  }
+
+  data_dumper_->DumpRaw("aec3_latency_blocks", latency_blocks);
+  data_dumper_->DumpRaw("aec3_min_latency_blocks", min_latency_blocks_);
+  data_dumper_->DumpRaw("aec3_excess_render_detected", excess_render_detected);
+  return excess_render_detected;
+}
+
+// Computes the latency in the buffer (the number of unread sub-blocks).
+int RenderDelayBufferImpl::BufferLatency() const {
+  const DownsampledRenderBuffer& l = low_rate_;
+  int latency_samples = (l.buffer.size() + l.read - l.write) % l.buffer.size();
+  int latency_blocks = latency_samples / sub_block_size_;
+  return latency_blocks;
+}
+
+// Increments the write indices for the render buffers.
+void RenderDelayBufferImpl::IncrementWriteIndices() {
+  low_rate_.UpdateWriteIndex(-sub_block_size_);
+  blocks_.IncWriteIndex();
+  spectra_.DecWriteIndex();
+  ffts_.DecWriteIndex();
+}
+
+// Increments the read indices of the low rate render buffers.
+void RenderDelayBufferImpl::IncrementLowRateReadIndices() {
+  low_rate_.UpdateReadIndex(-sub_block_size_);
+}
+
+// Increments the read indices for the render buffers.
+void RenderDelayBufferImpl::IncrementReadIndices() {
+  if (blocks_.read != blocks_.write) {
+    blocks_.IncReadIndex();
+    spectra_.DecReadIndex();
+    ffts_.DecReadIndex();
+  }
+}
+
+// Checks for a render buffer overrun.
+bool RenderDelayBufferImpl::RenderOverrun() {
+  return low_rate_.read == low_rate_.write || blocks_.read == blocks_.write;
+}
+
+// Checks for a render buffer underrun.
+bool RenderDelayBufferImpl::RenderUnderrun() {
+  return low_rate_.read == low_rate_.write;
+}
+
+}  // namespace
+
+RenderDelayBuffer* RenderDelayBuffer::Create(const EchoCanceller3Config& config,
+                                             int sample_rate_hz,
+                                             size_t num_render_channels) {
+  return new RenderDelayBufferImpl(config, sample_rate_hz, num_render_channels);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,86 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_
+
+#include <stddef.h>
+
+#include <vector>
+
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+
+namespace webrtc {
+
+// Class for buffering the incoming render blocks such that these may be
+// extracted with a specified delay.
+class RenderDelayBuffer {
+ public:
+  enum class BufferingEvent {
+    kNone,
+    kRenderUnderrun,
+    kRenderOverrun,
+    kApiCallSkew
+  };
+
+  static RenderDelayBuffer* Create(const EchoCanceller3Config& config,
+                                   int sample_rate_hz,
+                                   size_t num_render_channels);
+  virtual ~RenderDelayBuffer() = default;
+
+  // Resets the buffer alignment.
+  virtual void Reset() = 0;
+
+  // Inserts a block into the buffer.
+  virtual BufferingEvent Insert(
+      const std::vector<std::vector<std::vector<float>>>& block) = 0;
+
+  // Updates the buffers one step based on the specified buffer delay. Returns
+  // an enum indicating whether there was a special event that occurred.
+  virtual BufferingEvent PrepareCaptureProcessing() = 0;
+
+  // Called on capture blocks where PrepareCaptureProcessing is not called.
+  virtual void HandleSkippedCaptureProcessing() = 0;
+
+  // Sets the buffer delay and returns a bool indicating whether the delay
+  // changed.
+  virtual bool AlignFromDelay(size_t delay) = 0;
+
+  // Sets the buffer delay from the most recently reported external delay.
+  virtual void AlignFromExternalDelay() = 0;
+
+  // Gets the buffer delay.
+  virtual size_t Delay() const = 0;
+
+  // Gets the buffer delay.
+  virtual size_t MaxDelay() const = 0;
+
+  // Returns the render buffer for the echo remover.
+  virtual RenderBuffer* GetRenderBuffer() = 0;
+
+  // Returns the downsampled render buffer.
+  virtual const DownsampledRenderBuffer& GetDownsampledRenderBuffer() const = 0;
+
+  // Returns the maximum non calusal offset that can occur in the delay buffer.
+  static int DelayEstimatorOffset(const EchoCanceller3Config& config);
+
+  // Provides an optional external estimate of the audio buffer delay.
+  virtual void SetAudioBufferDelay(int delay_ms) = 0;
+
+  // Returns whether an external delay estimate has been reported via
+  // SetAudioBufferDelay.
+  virtual bool HasReceivedBufferDelay() = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_buffer_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,156 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/random.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+std::string ProduceDebugText(int sample_rate_hz) {
+  rtc::StringBuilder ss;
+  ss << "Sample rate: " << sample_rate_hz;
+  return ss.Release();
+}
+
+}  // namespace
+
+// Verifies that the buffer overflow is correctly reported.
+TEST(RenderDelayBuffer, BufferOverflow) {
+  const EchoCanceller3Config config;
+  for (auto num_channels : {1, 2, 8}) {
+    for (auto rate : {16000, 32000, 48000}) {
+      SCOPED_TRACE(ProduceDebugText(rate));
+      std::unique_ptr<RenderDelayBuffer> delay_buffer(
+          RenderDelayBuffer::Create(config, rate, num_channels));
+      std::vector<std::vector<std::vector<float>>> block_to_insert(
+          NumBandsForRate(rate),
+          std::vector<std::vector<float>>(num_channels,
+                                          std::vector<float>(kBlockSize, 0.f)));
+      for (size_t k = 0; k < 10; ++k) {
+        EXPECT_EQ(RenderDelayBuffer::BufferingEvent::kNone,
+                  delay_buffer->Insert(block_to_insert));
+      }
+      bool overrun_occurred = false;
+      for (size_t k = 0; k < 1000; ++k) {
+        RenderDelayBuffer::BufferingEvent event =
+            delay_buffer->Insert(block_to_insert);
+        overrun_occurred =
+            overrun_occurred ||
+            RenderDelayBuffer::BufferingEvent::kRenderOverrun == event;
+      }
+
+      EXPECT_TRUE(overrun_occurred);
+    }
+  }
+}
+
+// Verifies that the check for available block works.
+TEST(RenderDelayBuffer, AvailableBlock) {
+  constexpr size_t kNumChannels = 1;
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+  std::unique_ptr<RenderDelayBuffer> delay_buffer(RenderDelayBuffer::Create(
+      EchoCanceller3Config(), kSampleRateHz, kNumChannels));
+  std::vector<std::vector<std::vector<float>>> input_block(
+      kNumBands, std::vector<std::vector<float>>(
+                     kNumChannels, std::vector<float>(kBlockSize, 1.f)));
+  EXPECT_EQ(RenderDelayBuffer::BufferingEvent::kNone,
+            delay_buffer->Insert(input_block));
+  delay_buffer->PrepareCaptureProcessing();
+}
+
+// Verifies the AlignFromDelay method.
+TEST(RenderDelayBuffer, AlignFromDelay) {
+  EchoCanceller3Config config;
+  std::unique_ptr<RenderDelayBuffer> delay_buffer(
+      RenderDelayBuffer::Create(config, 16000, 1));
+  ASSERT_TRUE(delay_buffer->Delay());
+  delay_buffer->Reset();
+  size_t initial_internal_delay = 0;
+  for (size_t delay = initial_internal_delay;
+       delay < initial_internal_delay + 20; ++delay) {
+    ASSERT_TRUE(delay_buffer->AlignFromDelay(delay));
+    EXPECT_EQ(delay, delay_buffer->Delay());
+  }
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies the check for feasible delay.
+// TODO(peah): Re-enable the test once the issue with memory leaks during DEATH
+// tests on test bots has been fixed.
+TEST(RenderDelayBufferDeathTest, DISABLED_WrongDelay) {
+  std::unique_ptr<RenderDelayBuffer> delay_buffer(
+      RenderDelayBuffer::Create(EchoCanceller3Config(), 48000, 1));
+  EXPECT_DEATH(delay_buffer->AlignFromDelay(21), "");
+}
+
+// Verifies the check for the number of bands in the inserted blocks.
+TEST(RenderDelayBufferDeathTest, WrongNumberOfBands) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t num_channels : {1, 2, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate));
+      std::unique_ptr<RenderDelayBuffer> delay_buffer(RenderDelayBuffer::Create(
+          EchoCanceller3Config(), rate, num_channels));
+      std::vector<std::vector<std::vector<float>>> block_to_insert(
+          NumBandsForRate(rate < 48000 ? rate + 16000 : 16000),
+          std::vector<std::vector<float>>(num_channels,
+                                          std::vector<float>(kBlockSize, 0.f)));
+      EXPECT_DEATH(delay_buffer->Insert(block_to_insert), "");
+    }
+  }
+}
+
+// Verifies the check for the number of channels in the inserted blocks.
+TEST(RenderDelayBufferDeathTest, WrongNumberOfChannels) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t num_channels : {1, 2, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate));
+      std::unique_ptr<RenderDelayBuffer> delay_buffer(RenderDelayBuffer::Create(
+          EchoCanceller3Config(), rate, num_channels));
+      std::vector<std::vector<std::vector<float>>> block_to_insert(
+          NumBandsForRate(rate),
+          std::vector<std::vector<float>>(num_channels + 1,
+                                          std::vector<float>(kBlockSize, 0.f)));
+      EXPECT_DEATH(delay_buffer->Insert(block_to_insert), "");
+    }
+  }
+}
+
+// Verifies the check of the length of the inserted blocks.
+TEST(RenderDelayBufferDeathTest, WrongBlockLength) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (size_t num_channels : {1, 2, 8}) {
+      SCOPED_TRACE(ProduceDebugText(rate));
+      std::unique_ptr<RenderDelayBuffer> delay_buffer(RenderDelayBuffer::Create(
+          EchoCanceller3Config(), rate, num_channels));
+      std::vector<std::vector<std::vector<float>>> block_to_insert(
+          NumBandsForRate(rate),
+          std::vector<std::vector<float>>(
+              num_channels, std::vector<float>(kBlockSize - 1, 0.f)));
+      EXPECT_DEATH(delay_buffer->Insert(block_to_insert), "");
+    }
+  }
+}
+
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,196 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "modules/audio_processing/aec3/render_delay_controller.h"
+
+#include <stddef.h>
+
+#include <algorithm>
+#include <memory>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/delay_estimate.h"
+#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
+#include "modules/audio_processing/aec3/echo_path_delay_estimator.h"
+#include "modules/audio_processing/aec3/render_delay_controller_metrics.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace {
+
+class RenderDelayControllerImpl final : public RenderDelayController {
+ public:
+  RenderDelayControllerImpl(const EchoCanceller3Config& config,
+                            int sample_rate_hz,
+                            size_t num_capture_channels);
+
+  RenderDelayControllerImpl() = delete;
+  RenderDelayControllerImpl(const RenderDelayControllerImpl&) = delete;
+  RenderDelayControllerImpl& operator=(const RenderDelayControllerImpl&) =
+      delete;
+
+  ~RenderDelayControllerImpl() override;
+  void Reset(bool reset_delay_confidence) override;
+  void LogRenderCall() override;
+  absl::optional<DelayEstimate> GetDelay(
+      const DownsampledRenderBuffer& render_buffer,
+      size_t render_delay_buffer_delay,
+      const std::vector<std::vector<float>>& capture) override;
+  bool HasClockdrift() const override;
+
+ private:
+  static int instance_count_;
+  std::unique_ptr<ApmDataDumper> data_dumper_;
+  const int hysteresis_limit_blocks_;
+  const int delay_headroom_samples_;
+  absl::optional<DelayEstimate> delay_;
+  EchoPathDelayEstimator delay_estimator_;
+  RenderDelayControllerMetrics metrics_;
+  absl::optional<DelayEstimate> delay_samples_;
+  size_t capture_call_counter_ = 0;
+  int delay_change_counter_ = 0;
+  DelayEstimate::Quality last_delay_estimate_quality_;
+};
+
+DelayEstimate ComputeBufferDelay(
+    const absl::optional<DelayEstimate>& current_delay,
+    int hysteresis_limit_blocks,
+    int delay_headroom_samples,
+    DelayEstimate estimated_delay) {
+  // Subtract delay headroom.
+  const int delay_with_headroom_samples = std::max(
+      static_cast<int>(estimated_delay.delay) - delay_headroom_samples, 0);
+
+  // Compute the buffer delay increase required to achieve the desired latency.
+  size_t new_delay_blocks = delay_with_headroom_samples >> kBlockSizeLog2;
+
+  // Add hysteresis.
+  if (current_delay) {
+    size_t current_delay_blocks = current_delay->delay;
+    if (new_delay_blocks > current_delay_blocks &&
+        new_delay_blocks <= current_delay_blocks + hysteresis_limit_blocks) {
+      new_delay_blocks = current_delay_blocks;
+    }
+  }
+
+  DelayEstimate new_delay = estimated_delay;
+  new_delay.delay = new_delay_blocks;
+  return new_delay;
+}
+
+int RenderDelayControllerImpl::instance_count_ = 0;
+
+RenderDelayControllerImpl::RenderDelayControllerImpl(
+    const EchoCanceller3Config& config,
+    int sample_rate_hz,
+    size_t num_capture_channels)
+    : data_dumper_(
+          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
+      hysteresis_limit_blocks_(
+          static_cast<int>(config.delay.hysteresis_limit_blocks)),
+      delay_headroom_samples_(config.delay.delay_headroom_samples),
+      delay_estimator_(data_dumper_.get(), config, num_capture_channels),
+      last_delay_estimate_quality_(DelayEstimate::Quality::kCoarse) {
+  RTC_DCHECK(ValidFullBandRate(sample_rate_hz));
+  delay_estimator_.LogDelayEstimationProperties(sample_rate_hz, 0);
+}
+
+RenderDelayControllerImpl::~RenderDelayControllerImpl() = default;
+
+void RenderDelayControllerImpl::Reset(bool reset_delay_confidence) {
+  delay_ = absl::nullopt;
+  delay_samples_ = absl::nullopt;
+  delay_estimator_.Reset(reset_delay_confidence);
+  delay_change_counter_ = 0;
+  if (reset_delay_confidence) {
+    last_delay_estimate_quality_ = DelayEstimate::Quality::kCoarse;
+  }
+}
+
+void RenderDelayControllerImpl::LogRenderCall() {}
+
+absl::optional<DelayEstimate> RenderDelayControllerImpl::GetDelay(
+    const DownsampledRenderBuffer& render_buffer,
+    size_t render_delay_buffer_delay,
+    const std::vector<std::vector<float>>& capture) {
+  RTC_DCHECK_EQ(kBlockSize, capture[0].size());
+  ++capture_call_counter_;
+
+  auto delay_samples = delay_estimator_.EstimateDelay(render_buffer, capture);
+
+  if (delay_samples) {
+    if (!delay_samples_ || delay_samples->delay != delay_samples_->delay) {
+      delay_change_counter_ = 0;
+    }
+    if (delay_samples_) {
+      delay_samples_->blocks_since_last_change =
+          delay_samples_->delay == delay_samples->delay
+              ? delay_samples_->blocks_since_last_change + 1
+              : 0;
+      delay_samples_->blocks_since_last_update = 0;
+      delay_samples_->delay = delay_samples->delay;
+      delay_samples_->quality = delay_samples->quality;
+    } else {
+      delay_samples_ = delay_samples;
+    }
+  } else {
+    if (delay_samples_) {
+      ++delay_samples_->blocks_since_last_change;
+      ++delay_samples_->blocks_since_last_update;
+    }
+  }
+
+  if (delay_change_counter_ < 2 * kNumBlocksPerSecond) {
+    ++delay_change_counter_;
+  }
+
+  if (delay_samples_) {
+    // Compute the render delay buffer delay.
+    const bool use_hysteresis =
+        last_delay_estimate_quality_ == DelayEstimate::Quality::kRefined &&
+        delay_samples_->quality == DelayEstimate::Quality::kRefined;
+    delay_ = ComputeBufferDelay(delay_,
+                                use_hysteresis ? hysteresis_limit_blocks_ : 0,
+                                delay_headroom_samples_, *delay_samples_);
+    last_delay_estimate_quality_ = delay_samples_->quality;
+  }
+
+  metrics_.Update(delay_samples_ ? absl::optional<size_t>(delay_samples_->delay)
+                                 : absl::nullopt,
+                  delay_ ? delay_->delay : 0, 0, delay_estimator_.Clockdrift());
+
+  data_dumper_->DumpRaw("aec3_render_delay_controller_delay",
+                        delay_samples ? delay_samples->delay : 0);
+  data_dumper_->DumpRaw("aec3_render_delay_controller_buffer_delay",
+                        delay_ ? delay_->delay : 0);
+
+  return delay_;
+}
+
+bool RenderDelayControllerImpl::HasClockdrift() const {
+  return delay_estimator_.Clockdrift() != ClockdriftDetector::Level::kNone;
+}
+
+}  // namespace
+
+RenderDelayController* RenderDelayController::Create(
+    const EchoCanceller3Config& config,
+    int sample_rate_hz,
+    size_t num_capture_channels) {
+  return new RenderDelayControllerImpl(config, sample_rate_hz,
+                                       num_capture_channels);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/delay_estimate.h"
+#include "modules/audio_processing/aec3/downsampled_render_buffer.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+
+namespace webrtc {
+
+// Class for aligning the render and capture signal using a RenderDelayBuffer.
+class RenderDelayController {
+ public:
+  static RenderDelayController* Create(const EchoCanceller3Config& config,
+                                       int sample_rate_hz,
+                                       size_t num_capture_channels);
+  virtual ~RenderDelayController() = default;
+
+  // Resets the delay controller. If the delay confidence is reset, the reset
+  // behavior is as if the call is restarted.
+  virtual void Reset(bool reset_delay_confidence) = 0;
+
+  // Logs a render call.
+  virtual void LogRenderCall() = 0;
+
+  // Aligns the render buffer content with the capture signal.
+  virtual absl::optional<DelayEstimate> GetDelay(
+      const DownsampledRenderBuffer& render_buffer,
+      size_t render_delay_buffer_delay,
+      const std::vector<std::vector<float>>& capture) = 0;
+
+  // Returns true if clockdrift has been detected.
+  virtual bool HasClockdrift() const = 0;
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,145 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/render_delay_controller_metrics.h"
+
+#include <algorithm>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/checks.h"
+#include "system_wrappers/include/metrics.h"
+
+namespace webrtc {
+
+namespace {
+
+enum class DelayReliabilityCategory {
+  kNone,
+  kPoor,
+  kMedium,
+  kGood,
+  kExcellent,
+  kNumCategories
+};
+enum class DelayChangesCategory {
+  kNone,
+  kFew,
+  kSeveral,
+  kMany,
+  kConstant,
+  kNumCategories
+};
+
+constexpr int kMaxSkewShiftCount = 20;
+
+}  // namespace
+
+RenderDelayControllerMetrics::RenderDelayControllerMetrics() = default;
+
+void RenderDelayControllerMetrics::Update(
+    absl::optional<size_t> delay_samples,
+    size_t buffer_delay_blocks,
+    absl::optional<int> skew_shift_blocks,
+    ClockdriftDetector::Level clockdrift) {
+  ++call_counter_;
+
+  if (!initial_update) {
+    size_t delay_blocks;
+    if (delay_samples) {
+      ++reliable_delay_estimate_counter_;
+      delay_blocks = (*delay_samples) / kBlockSize + 2;
+    } else {
+      delay_blocks = 0;
+    }
+
+    if (delay_blocks != delay_blocks_) {
+      ++delay_change_counter_;
+      delay_blocks_ = delay_blocks;
+    }
+
+    if (skew_shift_blocks) {
+      skew_shift_count_ = std::min(kMaxSkewShiftCount, skew_shift_count_);
+    }
+  } else if (++initial_call_counter_ == 5 * kNumBlocksPerSecond) {
+    initial_update = false;
+  }
+
+  if (call_counter_ == kMetricsReportingIntervalBlocks) {
+    int value_to_report = static_cast<int>(delay_blocks_);
+    value_to_report = std::min(124, value_to_report >> 1);
+    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.EchoCanceller.EchoPathDelay",
+                                value_to_report, 0, 124, 125);
+
+    value_to_report = static_cast<int>(buffer_delay_blocks + 2);
+    value_to_report = std::min(124, value_to_report >> 1);
+    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.EchoCanceller.BufferDelay",
+                                value_to_report, 0, 124, 125);
+
+    DelayReliabilityCategory delay_reliability;
+    if (reliable_delay_estimate_counter_ == 0) {
+      delay_reliability = DelayReliabilityCategory::kNone;
+    } else if (reliable_delay_estimate_counter_ > (call_counter_ >> 1)) {
+      delay_reliability = DelayReliabilityCategory::kExcellent;
+    } else if (reliable_delay_estimate_counter_ > 100) {
+      delay_reliability = DelayReliabilityCategory::kGood;
+    } else if (reliable_delay_estimate_counter_ > 10) {
+      delay_reliability = DelayReliabilityCategory::kMedium;
+    } else {
+      delay_reliability = DelayReliabilityCategory::kPoor;
+    }
+    RTC_HISTOGRAM_ENUMERATION(
+        "WebRTC.Audio.EchoCanceller.ReliableDelayEstimates",
+        static_cast<int>(delay_reliability),
+        static_cast<int>(DelayReliabilityCategory::kNumCategories));
+
+    DelayChangesCategory delay_changes;
+    if (delay_change_counter_ == 0) {
+      delay_changes = DelayChangesCategory::kNone;
+    } else if (delay_change_counter_ > 10) {
+      delay_changes = DelayChangesCategory::kConstant;
+    } else if (delay_change_counter_ > 5) {
+      delay_changes = DelayChangesCategory::kMany;
+    } else if (delay_change_counter_ > 2) {
+      delay_changes = DelayChangesCategory::kSeveral;
+    } else {
+      delay_changes = DelayChangesCategory::kFew;
+    }
+    RTC_HISTOGRAM_ENUMERATION(
+        "WebRTC.Audio.EchoCanceller.DelayChanges",
+        static_cast<int>(delay_changes),
+        static_cast<int>(DelayChangesCategory::kNumCategories));
+
+    RTC_HISTOGRAM_ENUMERATION(
+        "WebRTC.Audio.EchoCanceller.Clockdrift", static_cast<int>(clockdrift),
+        static_cast<int>(ClockdriftDetector::Level::kNumCategories));
+
+    metrics_reported_ = true;
+    call_counter_ = 0;
+    ResetMetrics();
+  } else {
+    metrics_reported_ = false;
+  }
+
+  if (!initial_update && ++skew_report_timer_ == 60 * kNumBlocksPerSecond) {
+    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.EchoCanceller.MaxSkewShiftCount",
+                                skew_shift_count_, 0, kMaxSkewShiftCount,
+                                kMaxSkewShiftCount + 1);
+
+    skew_shift_count_ = 0;
+    skew_report_timer_ = 0;
+  }
+}
+
+void RenderDelayControllerMetrics::ResetMetrics() {
+  delay_change_counter_ = 0;
+  reliable_delay_estimate_counter_ = 0;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_
+
+#include <stddef.h>
+
+#include "absl/types/optional.h"
+#include "modules/audio_processing/aec3/clockdrift_detector.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+// Handles the reporting of metrics for the render delay controller.
+class RenderDelayControllerMetrics {
+ public:
+  RenderDelayControllerMetrics();
+
+  // Updates the metric with new data.
+  void Update(absl::optional<size_t> delay_samples,
+              size_t buffer_delay_blocks,
+              absl::optional<int> skew_shift_blocks,
+              ClockdriftDetector::Level clockdrift);
+
+  // Returns true if the metrics have just been reported, otherwise false.
+  bool MetricsReported() { return metrics_reported_; }
+
+ private:
+  // Resets the metrics.
+  void ResetMetrics();
+
+  size_t delay_blocks_ = 0;
+  int reliable_delay_estimate_counter_ = 0;
+  int delay_change_counter_ = 0;
+  int call_counter_ = 0;
+  int skew_report_timer_ = 0;
+  int initial_call_counter_ = 0;
+  bool metrics_reported_ = false;
+  bool initial_update = true;
+  int skew_shift_count_ = 0;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(RenderDelayControllerMetrics);
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_RENDER_DELAY_CONTROLLER_METRICS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_metrics_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/render_delay_controller_metrics.h"
+
+#include "absl/types/optional.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+// Verify the general functionality of RenderDelayControllerMetrics.
+TEST(RenderDelayControllerMetrics, NormalUsage) {
+  RenderDelayControllerMetrics metrics;
+
+  for (int j = 0; j < 3; ++j) {
+    for (int k = 0; k < kMetricsReportingIntervalBlocks - 1; ++k) {
+      metrics.Update(absl::nullopt, 0, absl::nullopt,
+                     ClockdriftDetector::Level::kNone);
+      EXPECT_FALSE(metrics.MetricsReported());
+    }
+    metrics.Update(absl::nullopt, 0, absl::nullopt,
+                   ClockdriftDetector::Level::kNone);
+    EXPECT_TRUE(metrics.MetricsReported());
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_delay_controller_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,363 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/render_delay_controller.h"
+
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/block_processor.h"
+#include "modules/audio_processing/aec3/decimator.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "modules/audio_processing/test/echo_canceller_test_tools.h"
+#include "rtc_base/random.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+std::string ProduceDebugText(int sample_rate_hz) {
+  rtc::StringBuilder ss;
+  ss << "Sample rate: " << sample_rate_hz;
+  return ss.Release();
+}
+
+std::string ProduceDebugText(int sample_rate_hz,
+                             size_t delay,
+                             size_t num_render_channels,
+                             size_t num_capture_channels) {
+  rtc::StringBuilder ss;
+  ss << ProduceDebugText(sample_rate_hz) << ", Delay: " << delay
+     << ", Num render channels: " << num_render_channels
+     << ", Num capture channels: " << num_capture_channels;
+  return ss.Release();
+}
+
+constexpr size_t kDownSamplingFactors[] = {2, 4, 8};
+
+}  // namespace
+
+// Verifies the output of GetDelay when there are no AnalyzeRender calls.
+// TODO(bugs.webrtc.org/11161): Re-enable tests.
+TEST(RenderDelayController, DISABLED_NoRenderSignal) {
+  for (size_t num_render_channels : {1, 2, 8}) {
+    std::vector<std::vector<float>> block(1,
+                                          std::vector<float>(kBlockSize, 0.f));
+    EchoCanceller3Config config;
+    for (size_t num_matched_filters = 4; num_matched_filters <= 10;
+         num_matched_filters++) {
+      for (auto down_sampling_factor : kDownSamplingFactors) {
+        config.delay.down_sampling_factor = down_sampling_factor;
+        config.delay.num_filters = num_matched_filters;
+        for (auto rate : {16000, 32000, 48000}) {
+          SCOPED_TRACE(ProduceDebugText(rate));
+          std::unique_ptr<RenderDelayBuffer> delay_buffer(
+              RenderDelayBuffer::Create(config, rate, num_render_channels));
+          std::unique_ptr<RenderDelayController> delay_controller(
+              RenderDelayController::Create(config, rate,
+                                            /*num_capture_channels*/ 1));
+          for (size_t k = 0; k < 100; ++k) {
+            auto delay = delay_controller->GetDelay(
+                delay_buffer->GetDownsampledRenderBuffer(),
+                delay_buffer->Delay(), block);
+            EXPECT_FALSE(delay->delay);
+          }
+        }
+      }
+    }
+  }
+}
+
+// Verifies the basic API call sequence.
+// TODO(bugs.webrtc.org/11161): Re-enable tests.
+TEST(RenderDelayController, DISABLED_BasicApiCalls) {
+  for (size_t num_capture_channels : {1, 2, 4}) {
+    for (size_t num_render_channels : {1, 2, 8}) {
+      std::vector<std::vector<float>> capture_block(
+          num_capture_channels, std::vector<float>(kBlockSize, 0.f));
+      absl::optional<DelayEstimate> delay_blocks;
+      for (size_t num_matched_filters = 4; num_matched_filters <= 10;
+           num_matched_filters++) {
+        for (auto down_sampling_factor : kDownSamplingFactors) {
+          EchoCanceller3Config config;
+          config.delay.down_sampling_factor = down_sampling_factor;
+          config.delay.num_filters = num_matched_filters;
+          config.delay.capture_alignment_mixing.downmix = false;
+          config.delay.capture_alignment_mixing.adaptive_selection = false;
+
+          for (auto rate : {16000, 32000, 48000}) {
+            std::vector<std::vector<std::vector<float>>> render_block(
+                NumBandsForRate(rate),
+                std::vector<std::vector<float>>(
+                    num_render_channels, std::vector<float>(kBlockSize, 0.f)));
+            std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+                RenderDelayBuffer::Create(config, rate, num_render_channels));
+            std::unique_ptr<RenderDelayController> delay_controller(
+                RenderDelayController::Create(EchoCanceller3Config(), rate,
+                                              num_capture_channels));
+            for (size_t k = 0; k < 10; ++k) {
+              render_delay_buffer->Insert(render_block);
+              render_delay_buffer->PrepareCaptureProcessing();
+
+              delay_blocks = delay_controller->GetDelay(
+                  render_delay_buffer->GetDownsampledRenderBuffer(),
+                  render_delay_buffer->Delay(), capture_block);
+            }
+            EXPECT_TRUE(delay_blocks);
+            EXPECT_FALSE(delay_blocks->delay);
+          }
+        }
+      }
+    }
+  }
+}
+
+// Verifies that the RenderDelayController is able to align the signals for
+// simple timeshifts between the signals.
+// TODO(bugs.webrtc.org/11161): Re-enable tests.
+TEST(RenderDelayController, DISABLED_Alignment) {
+  Random random_generator(42U);
+  for (size_t num_capture_channels : {1, 2, 4}) {
+    std::vector<std::vector<float>> capture_block(
+        num_capture_channels, std::vector<float>(kBlockSize, 0.f));
+    for (size_t num_matched_filters = 4; num_matched_filters <= 10;
+         num_matched_filters++) {
+      for (auto down_sampling_factor : kDownSamplingFactors) {
+        EchoCanceller3Config config;
+        config.delay.down_sampling_factor = down_sampling_factor;
+        config.delay.num_filters = num_matched_filters;
+        config.delay.capture_alignment_mixing.downmix = false;
+        config.delay.capture_alignment_mixing.adaptive_selection = false;
+
+        for (size_t num_render_channels : {1, 2, 8}) {
+          for (auto rate : {16000, 32000, 48000}) {
+            std::vector<std::vector<std::vector<float>>> render_block(
+                NumBandsForRate(rate),
+                std::vector<std::vector<float>>(
+                    num_render_channels, std::vector<float>(kBlockSize, 0.f)));
+
+            for (size_t delay_samples : {15, 50, 150, 200, 800, 4000}) {
+              absl::optional<DelayEstimate> delay_blocks;
+              SCOPED_TRACE(ProduceDebugText(rate, delay_samples,
+                                            num_render_channels,
+                                            num_capture_channels));
+              std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+                  RenderDelayBuffer::Create(config, rate, num_render_channels));
+              std::unique_ptr<RenderDelayController> delay_controller(
+                  RenderDelayController::Create(config, rate,
+                                                num_capture_channels));
+              DelayBuffer<float> signal_delay_buffer(delay_samples);
+              for (size_t k = 0; k < (400 + delay_samples / kBlockSize); ++k) {
+                for (size_t band = 0; band < render_block.size(); ++band) {
+                  for (size_t channel = 0; channel < render_block[band].size();
+                       ++channel) {
+                    RandomizeSampleVector(&random_generator,
+                                          render_block[band][channel]);
+                  }
+                }
+                signal_delay_buffer.Delay(render_block[0][0], capture_block[0]);
+                render_delay_buffer->Insert(render_block);
+                render_delay_buffer->PrepareCaptureProcessing();
+                delay_blocks = delay_controller->GetDelay(
+                    render_delay_buffer->GetDownsampledRenderBuffer(),
+                    render_delay_buffer->Delay(), capture_block);
+              }
+              ASSERT_TRUE(!!delay_blocks);
+
+              constexpr int kDelayHeadroomBlocks = 1;
+              size_t expected_delay_blocks =
+                  std::max(0, static_cast<int>(delay_samples / kBlockSize) -
+                                  kDelayHeadroomBlocks);
+
+              EXPECT_EQ(expected_delay_blocks, delay_blocks->delay);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+// Verifies that the RenderDelayController is able to properly handle noncausal
+// delays.
+// TODO(bugs.webrtc.org/11161): Re-enable tests.
+TEST(RenderDelayController, DISABLED_NonCausalAlignment) {
+  Random random_generator(42U);
+  for (size_t num_capture_channels : {1, 2, 4}) {
+    for (size_t num_render_channels : {1, 2, 8}) {
+      for (size_t num_matched_filters = 4; num_matched_filters <= 10;
+           num_matched_filters++) {
+        for (auto down_sampling_factor : kDownSamplingFactors) {
+          EchoCanceller3Config config;
+          config.delay.down_sampling_factor = down_sampling_factor;
+          config.delay.num_filters = num_matched_filters;
+          config.delay.capture_alignment_mixing.downmix = false;
+          config.delay.capture_alignment_mixing.adaptive_selection = false;
+          for (auto rate : {16000, 32000, 48000}) {
+            std::vector<std::vector<std::vector<float>>> render_block(
+                NumBandsForRate(rate),
+                std::vector<std::vector<float>>(
+                    num_render_channels, std::vector<float>(kBlockSize, 0.f)));
+            std::vector<std::vector<std::vector<float>>> capture_block(
+                NumBandsForRate(rate),
+                std::vector<std::vector<float>>(
+                    num_capture_channels, std::vector<float>(kBlockSize, 0.f)));
+
+            for (int delay_samples : {-15, -50, -150, -200}) {
+              absl::optional<DelayEstimate> delay_blocks;
+              SCOPED_TRACE(ProduceDebugText(rate, -delay_samples,
+                                            num_render_channels,
+                                            num_capture_channels));
+              std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+                  RenderDelayBuffer::Create(config, rate, num_render_channels));
+              std::unique_ptr<RenderDelayController> delay_controller(
+                  RenderDelayController::Create(EchoCanceller3Config(), rate,
+                                                num_capture_channels));
+              DelayBuffer<float> signal_delay_buffer(-delay_samples);
+              for (int k = 0;
+                   k < (400 - delay_samples / static_cast<int>(kBlockSize));
+                   ++k) {
+                RandomizeSampleVector(&random_generator, capture_block[0][0]);
+                signal_delay_buffer.Delay(capture_block[0][0],
+                                          render_block[0][0]);
+                render_delay_buffer->Insert(render_block);
+                render_delay_buffer->PrepareCaptureProcessing();
+                delay_blocks = delay_controller->GetDelay(
+                    render_delay_buffer->GetDownsampledRenderBuffer(),
+                    render_delay_buffer->Delay(), capture_block[0]);
+              }
+
+              ASSERT_FALSE(delay_blocks);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+// Verifies that the RenderDelayController is able to align the signals for
+// simple timeshifts between the signals when there is jitter in the API calls.
+// TODO(bugs.webrtc.org/11161): Re-enable tests.
+TEST(RenderDelayController, DISABLED_AlignmentWithJitter) {
+  Random random_generator(42U);
+  for (size_t num_capture_channels : {1, 2, 4}) {
+    for (size_t num_render_channels : {1, 2, 8}) {
+      std::vector<std::vector<float>> capture_block(
+          num_capture_channels, std::vector<float>(kBlockSize, 0.f));
+      for (size_t num_matched_filters = 4; num_matched_filters <= 10;
+           num_matched_filters++) {
+        for (auto down_sampling_factor : kDownSamplingFactors) {
+          EchoCanceller3Config config;
+          config.delay.down_sampling_factor = down_sampling_factor;
+          config.delay.num_filters = num_matched_filters;
+          config.delay.capture_alignment_mixing.downmix = false;
+          config.delay.capture_alignment_mixing.adaptive_selection = false;
+
+          for (auto rate : {16000, 32000, 48000}) {
+            std::vector<std::vector<std::vector<float>>> render_block(
+                NumBandsForRate(rate),
+                std::vector<std::vector<float>>(
+                    num_render_channels, std::vector<float>(kBlockSize, 0.f)));
+            for (size_t delay_samples : {15, 50, 300, 800}) {
+              absl::optional<DelayEstimate> delay_blocks;
+              SCOPED_TRACE(ProduceDebugText(rate, delay_samples,
+                                            num_render_channels,
+                                            num_capture_channels));
+              std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+                  RenderDelayBuffer::Create(config, rate, num_render_channels));
+              std::unique_ptr<RenderDelayController> delay_controller(
+                  RenderDelayController::Create(config, rate,
+                                                num_capture_channels));
+              DelayBuffer<float> signal_delay_buffer(delay_samples);
+              constexpr size_t kMaxTestJitterBlocks = 26;
+              for (size_t j = 0; j < (1000 + delay_samples / kBlockSize) /
+                                             kMaxTestJitterBlocks +
+                                         1;
+                   ++j) {
+                std::vector<std::vector<std::vector<float>>>
+                    capture_block_buffer;
+                for (size_t k = 0; k < (kMaxTestJitterBlocks - 1); ++k) {
+                  RandomizeSampleVector(&random_generator, render_block[0][0]);
+                  signal_delay_buffer.Delay(render_block[0][0],
+                                            capture_block[0]);
+                  capture_block_buffer.push_back(capture_block);
+                  render_delay_buffer->Insert(render_block);
+                }
+                for (size_t k = 0; k < (kMaxTestJitterBlocks - 1); ++k) {
+                  render_delay_buffer->PrepareCaptureProcessing();
+                  delay_blocks = delay_controller->GetDelay(
+                      render_delay_buffer->GetDownsampledRenderBuffer(),
+                      render_delay_buffer->Delay(), capture_block_buffer[k]);
+                }
+              }
+
+              constexpr int kDelayHeadroomBlocks = 1;
+              size_t expected_delay_blocks =
+                  std::max(0, static_cast<int>(delay_samples / kBlockSize) -
+                                  kDelayHeadroomBlocks);
+              if (expected_delay_blocks < 2) {
+                expected_delay_blocks = 0;
+              }
+
+              ASSERT_TRUE(delay_blocks);
+              EXPECT_EQ(expected_delay_blocks, delay_blocks->delay);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies the check for the capture signal block size.
+TEST(RenderDelayControllerDeathTest, WrongCaptureSize) {
+  std::vector<std::vector<float>> block(
+      1, std::vector<float>(kBlockSize - 1, 0.f));
+  EchoCanceller3Config config;
+  for (auto rate : {16000, 32000, 48000}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+        RenderDelayBuffer::Create(config, rate, 1));
+    EXPECT_DEATH(
+        std::unique_ptr<RenderDelayController>(
+            RenderDelayController::Create(EchoCanceller3Config(), rate, 1))
+            ->GetDelay(render_delay_buffer->GetDownsampledRenderBuffer(),
+                       render_delay_buffer->Delay(), block),
+        "");
+  }
+}
+
+// Verifies the check for correct sample rate.
+// TODO(peah): Re-enable the test once the issue with memory leaks during DEATH
+// tests on test bots has been fixed.
+TEST(RenderDelayControllerDeathTest, DISABLED_WrongSampleRate) {
+  for (auto rate : {-1, 0, 8001, 16001}) {
+    SCOPED_TRACE(ProduceDebugText(rate));
+    EchoCanceller3Config config;
+    std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+        RenderDelayBuffer::Create(config, rate, 1));
+    EXPECT_DEATH(
+        std::unique_ptr<RenderDelayController>(
+            RenderDelayController::Create(EchoCanceller3Config(), rate, 1)),
+        "");
+  }
+}
+
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,156 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/render_signal_analyzer.h"
+
+#include <math.h>
+
+#include <algorithm>
+#include <utility>
+#include <vector>
+
+#include "api/array_view.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace {
+constexpr size_t kCounterThreshold = 5;
+
+// Identifies local bands with narrow characteristics.
+void IdentifySmallNarrowBandRegions(
+    const RenderBuffer& render_buffer,
+    const absl::optional<size_t>& delay_partitions,
+    std::array<size_t, kFftLengthBy2 - 1>* narrow_band_counters) {
+  RTC_DCHECK(narrow_band_counters);
+
+  if (!delay_partitions) {
+    narrow_band_counters->fill(0);
+    return;
+  }
+
+  std::array<size_t, kFftLengthBy2 - 1> channel_counters;
+  channel_counters.fill(0);
+  rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> X2 =
+      render_buffer.Spectrum(*delay_partitions);
+  for (size_t ch = 0; ch < X2.size(); ++ch) {
+    for (size_t k = 1; k < kFftLengthBy2; ++k) {
+      if (X2[ch][k] > 3 * std::max(X2[ch][k - 1], X2[ch][k + 1])) {
+        ++channel_counters[k - 1];
+      }
+    }
+  }
+  for (size_t k = 1; k < kFftLengthBy2; ++k) {
+    (*narrow_band_counters)[k - 1] =
+        channel_counters[k - 1] > 0 ? (*narrow_band_counters)[k - 1] + 1 : 0;
+  }
+}
+
+// Identifies whether the signal has a single strong narrow-band component.
+void IdentifyStrongNarrowBandComponent(const RenderBuffer& render_buffer,
+                                       int strong_peak_freeze_duration,
+                                       absl::optional<int>* narrow_peak_band,
+                                       size_t* narrow_peak_counter) {
+  RTC_DCHECK(narrow_peak_band);
+  RTC_DCHECK(narrow_peak_counter);
+  if (*narrow_peak_band &&
+      ++(*narrow_peak_counter) >
+          static_cast<size_t>(strong_peak_freeze_duration)) {
+    *narrow_peak_band = absl::nullopt;
+  }
+
+  const std::vector<std::vector<std::vector<float>>>& x_latest =
+      render_buffer.Block(0);
+  float max_peak_level = 0.f;
+  for (size_t channel = 0; channel < x_latest[0].size(); ++channel) {
+    rtc::ArrayView<const float, kFftLengthBy2Plus1> X2_latest =
+        render_buffer.Spectrum(0)[channel];
+
+    // Identify the spectral peak.
+    const int peak_bin =
+        static_cast<int>(std::max_element(X2_latest.begin(), X2_latest.end()) -
+                         X2_latest.begin());
+
+    // Compute the level around the peak.
+    float non_peak_power = 0.f;
+    for (int k = std::max(0, peak_bin - 14); k < peak_bin - 4; ++k) {
+      non_peak_power = std::max(X2_latest[k], non_peak_power);
+    }
+    for (int k = peak_bin + 5;
+         k < std::min(peak_bin + 15, static_cast<int>(kFftLengthBy2Plus1));
+         ++k) {
+      non_peak_power = std::max(X2_latest[k], non_peak_power);
+    }
+
+    // Assess the render signal strength.
+    auto result0 = std::minmax_element(x_latest[0][channel].begin(),
+                                       x_latest[0][channel].end());
+    float max_abs = std::max(fabs(*result0.first), fabs(*result0.second));
+
+    if (x_latest.size() > 1) {
+      const auto result1 = std::minmax_element(x_latest[1][channel].begin(),
+                                               x_latest[1][channel].end());
+      max_abs =
+          std::max(max_abs, static_cast<float>(std::max(
+                                fabs(*result1.first), fabs(*result1.second))));
+    }
+
+    // Detect whether the spectral peak has as strong narrowband nature.
+    const float peak_level = X2_latest[peak_bin];
+    if (peak_bin > 0 && max_abs > 100 && peak_level > 100 * non_peak_power) {
+      // Store the strongest peak across channels.
+      if (peak_level > max_peak_level) {
+        max_peak_level = peak_level;
+        *narrow_peak_band = peak_bin;
+        *narrow_peak_counter = 0;
+      }
+    }
+  }
+}
+
+}  // namespace
+
+RenderSignalAnalyzer::RenderSignalAnalyzer(const EchoCanceller3Config& config)
+    : strong_peak_freeze_duration_(config.filter.refined.length_blocks) {
+  narrow_band_counters_.fill(0);
+}
+RenderSignalAnalyzer::~RenderSignalAnalyzer() = default;
+
+void RenderSignalAnalyzer::Update(
+    const RenderBuffer& render_buffer,
+    const absl::optional<size_t>& delay_partitions) {
+  // Identify bands of narrow nature.
+  IdentifySmallNarrowBandRegions(render_buffer, delay_partitions,
+                                 &narrow_band_counters_);
+
+  // Identify the presence of a strong narrow band.
+  IdentifyStrongNarrowBandComponent(render_buffer, strong_peak_freeze_duration_,
+                                    &narrow_peak_band_, &narrow_peak_counter_);
+}
+
+void RenderSignalAnalyzer::MaskRegionsAroundNarrowBands(
+    std::array<float, kFftLengthBy2Plus1>* v) const {
+  RTC_DCHECK(v);
+
+  // Set v to zero around narrow band signal regions.
+  if (narrow_band_counters_[0] > kCounterThreshold) {
+    (*v)[1] = (*v)[0] = 0.f;
+  }
+  for (size_t k = 2; k < kFftLengthBy2 - 1; ++k) {
+    if (narrow_band_counters_[k - 1] > kCounterThreshold) {
+      (*v)[k - 2] = (*v)[k - 1] = (*v)[k] = (*v)[k + 1] = (*v)[k + 2] = 0.f;
+    }
+  }
+  if (narrow_band_counters_[kFftLengthBy2 - 2] > kCounterThreshold) {
+    (*v)[kFftLengthBy2] = (*v)[kFftLengthBy2 - 1] = 0.f;
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_
+
+#include <algorithm>
+#include <array>
+#include <cstddef>
+
+#include "absl/types/optional.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+// Provides functionality for analyzing the properties of the render signal.
+class RenderSignalAnalyzer {
+ public:
+  explicit RenderSignalAnalyzer(const EchoCanceller3Config& config);
+  ~RenderSignalAnalyzer();
+
+  // Updates the render signal analysis with the most recent render signal.
+  void Update(const RenderBuffer& render_buffer,
+              const absl::optional<size_t>& delay_partitions);
+
+  // Returns true if the render signal is poorly exciting.
+  bool PoorSignalExcitation() const {
+    RTC_DCHECK_LT(2, narrow_band_counters_.size());
+    return std::any_of(narrow_band_counters_.begin(),
+                       narrow_band_counters_.end(),
+                       [](size_t a) { return a > 10; });
+  }
+
+  // Zeros the array around regions with narrow bands signal characteristics.
+  void MaskRegionsAroundNarrowBands(
+      std::array<float, kFftLengthBy2Plus1>* v) const;
+
+  absl::optional<int> NarrowPeakBand() const { return narrow_peak_band_; }
+
+ private:
+  const int strong_peak_freeze_duration_;
+  std::array<size_t, kFftLengthBy2 - 1> narrow_band_counters_;
+  absl::optional<int> narrow_peak_band_;
+  size_t narrow_peak_counter_;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(RenderSignalAnalyzer);
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_RENDER_SIGNAL_ANALYZER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/render_signal_analyzer_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,175 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/render_signal_analyzer.h"
+
+#include <math.h>
+
+#include <array>
+#include <cmath>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/aec3_fft.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/test/echo_canceller_test_tools.h"
+#include "rtc_base/random.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+constexpr float kPi = 3.141592f;
+
+void ProduceSinusoidInNoise(int sample_rate_hz,
+                            size_t sinusoid_channel,
+                            float sinusoidal_frequency_hz,
+                            Random* random_generator,
+                            size_t* sample_counter,
+                            std::vector<std::vector<std::vector<float>>>* x) {
+  // Fill x with low-amplitude noise.
+  for (auto& band : *x) {
+    for (auto& channel : band) {
+      RandomizeSampleVector(random_generator, channel,
+                            /*amplitude=*/500.f);
+    }
+  }
+  // Produce a sinusoid of the specified frequency in the specified channel.
+  for (size_t k = *sample_counter, j = 0; k < (*sample_counter + kBlockSize);
+       ++k, ++j) {
+    (*x)[0][sinusoid_channel][j] +=
+        32000.f *
+        std::sin(2.f * kPi * sinusoidal_frequency_hz * k / sample_rate_hz);
+  }
+  *sample_counter = *sample_counter + kBlockSize;
+}
+
+void RunNarrowBandDetectionTest(size_t num_channels) {
+  RenderSignalAnalyzer analyzer(EchoCanceller3Config{});
+  Random random_generator(42U);
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+  std::vector<std::vector<std::vector<float>>> x(
+      kNumBands, std::vector<std::vector<float>>(
+                     num_channels, std::vector<float>(kBlockSize, 0.f)));
+  std::array<float, kBlockSize> x_old;
+  Aec3Fft fft;
+  EchoCanceller3Config config;
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, kSampleRateHz, num_channels));
+
+  std::array<float, kFftLengthBy2Plus1> mask;
+  x_old.fill(0.f);
+  constexpr int kSinusFrequencyBin = 32;
+
+  auto generate_sinusoid_test = [&](bool known_delay) {
+    size_t sample_counter = 0;
+    for (size_t k = 0; k < 100; ++k) {
+      ProduceSinusoidInNoise(16000, num_channels - 1,
+                             16000 / 2 * kSinusFrequencyBin / kFftLengthBy2,
+                             &random_generator, &sample_counter, &x);
+
+      render_delay_buffer->Insert(x);
+      if (k == 0) {
+        render_delay_buffer->Reset();
+      }
+      render_delay_buffer->PrepareCaptureProcessing();
+
+      analyzer.Update(*render_delay_buffer->GetRenderBuffer(),
+                      known_delay ? absl::optional<size_t>(0) : absl::nullopt);
+    }
+  };
+
+  generate_sinusoid_test(true);
+  mask.fill(1.f);
+  analyzer.MaskRegionsAroundNarrowBands(&mask);
+  for (int k = 0; k < static_cast<int>(mask.size()); ++k) {
+    EXPECT_EQ(abs(k - kSinusFrequencyBin) <= 2 ? 0.f : 1.f, mask[k]);
+  }
+  EXPECT_TRUE(analyzer.PoorSignalExcitation());
+  EXPECT_TRUE(static_cast<bool>(analyzer.NarrowPeakBand()));
+  EXPECT_EQ(*analyzer.NarrowPeakBand(), 32);
+
+  // Verify that no bands are detected as narrow when the delay is unknown.
+  generate_sinusoid_test(false);
+  mask.fill(1.f);
+  analyzer.MaskRegionsAroundNarrowBands(&mask);
+  std::for_each(mask.begin(), mask.end(), [](float a) { EXPECT_EQ(1.f, a); });
+  EXPECT_FALSE(analyzer.PoorSignalExcitation());
+}
+
+std::string ProduceDebugText(size_t num_channels) {
+  rtc::StringBuilder ss;
+  ss << "number of channels: " << num_channels;
+  return ss.Release();
+}
+}  // namespace
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+// Verifies that the check for non-null output parameter works.
+TEST(RenderSignalAnalyzerDeathTest, NullMaskOutput) {
+  RenderSignalAnalyzer analyzer(EchoCanceller3Config{});
+  EXPECT_DEATH(analyzer.MaskRegionsAroundNarrowBands(nullptr), "");
+}
+
+#endif
+
+// Verify that no narrow bands are detected in a Gaussian noise signal.
+TEST(RenderSignalAnalyzer, NoFalseDetectionOfNarrowBands) {
+  for (auto num_channels : {1, 2, 8}) {
+    SCOPED_TRACE(ProduceDebugText(num_channels));
+    RenderSignalAnalyzer analyzer(EchoCanceller3Config{});
+    Random random_generator(42U);
+    std::vector<std::vector<std::vector<float>>> x(
+        3, std::vector<std::vector<float>>(
+               num_channels, std::vector<float>(kBlockSize, 0.f)));
+    std::array<float, kBlockSize> x_old;
+    std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+        RenderDelayBuffer::Create(EchoCanceller3Config(), 48000, num_channels));
+    std::array<float, kFftLengthBy2Plus1> mask;
+    x_old.fill(0.f);
+
+    for (size_t k = 0; k < 100; ++k) {
+      for (auto& band : x) {
+        for (auto& channel : band) {
+          RandomizeSampleVector(&random_generator, channel);
+        }
+      }
+
+      render_delay_buffer->Insert(x);
+      if (k == 0) {
+        render_delay_buffer->Reset();
+      }
+      render_delay_buffer->PrepareCaptureProcessing();
+
+      analyzer.Update(*render_delay_buffer->GetRenderBuffer(),
+                      absl::optional<size_t>(0));
+    }
+
+    mask.fill(1.f);
+    analyzer.MaskRegionsAroundNarrowBands(&mask);
+    EXPECT_TRUE(std::all_of(mask.begin(), mask.end(),
+                            [](float a) { return a == 1.f; }));
+    EXPECT_FALSE(analyzer.PoorSignalExcitation());
+    EXPECT_FALSE(static_cast<bool>(analyzer.NarrowPeakBand()));
+  }
+}
+
+// Verify that a sinusoid signal is detected as narrow bands.
+TEST(RenderSignalAnalyzer, NarrowBandDetection) {
+  for (auto num_channels : {1, 2, 8}) {
+    SCOPED_TRACE(ProduceDebugText(num_channels));
+    RunNarrowBandDetectionTest(num_channels);
+  }
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,365 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/residual_echo_estimator.h"
+
+#include <stddef.h>
+
+#include <algorithm>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/reverb_model.h"
+#include "rtc_base/checks.h"
+#include "system_wrappers/include/field_trial.h"
+
+namespace webrtc {
+namespace {
+
+constexpr float kDefaultTransparentModeGain = 0.01f;
+
+float GetTransparentModeGain() {
+  return kDefaultTransparentModeGain;
+}
+
+float GetEarlyReflectionsDefaultModeGain(
+    const EchoCanceller3Config::EpStrength& config) {
+  if (field_trial::IsEnabled("WebRTC-Aec3UseLowEarlyReflectionsDefaultGain")) {
+    return 0.1f;
+  }
+  return config.default_gain;
+}
+
+float GetLateReflectionsDefaultModeGain(
+    const EchoCanceller3Config::EpStrength& config) {
+  if (field_trial::IsEnabled("WebRTC-Aec3UseLowLateReflectionsDefaultGain")) {
+    return 0.1f;
+  }
+  return config.default_gain;
+}
+
+bool UseErleOnsetCompensationInDominantNearend(
+    const EchoCanceller3Config::EpStrength& config) {
+  return config.erle_onset_compensation_in_dominant_nearend ||
+         field_trial::IsEnabled(
+             "WebRTC-Aec3UseErleOnsetCompensationInDominantNearend");
+}
+
+// Computes the indexes that will be used for computing spectral power over
+// the blocks surrounding the delay.
+void GetRenderIndexesToAnalyze(
+    const SpectrumBuffer& spectrum_buffer,
+    const EchoCanceller3Config::EchoModel& echo_model,
+    int filter_delay_blocks,
+    int* idx_start,
+    int* idx_stop) {
+  RTC_DCHECK(idx_start);
+  RTC_DCHECK(idx_stop);
+  size_t window_start;
+  size_t window_end;
+  window_start =
+      std::max(0, filter_delay_blocks -
+                      static_cast<int>(echo_model.render_pre_window_size));
+  window_end = filter_delay_blocks +
+               static_cast<int>(echo_model.render_post_window_size);
+  *idx_start = spectrum_buffer.OffsetIndex(spectrum_buffer.read, window_start);
+  *idx_stop = spectrum_buffer.OffsetIndex(spectrum_buffer.read, window_end + 1);
+}
+
+// Estimates the residual echo power based on the echo return loss enhancement
+// (ERLE) and the linear power estimate.
+void LinearEstimate(
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> S2_linear,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> erle,
+    rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> R2) {
+  RTC_DCHECK_EQ(S2_linear.size(), erle.size());
+  RTC_DCHECK_EQ(S2_linear.size(), R2.size());
+
+  const size_t num_capture_channels = R2.size();
+  for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+    for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+      RTC_DCHECK_LT(0.f, erle[ch][k]);
+      R2[ch][k] = S2_linear[ch][k] / erle[ch][k];
+    }
+  }
+}
+
+// Estimates the residual echo power based on the estimate of the echo path
+// gain.
+void NonLinearEstimate(
+    float echo_path_gain,
+    const std::array<float, kFftLengthBy2Plus1>& X2,
+    rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> R2) {
+  const size_t num_capture_channels = R2.size();
+  for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+    for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+      R2[ch][k] = X2[k] * echo_path_gain;
+    }
+  }
+}
+
+// Applies a soft noise gate to the echo generating power.
+void ApplyNoiseGate(const EchoCanceller3Config::EchoModel& config,
+                    rtc::ArrayView<float, kFftLengthBy2Plus1> X2) {
+  for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+    if (config.noise_gate_power > X2[k]) {
+      X2[k] = std::max(0.f, X2[k] - config.noise_gate_slope *
+                                        (config.noise_gate_power - X2[k]));
+    }
+  }
+}
+
+// Estimates the echo generating signal power as gated maximal power over a
+// time window.
+void EchoGeneratingPower(size_t num_render_channels,
+                         const SpectrumBuffer& spectrum_buffer,
+                         const EchoCanceller3Config::EchoModel& echo_model,
+                         int filter_delay_blocks,
+                         rtc::ArrayView<float, kFftLengthBy2Plus1> X2) {
+  int idx_stop;
+  int idx_start;
+  GetRenderIndexesToAnalyze(spectrum_buffer, echo_model, filter_delay_blocks,
+                            &idx_start, &idx_stop);
+
+  std::fill(X2.begin(), X2.end(), 0.f);
+  if (num_render_channels == 1) {
+    for (int k = idx_start; k != idx_stop; k = spectrum_buffer.IncIndex(k)) {
+      for (size_t j = 0; j < kFftLengthBy2Plus1; ++j) {
+        X2[j] = std::max(X2[j], spectrum_buffer.buffer[k][/*channel=*/0][j]);
+      }
+    }
+  } else {
+    for (int k = idx_start; k != idx_stop; k = spectrum_buffer.IncIndex(k)) {
+      std::array<float, kFftLengthBy2Plus1> render_power;
+      render_power.fill(0.f);
+      for (size_t ch = 0; ch < num_render_channels; ++ch) {
+        const auto& channel_power = spectrum_buffer.buffer[k][ch];
+        for (size_t j = 0; j < kFftLengthBy2Plus1; ++j) {
+          render_power[j] += channel_power[j];
+        }
+      }
+      for (size_t j = 0; j < kFftLengthBy2Plus1; ++j) {
+        X2[j] = std::max(X2[j], render_power[j]);
+      }
+    }
+  }
+}
+
+}  // namespace
+
+ResidualEchoEstimator::ResidualEchoEstimator(const EchoCanceller3Config& config,
+                                             size_t num_render_channels)
+    : config_(config),
+      num_render_channels_(num_render_channels),
+      early_reflections_transparent_mode_gain_(GetTransparentModeGain()),
+      late_reflections_transparent_mode_gain_(GetTransparentModeGain()),
+      early_reflections_general_gain_(
+          GetEarlyReflectionsDefaultModeGain(config_.ep_strength)),
+      late_reflections_general_gain_(
+          GetLateReflectionsDefaultModeGain(config_.ep_strength)),
+      erle_onset_compensation_in_dominant_nearend_(
+          UseErleOnsetCompensationInDominantNearend(config_.ep_strength)) {
+  Reset();
+}
+
+ResidualEchoEstimator::~ResidualEchoEstimator() = default;
+
+void ResidualEchoEstimator::Estimate(
+    const AecState& aec_state,
+    const RenderBuffer& render_buffer,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> S2_linear,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+    bool dominant_nearend,
+    rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> R2) {
+  RTC_DCHECK_EQ(R2.size(), Y2.size());
+  RTC_DCHECK_EQ(R2.size(), S2_linear.size());
+
+  const size_t num_capture_channels = R2.size();
+
+  // Estimate the power of the stationary noise in the render signal.
+  UpdateRenderNoisePower(render_buffer);
+
+  // Estimate the residual echo power.
+  if (aec_state.UsableLinearEstimate()) {
+    // When there is saturated echo, assume the same spectral content as is
+    // present in the microphone signal.
+    if (aec_state.SaturatedEcho()) {
+      for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+        std::copy(Y2[ch].begin(), Y2[ch].end(), R2[ch].begin());
+      }
+    } else {
+      const bool onset_compensated =
+          erle_onset_compensation_in_dominant_nearend_ || !dominant_nearend;
+      LinearEstimate(S2_linear, aec_state.Erle(onset_compensated), R2);
+    }
+
+    AddReverb(ReverbType::kLinear, aec_state, render_buffer, R2);
+  } else {
+    const float echo_path_gain =
+        GetEchoPathGain(aec_state, /*gain_for_early_reflections=*/true);
+
+    // When there is saturated echo, assume the same spectral content as is
+    // present in the microphone signal.
+    if (aec_state.SaturatedEcho()) {
+      for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+        std::copy(Y2[ch].begin(), Y2[ch].end(), R2[ch].begin());
+      }
+    } else {
+      // Estimate the echo generating signal power.
+      std::array<float, kFftLengthBy2Plus1> X2;
+      EchoGeneratingPower(num_render_channels_,
+                          render_buffer.GetSpectrumBuffer(), config_.echo_model,
+                          aec_state.MinDirectPathFilterDelay(), X2);
+      if (!aec_state.UseStationarityProperties()) {
+        ApplyNoiseGate(config_.echo_model, X2);
+      }
+
+      // Subtract the stationary noise power to avoid stationary noise causing
+      // excessive echo suppression.
+      for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+        X2[k] -= config_.echo_model.stationary_gate_slope * X2_noise_floor_[k];
+        X2[k] = std::max(0.f, X2[k]);
+      }
+
+      NonLinearEstimate(echo_path_gain, X2, R2);
+    }
+
+    if (config_.echo_model.model_reverb_in_nonlinear_mode &&
+        !aec_state.TransparentModeActive()) {
+      AddReverb(ReverbType::kNonLinear, aec_state, render_buffer, R2);
+    }
+  }
+
+  if (aec_state.UseStationarityProperties()) {
+    // Scale the echo according to echo audibility.
+    std::array<float, kFftLengthBy2Plus1> residual_scaling;
+    aec_state.GetResidualEchoScaling(residual_scaling);
+    for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+      for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+        R2[ch][k] *= residual_scaling[k];
+      }
+    }
+  }
+}
+
+void ResidualEchoEstimator::Reset() {
+  echo_reverb_.Reset();
+  X2_noise_floor_counter_.fill(config_.echo_model.noise_floor_hold);
+  X2_noise_floor_.fill(config_.echo_model.min_noise_floor_power);
+}
+
+void ResidualEchoEstimator::UpdateRenderNoisePower(
+    const RenderBuffer& render_buffer) {
+  std::array<float, kFftLengthBy2Plus1> render_power_data;
+  rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> X2 =
+      render_buffer.Spectrum(0);
+  rtc::ArrayView<const float, kFftLengthBy2Plus1> render_power =
+      X2[/*channel=*/0];
+  if (num_render_channels_ > 1) {
+    render_power_data.fill(0.f);
+    for (size_t ch = 0; ch < num_render_channels_; ++ch) {
+      const auto& channel_power = X2[ch];
+      for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+        render_power_data[k] += channel_power[k];
+      }
+    }
+    render_power = render_power_data;
+  }
+
+  // Estimate the stationary noise power in a minimum statistics manner.
+  for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+    // Decrease rapidly.
+    if (render_power[k] < X2_noise_floor_[k]) {
+      X2_noise_floor_[k] = render_power[k];
+      X2_noise_floor_counter_[k] = 0;
+    } else {
+      // Increase in a delayed, leaky manner.
+      if (X2_noise_floor_counter_[k] >=
+          static_cast<int>(config_.echo_model.noise_floor_hold)) {
+        X2_noise_floor_[k] = std::max(X2_noise_floor_[k] * 1.1f,
+                                      config_.echo_model.min_noise_floor_power);
+      } else {
+        ++X2_noise_floor_counter_[k];
+      }
+    }
+  }
+}
+
+// Adds the estimated power of the reverb to the residual echo power.
+void ResidualEchoEstimator::AddReverb(
+    ReverbType reverb_type,
+    const AecState& aec_state,
+    const RenderBuffer& render_buffer,
+    rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> R2) {
+  const size_t num_capture_channels = R2.size();
+
+  // Choose reverb partition based on what type of echo power model is used.
+  const size_t first_reverb_partition =
+      reverb_type == ReverbType::kLinear
+          ? aec_state.FilterLengthBlocks() + 1
+          : aec_state.MinDirectPathFilterDelay() + 1;
+
+  // Compute render power for the reverb.
+  std::array<float, kFftLengthBy2Plus1> render_power_data;
+  rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> X2 =
+      render_buffer.Spectrum(first_reverb_partition);
+  rtc::ArrayView<const float, kFftLengthBy2Plus1> render_power =
+      X2[/*channel=*/0];
+  if (num_render_channels_ > 1) {
+    render_power_data.fill(0.f);
+    for (size_t ch = 0; ch < num_render_channels_; ++ch) {
+      const auto& channel_power = X2[ch];
+      for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+        render_power_data[k] += channel_power[k];
+      }
+    }
+    render_power = render_power_data;
+  }
+
+  // Update the reverb estimate.
+  if (reverb_type == ReverbType::kLinear) {
+    echo_reverb_.UpdateReverb(render_power,
+                              aec_state.GetReverbFrequencyResponse(),
+                              aec_state.ReverbDecay());
+  } else {
+    const float echo_path_gain =
+        GetEchoPathGain(aec_state, /*gain_for_early_reflections=*/false);
+    echo_reverb_.UpdateReverbNoFreqShaping(render_power, echo_path_gain,
+                                           aec_state.ReverbDecay());
+  }
+
+  // Add the reverb power.
+  rtc::ArrayView<const float, kFftLengthBy2Plus1> reverb_power =
+      echo_reverb_.reverb();
+  for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+    for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+      R2[ch][k] += reverb_power[k];
+    }
+  }
+}
+
+// Chooses the echo path gain to use.
+float ResidualEchoEstimator::GetEchoPathGain(
+    const AecState& aec_state,
+    bool gain_for_early_reflections) const {
+  float gain_amplitude;
+  if (aec_state.TransparentModeActive()) {
+    gain_amplitude = gain_for_early_reflections
+                         ? early_reflections_transparent_mode_gain_
+                         : late_reflections_transparent_mode_gain_;
+  } else {
+    gain_amplitude = gain_for_early_reflections
+                         ? early_reflections_general_gain_
+                         : late_reflections_general_gain_;
+  }
+  return gain_amplitude * gain_amplitude;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_
+
+#include <array>
+#include <memory>
+
+#include "absl/types/optional.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "modules/audio_processing/aec3/reverb_model.h"
+#include "modules/audio_processing/aec3/spectrum_buffer.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+class ResidualEchoEstimator {
+ public:
+  ResidualEchoEstimator(const EchoCanceller3Config& config,
+                        size_t num_render_channels);
+  ~ResidualEchoEstimator();
+
+  ResidualEchoEstimator(const ResidualEchoEstimator&) = delete;
+  ResidualEchoEstimator& operator=(const ResidualEchoEstimator&) = delete;
+
+  void Estimate(
+      const AecState& aec_state,
+      const RenderBuffer& render_buffer,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> S2_linear,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+      bool dominant_nearend,
+      rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> R2);
+
+ private:
+  enum class ReverbType { kLinear, kNonLinear };
+
+  // Resets the state.
+  void Reset();
+
+  // Updates estimate for the power of the stationary noise component in the
+  // render signal.
+  void UpdateRenderNoisePower(const RenderBuffer& render_buffer);
+
+  // Adds the estimated unmodelled echo power to the residual echo power
+  // estimate.
+  void AddReverb(ReverbType reverb_type,
+                 const AecState& aec_state,
+                 const RenderBuffer& render_buffer,
+                 rtc::ArrayView<std::array<float, kFftLengthBy2Plus1>> R2);
+
+  // Gets the echo path gain to apply.
+  float GetEchoPathGain(const AecState& aec_state,
+                        bool gain_for_early_reflections) const;
+
+  const EchoCanceller3Config config_;
+  const size_t num_render_channels_;
+  const float early_reflections_transparent_mode_gain_;
+  const float late_reflections_transparent_mode_gain_;
+  const float early_reflections_general_gain_;
+  const float late_reflections_general_gain_;
+  const bool erle_onset_compensation_in_dominant_nearend_;
+  std::array<float, kFftLengthBy2Plus1> X2_noise_floor_;
+  std::array<int, kFftLengthBy2Plus1> X2_noise_floor_counter_;
+  ReverbModel echo_reverb_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_RESIDUAL_ECHO_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/residual_echo_estimator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,107 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/residual_echo_estimator.h"
+
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_fft.h"
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/test/echo_canceller_test_tools.h"
+#include "rtc_base/random.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+class ResidualEchoEstimatorMultiChannel
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<std::tuple<size_t, size_t>> {};
+
+INSTANTIATE_TEST_SUITE_P(MultiChannel,
+                         ResidualEchoEstimatorMultiChannel,
+                         ::testing::Combine(::testing::Values(1, 2, 4),
+                                            ::testing::Values(1, 2, 4)));
+
+TEST_P(ResidualEchoEstimatorMultiChannel, BasicTest) {
+  const size_t num_render_channels = std::get<0>(GetParam());
+  const size_t num_capture_channels = std::get<1>(GetParam());
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+
+  EchoCanceller3Config config;
+  ResidualEchoEstimator estimator(config, num_render_channels);
+  AecState aec_state(config, num_capture_channels);
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, kSampleRateHz, num_render_channels));
+
+  std::vector<std::array<float, kFftLengthBy2Plus1>> E2_refined(
+      num_capture_channels);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> S2_linear(
+      num_capture_channels);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> Y2(num_capture_channels);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> R2(num_capture_channels);
+  std::vector<std::vector<std::vector<float>>> x(
+      kNumBands, std::vector<std::vector<float>>(
+                     num_render_channels, std::vector<float>(kBlockSize, 0.f)));
+  std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>> H2(
+      num_capture_channels,
+      std::vector<std::array<float, kFftLengthBy2Plus1>>(10));
+  Random random_generator(42U);
+  std::vector<SubtractorOutput> output(num_capture_channels);
+  std::array<float, kBlockSize> y;
+  absl::optional<DelayEstimate> delay_estimate;
+
+  for (auto& H2_ch : H2) {
+    for (auto& H2_k : H2_ch) {
+      H2_k.fill(0.01f);
+    }
+    H2_ch[2].fill(10.f);
+    H2_ch[2][0] = 0.1f;
+  }
+
+  std::vector<std::vector<float>> h(
+      num_capture_channels,
+      std::vector<float>(
+          GetTimeDomainLength(config.filter.refined.length_blocks), 0.f));
+
+  for (auto& subtractor_output : output) {
+    subtractor_output.Reset();
+    subtractor_output.s_refined.fill(100.f);
+  }
+  y.fill(0.f);
+
+  constexpr float kLevel = 10.f;
+  for (auto& E2_refined_ch : E2_refined) {
+    E2_refined_ch.fill(kLevel);
+  }
+  S2_linear[0].fill(kLevel);
+  for (auto& Y2_ch : Y2) {
+    Y2_ch.fill(kLevel);
+  }
+
+  for (int k = 0; k < 1993; ++k) {
+    RandomizeSampleVector(&random_generator, x[0][0]);
+    render_delay_buffer->Insert(x);
+    if (k == 0) {
+      render_delay_buffer->Reset();
+    }
+    render_delay_buffer->PrepareCaptureProcessing();
+
+    aec_state.Update(delay_estimate, H2, h,
+                     *render_delay_buffer->GetRenderBuffer(), E2_refined, Y2,
+                     output);
+
+    estimator.Estimate(aec_state, *render_delay_buffer->GetRenderBuffer(),
+                       S2_linear, Y2, /*dominant_nearend=*/false, R2);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_decay_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_decay_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_decay_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_decay_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,409 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/reverb_decay_estimator.h"
+
+#include <stddef.h>
+
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace {
+
+constexpr int kEarlyReverbMinSizeBlocks = 3;
+constexpr int kBlocksPerSection = 6;
+// Linear regression approach assumes symmetric index around 0.
+constexpr float kEarlyReverbFirstPointAtLinearRegressors =
+    -0.5f * kBlocksPerSection * kFftLengthBy2 + 0.5f;
+
+// Averages the values in a block of size kFftLengthBy2;
+float BlockAverage(rtc::ArrayView<const float> v, size_t block_index) {
+  constexpr float kOneByFftLengthBy2 = 1.f / kFftLengthBy2;
+  const int i = block_index * kFftLengthBy2;
+  RTC_DCHECK_GE(v.size(), i + kFftLengthBy2);
+  const float sum =
+      std::accumulate(v.begin() + i, v.begin() + i + kFftLengthBy2, 0.f);
+  return sum * kOneByFftLengthBy2;
+}
+
+// Analyzes the gain in a block.
+void AnalyzeBlockGain(const std::array<float, kFftLengthBy2>& h2,
+                      float floor_gain,
+                      float* previous_gain,
+                      bool* block_adapting,
+                      bool* decaying_gain) {
+  float gain = std::max(BlockAverage(h2, 0), 1e-32f);
+  *block_adapting =
+      *previous_gain > 1.1f * gain || *previous_gain < 0.9f * gain;
+  *decaying_gain = gain > floor_gain;
+  *previous_gain = gain;
+}
+
+// Arithmetic sum of $2 \sum_{i=0.5}^{(N-1)/2}i^2$ calculated directly.
+constexpr float SymmetricArithmetricSum(int N) {
+  return N * (N * N - 1.0f) * (1.f / 12.f);
+}
+
+// Returns the peak energy of an impulse response.
+float BlockEnergyPeak(rtc::ArrayView<const float> h, int peak_block) {
+  RTC_DCHECK_LE((peak_block + 1) * kFftLengthBy2, h.size());
+  RTC_DCHECK_GE(peak_block, 0);
+  float peak_value =
+      *std::max_element(h.begin() + peak_block * kFftLengthBy2,
+                        h.begin() + (peak_block + 1) * kFftLengthBy2,
+                        [](float a, float b) { return a * a < b * b; });
+  return peak_value * peak_value;
+}
+
+// Returns the average energy of an impulse response block.
+float BlockEnergyAverage(rtc::ArrayView<const float> h, int block_index) {
+  RTC_DCHECK_LE((block_index + 1) * kFftLengthBy2, h.size());
+  RTC_DCHECK_GE(block_index, 0);
+  constexpr float kOneByFftLengthBy2 = 1.f / kFftLengthBy2;
+  const auto sum_of_squares = [](float a, float b) { return a + b * b; };
+  return std::accumulate(h.begin() + block_index * kFftLengthBy2,
+                         h.begin() + (block_index + 1) * kFftLengthBy2, 0.f,
+                         sum_of_squares) *
+         kOneByFftLengthBy2;
+}
+
+}  // namespace
+
+ReverbDecayEstimator::ReverbDecayEstimator(const EchoCanceller3Config& config)
+    : filter_length_blocks_(config.filter.refined.length_blocks),
+      filter_length_coefficients_(GetTimeDomainLength(filter_length_blocks_)),
+      use_adaptive_echo_decay_(config.ep_strength.default_len < 0.f),
+      early_reverb_estimator_(config.filter.refined.length_blocks -
+                              kEarlyReverbMinSizeBlocks),
+      late_reverb_start_(kEarlyReverbMinSizeBlocks),
+      late_reverb_end_(kEarlyReverbMinSizeBlocks),
+      previous_gains_(config.filter.refined.length_blocks, 0.f),
+      decay_(std::fabs(config.ep_strength.default_len)) {
+  RTC_DCHECK_GT(config.filter.refined.length_blocks,
+                static_cast<size_t>(kEarlyReverbMinSizeBlocks));
+}
+
+ReverbDecayEstimator::~ReverbDecayEstimator() = default;
+
+void ReverbDecayEstimator::Update(rtc::ArrayView<const float> filter,
+                                  const absl::optional<float>& filter_quality,
+                                  int filter_delay_blocks,
+                                  bool usable_linear_filter,
+                                  bool stationary_signal) {
+  const int filter_size = static_cast<int>(filter.size());
+
+  if (stationary_signal) {
+    return;
+  }
+
+  bool estimation_feasible =
+      filter_delay_blocks <=
+      filter_length_blocks_ - kEarlyReverbMinSizeBlocks - 1;
+  estimation_feasible =
+      estimation_feasible && filter_size == filter_length_coefficients_;
+  estimation_feasible = estimation_feasible && filter_delay_blocks > 0;
+  estimation_feasible = estimation_feasible && usable_linear_filter;
+
+  if (!estimation_feasible) {
+    ResetDecayEstimation();
+    return;
+  }
+
+  if (!use_adaptive_echo_decay_) {
+    return;
+  }
+
+  const float new_smoothing = filter_quality ? *filter_quality * 0.2f : 0.f;
+  smoothing_constant_ = std::max(new_smoothing, smoothing_constant_);
+  if (smoothing_constant_ == 0.f) {
+    return;
+  }
+
+  if (block_to_analyze_ < filter_length_blocks_) {
+    // Analyze the filter and accumulate data for reverb estimation.
+    AnalyzeFilter(filter);
+    ++block_to_analyze_;
+  } else {
+    // When the filter is fully analyzed, estimate the reverb decay and reset
+    // the block_to_analyze_ counter.
+    EstimateDecay(filter, filter_delay_blocks);
+  }
+}
+
+void ReverbDecayEstimator::ResetDecayEstimation() {
+  early_reverb_estimator_.Reset();
+  late_reverb_decay_estimator_.Reset(0);
+  block_to_analyze_ = 0;
+  estimation_region_candidate_size_ = 0;
+  estimation_region_identified_ = false;
+  smoothing_constant_ = 0.f;
+  late_reverb_start_ = 0;
+  late_reverb_end_ = 0;
+}
+
+void ReverbDecayEstimator::EstimateDecay(rtc::ArrayView<const float> filter,
+                                         int peak_block) {
+  auto& h = filter;
+  RTC_DCHECK_EQ(0, h.size() % kFftLengthBy2);
+
+  // Reset the block analysis counter.
+  block_to_analyze_ =
+      std::min(peak_block + kEarlyReverbMinSizeBlocks, filter_length_blocks_);
+
+  // To estimate the reverb decay, the energy of the first filter section must
+  // be substantially larger than the last. Also, the first filter section
+  // energy must not deviate too much from the max peak.
+  const float first_reverb_gain = BlockEnergyAverage(h, block_to_analyze_);
+  const size_t h_size_blocks = h.size() >> kFftLengthBy2Log2;
+  tail_gain_ = BlockEnergyAverage(h, h_size_blocks - 1);
+  float peak_energy = BlockEnergyPeak(h, peak_block);
+  const bool sufficient_reverb_decay = first_reverb_gain > 4.f * tail_gain_;
+  const bool valid_filter =
+      first_reverb_gain > 2.f * tail_gain_ && peak_energy < 100.f;
+
+  // Estimate the size of the regions with early and late reflections.
+  const int size_early_reverb = early_reverb_estimator_.Estimate();
+  const int size_late_reverb =
+      std::max(estimation_region_candidate_size_ - size_early_reverb, 0);
+
+  // Only update the reverb decay estimate if the size of the identified late
+  // reverb is sufficiently large.
+  if (size_late_reverb >= 5) {
+    if (valid_filter && late_reverb_decay_estimator_.EstimateAvailable()) {
+      float decay = std::pow(
+          2.0f, late_reverb_decay_estimator_.Estimate() * kFftLengthBy2);
+      constexpr float kMaxDecay = 0.95f;  // ~1 sec min RT60.
+      constexpr float kMinDecay = 0.02f;  // ~15 ms max RT60.
+      decay = std::max(.97f * decay_, decay);
+      decay = std::min(decay, kMaxDecay);
+      decay = std::max(decay, kMinDecay);
+      decay_ += smoothing_constant_ * (decay - decay_);
+    }
+
+    // Update length of decay. Must have enough data (number of sections) in
+    // order to estimate decay rate.
+    late_reverb_decay_estimator_.Reset(size_late_reverb * kFftLengthBy2);
+    late_reverb_start_ =
+        peak_block + kEarlyReverbMinSizeBlocks + size_early_reverb;
+    late_reverb_end_ =
+        block_to_analyze_ + estimation_region_candidate_size_ - 1;
+  } else {
+    late_reverb_decay_estimator_.Reset(0);
+    late_reverb_start_ = 0;
+    late_reverb_end_ = 0;
+  }
+
+  // Reset variables for the identification of the region for reverb decay
+  // estimation.
+  estimation_region_identified_ = !(valid_filter && sufficient_reverb_decay);
+  estimation_region_candidate_size_ = 0;
+
+  // Stop estimation of the decay until another good filter is received.
+  smoothing_constant_ = 0.f;
+
+  // Reset early reflections detector.
+  early_reverb_estimator_.Reset();
+}
+
+void ReverbDecayEstimator::AnalyzeFilter(rtc::ArrayView<const float> filter) {
+  auto h = rtc::ArrayView<const float>(
+      filter.begin() + block_to_analyze_ * kFftLengthBy2, kFftLengthBy2);
+
+  // Compute squared filter coeffiecients for the block to analyze_;
+  std::array<float, kFftLengthBy2> h2;
+  std::transform(h.begin(), h.end(), h2.begin(), [](float a) { return a * a; });
+
+  // Map out the region for estimating the reverb decay.
+  bool adapting;
+  bool above_noise_floor;
+  AnalyzeBlockGain(h2, tail_gain_, &previous_gains_[block_to_analyze_],
+                   &adapting, &above_noise_floor);
+
+  // Count consecutive number of "good" filter sections, where "good" means:
+  // 1) energy is above noise floor.
+  // 2) energy of current section has not changed too much from last check.
+  estimation_region_identified_ =
+      estimation_region_identified_ || adapting || !above_noise_floor;
+  if (!estimation_region_identified_) {
+    ++estimation_region_candidate_size_;
+  }
+
+  // Accumulate data for reverb decay estimation and for the estimation of early
+  // reflections.
+  if (block_to_analyze_ <= late_reverb_end_) {
+    if (block_to_analyze_ >= late_reverb_start_) {
+      for (float h2_k : h2) {
+        float h2_log2 = FastApproxLog2f(h2_k + 1e-10);
+        late_reverb_decay_estimator_.Accumulate(h2_log2);
+        early_reverb_estimator_.Accumulate(h2_log2, smoothing_constant_);
+      }
+    } else {
+      for (float h2_k : h2) {
+        float h2_log2 = FastApproxLog2f(h2_k + 1e-10);
+        early_reverb_estimator_.Accumulate(h2_log2, smoothing_constant_);
+      }
+    }
+  }
+}
+
+void ReverbDecayEstimator::Dump(ApmDataDumper* data_dumper) const {
+  data_dumper->DumpRaw("aec3_reverb_decay", decay_);
+  data_dumper->DumpRaw("aec3_reverb_tail_energy", tail_gain_);
+  data_dumper->DumpRaw("aec3_reverb_alpha", smoothing_constant_);
+  data_dumper->DumpRaw("aec3_num_reverb_decay_blocks",
+                       late_reverb_end_ - late_reverb_start_);
+  data_dumper->DumpRaw("aec3_late_reverb_start", late_reverb_start_);
+  data_dumper->DumpRaw("aec3_late_reverb_end", late_reverb_end_);
+  early_reverb_estimator_.Dump(data_dumper);
+}
+
+void ReverbDecayEstimator::LateReverbLinearRegressor::Reset(
+    int num_data_points) {
+  RTC_DCHECK_LE(0, num_data_points);
+  RTC_DCHECK_EQ(0, num_data_points % 2);
+  const int N = num_data_points;
+  nz_ = 0.f;
+  // Arithmetic sum of $2 \sum_{i=0.5}^{(N-1)/2}i^2$ calculated directly.
+  nn_ = SymmetricArithmetricSum(N);
+  // The linear regression approach assumes symmetric index around 0.
+  count_ = N > 0 ? -N * 0.5f + 0.5f : 0.f;
+  N_ = N;
+  n_ = 0;
+}
+
+void ReverbDecayEstimator::LateReverbLinearRegressor::Accumulate(float z) {
+  nz_ += count_ * z;
+  ++count_;
+  ++n_;
+}
+
+float ReverbDecayEstimator::LateReverbLinearRegressor::Estimate() {
+  RTC_DCHECK(EstimateAvailable());
+  if (nn_ == 0.f) {
+    RTC_NOTREACHED();
+    return 0.f;
+  }
+  return nz_ / nn_;
+}
+
+ReverbDecayEstimator::EarlyReverbLengthEstimator::EarlyReverbLengthEstimator(
+    int max_blocks)
+    : numerators_smooth_(max_blocks - kBlocksPerSection, 0.f),
+      numerators_(numerators_smooth_.size(), 0.f),
+      coefficients_counter_(0) {
+  RTC_DCHECK_LE(0, max_blocks);
+}
+
+ReverbDecayEstimator::EarlyReverbLengthEstimator::
+    ~EarlyReverbLengthEstimator() = default;
+
+void ReverbDecayEstimator::EarlyReverbLengthEstimator::Reset() {
+  coefficients_counter_ = 0;
+  std::fill(numerators_.begin(), numerators_.end(), 0.f);
+  block_counter_ = 0;
+}
+
+void ReverbDecayEstimator::EarlyReverbLengthEstimator::Accumulate(
+    float value,
+    float smoothing) {
+  // Each section is composed by kBlocksPerSection blocks and each section
+  // overlaps with the next one in (kBlocksPerSection - 1) blocks. For example,
+  // the first section covers the blocks [0:5], the second covers the blocks
+  // [1:6] and so on. As a result, for each value, kBlocksPerSection sections
+  // need to be updated.
+  int first_section_index = std::max(block_counter_ - kBlocksPerSection + 1, 0);
+  int last_section_index =
+      std::min(block_counter_, static_cast<int>(numerators_.size() - 1));
+  float x_value = static_cast<float>(coefficients_counter_) +
+                  kEarlyReverbFirstPointAtLinearRegressors;
+  const float value_to_inc = kFftLengthBy2 * value;
+  float value_to_add =
+      x_value * value + (block_counter_ - last_section_index) * value_to_inc;
+  for (int section = last_section_index; section >= first_section_index;
+       --section, value_to_add += value_to_inc) {
+    numerators_[section] += value_to_add;
+  }
+
+  // Check if this update was the last coefficient of the current block. In that
+  // case, check if we are at the end of one of the sections and update the
+  // numerator of the linear regressor that is computed in such section.
+  if (++coefficients_counter_ == kFftLengthBy2) {
+    if (block_counter_ >= (kBlocksPerSection - 1)) {
+      size_t section = block_counter_ - (kBlocksPerSection - 1);
+      RTC_DCHECK_GT(numerators_.size(), section);
+      RTC_DCHECK_GT(numerators_smooth_.size(), section);
+      numerators_smooth_[section] +=
+          smoothing * (numerators_[section] - numerators_smooth_[section]);
+      n_sections_ = section + 1;
+    }
+    ++block_counter_;
+    coefficients_counter_ = 0;
+  }
+}
+
+// Estimates the size in blocks of the early reverb. The estimation is done by
+// comparing the tilt that is estimated in each section. As an optimization
+// detail and due to the fact that all the linear regressors that are computed
+// shared the same denominator, the comparison of the tilts is done by a
+// comparison of the numerator of the linear regressors.
+int ReverbDecayEstimator::EarlyReverbLengthEstimator::Estimate() {
+  constexpr float N = kBlocksPerSection * kFftLengthBy2;
+  constexpr float nn = SymmetricArithmetricSum(N);
+  // numerator_11 refers to the quantity that the linear regressor needs in the
+  // numerator for getting a decay equal to 1.1 (which is not a decay).
+  // log2(1.1) * nn / kFftLengthBy2.
+  constexpr float numerator_11 = 0.13750352374993502f * nn / kFftLengthBy2;
+  // log2(0.8) *  nn / kFftLengthBy2.
+  constexpr float numerator_08 = -0.32192809488736229f * nn / kFftLengthBy2;
+  constexpr int kNumSectionsToAnalyze = 9;
+
+  if (n_sections_ < kNumSectionsToAnalyze) {
+    return 0;
+  }
+
+  // Estimation of the blocks that correspond to early reverberations. The
+  // estimation is done by analyzing the impulse response. The portions of the
+  // impulse response whose energy is not decreasing over its coefficients are
+  // considered to be part of the early reverberations. Furthermore, the blocks
+  // where the energy is decreasing faster than what it does at the end of the
+  // impulse response are also considered to be part of the early
+  // reverberations. The estimation is limited to the first
+  // kNumSectionsToAnalyze sections.
+
+  RTC_DCHECK_LE(n_sections_, numerators_smooth_.size());
+  const float min_numerator_tail =
+      *std::min_element(numerators_smooth_.begin() + kNumSectionsToAnalyze,
+                        numerators_smooth_.begin() + n_sections_);
+  int early_reverb_size_minus_1 = 0;
+  for (int k = 0; k < kNumSectionsToAnalyze; ++k) {
+    if ((numerators_smooth_[k] > numerator_11) ||
+        (numerators_smooth_[k] < numerator_08 &&
+         numerators_smooth_[k] < 0.9f * min_numerator_tail)) {
+      early_reverb_size_minus_1 = k;
+    }
+  }
+
+  return early_reverb_size_minus_1 == 0 ? 0 : early_reverb_size_minus_1 + 1;
+}
+
+void ReverbDecayEstimator::EarlyReverbLengthEstimator::Dump(
+    ApmDataDumper* data_dumper) const {
+  data_dumper->DumpRaw("aec3_er_acum_numerator", numerators_smooth_);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_decay_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_decay_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_decay_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_decay_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,112 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_REVERB_DECAY_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_REVERB_DECAY_ESTIMATOR_H_
+
+#include <array>
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"  // kMaxAdaptiveFilter...
+
+namespace webrtc {
+
+class ApmDataDumper;
+struct EchoCanceller3Config;
+
+// Class for estimating the decay of the late reverb.
+class ReverbDecayEstimator {
+ public:
+  explicit ReverbDecayEstimator(const EchoCanceller3Config& config);
+  ~ReverbDecayEstimator();
+  // Updates the decay estimate.
+  void Update(rtc::ArrayView<const float> filter,
+              const absl::optional<float>& filter_quality,
+              int filter_delay_blocks,
+              bool usable_linear_filter,
+              bool stationary_signal);
+  // Returns the decay for the exponential model.
+  float Decay() const { return decay_; }
+  // Dumps debug data.
+  void Dump(ApmDataDumper* data_dumper) const;
+
+ private:
+  void EstimateDecay(rtc::ArrayView<const float> filter, int peak_block);
+  void AnalyzeFilter(rtc::ArrayView<const float> filter);
+
+  void ResetDecayEstimation();
+
+  // Class for estimating the decay of the late reverb from the linear filter.
+  class LateReverbLinearRegressor {
+   public:
+    // Resets the estimator to receive a specified number of data points.
+    void Reset(int num_data_points);
+    // Accumulates estimation data.
+    void Accumulate(float z);
+    // Estimates the decay.
+    float Estimate();
+    // Returns whether an estimate is available.
+    bool EstimateAvailable() const { return n_ == N_ && N_ != 0; }
+
+   public:
+    float nz_ = 0.f;
+    float nn_ = 0.f;
+    float count_ = 0.f;
+    int N_ = 0;
+    int n_ = 0;
+  };
+
+  // Class for identifying the length of the early reverb from the linear
+  // filter. For identifying the early reverberations, the impulse response is
+  // divided in sections and the tilt of each section is computed by a linear
+  // regressor.
+  class EarlyReverbLengthEstimator {
+   public:
+    explicit EarlyReverbLengthEstimator(int max_blocks);
+    ~EarlyReverbLengthEstimator();
+
+    // Resets the estimator.
+    void Reset();
+    // Accumulates estimation data.
+    void Accumulate(float value, float smoothing);
+    // Estimates the size in blocks of the early reverb.
+    int Estimate();
+    // Dumps debug data.
+    void Dump(ApmDataDumper* data_dumper) const;
+
+   private:
+    std::vector<float> numerators_smooth_;
+    std::vector<float> numerators_;
+    int coefficients_counter_;
+    int block_counter_ = 0;
+    int n_sections_ = 0;
+  };
+
+  const int filter_length_blocks_;
+  const int filter_length_coefficients_;
+  const bool use_adaptive_echo_decay_;
+  LateReverbLinearRegressor late_reverb_decay_estimator_;
+  EarlyReverbLengthEstimator early_reverb_estimator_;
+  int late_reverb_start_;
+  int late_reverb_end_;
+  int block_to_analyze_ = 0;
+  int estimation_region_candidate_size_ = 0;
+  bool estimation_region_identified_ = false;
+  std::vector<float> previous_gains_;
+  float decay_;
+  float tail_gain_ = 0.f;
+  float smoothing_constant_ = 0.f;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_REVERB_DECAY_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_frequency_response.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_frequency_response.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_frequency_response.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_frequency_response.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,98 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/reverb_frequency_response.h"
+
+#include <stddef.h>
+
+#include <algorithm>
+#include <array>
+#include <numeric>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace {
+
+// Computes the ratio of the energies between the direct path and the tail. The
+// energy is computed in the power spectrum domain discarding the DC
+// contributions.
+float AverageDecayWithinFilter(
+    rtc::ArrayView<const float> freq_resp_direct_path,
+    rtc::ArrayView<const float> freq_resp_tail) {
+  // Skipping the DC for the ratio computation
+  constexpr size_t kSkipBins = 1;
+  RTC_CHECK_EQ(freq_resp_direct_path.size(), freq_resp_tail.size());
+
+  float direct_path_energy =
+      std::accumulate(freq_resp_direct_path.begin() + kSkipBins,
+                      freq_resp_direct_path.end(), 0.f);
+
+  if (direct_path_energy == 0.f) {
+    return 0.f;
+  }
+
+  float tail_energy = std::accumulate(freq_resp_tail.begin() + kSkipBins,
+                                      freq_resp_tail.end(), 0.f);
+  return tail_energy / direct_path_energy;
+}
+
+}  // namespace
+
+ReverbFrequencyResponse::ReverbFrequencyResponse() {
+  tail_response_.fill(0.f);
+}
+ReverbFrequencyResponse::~ReverbFrequencyResponse() = default;
+
+void ReverbFrequencyResponse::Update(
+    const std::vector<std::array<float, kFftLengthBy2Plus1>>&
+        frequency_response,
+    int filter_delay_blocks,
+    const absl::optional<float>& linear_filter_quality,
+    bool stationary_block) {
+  if (stationary_block || !linear_filter_quality) {
+    return;
+  }
+
+  Update(frequency_response, filter_delay_blocks, *linear_filter_quality);
+}
+
+void ReverbFrequencyResponse::Update(
+    const std::vector<std::array<float, kFftLengthBy2Plus1>>&
+        frequency_response,
+    int filter_delay_blocks,
+    float linear_filter_quality) {
+  rtc::ArrayView<const float> freq_resp_tail(
+      frequency_response[frequency_response.size() - 1]);
+
+  rtc::ArrayView<const float> freq_resp_direct_path(
+      frequency_response[filter_delay_blocks]);
+
+  float average_decay =
+      AverageDecayWithinFilter(freq_resp_direct_path, freq_resp_tail);
+
+  const float smoothing = 0.2f * linear_filter_quality;
+  average_decay_ += smoothing * (average_decay - average_decay_);
+
+  for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+    tail_response_[k] = freq_resp_direct_path[k] * average_decay_;
+  }
+
+  for (size_t k = 1; k < kFftLengthBy2; ++k) {
+    const float avg_neighbour =
+        0.5f * (tail_response_[k - 1] + tail_response_[k + 1]);
+    tail_response_[k] = std::max(tail_response_[k], avg_neighbour);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_frequency_response.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_frequency_response.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_frequency_response.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_frequency_response.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_REVERB_FREQUENCY_RESPONSE_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_REVERB_FREQUENCY_RESPONSE_H_
+
+#include <array>
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+
+namespace webrtc {
+
+// Class for updating the frequency response for the reverb.
+class ReverbFrequencyResponse {
+ public:
+  ReverbFrequencyResponse();
+  ~ReverbFrequencyResponse();
+
+  // Updates the frequency response estimate of the reverb.
+  void Update(const std::vector<std::array<float, kFftLengthBy2Plus1>>&
+                  frequency_response,
+              int filter_delay_blocks,
+              const absl::optional<float>& linear_filter_quality,
+              bool stationary_block);
+
+  // Returns the estimated frequency response for the reverb.
+  rtc::ArrayView<const float> FrequencyResponse() const {
+    return tail_response_;
+  }
+
+ private:
+  void Update(const std::vector<std::array<float, kFftLengthBy2Plus1>>&
+                  frequency_response,
+              int filter_delay_blocks,
+              float linear_filter_quality);
+
+  float average_decay_ = 0.f;
+  std::array<float, kFftLengthBy2Plus1> tail_response_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_REVERB_FREQUENCY_RESPONSE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/reverb_model.h"
+
+#include <stddef.h>
+
+#include <algorithm>
+#include <functional>
+
+#include "api/array_view.h"
+
+namespace webrtc {
+
+ReverbModel::ReverbModel() {
+  Reset();
+}
+
+ReverbModel::~ReverbModel() = default;
+
+void ReverbModel::Reset() {
+  reverb_.fill(0.);
+}
+
+void ReverbModel::UpdateReverbNoFreqShaping(
+    rtc::ArrayView<const float> power_spectrum,
+    float power_spectrum_scaling,
+    float reverb_decay) {
+  if (reverb_decay > 0) {
+    // Update the estimate of the reverberant power.
+    for (size_t k = 0; k < power_spectrum.size(); ++k) {
+      reverb_[k] = (reverb_[k] + power_spectrum[k] * power_spectrum_scaling) *
+                   reverb_decay;
+    }
+  }
+}
+
+void ReverbModel::UpdateReverb(
+    rtc::ArrayView<const float> power_spectrum,
+    rtc::ArrayView<const float> power_spectrum_scaling,
+    float reverb_decay) {
+  if (reverb_decay > 0) {
+    // Update the estimate of the reverberant power.
+    for (size_t k = 0; k < power_spectrum.size(); ++k) {
+      reverb_[k] =
+          (reverb_[k] + power_spectrum[k] * power_spectrum_scaling[k]) *
+          reverb_decay;
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/reverb_model_estimator.h"
+
+namespace webrtc {
+
+ReverbModelEstimator::ReverbModelEstimator(const EchoCanceller3Config& config,
+                                           size_t num_capture_channels)
+    : reverb_decay_estimators_(num_capture_channels),
+      reverb_frequency_responses_(num_capture_channels) {
+  for (size_t ch = 0; ch < reverb_decay_estimators_.size(); ++ch) {
+    reverb_decay_estimators_[ch] =
+        std::make_unique<ReverbDecayEstimator>(config);
+  }
+}
+
+ReverbModelEstimator::~ReverbModelEstimator() = default;
+
+void ReverbModelEstimator::Update(
+    rtc::ArrayView<const std::vector<float>> impulse_responses,
+    rtc::ArrayView<const std::vector<std::array<float, kFftLengthBy2Plus1>>>
+        frequency_responses,
+    rtc::ArrayView<const absl::optional<float>> linear_filter_qualities,
+    rtc::ArrayView<const int> filter_delays_blocks,
+    const std::vector<bool>& usable_linear_estimates,
+    bool stationary_block) {
+  const size_t num_capture_channels = reverb_decay_estimators_.size();
+  RTC_DCHECK_EQ(num_capture_channels, impulse_responses.size());
+  RTC_DCHECK_EQ(num_capture_channels, frequency_responses.size());
+  RTC_DCHECK_EQ(num_capture_channels, usable_linear_estimates.size());
+
+  for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+    // Estimate the frequency response for the reverb.
+    reverb_frequency_responses_[ch].Update(
+        frequency_responses[ch], filter_delays_blocks[ch],
+        linear_filter_qualities[ch], stationary_block);
+
+    // Estimate the reverb decay,
+    reverb_decay_estimators_[ch]->Update(
+        impulse_responses[ch], linear_filter_qualities[ch],
+        filter_delays_blocks[ch], usable_linear_estimates[ch],
+        stationary_block);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_ESTIMATOR_H_
+
+#include <array>
+#include <memory>
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"  // kFftLengthBy2Plus1
+#include "modules/audio_processing/aec3/reverb_decay_estimator.h"
+#include "modules/audio_processing/aec3/reverb_frequency_response.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+
+// Class for estimating the model parameters for the reverberant echo.
+class ReverbModelEstimator {
+ public:
+  ReverbModelEstimator(const EchoCanceller3Config& config,
+                       size_t num_capture_channels);
+  ~ReverbModelEstimator();
+
+  // Updates the estimates based on new data.
+  void Update(
+      rtc::ArrayView<const std::vector<float>> impulse_responses,
+      rtc::ArrayView<const std::vector<std::array<float, kFftLengthBy2Plus1>>>
+          frequency_responses,
+      rtc::ArrayView<const absl::optional<float>> linear_filter_qualities,
+      rtc::ArrayView<const int> filter_delays_blocks,
+      const std::vector<bool>& usable_linear_estimates,
+      bool stationary_block);
+
+  // Returns the exponential decay of the reverberant echo.
+  // TODO(peah): Correct to properly support multiple channels.
+  float ReverbDecay() const { return reverb_decay_estimators_[0]->Decay(); }
+
+  // Return the frequency response of the reverberant echo.
+  // TODO(peah): Correct to properly support multiple channels.
+  rtc::ArrayView<const float> GetReverbFrequencyResponse() const {
+    return reverb_frequency_responses_[0].FrequencyResponse();
+  }
+
+  // Dumps debug data.
+  void Dump(ApmDataDumper* data_dumper) const {
+    reverb_decay_estimators_[0]->Dump(data_dumper);
+  }
+
+ private:
+  std::vector<std::unique_ptr<ReverbDecayEstimator>> reverb_decay_estimators_;
+  std::vector<ReverbFrequencyResponse> reverb_frequency_responses_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model_estimator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,150 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/reverb_model_estimator.h"
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <numeric>
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/aec3_fft.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "rtc_base/checks.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+namespace {
+
+EchoCanceller3Config CreateConfigForTest(float default_decay) {
+  EchoCanceller3Config cfg;
+  cfg.ep_strength.default_len = default_decay;
+  cfg.filter.refined.length_blocks = 40;
+  return cfg;
+}
+
+constexpr int kFilterDelayBlocks = 2;
+
+}  // namespace
+
+class ReverbModelEstimatorTest {
+ public:
+  ReverbModelEstimatorTest(float default_decay, size_t num_capture_channels)
+      : aec3_config_(CreateConfigForTest(default_decay)),
+        estimated_decay_(default_decay),
+        h_(num_capture_channels,
+           std::vector<float>(
+               aec3_config_.filter.refined.length_blocks * kBlockSize,
+               0.f)),
+        H2_(num_capture_channels,
+            std::vector<std::array<float, kFftLengthBy2Plus1>>(
+                aec3_config_.filter.refined.length_blocks)),
+        quality_linear_(num_capture_channels, 1.0f) {
+    CreateImpulseResponseWithDecay();
+  }
+  void RunEstimator();
+  float GetDecay() { return estimated_decay_; }
+  float GetTrueDecay() { return kTruePowerDecay; }
+  float GetPowerTailDb() { return 10.f * std::log10(estimated_power_tail_); }
+  float GetTruePowerTailDb() { return 10.f * std::log10(true_power_tail_); }
+
+ private:
+  void CreateImpulseResponseWithDecay();
+  static constexpr bool kStationaryBlock = false;
+  static constexpr float kTruePowerDecay = 0.5f;
+  const EchoCanceller3Config aec3_config_;
+  float estimated_decay_;
+  float estimated_power_tail_ = 0.f;
+  float true_power_tail_ = 0.f;
+  std::vector<std::vector<float>> h_;
+  std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>> H2_;
+  std::vector<absl::optional<float>> quality_linear_;
+};
+
+void ReverbModelEstimatorTest::CreateImpulseResponseWithDecay() {
+  const Aec3Fft fft;
+  for (const auto& h_k : h_) {
+    RTC_DCHECK_EQ(h_k.size(),
+                  aec3_config_.filter.refined.length_blocks * kBlockSize);
+  }
+  for (const auto& H2_k : H2_) {
+    RTC_DCHECK_EQ(H2_k.size(), aec3_config_.filter.refined.length_blocks);
+  }
+  RTC_DCHECK_EQ(kFilterDelayBlocks, 2);
+
+  float decay_sample = std::sqrt(powf(kTruePowerDecay, 1.f / kBlockSize));
+  const size_t filter_delay_coefficients = kFilterDelayBlocks * kBlockSize;
+  for (auto& h_i : h_) {
+    std::fill(h_i.begin(), h_i.end(), 0.f);
+    h_i[filter_delay_coefficients] = 1.f;
+    for (size_t k = filter_delay_coefficients + 1; k < h_i.size(); ++k) {
+      h_i[k] = h_i[k - 1] * decay_sample;
+    }
+  }
+
+  for (size_t ch = 0; ch < H2_.size(); ++ch) {
+    for (size_t j = 0, k = 0; j < H2_[ch].size(); ++j, k += kBlockSize) {
+      std::array<float, kFftLength> fft_data;
+      fft_data.fill(0.f);
+      std::copy(h_[ch].begin() + k, h_[ch].begin() + k + kBlockSize,
+                fft_data.begin());
+      FftData H_j;
+      fft.Fft(&fft_data, &H_j);
+      H_j.Spectrum(Aec3Optimization::kNone, H2_[ch][j]);
+    }
+  }
+  rtc::ArrayView<float> H2_tail(H2_[0][H2_[0].size() - 1]);
+  true_power_tail_ = std::accumulate(H2_tail.begin(), H2_tail.end(), 0.f);
+}
+void ReverbModelEstimatorTest::RunEstimator() {
+  const size_t num_capture_channels = H2_.size();
+  constexpr bool kUsableLinearEstimate = true;
+  ReverbModelEstimator estimator(aec3_config_, num_capture_channels);
+  std::vector<bool> usable_linear_estimates(num_capture_channels,
+                                            kUsableLinearEstimate);
+  std::vector<int> filter_delay_blocks(num_capture_channels,
+                                       kFilterDelayBlocks);
+  for (size_t k = 0; k < 3000; ++k) {
+    estimator.Update(h_, H2_, quality_linear_, filter_delay_blocks,
+                     usable_linear_estimates, kStationaryBlock);
+  }
+  estimated_decay_ = estimator.ReverbDecay();
+  auto freq_resp_tail = estimator.GetReverbFrequencyResponse();
+  estimated_power_tail_ =
+      std::accumulate(freq_resp_tail.begin(), freq_resp_tail.end(), 0.f);
+}
+
+TEST(ReverbModelEstimatorTests, NotChangingDecay) {
+  constexpr float kDefaultDecay = 0.9f;
+  for (size_t num_capture_channels : {1, 2, 4, 8}) {
+    ReverbModelEstimatorTest test(kDefaultDecay, num_capture_channels);
+    test.RunEstimator();
+    EXPECT_EQ(test.GetDecay(), kDefaultDecay);
+    EXPECT_NEAR(test.GetPowerTailDb(), test.GetTruePowerTailDb(), 5.f);
+  }
+}
+
+TEST(ReverbModelEstimatorTests, ChangingDecay) {
+  constexpr float kDefaultDecay = -0.9f;
+  for (size_t num_capture_channels : {1, 2, 4, 8}) {
+    ReverbModelEstimatorTest test(kDefaultDecay, num_capture_channels);
+    test.RunEstimator();
+    EXPECT_NEAR(test.GetDecay(), test.GetTrueDecay(), 0.1);
+    EXPECT_NEAR(test.GetPowerTailDb(), test.GetTruePowerTailDb(), 5.f);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/reverb_model.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_H_
+
+#include <array>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+
+namespace webrtc {
+
+// The ReverbModel class describes an exponential reverberant model
+// that can be applied over power spectrums.
+class ReverbModel {
+ public:
+  ReverbModel();
+  ~ReverbModel();
+
+  // Resets the state.
+  void Reset();
+
+  // Returns the reverb.
+  rtc::ArrayView<const float, kFftLengthBy2Plus1> reverb() const {
+    return reverb_;
+  }
+
+  // The methods UpdateReverbNoFreqShaping and UpdateReverb update the
+  // estimate of the reverberation contribution to an input/output power
+  // spectrum. Before applying the exponential reverberant model, the input
+  // power spectrum is pre-scaled. Use the method UpdateReverb when a different
+  // scaling should be applied per frequency and UpdateReverb_no_freq_shape if
+  // the same scaling should be used for all the frequencies.
+  void UpdateReverbNoFreqShaping(rtc::ArrayView<const float> power_spectrum,
+                                 float power_spectrum_scaling,
+                                 float reverb_decay);
+
+  // Update the reverb based on new data.
+  void UpdateReverb(rtc::ArrayView<const float> power_spectrum,
+                    rtc::ArrayView<const float> power_spectrum_scaling,
+                    float reverb_decay);
+
+ private:
+
+  std::array<float, kFftLengthBy2Plus1> reverb_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_REVERB_MODEL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,416 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/signal_dependent_erle_estimator.h"
+
+#include <algorithm>
+#include <functional>
+#include <numeric>
+
+#include "modules/audio_processing/aec3/spectrum_buffer.h"
+#include "rtc_base/numerics/safe_minmax.h"
+
+namespace webrtc {
+
+namespace {
+
+constexpr std::array<size_t, SignalDependentErleEstimator::kSubbands + 1>
+    kBandBoundaries = {1, 8, 16, 24, 32, 48, kFftLengthBy2Plus1};
+
+std::array<size_t, kFftLengthBy2Plus1> FormSubbandMap() {
+  std::array<size_t, kFftLengthBy2Plus1> map_band_to_subband;
+  size_t subband = 1;
+  for (size_t k = 0; k < map_band_to_subband.size(); ++k) {
+    RTC_DCHECK_LT(subband, kBandBoundaries.size());
+    if (k >= kBandBoundaries[subband]) {
+      subband++;
+      RTC_DCHECK_LT(k, kBandBoundaries[subband]);
+    }
+    map_band_to_subband[k] = subband - 1;
+  }
+  return map_band_to_subband;
+}
+
+// Defines the size in blocks of the sections that are used for dividing the
+// linear filter. The sections are split in a non-linear manner so that lower
+// sections that typically represent the direct path have a larger resolution
+// than the higher sections which typically represent more reverberant acoustic
+// paths.
+std::vector<size_t> DefineFilterSectionSizes(size_t delay_headroom_blocks,
+                                             size_t num_blocks,
+                                             size_t num_sections) {
+  size_t filter_length_blocks = num_blocks - delay_headroom_blocks;
+  std::vector<size_t> section_sizes(num_sections);
+  size_t remaining_blocks = filter_length_blocks;
+  size_t remaining_sections = num_sections;
+  size_t estimator_size = 2;
+  size_t idx = 0;
+  while (remaining_sections > 1 &&
+         remaining_blocks > estimator_size * remaining_sections) {
+    RTC_DCHECK_LT(idx, section_sizes.size());
+    section_sizes[idx] = estimator_size;
+    remaining_blocks -= estimator_size;
+    remaining_sections--;
+    estimator_size *= 2;
+    idx++;
+  }
+
+  size_t last_groups_size = remaining_blocks / remaining_sections;
+  for (; idx < num_sections; idx++) {
+    section_sizes[idx] = last_groups_size;
+  }
+  section_sizes[num_sections - 1] +=
+      remaining_blocks - last_groups_size * remaining_sections;
+  return section_sizes;
+}
+
+// Forms the limits in blocks for each filter section. Those sections
+// are used for analyzing the echo estimates and investigating which
+// linear filter sections contribute most to the echo estimate energy.
+std::vector<size_t> SetSectionsBoundaries(size_t delay_headroom_blocks,
+                                          size_t num_blocks,
+                                          size_t num_sections) {
+  std::vector<size_t> estimator_boundaries_blocks(num_sections + 1);
+  if (estimator_boundaries_blocks.size() == 2) {
+    estimator_boundaries_blocks[0] = 0;
+    estimator_boundaries_blocks[1] = num_blocks;
+    return estimator_boundaries_blocks;
+  }
+  RTC_DCHECK_GT(estimator_boundaries_blocks.size(), 2);
+  const std::vector<size_t> section_sizes =
+      DefineFilterSectionSizes(delay_headroom_blocks, num_blocks,
+                               estimator_boundaries_blocks.size() - 1);
+
+  size_t idx = 0;
+  size_t current_size_block = 0;
+  RTC_DCHECK_EQ(section_sizes.size() + 1, estimator_boundaries_blocks.size());
+  estimator_boundaries_blocks[0] = delay_headroom_blocks;
+  for (size_t k = delay_headroom_blocks; k < num_blocks; ++k) {
+    current_size_block++;
+    if (current_size_block >= section_sizes[idx]) {
+      idx = idx + 1;
+      if (idx == section_sizes.size()) {
+        break;
+      }
+      estimator_boundaries_blocks[idx] = k + 1;
+      current_size_block = 0;
+    }
+  }
+  estimator_boundaries_blocks[section_sizes.size()] = num_blocks;
+  return estimator_boundaries_blocks;
+}
+
+std::array<float, SignalDependentErleEstimator::kSubbands>
+SetMaxErleSubbands(float max_erle_l, float max_erle_h, size_t limit_subband_l) {
+  std::array<float, SignalDependentErleEstimator::kSubbands> max_erle;
+  std::fill(max_erle.begin(), max_erle.begin() + limit_subband_l, max_erle_l);
+  std::fill(max_erle.begin() + limit_subband_l, max_erle.end(), max_erle_h);
+  return max_erle;
+}
+
+}  // namespace
+
+SignalDependentErleEstimator::SignalDependentErleEstimator(
+    const EchoCanceller3Config& config,
+    size_t num_capture_channels)
+    : min_erle_(config.erle.min),
+      num_sections_(config.erle.num_sections),
+      num_blocks_(config.filter.refined.length_blocks),
+      delay_headroom_blocks_(config.delay.delay_headroom_samples / kBlockSize),
+      band_to_subband_(FormSubbandMap()),
+      max_erle_(SetMaxErleSubbands(config.erle.max_l,
+                                   config.erle.max_h,
+                                   band_to_subband_[kFftLengthBy2 / 2])),
+      section_boundaries_blocks_(SetSectionsBoundaries(delay_headroom_blocks_,
+                                                       num_blocks_,
+                                                       num_sections_)),
+      use_onset_detection_(config.erle.onset_detection),
+      erle_(num_capture_channels),
+      erle_onset_compensated_(num_capture_channels),
+      S2_section_accum_(
+          num_capture_channels,
+          std::vector<std::array<float, kFftLengthBy2Plus1>>(num_sections_)),
+      erle_estimators_(
+          num_capture_channels,
+          std::vector<std::array<float, kSubbands>>(num_sections_)),
+      erle_ref_(num_capture_channels),
+      correction_factors_(
+          num_capture_channels,
+          std::vector<std::array<float, kSubbands>>(num_sections_)),
+      num_updates_(num_capture_channels),
+      n_active_sections_(num_capture_channels) {
+  RTC_DCHECK_LE(num_sections_, num_blocks_);
+  RTC_DCHECK_GE(num_sections_, 1);
+  Reset();
+}
+
+SignalDependentErleEstimator::~SignalDependentErleEstimator() = default;
+
+void SignalDependentErleEstimator::Reset() {
+  for (size_t ch = 0; ch < erle_.size(); ++ch) {
+    erle_[ch].fill(min_erle_);
+    erle_onset_compensated_[ch].fill(min_erle_);
+    for (auto& erle_estimator : erle_estimators_[ch]) {
+      erle_estimator.fill(min_erle_);
+    }
+    erle_ref_[ch].fill(min_erle_);
+    for (auto& factor : correction_factors_[ch]) {
+      factor.fill(1.0f);
+    }
+    num_updates_[ch].fill(0);
+    n_active_sections_[ch].fill(0);
+  }
+}
+
+// Updates the Erle estimate by analyzing the current input signals. It takes
+// the render buffer and the filter frequency response in order to do an
+// estimation of the number of sections of the linear filter that are needed
+// for getting the majority of the energy in the echo estimate. Based on that
+// number of sections, it updates the erle estimation by introducing a
+// correction factor to the erle that is given as an input to this method.
+void SignalDependentErleEstimator::Update(
+    const RenderBuffer& render_buffer,
+    rtc::ArrayView<const std::vector<std::array<float, kFftLengthBy2Plus1>>>
+        filter_frequency_responses,
+    rtc::ArrayView<const float, kFftLengthBy2Plus1> X2,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> E2,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> average_erle,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        average_erle_onset_compensated,
+    const std::vector<bool>& converged_filters) {
+  RTC_DCHECK_GT(num_sections_, 1);
+
+  // Gets the number of filter sections that are needed for achieving 90 %
+  // of the power spectrum energy of the echo estimate.
+  ComputeNumberOfActiveFilterSections(render_buffer,
+                                      filter_frequency_responses);
+
+  // Updates the correction factors that is used for correcting the erle and
+  // adapt it to the particular characteristics of the input signal.
+  UpdateCorrectionFactors(X2, Y2, E2, converged_filters);
+
+  // Applies the correction factor to the input erle for getting a more refined
+  // erle estimation for the current input signal.
+  for (size_t ch = 0; ch < erle_.size(); ++ch) {
+    for (size_t k = 0; k < kFftLengthBy2; ++k) {
+      RTC_DCHECK_GT(correction_factors_[ch].size(), n_active_sections_[ch][k]);
+      float correction_factor =
+          correction_factors_[ch][n_active_sections_[ch][k]]
+                             [band_to_subband_[k]];
+      erle_[ch][k] = rtc::SafeClamp(average_erle[ch][k] * correction_factor,
+                                    min_erle_, max_erle_[band_to_subband_[k]]);
+      if (use_onset_detection_) {
+        erle_onset_compensated_[ch][k] = rtc::SafeClamp(
+            average_erle_onset_compensated[ch][k] * correction_factor,
+            min_erle_, max_erle_[band_to_subband_[k]]);
+      }
+    }
+  }
+}
+
+void SignalDependentErleEstimator::Dump(
+    const std::unique_ptr<ApmDataDumper>& data_dumper) const {
+  for (auto& erle : erle_estimators_[0]) {
+    data_dumper->DumpRaw("aec3_all_erle", erle);
+  }
+  data_dumper->DumpRaw("aec3_ref_erle", erle_ref_[0]);
+  for (auto& factor : correction_factors_[0]) {
+    data_dumper->DumpRaw("aec3_erle_correction_factor", factor);
+  }
+}
+
+// Estimates for each band the smallest number of sections in the filter that
+// together constitute 90% of the estimated echo energy.
+void SignalDependentErleEstimator::ComputeNumberOfActiveFilterSections(
+    const RenderBuffer& render_buffer,
+    rtc::ArrayView<const std::vector<std::array<float, kFftLengthBy2Plus1>>>
+        filter_frequency_responses) {
+  RTC_DCHECK_GT(num_sections_, 1);
+  // Computes an approximation of the power spectrum if the filter would have
+  // been limited to a certain number of filter sections.
+  ComputeEchoEstimatePerFilterSection(render_buffer,
+                                      filter_frequency_responses);
+  // For each band, computes the number of filter sections that are needed for
+  // achieving the 90 % energy in the echo estimate.
+  ComputeActiveFilterSections();
+}
+
+void SignalDependentErleEstimator::UpdateCorrectionFactors(
+    rtc::ArrayView<const float, kFftLengthBy2Plus1> X2,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> E2,
+    const std::vector<bool>& converged_filters) {
+  for (size_t ch = 0; ch < converged_filters.size(); ++ch) {
+    if (converged_filters[ch]) {
+      constexpr float kX2BandEnergyThreshold = 44015068.0f;
+      constexpr float kSmthConstantDecreases = 0.1f;
+      constexpr float kSmthConstantIncreases = kSmthConstantDecreases / 2.f;
+      auto subband_powers = [](rtc::ArrayView<const float> power_spectrum,
+                               rtc::ArrayView<float> power_spectrum_subbands) {
+        for (size_t subband = 0; subband < kSubbands; ++subband) {
+          RTC_DCHECK_LE(kBandBoundaries[subband + 1], power_spectrum.size());
+          power_spectrum_subbands[subband] = std::accumulate(
+              power_spectrum.begin() + kBandBoundaries[subband],
+              power_spectrum.begin() + kBandBoundaries[subband + 1], 0.f);
+        }
+      };
+
+      std::array<float, kSubbands> X2_subbands, E2_subbands, Y2_subbands;
+      subband_powers(X2, X2_subbands);
+      subband_powers(E2[ch], E2_subbands);
+      subband_powers(Y2[ch], Y2_subbands);
+      std::array<size_t, kSubbands> idx_subbands;
+      for (size_t subband = 0; subband < kSubbands; ++subband) {
+        // When aggregating the number of active sections in the filter for
+        // different bands we choose to take the minimum of all of them. As an
+        // example, if for one of the bands it is the direct path its refined
+        // contributor to the final echo estimate, we consider the direct path
+        // is as well the refined contributor for the subband that contains that
+        // particular band. That aggregate number of sections will be later used
+        // as the identifier of the erle estimator that needs to be updated.
+        RTC_DCHECK_LE(kBandBoundaries[subband + 1],
+                      n_active_sections_[ch].size());
+        idx_subbands[subband] = *std::min_element(
+            n_active_sections_[ch].begin() + kBandBoundaries[subband],
+            n_active_sections_[ch].begin() + kBandBoundaries[subband + 1]);
+      }
+
+      std::array<float, kSubbands> new_erle;
+      std::array<bool, kSubbands> is_erle_updated;
+      is_erle_updated.fill(false);
+      new_erle.fill(0.f);
+      for (size_t subband = 0; subband < kSubbands; ++subband) {
+        if (X2_subbands[subband] > kX2BandEnergyThreshold &&
+            E2_subbands[subband] > 0) {
+          new_erle[subband] = Y2_subbands[subband] / E2_subbands[subband];
+          RTC_DCHECK_GT(new_erle[subband], 0);
+          is_erle_updated[subband] = true;
+          ++num_updates_[ch][subband];
+        }
+      }
+
+      for (size_t subband = 0; subband < kSubbands; ++subband) {
+        const size_t idx = idx_subbands[subband];
+        RTC_DCHECK_LT(idx, erle_estimators_[ch].size());
+        float alpha = new_erle[subband] > erle_estimators_[ch][idx][subband]
+                          ? kSmthConstantIncreases
+                          : kSmthConstantDecreases;
+        alpha = static_cast<float>(is_erle_updated[subband]) * alpha;
+        erle_estimators_[ch][idx][subband] +=
+            alpha * (new_erle[subband] - erle_estimators_[ch][idx][subband]);
+        erle_estimators_[ch][idx][subband] = rtc::SafeClamp(
+            erle_estimators_[ch][idx][subband], min_erle_, max_erle_[subband]);
+      }
+
+      for (size_t subband = 0; subband < kSubbands; ++subband) {
+        float alpha = new_erle[subband] > erle_ref_[ch][subband]
+                          ? kSmthConstantIncreases
+                          : kSmthConstantDecreases;
+        alpha = static_cast<float>(is_erle_updated[subband]) * alpha;
+        erle_ref_[ch][subband] +=
+            alpha * (new_erle[subband] - erle_ref_[ch][subband]);
+        erle_ref_[ch][subband] = rtc::SafeClamp(erle_ref_[ch][subband],
+                                                min_erle_, max_erle_[subband]);
+      }
+
+      for (size_t subband = 0; subband < kSubbands; ++subband) {
+        constexpr int kNumUpdateThr = 50;
+        if (is_erle_updated[subband] &&
+            num_updates_[ch][subband] > kNumUpdateThr) {
+          const size_t idx = idx_subbands[subband];
+          RTC_DCHECK_GT(erle_ref_[ch][subband], 0.f);
+          // Computes the ratio between the erle that is updated using all the
+          // points and the erle that is updated only on signals that share the
+          // same number of active filter sections.
+          float new_correction_factor =
+              erle_estimators_[ch][idx][subband] / erle_ref_[ch][subband];
+
+          correction_factors_[ch][idx][subband] +=
+              0.1f *
+              (new_correction_factor - correction_factors_[ch][idx][subband]);
+        }
+      }
+    }
+  }
+}
+
+void SignalDependentErleEstimator::ComputeEchoEstimatePerFilterSection(
+    const RenderBuffer& render_buffer,
+    rtc::ArrayView<const std::vector<std::array<float, kFftLengthBy2Plus1>>>
+        filter_frequency_responses) {
+  const SpectrumBuffer& spectrum_render_buffer =
+      render_buffer.GetSpectrumBuffer();
+  const size_t num_render_channels = spectrum_render_buffer.buffer[0].size();
+  const size_t num_capture_channels = S2_section_accum_.size();
+  const float one_by_num_render_channels = 1.f / num_render_channels;
+
+  RTC_DCHECK_EQ(S2_section_accum_.size(), filter_frequency_responses.size());
+
+  for (size_t capture_ch = 0; capture_ch < num_capture_channels; ++capture_ch) {
+    RTC_DCHECK_EQ(S2_section_accum_[capture_ch].size() + 1,
+                  section_boundaries_blocks_.size());
+    size_t idx_render = render_buffer.Position();
+    idx_render = spectrum_render_buffer.OffsetIndex(
+        idx_render, section_boundaries_blocks_[0]);
+
+    for (size_t section = 0; section < num_sections_; ++section) {
+      std::array<float, kFftLengthBy2Plus1> X2_section;
+      std::array<float, kFftLengthBy2Plus1> H2_section;
+      X2_section.fill(0.f);
+      H2_section.fill(0.f);
+      const size_t block_limit =
+          std::min(section_boundaries_blocks_[section + 1],
+                   filter_frequency_responses[capture_ch].size());
+      for (size_t block = section_boundaries_blocks_[section];
+           block < block_limit; ++block) {
+        for (size_t render_ch = 0;
+             render_ch < spectrum_render_buffer.buffer[idx_render].size();
+             ++render_ch) {
+          for (size_t k = 0; k < X2_section.size(); ++k) {
+            X2_section[k] +=
+                spectrum_render_buffer.buffer[idx_render][render_ch][k] *
+                one_by_num_render_channels;
+          }
+        }
+        std::transform(H2_section.begin(), H2_section.end(),
+                       filter_frequency_responses[capture_ch][block].begin(),
+                       H2_section.begin(), std::plus<float>());
+        idx_render = spectrum_render_buffer.IncIndex(idx_render);
+      }
+
+      std::transform(X2_section.begin(), X2_section.end(), H2_section.begin(),
+                     S2_section_accum_[capture_ch][section].begin(),
+                     std::multiplies<float>());
+    }
+
+    for (size_t section = 1; section < num_sections_; ++section) {
+      std::transform(S2_section_accum_[capture_ch][section - 1].begin(),
+                     S2_section_accum_[capture_ch][section - 1].end(),
+                     S2_section_accum_[capture_ch][section].begin(),
+                     S2_section_accum_[capture_ch][section].begin(),
+                     std::plus<float>());
+    }
+  }
+}
+
+void SignalDependentErleEstimator::ComputeActiveFilterSections() {
+  for (size_t ch = 0; ch < n_active_sections_.size(); ++ch) {
+    std::fill(n_active_sections_[ch].begin(), n_active_sections_[ch].end(), 0);
+    for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+      size_t section = num_sections_;
+      float target = 0.9f * S2_section_accum_[ch][num_sections_ - 1][k];
+      while (section > 0 && S2_section_accum_[ch][section - 1][k] >= target) {
+        n_active_sections_[ch][k] = --section;
+      }
+    }
+  }
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,104 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_SIGNAL_DEPENDENT_ERLE_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_SIGNAL_DEPENDENT_ERLE_ESTIMATOR_H_
+
+#include <memory>
+#include <vector>
+
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+
+namespace webrtc {
+
+// This class estimates the dependency of the Erle to the input signal. By
+// looking at the input signal, an estimation on whether the current echo
+// estimate is due to the direct path or to a more reverberant one is performed.
+// Once that estimation is done, it is possible to refine the average Erle that
+// this class receive as an input.
+class SignalDependentErleEstimator {
+ public:
+  SignalDependentErleEstimator(const EchoCanceller3Config& config,
+                               size_t num_capture_channels);
+
+  ~SignalDependentErleEstimator();
+
+  void Reset();
+
+  // Returns the Erle per frequency subband.
+  rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Erle(
+      bool onset_compensated) const {
+    return onset_compensated && use_onset_detection_ ? erle_onset_compensated_
+                                                     : erle_;
+  }
+
+  // Updates the Erle estimate. The Erle that is passed as an input is required
+  // to be an estimation of the average Erle achieved by the linear filter.
+  void Update(
+      const RenderBuffer& render_buffer,
+      rtc::ArrayView<const std::vector<std::array<float, kFftLengthBy2Plus1>>>
+          filter_frequency_response,
+      rtc::ArrayView<const float, kFftLengthBy2Plus1> X2,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> E2,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> average_erle,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+          average_erle_onset_compensated,
+      const std::vector<bool>& converged_filters);
+
+  void Dump(const std::unique_ptr<ApmDataDumper>& data_dumper) const;
+
+  static constexpr size_t kSubbands = 6;
+
+ private:
+  void ComputeNumberOfActiveFilterSections(
+      const RenderBuffer& render_buffer,
+      rtc::ArrayView<const std::vector<std::array<float, kFftLengthBy2Plus1>>>
+          filter_frequency_responses);
+
+  void UpdateCorrectionFactors(
+      rtc::ArrayView<const float, kFftLengthBy2Plus1> X2,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> E2,
+      const std::vector<bool>& converged_filters);
+
+  void ComputeEchoEstimatePerFilterSection(
+      const RenderBuffer& render_buffer,
+      rtc::ArrayView<const std::vector<std::array<float, kFftLengthBy2Plus1>>>
+          filter_frequency_responses);
+
+  void ComputeActiveFilterSections();
+
+  const float min_erle_;
+  const size_t num_sections_;
+  const size_t num_blocks_;
+  const size_t delay_headroom_blocks_;
+  const std::array<size_t, kFftLengthBy2Plus1> band_to_subband_;
+  const std::array<float, kSubbands> max_erle_;
+  const std::vector<size_t> section_boundaries_blocks_;
+  const bool use_onset_detection_;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> erle_;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> erle_onset_compensated_;
+  std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>>
+      S2_section_accum_;
+  std::vector<std::vector<std::array<float, kSubbands>>> erle_estimators_;
+  std::vector<std::array<float, kSubbands>> erle_ref_;
+  std::vector<std::vector<std::array<float, kSubbands>>> correction_factors_;
+  std::vector<std::array<int, kSubbands>> num_updates_;
+  std::vector<std::array<size_t, kFftLengthBy2Plus1>> n_active_sections_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_SIGNAL_DEPENDENT_ERLE_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/signal_dependent_erle_estimator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,209 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/signal_dependent_erle_estimator.h"
+
+#include <algorithm>
+#include <iostream>
+#include <string>
+
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+namespace {
+
+void GetActiveFrame(std::vector<std::vector<std::vector<float>>>* x) {
+  const std::array<float, kBlockSize> frame = {
+      7459.88, 17209.6, 17383,   20768.9, 16816.7, 18386.3, 4492.83, 9675.85,
+      6665.52, 14808.6, 9342.3,  7483.28, 19261.7, 4145.98, 1622.18, 13475.2,
+      7166.32, 6856.61, 21937,   7263.14, 9569.07, 14919,   8413.32, 7551.89,
+      7848.65, 6011.27, 13080.6, 15865.2, 12656,   17459.6, 4263.93, 4503.03,
+      9311.79, 21095.8, 12657.9, 13906.6, 19267.2, 11338.1, 16828.9, 11501.6,
+      11405,   15031.4, 14541.6, 19765.5, 18346.3, 19350.2, 3157.47, 18095.8,
+      1743.68, 21328.2, 19727.5, 7295.16, 10332.4, 11055.5, 20107.4, 14708.4,
+      12416.2, 16434,   2454.69, 9840.8,  6867.23, 1615.75, 6059.9,  8394.19};
+  for (size_t band = 0; band < x->size(); ++band) {
+    for (size_t channel = 0; channel < (*x)[band].size(); ++channel) {
+      RTC_DCHECK_GE((*x)[band][channel].size(), frame.size());
+      std::copy(frame.begin(), frame.end(), (*x)[band][channel].begin());
+    }
+  }
+}
+
+class TestInputs {
+ public:
+  TestInputs(const EchoCanceller3Config& cfg,
+             size_t num_render_channels,
+             size_t num_capture_channels);
+  ~TestInputs();
+  const RenderBuffer& GetRenderBuffer() { return *render_buffer_; }
+  rtc::ArrayView<const float, kFftLengthBy2Plus1> GetX2() { return X2_; }
+  rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> GetY2() const {
+    return Y2_;
+  }
+  rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> GetE2() const {
+    return E2_;
+  }
+  rtc::ArrayView<const std::vector<std::array<float, kFftLengthBy2Plus1>>>
+  GetH2() const {
+    return H2_;
+  }
+  const std::vector<bool>& GetConvergedFilters() const {
+    return converged_filters_;
+  }
+  void Update();
+
+ private:
+  void UpdateCurrentPowerSpectra();
+  int n_ = 0;
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer_;
+  RenderBuffer* render_buffer_;
+  std::array<float, kFftLengthBy2Plus1> X2_;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> Y2_;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> E2_;
+  std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>> H2_;
+  std::vector<std::vector<std::vector<float>>> x_;
+  std::vector<bool> converged_filters_;
+};
+
+TestInputs::TestInputs(const EchoCanceller3Config& cfg,
+                       size_t num_render_channels,
+                       size_t num_capture_channels)
+    : render_delay_buffer_(
+          RenderDelayBuffer::Create(cfg, 16000, num_render_channels)),
+      Y2_(num_capture_channels),
+      E2_(num_capture_channels),
+      H2_(num_capture_channels,
+          std::vector<std::array<float, kFftLengthBy2Plus1>>(
+              cfg.filter.refined.length_blocks)),
+      x_(1,
+         std::vector<std::vector<float>>(num_render_channels,
+                                         std::vector<float>(kBlockSize, 0.f))),
+      converged_filters_(num_capture_channels, true) {
+  render_delay_buffer_->AlignFromDelay(4);
+  render_buffer_ = render_delay_buffer_->GetRenderBuffer();
+  for (auto& H2_ch : H2_) {
+    for (auto& H2_p : H2_ch) {
+      H2_p.fill(0.f);
+    }
+  }
+  for (auto& H2_p : H2_[0]) {
+    H2_p.fill(1.f);
+  }
+}
+
+TestInputs::~TestInputs() = default;
+
+void TestInputs::Update() {
+  if (n_ % 2 == 0) {
+    std::fill(x_[0][0].begin(), x_[0][0].end(), 0.f);
+  } else {
+    GetActiveFrame(&x_);
+  }
+
+  render_delay_buffer_->Insert(x_);
+  render_delay_buffer_->PrepareCaptureProcessing();
+  UpdateCurrentPowerSpectra();
+  ++n_;
+}
+
+void TestInputs::UpdateCurrentPowerSpectra() {
+  const SpectrumBuffer& spectrum_render_buffer =
+      render_buffer_->GetSpectrumBuffer();
+  size_t idx = render_buffer_->Position();
+  size_t prev_idx = spectrum_render_buffer.OffsetIndex(idx, 1);
+  auto& X2 = spectrum_render_buffer.buffer[idx][/*channel=*/0];
+  auto& X2_prev = spectrum_render_buffer.buffer[prev_idx][/*channel=*/0];
+  std::copy(X2.begin(), X2.end(), X2_.begin());
+  for (size_t ch = 0; ch < Y2_.size(); ++ch) {
+    RTC_DCHECK_EQ(X2.size(), Y2_[ch].size());
+    for (size_t k = 0; k < X2.size(); ++k) {
+      E2_[ch][k] = 0.01f * X2_prev[k];
+      Y2_[ch][k] = X2[k] + E2_[ch][k];
+    }
+  }
+}
+
+}  // namespace
+
+class SignalDependentErleEstimatorMultiChannel
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<std::tuple<size_t, size_t>> {};
+
+INSTANTIATE_TEST_SUITE_P(MultiChannel,
+                         SignalDependentErleEstimatorMultiChannel,
+                         ::testing::Combine(::testing::Values(1, 2, 4),
+                                            ::testing::Values(1, 2, 4)));
+
+TEST_P(SignalDependentErleEstimatorMultiChannel, SweepSettings) {
+  const size_t num_render_channels = std::get<0>(GetParam());
+  const size_t num_capture_channels = std::get<1>(GetParam());
+  EchoCanceller3Config cfg;
+  size_t max_length_blocks = 50;
+  for (size_t blocks = 1; blocks < max_length_blocks; blocks = blocks + 10) {
+    for (size_t delay_headroom = 0; delay_headroom < 5; ++delay_headroom) {
+      for (size_t num_sections = 2; num_sections < max_length_blocks;
+           ++num_sections) {
+        cfg.filter.refined.length_blocks = blocks;
+        cfg.filter.refined_initial.length_blocks =
+            std::min(cfg.filter.refined_initial.length_blocks, blocks);
+        cfg.delay.delay_headroom_samples = delay_headroom * kBlockSize;
+        cfg.erle.num_sections = num_sections;
+        if (EchoCanceller3Config::Validate(&cfg)) {
+          SignalDependentErleEstimator s(cfg, num_capture_channels);
+          std::vector<std::array<float, kFftLengthBy2Plus1>> average_erle(
+              num_capture_channels);
+          for (auto& e : average_erle) {
+            e.fill(cfg.erle.max_l);
+          }
+          TestInputs inputs(cfg, num_render_channels, num_capture_channels);
+          for (size_t n = 0; n < 10; ++n) {
+            inputs.Update();
+            s.Update(inputs.GetRenderBuffer(), inputs.GetH2(), inputs.GetX2(),
+                     inputs.GetY2(), inputs.GetE2(), average_erle, average_erle,
+                     inputs.GetConvergedFilters());
+          }
+        }
+      }
+    }
+  }
+}
+
+TEST_P(SignalDependentErleEstimatorMultiChannel, LongerRun) {
+  const size_t num_render_channels = std::get<0>(GetParam());
+  const size_t num_capture_channels = std::get<1>(GetParam());
+  EchoCanceller3Config cfg;
+  cfg.filter.refined.length_blocks = 2;
+  cfg.filter.refined_initial.length_blocks = 1;
+  cfg.delay.delay_headroom_samples = 0;
+  cfg.delay.hysteresis_limit_blocks = 0;
+  cfg.erle.num_sections = 2;
+  EXPECT_EQ(EchoCanceller3Config::Validate(&cfg), true);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> average_erle(
+      num_capture_channels);
+  for (auto& e : average_erle) {
+    e.fill(cfg.erle.max_l);
+  }
+  SignalDependentErleEstimator s(cfg, num_capture_channels);
+  TestInputs inputs(cfg, num_render_channels, num_capture_channels);
+  for (size_t n = 0; n < 200; ++n) {
+    inputs.Update();
+    s.Update(inputs.GetRenderBuffer(), inputs.GetH2(), inputs.GetX2(),
+             inputs.GetY2(), inputs.GetE2(), average_erle, average_erle,
+             inputs.GetConvergedFilters());
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/spectrum_buffer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/spectrum_buffer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/spectrum_buffer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/spectrum_buffer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/spectrum_buffer.h"
+
+#include <algorithm>
+
+namespace webrtc {
+
+SpectrumBuffer::SpectrumBuffer(size_t size, size_t num_channels)
+    : size(static_cast<int>(size)),
+      buffer(size,
+             std::vector<std::array<float, kFftLengthBy2Plus1>>(num_channels)) {
+  for (auto& channel : buffer) {
+    for (auto& c : channel) {
+      std::fill(c.begin(), c.end(), 0.f);
+    }
+  }
+}
+
+SpectrumBuffer::~SpectrumBuffer() = default;
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/spectrum_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/spectrum_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/spectrum_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/spectrum_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_SPECTRUM_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_SPECTRUM_BUFFER_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <vector>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+// Struct for bundling a circular buffer of one dimensional vector objects
+// together with the read and write indices.
+struct SpectrumBuffer {
+  SpectrumBuffer(size_t size, size_t num_channels);
+  ~SpectrumBuffer();
+
+  int IncIndex(int index) const {
+    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
+    return index < size - 1 ? index + 1 : 0;
+  }
+
+  int DecIndex(int index) const {
+    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
+    return index > 0 ? index - 1 : size - 1;
+  }
+
+  int OffsetIndex(int index, int offset) const {
+    RTC_DCHECK_GE(size, offset);
+    RTC_DCHECK_EQ(buffer.size(), static_cast<size_t>(size));
+    RTC_DCHECK_GE(size + index + offset, 0);
+    return (size + index + offset) % size;
+  }
+
+  void UpdateWriteIndex(int offset) { write = OffsetIndex(write, offset); }
+  void IncWriteIndex() { write = IncIndex(write); }
+  void DecWriteIndex() { write = DecIndex(write); }
+  void UpdateReadIndex(int offset) { read = OffsetIndex(read, offset); }
+  void IncReadIndex() { read = IncIndex(read); }
+  void DecReadIndex() { read = DecIndex(read); }
+
+  const int size;
+  std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>> buffer;
+  int write = 0;
+  int read = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_SPECTRUM_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/stationarity_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/stationarity_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/stationarity_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/stationarity_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,243 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/stationarity_estimator.h"
+
+#include <algorithm>
+#include <array>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/spectrum_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/atomic_ops.h"
+
+namespace webrtc {
+
+namespace {
+constexpr float kMinNoisePower = 10.f;
+constexpr int kHangoverBlocks = kNumBlocksPerSecond / 20;
+constexpr int kNBlocksAverageInitPhase = 20;
+constexpr int kNBlocksInitialPhase = kNumBlocksPerSecond * 2.;
+}  // namespace
+
+StationarityEstimator::StationarityEstimator()
+    : data_dumper_(
+          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))) {
+  Reset();
+}
+
+StationarityEstimator::~StationarityEstimator() = default;
+
+void StationarityEstimator::Reset() {
+  noise_.Reset();
+  hangovers_.fill(0);
+  stationarity_flags_.fill(false);
+}
+
+// Update just the noise estimator. Usefull until the delay is known
+void StationarityEstimator::UpdateNoiseEstimator(
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> spectrum) {
+  noise_.Update(spectrum);
+  data_dumper_->DumpRaw("aec3_stationarity_noise_spectrum", noise_.Spectrum());
+  data_dumper_->DumpRaw("aec3_stationarity_is_block_stationary",
+                        IsBlockStationary());
+}
+
+void StationarityEstimator::UpdateStationarityFlags(
+    const SpectrumBuffer& spectrum_buffer,
+    rtc::ArrayView<const float> render_reverb_contribution_spectrum,
+    int idx_current,
+    int num_lookahead) {
+  std::array<int, kWindowLength> indexes;
+  int num_lookahead_bounded = std::min(num_lookahead, kWindowLength - 1);
+  int idx = idx_current;
+
+  if (num_lookahead_bounded < kWindowLength - 1) {
+    int num_lookback = (kWindowLength - 1) - num_lookahead_bounded;
+    idx = spectrum_buffer.OffsetIndex(idx_current, num_lookback);
+  }
+  // For estimating the stationarity properties of the current frame, the
+  // power for each band is accumulated for several consecutive spectra in the
+  // method EstimateBandStationarity.
+  // In order to avoid getting the indexes of the spectra for every band with
+  // its associated overhead, those indexes are stored in an array and then use
+  // when the estimation is done.
+  indexes[0] = idx;
+  for (size_t k = 1; k < indexes.size(); ++k) {
+    indexes[k] = spectrum_buffer.DecIndex(indexes[k - 1]);
+  }
+  RTC_DCHECK_EQ(
+      spectrum_buffer.DecIndex(indexes[kWindowLength - 1]),
+      spectrum_buffer.OffsetIndex(idx_current, -(num_lookahead_bounded + 1)));
+
+  for (size_t k = 0; k < stationarity_flags_.size(); ++k) {
+    stationarity_flags_[k] = EstimateBandStationarity(
+        spectrum_buffer, render_reverb_contribution_spectrum, indexes, k);
+  }
+  UpdateHangover();
+  SmoothStationaryPerFreq();
+}
+
+bool StationarityEstimator::IsBlockStationary() const {
+  float acum_stationarity = 0.f;
+  RTC_DCHECK_EQ(stationarity_flags_.size(), kFftLengthBy2Plus1);
+  for (size_t band = 0; band < stationarity_flags_.size(); ++band) {
+    bool st = IsBandStationary(band);
+    acum_stationarity += static_cast<float>(st);
+  }
+  return ((acum_stationarity * (1.f / kFftLengthBy2Plus1)) > 0.75f);
+}
+
+bool StationarityEstimator::EstimateBandStationarity(
+    const SpectrumBuffer& spectrum_buffer,
+    rtc::ArrayView<const float> average_reverb,
+    const std::array<int, kWindowLength>& indexes,
+    size_t band) const {
+  constexpr float kThrStationarity = 10.f;
+  float acum_power = 0.f;
+  const int num_render_channels =
+      static_cast<int>(spectrum_buffer.buffer[0].size());
+  const float one_by_num_channels = 1.f / num_render_channels;
+  for (auto idx : indexes) {
+    for (int ch = 0; ch < num_render_channels; ++ch) {
+      acum_power += spectrum_buffer.buffer[idx][ch][band] * one_by_num_channels;
+    }
+  }
+  acum_power += average_reverb[band];
+  float noise = kWindowLength * GetStationarityPowerBand(band);
+  RTC_CHECK_LT(0.f, noise);
+  bool stationary = acum_power < kThrStationarity * noise;
+  data_dumper_->DumpRaw("aec3_stationarity_long_ratio", acum_power / noise);
+  return stationary;
+}
+
+bool StationarityEstimator::AreAllBandsStationary() {
+  for (auto b : stationarity_flags_) {
+    if (!b)
+      return false;
+  }
+  return true;
+}
+
+void StationarityEstimator::UpdateHangover() {
+  bool reduce_hangover = AreAllBandsStationary();
+  for (size_t k = 0; k < stationarity_flags_.size(); ++k) {
+    if (!stationarity_flags_[k]) {
+      hangovers_[k] = kHangoverBlocks;
+    } else if (reduce_hangover) {
+      hangovers_[k] = std::max(hangovers_[k] - 1, 0);
+    }
+  }
+}
+
+void StationarityEstimator::SmoothStationaryPerFreq() {
+  std::array<bool, kFftLengthBy2Plus1> all_ahead_stationary_smooth;
+  for (size_t k = 1; k < kFftLengthBy2Plus1 - 1; ++k) {
+    all_ahead_stationary_smooth[k] = stationarity_flags_[k - 1] &&
+                                     stationarity_flags_[k] &&
+                                     stationarity_flags_[k + 1];
+  }
+
+  all_ahead_stationary_smooth[0] = all_ahead_stationary_smooth[1];
+  all_ahead_stationary_smooth[kFftLengthBy2Plus1 - 1] =
+      all_ahead_stationary_smooth[kFftLengthBy2Plus1 - 2];
+
+  stationarity_flags_ = all_ahead_stationary_smooth;
+}
+
+int StationarityEstimator::instance_count_ = 0;
+
+StationarityEstimator::NoiseSpectrum::NoiseSpectrum() {
+  Reset();
+}
+
+StationarityEstimator::NoiseSpectrum::~NoiseSpectrum() = default;
+
+void StationarityEstimator::NoiseSpectrum::Reset() {
+  block_counter_ = 0;
+  noise_spectrum_.fill(kMinNoisePower);
+}
+
+void StationarityEstimator::NoiseSpectrum::Update(
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> spectrum) {
+  RTC_DCHECK_LE(1, spectrum[0].size());
+  const int num_render_channels = static_cast<int>(spectrum.size());
+
+  std::array<float, kFftLengthBy2Plus1> avg_spectrum_data;
+  rtc::ArrayView<const float> avg_spectrum;
+  if (num_render_channels == 1) {
+    avg_spectrum = spectrum[0];
+  } else {
+    // For multiple channels, average the channel spectra before passing to the
+    // noise spectrum estimator.
+    avg_spectrum = avg_spectrum_data;
+    std::copy(spectrum[0].begin(), spectrum[0].end(),
+              avg_spectrum_data.begin());
+    for (int ch = 1; ch < num_render_channels; ++ch) {
+      for (size_t k = 1; k < kFftLengthBy2Plus1; ++k) {
+        avg_spectrum_data[k] += spectrum[ch][k];
+      }
+    }
+
+    const float one_by_num_channels = 1.f / num_render_channels;
+    for (size_t k = 1; k < kFftLengthBy2Plus1; ++k) {
+      avg_spectrum_data[k] *= one_by_num_channels;
+    }
+  }
+
+  ++block_counter_;
+  float alpha = GetAlpha();
+  for (size_t k = 0; k < kFftLengthBy2Plus1; ++k) {
+    if (block_counter_ <= kNBlocksAverageInitPhase) {
+      noise_spectrum_[k] += (1.f / kNBlocksAverageInitPhase) * avg_spectrum[k];
+    } else {
+      noise_spectrum_[k] =
+          UpdateBandBySmoothing(avg_spectrum[k], noise_spectrum_[k], alpha);
+    }
+  }
+}
+
+float StationarityEstimator::NoiseSpectrum::GetAlpha() const {
+  constexpr float kAlpha = 0.004f;
+  constexpr float kAlphaInit = 0.04f;
+  constexpr float kTiltAlpha = (kAlphaInit - kAlpha) / kNBlocksInitialPhase;
+
+  if (block_counter_ > (kNBlocksInitialPhase + kNBlocksAverageInitPhase)) {
+    return kAlpha;
+  } else {
+    return kAlphaInit -
+           kTiltAlpha * (block_counter_ - kNBlocksAverageInitPhase);
+  }
+}
+
+float StationarityEstimator::NoiseSpectrum::UpdateBandBySmoothing(
+    float power_band,
+    float power_band_noise,
+    float alpha) const {
+  float power_band_noise_updated = power_band_noise;
+  if (power_band_noise < power_band) {
+    RTC_DCHECK_GT(power_band, 0.f);
+    float alpha_inc = alpha * (power_band_noise / power_band);
+    if (block_counter_ > kNBlocksInitialPhase) {
+      if (10.f * power_band_noise < power_band) {
+        alpha_inc *= 0.1f;
+      }
+    }
+    power_band_noise_updated += alpha_inc * (power_band - power_band_noise);
+  } else {
+    power_band_noise_updated += alpha * (power_band - power_band_noise);
+    power_band_noise_updated =
+        std::max(power_band_noise_updated, kMinNoisePower);
+  }
+  return power_band_noise_updated;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/stationarity_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/stationarity_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/stationarity_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/stationarity_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,122 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_STATIONARITY_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_STATIONARITY_ESTIMATOR_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <memory>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"  // kFftLengthBy2Plus1...
+#include "modules/audio_processing/aec3/reverb_model.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+struct SpectrumBuffer;
+
+class StationarityEstimator {
+ public:
+  StationarityEstimator();
+  ~StationarityEstimator();
+
+  // Reset the stationarity estimator.
+  void Reset();
+
+  // Update just the noise estimator. Usefull until the delay is known
+  void UpdateNoiseEstimator(
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> spectrum);
+
+  // Update the flag indicating whether this current frame is stationary. For
+  // getting a more robust estimation, it looks at future and/or past frames.
+  void UpdateStationarityFlags(
+      const SpectrumBuffer& spectrum_buffer,
+      rtc::ArrayView<const float> render_reverb_contribution_spectrum,
+      int idx_current,
+      int num_lookahead);
+
+  // Returns true if the current band is stationary.
+  bool IsBandStationary(size_t band) const {
+    return stationarity_flags_[band] && (hangovers_[band] == 0);
+  }
+
+  // Returns true if the current block is estimated as stationary.
+  bool IsBlockStationary() const;
+
+ private:
+  static constexpr int kWindowLength = 13;
+  // Returns the power of the stationary noise spectrum at a band.
+  float GetStationarityPowerBand(size_t k) const { return noise_.Power(k); }
+
+  // Get an estimation of the stationarity for the current band by looking
+  // at the past/present/future available data.
+  bool EstimateBandStationarity(const SpectrumBuffer& spectrum_buffer,
+                                rtc::ArrayView<const float> average_reverb,
+                                const std::array<int, kWindowLength>& indexes,
+                                size_t band) const;
+
+  // True if all bands at the current point are stationary.
+  bool AreAllBandsStationary();
+
+  // Update the hangover depending on the stationary status of the current
+  // frame.
+  void UpdateHangover();
+
+  // Smooth the stationarity detection by looking at neighbouring frequency
+  // bands.
+  void SmoothStationaryPerFreq();
+
+  class NoiseSpectrum {
+   public:
+    NoiseSpectrum();
+    ~NoiseSpectrum();
+
+    // Reset the noise power spectrum estimate state.
+    void Reset();
+
+    // Update the noise power spectrum with a new frame.
+    void Update(
+        rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> spectrum);
+
+    // Get the noise estimation power spectrum.
+    rtc::ArrayView<const float> Spectrum() const { return noise_spectrum_; }
+
+    // Get the noise power spectrum at a certain band.
+    float Power(size_t band) const {
+      RTC_DCHECK_LT(band, noise_spectrum_.size());
+      return noise_spectrum_[band];
+    }
+
+   private:
+    // Get the update coefficient to be used for the current frame.
+    float GetAlpha() const;
+
+    // Update the noise power spectrum at a certain band with a new frame.
+    float UpdateBandBySmoothing(float power_band,
+                                float power_band_noise,
+                                float alpha) const;
+    std::array<float, kFftLengthBy2Plus1> noise_spectrum_;
+    size_t block_counter_;
+  };
+
+  static int instance_count_;
+  std::unique_ptr<ApmDataDumper> data_dumper_;
+  NoiseSpectrum noise_;
+  std::array<int, kFftLengthBy2Plus1> hangovers_;
+  std::array<bool, kFftLengthBy2Plus1> stationarity_flags_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_STATIONARITY_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_erle_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_erle_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_erle_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_erle_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,240 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/subband_erle_estimator.h"
+
+#include <algorithm>
+#include <functional>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_minmax.h"
+#include "system_wrappers/include/field_trial.h"
+
+namespace webrtc {
+
+namespace {
+
+constexpr float kX2BandEnergyThreshold = 44015068.0f;
+constexpr int kBlocksToHoldErle = 100;
+constexpr int kBlocksForOnsetDetection = kBlocksToHoldErle + 150;
+constexpr int kPointsToAccumulate = 6;
+
+std::array<float, kFftLengthBy2Plus1> SetMaxErleBands(float max_erle_l,
+                                                      float max_erle_h) {
+  std::array<float, kFftLengthBy2Plus1> max_erle;
+  std::fill(max_erle.begin(), max_erle.begin() + kFftLengthBy2 / 2, max_erle_l);
+  std::fill(max_erle.begin() + kFftLengthBy2 / 2, max_erle.end(), max_erle_h);
+  return max_erle;
+}
+
+bool EnableMinErleDuringOnsets() {
+  return !field_trial::IsEnabled("WebRTC-Aec3MinErleDuringOnsetsKillSwitch");
+}
+
+}  // namespace
+
+SubbandErleEstimator::SubbandErleEstimator(const EchoCanceller3Config& config,
+                                           size_t num_capture_channels)
+    : use_onset_detection_(config.erle.onset_detection),
+      min_erle_(config.erle.min),
+      max_erle_(SetMaxErleBands(config.erle.max_l, config.erle.max_h)),
+      use_min_erle_during_onsets_(EnableMinErleDuringOnsets()),
+      accum_spectra_(num_capture_channels),
+      erle_(num_capture_channels),
+      erle_onset_compensated_(num_capture_channels),
+      erle_during_onsets_(num_capture_channels),
+      coming_onset_(num_capture_channels),
+      hold_counters_(num_capture_channels) {
+  Reset();
+}
+
+SubbandErleEstimator::~SubbandErleEstimator() = default;
+
+void SubbandErleEstimator::Reset() {
+  const size_t num_capture_channels = erle_.size();
+  for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+    erle_[ch].fill(min_erle_);
+    erle_onset_compensated_[ch].fill(min_erle_);
+    erle_during_onsets_[ch].fill(min_erle_);
+    coming_onset_[ch].fill(true);
+    hold_counters_[ch].fill(0);
+  }
+  ResetAccumulatedSpectra();
+}
+
+void SubbandErleEstimator::Update(
+    rtc::ArrayView<const float, kFftLengthBy2Plus1> X2,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> E2,
+    const std::vector<bool>& converged_filters) {
+  UpdateAccumulatedSpectra(X2, Y2, E2, converged_filters);
+  UpdateBands(converged_filters);
+
+  if (use_onset_detection_) {
+    DecreaseErlePerBandForLowRenderSignals();
+  }
+
+  const size_t num_capture_channels = erle_.size();
+  for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+    auto& erle = erle_[ch];
+    erle[0] = erle[1];
+    erle[kFftLengthBy2] = erle[kFftLengthBy2 - 1];
+
+    auto& erle_oc = erle_onset_compensated_[ch];
+    erle_oc[0] = erle_oc[1];
+    erle_oc[kFftLengthBy2] = erle_oc[kFftLengthBy2 - 1];
+  }
+}
+
+void SubbandErleEstimator::Dump(
+    const std::unique_ptr<ApmDataDumper>& data_dumper) const {
+  data_dumper->DumpRaw("aec3_erle_onset", ErleDuringOnsets()[0]);
+}
+
+void SubbandErleEstimator::UpdateBands(
+    const std::vector<bool>& converged_filters) {
+  const int num_capture_channels = static_cast<int>(accum_spectra_.Y2.size());
+  for (int ch = 0; ch < num_capture_channels; ++ch) {
+    // Note that the use of the converged_filter flag already imposed
+    // a minimum of the erle that can be estimated as that flag would
+    // be false if the filter is performing poorly.
+    if (!converged_filters[ch]) {
+      continue;
+    }
+
+    if (accum_spectra_.num_points[ch] != kPointsToAccumulate) {
+      continue;
+    }
+
+    std::array<float, kFftLengthBy2> new_erle;
+    std::array<bool, kFftLengthBy2> is_erle_updated;
+    is_erle_updated.fill(false);
+
+    for (size_t k = 1; k < kFftLengthBy2; ++k) {
+      if (accum_spectra_.E2[ch][k] > 0.f) {
+        new_erle[k] = accum_spectra_.Y2[ch][k] / accum_spectra_.E2[ch][k];
+        is_erle_updated[k] = true;
+      }
+    }
+
+    if (use_onset_detection_) {
+      for (size_t k = 1; k < kFftLengthBy2; ++k) {
+        if (is_erle_updated[k] && !accum_spectra_.low_render_energy[ch][k]) {
+          if (coming_onset_[ch][k]) {
+            coming_onset_[ch][k] = false;
+            if (!use_min_erle_during_onsets_) {
+              float alpha =
+                  new_erle[k] < erle_during_onsets_[ch][k] ? 0.3f : 0.15f;
+              erle_during_onsets_[ch][k] = rtc::SafeClamp(
+                  erle_during_onsets_[ch][k] +
+                      alpha * (new_erle[k] - erle_during_onsets_[ch][k]),
+                  min_erle_, max_erle_[k]);
+            }
+          }
+          hold_counters_[ch][k] = kBlocksForOnsetDetection;
+        }
+      }
+    }
+
+    auto update_erle_band = [](float& erle, float new_erle,
+                               bool low_render_energy, float min_erle,
+                               float max_erle) {
+      float alpha = 0.05f;
+      if (new_erle < erle) {
+        alpha = low_render_energy ? 0.f : 0.1f;
+      }
+      erle =
+          rtc::SafeClamp(erle + alpha * (new_erle - erle), min_erle, max_erle);
+    };
+
+    for (size_t k = 1; k < kFftLengthBy2; ++k) {
+      if (is_erle_updated[k]) {
+        const bool low_render_energy = accum_spectra_.low_render_energy[ch][k];
+        update_erle_band(erle_[ch][k], new_erle[k], low_render_energy,
+                         min_erle_, max_erle_[k]);
+        if (use_onset_detection_) {
+          update_erle_band(erle_onset_compensated_[ch][k], new_erle[k],
+                           low_render_energy, min_erle_, max_erle_[k]);
+        }
+      }
+    }
+  }
+}
+
+void SubbandErleEstimator::DecreaseErlePerBandForLowRenderSignals() {
+  const int num_capture_channels = static_cast<int>(accum_spectra_.Y2.size());
+  for (int ch = 0; ch < num_capture_channels; ++ch) {
+    for (size_t k = 1; k < kFftLengthBy2; ++k) {
+      --hold_counters_[ch][k];
+      if (hold_counters_[ch][k] <=
+          (kBlocksForOnsetDetection - kBlocksToHoldErle)) {
+        if (erle_onset_compensated_[ch][k] > erle_during_onsets_[ch][k]) {
+          erle_onset_compensated_[ch][k] =
+              std::max(erle_during_onsets_[ch][k],
+                       0.97f * erle_onset_compensated_[ch][k]);
+          RTC_DCHECK_LE(min_erle_, erle_onset_compensated_[ch][k]);
+        }
+        if (hold_counters_[ch][k] <= 0) {
+          coming_onset_[ch][k] = true;
+          hold_counters_[ch][k] = 0;
+        }
+      }
+    }
+  }
+}
+
+void SubbandErleEstimator::ResetAccumulatedSpectra() {
+  for (size_t ch = 0; ch < erle_during_onsets_.size(); ++ch) {
+    accum_spectra_.Y2[ch].fill(0.f);
+    accum_spectra_.E2[ch].fill(0.f);
+    accum_spectra_.num_points[ch] = 0;
+    accum_spectra_.low_render_energy[ch].fill(false);
+  }
+}
+
+void SubbandErleEstimator::UpdateAccumulatedSpectra(
+    rtc::ArrayView<const float, kFftLengthBy2Plus1> X2,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> E2,
+    const std::vector<bool>& converged_filters) {
+  auto& st = accum_spectra_;
+  RTC_DCHECK_EQ(st.E2.size(), E2.size());
+  RTC_DCHECK_EQ(st.E2.size(), E2.size());
+  const int num_capture_channels = static_cast<int>(Y2.size());
+  for (int ch = 0; ch < num_capture_channels; ++ch) {
+    // Note that the use of the converged_filter flag already imposed
+    // a minimum of the erle that can be estimated as that flag would
+    // be false if the filter is performing poorly.
+    if (!converged_filters[ch]) {
+      continue;
+    }
+
+    if (st.num_points[ch] == kPointsToAccumulate) {
+      st.num_points[ch] = 0;
+      st.Y2[ch].fill(0.f);
+      st.E2[ch].fill(0.f);
+      st.low_render_energy[ch].fill(false);
+    }
+
+    std::transform(Y2[ch].begin(), Y2[ch].end(), st.Y2[ch].begin(),
+                   st.Y2[ch].begin(), std::plus<float>());
+    std::transform(E2[ch].begin(), E2[ch].end(), st.E2[ch].begin(),
+                   st.E2[ch].begin(), std::plus<float>());
+
+    for (size_t k = 0; k < X2.size(); ++k) {
+      st.low_render_energy[ch][k] =
+          st.low_render_energy[ch][k] || X2[k] < kX2BandEnergyThreshold;
+    }
+
+    ++st.num_points[ch];
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_erle_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_erle_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_erle_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_erle_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,99 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBBAND_ERLE_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_SUBBAND_ERLE_ESTIMATOR_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <memory>
+#include <vector>
+
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+
+namespace webrtc {
+
+// Estimates the echo return loss enhancement for each frequency subband.
+class SubbandErleEstimator {
+ public:
+  SubbandErleEstimator(const EchoCanceller3Config& config,
+                       size_t num_capture_channels);
+  ~SubbandErleEstimator();
+
+  // Resets the ERLE estimator.
+  void Reset();
+
+  // Updates the ERLE estimate.
+  void Update(rtc::ArrayView<const float, kFftLengthBy2Plus1> X2,
+              rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+              rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> E2,
+              const std::vector<bool>& converged_filters);
+
+  // Returns the ERLE estimate.
+  rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Erle(
+      bool onset_compensated) const {
+    return onset_compensated && use_onset_detection_ ? erle_onset_compensated_
+                                                     : erle_;
+  }
+
+  // Returns the ERLE estimate at onsets (only used for testing).
+  rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> ErleDuringOnsets()
+      const {
+    return erle_during_onsets_;
+  }
+
+  void Dump(const std::unique_ptr<ApmDataDumper>& data_dumper) const;
+
+ private:
+  struct AccumulatedSpectra {
+    explicit AccumulatedSpectra(size_t num_capture_channels)
+        : Y2(num_capture_channels),
+          E2(num_capture_channels),
+          low_render_energy(num_capture_channels),
+          num_points(num_capture_channels) {}
+    std::vector<std::array<float, kFftLengthBy2Plus1>> Y2;
+    std::vector<std::array<float, kFftLengthBy2Plus1>> E2;
+    std::vector<std::array<bool, kFftLengthBy2Plus1>> low_render_energy;
+    std::vector<int> num_points;
+  };
+
+  void UpdateAccumulatedSpectra(
+      rtc::ArrayView<const float, kFftLengthBy2Plus1> X2,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> Y2,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> E2,
+      const std::vector<bool>& converged_filters);
+
+  void ResetAccumulatedSpectra();
+
+  void UpdateBands(const std::vector<bool>& converged_filters);
+  void DecreaseErlePerBandForLowRenderSignals();
+
+  const bool use_onset_detection_;
+  const float min_erle_;
+  const std::array<float, kFftLengthBy2Plus1> max_erle_;
+  const bool use_min_erle_during_onsets_;
+  AccumulatedSpectra accum_spectra_;
+  // ERLE without special handling of render onsets.
+  std::vector<std::array<float, kFftLengthBy2Plus1>> erle_;
+  // ERLE lowered during render onsets.
+  std::vector<std::array<float, kFftLengthBy2Plus1>> erle_onset_compensated_;
+  // Estimation of ERLE during render onsets.
+  std::vector<std::array<float, kFftLengthBy2Plus1>> erle_during_onsets_;
+  std::vector<std::array<bool, kFftLengthBy2Plus1>> coming_onset_;
+  std::vector<std::array<int, kFftLengthBy2Plus1>> hold_counters_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUBBAND_ERLE_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_nearend_detector.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_nearend_detector.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_nearend_detector.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_nearend_detector.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/subband_nearend_detector.h"
+
+#include <numeric>
+
+namespace webrtc {
+SubbandNearendDetector::SubbandNearendDetector(
+    const EchoCanceller3Config::Suppressor::SubbandNearendDetection& config,
+    size_t num_capture_channels)
+    : config_(config),
+      num_capture_channels_(num_capture_channels),
+      nearend_smoothers_(num_capture_channels_,
+                         aec3::MovingAverage(kFftLengthBy2Plus1,
+                                             config_.nearend_average_blocks)),
+      one_over_subband_length1_(
+          1.f / (config_.subband1.high - config_.subband1.low + 1)),
+      one_over_subband_length2_(
+          1.f / (config_.subband2.high - config_.subband2.low + 1)) {}
+
+void SubbandNearendDetector::Update(
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        nearend_spectrum,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        residual_echo_spectrum,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        comfort_noise_spectrum,
+    bool initial_state) {
+  nearend_state_ = false;
+  for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+    const std::array<float, kFftLengthBy2Plus1>& noise =
+        comfort_noise_spectrum[ch];
+    std::array<float, kFftLengthBy2Plus1> nearend;
+    nearend_smoothers_[ch].Average(nearend_spectrum[ch], nearend);
+
+    // Noise power of the first region.
+    float noise_power =
+        std::accumulate(noise.begin() + config_.subband1.low,
+                        noise.begin() + config_.subband1.high + 1, 0.f) *
+        one_over_subband_length1_;
+
+    // Nearend power of the first region.
+    float nearend_power_subband1 =
+        std::accumulate(nearend.begin() + config_.subband1.low,
+                        nearend.begin() + config_.subband1.high + 1, 0.f) *
+        one_over_subband_length1_;
+
+    // Nearend power of the second region.
+    float nearend_power_subband2 =
+        std::accumulate(nearend.begin() + config_.subband2.low,
+                        nearend.begin() + config_.subband2.high + 1, 0.f) *
+        one_over_subband_length2_;
+
+    // One channel is sufficient to trigger nearend state.
+    nearend_state_ =
+        nearend_state_ ||
+        (nearend_power_subband1 <
+             config_.nearend_threshold * nearend_power_subband2 &&
+         (nearend_power_subband1 > config_.snr_threshold * noise_power));
+  }
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_nearend_detector.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_nearend_detector.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_nearend_detector.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subband_nearend_detector.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBBAND_NEAREND_DETECTOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_SUBBAND_NEAREND_DETECTOR_H_
+
+#include <vector>
+
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/moving_average.h"
+#include "modules/audio_processing/aec3/nearend_detector.h"
+
+namespace webrtc {
+// Class for selecting whether the suppressor is in the nearend or echo state.
+class SubbandNearendDetector : public NearendDetector {
+ public:
+  SubbandNearendDetector(
+      const EchoCanceller3Config::Suppressor::SubbandNearendDetection& config,
+      size_t num_capture_channels);
+
+  // Returns whether the current state is the nearend state.
+  bool IsNearendState() const override { return nearend_state_; }
+
+  // Updates the state selection based on latest spectral estimates.
+  void Update(rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+                  nearend_spectrum,
+              rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+                  residual_echo_spectrum,
+              rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+                  comfort_noise_spectrum,
+              bool initial_state) override;
+
+ private:
+  const EchoCanceller3Config::Suppressor::SubbandNearendDetection config_;
+  const size_t num_capture_channels_;
+  std::vector<aec3::MovingAverage> nearend_smoothers_;
+  const float one_over_subband_length1_;
+  const float one_over_subband_length2_;
+  bool nearend_state_ = false;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUBBAND_NEAREND_DETECTOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,345 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/subtractor.h"
+
+#include <algorithm>
+#include <utility>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/adaptive_fir_filter_erl.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_minmax.h"
+#include "system_wrappers/include/field_trial.h"
+
+namespace webrtc {
+
+namespace {
+
+bool UseCoarseFilterResetHangover() {
+  return !field_trial::IsEnabled(
+      "WebRTC-Aec3CoarseFilterResetHangoverKillSwitch");
+}
+
+void PredictionError(const Aec3Fft& fft,
+                     const FftData& S,
+                     rtc::ArrayView<const float> y,
+                     std::array<float, kBlockSize>* e,
+                     std::array<float, kBlockSize>* s) {
+  std::array<float, kFftLength> tmp;
+  fft.Ifft(S, &tmp);
+  constexpr float kScale = 1.0f / kFftLengthBy2;
+  std::transform(y.begin(), y.end(), tmp.begin() + kFftLengthBy2, e->begin(),
+                 [&](float a, float b) { return a - b * kScale; });
+
+  if (s) {
+    for (size_t k = 0; k < s->size(); ++k) {
+      (*s)[k] = kScale * tmp[k + kFftLengthBy2];
+    }
+  }
+}
+
+void ScaleFilterOutput(rtc::ArrayView<const float> y,
+                       float factor,
+                       rtc::ArrayView<float> e,
+                       rtc::ArrayView<float> s) {
+  RTC_DCHECK_EQ(y.size(), e.size());
+  RTC_DCHECK_EQ(y.size(), s.size());
+  for (size_t k = 0; k < y.size(); ++k) {
+    s[k] *= factor;
+    e[k] = y[k] - s[k];
+  }
+}
+
+}  // namespace
+
+Subtractor::Subtractor(const EchoCanceller3Config& config,
+                       size_t num_render_channels,
+                       size_t num_capture_channels,
+                       ApmDataDumper* data_dumper,
+                       Aec3Optimization optimization)
+    : fft_(),
+      data_dumper_(data_dumper),
+      optimization_(optimization),
+      config_(config),
+      num_capture_channels_(num_capture_channels),
+      use_coarse_filter_reset_hangover_(UseCoarseFilterResetHangover()),
+      refined_filters_(num_capture_channels_),
+      coarse_filter_(num_capture_channels_),
+      refined_gains_(num_capture_channels_),
+      coarse_gains_(num_capture_channels_),
+      filter_misadjustment_estimators_(num_capture_channels_),
+      poor_coarse_filter_counters_(num_capture_channels_, 0),
+      coarse_filter_reset_hangover_(num_capture_channels_, 0),
+      refined_frequency_responses_(
+          num_capture_channels_,
+          std::vector<std::array<float, kFftLengthBy2Plus1>>(
+              std::max(config_.filter.refined_initial.length_blocks,
+                       config_.filter.refined.length_blocks),
+              std::array<float, kFftLengthBy2Plus1>())),
+      refined_impulse_responses_(
+          num_capture_channels_,
+          std::vector<float>(GetTimeDomainLength(std::max(
+                                 config_.filter.refined_initial.length_blocks,
+                                 config_.filter.refined.length_blocks)),
+                             0.f)) {
+  for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+    refined_filters_[ch] = std::make_unique<AdaptiveFirFilter>(
+        config_.filter.refined.length_blocks,
+        config_.filter.refined_initial.length_blocks,
+        config.filter.config_change_duration_blocks, num_render_channels,
+        optimization, data_dumper_);
+
+    coarse_filter_[ch] = std::make_unique<AdaptiveFirFilter>(
+        config_.filter.coarse.length_blocks,
+        config_.filter.coarse_initial.length_blocks,
+        config.filter.config_change_duration_blocks, num_render_channels,
+        optimization, data_dumper_);
+    refined_gains_[ch] = std::make_unique<RefinedFilterUpdateGain>(
+        config_.filter.refined_initial,
+        config_.filter.config_change_duration_blocks);
+    coarse_gains_[ch] = std::make_unique<CoarseFilterUpdateGain>(
+        config_.filter.coarse_initial,
+        config.filter.config_change_duration_blocks);
+  }
+
+  RTC_DCHECK(data_dumper_);
+  for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+    for (auto& H2_k : refined_frequency_responses_[ch]) {
+      H2_k.fill(0.f);
+    }
+  }
+}
+
+Subtractor::~Subtractor() = default;
+
+void Subtractor::HandleEchoPathChange(
+    const EchoPathVariability& echo_path_variability) {
+  const auto full_reset = [&]() {
+    for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+      refined_filters_[ch]->HandleEchoPathChange();
+      coarse_filter_[ch]->HandleEchoPathChange();
+      refined_gains_[ch]->HandleEchoPathChange(echo_path_variability);
+      coarse_gains_[ch]->HandleEchoPathChange();
+      refined_gains_[ch]->SetConfig(config_.filter.refined_initial, true);
+      coarse_gains_[ch]->SetConfig(config_.filter.coarse_initial, true);
+      refined_filters_[ch]->SetSizePartitions(
+          config_.filter.refined_initial.length_blocks, true);
+      coarse_filter_[ch]->SetSizePartitions(
+          config_.filter.coarse_initial.length_blocks, true);
+    }
+  };
+
+  if (echo_path_variability.delay_change !=
+      EchoPathVariability::DelayAdjustment::kNone) {
+    full_reset();
+  }
+
+  if (echo_path_variability.gain_change) {
+    for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+      refined_gains_[ch]->HandleEchoPathChange(echo_path_variability);
+    }
+  }
+}
+
+void Subtractor::ExitInitialState() {
+  for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+    refined_gains_[ch]->SetConfig(config_.filter.refined, false);
+    coarse_gains_[ch]->SetConfig(config_.filter.coarse, false);
+    refined_filters_[ch]->SetSizePartitions(
+        config_.filter.refined.length_blocks, false);
+    coarse_filter_[ch]->SetSizePartitions(config_.filter.coarse.length_blocks,
+                                          false);
+  }
+}
+
+void Subtractor::Process(const RenderBuffer& render_buffer,
+                         const std::vector<std::vector<float>>& capture,
+                         const RenderSignalAnalyzer& render_signal_analyzer,
+                         const AecState& aec_state,
+                         rtc::ArrayView<SubtractorOutput> outputs) {
+  RTC_DCHECK_EQ(num_capture_channels_, capture.size());
+
+  // Compute the render powers.
+  const bool same_filter_sizes = refined_filters_[0]->SizePartitions() ==
+                                 coarse_filter_[0]->SizePartitions();
+  std::array<float, kFftLengthBy2Plus1> X2_refined;
+  std::array<float, kFftLengthBy2Plus1> X2_coarse_data;
+  auto& X2_coarse = same_filter_sizes ? X2_refined : X2_coarse_data;
+  if (same_filter_sizes) {
+    render_buffer.SpectralSum(refined_filters_[0]->SizePartitions(),
+                              &X2_refined);
+  } else if (refined_filters_[0]->SizePartitions() >
+             coarse_filter_[0]->SizePartitions()) {
+    render_buffer.SpectralSums(coarse_filter_[0]->SizePartitions(),
+                               refined_filters_[0]->SizePartitions(),
+                               &X2_coarse, &X2_refined);
+  } else {
+    render_buffer.SpectralSums(refined_filters_[0]->SizePartitions(),
+                               coarse_filter_[0]->SizePartitions(), &X2_refined,
+                               &X2_coarse);
+  }
+
+  // Process all capture channels
+  for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+    RTC_DCHECK_EQ(kBlockSize, capture[ch].size());
+    SubtractorOutput& output = outputs[ch];
+    rtc::ArrayView<const float> y = capture[ch];
+    FftData& E_refined = output.E_refined;
+    FftData E_coarse;
+    std::array<float, kBlockSize>& e_refined = output.e_refined;
+    std::array<float, kBlockSize>& e_coarse = output.e_coarse;
+
+    FftData S;
+    FftData& G = S;
+
+    // Form the outputs of the refined and coarse filters.
+    refined_filters_[ch]->Filter(render_buffer, &S);
+    PredictionError(fft_, S, y, &e_refined, &output.s_refined);
+
+    coarse_filter_[ch]->Filter(render_buffer, &S);
+    PredictionError(fft_, S, y, &e_coarse, &output.s_coarse);
+
+    // Compute the signal powers in the subtractor output.
+    output.ComputeMetrics(y);
+
+    // Adjust the filter if needed.
+    bool refined_filters_adjusted = false;
+    filter_misadjustment_estimators_[ch].Update(output);
+    if (filter_misadjustment_estimators_[ch].IsAdjustmentNeeded()) {
+      float scale = filter_misadjustment_estimators_[ch].GetMisadjustment();
+      refined_filters_[ch]->ScaleFilter(scale);
+      for (auto& h_k : refined_impulse_responses_[ch]) {
+        h_k *= scale;
+      }
+      ScaleFilterOutput(y, scale, e_refined, output.s_refined);
+      filter_misadjustment_estimators_[ch].Reset();
+      refined_filters_adjusted = true;
+    }
+
+    // Compute the FFts of the refined and coarse filter outputs.
+    fft_.ZeroPaddedFft(e_refined, Aec3Fft::Window::kHanning, &E_refined);
+    fft_.ZeroPaddedFft(e_coarse, Aec3Fft::Window::kHanning, &E_coarse);
+
+    // Compute spectra for future use.
+    E_coarse.Spectrum(optimization_, output.E2_coarse);
+    E_refined.Spectrum(optimization_, output.E2_refined);
+
+    // Update the refined filter.
+    if (!refined_filters_adjusted) {
+      // Do not allow the performance of the coarse filter to affect the
+      // adaptation speed of the refined filter just after the coarse filter has
+      // been reset.
+      const bool disallow_leakage_diverged =
+          coarse_filter_reset_hangover_[ch] > 0 &&
+          use_coarse_filter_reset_hangover_;
+
+      std::array<float, kFftLengthBy2Plus1> erl;
+      ComputeErl(optimization_, refined_frequency_responses_[ch], erl);
+      refined_gains_[ch]->Compute(X2_refined, render_signal_analyzer, output,
+                                  erl, refined_filters_[ch]->SizePartitions(),
+                                  aec_state.SaturatedCapture(),
+                                  disallow_leakage_diverged, &G);
+    } else {
+      G.re.fill(0.f);
+      G.im.fill(0.f);
+    }
+    refined_filters_[ch]->Adapt(render_buffer, G,
+                                &refined_impulse_responses_[ch]);
+    refined_filters_[ch]->ComputeFrequencyResponse(
+        &refined_frequency_responses_[ch]);
+
+    if (ch == 0) {
+      data_dumper_->DumpRaw("aec3_subtractor_G_refined", G.re);
+      data_dumper_->DumpRaw("aec3_subtractor_G_refined", G.im);
+    }
+
+    // Update the coarse filter.
+    poor_coarse_filter_counters_[ch] =
+        output.e2_refined < output.e2_coarse
+            ? poor_coarse_filter_counters_[ch] + 1
+            : 0;
+    if (poor_coarse_filter_counters_[ch] < 5) {
+      coarse_gains_[ch]->Compute(X2_coarse, render_signal_analyzer, E_coarse,
+                                 coarse_filter_[ch]->SizePartitions(),
+                                 aec_state.SaturatedCapture(), &G);
+      coarse_filter_reset_hangover_[ch] =
+          std::max(coarse_filter_reset_hangover_[ch] - 1, 0);
+    } else {
+      poor_coarse_filter_counters_[ch] = 0;
+      coarse_filter_[ch]->SetFilter(refined_filters_[ch]->SizePartitions(),
+                                    refined_filters_[ch]->GetFilter());
+      coarse_gains_[ch]->Compute(X2_coarse, render_signal_analyzer, E_refined,
+                                 coarse_filter_[ch]->SizePartitions(),
+                                 aec_state.SaturatedCapture(), &G);
+      coarse_filter_reset_hangover_[ch] =
+          config_.filter.coarse_reset_hangover_blocks;
+    }
+
+    coarse_filter_[ch]->Adapt(render_buffer, G);
+    if (ch == 0) {
+      data_dumper_->DumpRaw("aec3_subtractor_G_coarse", G.re);
+      data_dumper_->DumpRaw("aec3_subtractor_G_coarse", G.im);
+      filter_misadjustment_estimators_[ch].Dump(data_dumper_);
+      DumpFilters();
+    }
+
+    std::for_each(e_refined.begin(), e_refined.end(),
+                  [](float& a) { a = rtc::SafeClamp(a, -32768.f, 32767.f); });
+
+    if (ch == 0) {
+      data_dumper_->DumpWav("aec3_refined_filters_output", kBlockSize,
+                            &e_refined[0], 16000, 1);
+      data_dumper_->DumpWav("aec3_coarse_filter_output", kBlockSize,
+                            &e_coarse[0], 16000, 1);
+    }
+  }
+}
+
+void Subtractor::FilterMisadjustmentEstimator::Update(
+    const SubtractorOutput& output) {
+  e2_acum_ += output.e2_refined;
+  y2_acum_ += output.y2;
+  if (++n_blocks_acum_ == n_blocks_) {
+    if (y2_acum_ > n_blocks_ * 200.f * 200.f * kBlockSize) {
+      float update = (e2_acum_ / y2_acum_);
+      if (e2_acum_ > n_blocks_ * 7500.f * 7500.f * kBlockSize) {
+        // Duration equal to blockSizeMs * n_blocks_ * 4.
+        overhang_ = 4;
+      } else {
+        overhang_ = std::max(overhang_ - 1, 0);
+      }
+
+      if ((update < inv_misadjustment_) || (overhang_ > 0)) {
+        inv_misadjustment_ += 0.1f * (update - inv_misadjustment_);
+      }
+    }
+    e2_acum_ = 0.f;
+    y2_acum_ = 0.f;
+    n_blocks_acum_ = 0;
+  }
+}
+
+void Subtractor::FilterMisadjustmentEstimator::Reset() {
+  e2_acum_ = 0.f;
+  y2_acum_ = 0.f;
+  n_blocks_acum_ = 0;
+  inv_misadjustment_ = 0.f;
+  overhang_ = 0.f;
+}
+
+void Subtractor::FilterMisadjustmentEstimator::Dump(
+    ApmDataDumper* data_dumper) const {
+  data_dumper->DumpRaw("aec3_inv_misadjustment_factor", inv_misadjustment_);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,139 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_
+
+#include <math.h>
+#include <stddef.h>
+
+#include <array>
+#include <vector>
+
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/adaptive_fir_filter.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/aec3_fft.h"
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "modules/audio_processing/aec3/coarse_filter_update_gain.h"
+#include "modules/audio_processing/aec3/echo_path_variability.h"
+#include "modules/audio_processing/aec3/refined_filter_update_gain.h"
+#include "modules/audio_processing/aec3/render_buffer.h"
+#include "modules/audio_processing/aec3/render_signal_analyzer.h"
+#include "modules/audio_processing/aec3/subtractor_output.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+// Proves linear echo cancellation functionality
+class Subtractor {
+ public:
+  Subtractor(const EchoCanceller3Config& config,
+             size_t num_render_channels,
+             size_t num_capture_channels,
+             ApmDataDumper* data_dumper,
+             Aec3Optimization optimization);
+  ~Subtractor();
+  Subtractor(const Subtractor&) = delete;
+  Subtractor& operator=(const Subtractor&) = delete;
+
+  // Performs the echo subtraction.
+  void Process(const RenderBuffer& render_buffer,
+               const std::vector<std::vector<float>>& capture,
+               const RenderSignalAnalyzer& render_signal_analyzer,
+               const AecState& aec_state,
+               rtc::ArrayView<SubtractorOutput> outputs);
+
+  void HandleEchoPathChange(const EchoPathVariability& echo_path_variability);
+
+  // Exits the initial state.
+  void ExitInitialState();
+
+  // Returns the block-wise frequency responses for the refined adaptive
+  // filters.
+  const std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>>&
+  FilterFrequencyResponses() const {
+    return refined_frequency_responses_;
+  }
+
+  // Returns the estimates of the impulse responses for the refined adaptive
+  // filters.
+  const std::vector<std::vector<float>>& FilterImpulseResponses() const {
+    return refined_impulse_responses_;
+  }
+
+  void DumpFilters() {
+    data_dumper_->DumpRaw(
+        "aec3_subtractor_h_refined",
+        rtc::ArrayView<const float>(
+            refined_impulse_responses_[0].data(),
+            GetTimeDomainLength(
+                refined_filters_[0]->max_filter_size_partitions())));
+
+    refined_filters_[0]->DumpFilter("aec3_subtractor_H_refined");
+    coarse_filter_[0]->DumpFilter("aec3_subtractor_H_coarse");
+  }
+
+ private:
+  class FilterMisadjustmentEstimator {
+   public:
+    FilterMisadjustmentEstimator() = default;
+    ~FilterMisadjustmentEstimator() = default;
+    // Update the misadjustment estimator.
+    void Update(const SubtractorOutput& output);
+    // GetMisadjustment() Returns a recommended scale for the filter so the
+    // prediction error energy gets closer to the energy that is seen at the
+    // microphone input.
+    float GetMisadjustment() const {
+      RTC_DCHECK_GT(inv_misadjustment_, 0.0f);
+      // It is not aiming to adjust all the estimated mismatch. Instead,
+      // it adjusts half of that estimated mismatch.
+      return 2.f / sqrtf(inv_misadjustment_);
+    }
+    // Returns true if the prediciton error energy is significantly larger
+    // than the microphone signal energy and, therefore, an adjustment is
+    // recommended.
+    bool IsAdjustmentNeeded() const { return inv_misadjustment_ > 10.f; }
+    void Reset();
+    void Dump(ApmDataDumper* data_dumper) const;
+
+   private:
+    const int n_blocks_ = 4;
+    int n_blocks_acum_ = 0;
+    float e2_acum_ = 0.f;
+    float y2_acum_ = 0.f;
+    float inv_misadjustment_ = 0.f;
+    int overhang_ = 0.f;
+  };
+
+  const Aec3Fft fft_;
+  ApmDataDumper* data_dumper_;
+  const Aec3Optimization optimization_;
+  const EchoCanceller3Config config_;
+  const size_t num_capture_channels_;
+  const bool use_coarse_filter_reset_hangover_;
+
+  std::vector<std::unique_ptr<AdaptiveFirFilter>> refined_filters_;
+  std::vector<std::unique_ptr<AdaptiveFirFilter>> coarse_filter_;
+  std::vector<std::unique_ptr<RefinedFilterUpdateGain>> refined_gains_;
+  std::vector<std::unique_ptr<CoarseFilterUpdateGain>> coarse_gains_;
+  std::vector<FilterMisadjustmentEstimator> filter_misadjustment_estimators_;
+  std::vector<size_t> poor_coarse_filter_counters_;
+  std::vector<int> coarse_filter_reset_hangover_;
+  std::vector<std::vector<std::array<float, kFftLengthBy2Plus1>>>
+      refined_frequency_responses_;
+  std::vector<std::vector<float>> refined_impulse_responses_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output_analyzer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output_analyzer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output_analyzer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output_analyzer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/subtractor_output_analyzer.h"
+
+#include <algorithm>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+
+namespace webrtc {
+
+SubtractorOutputAnalyzer::SubtractorOutputAnalyzer(size_t num_capture_channels)
+    : filters_converged_(num_capture_channels, false) {}
+
+void SubtractorOutputAnalyzer::Update(
+    rtc::ArrayView<const SubtractorOutput> subtractor_output,
+    bool* any_filter_converged,
+    bool* any_coarse_filter_converged,
+    bool* all_filters_diverged) {
+  RTC_DCHECK(any_filter_converged);
+  RTC_DCHECK(all_filters_diverged);
+  RTC_DCHECK_EQ(subtractor_output.size(), filters_converged_.size());
+
+  *any_filter_converged = false;
+  *any_coarse_filter_converged = false;
+  *all_filters_diverged = true;
+
+  for (size_t ch = 0; ch < subtractor_output.size(); ++ch) {
+    const float y2 = subtractor_output[ch].y2;
+    const float e2_refined = subtractor_output[ch].e2_refined;
+    const float e2_coarse = subtractor_output[ch].e2_coarse;
+
+    constexpr float kConvergenceThreshold = 50 * 50 * kBlockSize;
+    constexpr float kConvergenceThresholdLowLevel = 20 * 20 * kBlockSize;
+    bool refined_filter_converged =
+        e2_refined < 0.5f * y2 && y2 > kConvergenceThreshold;
+    bool coarse_filter_converged_strict =
+        e2_coarse < 0.05f * y2 && y2 > kConvergenceThreshold;
+    bool coarse_filter_converged_relaxed =
+        e2_coarse < 0.2f * y2 && y2 > kConvergenceThresholdLowLevel;
+    float min_e2 = std::min(e2_refined, e2_coarse);
+    bool filter_diverged = min_e2 > 1.5f * y2 && y2 > 30.f * 30.f * kBlockSize;
+    filters_converged_[ch] =
+        refined_filter_converged || coarse_filter_converged_strict;
+
+    *any_filter_converged = *any_filter_converged || filters_converged_[ch];
+    *any_coarse_filter_converged =
+        *any_coarse_filter_converged || coarse_filter_converged_relaxed;
+    *all_filters_diverged = *all_filters_diverged && filter_diverged;
+  }
+}
+
+void SubtractorOutputAnalyzer::HandleEchoPathChange() {
+  std::fill(filters_converged_.begin(), filters_converged_.end(), false);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output_analyzer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output_analyzer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output_analyzer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output_analyzer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_ANALYZER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_ANALYZER_H_
+
+#include <vector>
+
+#include "modules/audio_processing/aec3/subtractor_output.h"
+
+namespace webrtc {
+
+// Class for analyzing the properties subtractor output.
+class SubtractorOutputAnalyzer {
+ public:
+  explicit SubtractorOutputAnalyzer(size_t num_capture_channels);
+  ~SubtractorOutputAnalyzer() = default;
+
+  // Analyses the subtractor output.
+  void Update(rtc::ArrayView<const SubtractorOutput> subtractor_output,
+              bool* any_filter_converged,
+              bool* any_coarse_filter_converged,
+              bool* all_filters_diverged);
+
+  const std::vector<bool>& ConvergedFilters() const {
+    return filters_converged_;
+  }
+
+  // Handle echo path change.
+  void HandleEchoPathChange();
+
+ private:
+  std::vector<bool> filters_converged_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_ANALYZER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/subtractor_output.h"
+
+#include <numeric>
+
+namespace webrtc {
+
+SubtractorOutput::SubtractorOutput() = default;
+SubtractorOutput::~SubtractorOutput() = default;
+
+void SubtractorOutput::Reset() {
+  s_refined.fill(0.f);
+  s_coarse.fill(0.f);
+  e_refined.fill(0.f);
+  e_coarse.fill(0.f);
+  E_refined.re.fill(0.f);
+  E_refined.im.fill(0.f);
+  E2_refined.fill(0.f);
+  E2_coarse.fill(0.f);
+  e2_refined = 0.f;
+  e2_coarse = 0.f;
+  s2_refined = 0.f;
+  s2_coarse = 0.f;
+  y2 = 0.f;
+}
+
+void SubtractorOutput::ComputeMetrics(rtc::ArrayView<const float> y) {
+  const auto sum_of_squares = [](float a, float b) { return a + b * b; };
+  y2 = std::accumulate(y.begin(), y.end(), 0.f, sum_of_squares);
+  e2_refined =
+      std::accumulate(e_refined.begin(), e_refined.end(), 0.f, sum_of_squares);
+  e2_coarse =
+      std::accumulate(e_coarse.begin(), e_coarse.end(), 0.f, sum_of_squares);
+  s2_refined =
+      std::accumulate(s_refined.begin(), s_refined.end(), 0.f, sum_of_squares);
+  s2_coarse =
+      std::accumulate(s_coarse.begin(), s_coarse.end(), 0.f, sum_of_squares);
+
+  s_refined_max_abs = *std::max_element(s_refined.begin(), s_refined.end());
+  s_refined_max_abs =
+      std::max(s_refined_max_abs,
+               -(*std::min_element(s_refined.begin(), s_refined.end())));
+
+  s_coarse_max_abs = *std::max_element(s_coarse.begin(), s_coarse.end());
+  s_coarse_max_abs = std::max(
+      s_coarse_max_abs, -(*std::min_element(s_coarse.begin(), s_coarse.end())));
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_output.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_
+
+#include <array>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+
+namespace webrtc {
+
+// Stores the values being returned from the echo subtractor for a single
+// capture channel.
+struct SubtractorOutput {
+  SubtractorOutput();
+  ~SubtractorOutput();
+
+  std::array<float, kBlockSize> s_refined;
+  std::array<float, kBlockSize> s_coarse;
+  std::array<float, kBlockSize> e_refined;
+  std::array<float, kBlockSize> e_coarse;
+  FftData E_refined;
+  std::array<float, kFftLengthBy2Plus1> E2_refined;
+  std::array<float, kFftLengthBy2Plus1> E2_coarse;
+  float s2_refined = 0.f;
+  float s2_coarse = 0.f;
+  float e2_refined = 0.f;
+  float e2_coarse = 0.f;
+  float y2 = 0.f;
+  float s_refined_max_abs = 0.f;
+  float s_coarse_max_abs = 0.f;
+
+  // Reset the struct content.
+  void Reset();
+
+  // Updates the powers of the signals.
+  void ComputeMetrics(rtc::ArrayView<const float> y);
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUBTRACTOR_OUTPUT_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/subtractor_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,337 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/subtractor.h"
+
+#include <algorithm>
+#include <memory>
+#include <numeric>
+#include <string>
+
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/test/echo_canceller_test_tools.h"
+#include "modules/audio_processing/utility/cascaded_biquad_filter.h"
+#include "rtc_base/random.h"
+#include "rtc_base/strings/string_builder.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+std::vector<float> RunSubtractorTest(
+    size_t num_render_channels,
+    size_t num_capture_channels,
+    int num_blocks_to_process,
+    int delay_samples,
+    int refined_filter_length_blocks,
+    int coarse_filter_length_blocks,
+    bool uncorrelated_inputs,
+    const std::vector<int>& blocks_with_echo_path_changes) {
+  ApmDataDumper data_dumper(42);
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+  EchoCanceller3Config config;
+  config.filter.refined.length_blocks = refined_filter_length_blocks;
+  config.filter.coarse.length_blocks = coarse_filter_length_blocks;
+
+  Subtractor subtractor(config, num_render_channels, num_capture_channels,
+                        &data_dumper, DetectOptimization());
+  absl::optional<DelayEstimate> delay_estimate;
+  std::vector<std::vector<std::vector<float>>> x(
+      kNumBands, std::vector<std::vector<float>>(
+                     num_render_channels, std::vector<float>(kBlockSize, 0.f)));
+  std::vector<std::vector<float>> y(num_capture_channels,
+                                    std::vector<float>(kBlockSize, 0.f));
+  std::array<float, kBlockSize> x_old;
+  std::vector<SubtractorOutput> output(num_capture_channels);
+  config.delay.default_delay = 1;
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, kSampleRateHz, num_render_channels));
+  RenderSignalAnalyzer render_signal_analyzer(config);
+  Random random_generator(42U);
+  Aec3Fft fft;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> Y2(num_capture_channels);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> E2_refined(
+      num_capture_channels);
+  std::array<float, kFftLengthBy2Plus1> E2_coarse;
+  AecState aec_state(config, num_capture_channels);
+  x_old.fill(0.f);
+  for (auto& Y2_ch : Y2) {
+    Y2_ch.fill(0.f);
+  }
+  for (auto& E2_refined_ch : E2_refined) {
+    E2_refined_ch.fill(0.f);
+  }
+  E2_coarse.fill(0.f);
+
+  std::vector<std::vector<std::unique_ptr<DelayBuffer<float>>>> delay_buffer(
+      num_capture_channels);
+  for (size_t capture_ch = 0; capture_ch < num_capture_channels; ++capture_ch) {
+    delay_buffer[capture_ch].resize(num_render_channels);
+    for (size_t render_ch = 0; render_ch < num_render_channels; ++render_ch) {
+      delay_buffer[capture_ch][render_ch] =
+          std::make_unique<DelayBuffer<float>>(delay_samples);
+    }
+  }
+
+  // [B,A] = butter(2,100/8000,'high')
+  constexpr CascadedBiQuadFilter::BiQuadCoefficients
+      kHighPassFilterCoefficients = {{0.97261f, -1.94523f, 0.97261f},
+                                     {-1.94448f, 0.94598f}};
+  std::vector<std::unique_ptr<CascadedBiQuadFilter>> x_hp_filter(
+      num_render_channels);
+  for (size_t ch = 0; ch < num_render_channels; ++ch) {
+    x_hp_filter[ch] =
+        std::make_unique<CascadedBiQuadFilter>(kHighPassFilterCoefficients, 1);
+  }
+  std::vector<std::unique_ptr<CascadedBiQuadFilter>> y_hp_filter(
+      num_capture_channels);
+  for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+    y_hp_filter[ch] =
+        std::make_unique<CascadedBiQuadFilter>(kHighPassFilterCoefficients, 1);
+  }
+
+  for (int k = 0; k < num_blocks_to_process; ++k) {
+    for (size_t render_ch = 0; render_ch < num_render_channels; ++render_ch) {
+      RandomizeSampleVector(&random_generator, x[0][render_ch]);
+    }
+    if (uncorrelated_inputs) {
+      for (size_t capture_ch = 0; capture_ch < num_capture_channels;
+           ++capture_ch) {
+        RandomizeSampleVector(&random_generator, y[capture_ch]);
+      }
+    } else {
+      for (size_t capture_ch = 0; capture_ch < num_capture_channels;
+           ++capture_ch) {
+        for (size_t render_ch = 0; render_ch < num_render_channels;
+             ++render_ch) {
+          std::array<float, kBlockSize> y_channel;
+          delay_buffer[capture_ch][render_ch]->Delay(x[0][render_ch],
+                                                     y_channel);
+          for (size_t k = 0; k < y.size(); ++k) {
+            y[capture_ch][k] += y_channel[k] / num_render_channels;
+          }
+        }
+      }
+    }
+    for (size_t ch = 0; ch < num_render_channels; ++ch) {
+      x_hp_filter[ch]->Process(x[0][ch]);
+    }
+    for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+      y_hp_filter[ch]->Process(y[ch]);
+    }
+
+    render_delay_buffer->Insert(x);
+    if (k == 0) {
+      render_delay_buffer->Reset();
+    }
+    render_delay_buffer->PrepareCaptureProcessing();
+    render_signal_analyzer.Update(*render_delay_buffer->GetRenderBuffer(),
+                                  aec_state.MinDirectPathFilterDelay());
+
+    // Handle echo path changes.
+    if (std::find(blocks_with_echo_path_changes.begin(),
+                  blocks_with_echo_path_changes.end(),
+                  k) != blocks_with_echo_path_changes.end()) {
+      subtractor.HandleEchoPathChange(EchoPathVariability(
+          true, EchoPathVariability::DelayAdjustment::kNewDetectedDelay,
+          false));
+    }
+    subtractor.Process(*render_delay_buffer->GetRenderBuffer(), y,
+                       render_signal_analyzer, aec_state, output);
+
+    aec_state.HandleEchoPathChange(EchoPathVariability(
+        false, EchoPathVariability::DelayAdjustment::kNone, false));
+    aec_state.Update(delay_estimate, subtractor.FilterFrequencyResponses(),
+                     subtractor.FilterImpulseResponses(),
+                     *render_delay_buffer->GetRenderBuffer(), E2_refined, Y2,
+                     output);
+  }
+
+  std::vector<float> results(num_capture_channels);
+  for (size_t ch = 0; ch < num_capture_channels; ++ch) {
+    const float output_power = std::inner_product(
+        output[ch].e_refined.begin(), output[ch].e_refined.end(),
+        output[ch].e_refined.begin(), 0.f);
+    const float y_power =
+        std::inner_product(y[ch].begin(), y[ch].end(), y[ch].begin(), 0.f);
+    if (y_power == 0.f) {
+      ADD_FAILURE();
+      results[ch] = -1.f;
+    }
+    results[ch] = output_power / y_power;
+  }
+  return results;
+}
+
+std::string ProduceDebugText(size_t num_render_channels,
+                             size_t num_capture_channels,
+                             size_t delay,
+                             int filter_length_blocks) {
+  rtc::StringBuilder ss;
+  ss << "delay: " << delay << ", ";
+  ss << "filter_length_blocks:" << filter_length_blocks << ", ";
+  ss << "num_render_channels:" << num_render_channels << ", ";
+  ss << "num_capture_channels:" << num_capture_channels;
+  return ss.Release();
+}
+
+}  // namespace
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies that the check for non data dumper works.
+TEST(SubtractorDeathTest, NullDataDumper) {
+  EXPECT_DEATH(
+      Subtractor(EchoCanceller3Config(), 1, 1, nullptr, DetectOptimization()),
+      "");
+}
+
+// Verifies the check for the capture signal size.
+TEST(Subtractor, WrongCaptureSize) {
+  ApmDataDumper data_dumper(42);
+  EchoCanceller3Config config;
+  Subtractor subtractor(config, 1, 1, &data_dumper, DetectOptimization());
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, 48000, 1));
+  RenderSignalAnalyzer render_signal_analyzer(config);
+  std::vector<std::vector<float>> y(1, std::vector<float>(kBlockSize - 1, 0.f));
+  std::array<SubtractorOutput, 1> output;
+
+  EXPECT_DEATH(
+      subtractor.Process(*render_delay_buffer->GetRenderBuffer(), y,
+                         render_signal_analyzer, AecState(config, 1), output),
+      "");
+}
+
+#endif
+
+// Verifies that the subtractor is able to converge on correlated data.
+TEST(Subtractor, Convergence) {
+  std::vector<int> blocks_with_echo_path_changes;
+  for (size_t filter_length_blocks : {12, 20, 30}) {
+    for (size_t delay_samples : {0, 64, 150, 200, 301}) {
+      SCOPED_TRACE(ProduceDebugText(1, 1, delay_samples, filter_length_blocks));
+      std::vector<float> echo_to_nearend_powers = RunSubtractorTest(
+          1, 1, 2500, delay_samples, filter_length_blocks, filter_length_blocks,
+          false, blocks_with_echo_path_changes);
+
+      for (float echo_to_nearend_power : echo_to_nearend_powers) {
+        EXPECT_GT(0.1f, echo_to_nearend_power);
+      }
+    }
+  }
+}
+
+// Verifies that the subtractor is able to handle the case when the refined
+// filter is longer than the coarse filter.
+TEST(Subtractor, RefinedFilterLongerThanCoarseFilter) {
+  std::vector<int> blocks_with_echo_path_changes;
+  std::vector<float> echo_to_nearend_powers = RunSubtractorTest(
+      1, 1, 400, 64, 20, 15, false, blocks_with_echo_path_changes);
+  for (float echo_to_nearend_power : echo_to_nearend_powers) {
+    EXPECT_GT(0.5f, echo_to_nearend_power);
+  }
+}
+
+// Verifies that the subtractor is able to handle the case when the coarse
+// filter is longer than the refined filter.
+TEST(Subtractor, CoarseFilterLongerThanRefinedFilter) {
+  std::vector<int> blocks_with_echo_path_changes;
+  std::vector<float> echo_to_nearend_powers = RunSubtractorTest(
+      1, 1, 400, 64, 15, 20, false, blocks_with_echo_path_changes);
+  for (float echo_to_nearend_power : echo_to_nearend_powers) {
+    EXPECT_GT(0.5f, echo_to_nearend_power);
+  }
+}
+
+// Verifies that the subtractor does not converge on uncorrelated signals.
+TEST(Subtractor, NonConvergenceOnUncorrelatedSignals) {
+  std::vector<int> blocks_with_echo_path_changes;
+  for (size_t filter_length_blocks : {12, 20, 30}) {
+    for (size_t delay_samples : {0, 64, 150, 200, 301}) {
+      SCOPED_TRACE(ProduceDebugText(1, 1, delay_samples, filter_length_blocks));
+
+      std::vector<float> echo_to_nearend_powers = RunSubtractorTest(
+          1, 1, 3000, delay_samples, filter_length_blocks, filter_length_blocks,
+          true, blocks_with_echo_path_changes);
+      for (float echo_to_nearend_power : echo_to_nearend_powers) {
+        EXPECT_NEAR(1.f, echo_to_nearend_power, 0.1);
+      }
+    }
+  }
+}
+
+class SubtractorMultiChannelUpToEightRender
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<std::tuple<size_t, size_t>> {};
+
+#if defined(NDEBUG)
+INSTANTIATE_TEST_SUITE_P(NonDebugMultiChannel,
+                         SubtractorMultiChannelUpToEightRender,
+                         ::testing::Combine(::testing::Values(1, 2, 8),
+                                            ::testing::Values(1, 2, 4)));
+#else
+INSTANTIATE_TEST_SUITE_P(DebugMultiChannel,
+                         SubtractorMultiChannelUpToEightRender,
+                         ::testing::Combine(::testing::Values(1, 2),
+                                            ::testing::Values(1, 2)));
+#endif
+
+// Verifies that the subtractor is able to converge on correlated data.
+TEST_P(SubtractorMultiChannelUpToEightRender, Convergence) {
+  const size_t num_render_channels = std::get<0>(GetParam());
+  const size_t num_capture_channels = std::get<1>(GetParam());
+
+  std::vector<int> blocks_with_echo_path_changes;
+  size_t num_blocks_to_process = 2500 * num_render_channels;
+  std::vector<float> echo_to_nearend_powers = RunSubtractorTest(
+      num_render_channels, num_capture_channels, num_blocks_to_process, 64, 20,
+      20, false, blocks_with_echo_path_changes);
+
+  for (float echo_to_nearend_power : echo_to_nearend_powers) {
+    EXPECT_GT(0.1f, echo_to_nearend_power);
+  }
+}
+
+class SubtractorMultiChannelUpToFourRender
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<std::tuple<size_t, size_t>> {};
+
+#if defined(NDEBUG)
+INSTANTIATE_TEST_SUITE_P(NonDebugMultiChannel,
+                         SubtractorMultiChannelUpToFourRender,
+                         ::testing::Combine(::testing::Values(1, 2, 4),
+                                            ::testing::Values(1, 2, 4)));
+#else
+INSTANTIATE_TEST_SUITE_P(DebugMultiChannel,
+                         SubtractorMultiChannelUpToFourRender,
+                         ::testing::Combine(::testing::Values(1, 2),
+                                            ::testing::Values(1, 2)));
+#endif
+
+// Verifies that the subtractor does not converge on uncorrelated signals.
+TEST_P(SubtractorMultiChannelUpToFourRender,
+       NonConvergenceOnUncorrelatedSignals) {
+  const size_t num_render_channels = std::get<0>(GetParam());
+  const size_t num_capture_channels = std::get<1>(GetParam());
+
+  std::vector<int> blocks_with_echo_path_changes;
+  size_t num_blocks_to_process = 5000 * num_render_channels;
+  std::vector<float> echo_to_nearend_powers = RunSubtractorTest(
+      num_render_channels, num_capture_channels, num_blocks_to_process, 64, 20,
+      20, true, blocks_with_echo_path_changes);
+  for (float echo_to_nearend_power : echo_to_nearend_powers) {
+    EXPECT_LT(.8f, echo_to_nearend_power);
+    EXPECT_NEAR(1.f, echo_to_nearend_power, 0.25f);
+  }
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,179 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/suppression_filter.h"
+
+#include <algorithm>
+#include <cmath>
+#include <cstring>
+#include <functional>
+#include <iterator>
+
+#include "modules/audio_processing/aec3/vector_math.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_minmax.h"
+
+namespace webrtc {
+namespace {
+
+// Hanning window from Matlab command win = sqrt(hanning(128)).
+const float kSqrtHanning[kFftLength] = {
+    0.00000000000000f, 0.02454122852291f, 0.04906767432742f, 0.07356456359967f,
+    0.09801714032956f, 0.12241067519922f, 0.14673047445536f, 0.17096188876030f,
+    0.19509032201613f, 0.21910124015687f, 0.24298017990326f, 0.26671275747490f,
+    0.29028467725446f, 0.31368174039889f, 0.33688985339222f, 0.35989503653499f,
+    0.38268343236509f, 0.40524131400499f, 0.42755509343028f, 0.44961132965461f,
+    0.47139673682600f, 0.49289819222978f, 0.51410274419322f, 0.53499761988710f,
+    0.55557023301960f, 0.57580819141785f, 0.59569930449243f, 0.61523159058063f,
+    0.63439328416365f, 0.65317284295378f, 0.67155895484702f, 0.68954054473707f,
+    0.70710678118655f, 0.72424708295147f, 0.74095112535496f, 0.75720884650648f,
+    0.77301045336274f, 0.78834642762661f, 0.80320753148064f, 0.81758481315158f,
+    0.83146961230255f, 0.84485356524971f, 0.85772861000027f, 0.87008699110871f,
+    0.88192126434835f, 0.89322430119552f, 0.90398929312344f, 0.91420975570353f,
+    0.92387953251129f, 0.93299279883474f, 0.94154406518302f, 0.94952818059304f,
+    0.95694033573221f, 0.96377606579544f, 0.97003125319454f, 0.97570213003853f,
+    0.98078528040323f, 0.98527764238894f, 0.98917650996478f, 0.99247953459871f,
+    0.99518472667220f, 0.99729045667869f, 0.99879545620517f, 0.99969881869620f,
+    1.00000000000000f, 0.99969881869620f, 0.99879545620517f, 0.99729045667869f,
+    0.99518472667220f, 0.99247953459871f, 0.98917650996478f, 0.98527764238894f,
+    0.98078528040323f, 0.97570213003853f, 0.97003125319454f, 0.96377606579544f,
+    0.95694033573221f, 0.94952818059304f, 0.94154406518302f, 0.93299279883474f,
+    0.92387953251129f, 0.91420975570353f, 0.90398929312344f, 0.89322430119552f,
+    0.88192126434835f, 0.87008699110871f, 0.85772861000027f, 0.84485356524971f,
+    0.83146961230255f, 0.81758481315158f, 0.80320753148064f, 0.78834642762661f,
+    0.77301045336274f, 0.75720884650648f, 0.74095112535496f, 0.72424708295147f,
+    0.70710678118655f, 0.68954054473707f, 0.67155895484702f, 0.65317284295378f,
+    0.63439328416365f, 0.61523159058063f, 0.59569930449243f, 0.57580819141785f,
+    0.55557023301960f, 0.53499761988710f, 0.51410274419322f, 0.49289819222978f,
+    0.47139673682600f, 0.44961132965461f, 0.42755509343028f, 0.40524131400499f,
+    0.38268343236509f, 0.35989503653499f, 0.33688985339222f, 0.31368174039889f,
+    0.29028467725446f, 0.26671275747490f, 0.24298017990326f, 0.21910124015687f,
+    0.19509032201613f, 0.17096188876030f, 0.14673047445536f, 0.12241067519922f,
+    0.09801714032956f, 0.07356456359967f, 0.04906767432742f, 0.02454122852291f};
+
+}  // namespace
+
+SuppressionFilter::SuppressionFilter(Aec3Optimization optimization,
+                                     int sample_rate_hz,
+                                     size_t num_capture_channels)
+    : optimization_(optimization),
+      sample_rate_hz_(sample_rate_hz),
+      num_capture_channels_(num_capture_channels),
+      fft_(),
+      e_output_old_(NumBandsForRate(sample_rate_hz_),
+                    std::vector<std::array<float, kFftLengthBy2>>(
+                        num_capture_channels_)) {
+  RTC_DCHECK(ValidFullBandRate(sample_rate_hz_));
+  for (size_t b = 0; b < e_output_old_.size(); ++b) {
+    for (size_t ch = 0; ch < e_output_old_[b].size(); ++ch) {
+      e_output_old_[b][ch].fill(0.f);
+    }
+  }
+}
+
+SuppressionFilter::~SuppressionFilter() = default;
+
+void SuppressionFilter::ApplyGain(
+    rtc::ArrayView<const FftData> comfort_noise,
+    rtc::ArrayView<const FftData> comfort_noise_high_band,
+    const std::array<float, kFftLengthBy2Plus1>& suppression_gain,
+    float high_bands_gain,
+    rtc::ArrayView<const FftData> E_lowest_band,
+    std::vector<std::vector<std::vector<float>>>* e) {
+  RTC_DCHECK(e);
+  RTC_DCHECK_EQ(e->size(), NumBandsForRate(sample_rate_hz_));
+
+  // Comfort noise gain is sqrt(1-g^2), where g is the suppression gain.
+  std::array<float, kFftLengthBy2Plus1> noise_gain;
+  for (size_t i = 0; i < kFftLengthBy2Plus1; ++i) {
+    noise_gain[i] = 1.f - suppression_gain[i] * suppression_gain[i];
+  }
+  aec3::VectorMath(optimization_).Sqrt(noise_gain);
+
+  const float high_bands_noise_scaling =
+      0.4f * std::sqrt(1.f - high_bands_gain * high_bands_gain);
+
+  for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+    FftData E;
+
+    // Analysis filterbank.
+    E.Assign(E_lowest_band[ch]);
+
+    for (size_t i = 0; i < kFftLengthBy2Plus1; ++i) {
+      // Apply suppression gains.
+      E.re[i] *= suppression_gain[i];
+      E.im[i] *= suppression_gain[i];
+
+      // Scale and add the comfort noise.
+      E.re[i] += noise_gain[i] * comfort_noise[ch].re[i];
+      E.im[i] += noise_gain[i] * comfort_noise[ch].im[i];
+    }
+
+    // Synthesis filterbank.
+    std::array<float, kFftLength> e_extended;
+    constexpr float kIfftNormalization = 2.f / kFftLength;
+    fft_.Ifft(E, &e_extended);
+
+    auto& e0 = (*e)[0][ch];
+    auto& e0_old = e_output_old_[0][ch];
+
+    // Window and add the first half of e_extended with the second half of
+    // e_extended from the previous block.
+    for (size_t i = 0; i < kFftLengthBy2; ++i) {
+      e0[i] = e0_old[i] * kSqrtHanning[kFftLengthBy2 + i];
+      e0[i] += e_extended[i] * kSqrtHanning[i];
+      e0[i] *= kIfftNormalization;
+    }
+
+    // The second half of e_extended is stored for the succeeding frame.
+    std::copy(e_extended.begin() + kFftLengthBy2,
+              e_extended.begin() + kFftLength, std::begin(e0_old));
+
+    // Apply suppression gain to upper bands.
+    for (size_t b = 1; b < e->size(); ++b) {
+      auto& e_band = (*e)[b][ch];
+      for (size_t i = 0; i < kFftLengthBy2; ++i) {
+        e_band[i] *= high_bands_gain;
+      }
+    }
+
+    // Add comfort noise to band 1.
+    if (e->size() > 1) {
+      E.Assign(comfort_noise_high_band[ch]);
+      std::array<float, kFftLength> time_domain_high_band_noise;
+      fft_.Ifft(E, &time_domain_high_band_noise);
+
+      auto& e1 = (*e)[1][ch];
+      const float gain = high_bands_noise_scaling * kIfftNormalization;
+      for (size_t i = 0; i < kFftLengthBy2; ++i) {
+        e1[i] += time_domain_high_band_noise[i] * gain;
+      }
+    }
+
+    // Delay upper bands to match the delay of the filter bank.
+    for (size_t b = 1; b < e->size(); ++b) {
+      auto& e_band = (*e)[b][ch];
+      auto& e_band_old = e_output_old_[b][ch];
+      for (size_t i = 0; i < kFftLengthBy2; ++i) {
+        std::swap(e_band[i], e_band_old[i]);
+      }
+    }
+
+    // Clamp output of all bands.
+    for (size_t b = 0; b < e->size(); ++b) {
+      auto& e_band = (*e)[b][ch];
+      for (size_t i = 0; i < kFftLengthBy2; ++i) {
+        e_band[i] = rtc::SafeClamp(e_band[i], -32768.f, 32767.f);
+      }
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_FILTER_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_FILTER_H_
+
+#include <array>
+#include <vector>
+
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/aec3_fft.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+class SuppressionFilter {
+ public:
+  SuppressionFilter(Aec3Optimization optimization,
+                    int sample_rate_hz,
+                    size_t num_capture_channels_);
+  ~SuppressionFilter();
+  void ApplyGain(rtc::ArrayView<const FftData> comfort_noise,
+                 rtc::ArrayView<const FftData> comfort_noise_high_bands,
+                 const std::array<float, kFftLengthBy2Plus1>& suppression_gain,
+                 float high_bands_gain,
+                 rtc::ArrayView<const FftData> E_lowest_band,
+                 std::vector<std::vector<std::vector<float>>>* e);
+
+ private:
+  const Aec3Optimization optimization_;
+  const int sample_rate_hz_;
+  const size_t num_capture_channels_;
+  const Aec3Fft fft_;
+  std::vector<std::vector<std::array<float, kFftLengthBy2>>> e_output_old_;
+  RTC_DISALLOW_COPY_AND_ASSIGN(SuppressionFilter);
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_FILTER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_filter_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,249 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/suppression_filter.h"
+
+#include <math.h>
+
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+constexpr float kPi = 3.141592f;
+
+void ProduceSinusoid(int sample_rate_hz,
+                     float sinusoidal_frequency_hz,
+                     size_t* sample_counter,
+                     std::vector<std::vector<std::vector<float>>>* x) {
+  // Produce a sinusoid of the specified frequency.
+  for (size_t k = *sample_counter, j = 0; k < (*sample_counter + kBlockSize);
+       ++k, ++j) {
+    for (size_t channel = 0; channel < (*x)[0].size(); ++channel) {
+      (*x)[0][channel][j] =
+          32767.f *
+          std::sin(2.f * kPi * sinusoidal_frequency_hz * k / sample_rate_hz);
+    }
+  }
+  *sample_counter = *sample_counter + kBlockSize;
+
+  for (size_t band = 1; band < x->size(); ++band) {
+    for (size_t channel = 0; channel < (*x)[band].size(); ++channel) {
+      std::fill((*x)[band][channel].begin(), (*x)[band][channel].end(), 0.f);
+    }
+  }
+}
+
+}  // namespace
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies the check for null suppressor output.
+TEST(SuppressionFilterDeathTest, NullOutput) {
+  std::vector<FftData> cn(1);
+  std::vector<FftData> cn_high_bands(1);
+  std::vector<FftData> E(1);
+  std::array<float, kFftLengthBy2Plus1> gain;
+
+  EXPECT_DEATH(SuppressionFilter(Aec3Optimization::kNone, 16000, 1)
+                   .ApplyGain(cn, cn_high_bands, gain, 1.0f, E, nullptr),
+               "");
+}
+
+// Verifies the check for allowed sample rate.
+TEST(SuppressionFilterDeathTest, ProperSampleRate) {
+  EXPECT_DEATH(SuppressionFilter(Aec3Optimization::kNone, 16001, 1), "");
+}
+
+#endif
+
+// Verifies that no comfort noise is added when the gain is 1.
+TEST(SuppressionFilter, ComfortNoiseInUnityGain) {
+  SuppressionFilter filter(Aec3Optimization::kNone, 48000, 1);
+  std::vector<FftData> cn(1);
+  std::vector<FftData> cn_high_bands(1);
+  std::array<float, kFftLengthBy2Plus1> gain;
+  std::array<float, kFftLengthBy2> e_old_;
+  Aec3Fft fft;
+
+  e_old_.fill(0.f);
+  gain.fill(1.f);
+  cn[0].re.fill(1.f);
+  cn[0].im.fill(1.f);
+  cn_high_bands[0].re.fill(1.f);
+  cn_high_bands[0].im.fill(1.f);
+
+  std::vector<std::vector<std::vector<float>>> e(
+      3,
+      std::vector<std::vector<float>>(1, std::vector<float>(kBlockSize, 0.f)));
+  std::vector<std::vector<std::vector<float>>> e_ref = e;
+
+  std::vector<FftData> E(1);
+  fft.PaddedFft(e[0][0], e_old_, Aec3Fft::Window::kSqrtHanning, &E[0]);
+  std::copy(e[0][0].begin(), e[0][0].end(), e_old_.begin());
+
+  filter.ApplyGain(cn, cn_high_bands, gain, 1.f, E, &e);
+
+  for (size_t band = 0; band < e.size(); ++band) {
+    for (size_t channel = 0; channel < e[band].size(); ++channel) {
+      for (size_t sample = 0; sample < e[band][channel].size(); ++sample) {
+        EXPECT_EQ(e_ref[band][channel][sample], e[band][channel][sample]);
+      }
+    }
+  }
+}
+
+// Verifies that the suppressor is able to suppress a signal.
+TEST(SuppressionFilter, SignalSuppression) {
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+  constexpr size_t kNumChannels = 1;
+
+  SuppressionFilter filter(Aec3Optimization::kNone, kSampleRateHz, 1);
+  std::vector<FftData> cn(1);
+  std::vector<FftData> cn_high_bands(1);
+  std::array<float, kFftLengthBy2> e_old_;
+  Aec3Fft fft;
+  std::array<float, kFftLengthBy2Plus1> gain;
+  std::vector<std::vector<std::vector<float>>> e(
+      kNumBands, std::vector<std::vector<float>>(
+                     kNumChannels, std::vector<float>(kBlockSize, 0.f)));
+  e_old_.fill(0.f);
+
+  gain.fill(1.f);
+  std::for_each(gain.begin() + 10, gain.end(), [](float& a) { a = 0.f; });
+
+  cn[0].re.fill(0.f);
+  cn[0].im.fill(0.f);
+  cn_high_bands[0].re.fill(0.f);
+  cn_high_bands[0].im.fill(0.f);
+
+  size_t sample_counter = 0;
+
+  float e0_input = 0.f;
+  float e0_output = 0.f;
+  for (size_t k = 0; k < 100; ++k) {
+    ProduceSinusoid(16000, 16000 * 40 / kFftLengthBy2 / 2, &sample_counter, &e);
+    e0_input = std::inner_product(e[0][0].begin(), e[0][0].end(),
+                                  e[0][0].begin(), e0_input);
+
+    std::vector<FftData> E(1);
+    fft.PaddedFft(e[0][0], e_old_, Aec3Fft::Window::kSqrtHanning, &E[0]);
+    std::copy(e[0][0].begin(), e[0][0].end(), e_old_.begin());
+
+    filter.ApplyGain(cn, cn_high_bands, gain, 1.f, E, &e);
+    e0_output = std::inner_product(e[0][0].begin(), e[0][0].end(),
+                                   e[0][0].begin(), e0_output);
+  }
+
+  EXPECT_LT(e0_output, e0_input / 1000.f);
+}
+
+// Verifies that the suppressor is able to pass through a desired signal while
+// applying suppressing for some frequencies.
+TEST(SuppressionFilter, SignalTransparency) {
+  constexpr size_t kNumChannels = 1;
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+
+  SuppressionFilter filter(Aec3Optimization::kNone, kSampleRateHz, 1);
+  std::vector<FftData> cn(1);
+  std::array<float, kFftLengthBy2> e_old_;
+  Aec3Fft fft;
+  std::vector<FftData> cn_high_bands(1);
+  std::array<float, kFftLengthBy2Plus1> gain;
+  std::vector<std::vector<std::vector<float>>> e(
+      kNumBands, std::vector<std::vector<float>>(
+                     kNumChannels, std::vector<float>(kBlockSize, 0.f)));
+  e_old_.fill(0.f);
+  gain.fill(1.f);
+  std::for_each(gain.begin() + 30, gain.end(), [](float& a) { a = 0.f; });
+
+  cn[0].re.fill(0.f);
+  cn[0].im.fill(0.f);
+  cn_high_bands[0].re.fill(0.f);
+  cn_high_bands[0].im.fill(0.f);
+
+  size_t sample_counter = 0;
+
+  float e0_input = 0.f;
+  float e0_output = 0.f;
+  for (size_t k = 0; k < 100; ++k) {
+    ProduceSinusoid(16000, 16000 * 10 / kFftLengthBy2 / 2, &sample_counter, &e);
+    e0_input = std::inner_product(e[0][0].begin(), e[0][0].end(),
+                                  e[0][0].begin(), e0_input);
+
+    std::vector<FftData> E(1);
+    fft.PaddedFft(e[0][0], e_old_, Aec3Fft::Window::kSqrtHanning, &E[0]);
+    std::copy(e[0][0].begin(), e[0][0].end(), e_old_.begin());
+
+    filter.ApplyGain(cn, cn_high_bands, gain, 1.f, E, &e);
+    e0_output = std::inner_product(e[0][0].begin(), e[0][0].end(),
+                                   e[0][0].begin(), e0_output);
+  }
+
+  EXPECT_LT(0.9f * e0_input, e0_output);
+}
+
+// Verifies that the suppressor delay.
+TEST(SuppressionFilter, Delay) {
+  constexpr size_t kNumChannels = 1;
+  constexpr int kSampleRateHz = 48000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+
+  SuppressionFilter filter(Aec3Optimization::kNone, kSampleRateHz, 1);
+  std::vector<FftData> cn(1);
+  std::vector<FftData> cn_high_bands(1);
+  std::array<float, kFftLengthBy2> e_old_;
+  Aec3Fft fft;
+  std::array<float, kFftLengthBy2Plus1> gain;
+  std::vector<std::vector<std::vector<float>>> e(
+      kNumBands, std::vector<std::vector<float>>(
+                     kNumChannels, std::vector<float>(kBlockSize, 0.f)));
+
+  gain.fill(1.f);
+
+  cn[0].re.fill(0.f);
+  cn[0].im.fill(0.f);
+  cn_high_bands[0].re.fill(0.f);
+  cn_high_bands[0].im.fill(0.f);
+
+  for (size_t k = 0; k < 100; ++k) {
+    for (size_t band = 0; band < kNumBands; ++band) {
+      for (size_t channel = 0; channel < kNumChannels; ++channel) {
+        for (size_t sample = 0; sample < kBlockSize; ++sample) {
+          e[band][channel][sample] = k * kBlockSize + sample + channel;
+        }
+      }
+    }
+
+    std::vector<FftData> E(1);
+    fft.PaddedFft(e[0][0], e_old_, Aec3Fft::Window::kSqrtHanning, &E[0]);
+    std::copy(e[0][0].begin(), e[0][0].end(), e_old_.begin());
+
+    filter.ApplyGain(cn, cn_high_bands, gain, 1.f, E, &e);
+    if (k > 2) {
+      for (size_t band = 0; band < kNumBands; ++band) {
+        for (size_t channel = 0; channel < kNumChannels; ++channel) {
+          for (size_t sample = 0; sample < kBlockSize; ++sample) {
+            EXPECT_NEAR(k * kBlockSize + sample - kBlockSize + channel,
+                        e[band][channel][sample], 0.01);
+          }
+        }
+      }
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,448 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/suppression_gain.h"
+
+#include <math.h>
+#include <stddef.h>
+
+#include <algorithm>
+#include <numeric>
+
+#include "modules/audio_processing/aec3/dominant_nearend_detector.h"
+#include "modules/audio_processing/aec3/moving_average.h"
+#include "modules/audio_processing/aec3/subband_nearend_detector.h"
+#include "modules/audio_processing/aec3/vector_math.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+void LimitLowFrequencyGains(std::array<float, kFftLengthBy2Plus1>* gain) {
+  // Limit the low frequency gains to avoid the impact of the high-pass filter
+  // on the lower-frequency gain influencing the overall achieved gain.
+  (*gain)[0] = (*gain)[1] = std::min((*gain)[1], (*gain)[2]);
+}
+
+void LimitHighFrequencyGains(bool conservative_hf_suppression,
+                             std::array<float, kFftLengthBy2Plus1>* gain) {
+  // Limit the high frequency gains to avoid echo leakage due to an imperfect
+  // filter.
+  constexpr size_t kFirstBandToLimit = (64 * 2000) / 8000;
+  const float min_upper_gain = (*gain)[kFirstBandToLimit];
+  std::for_each(
+      gain->begin() + kFirstBandToLimit + 1, gain->end(),
+      [min_upper_gain](float& a) { a = std::min(a, min_upper_gain); });
+  (*gain)[kFftLengthBy2] = (*gain)[kFftLengthBy2Minus1];
+
+  if (conservative_hf_suppression) {
+    // Limits the gain in the frequencies for which the adaptive filter has not
+    // converged.
+    // TODO(peah): Make adaptive to take the actual filter error into account.
+    constexpr size_t kUpperAccurateBandPlus1 = 29;
+
+    constexpr float oneByBandsInSum =
+        1 / static_cast<float>(kUpperAccurateBandPlus1 - 20);
+    const float hf_gain_bound =
+        std::accumulate(gain->begin() + 20,
+                        gain->begin() + kUpperAccurateBandPlus1, 0.f) *
+        oneByBandsInSum;
+
+    std::for_each(
+        gain->begin() + kUpperAccurateBandPlus1, gain->end(),
+        [hf_gain_bound](float& a) { a = std::min(a, hf_gain_bound); });
+  }
+}
+
+// Scales the echo according to assessed audibility at the other end.
+void WeightEchoForAudibility(const EchoCanceller3Config& config,
+                             rtc::ArrayView<const float> echo,
+                             rtc::ArrayView<float> weighted_echo) {
+  RTC_DCHECK_EQ(kFftLengthBy2Plus1, echo.size());
+  RTC_DCHECK_EQ(kFftLengthBy2Plus1, weighted_echo.size());
+
+  auto weigh = [](float threshold, float normalizer, size_t begin, size_t end,
+                  rtc::ArrayView<const float> echo,
+                  rtc::ArrayView<float> weighted_echo) {
+    for (size_t k = begin; k < end; ++k) {
+      if (echo[k] < threshold) {
+        float tmp = (threshold - echo[k]) * normalizer;
+        weighted_echo[k] = echo[k] * std::max(0.f, 1.f - tmp * tmp);
+      } else {
+        weighted_echo[k] = echo[k];
+      }
+    }
+  };
+
+  float threshold = config.echo_audibility.floor_power *
+                    config.echo_audibility.audibility_threshold_lf;
+  float normalizer = 1.f / (threshold - config.echo_audibility.floor_power);
+  weigh(threshold, normalizer, 0, 3, echo, weighted_echo);
+
+  threshold = config.echo_audibility.floor_power *
+              config.echo_audibility.audibility_threshold_mf;
+  normalizer = 1.f / (threshold - config.echo_audibility.floor_power);
+  weigh(threshold, normalizer, 3, 7, echo, weighted_echo);
+
+  threshold = config.echo_audibility.floor_power *
+              config.echo_audibility.audibility_threshold_hf;
+  normalizer = 1.f / (threshold - config.echo_audibility.floor_power);
+  weigh(threshold, normalizer, 7, kFftLengthBy2Plus1, echo, weighted_echo);
+}
+
+}  // namespace
+
+int SuppressionGain::instance_count_ = 0;
+
+float SuppressionGain::UpperBandsGain(
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> echo_spectrum,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        comfort_noise_spectrum,
+    const absl::optional<int>& narrow_peak_band,
+    bool saturated_echo,
+    const std::vector<std::vector<std::vector<float>>>& render,
+    const std::array<float, kFftLengthBy2Plus1>& low_band_gain) const {
+  RTC_DCHECK_LT(0, render.size());
+  if (render.size() == 1) {
+    return 1.f;
+  }
+  const size_t num_render_channels = render[0].size();
+
+  if (narrow_peak_band &&
+      (*narrow_peak_band > static_cast<int>(kFftLengthBy2Plus1 - 10))) {
+    return 0.001f;
+  }
+
+  constexpr size_t kLowBandGainLimit = kFftLengthBy2 / 2;
+  const float gain_below_8_khz = *std::min_element(
+      low_band_gain.begin() + kLowBandGainLimit, low_band_gain.end());
+
+  // Always attenuate the upper bands when there is saturated echo.
+  if (saturated_echo) {
+    return std::min(0.001f, gain_below_8_khz);
+  }
+
+  // Compute the upper and lower band energies.
+  const auto sum_of_squares = [](float a, float b) { return a + b * b; };
+  float low_band_energy = 0.f;
+  for (size_t ch = 0; ch < num_render_channels; ++ch) {
+    const float channel_energy = std::accumulate(
+        render[0][0].begin(), render[0][0].end(), 0.f, sum_of_squares);
+    low_band_energy = std::max(low_band_energy, channel_energy);
+  }
+  float high_band_energy = 0.f;
+  for (size_t k = 1; k < render.size(); ++k) {
+    for (size_t ch = 0; ch < num_render_channels; ++ch) {
+      const float energy = std::accumulate(
+          render[k][ch].begin(), render[k][ch].end(), 0.f, sum_of_squares);
+      high_band_energy = std::max(high_band_energy, energy);
+    }
+  }
+
+  // If there is more power in the lower frequencies than the upper frequencies,
+  // or if the power in upper frequencies is low, do not bound the gain in the
+  // upper bands.
+  float anti_howling_gain;
+  const float activation_threshold =
+      kBlockSize * config_.suppressor.high_bands_suppression
+                       .anti_howling_activation_threshold;
+  if (high_band_energy < std::max(low_band_energy, activation_threshold)) {
+    anti_howling_gain = 1.f;
+  } else {
+    // In all other cases, bound the gain for upper frequencies.
+    RTC_DCHECK_LE(low_band_energy, high_band_energy);
+    RTC_DCHECK_NE(0.f, high_band_energy);
+    anti_howling_gain =
+        config_.suppressor.high_bands_suppression.anti_howling_gain *
+        sqrtf(low_band_energy / high_band_energy);
+  }
+
+  float gain_bound = 1.f;
+  if (!dominant_nearend_detector_->IsNearendState()) {
+    // Bound the upper gain during significant echo activity.
+    const auto& cfg = config_.suppressor.high_bands_suppression;
+    auto low_frequency_energy = [](rtc::ArrayView<const float> spectrum) {
+      RTC_DCHECK_LE(16, spectrum.size());
+      return std::accumulate(spectrum.begin() + 1, spectrum.begin() + 16, 0.f);
+    };
+    for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+      const float echo_sum = low_frequency_energy(echo_spectrum[ch]);
+      const float noise_sum = low_frequency_energy(comfort_noise_spectrum[ch]);
+      if (echo_sum > cfg.enr_threshold * noise_sum) {
+        gain_bound = cfg.max_gain_during_echo;
+        break;
+      }
+    }
+  }
+
+  // Choose the gain as the minimum of the lower and upper gains.
+  return std::min(std::min(gain_below_8_khz, anti_howling_gain), gain_bound);
+}
+
+// Computes the gain to reduce the echo to a non audible level.
+void SuppressionGain::GainToNoAudibleEcho(
+    const std::array<float, kFftLengthBy2Plus1>& nearend,
+    const std::array<float, kFftLengthBy2Plus1>& echo,
+    const std::array<float, kFftLengthBy2Plus1>& masker,
+    std::array<float, kFftLengthBy2Plus1>* gain) const {
+  const auto& p = dominant_nearend_detector_->IsNearendState() ? nearend_params_
+                                                               : normal_params_;
+  for (size_t k = 0; k < gain->size(); ++k) {
+    float enr = echo[k] / (nearend[k] + 1.f);  // Echo-to-nearend ratio.
+    float emr = echo[k] / (masker[k] + 1.f);   // Echo-to-masker (noise) ratio.
+    float g = 1.0f;
+    if (enr > p.enr_transparent_[k] && emr > p.emr_transparent_[k]) {
+      g = (p.enr_suppress_[k] - enr) /
+          (p.enr_suppress_[k] - p.enr_transparent_[k]);
+      g = std::max(g, p.emr_transparent_[k] / emr);
+    }
+    (*gain)[k] = g;
+  }
+}
+
+// Compute the minimum gain as the attenuating gain to put the signal just
+// above the zero sample values.
+void SuppressionGain::GetMinGain(
+    rtc::ArrayView<const float> weighted_residual_echo,
+    rtc::ArrayView<const float> last_nearend,
+    rtc::ArrayView<const float> last_echo,
+    bool low_noise_render,
+    bool saturated_echo,
+    rtc::ArrayView<float> min_gain) const {
+  if (!saturated_echo) {
+    const float min_echo_power =
+        low_noise_render ? config_.echo_audibility.low_render_limit
+                         : config_.echo_audibility.normal_render_limit;
+
+    for (size_t k = 0; k < min_gain.size(); ++k) {
+      min_gain[k] = weighted_residual_echo[k] > 0.f
+                        ? min_echo_power / weighted_residual_echo[k]
+                        : 1.f;
+      min_gain[k] = std::min(min_gain[k], 1.f);
+    }
+
+    const bool is_nearend_state = dominant_nearend_detector_->IsNearendState();
+    for (size_t k = 0; k < 6; ++k) {
+      const auto& dec = is_nearend_state ? nearend_params_.max_dec_factor_lf
+                                         : normal_params_.max_dec_factor_lf;
+
+      // Make sure the gains of the low frequencies do not decrease too
+      // quickly after strong nearend.
+      if (last_nearend[k] > last_echo[k]) {
+        min_gain[k] = std::max(min_gain[k], last_gain_[k] * dec);
+        min_gain[k] = std::min(min_gain[k], 1.f);
+      }
+    }
+  } else {
+    std::fill(min_gain.begin(), min_gain.end(), 0.f);
+  }
+}
+
+// Compute the maximum gain by limiting the gain increase from the previous
+// gain.
+void SuppressionGain::GetMaxGain(rtc::ArrayView<float> max_gain) const {
+  const auto& inc = dominant_nearend_detector_->IsNearendState()
+                        ? nearend_params_.max_inc_factor
+                        : normal_params_.max_inc_factor;
+  const auto& floor = config_.suppressor.floor_first_increase;
+  for (size_t k = 0; k < max_gain.size(); ++k) {
+    max_gain[k] = std::min(std::max(last_gain_[k] * inc, floor), 1.f);
+  }
+}
+
+void SuppressionGain::LowerBandGain(
+    bool low_noise_render,
+    const AecState& aec_state,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        suppressor_input,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> residual_echo,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> comfort_noise,
+    bool clock_drift,
+    std::array<float, kFftLengthBy2Plus1>* gain) {
+  gain->fill(1.f);
+  const bool saturated_echo = aec_state.SaturatedEcho();
+  std::array<float, kFftLengthBy2Plus1> max_gain;
+  GetMaxGain(max_gain);
+
+  for (size_t ch = 0; ch < num_capture_channels_; ++ch) {
+    std::array<float, kFftLengthBy2Plus1> G;
+    std::array<float, kFftLengthBy2Plus1> nearend;
+    nearend_smoothers_[ch].Average(suppressor_input[ch], nearend);
+
+    // Weight echo power in terms of audibility.
+    std::array<float, kFftLengthBy2Plus1> weighted_residual_echo;
+    WeightEchoForAudibility(config_, residual_echo[ch], weighted_residual_echo);
+
+    std::array<float, kFftLengthBy2Plus1> min_gain;
+    GetMinGain(weighted_residual_echo, last_nearend_[ch], last_echo_[ch],
+               low_noise_render, saturated_echo, min_gain);
+
+    GainToNoAudibleEcho(nearend, weighted_residual_echo, comfort_noise[0], &G);
+
+    // Clamp gains.
+    for (size_t k = 0; k < gain->size(); ++k) {
+      G[k] = std::max(std::min(G[k], max_gain[k]), min_gain[k]);
+      (*gain)[k] = std::min((*gain)[k], G[k]);
+    }
+
+    // Store data required for the gain computation of the next block.
+    std::copy(nearend.begin(), nearend.end(), last_nearend_[ch].begin());
+    std::copy(weighted_residual_echo.begin(), weighted_residual_echo.end(),
+              last_echo_[ch].begin());
+  }
+
+  LimitLowFrequencyGains(gain);
+  // Use conservative high-frequency gains during clock-drift or when not in
+  // dominant nearend.
+  if (!dominant_nearend_detector_->IsNearendState() || clock_drift ||
+      config_.suppressor.conservative_hf_suppression) {
+    LimitHighFrequencyGains(config_.suppressor.conservative_hf_suppression,
+                            gain);
+  }
+
+  // Store computed gains.
+  std::copy(gain->begin(), gain->end(), last_gain_.begin());
+
+  // Transform gains to amplitude domain.
+  aec3::VectorMath(optimization_).Sqrt(*gain);
+}
+
+SuppressionGain::SuppressionGain(const EchoCanceller3Config& config,
+                                 Aec3Optimization optimization,
+                                 int sample_rate_hz,
+                                 size_t num_capture_channels)
+    : data_dumper_(
+          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
+      optimization_(optimization),
+      config_(config),
+      num_capture_channels_(num_capture_channels),
+      state_change_duration_blocks_(
+          static_cast<int>(config_.filter.config_change_duration_blocks)),
+      last_nearend_(num_capture_channels_, {0}),
+      last_echo_(num_capture_channels_, {0}),
+      nearend_smoothers_(
+          num_capture_channels_,
+          aec3::MovingAverage(kFftLengthBy2Plus1,
+                              config.suppressor.nearend_average_blocks)),
+      nearend_params_(config_.suppressor.nearend_tuning),
+      normal_params_(config_.suppressor.normal_tuning) {
+  RTC_DCHECK_LT(0, state_change_duration_blocks_);
+  last_gain_.fill(1.f);
+  if (config_.suppressor.use_subband_nearend_detection) {
+    dominant_nearend_detector_ = std::make_unique<SubbandNearendDetector>(
+        config_.suppressor.subband_nearend_detection, num_capture_channels_);
+  } else {
+    dominant_nearend_detector_ = std::make_unique<DominantNearendDetector>(
+        config_.suppressor.dominant_nearend_detection, num_capture_channels_);
+  }
+  RTC_DCHECK(dominant_nearend_detector_);
+}
+
+SuppressionGain::~SuppressionGain() = default;
+
+void SuppressionGain::GetGain(
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        nearend_spectrum,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> echo_spectrum,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        residual_echo_spectrum,
+    rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+        comfort_noise_spectrum,
+    const RenderSignalAnalyzer& render_signal_analyzer,
+    const AecState& aec_state,
+    const std::vector<std::vector<std::vector<float>>>& render,
+    bool clock_drift,
+    float* high_bands_gain,
+    std::array<float, kFftLengthBy2Plus1>* low_band_gain) {
+  RTC_DCHECK(high_bands_gain);
+  RTC_DCHECK(low_band_gain);
+
+  // Update the nearend state selection.
+  dominant_nearend_detector_->Update(nearend_spectrum, residual_echo_spectrum,
+                                     comfort_noise_spectrum, initial_state_);
+
+  // Compute gain for the lower band.
+  bool low_noise_render = low_render_detector_.Detect(render);
+  LowerBandGain(low_noise_render, aec_state, nearend_spectrum,
+                residual_echo_spectrum, comfort_noise_spectrum, clock_drift,
+                low_band_gain);
+
+  // Compute the gain for the upper bands.
+  const absl::optional<int> narrow_peak_band =
+      render_signal_analyzer.NarrowPeakBand();
+
+  *high_bands_gain =
+      UpperBandsGain(echo_spectrum, comfort_noise_spectrum, narrow_peak_band,
+                     aec_state.SaturatedEcho(), render, *low_band_gain);
+}
+
+void SuppressionGain::SetInitialState(bool state) {
+  initial_state_ = state;
+  if (state) {
+    initial_state_change_counter_ = state_change_duration_blocks_;
+  } else {
+    initial_state_change_counter_ = 0;
+  }
+}
+
+// Detects when the render signal can be considered to have low power and
+// consist of stationary noise.
+bool SuppressionGain::LowNoiseRenderDetector::Detect(
+    const std::vector<std::vector<std::vector<float>>>& render) {
+  float x2_sum = 0.f;
+  float x2_max = 0.f;
+  for (const auto& x_ch : render[0]) {
+    for (const auto& x_k : x_ch) {
+      const float x2 = x_k * x_k;
+      x2_sum += x2;
+      x2_max = std::max(x2_max, x2);
+    }
+  }
+  const size_t num_render_channels = render[0].size();
+  x2_sum = x2_sum / num_render_channels;
+  ;
+
+  constexpr float kThreshold = 50.f * 50.f * 64.f;
+  const bool low_noise_render =
+      average_power_ < kThreshold && x2_max < 3 * average_power_;
+  average_power_ = average_power_ * 0.9f + x2_sum * 0.1f;
+  return low_noise_render;
+}
+
+SuppressionGain::GainParameters::GainParameters(
+    const EchoCanceller3Config::Suppressor::Tuning& tuning)
+    : max_inc_factor(tuning.max_inc_factor),
+      max_dec_factor_lf(tuning.max_dec_factor_lf) {
+  // Compute per-band masking thresholds.
+  constexpr size_t kLastLfBand = 5;
+  constexpr size_t kFirstHfBand = 8;
+  RTC_DCHECK_LT(kLastLfBand, kFirstHfBand);
+  auto& lf = tuning.mask_lf;
+  auto& hf = tuning.mask_hf;
+  RTC_DCHECK_LT(lf.enr_transparent, lf.enr_suppress);
+  RTC_DCHECK_LT(hf.enr_transparent, hf.enr_suppress);
+  for (size_t k = 0; k < kFftLengthBy2Plus1; k++) {
+    float a;
+    if (k <= kLastLfBand) {
+      a = 0.f;
+    } else if (k < kFirstHfBand) {
+      a = (k - kLastLfBand) / static_cast<float>(kFirstHfBand - kLastLfBand);
+    } else {
+      a = 1.f;
+    }
+    enr_transparent_[k] = (1 - a) * lf.enr_transparent + a * hf.enr_transparent;
+    enr_suppress_[k] = (1 - a) * lf.enr_suppress + a * hf.enr_suppress;
+    emr_transparent_[k] = (1 - a) * lf.emr_transparent + a * hf.emr_transparent;
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,136 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_
+
+#include <array>
+#include <memory>
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "modules/audio_processing/aec3/fft_data.h"
+#include "modules/audio_processing/aec3/moving_average.h"
+#include "modules/audio_processing/aec3/nearend_detector.h"
+#include "modules/audio_processing/aec3/render_signal_analyzer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+class SuppressionGain {
+ public:
+  SuppressionGain(const EchoCanceller3Config& config,
+                  Aec3Optimization optimization,
+                  int sample_rate_hz,
+                  size_t num_capture_channels);
+  ~SuppressionGain();
+  void GetGain(
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+          nearend_spectrum,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> echo_spectrum,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+          residual_echo_spectrum,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+          comfort_noise_spectrum,
+      const RenderSignalAnalyzer& render_signal_analyzer,
+      const AecState& aec_state,
+      const std::vector<std::vector<std::vector<float>>>& render,
+      bool clock_drift,
+      float* high_bands_gain,
+      std::array<float, kFftLengthBy2Plus1>* low_band_gain);
+
+  bool IsDominantNearend() {
+    return dominant_nearend_detector_->IsNearendState();
+  }
+
+  // Toggles the usage of the initial state.
+  void SetInitialState(bool state);
+
+ private:
+  // Computes the gain to apply for the bands beyond the first band.
+  float UpperBandsGain(
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> echo_spectrum,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+          comfort_noise_spectrum,
+      const absl::optional<int>& narrow_peak_band,
+      bool saturated_echo,
+      const std::vector<std::vector<std::vector<float>>>& render,
+      const std::array<float, kFftLengthBy2Plus1>& low_band_gain) const;
+
+  void GainToNoAudibleEcho(const std::array<float, kFftLengthBy2Plus1>& nearend,
+                           const std::array<float, kFftLengthBy2Plus1>& echo,
+                           const std::array<float, kFftLengthBy2Plus1>& masker,
+                           std::array<float, kFftLengthBy2Plus1>* gain) const;
+
+  void LowerBandGain(
+      bool stationary_with_low_power,
+      const AecState& aec_state,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>>
+          suppressor_input,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> residual_echo,
+      rtc::ArrayView<const std::array<float, kFftLengthBy2Plus1>> comfort_noise,
+      bool clock_drift,
+      std::array<float, kFftLengthBy2Plus1>* gain);
+
+  void GetMinGain(rtc::ArrayView<const float> weighted_residual_echo,
+                  rtc::ArrayView<const float> last_nearend,
+                  rtc::ArrayView<const float> last_echo,
+                  bool low_noise_render,
+                  bool saturated_echo,
+                  rtc::ArrayView<float> min_gain) const;
+
+  void GetMaxGain(rtc::ArrayView<float> max_gain) const;
+
+  class LowNoiseRenderDetector {
+   public:
+    bool Detect(const std::vector<std::vector<std::vector<float>>>& render);
+
+   private:
+    float average_power_ = 32768.f * 32768.f;
+  };
+
+  struct GainParameters {
+    explicit GainParameters(
+        const EchoCanceller3Config::Suppressor::Tuning& tuning);
+    const float max_inc_factor;
+    const float max_dec_factor_lf;
+    std::array<float, kFftLengthBy2Plus1> enr_transparent_;
+    std::array<float, kFftLengthBy2Plus1> enr_suppress_;
+    std::array<float, kFftLengthBy2Plus1> emr_transparent_;
+  };
+
+  static int instance_count_;
+  std::unique_ptr<ApmDataDumper> data_dumper_;
+  const Aec3Optimization optimization_;
+  const EchoCanceller3Config config_;
+  const size_t num_capture_channels_;
+  const int state_change_duration_blocks_;
+  std::array<float, kFftLengthBy2Plus1> last_gain_;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> last_nearend_;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> last_echo_;
+  LowNoiseRenderDetector low_render_detector_;
+  bool initial_state_ = true;
+  int initial_state_change_counter_ = 0;
+  std::vector<aec3::MovingAverage> nearend_smoothers_;
+  const GainParameters nearend_params_;
+  const GainParameters normal_params_;
+  std::unique_ptr<NearendDetector> dominant_nearend_detector_;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(SuppressionGain);
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_SUPPRESSION_GAIN_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/suppression_gain_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,148 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/suppression_gain.h"
+
+#include "modules/audio_processing/aec3/aec_state.h"
+#include "modules/audio_processing/aec3/render_delay_buffer.h"
+#include "modules/audio_processing/aec3/subtractor.h"
+#include "modules/audio_processing/aec3/subtractor_output.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace aec3 {
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+// Verifies that the check for non-null output gains works.
+TEST(SuppressionGainDeathTest, NullOutputGains) {
+  std::vector<std::array<float, kFftLengthBy2Plus1>> E2(1, {0.f});
+  std::vector<std::array<float, kFftLengthBy2Plus1>> R2(1, {0.f});
+  std::vector<std::array<float, kFftLengthBy2Plus1>> S2(1);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> N2(1, {0.f});
+  for (auto& S2_k : S2) {
+    S2_k.fill(.1f);
+  }
+  FftData E;
+  FftData Y;
+  E.re.fill(0.f);
+  E.im.fill(0.f);
+  Y.re.fill(0.f);
+  Y.im.fill(0.f);
+
+  float high_bands_gain;
+  AecState aec_state(EchoCanceller3Config{}, 1);
+  EXPECT_DEATH(
+      SuppressionGain(EchoCanceller3Config{}, DetectOptimization(), 16000, 1)
+          .GetGain(E2, S2, R2, N2,
+                   RenderSignalAnalyzer((EchoCanceller3Config{})), aec_state,
+                   std::vector<std::vector<std::vector<float>>>(
+                       3, std::vector<std::vector<float>>(
+                              1, std::vector<float>(kBlockSize, 0.f))),
+                   false, &high_bands_gain, nullptr),
+      "");
+}
+
+#endif
+
+// Does a sanity check that the gains are correctly computed.
+TEST(SuppressionGain, BasicGainComputation) {
+  constexpr size_t kNumRenderChannels = 1;
+  constexpr size_t kNumCaptureChannels = 2;
+  constexpr int kSampleRateHz = 16000;
+  constexpr size_t kNumBands = NumBandsForRate(kSampleRateHz);
+  SuppressionGain suppression_gain(EchoCanceller3Config(), DetectOptimization(),
+                                   kSampleRateHz, kNumCaptureChannels);
+  RenderSignalAnalyzer analyzer(EchoCanceller3Config{});
+  float high_bands_gain;
+  std::vector<std::array<float, kFftLengthBy2Plus1>> E2(kNumCaptureChannels);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> S2(kNumCaptureChannels,
+                                                        {0.f});
+  std::vector<std::array<float, kFftLengthBy2Plus1>> Y2(kNumCaptureChannels);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> R2(kNumCaptureChannels);
+  std::vector<std::array<float, kFftLengthBy2Plus1>> N2(kNumCaptureChannels);
+  std::array<float, kFftLengthBy2Plus1> g;
+  std::vector<SubtractorOutput> output(kNumCaptureChannels);
+  std::vector<std::vector<std::vector<float>>> x(
+      kNumBands, std::vector<std::vector<float>>(
+                     kNumRenderChannels, std::vector<float>(kBlockSize, 0.f)));
+  EchoCanceller3Config config;
+  AecState aec_state(config, kNumCaptureChannels);
+  ApmDataDumper data_dumper(42);
+  Subtractor subtractor(config, kNumRenderChannels, kNumCaptureChannels,
+                        &data_dumper, DetectOptimization());
+  std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+      RenderDelayBuffer::Create(config, kSampleRateHz, kNumRenderChannels));
+  absl::optional<DelayEstimate> delay_estimate;
+
+  // Ensure that a strong noise is detected to mask any echoes.
+  for (size_t ch = 0; ch < kNumCaptureChannels; ++ch) {
+    E2[ch].fill(10.f);
+    Y2[ch].fill(10.f);
+    R2[ch].fill(.1f);
+    N2[ch].fill(100.f);
+  }
+  for (auto& subtractor_output : output) {
+    subtractor_output.Reset();
+  }
+
+  // Ensure that the gain is no longer forced to zero.
+  for (int k = 0; k <= kNumBlocksPerSecond / 5 + 1; ++k) {
+    aec_state.Update(delay_estimate, subtractor.FilterFrequencyResponses(),
+                     subtractor.FilterImpulseResponses(),
+                     *render_delay_buffer->GetRenderBuffer(), E2, Y2, output);
+  }
+
+  for (int k = 0; k < 100; ++k) {
+    aec_state.Update(delay_estimate, subtractor.FilterFrequencyResponses(),
+                     subtractor.FilterImpulseResponses(),
+                     *render_delay_buffer->GetRenderBuffer(), E2, Y2, output);
+    suppression_gain.GetGain(E2, S2, R2, N2, analyzer, aec_state, x, false,
+                             &high_bands_gain, &g);
+  }
+  std::for_each(g.begin(), g.end(),
+                [](float a) { EXPECT_NEAR(1.f, a, 0.001); });
+
+  // Ensure that a strong nearend is detected to mask any echoes.
+  for (size_t ch = 0; ch < kNumCaptureChannels; ++ch) {
+    E2[ch].fill(100.f);
+    Y2[ch].fill(100.f);
+    R2[ch].fill(0.1f);
+    S2[ch].fill(0.1f);
+    N2[ch].fill(0.f);
+  }
+
+  for (int k = 0; k < 100; ++k) {
+    aec_state.Update(delay_estimate, subtractor.FilterFrequencyResponses(),
+                     subtractor.FilterImpulseResponses(),
+                     *render_delay_buffer->GetRenderBuffer(), E2, Y2, output);
+    suppression_gain.GetGain(E2, S2, R2, N2, analyzer, aec_state, x, false,
+                             &high_bands_gain, &g);
+  }
+  std::for_each(g.begin(), g.end(),
+                [](float a) { EXPECT_NEAR(1.f, a, 0.001); });
+
+  // Add a strong echo to one of the channels and ensure that it is suppressed.
+  E2[1].fill(1000000000.f);
+  R2[1].fill(10000000000000.f);
+
+  for (int k = 0; k < 10; ++k) {
+    suppression_gain.GetGain(E2, S2, R2, N2, analyzer, aec_state, x, false,
+                             &high_bands_gain, &g);
+  }
+  std::for_each(g.begin(), g.end(),
+                [](float a) { EXPECT_NEAR(0.f, a, 0.001); });
+}
+
+}  // namespace aec3
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/transparent_mode.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/transparent_mode.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/transparent_mode.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/transparent_mode.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,239 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/transparent_mode.h"
+
+#include "rtc_base/checks.h"
+#include "system_wrappers/include/field_trial.h"
+
+namespace webrtc {
+namespace {
+
+constexpr size_t kBlocksSinceConvergencedFilterInit = 10000;
+constexpr size_t kBlocksSinceConsistentEstimateInit = 10000;
+
+bool DeactivateTransparentMode() {
+  return field_trial::IsEnabled("WebRTC-Aec3TransparentModeKillSwitch");
+}
+
+bool ActivateTransparentModeHmm() {
+  return field_trial::IsEnabled("WebRTC-Aec3TransparentModeHmm");
+}
+
+}  // namespace
+
+// Classifier that toggles transparent mode which reduces echo suppression when
+// headsets are used.
+class TransparentModeImpl : public TransparentMode {
+ public:
+  bool Active() const override { return transparency_activated_; }
+
+  void Reset() override {
+    // Determines if transparent mode is used.
+    transparency_activated_ = false;
+
+    // The estimated probability of being transparent mode.
+    prob_transparent_state_ = 0.f;
+  }
+
+  void Update(int filter_delay_blocks,
+              bool any_filter_consistent,
+              bool any_filter_converged,
+              bool any_coarse_filter_converged,
+              bool all_filters_diverged,
+              bool active_render,
+              bool saturated_capture) override {
+    // The classifier is implemented as a Hidden Markov Model (HMM) with two
+    // hidden states: "normal" and "transparent". The estimated probabilities of
+    // the two states are updated by observing filter convergence during active
+    // render. The filters are less likely to be reported as converged when
+    // there is no echo present in the microphone signal.
+
+    // The constants have been obtained by observing active_render and
+    // any_coarse_filter_converged under varying call scenarios. They
+    // have further been hand tuned to prefer normal state during uncertain
+    // regions (to avoid echo leaks).
+
+    // The model is only updated during active render.
+    if (!active_render)
+      return;
+
+    // Probability of switching from one state to the other.
+    constexpr float kSwitch = 0.000001f;
+
+    // Probability of observing converged filters in states "normal" and
+    // "transparent" during active render.
+    constexpr float kConvergedNormal = 0.01f;
+    constexpr float kConvergedTransparent = 0.001f;
+
+    // Probability of transitioning to transparent state from normal state and
+    // transparent state respectively.
+    constexpr float kA[2] = {kSwitch, 1.f - kSwitch};
+
+    // Probability of the two observations (converged filter or not converged
+    // filter) in normal state and transparent state respectively.
+    constexpr float kB[2][2] = {
+        {1.f - kConvergedNormal, kConvergedNormal},
+        {1.f - kConvergedTransparent, kConvergedTransparent}};
+
+    // Probability of the two states before the update.
+    const float prob_transparent = prob_transparent_state_;
+    const float prob_normal = 1.f - prob_transparent;
+
+    // Probability of transitioning to transparent state.
+    const float prob_transition_transparent =
+        prob_normal * kA[0] + prob_transparent * kA[1];
+    const float prob_transition_normal = 1.f - prob_transition_transparent;
+
+    // Observed output.
+    const int out = static_cast<int>(any_coarse_filter_converged);
+
+    // Joint probabilites of the observed output and respective states.
+    const float prob_joint_normal = prob_transition_normal * kB[0][out];
+    const float prob_joint_transparent =
+        prob_transition_transparent * kB[1][out];
+
+    // Conditional probability of transparent state and the observed output.
+    RTC_DCHECK_GT(prob_joint_normal + prob_joint_transparent, 0.f);
+    prob_transparent_state_ =
+        prob_joint_transparent / (prob_joint_normal + prob_joint_transparent);
+
+    // Transparent mode is only activated when its state probability is high.
+    // Dead zone between activation/deactivation thresholds to avoid switching
+    // back and forth.
+    if (prob_transparent_state_ > 0.95f) {
+      transparency_activated_ = true;
+    } else if (prob_transparent_state_ < 0.5f) {
+      transparency_activated_ = false;
+    }
+  }
+
+ private:
+  bool transparency_activated_ = false;
+  float prob_transparent_state_ = 0.f;
+};
+
+// Legacy classifier for toggling transparent mode.
+class LegacyTransparentModeImpl : public TransparentMode {
+ public:
+  explicit LegacyTransparentModeImpl(const EchoCanceller3Config& config)
+      : linear_and_stable_echo_path_(
+            config.echo_removal_control.linear_and_stable_echo_path),
+        active_blocks_since_sane_filter_(kBlocksSinceConsistentEstimateInit),
+        non_converged_sequence_size_(kBlocksSinceConvergencedFilterInit) {}
+
+  bool Active() const override { return transparency_activated_; }
+
+  void Reset() override {
+    non_converged_sequence_size_ = kBlocksSinceConvergencedFilterInit;
+    diverged_sequence_size_ = 0;
+    strong_not_saturated_render_blocks_ = 0;
+    if (linear_and_stable_echo_path_) {
+      recent_convergence_during_activity_ = false;
+    }
+  }
+
+  void Update(int filter_delay_blocks,
+              bool any_filter_consistent,
+              bool any_filter_converged,
+              bool any_coarse_filter_converged,
+              bool all_filters_diverged,
+              bool active_render,
+              bool saturated_capture) override {
+    ++capture_block_counter_;
+    strong_not_saturated_render_blocks_ +=
+        active_render && !saturated_capture ? 1 : 0;
+
+    if (any_filter_consistent && filter_delay_blocks < 5) {
+      sane_filter_observed_ = true;
+      active_blocks_since_sane_filter_ = 0;
+    } else if (active_render) {
+      ++active_blocks_since_sane_filter_;
+    }
+
+    bool sane_filter_recently_seen;
+    if (!sane_filter_observed_) {
+      sane_filter_recently_seen =
+          capture_block_counter_ <= 5 * kNumBlocksPerSecond;
+    } else {
+      sane_filter_recently_seen =
+          active_blocks_since_sane_filter_ <= 30 * kNumBlocksPerSecond;
+    }
+
+    if (any_filter_converged) {
+      recent_convergence_during_activity_ = true;
+      active_non_converged_sequence_size_ = 0;
+      non_converged_sequence_size_ = 0;
+      ++num_converged_blocks_;
+    } else {
+      if (++non_converged_sequence_size_ > 20 * kNumBlocksPerSecond) {
+        num_converged_blocks_ = 0;
+      }
+
+      if (active_render &&
+          ++active_non_converged_sequence_size_ > 60 * kNumBlocksPerSecond) {
+        recent_convergence_during_activity_ = false;
+      }
+    }
+
+    if (!all_filters_diverged) {
+      diverged_sequence_size_ = 0;
+    } else if (++diverged_sequence_size_ >= 60) {
+      // TODO(peah): Change these lines to ensure proper triggering of usable
+      // filter.
+      non_converged_sequence_size_ = kBlocksSinceConvergencedFilterInit;
+    }
+
+    if (active_non_converged_sequence_size_ > 60 * kNumBlocksPerSecond) {
+      finite_erl_recently_detected_ = false;
+    }
+    if (num_converged_blocks_ > 50) {
+      finite_erl_recently_detected_ = true;
+    }
+
+    if (finite_erl_recently_detected_) {
+      transparency_activated_ = false;
+    } else if (sane_filter_recently_seen &&
+               recent_convergence_during_activity_) {
+      transparency_activated_ = false;
+    } else {
+      const bool filter_should_have_converged =
+          strong_not_saturated_render_blocks_ > 6 * kNumBlocksPerSecond;
+      transparency_activated_ = filter_should_have_converged;
+    }
+  }
+
+ private:
+  const bool linear_and_stable_echo_path_;
+  size_t capture_block_counter_ = 0;
+  bool transparency_activated_ = false;
+  size_t active_blocks_since_sane_filter_;
+  bool sane_filter_observed_ = false;
+  bool finite_erl_recently_detected_ = false;
+  size_t non_converged_sequence_size_;
+  size_t diverged_sequence_size_ = 0;
+  size_t active_non_converged_sequence_size_ = 0;
+  size_t num_converged_blocks_ = 0;
+  bool recent_convergence_during_activity_ = false;
+  size_t strong_not_saturated_render_blocks_ = 0;
+};
+
+std::unique_ptr<TransparentMode> TransparentMode::Create(
+    const EchoCanceller3Config& config) {
+  if (config.ep_strength.bounded_erl || DeactivateTransparentMode()) {
+    return nullptr;
+  }
+  if (ActivateTransparentModeHmm()) {
+    return std::make_unique<TransparentModeImpl>();
+  }
+  return std::make_unique<LegacyTransparentModeImpl>(config);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/transparent_mode.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/transparent_mode.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/transparent_mode.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/transparent_mode.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_TRANSPARENT_MODE_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_TRANSPARENT_MODE_H_
+
+#include <memory>
+
+#include "api/audio/echo_canceller3_config.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+
+namespace webrtc {
+
+// Class for detecting and toggling the transparent mode which causes the
+// suppressor to apply less suppression.
+class TransparentMode {
+ public:
+  static std::unique_ptr<TransparentMode> Create(
+      const EchoCanceller3Config& config);
+
+  virtual ~TransparentMode() {}
+
+  // Returns whether the transparent mode should be active.
+  virtual bool Active() const = 0;
+
+  // Resets the state of the detector.
+  virtual void Reset() = 0;
+
+  // Updates the detection decision based on new data.
+  virtual void Update(int filter_delay_blocks,
+                      bool any_filter_consistent,
+                      bool any_filter_converged,
+                      bool any_coarse_filter_converged,
+                      bool all_filters_diverged,
+                      bool active_render,
+                      bool saturated_capture) = 0;
+};
+
+}  // namespace webrtc
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_TRANSPARENT_MODE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math_avx2.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math_avx2.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math_avx2.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math_avx2.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,82 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/vector_math.h"
+
+#include <immintrin.h>
+#include <math.h>
+
+#include "api/array_view.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace aec3 {
+
+// Elementwise square root.
+void VectorMath::SqrtAVX2(rtc::ArrayView<float> x) {
+  const int x_size = static_cast<int>(x.size());
+  const int vector_limit = x_size >> 3;
+
+  int j = 0;
+  for (; j < vector_limit * 8; j += 8) {
+    __m256 g = _mm256_loadu_ps(&x[j]);
+    g = _mm256_sqrt_ps(g);
+    _mm256_storeu_ps(&x[j], g);
+  }
+
+  for (; j < x_size; ++j) {
+    x[j] = sqrtf(x[j]);
+  }
+}
+
+// Elementwise vector multiplication z = x * y.
+void VectorMath::MultiplyAVX2(rtc::ArrayView<const float> x,
+                              rtc::ArrayView<const float> y,
+                              rtc::ArrayView<float> z) {
+  RTC_DCHECK_EQ(z.size(), x.size());
+  RTC_DCHECK_EQ(z.size(), y.size());
+  const int x_size = static_cast<int>(x.size());
+  const int vector_limit = x_size >> 3;
+
+  int j = 0;
+  for (; j < vector_limit * 8; j += 8) {
+    const __m256 x_j = _mm256_loadu_ps(&x[j]);
+    const __m256 y_j = _mm256_loadu_ps(&y[j]);
+    const __m256 z_j = _mm256_mul_ps(x_j, y_j);
+    _mm256_storeu_ps(&z[j], z_j);
+  }
+
+  for (; j < x_size; ++j) {
+    z[j] = x[j] * y[j];
+  }
+}
+
+// Elementwise vector accumulation z += x.
+void VectorMath::AccumulateAVX2(rtc::ArrayView<const float> x,
+                                rtc::ArrayView<float> z) {
+  RTC_DCHECK_EQ(z.size(), x.size());
+  const int x_size = static_cast<int>(x.size());
+  const int vector_limit = x_size >> 3;
+
+  int j = 0;
+  for (; j < vector_limit * 8; j += 8) {
+    const __m256 x_j = _mm256_loadu_ps(&x[j]);
+    __m256 z_j = _mm256_loadu_ps(&z[j]);
+    z_j = _mm256_add_ps(x_j, z_j);
+    _mm256_storeu_ps(&z[j], z_j);
+  }
+
+  for (; j < x_size; ++j) {
+    z[j] += x[j];
+  }
+}
+
+}  // namespace aec3
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,229 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_
+#define MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_
+
+// Defines WEBRTC_ARCH_X86_FAMILY, used below.
+#include "rtc_base/system/arch.h"
+
+#if defined(WEBRTC_HAS_NEON)
+#include <arm_neon.h>
+#endif
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+#include <emmintrin.h>
+#endif
+#include <math.h>
+
+#include <algorithm>
+#include <array>
+#include <functional>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/aec3/aec3_common.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace aec3 {
+
+// Provides optimizations for mathematical operations based on vectors.
+class VectorMath {
+ public:
+  explicit VectorMath(Aec3Optimization optimization)
+      : optimization_(optimization) {}
+
+  // Elementwise square root.
+  void SqrtAVX2(rtc::ArrayView<float> x);
+  void Sqrt(rtc::ArrayView<float> x) {
+    switch (optimization_) {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+      case Aec3Optimization::kSse2: {
+        const int x_size = static_cast<int>(x.size());
+        const int vector_limit = x_size >> 2;
+
+        int j = 0;
+        for (; j < vector_limit * 4; j += 4) {
+          __m128 g = _mm_loadu_ps(&x[j]);
+          g = _mm_sqrt_ps(g);
+          _mm_storeu_ps(&x[j], g);
+        }
+
+        for (; j < x_size; ++j) {
+          x[j] = sqrtf(x[j]);
+        }
+      } break;
+      case Aec3Optimization::kAvx2:
+        SqrtAVX2(x);
+        break;
+#endif
+#if defined(WEBRTC_HAS_NEON)
+      case Aec3Optimization::kNeon: {
+        const int x_size = static_cast<int>(x.size());
+        const int vector_limit = x_size >> 2;
+
+        int j = 0;
+        for (; j < vector_limit * 4; j += 4) {
+          float32x4_t g = vld1q_f32(&x[j]);
+#if !defined(WEBRTC_ARCH_ARM64)
+          float32x4_t y = vrsqrteq_f32(g);
+
+          // Code to handle sqrt(0).
+          // If the input to sqrtf() is zero, a zero will be returned.
+          // If the input to vrsqrteq_f32() is zero, positive infinity is
+          // returned.
+          const uint32x4_t vec_p_inf = vdupq_n_u32(0x7F800000);
+          // check for divide by zero
+          const uint32x4_t div_by_zero =
+              vceqq_u32(vec_p_inf, vreinterpretq_u32_f32(y));
+          // zero out the positive infinity results
+          y = vreinterpretq_f32_u32(
+              vandq_u32(vmvnq_u32(div_by_zero), vreinterpretq_u32_f32(y)));
+          // from arm documentation
+          // The Newton-Raphson iteration:
+          //     y[n+1] = y[n] * (3 - d * (y[n] * y[n])) / 2)
+          // converges to (1/√d) if y0 is the result of VRSQRTE applied to d.
+          //
+          // Note: The precision did not improve after 2 iterations.
+          for (int i = 0; i < 2; i++) {
+            y = vmulq_f32(vrsqrtsq_f32(vmulq_f32(y, y), g), y);
+          }
+          // sqrt(g) = g * 1/sqrt(g)
+          g = vmulq_f32(g, y);
+#else
+          g = vsqrtq_f32(g);
+#endif
+          vst1q_f32(&x[j], g);
+        }
+
+        for (; j < x_size; ++j) {
+          x[j] = sqrtf(x[j]);
+        }
+      }
+#endif
+      break;
+      default:
+        std::for_each(x.begin(), x.end(), [](float& a) { a = sqrtf(a); });
+    }
+  }
+
+  // Elementwise vector multiplication z = x * y.
+  void MultiplyAVX2(rtc::ArrayView<const float> x,
+                    rtc::ArrayView<const float> y,
+                    rtc::ArrayView<float> z);
+  void Multiply(rtc::ArrayView<const float> x,
+                rtc::ArrayView<const float> y,
+                rtc::ArrayView<float> z) {
+    RTC_DCHECK_EQ(z.size(), x.size());
+    RTC_DCHECK_EQ(z.size(), y.size());
+    switch (optimization_) {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+      case Aec3Optimization::kSse2: {
+        const int x_size = static_cast<int>(x.size());
+        const int vector_limit = x_size >> 2;
+
+        int j = 0;
+        for (; j < vector_limit * 4; j += 4) {
+          const __m128 x_j = _mm_loadu_ps(&x[j]);
+          const __m128 y_j = _mm_loadu_ps(&y[j]);
+          const __m128 z_j = _mm_mul_ps(x_j, y_j);
+          _mm_storeu_ps(&z[j], z_j);
+        }
+
+        for (; j < x_size; ++j) {
+          z[j] = x[j] * y[j];
+        }
+      } break;
+      case Aec3Optimization::kAvx2:
+        MultiplyAVX2(x, y, z);
+        break;
+#endif
+#if defined(WEBRTC_HAS_NEON)
+      case Aec3Optimization::kNeon: {
+        const int x_size = static_cast<int>(x.size());
+        const int vector_limit = x_size >> 2;
+
+        int j = 0;
+        for (; j < vector_limit * 4; j += 4) {
+          const float32x4_t x_j = vld1q_f32(&x[j]);
+          const float32x4_t y_j = vld1q_f32(&y[j]);
+          const float32x4_t z_j = vmulq_f32(x_j, y_j);
+          vst1q_f32(&z[j], z_j);
+        }
+
+        for (; j < x_size; ++j) {
+          z[j] = x[j] * y[j];
+        }
+      } break;
+#endif
+      default:
+        std::transform(x.begin(), x.end(), y.begin(), z.begin(),
+                       std::multiplies<float>());
+    }
+  }
+
+  // Elementwise vector accumulation z += x.
+  void AccumulateAVX2(rtc::ArrayView<const float> x, rtc::ArrayView<float> z);
+  void Accumulate(rtc::ArrayView<const float> x, rtc::ArrayView<float> z) {
+    RTC_DCHECK_EQ(z.size(), x.size());
+    switch (optimization_) {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+      case Aec3Optimization::kSse2: {
+        const int x_size = static_cast<int>(x.size());
+        const int vector_limit = x_size >> 2;
+
+        int j = 0;
+        for (; j < vector_limit * 4; j += 4) {
+          const __m128 x_j = _mm_loadu_ps(&x[j]);
+          __m128 z_j = _mm_loadu_ps(&z[j]);
+          z_j = _mm_add_ps(x_j, z_j);
+          _mm_storeu_ps(&z[j], z_j);
+        }
+
+        for (; j < x_size; ++j) {
+          z[j] += x[j];
+        }
+      } break;
+      case Aec3Optimization::kAvx2:
+        AccumulateAVX2(x, z);
+        break;
+#endif
+#if defined(WEBRTC_HAS_NEON)
+      case Aec3Optimization::kNeon: {
+        const int x_size = static_cast<int>(x.size());
+        const int vector_limit = x_size >> 2;
+
+        int j = 0;
+        for (; j < vector_limit * 4; j += 4) {
+          const float32x4_t x_j = vld1q_f32(&x[j]);
+          float32x4_t z_j = vld1q_f32(&z[j]);
+          z_j = vaddq_f32(z_j, x_j);
+          vst1q_f32(&z[j], z_j);
+        }
+
+        for (; j < x_size; ++j) {
+          z[j] += x[j];
+        }
+      } break;
+#endif
+      default:
+        std::transform(x.begin(), x.end(), z.begin(), z.begin(),
+                       std::plus<float>());
+    }
+  }
+
+ private:
+  Aec3Optimization optimization_;
+};
+
+}  // namespace aec3
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AEC3_VECTOR_MATH_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/aec3/vector_math_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,209 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/aec3/vector_math.h"
+
+#include <math.h>
+
+#include "rtc_base/system/arch.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+#if defined(WEBRTC_HAS_NEON)
+
+TEST(VectorMath, Sqrt) {
+  std::array<float, kFftLengthBy2Plus1> x;
+  std::array<float, kFftLengthBy2Plus1> z;
+  std::array<float, kFftLengthBy2Plus1> z_neon;
+
+  for (size_t k = 0; k < x.size(); ++k) {
+    x[k] = (2.f / 3.f) * k;
+  }
+
+  std::copy(x.begin(), x.end(), z.begin());
+  aec3::VectorMath(Aec3Optimization::kNone).Sqrt(z);
+  std::copy(x.begin(), x.end(), z_neon.begin());
+  aec3::VectorMath(Aec3Optimization::kNeon).Sqrt(z_neon);
+  for (size_t k = 0; k < z.size(); ++k) {
+    EXPECT_NEAR(z[k], z_neon[k], 0.0001f);
+    EXPECT_NEAR(sqrtf(x[k]), z_neon[k], 0.0001f);
+  }
+}
+
+TEST(VectorMath, Multiply) {
+  std::array<float, kFftLengthBy2Plus1> x;
+  std::array<float, kFftLengthBy2Plus1> y;
+  std::array<float, kFftLengthBy2Plus1> z;
+  std::array<float, kFftLengthBy2Plus1> z_neon;
+
+  for (size_t k = 0; k < x.size(); ++k) {
+    x[k] = k;
+    y[k] = (2.f / 3.f) * k;
+  }
+
+  aec3::VectorMath(Aec3Optimization::kNone).Multiply(x, y, z);
+  aec3::VectorMath(Aec3Optimization::kNeon).Multiply(x, y, z_neon);
+  for (size_t k = 0; k < z.size(); ++k) {
+    EXPECT_FLOAT_EQ(z[k], z_neon[k]);
+    EXPECT_FLOAT_EQ(x[k] * y[k], z_neon[k]);
+  }
+}
+
+TEST(VectorMath, Accumulate) {
+  std::array<float, kFftLengthBy2Plus1> x;
+  std::array<float, kFftLengthBy2Plus1> z;
+  std::array<float, kFftLengthBy2Plus1> z_neon;
+
+  for (size_t k = 0; k < x.size(); ++k) {
+    x[k] = k;
+    z[k] = z_neon[k] = 2.f * k;
+  }
+
+  aec3::VectorMath(Aec3Optimization::kNone).Accumulate(x, z);
+  aec3::VectorMath(Aec3Optimization::kNeon).Accumulate(x, z_neon);
+  for (size_t k = 0; k < z.size(); ++k) {
+    EXPECT_FLOAT_EQ(z[k], z_neon[k]);
+    EXPECT_FLOAT_EQ(x[k] + 2.f * x[k], z_neon[k]);
+  }
+}
+#endif
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+
+TEST(VectorMath, Sse2Sqrt) {
+  if (GetCPUInfo(kSSE2) != 0) {
+    std::array<float, kFftLengthBy2Plus1> x;
+    std::array<float, kFftLengthBy2Plus1> z;
+    std::array<float, kFftLengthBy2Plus1> z_sse2;
+
+    for (size_t k = 0; k < x.size(); ++k) {
+      x[k] = (2.f / 3.f) * k;
+    }
+
+    std::copy(x.begin(), x.end(), z.begin());
+    aec3::VectorMath(Aec3Optimization::kNone).Sqrt(z);
+    std::copy(x.begin(), x.end(), z_sse2.begin());
+    aec3::VectorMath(Aec3Optimization::kSse2).Sqrt(z_sse2);
+    EXPECT_EQ(z, z_sse2);
+    for (size_t k = 0; k < z.size(); ++k) {
+      EXPECT_FLOAT_EQ(z[k], z_sse2[k]);
+      EXPECT_FLOAT_EQ(sqrtf(x[k]), z_sse2[k]);
+    }
+  }
+}
+
+TEST(VectorMath, Avx2Sqrt) {
+  if (GetCPUInfo(kAVX2) != 0) {
+    std::array<float, kFftLengthBy2Plus1> x;
+    std::array<float, kFftLengthBy2Plus1> z;
+    std::array<float, kFftLengthBy2Plus1> z_avx2;
+
+    for (size_t k = 0; k < x.size(); ++k) {
+      x[k] = (2.f / 3.f) * k;
+    }
+
+    std::copy(x.begin(), x.end(), z.begin());
+    aec3::VectorMath(Aec3Optimization::kNone).Sqrt(z);
+    std::copy(x.begin(), x.end(), z_avx2.begin());
+    aec3::VectorMath(Aec3Optimization::kAvx2).Sqrt(z_avx2);
+    EXPECT_EQ(z, z_avx2);
+    for (size_t k = 0; k < z.size(); ++k) {
+      EXPECT_FLOAT_EQ(z[k], z_avx2[k]);
+      EXPECT_FLOAT_EQ(sqrtf(x[k]), z_avx2[k]);
+    }
+  }
+}
+
+TEST(VectorMath, Sse2Multiply) {
+  if (GetCPUInfo(kSSE2) != 0) {
+    std::array<float, kFftLengthBy2Plus1> x;
+    std::array<float, kFftLengthBy2Plus1> y;
+    std::array<float, kFftLengthBy2Plus1> z;
+    std::array<float, kFftLengthBy2Plus1> z_sse2;
+
+    for (size_t k = 0; k < x.size(); ++k) {
+      x[k] = k;
+      y[k] = (2.f / 3.f) * k;
+    }
+
+    aec3::VectorMath(Aec3Optimization::kNone).Multiply(x, y, z);
+    aec3::VectorMath(Aec3Optimization::kSse2).Multiply(x, y, z_sse2);
+    for (size_t k = 0; k < z.size(); ++k) {
+      EXPECT_FLOAT_EQ(z[k], z_sse2[k]);
+      EXPECT_FLOAT_EQ(x[k] * y[k], z_sse2[k]);
+    }
+  }
+}
+
+TEST(VectorMath, Avx2Multiply) {
+  if (GetCPUInfo(kAVX2) != 0) {
+    std::array<float, kFftLengthBy2Plus1> x;
+    std::array<float, kFftLengthBy2Plus1> y;
+    std::array<float, kFftLengthBy2Plus1> z;
+    std::array<float, kFftLengthBy2Plus1> z_avx2;
+
+    for (size_t k = 0; k < x.size(); ++k) {
+      x[k] = k;
+      y[k] = (2.f / 3.f) * k;
+    }
+
+    aec3::VectorMath(Aec3Optimization::kNone).Multiply(x, y, z);
+    aec3::VectorMath(Aec3Optimization::kAvx2).Multiply(x, y, z_avx2);
+    for (size_t k = 0; k < z.size(); ++k) {
+      EXPECT_FLOAT_EQ(z[k], z_avx2[k]);
+      EXPECT_FLOAT_EQ(x[k] * y[k], z_avx2[k]);
+    }
+  }
+}
+
+TEST(VectorMath, Sse2Accumulate) {
+  if (GetCPUInfo(kSSE2) != 0) {
+    std::array<float, kFftLengthBy2Plus1> x;
+    std::array<float, kFftLengthBy2Plus1> z;
+    std::array<float, kFftLengthBy2Plus1> z_sse2;
+
+    for (size_t k = 0; k < x.size(); ++k) {
+      x[k] = k;
+      z[k] = z_sse2[k] = 2.f * k;
+    }
+
+    aec3::VectorMath(Aec3Optimization::kNone).Accumulate(x, z);
+    aec3::VectorMath(Aec3Optimization::kSse2).Accumulate(x, z_sse2);
+    for (size_t k = 0; k < z.size(); ++k) {
+      EXPECT_FLOAT_EQ(z[k], z_sse2[k]);
+      EXPECT_FLOAT_EQ(x[k] + 2.f * x[k], z_sse2[k]);
+    }
+  }
+}
+
+TEST(VectorMath, Avx2Accumulate) {
+  if (GetCPUInfo(kAVX2) != 0) {
+    std::array<float, kFftLengthBy2Plus1> x;
+    std::array<float, kFftLengthBy2Plus1> z;
+    std::array<float, kFftLengthBy2Plus1> z_avx2;
+
+    for (size_t k = 0; k < x.size(); ++k) {
+      x[k] = k;
+      z[k] = z_avx2[k] = 2.f * k;
+    }
+
+    aec3::VectorMath(Aec3Optimization::kNone).Accumulate(x, z);
+    aec3::VectorMath(Aec3Optimization::kAvx2).Accumulate(x, z_avx2);
+    for (size_t k = 0; k < z.size(); ++k) {
+      EXPECT_FLOAT_EQ(z[k], z_avx2[k]);
+      EXPECT_FLOAT_EQ(x[k] + 2.f * x[k], z_avx2[k]);
+    }
+  }
+}
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_agc.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_agc.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_agc.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_agc.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,146 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/adaptive_agc.h"
+
+#include "common_audio/include/audio_util.h"
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "modules/audio_processing/agc2/vad_with_level.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+
+namespace webrtc {
+namespace {
+
+using AdaptiveDigitalConfig =
+    AudioProcessing::Config::GainController2::AdaptiveDigital;
+using NoiseEstimatorType =
+    AudioProcessing::Config::GainController2::NoiseEstimator;
+
+constexpr int kGainApplierAdjacentSpeechFramesThreshold = 1;
+constexpr float kMaxGainChangePerSecondDb = 3.0f;
+constexpr float kMaxOutputNoiseLevelDbfs = -50.0f;
+
+// Detects the available CPU features and applies any kill-switches.
+AvailableCpuFeatures GetAllowedCpuFeatures(
+    const AdaptiveDigitalConfig& config) {
+  AvailableCpuFeatures features = GetAvailableCpuFeatures();
+  if (!config.sse2_allowed) {
+    features.sse2 = false;
+  }
+  if (!config.avx2_allowed) {
+    features.avx2 = false;
+  }
+  if (!config.neon_allowed) {
+    features.neon = false;
+  }
+  return features;
+}
+
+std::unique_ptr<NoiseLevelEstimator> CreateNoiseLevelEstimator(
+    NoiseEstimatorType estimator_type,
+    ApmDataDumper* apm_data_dumper) {
+  switch (estimator_type) {
+    case NoiseEstimatorType::kStationaryNoise:
+      return CreateStationaryNoiseEstimator(apm_data_dumper);
+    case NoiseEstimatorType::kNoiseFloor:
+      return CreateNoiseFloorEstimator(apm_data_dumper);
+  }
+}
+
+constexpr NoiseEstimatorType kDefaultNoiseLevelEstimatorType =
+    NoiseEstimatorType::kNoiseFloor;
+
+}  // namespace
+
+AdaptiveAgc::AdaptiveAgc(ApmDataDumper* apm_data_dumper)
+    : speech_level_estimator_(apm_data_dumper),
+      gain_controller_(apm_data_dumper,
+                       kGainApplierAdjacentSpeechFramesThreshold,
+                       kMaxGainChangePerSecondDb,
+                       kMaxOutputNoiseLevelDbfs),
+      apm_data_dumper_(apm_data_dumper),
+      noise_level_estimator_(
+          CreateNoiseLevelEstimator(kDefaultNoiseLevelEstimatorType,
+                                    apm_data_dumper)),
+      saturation_protector_(
+          CreateSaturationProtector(kSaturationProtectorInitialHeadroomDb,
+                                    kSaturationProtectorExtraHeadroomDb,
+                                    kGainApplierAdjacentSpeechFramesThreshold,
+                                    apm_data_dumper)) {
+  RTC_DCHECK(apm_data_dumper);
+}
+
+AdaptiveAgc::AdaptiveAgc(ApmDataDumper* apm_data_dumper,
+                         const AdaptiveDigitalConfig& config)
+    : speech_level_estimator_(apm_data_dumper,
+                              config.adjacent_speech_frames_threshold),
+      vad_(config.vad_reset_period_ms, GetAllowedCpuFeatures(config)),
+      gain_controller_(apm_data_dumper,
+                       config.adjacent_speech_frames_threshold,
+                       config.max_gain_change_db_per_second,
+                       config.max_output_noise_level_dbfs),
+      apm_data_dumper_(apm_data_dumper),
+      noise_level_estimator_(
+          CreateNoiseLevelEstimator(config.noise_estimator, apm_data_dumper)),
+      saturation_protector_(
+          CreateSaturationProtector(kSaturationProtectorInitialHeadroomDb,
+                                    kSaturationProtectorExtraHeadroomDb,
+                                    config.adjacent_speech_frames_threshold,
+                                    apm_data_dumper)) {
+  RTC_DCHECK(apm_data_dumper);
+  RTC_DCHECK(noise_level_estimator_);
+  RTC_DCHECK(saturation_protector_);
+  if (!config.use_saturation_protector) {
+    RTC_LOG(LS_WARNING) << "The saturation protector cannot be disabled.";
+  }
+}
+
+AdaptiveAgc::~AdaptiveAgc() = default;
+
+void AdaptiveAgc::Process(AudioFrameView<float> frame, float limiter_envelope) {
+  AdaptiveDigitalGainApplier::FrameInfo info;
+
+  VadLevelAnalyzer::Result vad_result = vad_.AnalyzeFrame(frame);
+  info.speech_probability = vad_result.speech_probability;
+  apm_data_dumper_->DumpRaw("agc2_speech_probability",
+                            vad_result.speech_probability);
+  apm_data_dumper_->DumpRaw("agc2_input_rms_dbfs", vad_result.rms_dbfs);
+  apm_data_dumper_->DumpRaw("agc2_input_peak_dbfs", vad_result.peak_dbfs);
+
+  speech_level_estimator_.Update(vad_result);
+  info.speech_level_dbfs = speech_level_estimator_.level_dbfs();
+  info.speech_level_reliable = speech_level_estimator_.IsConfident();
+  apm_data_dumper_->DumpRaw("agc2_speech_level_dbfs", info.speech_level_dbfs);
+  apm_data_dumper_->DumpRaw("agc2_speech_level_reliable",
+                            info.speech_level_reliable);
+
+  info.noise_rms_dbfs = noise_level_estimator_->Analyze(frame);
+  apm_data_dumper_->DumpRaw("agc2_noise_rms_dbfs", info.noise_rms_dbfs);
+
+  saturation_protector_->Analyze(info.speech_probability, vad_result.peak_dbfs,
+                                 info.speech_level_dbfs);
+  info.headroom_db = saturation_protector_->HeadroomDb();
+  apm_data_dumper_->DumpRaw("agc2_headroom_db", info.headroom_db);
+
+  info.limiter_envelope_dbfs = FloatS16ToDbfs(limiter_envelope);
+  apm_data_dumper_->DumpRaw("agc2_limiter_envelope_dbfs",
+                            info.limiter_envelope_dbfs);
+
+  gain_controller_.Process(info, frame);
+}
+
+void AdaptiveAgc::HandleInputGainChange() {
+  speech_level_estimator_.Reset();
+  saturation_protector_->Reset();
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_agc.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_agc.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_agc.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_agc.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_AGC_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_AGC_H_
+
+#include <memory>
+
+#include "modules/audio_processing/agc2/adaptive_digital_gain_applier.h"
+#include "modules/audio_processing/agc2/adaptive_mode_level_estimator.h"
+#include "modules/audio_processing/agc2/noise_level_estimator.h"
+#include "modules/audio_processing/agc2/saturation_protector.h"
+#include "modules/audio_processing/agc2/vad_with_level.h"
+#include "modules/audio_processing/include/audio_frame_view.h"
+#include "modules/audio_processing/include/audio_processing.h"
+
+namespace webrtc {
+class ApmDataDumper;
+
+// Adaptive digital gain controller.
+// TODO(crbug.com/webrtc/7494): Unify with `AdaptiveDigitalGainApplier`.
+class AdaptiveAgc {
+ public:
+  explicit AdaptiveAgc(ApmDataDumper* apm_data_dumper);
+  // TODO(crbug.com/webrtc/7494): Remove ctor above.
+  AdaptiveAgc(
+      ApmDataDumper* apm_data_dumper,
+      const AudioProcessing::Config::GainController2::AdaptiveDigital& config);
+  ~AdaptiveAgc();
+
+  // Analyzes `frame` and applies a digital adaptive gain to it. Takes into
+  // account the envelope measured by the limiter.
+  // TODO(crbug.com/webrtc/7494): Make the class depend on the limiter.
+  void Process(AudioFrameView<float> frame, float limiter_envelope);
+
+  // Handles a gain change applied to the input signal (e.g., analog gain).
+  void HandleInputGainChange();
+
+ private:
+  AdaptiveModeLevelEstimator speech_level_estimator_;
+  VadLevelAnalyzer vad_;
+  AdaptiveDigitalGainApplier gain_controller_;
+  ApmDataDumper* const apm_data_dumper_;
+  std::unique_ptr<NoiseLevelEstimator> noise_level_estimator_;
+  std::unique_ptr<SaturationProtector> saturation_protector_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_AGC_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,206 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/adaptive_digital_gain_applier.h"
+
+#include <algorithm>
+
+#include "common_audio/include/audio_util.h"
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/numerics/safe_minmax.h"
+#include "system_wrappers/include/metrics.h"
+
+namespace webrtc {
+namespace {
+
+constexpr int kHeadroomHistogramMin = 0;
+constexpr int kHeadroomHistogramMax = 50;
+
+// This function maps input level to desired applied gain. We want to
+// boost the signal so that peaks are at -kHeadroomDbfs. We can't
+// apply more than kMaxGainDb gain.
+float ComputeGainDb(float input_level_dbfs) {
+  // If the level is very low, boost it as much as we can.
+  if (input_level_dbfs < -(kHeadroomDbfs + kMaxGainDb)) {
+    return kMaxGainDb;
+  }
+  // We expect to end up here most of the time: the level is below
+  // -headroom, but we can boost it to -headroom.
+  if (input_level_dbfs < -kHeadroomDbfs) {
+    return -kHeadroomDbfs - input_level_dbfs;
+  }
+  // Otherwise, the level is too high and we can't boost.
+  RTC_DCHECK_GE(input_level_dbfs, -kHeadroomDbfs);
+  return 0.f;
+}
+
+// Returns `target_gain` if the output noise level is below
+// `max_output_noise_level_dbfs`; otherwise returns a capped gain so that the
+// output noise level equals `max_output_noise_level_dbfs`.
+float LimitGainByNoise(float target_gain,
+                       float input_noise_level_dbfs,
+                       float max_output_noise_level_dbfs,
+                       ApmDataDumper& apm_data_dumper) {
+  const float max_allowed_gain_db =
+      max_output_noise_level_dbfs - input_noise_level_dbfs;
+  apm_data_dumper.DumpRaw("agc2_adaptive_gain_applier_max_allowed_gain_db",
+                          max_allowed_gain_db);
+  return std::min(target_gain, std::max(max_allowed_gain_db, 0.f));
+}
+
+float LimitGainByLowConfidence(float target_gain,
+                               float last_gain,
+                               float limiter_audio_level_dbfs,
+                               bool estimate_is_confident) {
+  if (estimate_is_confident ||
+      limiter_audio_level_dbfs <= kLimiterThresholdForAgcGainDbfs) {
+    return target_gain;
+  }
+  const float limiter_level_before_gain = limiter_audio_level_dbfs - last_gain;
+
+  // Compute a new gain so that `limiter_level_before_gain` + `new_target_gain`
+  // is not great than `kLimiterThresholdForAgcGainDbfs`.
+  const float new_target_gain = std::max(
+      kLimiterThresholdForAgcGainDbfs - limiter_level_before_gain, 0.f);
+  return std::min(new_target_gain, target_gain);
+}
+
+// Computes how the gain should change during this frame.
+// Return the gain difference in db to 'last_gain_db'.
+float ComputeGainChangeThisFrameDb(float target_gain_db,
+                                   float last_gain_db,
+                                   bool gain_increase_allowed,
+                                   float max_gain_decrease_db,
+                                   float max_gain_increase_db) {
+  RTC_DCHECK_GT(max_gain_decrease_db, 0);
+  RTC_DCHECK_GT(max_gain_increase_db, 0);
+  float target_gain_difference_db = target_gain_db - last_gain_db;
+  if (!gain_increase_allowed) {
+    target_gain_difference_db = std::min(target_gain_difference_db, 0.f);
+  }
+  return rtc::SafeClamp(target_gain_difference_db, -max_gain_decrease_db,
+                        max_gain_increase_db);
+}
+
+}  // namespace
+
+AdaptiveDigitalGainApplier::AdaptiveDigitalGainApplier(
+    ApmDataDumper* apm_data_dumper,
+    int adjacent_speech_frames_threshold,
+    float max_gain_change_db_per_second,
+    float max_output_noise_level_dbfs)
+    : apm_data_dumper_(apm_data_dumper),
+      gain_applier_(
+          /*hard_clip_samples=*/false,
+          /*initial_gain_factor=*/DbToRatio(kInitialAdaptiveDigitalGainDb)),
+      adjacent_speech_frames_threshold_(adjacent_speech_frames_threshold),
+      max_gain_change_db_per_10ms_(max_gain_change_db_per_second *
+                                   kFrameDurationMs / 1000.f),
+      max_output_noise_level_dbfs_(max_output_noise_level_dbfs),
+      calls_since_last_gain_log_(0),
+      frames_to_gain_increase_allowed_(adjacent_speech_frames_threshold_),
+      last_gain_db_(kInitialAdaptiveDigitalGainDb) {
+  RTC_DCHECK_GT(max_gain_change_db_per_second, 0.f);
+  RTC_DCHECK_GE(frames_to_gain_increase_allowed_, 1);
+  RTC_DCHECK_GE(max_output_noise_level_dbfs_, -90.f);
+  RTC_DCHECK_LE(max_output_noise_level_dbfs_, 0.f);
+}
+
+void AdaptiveDigitalGainApplier::Process(const FrameInfo& info,
+                                         AudioFrameView<float> frame) {
+  RTC_DCHECK_GE(info.speech_level_dbfs, -150.f);
+  RTC_DCHECK_GE(frame.num_channels(), 1);
+  RTC_DCHECK(
+      frame.samples_per_channel() == 80 || frame.samples_per_channel() == 160 ||
+      frame.samples_per_channel() == 320 || frame.samples_per_channel() == 480)
+      << "`frame` does not look like a 10 ms frame for an APM supported sample "
+         "rate";
+
+  // Compute the input level used to select the desired gain.
+  RTC_DCHECK_GT(info.headroom_db, 0.0f);
+  const float input_level_dbfs = info.speech_level_dbfs + info.headroom_db;
+
+  const float target_gain_db = LimitGainByLowConfidence(
+      LimitGainByNoise(ComputeGainDb(input_level_dbfs), info.noise_rms_dbfs,
+                       max_output_noise_level_dbfs_, *apm_data_dumper_),
+      last_gain_db_, info.limiter_envelope_dbfs, info.speech_level_reliable);
+
+  // Forbid increasing the gain until enough adjacent speech frames are
+  // observed.
+  bool first_confident_speech_frame = false;
+  if (info.speech_probability < kVadConfidenceThreshold) {
+    frames_to_gain_increase_allowed_ = adjacent_speech_frames_threshold_;
+  } else if (frames_to_gain_increase_allowed_ > 0) {
+    frames_to_gain_increase_allowed_--;
+    first_confident_speech_frame = frames_to_gain_increase_allowed_ == 0;
+  }
+  apm_data_dumper_->DumpRaw(
+      "agc2_adaptive_gain_applier_frames_to_gain_increase_allowed",
+      frames_to_gain_increase_allowed_);
+
+  const bool gain_increase_allowed = frames_to_gain_increase_allowed_ == 0;
+
+  float max_gain_increase_db = max_gain_change_db_per_10ms_;
+  if (first_confident_speech_frame) {
+    // No gain increase happened while waiting for a long enough speech
+    // sequence. Therefore, temporarily allow a faster gain increase.
+    RTC_DCHECK(gain_increase_allowed);
+    max_gain_increase_db *= adjacent_speech_frames_threshold_;
+  }
+
+  const float gain_change_this_frame_db = ComputeGainChangeThisFrameDb(
+      target_gain_db, last_gain_db_, gain_increase_allowed,
+      /*max_gain_decrease_db=*/max_gain_change_db_per_10ms_,
+      max_gain_increase_db);
+
+  apm_data_dumper_->DumpRaw("agc2_adaptive_gain_applier_want_to_change_by_db",
+                            target_gain_db - last_gain_db_);
+  apm_data_dumper_->DumpRaw("agc2_adaptive_gain_applier_will_change_by_db",
+                            gain_change_this_frame_db);
+
+  // Optimization: avoid calling math functions if gain does not
+  // change.
+  if (gain_change_this_frame_db != 0.f) {
+    gain_applier_.SetGainFactor(
+        DbToRatio(last_gain_db_ + gain_change_this_frame_db));
+  }
+  gain_applier_.ApplyGain(frame);
+
+  // Remember that the gain has changed for the next iteration.
+  last_gain_db_ = last_gain_db_ + gain_change_this_frame_db;
+  apm_data_dumper_->DumpRaw("agc2_adaptive_gain_applier_applied_gain_db",
+                            last_gain_db_);
+
+  // Log every 10 seconds.
+  calls_since_last_gain_log_++;
+  if (calls_since_last_gain_log_ == 1000) {
+    calls_since_last_gain_log_ = 0;
+    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.Agc2.EstimatedSpeechLevel",
+                                -info.speech_level_dbfs, 0, 100, 101);
+    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.Agc2.EstimatedNoiseLevel",
+                                -info.noise_rms_dbfs, 0, 100, 101);
+    RTC_HISTOGRAM_COUNTS_LINEAR(
+        "WebRTC.Audio.Agc2.Headroom", info.headroom_db, kHeadroomHistogramMin,
+        kHeadroomHistogramMax,
+        kHeadroomHistogramMax - kHeadroomHistogramMin + 1);
+    RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.Audio.Agc2.DigitalGainApplied",
+                                last_gain_db_, 0, kMaxGainDb, kMaxGainDb + 1);
+    RTC_LOG(LS_INFO) << "AGC2 adaptive digital"
+                     << " | speech_dbfs: " << info.speech_level_dbfs
+                     << " | noise_dbfs: " << info.noise_rms_dbfs
+                     << " | headroom_db: " << info.headroom_db
+                     << " | gain_db: " << last_gain_db_;
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_DIGITAL_GAIN_APPLIER_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_DIGITAL_GAIN_APPLIER_H_
+
+#include "modules/audio_processing/agc2/gain_applier.h"
+#include "modules/audio_processing/include/audio_frame_view.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+
+// TODO(bugs.webrtc.org): Split into `GainAdaptor` and `GainApplier`.
+// Selects the target digital gain, decides when and how quickly to adapt to the
+// target and applies the current gain to 10 ms frames.
+class AdaptiveDigitalGainApplier {
+ public:
+  // Information about a frame to process.
+  struct FrameInfo {
+    float speech_probability;     // Probability of speech in the [0, 1] range.
+    float speech_level_dbfs;      // Estimated speech level (dBFS).
+    bool speech_level_reliable;   // True with reliable speech level estimation.
+    float noise_rms_dbfs;         // Estimated noise RMS level (dBFS).
+    float headroom_db;            // Headroom (dB).
+    float limiter_envelope_dbfs;  // Envelope level from the limiter (dBFS).
+  };
+
+  // Ctor. `adjacent_speech_frames_threshold` indicates how many adjacent speech
+  // frames must be observed in order to consider the sequence as speech.
+  // `max_gain_change_db_per_second` limits the adaptation speed (uniformly
+  // operated across frames). `max_output_noise_level_dbfs` limits the output
+  // noise level.
+  AdaptiveDigitalGainApplier(ApmDataDumper* apm_data_dumper,
+                             int adjacent_speech_frames_threshold,
+                             float max_gain_change_db_per_second,
+                             float max_output_noise_level_dbfs);
+  AdaptiveDigitalGainApplier(const AdaptiveDigitalGainApplier&) = delete;
+  AdaptiveDigitalGainApplier& operator=(const AdaptiveDigitalGainApplier&) =
+      delete;
+
+  // Analyzes `info`, updates the digital gain and applies it to a 10 ms
+  // `frame`. Supports any sample rate supported by APM.
+  void Process(const FrameInfo& info, AudioFrameView<float> frame);
+
+ private:
+  ApmDataDumper* const apm_data_dumper_;
+  GainApplier gain_applier_;
+
+  const int adjacent_speech_frames_threshold_;
+  const float max_gain_change_db_per_10ms_;
+  const float max_output_noise_level_dbfs_;
+
+  int calls_since_last_gain_log_;
+  int frames_to_gain_increase_allowed_;
+  float last_gain_db_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_DIGITAL_GAIN_APPLIER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_digital_gain_applier_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,273 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/adaptive_digital_gain_applier.h"
+
+#include <algorithm>
+#include <memory>
+
+#include "common_audio/include/audio_util.h"
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/agc2/vector_float_frame.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/gunit.h"
+
+namespace webrtc {
+namespace {
+
+constexpr int kMono = 1;
+constexpr int kStereo = 2;
+constexpr int kFrameLen10ms8kHz = 80;
+constexpr int kFrameLen10ms48kHz = 480;
+
+constexpr float kMaxSpeechProbability = 1.0f;
+
+// Constants used in place of estimated noise levels.
+constexpr float kNoNoiseDbfs = kMinLevelDbfs;
+constexpr float kWithNoiseDbfs = -20.f;
+
+constexpr float kMaxGainChangePerSecondDb = 3.0f;
+constexpr float kMaxGainChangePerFrameDb =
+    kMaxGainChangePerSecondDb * kFrameDurationMs / 1000.0f;
+constexpr float kMaxOutputNoiseLevelDbfs = -50.0f;
+
+// Helper to create initialized `AdaptiveDigitalGainApplier` objects.
+struct GainApplierHelper {
+  GainApplierHelper()
+      : GainApplierHelper(/*adjacent_speech_frames_threshold=*/1) {}
+  explicit GainApplierHelper(int adjacent_speech_frames_threshold)
+      : apm_data_dumper(0),
+        gain_applier(std::make_unique<AdaptiveDigitalGainApplier>(
+            &apm_data_dumper,
+            adjacent_speech_frames_threshold,
+            kMaxGainChangePerSecondDb,
+            kMaxOutputNoiseLevelDbfs)) {}
+  ApmDataDumper apm_data_dumper;
+  std::unique_ptr<AdaptiveDigitalGainApplier> gain_applier;
+};
+
+// Voice on, no noise, low limiter, confident level.
+static_assert(std::is_trivially_destructible<
+                  AdaptiveDigitalGainApplier::FrameInfo>::value,
+              "");
+constexpr AdaptiveDigitalGainApplier::FrameInfo kFrameInfo{
+    /*speech_probability=*/kMaxSpeechProbability,
+    /*speech_level_dbfs=*/kInitialSpeechLevelEstimateDbfs,
+    /*speech_level_reliable=*/true,
+    /*noise_rms_dbfs=*/kNoNoiseDbfs,
+    /*headroom_db=*/kSaturationProtectorInitialHeadroomDb,
+    /*limiter_envelope_dbfs=*/-2.0f};
+
+TEST(GainController2AdaptiveGainApplier, GainApplierShouldNotCrash) {
+  GainApplierHelper helper;
+  // Make one call with reasonable audio level values and settings.
+  VectorFloatFrame fake_audio(kStereo, kFrameLen10ms48kHz, 10000.0f);
+  AdaptiveDigitalGainApplier::FrameInfo info = kFrameInfo;
+  info.speech_level_dbfs = -5.0f;
+  helper.gain_applier->Process(kFrameInfo, fake_audio.float_frame_view());
+}
+
+// Checks that the maximum allowed gain is applied.
+TEST(GainController2AdaptiveGainApplier, MaxGainApplied) {
+  constexpr int kNumFramesToAdapt =
+      static_cast<int>(kMaxGainDb / kMaxGainChangePerFrameDb) + 10;
+
+  GainApplierHelper helper;
+  AdaptiveDigitalGainApplier::FrameInfo info = kFrameInfo;
+  info.speech_level_dbfs = -60.0f;
+  float applied_gain;
+  for (int i = 0; i < kNumFramesToAdapt; ++i) {
+    VectorFloatFrame fake_audio(kMono, kFrameLen10ms8kHz, 1.0f);
+    helper.gain_applier->Process(info, fake_audio.float_frame_view());
+    applied_gain = fake_audio.float_frame_view().channel(0)[0];
+  }
+  const float applied_gain_db = 20.0f * std::log10f(applied_gain);
+  EXPECT_NEAR(applied_gain_db, kMaxGainDb, 0.1f);
+}
+
+TEST(GainController2AdaptiveGainApplier, GainDoesNotChangeFast) {
+  GainApplierHelper helper;
+
+  constexpr float initial_level_dbfs = -25.0f;
+  // A few extra frames for safety.
+  constexpr int kNumFramesToAdapt =
+      static_cast<int>(initial_level_dbfs / kMaxGainChangePerFrameDb) + 10;
+
+  const float kMaxChangePerFrameLinear = DbToRatio(kMaxGainChangePerFrameDb);
+
+  float last_gain_linear = 1.f;
+  for (int i = 0; i < kNumFramesToAdapt; ++i) {
+    SCOPED_TRACE(i);
+    VectorFloatFrame fake_audio(kMono, kFrameLen10ms8kHz, 1.0f);
+    AdaptiveDigitalGainApplier::FrameInfo info = kFrameInfo;
+    info.speech_level_dbfs = initial_level_dbfs;
+    helper.gain_applier->Process(info, fake_audio.float_frame_view());
+    float current_gain_linear = fake_audio.float_frame_view().channel(0)[0];
+    EXPECT_LE(std::abs(current_gain_linear - last_gain_linear),
+              kMaxChangePerFrameLinear);
+    last_gain_linear = current_gain_linear;
+  }
+
+  // Check that the same is true when gain decreases as well.
+  for (int i = 0; i < kNumFramesToAdapt; ++i) {
+    SCOPED_TRACE(i);
+    VectorFloatFrame fake_audio(kMono, kFrameLen10ms8kHz, 1.0f);
+    AdaptiveDigitalGainApplier::FrameInfo info = kFrameInfo;
+    info.speech_level_dbfs = 0.f;
+    helper.gain_applier->Process(info, fake_audio.float_frame_view());
+    float current_gain_linear = fake_audio.float_frame_view().channel(0)[0];
+    EXPECT_LE(std::abs(current_gain_linear - last_gain_linear),
+              kMaxChangePerFrameLinear);
+    last_gain_linear = current_gain_linear;
+  }
+}
+
+TEST(GainController2AdaptiveGainApplier, GainIsRampedInAFrame) {
+  GainApplierHelper helper;
+
+  constexpr float initial_level_dbfs = -25.0f;
+
+  VectorFloatFrame fake_audio(kMono, kFrameLen10ms48kHz, 1.0f);
+  AdaptiveDigitalGainApplier::FrameInfo info = kFrameInfo;
+  info.speech_level_dbfs = initial_level_dbfs;
+  helper.gain_applier->Process(info, fake_audio.float_frame_view());
+  float maximal_difference = 0.0f;
+  float current_value = 1.0f * DbToRatio(kInitialAdaptiveDigitalGainDb);
+  for (const auto& x : fake_audio.float_frame_view().channel(0)) {
+    const float difference = std::abs(x - current_value);
+    maximal_difference = std::max(maximal_difference, difference);
+    current_value = x;
+  }
+
+  const float kMaxChangePerFrameLinear = DbToRatio(kMaxGainChangePerFrameDb);
+  const float kMaxChangePerSample =
+      kMaxChangePerFrameLinear / kFrameLen10ms48kHz;
+
+  EXPECT_LE(maximal_difference, kMaxChangePerSample);
+}
+
+TEST(GainController2AdaptiveGainApplier, NoiseLimitsGain) {
+  GainApplierHelper helper;
+
+  constexpr float initial_level_dbfs = -25.0f;
+  constexpr int num_initial_frames =
+      kInitialAdaptiveDigitalGainDb / kMaxGainChangePerFrameDb;
+  constexpr int num_frames = 50;
+
+  ASSERT_GT(kWithNoiseDbfs, kMaxOutputNoiseLevelDbfs)
+      << "kWithNoiseDbfs is too low";
+
+  for (int i = 0; i < num_initial_frames + num_frames; ++i) {
+    VectorFloatFrame fake_audio(kMono, kFrameLen10ms48kHz, 1.0f);
+    AdaptiveDigitalGainApplier::FrameInfo info = kFrameInfo;
+    info.speech_level_dbfs = initial_level_dbfs;
+    info.noise_rms_dbfs = kWithNoiseDbfs;
+    helper.gain_applier->Process(info, fake_audio.float_frame_view());
+
+    // Wait so that the adaptive gain applier has time to lower the gain.
+    if (i > num_initial_frames) {
+      const float maximal_ratio =
+          *std::max_element(fake_audio.float_frame_view().channel(0).begin(),
+                            fake_audio.float_frame_view().channel(0).end());
+
+      EXPECT_NEAR(maximal_ratio, 1.0f, 0.001f);
+    }
+  }
+}
+
+TEST(GainController2GainApplier, CanHandlePositiveSpeechLevels) {
+  GainApplierHelper helper;
+
+  // Make one call with positive audio level values and settings.
+  VectorFloatFrame fake_audio(kStereo, kFrameLen10ms48kHz, 10000.0f);
+  AdaptiveDigitalGainApplier::FrameInfo info = kFrameInfo;
+  info.speech_level_dbfs = 5.0f;
+  helper.gain_applier->Process(info, fake_audio.float_frame_view());
+}
+
+TEST(GainController2GainApplier, AudioLevelLimitsGain) {
+  GainApplierHelper helper;
+
+  constexpr float initial_level_dbfs = -25.0f;
+  constexpr int num_initial_frames =
+      kInitialAdaptiveDigitalGainDb / kMaxGainChangePerFrameDb;
+  constexpr int num_frames = 50;
+
+  ASSERT_GT(kWithNoiseDbfs, kMaxOutputNoiseLevelDbfs)
+      << "kWithNoiseDbfs is too low";
+
+  for (int i = 0; i < num_initial_frames + num_frames; ++i) {
+    VectorFloatFrame fake_audio(kMono, kFrameLen10ms48kHz, 1.0f);
+    AdaptiveDigitalGainApplier::FrameInfo info = kFrameInfo;
+    info.speech_level_dbfs = initial_level_dbfs;
+    info.limiter_envelope_dbfs = 1.0f;
+    info.speech_level_reliable = false;
+    helper.gain_applier->Process(info, fake_audio.float_frame_view());
+
+    // Wait so that the adaptive gain applier has time to lower the gain.
+    if (i > num_initial_frames) {
+      const float maximal_ratio =
+          *std::max_element(fake_audio.float_frame_view().channel(0).begin(),
+                            fake_audio.float_frame_view().channel(0).end());
+
+      EXPECT_NEAR(maximal_ratio, 1.0f, 0.001f);
+    }
+  }
+}
+
+class AdaptiveDigitalGainApplierTest : public ::testing::TestWithParam<int> {
+ protected:
+  int AdjacentSpeechFramesThreshold() const { return GetParam(); }
+};
+
+TEST_P(AdaptiveDigitalGainApplierTest,
+       DoNotIncreaseGainWithTooFewSpeechFrames) {
+  const int adjacent_speech_frames_threshold = AdjacentSpeechFramesThreshold();
+  GainApplierHelper helper(adjacent_speech_frames_threshold);
+
+  float prev_gain = 0.0f;
+  for (int i = 0; i < adjacent_speech_frames_threshold; ++i) {
+    SCOPED_TRACE(i);
+    VectorFloatFrame audio(kMono, kFrameLen10ms48kHz, 1.0f);
+    helper.gain_applier->Process(kFrameInfo, audio.float_frame_view());
+    const float gain = audio.float_frame_view().channel(0)[0];
+    if (i > 0) {
+      EXPECT_EQ(prev_gain, gain);  // No gain increase.
+    }
+    prev_gain = gain;
+  }
+}
+
+TEST_P(AdaptiveDigitalGainApplierTest, IncreaseGainWithEnoughSpeechFrames) {
+  const int adjacent_speech_frames_threshold = AdjacentSpeechFramesThreshold();
+  GainApplierHelper helper(adjacent_speech_frames_threshold);
+
+  float prev_gain = 0.0f;
+  for (int i = 0; i < adjacent_speech_frames_threshold; ++i) {
+    SCOPED_TRACE(i);
+    VectorFloatFrame audio(kMono, kFrameLen10ms48kHz, 1.0f);
+    helper.gain_applier->Process(kFrameInfo, audio.float_frame_view());
+    prev_gain = audio.float_frame_view().channel(0)[0];
+  }
+
+  // Process one more speech frame.
+  VectorFloatFrame audio(kMono, kFrameLen10ms48kHz, 1.0f);
+  helper.gain_applier->Process(kFrameInfo, audio.float_frame_view());
+
+  // The gain has increased.
+  EXPECT_GT(audio.float_frame_view().channel(0)[0], prev_gain);
+}
+
+INSTANTIATE_TEST_SUITE_P(GainController2,
+                         AdaptiveDigitalGainApplierTest,
+                         ::testing::Values(1, 7, 31));
+
+}  // namespace
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,163 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/adaptive_mode_level_estimator.h"
+
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/numerics/safe_minmax.h"
+
+namespace webrtc {
+namespace {
+
+using LevelEstimatorType =
+    AudioProcessing::Config::GainController2::LevelEstimator;
+
+float ClampLevelEstimateDbfs(float level_estimate_dbfs) {
+  return rtc::SafeClamp<float>(level_estimate_dbfs, -90.f, 30.f);
+}
+
+}  // namespace
+
+bool AdaptiveModeLevelEstimator::LevelEstimatorState::operator==(
+    const AdaptiveModeLevelEstimator::LevelEstimatorState& b) const {
+  return time_to_confidence_ms == b.time_to_confidence_ms &&
+         level_dbfs.numerator == b.level_dbfs.numerator &&
+         level_dbfs.denominator == b.level_dbfs.denominator;
+}
+
+float AdaptiveModeLevelEstimator::LevelEstimatorState::Ratio::GetRatio() const {
+  RTC_DCHECK_NE(denominator, 0.f);
+  return numerator / denominator;
+}
+
+AdaptiveModeLevelEstimator::AdaptiveModeLevelEstimator(
+    ApmDataDumper* apm_data_dumper)
+    : AdaptiveModeLevelEstimator(
+          apm_data_dumper,
+          kDefaultLevelEstimatorAdjacentSpeechFramesThreshold) {}
+
+AdaptiveModeLevelEstimator::AdaptiveModeLevelEstimator(
+    ApmDataDumper* apm_data_dumper,
+    int adjacent_speech_frames_threshold)
+    : apm_data_dumper_(apm_data_dumper),
+      adjacent_speech_frames_threshold_(adjacent_speech_frames_threshold),
+      level_dbfs_(ClampLevelEstimateDbfs(kInitialSpeechLevelEstimateDbfs)) {
+  RTC_DCHECK(apm_data_dumper_);
+  RTC_DCHECK_GE(adjacent_speech_frames_threshold_, 1);
+  Reset();
+}
+
+void AdaptiveModeLevelEstimator::Update(
+    const VadLevelAnalyzer::Result& vad_level) {
+  RTC_DCHECK_GT(vad_level.rms_dbfs, -150.f);
+  RTC_DCHECK_LT(vad_level.rms_dbfs, 50.f);
+  RTC_DCHECK_GT(vad_level.peak_dbfs, -150.f);
+  RTC_DCHECK_LT(vad_level.peak_dbfs, 50.f);
+  RTC_DCHECK_GE(vad_level.speech_probability, 0.f);
+  RTC_DCHECK_LE(vad_level.speech_probability, 1.f);
+  if (vad_level.speech_probability < kVadConfidenceThreshold) {
+    // Not a speech frame.
+    if (adjacent_speech_frames_threshold_ > 1) {
+      // When two or more adjacent speech frames are required in order to update
+      // the state, we need to decide whether to discard or confirm the updates
+      // based on the speech sequence length.
+      if (num_adjacent_speech_frames_ >= adjacent_speech_frames_threshold_) {
+        // First non-speech frame after a long enough sequence of speech frames.
+        // Update the reliable state.
+        reliable_state_ = preliminary_state_;
+      } else if (num_adjacent_speech_frames_ > 0) {
+        // First non-speech frame after a too short sequence of speech frames.
+        // Reset to the last reliable state.
+        preliminary_state_ = reliable_state_;
+      }
+    }
+    num_adjacent_speech_frames_ = 0;
+  } else {
+    // Speech frame observed.
+    num_adjacent_speech_frames_++;
+
+    // Update preliminary level estimate.
+    RTC_DCHECK_GE(preliminary_state_.time_to_confidence_ms, 0);
+    const bool buffer_is_full = preliminary_state_.time_to_confidence_ms == 0;
+    if (!buffer_is_full) {
+      preliminary_state_.time_to_confidence_ms -= kFrameDurationMs;
+    }
+    // Weighted average of levels with speech probability as weight.
+    RTC_DCHECK_GT(vad_level.speech_probability, 0.f);
+    const float leak_factor = buffer_is_full ? kLevelEstimatorLeakFactor : 1.f;
+    preliminary_state_.level_dbfs.numerator =
+        preliminary_state_.level_dbfs.numerator * leak_factor +
+        vad_level.rms_dbfs * vad_level.speech_probability;
+    preliminary_state_.level_dbfs.denominator =
+        preliminary_state_.level_dbfs.denominator * leak_factor +
+        vad_level.speech_probability;
+
+    const float level_dbfs = preliminary_state_.level_dbfs.GetRatio();
+
+    if (num_adjacent_speech_frames_ >= adjacent_speech_frames_threshold_) {
+      // `preliminary_state_` is now reliable. Update the last level estimation.
+      level_dbfs_ = ClampLevelEstimateDbfs(level_dbfs);
+    }
+  }
+  DumpDebugData();
+}
+
+bool AdaptiveModeLevelEstimator::IsConfident() const {
+  if (adjacent_speech_frames_threshold_ == 1) {
+    // Ignore `reliable_state_` when a single frame is enough to update the
+    // level estimate (because it is not used).
+    return preliminary_state_.time_to_confidence_ms == 0;
+  }
+  // Once confident, it remains confident.
+  RTC_DCHECK(reliable_state_.time_to_confidence_ms != 0 ||
+             preliminary_state_.time_to_confidence_ms == 0);
+  // During the first long enough speech sequence, `reliable_state_` must be
+  // ignored since `preliminary_state_` is used.
+  return reliable_state_.time_to_confidence_ms == 0 ||
+         (num_adjacent_speech_frames_ >= adjacent_speech_frames_threshold_ &&
+          preliminary_state_.time_to_confidence_ms == 0);
+}
+
+void AdaptiveModeLevelEstimator::Reset() {
+  ResetLevelEstimatorState(preliminary_state_);
+  ResetLevelEstimatorState(reliable_state_);
+  level_dbfs_ = ClampLevelEstimateDbfs(kInitialSpeechLevelEstimateDbfs);
+  num_adjacent_speech_frames_ = 0;
+}
+
+void AdaptiveModeLevelEstimator::ResetLevelEstimatorState(
+    LevelEstimatorState& state) const {
+  state.time_to_confidence_ms = kLevelEstimatorTimeToConfidenceMs;
+  state.level_dbfs.numerator = kInitialSpeechLevelEstimateDbfs;
+  state.level_dbfs.denominator = 1.0f;
+}
+
+void AdaptiveModeLevelEstimator::DumpDebugData() const {
+  apm_data_dumper_->DumpRaw(
+      "agc2_adaptive_level_estimator_num_adjacent_speech_frames",
+      num_adjacent_speech_frames_);
+  apm_data_dumper_->DumpRaw(
+      "agc2_adaptive_level_estimator_preliminary_level_estimate_num",
+      preliminary_state_.level_dbfs.numerator);
+  apm_data_dumper_->DumpRaw(
+      "agc2_adaptive_level_estimator_preliminary_level_estimate_den",
+      preliminary_state_.level_dbfs.denominator);
+  apm_data_dumper_->DumpRaw(
+      "agc2_adaptive_level_estimator_preliminary_time_to_confidence_ms",
+      preliminary_state_.time_to_confidence_ms);
+  apm_data_dumper_->DumpRaw(
+      "agc2_adaptive_level_estimator_reliable_time_to_confidence_ms",
+      reliable_state_.time_to_confidence_ms);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_MODE_LEVEL_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_MODE_LEVEL_ESTIMATOR_H_
+
+#include <stddef.h>
+#include <type_traits>
+
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/agc2/vad_with_level.h"
+#include "modules/audio_processing/include/audio_processing.h"
+
+namespace webrtc {
+class ApmDataDumper;
+
+// Level estimator for the digital adaptive gain controller.
+class AdaptiveModeLevelEstimator {
+ public:
+  explicit AdaptiveModeLevelEstimator(ApmDataDumper* apm_data_dumper);
+  AdaptiveModeLevelEstimator(const AdaptiveModeLevelEstimator&) = delete;
+  AdaptiveModeLevelEstimator& operator=(const AdaptiveModeLevelEstimator&) =
+      delete;
+  AdaptiveModeLevelEstimator(ApmDataDumper* apm_data_dumper,
+                             int adjacent_speech_frames_threshold);
+
+  // Updates the level estimation.
+  void Update(const VadLevelAnalyzer::Result& vad_data);
+  // Returns the estimated speech plus noise level.
+  float level_dbfs() const { return level_dbfs_; }
+  // Returns true if the estimator is confident on its current estimate.
+  bool IsConfident() const;
+
+  void Reset();
+
+ private:
+  // Part of the level estimator state used for check-pointing and restore ops.
+  struct LevelEstimatorState {
+    bool operator==(const LevelEstimatorState& s) const;
+    inline bool operator!=(const LevelEstimatorState& s) const {
+      return !(*this == s);
+    }
+    struct Ratio {
+      float numerator;
+      float denominator;
+      float GetRatio() const;
+    };
+    // TODO(crbug.com/webrtc/7494): Remove time_to_confidence_ms if redundant.
+    int time_to_confidence_ms;
+    Ratio level_dbfs;
+  };
+  static_assert(std::is_trivially_copyable<LevelEstimatorState>::value, "");
+
+  void ResetLevelEstimatorState(LevelEstimatorState& state) const;
+
+  void DumpDebugData() const;
+
+  ApmDataDumper* const apm_data_dumper_;
+
+  const int adjacent_speech_frames_threshold_;
+  LevelEstimatorState preliminary_state_;
+  LevelEstimatorState reliable_state_;
+  float level_dbfs_;
+  int num_adjacent_speech_frames_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_ADAPTIVE_MODE_LEVEL_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/adaptive_mode_level_estimator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,202 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/adaptive_mode_level_estimator.h"
+
+#include <memory>
+
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/gunit.h"
+
+namespace webrtc {
+namespace {
+
+// Number of speech frames that the level estimator must observe in order to
+// become confident about the estimated level.
+constexpr int kNumFramesToConfidence =
+    kLevelEstimatorTimeToConfidenceMs / kFrameDurationMs;
+static_assert(kNumFramesToConfidence > 0, "");
+
+// Fake levels and speech probabilities used in the tests.
+static_assert(kInitialSpeechLevelEstimateDbfs < 0.0f, "");
+constexpr float kVadLevelRms = kInitialSpeechLevelEstimateDbfs / 2.0f;
+constexpr float kVadLevelPeak = kInitialSpeechLevelEstimateDbfs / 3.0f;
+static_assert(kVadLevelRms < kVadLevelPeak, "");
+static_assert(kVadLevelRms > kInitialSpeechLevelEstimateDbfs, "");
+static_assert(kVadLevelRms - kInitialSpeechLevelEstimateDbfs > 5.0f,
+              "Adjust `kVadLevelRms` so that the difference from the initial "
+              "level is wide enough for the tests.");
+
+constexpr VadLevelAnalyzer::Result kVadDataSpeech{/*speech_probability=*/1.0f,
+                                                  kVadLevelRms, kVadLevelPeak};
+constexpr VadLevelAnalyzer::Result kVadDataNonSpeech{
+    /*speech_probability=*/kVadConfidenceThreshold / 2.0f, kVadLevelRms,
+    kVadLevelPeak};
+
+constexpr float kMinSpeechProbability = 0.0f;
+constexpr float kMaxSpeechProbability = 1.0f;
+
+constexpr float kConvergenceSpeedTestsLevelTolerance = 0.5f;
+
+// Provides the `vad_level` value `num_iterations` times to `level_estimator`.
+void RunOnConstantLevel(int num_iterations,
+                        const VadLevelAnalyzer::Result& vad_level,
+                        AdaptiveModeLevelEstimator& level_estimator) {
+  for (int i = 0; i < num_iterations; ++i) {
+    level_estimator.Update(vad_level);
+  }
+}
+
+// Level estimator with data dumper.
+struct TestLevelEstimator {
+  TestLevelEstimator()
+      : data_dumper(0),
+        estimator(std::make_unique<AdaptiveModeLevelEstimator>(
+            &data_dumper,
+            /*adjacent_speech_frames_threshold=*/1)) {}
+  ApmDataDumper data_dumper;
+  std::unique_ptr<AdaptiveModeLevelEstimator> estimator;
+};
+
+// Checks the initially estimated level.
+TEST(GainController2AdaptiveModeLevelEstimator, CheckInitialEstimate) {
+  TestLevelEstimator level_estimator;
+  EXPECT_FLOAT_EQ(level_estimator.estimator->level_dbfs(),
+                  kInitialSpeechLevelEstimateDbfs);
+}
+
+// Checks that the level estimator converges to a constant input speech level.
+TEST(GainController2AdaptiveModeLevelEstimator, LevelStabilizes) {
+  TestLevelEstimator level_estimator;
+  RunOnConstantLevel(/*num_iterations=*/kNumFramesToConfidence, kVadDataSpeech,
+                     *level_estimator.estimator);
+  const float estimated_level_dbfs = level_estimator.estimator->level_dbfs();
+  RunOnConstantLevel(/*num_iterations=*/1, kVadDataSpeech,
+                     *level_estimator.estimator);
+  EXPECT_NEAR(level_estimator.estimator->level_dbfs(), estimated_level_dbfs,
+              0.1f);
+}
+
+// Checks that the level controller does not become confident when too few
+// speech frames are observed.
+TEST(GainController2AdaptiveModeLevelEstimator, IsNotConfident) {
+  TestLevelEstimator level_estimator;
+  RunOnConstantLevel(/*num_iterations=*/kNumFramesToConfidence / 2,
+                     kVadDataSpeech, *level_estimator.estimator);
+  EXPECT_FALSE(level_estimator.estimator->IsConfident());
+}
+
+// Checks that the level controller becomes confident when enough speech frames
+// are observed.
+TEST(GainController2AdaptiveModeLevelEstimator, IsConfident) {
+  TestLevelEstimator level_estimator;
+  RunOnConstantLevel(/*num_iterations=*/kNumFramesToConfidence, kVadDataSpeech,
+                     *level_estimator.estimator);
+  EXPECT_TRUE(level_estimator.estimator->IsConfident());
+}
+
+// Checks that the estimated level is not affected by the level of non-speech
+// frames.
+TEST(GainController2AdaptiveModeLevelEstimator,
+     EstimatorIgnoresNonSpeechFrames) {
+  TestLevelEstimator level_estimator;
+  // Simulate speech.
+  RunOnConstantLevel(/*num_iterations=*/kNumFramesToConfidence, kVadDataSpeech,
+                     *level_estimator.estimator);
+  const float estimated_level_dbfs = level_estimator.estimator->level_dbfs();
+  // Simulate full-scale non-speech.
+  RunOnConstantLevel(/*num_iterations=*/kNumFramesToConfidence,
+                     VadLevelAnalyzer::Result{kMinSpeechProbability,
+                                              /*rms_dbfs=*/0.0f,
+                                              /*peak_dbfs=*/0.0f},
+                     *level_estimator.estimator);
+  // No estimated level change is expected.
+  EXPECT_FLOAT_EQ(level_estimator.estimator->level_dbfs(),
+                  estimated_level_dbfs);
+}
+
+// Checks the convergence speed of the estimator before it becomes confident.
+TEST(GainController2AdaptiveModeLevelEstimator,
+     ConvergenceSpeedBeforeConfidence) {
+  TestLevelEstimator level_estimator;
+  RunOnConstantLevel(/*num_iterations=*/kNumFramesToConfidence, kVadDataSpeech,
+                     *level_estimator.estimator);
+  EXPECT_NEAR(level_estimator.estimator->level_dbfs(), kVadDataSpeech.rms_dbfs,
+              kConvergenceSpeedTestsLevelTolerance);
+}
+
+// Checks the convergence speed of the estimator after it becomes confident.
+TEST(GainController2AdaptiveModeLevelEstimator,
+     ConvergenceSpeedAfterConfidence) {
+  TestLevelEstimator level_estimator;
+  // Reach confidence using the initial level estimate.
+  RunOnConstantLevel(
+      /*num_iterations=*/kNumFramesToConfidence,
+      VadLevelAnalyzer::Result{
+          kMaxSpeechProbability,
+          /*rms_dbfs=*/kInitialSpeechLevelEstimateDbfs,
+          /*peak_dbfs=*/kInitialSpeechLevelEstimateDbfs + 6.0f},
+      *level_estimator.estimator);
+  // No estimate change should occur, but confidence is achieved.
+  ASSERT_FLOAT_EQ(level_estimator.estimator->level_dbfs(),
+                  kInitialSpeechLevelEstimateDbfs);
+  ASSERT_TRUE(level_estimator.estimator->IsConfident());
+  // After confidence.
+  constexpr float kConvergenceTimeAfterConfidenceNumFrames = 600;  // 6 seconds.
+  static_assert(
+      kConvergenceTimeAfterConfidenceNumFrames > kNumFramesToConfidence, "");
+  RunOnConstantLevel(
+      /*num_iterations=*/kConvergenceTimeAfterConfidenceNumFrames,
+      kVadDataSpeech, *level_estimator.estimator);
+  EXPECT_NEAR(level_estimator.estimator->level_dbfs(), kVadDataSpeech.rms_dbfs,
+              kConvergenceSpeedTestsLevelTolerance);
+}
+
+class AdaptiveModeLevelEstimatorParametrization
+    : public ::testing::TestWithParam<int> {
+ protected:
+  int adjacent_speech_frames_threshold() const { return GetParam(); }
+};
+
+TEST_P(AdaptiveModeLevelEstimatorParametrization,
+       DoNotAdaptToShortSpeechSegments) {
+  ApmDataDumper apm_data_dumper(0);
+  AdaptiveModeLevelEstimator level_estimator(
+      &apm_data_dumper, adjacent_speech_frames_threshold());
+  const float initial_level = level_estimator.level_dbfs();
+  ASSERT_LT(initial_level, kVadDataSpeech.peak_dbfs);
+  for (int i = 0; i < adjacent_speech_frames_threshold() - 1; ++i) {
+    SCOPED_TRACE(i);
+    level_estimator.Update(kVadDataSpeech);
+    EXPECT_EQ(initial_level, level_estimator.level_dbfs());
+  }
+  level_estimator.Update(kVadDataNonSpeech);
+  EXPECT_EQ(initial_level, level_estimator.level_dbfs());
+}
+
+TEST_P(AdaptiveModeLevelEstimatorParametrization, AdaptToEnoughSpeechSegments) {
+  ApmDataDumper apm_data_dumper(0);
+  AdaptiveModeLevelEstimator level_estimator(
+      &apm_data_dumper, adjacent_speech_frames_threshold());
+  const float initial_level = level_estimator.level_dbfs();
+  ASSERT_LT(initial_level, kVadDataSpeech.peak_dbfs);
+  for (int i = 0; i < adjacent_speech_frames_threshold(); ++i) {
+    level_estimator.Update(kVadDataSpeech);
+  }
+  EXPECT_LT(initial_level, level_estimator.level_dbfs());
+}
+
+INSTANTIATE_TEST_SUITE_P(GainController2,
+                         AdaptiveModeLevelEstimatorParametrization,
+                         ::testing::Values(1, 9, 17));
+
+}  // namespace
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_common.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_common.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_common.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_common.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,73 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_AGC2_COMMON_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_AGC2_COMMON_H_
+
+namespace webrtc {
+
+constexpr float kMinFloatS16Value = -32768.0f;
+constexpr float kMaxFloatS16Value = 32767.0f;
+constexpr float kMaxAbsFloatS16Value = 32768.0f;
+
+// Minimum audio level in dBFS scale for S16 samples.
+constexpr float kMinLevelDbfs = -90.31f;
+
+constexpr int kFrameDurationMs = 10;
+constexpr int kSubFramesInFrame = 20;
+constexpr int kMaximalNumberOfSamplesPerChannel = 480;
+
+// Adaptive digital gain applier settings below.
+constexpr float kHeadroomDbfs = 1.0f;
+constexpr float kMaxGainDb = 30.0f;
+constexpr float kInitialAdaptiveDigitalGainDb = 8.0f;
+// At what limiter levels should we start decreasing the adaptive digital gain.
+constexpr float kLimiterThresholdForAgcGainDbfs = -kHeadroomDbfs;
+
+// This is the threshold for speech. Speech frames are used for updating the
+// speech level, measuring the amount of speech, and decide when to allow target
+// gain reduction.
+constexpr float kVadConfidenceThreshold = 0.95f;
+
+// Adaptive digital level estimator parameters.
+// Number of milliseconds of speech frames to observe to make the estimator
+// confident.
+constexpr float kLevelEstimatorTimeToConfidenceMs = 400;
+constexpr float kLevelEstimatorLeakFactor =
+    1.0f - 1.0f / kLevelEstimatorTimeToConfidenceMs;
+
+// Robust VAD probability and speech decisions.
+constexpr int kDefaultVadRnnResetPeriodMs = 1500;
+static_assert(kDefaultVadRnnResetPeriodMs % kFrameDurationMs == 0, "");
+constexpr int kDefaultLevelEstimatorAdjacentSpeechFramesThreshold = 12;
+
+// Saturation Protector settings.
+constexpr float kSaturationProtectorInitialHeadroomDb = 20.0f;
+constexpr float kSaturationProtectorExtraHeadroomDb = 5.0f;
+constexpr int kSaturationProtectorBufferSize = 4;
+
+// Set the initial speech level estimate so that `kInitialAdaptiveDigitalGainDb`
+// is applied at the beginning of the call.
+constexpr float kInitialSpeechLevelEstimateDbfs =
+    -kSaturationProtectorExtraHeadroomDb -
+    kSaturationProtectorInitialHeadroomDb - kInitialAdaptiveDigitalGainDb -
+    kHeadroomDbfs;
+
+// Number of interpolation points for each region of the limiter.
+// These values have been tuned to limit the interpolated gain curve error given
+// the limiter parameters and allowing a maximum error of +/- 32768^-1.
+constexpr int kInterpolatedGainCurveKneePoints = 22;
+constexpr int kInterpolatedGainCurveBeyondKneePoints = 10;
+constexpr int kInterpolatedGainCurveTotalPoints =
+    kInterpolatedGainCurveKneePoints + kInterpolatedGainCurveBeyondKneePoints;
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_AGC2_COMMON_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,93 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/agc2_testing_common.h"
+
+#include <cmath>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace test {
+
+std::vector<double> LinSpace(double l, double r, int num_points) {
+  RTC_CHECK_GE(num_points, 2);
+  std::vector<double> points(num_points);
+  const double step = (r - l) / (num_points - 1.0);
+  points[0] = l;
+  for (int i = 1; i < num_points - 1; i++) {
+    points[i] = static_cast<double>(l) + i * step;
+  }
+  points[num_points - 1] = r;
+  return points;
+}
+
+WhiteNoiseGenerator::WhiteNoiseGenerator(int min_amplitude, int max_amplitude)
+    : rand_gen_(42),
+      min_amplitude_(min_amplitude),
+      max_amplitude_(max_amplitude) {
+  RTC_DCHECK_LT(min_amplitude_, max_amplitude_);
+  RTC_DCHECK_LE(kMinS16, min_amplitude_);
+  RTC_DCHECK_LE(min_amplitude_, kMaxS16);
+  RTC_DCHECK_LE(kMinS16, max_amplitude_);
+  RTC_DCHECK_LE(max_amplitude_, kMaxS16);
+}
+
+float WhiteNoiseGenerator::operator()() {
+  return static_cast<float>(rand_gen_.Rand(min_amplitude_, max_amplitude_));
+}
+
+SineGenerator::SineGenerator(float amplitude,
+                             float frequency_hz,
+                             int sample_rate_hz)
+    : amplitude_(amplitude),
+      frequency_hz_(frequency_hz),
+      sample_rate_hz_(sample_rate_hz),
+      x_radians_(0.0f) {
+  RTC_DCHECK_GT(amplitude_, 0);
+  RTC_DCHECK_LE(amplitude_, kMaxS16);
+}
+
+float SineGenerator::operator()() {
+  constexpr float kPi = 3.1415926536f;
+  x_radians_ += frequency_hz_ / sample_rate_hz_ * 2 * kPi;
+  if (x_radians_ >= 2 * kPi) {
+    x_radians_ -= 2 * kPi;
+  }
+  return amplitude_ * std::sinf(x_radians_);
+}
+
+PulseGenerator::PulseGenerator(float pulse_amplitude,
+                               float no_pulse_amplitude,
+                               float frequency_hz,
+                               int sample_rate_hz)
+    : pulse_amplitude_(pulse_amplitude),
+      no_pulse_amplitude_(no_pulse_amplitude),
+      samples_period_(
+          static_cast<int>(static_cast<float>(sample_rate_hz) / frequency_hz)),
+      sample_counter_(0) {
+  RTC_DCHECK_GE(pulse_amplitude_, kMinS16);
+  RTC_DCHECK_LE(pulse_amplitude_, kMaxS16);
+  RTC_DCHECK_GT(no_pulse_amplitude_, kMinS16);
+  RTC_DCHECK_LE(no_pulse_amplitude_, kMaxS16);
+  RTC_DCHECK_GT(sample_rate_hz, frequency_hz);
+}
+
+float PulseGenerator::operator()() {
+  sample_counter_++;
+  if (sample_counter_ >= samples_period_) {
+    sample_counter_ -= samples_period_;
+  }
+  return static_cast<float>(sample_counter_ == 0 ? pulse_amplitude_
+                                                 : no_pulse_amplitude_);
+}
+
+}  // namespace test
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,82 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_AGC2_TESTING_COMMON_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_AGC2_TESTING_COMMON_H_
+
+#include <limits>
+#include <vector>
+
+#include "rtc_base/random.h"
+
+namespace webrtc {
+namespace test {
+
+constexpr float kMinS16 =
+    static_cast<float>(std::numeric_limits<int16_t>::min());
+constexpr float kMaxS16 =
+    static_cast<float>(std::numeric_limits<int16_t>::max());
+
+// Level Estimator test parameters.
+constexpr float kDecayMs = 500.f;
+
+// Limiter parameters.
+constexpr float kLimiterMaxInputLevelDbFs = 1.f;
+constexpr float kLimiterKneeSmoothnessDb = 1.f;
+constexpr float kLimiterCompressionRatio = 5.f;
+
+// Returns evenly spaced `num_points` numbers over a specified interval [l, r].
+std::vector<double> LinSpace(double l, double r, int num_points);
+
+// Generates white noise.
+class WhiteNoiseGenerator {
+ public:
+  WhiteNoiseGenerator(int min_amplitude, int max_amplitude);
+  float operator()();
+
+ private:
+  Random rand_gen_;
+  const int min_amplitude_;
+  const int max_amplitude_;
+};
+
+// Generates a sine function.
+class SineGenerator {
+ public:
+  SineGenerator(float amplitude, float frequency_hz, int sample_rate_hz);
+  float operator()();
+
+ private:
+  const float amplitude_;
+  const float frequency_hz_;
+  const int sample_rate_hz_;
+  float x_radians_;
+};
+
+// Generates periodic pulses.
+class PulseGenerator {
+ public:
+  PulseGenerator(float pulse_amplitude,
+                 float no_pulse_amplitude,
+                 float frequency_hz,
+                 int sample_rate_hz);
+  float operator()();
+
+ private:
+  const float pulse_amplitude_;
+  const float no_pulse_amplitude_;
+  const int samples_period_;
+  int sample_counter_;
+};
+
+}  // namespace test
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_AGC2_TESTING_COMMON_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/agc2_testing_common_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,27 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/agc2_testing_common.h"
+
+#include "rtc_base/gunit.h"
+
+namespace webrtc {
+
+TEST(GainController2TestingCommon, LinSpace) {
+  std::vector<double> points1 = test::LinSpace(-1.0, 2.0, 4);
+  const std::vector<double> expected_points1{{-1.0, 0.0, 1.0, 2.0}};
+  EXPECT_EQ(expected_points1, points1);
+
+  std::vector<double> points2 = test::LinSpace(0.0, 1.0, 4);
+  const std::vector<double> expected_points2{{0.0, 1.0 / 3.0, 2.0 / 3.0, 1.0}};
+  EXPECT_EQ(points2, expected_points2);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/biquad_filter.h"
+
+#include <stddef.h>
+
+namespace webrtc {
+
+// Transposed direct form I implementation of a bi-quad filter applied to an
+// input signal |x| to produce an output signal |y|.
+void BiQuadFilter::Process(rtc::ArrayView<const float> x,
+                           rtc::ArrayView<float> y) {
+  for (size_t k = 0; k < x.size(); ++k) {
+    // Use temporary variable for x[k] to allow in-place function call
+    // (that x and y refer to the same array).
+    const float tmp = x[k];
+    y[k] = coefficients_.b[0] * tmp + coefficients_.b[1] * biquad_state_.b[0] +
+           coefficients_.b[2] * biquad_state_.b[1] -
+           coefficients_.a[0] * biquad_state_.a[0] -
+           coefficients_.a[1] * biquad_state_.a[1];
+    biquad_state_.b[1] = biquad_state_.b[0];
+    biquad_state_.b[0] = tmp;
+    biquad_state_.a[1] = biquad_state_.a[0];
+    biquad_state_.a[0] = y[k];
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_BIQUAD_FILTER_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_BIQUAD_FILTER_H_
+
+#include <algorithm>
+
+#include "api/array_view.h"
+#include "rtc_base/arraysize.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+class BiQuadFilter {
+ public:
+  // Normalized filter coefficients.
+  //        b_0 + b_1 • z^(-1) + b_2 • z^(-2)
+  // H(z) = ---------------------------------
+  //         1 + a_1 • z^(-1) + a_2 • z^(-2)
+  struct BiQuadCoefficients {
+    float b[3];
+    float a[2];
+  };
+
+  BiQuadFilter() = default;
+
+  void Initialize(const BiQuadCoefficients& coefficients) {
+    coefficients_ = coefficients;
+  }
+
+  void Reset() { biquad_state_.Reset(); }
+
+  // Produces a filtered output y of the input x. Both x and y need to
+  // have the same length. In-place modification is allowed.
+  void Process(rtc::ArrayView<const float> x, rtc::ArrayView<float> y);
+
+ private:
+  struct BiQuadState {
+    BiQuadState() { Reset(); }
+
+    void Reset() {
+      std::fill(b, b + arraysize(b), 0.f);
+      std::fill(a, a + arraysize(a), 0.f);
+    }
+
+    float b[2];
+    float a[2];
+  };
+
+  BiQuadState biquad_state_;
+  BiQuadCoefficients coefficients_;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(BiQuadFilter);
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_BIQUAD_FILTER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/biquad_filter_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,136 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/biquad_filter.h"
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+
+// TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+// #include "test/fpe_observer.h"
+#include "rtc_base/gunit.h"
+
+namespace webrtc {
+namespace test {
+namespace {
+
+constexpr size_t kFrameSize = 8;
+constexpr size_t kNumFrames = 4;
+using FloatArraySequence =
+    std::array<std::array<float, kFrameSize>, kNumFrames>;
+
+constexpr FloatArraySequence kBiQuadInputSeq = {
+    {{{-87.166290f, -8.029022f, 101.619583f, -0.294296f, -5.825764f, -8.890625f,
+       10.310432f, 54.845333f}},
+     {{-64.647644f, -6.883945f, 11.059189f, -95.242538f, -108.870834f,
+       11.024944f, 63.044102f, -52.709583f}},
+     {{-32.350529f, -18.108028f, -74.022339f, -8.986874f, -1.525581f,
+       103.705513f, 6.346226f, -14.319557f}},
+     {{22.645832f, -64.597153f, 55.462521f, -109.393188f, 10.117825f,
+       -40.019642f, -98.612228f, -8.330326f}}}};
+
+// Generated via "B, A = scipy.signal.butter(2, 30/12000, btype='highpass')"
+const BiQuadFilter::BiQuadCoefficients kBiQuadConfig = {
+    {0.99446179f, -1.98892358f, 0.99446179f},
+    {-1.98889291f, 0.98895425f}};
+
+// Comparing to scipy. The expected output is generated as follows:
+// zi = np.float32([0, 0])
+// for i in range(4):
+//   yn, zi = scipy.signal.lfilter(B, A, x[i], zi=zi)
+//   print(yn)
+constexpr FloatArraySequence kBiQuadOutputSeq = {
+    {{{-86.68354497f, -7.02175351f, 102.10290352f, -0.37487333f, -5.87205847f,
+       -8.85521608f, 10.33772563f, 54.51157181f}},
+     {{-64.92531604f, -6.76395978f, 11.15534507f, -94.68073341f, -107.18177856f,
+       13.24642474f, 64.84288941f, -50.97822629f}},
+     {{-30.1579652f, -15.64850899f, -71.06662821f, -5.5883229f, 1.91175353f,
+       106.5572003f, 8.57183046f, -12.06298473f}},
+     {{24.84286614f, -62.18094158f, 57.91488056f, -106.65685933f, 13.38760103f,
+       -36.60367134f, -94.44880104f, -3.59920354f}}}};
+
+// Fail for every pair from two equally sized rtc::ArrayView<float> views such
+// that their relative error is above a given threshold. If the expected value
+// of a pair is 0, the tolerance is used to check the absolute error.
+void ExpectNearRelative(rtc::ArrayView<const float> expected,
+                        rtc::ArrayView<const float> computed,
+                        const float tolerance) {
+  // The relative error is undefined when the expected value is 0.
+  // When that happens, check the absolute error instead. |safe_den| is used
+  // below to implement such logic.
+  auto safe_den = [](float x) { return (x == 0.f) ? 1.f : std::fabs(x); };
+  ASSERT_EQ(expected.size(), computed.size());
+  for (size_t i = 0; i < expected.size(); ++i) {
+    const float abs_diff = std::fabs(expected[i] - computed[i]);
+    // No failure when the values are equal.
+    if (abs_diff == 0.f)
+      continue;
+    SCOPED_TRACE(i);
+    SCOPED_TRACE(expected[i]);
+    SCOPED_TRACE(computed[i]);
+    EXPECT_LE(abs_diff / safe_den(expected[i]), tolerance);
+  }
+}
+
+}  // namespace
+
+TEST(BiQuadFilterTest, FilterNotInPlace) {
+  BiQuadFilter filter;
+  filter.Initialize(kBiQuadConfig);
+  std::array<float, kFrameSize> samples;
+
+  // TODO(https://bugs.webrtc.org/8948): Add when the issue is fixed.
+  // FloatingPointExceptionObserver fpe_observer;
+
+  for (size_t i = 0; i < kNumFrames; ++i) {
+    SCOPED_TRACE(i);
+    filter.Process(kBiQuadInputSeq[i], samples);
+    ExpectNearRelative(kBiQuadOutputSeq[i], samples, 2e-4f);
+  }
+}
+
+TEST(BiQuadFilterTest, FilterInPlace) {
+  BiQuadFilter filter;
+  filter.Initialize(kBiQuadConfig);
+  std::array<float, kFrameSize> samples;
+
+  // TODO(https://bugs.webrtc.org/8948): Add when the issue is fixed.
+  // FloatingPointExceptionObserver fpe_observer;
+
+  for (size_t i = 0; i < kNumFrames; ++i) {
+    SCOPED_TRACE(i);
+    std::copy(kBiQuadInputSeq[i].begin(), kBiQuadInputSeq[i].end(),
+              samples.begin());
+    filter.Process({samples}, {samples});
+    ExpectNearRelative(kBiQuadOutputSeq[i], samples, 2e-4f);
+  }
+}
+
+TEST(BiQuadFilterTest, Reset) {
+  BiQuadFilter filter;
+  filter.Initialize(kBiQuadConfig);
+
+  std::array<float, kFrameSize> samples1;
+  for (size_t i = 0; i < kNumFrames; ++i) {
+    filter.Process(kBiQuadInputSeq[i], samples1);
+  }
+
+  filter.Reset();
+  std::array<float, kFrameSize> samples2;
+  for (size_t i = 0; i < kNumFrames; ++i) {
+    filter.Process(kBiQuadInputSeq[i], samples2);
+  }
+
+  EXPECT_EQ(samples1, samples2);
+}
+
+}  // namespace test
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/BUILD.gn asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/BUILD.gn
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/BUILD.gn	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,291 @@
+# Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+import("../../../webrtc.gni")
+
+group("agc2") {
+  deps = [
+    ":adaptive_digital",
+    ":fixed_digital",
+  ]
+}
+
+rtc_library("adaptive_digital") {
+  sources = [
+    "adaptive_agc.cc",
+    "adaptive_agc.h",
+    "adaptive_digital_gain_applier.cc",
+    "adaptive_digital_gain_applier.h",
+    "adaptive_mode_level_estimator.cc",
+    "adaptive_mode_level_estimator.h",
+    "saturation_protector.cc",
+    "saturation_protector.h",
+    "saturation_protector_buffer.cc",
+    "saturation_protector_buffer.h",
+  ]
+
+  configs += [ "..:apm_debug_dump" ]
+
+  deps = [
+    ":common",
+    ":cpu_features",
+    ":gain_applier",
+    ":noise_level_estimator",
+    ":rnn_vad_with_level",
+    "..:api",
+    "..:apm_logging",
+    "..:audio_frame_view",
+    "../../../api:array_view",
+    "../../../common_audio",
+    "../../../rtc_base:checks",
+    "../../../rtc_base:logging",
+    "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_compare",
+    "../../../rtc_base:safe_minmax",
+    "../../../system_wrappers:metrics",
+  ]
+
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+}
+
+rtc_library("biquad_filter") {
+  visibility = [ "./*" ]
+  sources = [
+    "biquad_filter.cc",
+    "biquad_filter.h",
+  ]
+  deps = [
+    "../../../api:array_view",
+    "../../../rtc_base:rtc_base_approved",
+  ]
+}
+
+rtc_source_set("common") {
+  sources = [ "agc2_common.h" ]
+}
+
+rtc_library("fixed_digital") {
+  sources = [
+    "fixed_digital_level_estimator.cc",
+    "fixed_digital_level_estimator.h",
+    "interpolated_gain_curve.cc",
+    "interpolated_gain_curve.h",
+    "limiter.cc",
+    "limiter.h",
+  ]
+
+  configs += [ "..:apm_debug_dump" ]
+
+  deps = [
+    ":common",
+    "..:apm_logging",
+    "..:audio_frame_view",
+    "../../../api:array_view",
+    "../../../common_audio",
+    "../../../rtc_base:checks",
+    "../../../rtc_base:gtest_prod",
+    "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_minmax",
+    "../../../system_wrappers:metrics",
+  ]
+}
+
+rtc_library("gain_applier") {
+  sources = [
+    "gain_applier.cc",
+    "gain_applier.h",
+  ]
+  deps = [
+    ":common",
+    "..:audio_frame_view",
+    "../../../api:array_view",
+    "../../../rtc_base:safe_minmax",
+  ]
+}
+
+rtc_library("noise_level_estimator") {
+  sources = [
+    "down_sampler.cc",
+    "down_sampler.h",
+    "noise_level_estimator.cc",
+    "noise_level_estimator.h",
+    "noise_spectrum_estimator.cc",
+    "noise_spectrum_estimator.h",
+    "signal_classifier.cc",
+    "signal_classifier.h",
+  ]
+  deps = [
+    ":biquad_filter",
+    "..:apm_logging",
+    "..:audio_frame_view",
+    "../../../api:array_view",
+    "../../../common_audio",
+    "../../../common_audio/third_party/ooura:fft_size_128",
+    "../../../rtc_base:checks",
+    "../../../rtc_base:macromagic",
+    "../../../system_wrappers",
+  ]
+
+  configs += [ "..:apm_debug_dump" ]
+}
+
+rtc_library("rnn_vad_with_level") {
+  sources = [
+    "vad_with_level.cc",
+    "vad_with_level.h",
+  ]
+
+  defines = []
+  if (rtc_build_with_neon && current_cpu != "arm64") {
+    suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+    cflags = [ "-mfpu=neon" ]
+  }
+
+  deps = [
+    ":common",
+    ":cpu_features",
+    "..:audio_frame_view",
+    "../../../api:array_view",
+    "../../../common_audio",
+    "../../../rtc_base:checks",
+    "rnn_vad",
+    "rnn_vad:rnn_vad_common",
+  ]
+}
+
+rtc_library("cpu_features") {
+  sources = [
+    "cpu_features.cc",
+    "cpu_features.h",
+  ]
+  visibility = [ "./*" ]
+  deps = [
+    "../../../rtc_base:stringutils",
+    "../../../rtc_base/system:arch",
+    "../../../system_wrappers",
+  ]
+}
+
+rtc_library("adaptive_digital_unittests") {
+  testonly = true
+  configs += [ "..:apm_debug_dump" ]
+
+  sources = [
+    "adaptive_digital_gain_applier_unittest.cc",
+    "adaptive_mode_level_estimator_unittest.cc",
+    "gain_applier_unittest.cc",
+    "saturation_protector_buffer_unittest.cc",
+    "saturation_protector_unittest.cc",
+  ]
+  deps = [
+    ":adaptive_digital",
+    ":common",
+    ":gain_applier",
+    ":test_utils",
+    "..:apm_logging",
+    "..:audio_frame_view",
+    "../../../api:array_view",
+    "../../../common_audio",
+    "../../../rtc_base:checks",
+    "../../../rtc_base:gunit_helpers",
+    "../../../rtc_base:rtc_base_approved",
+    "../../../test:test_support",
+  ]
+}
+
+rtc_library("biquad_filter_unittests") {
+  testonly = true
+  sources = [ "biquad_filter_unittest.cc" ]
+  deps = [
+    ":biquad_filter",
+    "../../../rtc_base:gunit_helpers",
+  ]
+}
+
+rtc_library("fixed_digital_unittests") {
+  testonly = true
+  configs += [ "..:apm_debug_dump" ]
+
+  sources = [
+    "agc2_testing_common_unittest.cc",
+    "compute_interpolated_gain_curve.cc",
+    "compute_interpolated_gain_curve.h",
+    "fixed_digital_level_estimator_unittest.cc",
+    "interpolated_gain_curve_unittest.cc",
+    "limiter_db_gain_curve.cc",
+    "limiter_db_gain_curve.h",
+    "limiter_db_gain_curve_unittest.cc",
+    "limiter_unittest.cc",
+  ]
+  deps = [
+    ":common",
+    ":fixed_digital",
+    ":test_utils",
+    "..:apm_logging",
+    "..:audio_frame_view",
+    "../../../api:array_view",
+    "../../../common_audio",
+    "../../../rtc_base:checks",
+    "../../../rtc_base:gunit_helpers",
+    "../../../rtc_base:rtc_base_approved",
+    "../../../system_wrappers:metrics",
+  ]
+}
+
+rtc_library("noise_estimator_unittests") {
+  testonly = true
+  configs += [ "..:apm_debug_dump" ]
+
+  sources = [
+    "noise_level_estimator_unittest.cc",
+    "signal_classifier_unittest.cc",
+  ]
+  deps = [
+    ":noise_level_estimator",
+    ":test_utils",
+    "..:apm_logging",
+    "..:audio_frame_view",
+    "../../../api:array_view",
+    "../../../api:function_view",
+    "../../../rtc_base:checks",
+    "../../../rtc_base:gunit_helpers",
+    "../../../rtc_base:rtc_base_approved",
+  ]
+}
+
+rtc_library("rnn_vad_with_level_unittests") {
+  testonly = true
+  sources = [ "vad_with_level_unittest.cc" ]
+  deps = [
+    ":common",
+    ":rnn_vad_with_level",
+    "..:audio_frame_view",
+    "../../../rtc_base:gunit_helpers",
+    "../../../rtc_base:safe_compare",
+    "../../../test:test_support",
+  ]
+}
+
+rtc_library("test_utils") {
+  testonly = true
+  visibility = [
+    ":*",
+    "..:audio_processing_unittests",
+  ]
+  sources = [
+    "agc2_testing_common.cc",
+    "agc2_testing_common.h",
+    "vector_float_frame.cc",
+    "vector_float_frame.h",
+  ]
+  deps = [
+    "..:audio_frame_view",
+    "../../../rtc_base:checks",
+    "../../../rtc_base:rtc_base_approved",
+  ]
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/compute_interpolated_gain_curve.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/compute_interpolated_gain_curve.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/compute_interpolated_gain_curve.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/compute_interpolated_gain_curve.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,229 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/compute_interpolated_gain_curve.h"
+
+#include <algorithm>
+#include <cmath>
+#include <queue>
+#include <tuple>
+#include <utility>
+#include <vector>
+
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/agc2/agc2_testing_common.h"
+#include "modules/audio_processing/agc2/limiter_db_gain_curve.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+std::pair<double, double> ComputeLinearApproximationParams(
+    const LimiterDbGainCurve* limiter,
+    const double x) {
+  const double m = limiter->GetGainFirstDerivativeLinear(x);
+  const double q = limiter->GetGainLinear(x) - m * x;
+  return {m, q};
+}
+
+double ComputeAreaUnderPiecewiseLinearApproximation(
+    const LimiterDbGainCurve* limiter,
+    const double x0,
+    const double x1) {
+  RTC_CHECK_LT(x0, x1);
+
+  // Linear approximation in x0 and x1.
+  double m0, q0, m1, q1;
+  std::tie(m0, q0) = ComputeLinearApproximationParams(limiter, x0);
+  std::tie(m1, q1) = ComputeLinearApproximationParams(limiter, x1);
+
+  // Intersection point between two adjacent linear pieces.
+  RTC_CHECK_NE(m1, m0);
+  const double x_split = (q0 - q1) / (m1 - m0);
+  RTC_CHECK_LT(x0, x_split);
+  RTC_CHECK_LT(x_split, x1);
+
+  auto area_under_linear_piece = [](double x_l, double x_r, double m,
+                                    double q) {
+    return x_r * (m * x_r / 2.0 + q) - x_l * (m * x_l / 2.0 + q);
+  };
+  return area_under_linear_piece(x0, x_split, m0, q0) +
+         area_under_linear_piece(x_split, x1, m1, q1);
+}
+
+// Computes the approximation error in the limiter region for a given interval.
+// The error is computed as the difference between the areas beneath the limiter
+// curve to approximate and its linear under-approximation.
+double LimiterUnderApproximationNegativeError(const LimiterDbGainCurve* limiter,
+                                              const double x0,
+                                              const double x1) {
+  const double area_limiter = limiter->GetGainIntegralLinear(x0, x1);
+  const double area_interpolated_curve =
+      ComputeAreaUnderPiecewiseLinearApproximation(limiter, x0, x1);
+  RTC_CHECK_GE(area_limiter, area_interpolated_curve);
+  return area_limiter - area_interpolated_curve;
+}
+
+// Automatically finds where to sample the beyond-knee region of a limiter using
+// a greedy optimization algorithm that iteratively decreases the approximation
+// error.
+// The solution is sub-optimal because the algorithm is greedy and the points
+// are assigned by halving intervals (starting with the whole beyond-knee region
+// as a single interval). However, even if sub-optimal, this algorithm works
+// well in practice and it is efficiently implemented using priority queues.
+std::vector<double> SampleLimiterRegion(const LimiterDbGainCurve* limiter) {
+  static_assert(kInterpolatedGainCurveBeyondKneePoints > 2, "");
+
+  struct Interval {
+    Interval() = default;  // Ctor required by std::priority_queue.
+    Interval(double l, double r, double e) : x0(l), x1(r), error(e) {
+      RTC_CHECK(x0 < x1);
+    }
+    bool operator<(const Interval& other) const { return error < other.error; }
+
+    double x0;
+    double x1;
+    double error;
+  };
+
+  std::priority_queue<Interval, std::vector<Interval>> q;
+  q.emplace(limiter->limiter_start_linear(), limiter->max_input_level_linear(),
+            LimiterUnderApproximationNegativeError(
+                limiter, limiter->limiter_start_linear(),
+                limiter->max_input_level_linear()));
+
+  // Iteratively find points by halving the interval with greatest error.
+  while (q.size() < kInterpolatedGainCurveBeyondKneePoints) {
+    // Get the interval with highest error.
+    const auto interval = q.top();
+    q.pop();
+
+    // Split |interval| and enqueue.
+    double x_split = (interval.x0 + interval.x1) / 2.0;
+    q.emplace(interval.x0, x_split,
+              LimiterUnderApproximationNegativeError(limiter, interval.x0,
+                                                     x_split));  // Left.
+    q.emplace(x_split, interval.x1,
+              LimiterUnderApproximationNegativeError(limiter, x_split,
+                                                     interval.x1));  // Right.
+  }
+
+  // Copy x1 values and sort them.
+  RTC_CHECK_EQ(q.size(), kInterpolatedGainCurveBeyondKneePoints);
+  std::vector<double> samples(kInterpolatedGainCurveBeyondKneePoints);
+  for (size_t i = 0; i < kInterpolatedGainCurveBeyondKneePoints; ++i) {
+    const auto interval = q.top();
+    q.pop();
+    samples[i] = interval.x1;
+  }
+  RTC_CHECK(q.empty());
+  std::sort(samples.begin(), samples.end());
+
+  return samples;
+}
+
+// Compute the parameters to over-approximate the knee region via linear
+// interpolation. Over-approximating is saturation-safe since the knee region is
+// convex.
+void PrecomputeKneeApproxParams(const LimiterDbGainCurve* limiter,
+                                test::InterpolatedParameters* parameters) {
+  static_assert(kInterpolatedGainCurveKneePoints > 2, "");
+  // Get |kInterpolatedGainCurveKneePoints| - 1 equally spaced points.
+  const std::vector<double> points = test::LinSpace(
+      limiter->knee_start_linear(), limiter->limiter_start_linear(),
+      kInterpolatedGainCurveKneePoints - 1);
+
+  // Set the first two points. The second is computed to help with the beginning
+  // of the knee region, which has high curvature.
+  parameters->computed_approximation_params_x[0] = points[0];
+  parameters->computed_approximation_params_x[1] =
+      (points[0] + points[1]) / 2.0;
+  // Copy the remaining points.
+  std::copy(std::begin(points) + 1, std::end(points),
+            std::begin(parameters->computed_approximation_params_x) + 2);
+
+  // Compute (m, q) pairs for each linear piece y = mx + q.
+  for (size_t i = 0; i < kInterpolatedGainCurveKneePoints - 1; ++i) {
+    const double x0 = parameters->computed_approximation_params_x[i];
+    const double x1 = parameters->computed_approximation_params_x[i + 1];
+    const double y0 = limiter->GetGainLinear(x0);
+    const double y1 = limiter->GetGainLinear(x1);
+    RTC_CHECK_NE(x1, x0);
+    parameters->computed_approximation_params_m[i] = (y1 - y0) / (x1 - x0);
+    parameters->computed_approximation_params_q[i] =
+        y0 - parameters->computed_approximation_params_m[i] * x0;
+  }
+}
+
+// Compute the parameters to under-approximate the beyond-knee region via linear
+// interpolation and greedy sampling. Under-approximating is saturation-safe
+// since the beyond-knee region is concave.
+void PrecomputeBeyondKneeApproxParams(
+    const LimiterDbGainCurve* limiter,
+    test::InterpolatedParameters* parameters) {
+  // Find points on which the linear pieces are tangent to the gain curve.
+  const auto samples = SampleLimiterRegion(limiter);
+
+  // Parametrize each linear piece.
+  double m, q;
+  std::tie(m, q) = ComputeLinearApproximationParams(
+      limiter,
+      parameters
+          ->computed_approximation_params_x[kInterpolatedGainCurveKneePoints -
+                                            1]);
+  parameters
+      ->computed_approximation_params_m[kInterpolatedGainCurveKneePoints - 1] =
+      m;
+  parameters
+      ->computed_approximation_params_q[kInterpolatedGainCurveKneePoints - 1] =
+      q;
+  for (size_t i = 0; i < samples.size(); ++i) {
+    std::tie(m, q) = ComputeLinearApproximationParams(limiter, samples[i]);
+    parameters
+        ->computed_approximation_params_m[i +
+                                          kInterpolatedGainCurveKneePoints] = m;
+    parameters
+        ->computed_approximation_params_q[i +
+                                          kInterpolatedGainCurveKneePoints] = q;
+  }
+
+  // Find the point of intersection between adjacent linear pieces. They will be
+  // used as boundaries between adjacent linear pieces.
+  for (size_t i = kInterpolatedGainCurveKneePoints;
+       i < kInterpolatedGainCurveKneePoints +
+               kInterpolatedGainCurveBeyondKneePoints;
+       ++i) {
+    RTC_CHECK_NE(parameters->computed_approximation_params_m[i],
+                 parameters->computed_approximation_params_m[i - 1]);
+    parameters->computed_approximation_params_x[i] =
+        (  // Formula: (q0 - q1) / (m1 - m0).
+            parameters->computed_approximation_params_q[i - 1] -
+            parameters->computed_approximation_params_q[i]) /
+        (parameters->computed_approximation_params_m[i] -
+         parameters->computed_approximation_params_m[i - 1]);
+  }
+}
+
+}  // namespace
+
+namespace test {
+
+InterpolatedParameters ComputeInterpolatedGainCurveApproximationParams() {
+  InterpolatedParameters parameters;
+  LimiterDbGainCurve limiter;
+  parameters.computed_approximation_params_x.fill(0.0f);
+  parameters.computed_approximation_params_m.fill(0.0f);
+  parameters.computed_approximation_params_q.fill(0.0f);
+  PrecomputeKneeApproxParams(&limiter, &parameters);
+  PrecomputeBeyondKneeApproxParams(&limiter, &parameters);
+  return parameters;
+}
+}  // namespace test
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/compute_interpolated_gain_curve.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/compute_interpolated_gain_curve.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/compute_interpolated_gain_curve.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/compute_interpolated_gain_curve.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_COMPUTE_INTERPOLATED_GAIN_CURVE_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_COMPUTE_INTERPOLATED_GAIN_CURVE_H_
+
+#include <array>
+
+#include "modules/audio_processing/agc2/agc2_common.h"
+
+namespace webrtc {
+
+namespace test {
+
+// Parameters for interpolated gain curve using under-approximation to
+// avoid saturation.
+//
+// The saturation gain is defined in order to let hard-clipping occur for
+// those samples having a level that falls in the saturation region. It is an
+// upper bound of the actual gain to apply - i.e., that returned by the
+// limiter.
+
+// Knee and beyond-knee regions approximation parameters.
+// The gain curve is approximated as a piece-wise linear function.
+// |approx_params_x_| are the boundaries between adjacent linear pieces,
+// |approx_params_m_| and |approx_params_q_| are the slope and the y-intercept
+// values of each piece.
+struct InterpolatedParameters {
+  std::array<float, kInterpolatedGainCurveTotalPoints>
+      computed_approximation_params_x;
+  std::array<float, kInterpolatedGainCurveTotalPoints>
+      computed_approximation_params_m;
+  std::array<float, kInterpolatedGainCurveTotalPoints>
+      computed_approximation_params_q;
+};
+
+InterpolatedParameters ComputeInterpolatedGainCurveApproximationParams();
+}  // namespace test
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_COMPUTE_INTERPOLATED_GAIN_CURVE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/cpu_features.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/cpu_features.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/cpu_features.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/cpu_features.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/cpu_features.h"
+
+#include "rtc_base/strings/string_builder.h"
+#include "rtc_base/system/arch.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+
+namespace webrtc {
+
+std::string AvailableCpuFeatures::ToString() const {
+  char buf[64];
+  rtc::SimpleStringBuilder builder(buf);
+  bool first = true;
+  if (sse2) {
+    builder << (first ? "SSE2" : "_SSE2");
+    first = false;
+  }
+  if (avx2) {
+    builder << (first ? "AVX2" : "_AVX2");
+    first = false;
+  }
+  if (neon) {
+    builder << (first ? "NEON" : "_NEON");
+    first = false;
+  }
+  if (first) {
+    return "none";
+  }
+  return builder.str();
+}
+
+// Detects available CPU features.
+AvailableCpuFeatures GetAvailableCpuFeatures() {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+  return {/*sse2=*/GetCPUInfo(kSSE2) != 0,
+          /*avx2=*/GetCPUInfo(kAVX2) != 0,
+          /*neon=*/false};
+#elif defined(WEBRTC_HAS_NEON)
+  return {/*sse2=*/false,
+          /*avx2=*/false,
+          /*neon=*/true};
+#else
+  return {/*sse2=*/false,
+          /*avx2=*/false,
+          /*neon=*/false};
+#endif
+}
+
+AvailableCpuFeatures NoAvailableCpuFeatures() {
+  return {/*sse2=*/false, /*avx2=*/false, /*neon=*/false};
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/cpu_features.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/cpu_features.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/cpu_features.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/cpu_features.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_CPU_FEATURES_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_CPU_FEATURES_H_
+
+#include <string>
+
+namespace webrtc {
+
+// Collection of flags indicating which CPU features are available on the
+// current platform. True means available.
+struct AvailableCpuFeatures {
+  AvailableCpuFeatures(bool sse2, bool avx2, bool neon)
+      : sse2(sse2), avx2(avx2), neon(neon) {}
+  // Intel.
+  bool sse2;
+  bool avx2;
+  // ARM.
+  bool neon;
+  std::string ToString() const;
+};
+
+// Detects what CPU features are available.
+AvailableCpuFeatures GetAvailableCpuFeatures();
+
+// Returns the CPU feature flags all set to false.
+AvailableCpuFeatures NoAvailableCpuFeatures();
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_CPU_FEATURES_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/down_sampler.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/down_sampler.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/down_sampler.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/down_sampler.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,99 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/down_sampler.h"
+
+#include <string.h>
+
+#include <algorithm>
+
+#include "modules/audio_processing/agc2/biquad_filter.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+constexpr int kChunkSizeMs = 10;
+constexpr int kSampleRate8kHz = 8000;
+constexpr int kSampleRate16kHz = 16000;
+constexpr int kSampleRate32kHz = 32000;
+constexpr int kSampleRate48kHz = 48000;
+
+// Bandlimiter coefficients computed based on that only
+// the first 40 bins of the spectrum for the downsampled
+// signal are used.
+// [B,A] = butter(2,(41/64*4000)/8000)
+const BiQuadFilter::BiQuadCoefficients kLowPassFilterCoefficients_16kHz = {
+    {0.1455f, 0.2911f, 0.1455f},
+    {-0.6698f, 0.2520f}};
+
+// [B,A] = butter(2,(41/64*4000)/16000)
+const BiQuadFilter::BiQuadCoefficients kLowPassFilterCoefficients_32kHz = {
+    {0.0462f, 0.0924f, 0.0462f},
+    {-1.3066f, 0.4915f}};
+
+// [B,A] = butter(2,(41/64*4000)/24000)
+const BiQuadFilter::BiQuadCoefficients kLowPassFilterCoefficients_48kHz = {
+    {0.0226f, 0.0452f, 0.0226f},
+    {-1.5320f, 0.6224f}};
+
+}  // namespace
+
+DownSampler::DownSampler(ApmDataDumper* data_dumper)
+    : data_dumper_(data_dumper) {
+  Initialize(48000);
+}
+void DownSampler::Initialize(int sample_rate_hz) {
+  RTC_DCHECK(
+      sample_rate_hz == kSampleRate8kHz || sample_rate_hz == kSampleRate16kHz ||
+      sample_rate_hz == kSampleRate32kHz || sample_rate_hz == kSampleRate48kHz);
+
+  sample_rate_hz_ = sample_rate_hz;
+  down_sampling_factor_ = rtc::CheckedDivExact(sample_rate_hz_, 8000);
+
+  /// Note that the down sampling filter is not used if the sample rate is 8
+  /// kHz.
+  if (sample_rate_hz_ == kSampleRate16kHz) {
+    low_pass_filter_.Initialize(kLowPassFilterCoefficients_16kHz);
+  } else if (sample_rate_hz_ == kSampleRate32kHz) {
+    low_pass_filter_.Initialize(kLowPassFilterCoefficients_32kHz);
+  } else if (sample_rate_hz_ == kSampleRate48kHz) {
+    low_pass_filter_.Initialize(kLowPassFilterCoefficients_48kHz);
+  }
+}
+
+void DownSampler::DownSample(rtc::ArrayView<const float> in,
+                             rtc::ArrayView<float> out) {
+  data_dumper_->DumpWav("agc2_down_sampler_input", in, sample_rate_hz_, 1);
+  RTC_DCHECK_EQ(sample_rate_hz_ * kChunkSizeMs / 1000, in.size());
+  RTC_DCHECK_EQ(kSampleRate8kHz * kChunkSizeMs / 1000, out.size());
+  const size_t kMaxNumFrames = kSampleRate48kHz * kChunkSizeMs / 1000;
+  float x[kMaxNumFrames];
+
+  // Band-limit the signal to 4 kHz.
+  if (sample_rate_hz_ != kSampleRate8kHz) {
+    low_pass_filter_.Process(in, rtc::ArrayView<float>(x, in.size()));
+
+    // Downsample the signal.
+    size_t k = 0;
+    for (size_t j = 0; j < out.size(); ++j) {
+      RTC_DCHECK_GT(kMaxNumFrames, k);
+      out[j] = x[k];
+      k += down_sampling_factor_;
+    }
+  } else {
+    std::copy(in.data(), in.data() + in.size(), out.data());
+  }
+
+  data_dumper_->DumpWav("agc2_down_sampler_output", out, kSampleRate8kHz, 1);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/down_sampler.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/down_sampler.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/down_sampler.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/down_sampler.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_DOWN_SAMPLER_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_DOWN_SAMPLER_H_
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/biquad_filter.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+
+class DownSampler {
+ public:
+  explicit DownSampler(ApmDataDumper* data_dumper);
+
+  DownSampler() = delete;
+  DownSampler(const DownSampler&) = delete;
+  DownSampler& operator=(const DownSampler&) = delete;
+
+  void Initialize(int sample_rate_hz);
+
+  void DownSample(rtc::ArrayView<const float> in, rtc::ArrayView<float> out);
+
+ private:
+  ApmDataDumper* const data_dumper_;
+  int sample_rate_hz_;
+  int down_sampling_factor_;
+  BiQuadFilter low_pass_filter_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_DOWN_SAMPLER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,120 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/fixed_digital_level_estimator.h"
+
+#include <algorithm>
+#include <cmath>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+constexpr float kInitialFilterStateLevel = 0.f;
+
+// Instant attack.
+constexpr float kAttackFilterConstant = 0.f;
+// This is computed from kDecayMs by
+// 10 ** (-1/20 * subframe_duration / kDecayMs).
+// |subframe_duration| is |kFrameDurationMs / kSubFramesInFrame|.
+// kDecayMs is defined in agc2_testing_common.h
+constexpr float kDecayFilterConstant = 0.9998848773724686f;
+
+}  // namespace
+
+FixedDigitalLevelEstimator::FixedDigitalLevelEstimator(
+    int sample_rate_hz,
+    ApmDataDumper* apm_data_dumper)
+    : apm_data_dumper_(apm_data_dumper),
+      filter_state_level_(kInitialFilterStateLevel) {
+  SetSampleRate(sample_rate_hz);
+  CheckParameterCombination();
+  RTC_DCHECK(apm_data_dumper_);
+  apm_data_dumper_->DumpRaw("agc2_level_estimator_samplerate", sample_rate_hz);
+}
+
+void FixedDigitalLevelEstimator::CheckParameterCombination() {
+  RTC_DCHECK_GT(samples_in_frame_, 0);
+  RTC_DCHECK_LE(kSubFramesInFrame, samples_in_frame_);
+  RTC_DCHECK_EQ(samples_in_frame_ % kSubFramesInFrame, 0);
+  RTC_DCHECK_GT(samples_in_sub_frame_, 1);
+}
+
+std::array<float, kSubFramesInFrame> FixedDigitalLevelEstimator::ComputeLevel(
+    const AudioFrameView<const float>& float_frame) {
+  RTC_DCHECK_GT(float_frame.num_channels(), 0);
+  RTC_DCHECK_EQ(float_frame.samples_per_channel(), samples_in_frame_);
+
+  // Compute max envelope without smoothing.
+  std::array<float, kSubFramesInFrame> envelope{};
+  for (size_t channel_idx = 0; channel_idx < float_frame.num_channels();
+       ++channel_idx) {
+    const auto channel = float_frame.channel(channel_idx);
+    for (int sub_frame = 0; sub_frame < kSubFramesInFrame; ++sub_frame) {
+      for (int sample_in_sub_frame = 0;
+           sample_in_sub_frame < samples_in_sub_frame_; ++sample_in_sub_frame) {
+        envelope[sub_frame] =
+            std::max(envelope[sub_frame],
+                     std::abs(channel[sub_frame * samples_in_sub_frame_ +
+                                      sample_in_sub_frame]));
+      }
+    }
+  }
+
+  // Make sure envelope increases happen one step earlier so that the
+  // corresponding *gain decrease* doesn't miss a sudden signal
+  // increase due to interpolation.
+  for (int sub_frame = 0; sub_frame < kSubFramesInFrame - 1; ++sub_frame) {
+    if (envelope[sub_frame] < envelope[sub_frame + 1]) {
+      envelope[sub_frame] = envelope[sub_frame + 1];
+    }
+  }
+
+  // Add attack / decay smoothing.
+  for (int sub_frame = 0; sub_frame < kSubFramesInFrame; ++sub_frame) {
+    const float envelope_value = envelope[sub_frame];
+    if (envelope_value > filter_state_level_) {
+      envelope[sub_frame] = envelope_value * (1 - kAttackFilterConstant) +
+                            filter_state_level_ * kAttackFilterConstant;
+    } else {
+      envelope[sub_frame] = envelope_value * (1 - kDecayFilterConstant) +
+                            filter_state_level_ * kDecayFilterConstant;
+    }
+    filter_state_level_ = envelope[sub_frame];
+
+    // Dump data for debug.
+    RTC_DCHECK(apm_data_dumper_);
+    const auto channel = float_frame.channel(0);
+    apm_data_dumper_->DumpRaw("agc2_level_estimator_samples",
+                              samples_in_sub_frame_,
+                              &channel[sub_frame * samples_in_sub_frame_]);
+    apm_data_dumper_->DumpRaw("agc2_level_estimator_level",
+                              envelope[sub_frame]);
+  }
+
+  return envelope;
+}
+
+void FixedDigitalLevelEstimator::SetSampleRate(int sample_rate_hz) {
+  samples_in_frame_ =
+      rtc::CheckedDivExact(sample_rate_hz * kFrameDurationMs, 1000);
+  samples_in_sub_frame_ =
+      rtc::CheckedDivExact(samples_in_frame_, kSubFramesInFrame);
+  CheckParameterCombination();
+}
+
+void FixedDigitalLevelEstimator::Reset() {
+  filter_state_level_ = kInitialFilterStateLevel;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,65 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_FIXED_DIGITAL_LEVEL_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_FIXED_DIGITAL_LEVEL_ESTIMATOR_H_
+
+#include <array>
+#include <vector>
+
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/include/audio_frame_view.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+// Produces a smooth signal level estimate from an input audio
+// stream. The estimate smoothing is done through exponential
+// filtering.
+class FixedDigitalLevelEstimator {
+ public:
+  // Sample rates are allowed if the number of samples in a frame
+  // (sample_rate_hz * kFrameDurationMs / 1000) is divisible by
+  // kSubFramesInSample. For kFrameDurationMs=10 and
+  // kSubFramesInSample=20, this means that sample_rate_hz has to be
+  // divisible by 2000.
+  FixedDigitalLevelEstimator(int sample_rate_hz,
+                             ApmDataDumper* apm_data_dumper);
+
+  // The input is assumed to be in FloatS16 format. Scaled input will
+  // produce similarly scaled output. A frame of with kFrameDurationMs
+  // ms of audio produces a level estimates in the same scale. The
+  // level estimate contains kSubFramesInFrame values.
+  std::array<float, kSubFramesInFrame> ComputeLevel(
+      const AudioFrameView<const float>& float_frame);
+
+  // Rate may be changed at any time (but not concurrently) from the
+  // value passed to the constructor. The class is not thread safe.
+  void SetSampleRate(int sample_rate_hz);
+
+  // Resets the level estimator internal state.
+  void Reset();
+
+  float LastAudioLevel() const { return filter_state_level_; }
+
+ private:
+  void CheckParameterCombination();
+
+  ApmDataDumper* const apm_data_dumper_ = nullptr;
+  float filter_state_level_;
+  int samples_in_frame_;
+  int samples_in_sub_frame_;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(FixedDigitalLevelEstimator);
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_FIXED_DIGITAL_LEVEL_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/fixed_digital_level_estimator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,159 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/fixed_digital_level_estimator.h"
+
+#include <limits>
+
+#include "common_audio/include/audio_util.h"
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/agc2/agc2_testing_common.h"
+#include "modules/audio_processing/agc2/vector_float_frame.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/gunit.h"
+
+namespace webrtc {
+namespace {
+
+constexpr float kInputLevel = 10000.f;
+
+// Run audio at specified settings through the level estimator, and
+// verify that the output level falls within the bounds.
+void TestLevelEstimator(int sample_rate_hz,
+                        int num_channels,
+                        float input_level_linear_scale,
+                        float expected_min,
+                        float expected_max) {
+  ApmDataDumper apm_data_dumper(0);
+  FixedDigitalLevelEstimator level_estimator(sample_rate_hz, &apm_data_dumper);
+
+  const VectorFloatFrame vectors_with_float_frame(
+      num_channels, rtc::CheckedDivExact(sample_rate_hz, 100),
+      input_level_linear_scale);
+
+  for (int i = 0; i < 500; ++i) {
+    const auto level = level_estimator.ComputeLevel(
+        vectors_with_float_frame.float_frame_view());
+
+    // Give the estimator some time to ramp up.
+    if (i < 50) {
+      continue;
+    }
+
+    for (const auto& x : level) {
+      EXPECT_LE(expected_min, x);
+      EXPECT_LE(x, expected_max);
+    }
+  }
+}
+
+// Returns time it takes for the level estimator to decrease its level
+// estimate by 'level_reduction_db'.
+float TimeMsToDecreaseLevel(int sample_rate_hz,
+                            int num_channels,
+                            float input_level_db,
+                            float level_reduction_db) {
+  const float input_level = DbfsToFloatS16(input_level_db);
+  RTC_DCHECK_GT(level_reduction_db, 0);
+
+  const VectorFloatFrame vectors_with_float_frame(
+      num_channels, rtc::CheckedDivExact(sample_rate_hz, 100), input_level);
+
+  ApmDataDumper apm_data_dumper(0);
+  FixedDigitalLevelEstimator level_estimator(sample_rate_hz, &apm_data_dumper);
+
+  // Give the LevelEstimator plenty of time to ramp up and stabilize
+  float last_level = 0.f;
+  for (int i = 0; i < 500; ++i) {
+    const auto level_envelope = level_estimator.ComputeLevel(
+        vectors_with_float_frame.float_frame_view());
+    last_level = *level_envelope.rbegin();
+  }
+
+  // Set input to 0.
+  VectorFloatFrame vectors_with_zero_float_frame(
+      num_channels, rtc::CheckedDivExact(sample_rate_hz, 100), 0);
+
+  const float reduced_level_linear =
+      DbfsToFloatS16(input_level_db - level_reduction_db);
+  int sub_frames_until_level_reduction = 0;
+  while (last_level > reduced_level_linear) {
+    const auto level_envelope = level_estimator.ComputeLevel(
+        vectors_with_zero_float_frame.float_frame_view());
+    for (const auto& v : level_envelope) {
+      EXPECT_LT(v, last_level);
+      sub_frames_until_level_reduction++;
+      last_level = v;
+      if (last_level <= reduced_level_linear) {
+        break;
+      }
+    }
+  }
+  return static_cast<float>(sub_frames_until_level_reduction) *
+         kFrameDurationMs / kSubFramesInFrame;
+}
+}  // namespace
+
+TEST(GainController2FixedDigitalLevelEstimator, EstimatorShouldNotCrash) {
+  TestLevelEstimator(8000, 1, 0, std::numeric_limits<float>::lowest(),
+                     std::numeric_limits<float>::max());
+}
+
+TEST(GainController2FixedDigitalLevelEstimator,
+     EstimatorShouldEstimateConstantLevel) {
+  TestLevelEstimator(10000, 1, kInputLevel, kInputLevel * 0.99,
+                     kInputLevel * 1.01);
+}
+
+TEST(GainController2FixedDigitalLevelEstimator,
+     EstimatorShouldEstimateConstantLevelForManyChannels) {
+  constexpr size_t num_channels = 10;
+  TestLevelEstimator(20000, num_channels, kInputLevel, kInputLevel * 0.99,
+                     kInputLevel * 1.01);
+}
+
+TEST(GainController2FixedDigitalLevelEstimator, TimeToDecreaseForLowLevel) {
+  constexpr float kLevelReductionDb = 25;
+  constexpr float kInitialLowLevel = -40;
+  constexpr float kExpectedTime = kLevelReductionDb * test::kDecayMs;
+
+  const float time_to_decrease =
+      TimeMsToDecreaseLevel(22000, 1, kInitialLowLevel, kLevelReductionDb);
+
+  EXPECT_LE(kExpectedTime * 0.9, time_to_decrease);
+  EXPECT_LE(time_to_decrease, kExpectedTime * 1.1);
+}
+
+TEST(GainController2FixedDigitalLevelEstimator,
+     TimeToDecreaseForFullScaleLevel) {
+  constexpr float kLevelReductionDb = 25;
+  constexpr float kExpectedTime = kLevelReductionDb * test::kDecayMs;
+
+  const float time_to_decrease =
+      TimeMsToDecreaseLevel(26000, 1, 0, kLevelReductionDb);
+
+  EXPECT_LE(kExpectedTime * 0.9, time_to_decrease);
+  EXPECT_LE(time_to_decrease, kExpectedTime * 1.1);
+}
+
+TEST(GainController2FixedDigitalLevelEstimator,
+     TimeToDecreaseForMultipleChannels) {
+  constexpr float kLevelReductionDb = 25;
+  constexpr float kExpectedTime = kLevelReductionDb * test::kDecayMs;
+  constexpr size_t kNumChannels = 10;
+
+  const float time_to_decrease =
+      TimeMsToDecreaseLevel(28000, kNumChannels, 0, kLevelReductionDb);
+
+  EXPECT_LE(kExpectedTime * 0.9, time_to_decrease);
+  EXPECT_LE(time_to_decrease, kExpectedTime * 1.1);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,102 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/gain_applier.h"
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "rtc_base/numerics/safe_minmax.h"
+
+namespace webrtc {
+namespace {
+
+// Returns true when the gain factor is so close to 1 that it would
+// not affect int16 samples.
+bool GainCloseToOne(float gain_factor) {
+  return 1.f - 1.f / kMaxFloatS16Value <= gain_factor &&
+         gain_factor <= 1.f + 1.f / kMaxFloatS16Value;
+}
+
+void ClipSignal(AudioFrameView<float> signal) {
+  for (size_t k = 0; k < signal.num_channels(); ++k) {
+    rtc::ArrayView<float> channel_view = signal.channel(k);
+    for (auto& sample : channel_view) {
+      sample = rtc::SafeClamp(sample, kMinFloatS16Value, kMaxFloatS16Value);
+    }
+  }
+}
+
+void ApplyGainWithRamping(float last_gain_linear,
+                          float gain_at_end_of_frame_linear,
+                          float inverse_samples_per_channel,
+                          AudioFrameView<float> float_frame) {
+  // Do not modify the signal.
+  if (last_gain_linear == gain_at_end_of_frame_linear &&
+      GainCloseToOne(gain_at_end_of_frame_linear)) {
+    return;
+  }
+
+  // Gain is constant and different from 1.
+  if (last_gain_linear == gain_at_end_of_frame_linear) {
+    for (size_t k = 0; k < float_frame.num_channels(); ++k) {
+      rtc::ArrayView<float> channel_view = float_frame.channel(k);
+      for (auto& sample : channel_view) {
+        sample *= gain_at_end_of_frame_linear;
+      }
+    }
+    return;
+  }
+
+  // The gain changes. We have to change slowly to avoid discontinuities.
+  const float increment = (gain_at_end_of_frame_linear - last_gain_linear) *
+                          inverse_samples_per_channel;
+  float gain = last_gain_linear;
+  for (size_t i = 0; i < float_frame.samples_per_channel(); ++i) {
+    for (size_t ch = 0; ch < float_frame.num_channels(); ++ch) {
+      float_frame.channel(ch)[i] *= gain;
+    }
+    gain += increment;
+  }
+}
+
+}  // namespace
+
+GainApplier::GainApplier(bool hard_clip_samples, float initial_gain_factor)
+    : hard_clip_samples_(hard_clip_samples),
+      last_gain_factor_(initial_gain_factor),
+      current_gain_factor_(initial_gain_factor) {}
+
+void GainApplier::ApplyGain(AudioFrameView<float> signal) {
+  if (static_cast<int>(signal.samples_per_channel()) != samples_per_channel_) {
+    Initialize(signal.samples_per_channel());
+  }
+
+  ApplyGainWithRamping(last_gain_factor_, current_gain_factor_,
+                       inverse_samples_per_channel_, signal);
+
+  last_gain_factor_ = current_gain_factor_;
+
+  if (hard_clip_samples_) {
+    ClipSignal(signal);
+  }
+}
+
+void GainApplier::SetGainFactor(float gain_factor) {
+  RTC_DCHECK_GT(gain_factor, 0.f);
+  current_gain_factor_ = gain_factor;
+}
+
+void GainApplier::Initialize(size_t samples_per_channel) {
+  RTC_DCHECK_GT(samples_per_channel, 0);
+  samples_per_channel_ = static_cast<int>(samples_per_channel);
+  inverse_samples_per_channel_ = 1.f / samples_per_channel_;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_GAIN_APPLIER_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_GAIN_APPLIER_H_
+
+#include <stddef.h>
+
+#include "modules/audio_processing/include/audio_frame_view.h"
+
+namespace webrtc {
+class GainApplier {
+ public:
+  GainApplier(bool hard_clip_samples, float initial_gain_factor);
+
+  void ApplyGain(AudioFrameView<float> signal);
+  void SetGainFactor(float gain_factor);
+  float GetGainFactor() const { return current_gain_factor_; }
+
+ private:
+  void Initialize(size_t samples_per_channel);
+
+  // Whether to clip samples after gain is applied. If 'true', result
+  // will fit in FloatS16 range.
+  const bool hard_clip_samples_;
+  float last_gain_factor_;
+
+  // If this value is not equal to 'last_gain_factor', gain will be
+  // ramped from 'last_gain_factor_' to this value during the next
+  // 'ApplyGain'.
+  float current_gain_factor_;
+  int samples_per_channel_ = -1;
+  float inverse_samples_per_channel_ = -1.f;
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_GAIN_APPLIER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/gain_applier_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,93 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/gain_applier.h"
+
+#include <math.h>
+
+#include <algorithm>
+#include <limits>
+
+#include "modules/audio_processing/agc2/vector_float_frame.h"
+#include "rtc_base/gunit.h"
+
+namespace webrtc {
+TEST(AutomaticGainController2GainApplier, InitialGainIsRespected) {
+  constexpr float initial_signal_level = 123.f;
+  constexpr float gain_factor = 10.f;
+  VectorFloatFrame fake_audio(1, 1, initial_signal_level);
+  GainApplier gain_applier(true, gain_factor);
+
+  gain_applier.ApplyGain(fake_audio.float_frame_view());
+  EXPECT_NEAR(fake_audio.float_frame_view().channel(0)[0],
+              initial_signal_level * gain_factor, 0.1f);
+}
+
+TEST(AutomaticGainController2GainApplier, ClippingIsDone) {
+  constexpr float initial_signal_level = 30000.f;
+  constexpr float gain_factor = 10.f;
+  VectorFloatFrame fake_audio(1, 1, initial_signal_level);
+  GainApplier gain_applier(true, gain_factor);
+
+  gain_applier.ApplyGain(fake_audio.float_frame_view());
+  EXPECT_NEAR(fake_audio.float_frame_view().channel(0)[0],
+              std::numeric_limits<int16_t>::max(), 0.1f);
+}
+
+TEST(AutomaticGainController2GainApplier, ClippingIsNotDone) {
+  constexpr float initial_signal_level = 30000.f;
+  constexpr float gain_factor = 10.f;
+  VectorFloatFrame fake_audio(1, 1, initial_signal_level);
+  GainApplier gain_applier(false, gain_factor);
+
+  gain_applier.ApplyGain(fake_audio.float_frame_view());
+
+  EXPECT_NEAR(fake_audio.float_frame_view().channel(0)[0],
+              initial_signal_level * gain_factor, 0.1f);
+}
+
+TEST(AutomaticGainController2GainApplier, RampingIsDone) {
+  constexpr float initial_signal_level = 30000.f;
+  constexpr float initial_gain_factor = 1.f;
+  constexpr float target_gain_factor = 0.5f;
+  constexpr int num_channels = 3;
+  constexpr int samples_per_channel = 4;
+  VectorFloatFrame fake_audio(num_channels, samples_per_channel,
+                              initial_signal_level);
+  GainApplier gain_applier(false, initial_gain_factor);
+
+  gain_applier.SetGainFactor(target_gain_factor);
+  gain_applier.ApplyGain(fake_audio.float_frame_view());
+
+  // The maximal gain change should be close to that in linear interpolation.
+  for (size_t channel = 0; channel < num_channels; ++channel) {
+    float max_signal_change = 0.f;
+    float last_signal_level = initial_signal_level;
+    for (const auto sample : fake_audio.float_frame_view().channel(channel)) {
+      const float current_change = fabs(last_signal_level - sample);
+      max_signal_change = std::max(max_signal_change, current_change);
+      last_signal_level = sample;
+    }
+    const float total_gain_change =
+        fabs((initial_gain_factor - target_gain_factor) * initial_signal_level);
+    EXPECT_NEAR(max_signal_change, total_gain_change / samples_per_channel,
+                0.1f);
+  }
+
+  // Next frame should have the desired level.
+  VectorFloatFrame next_fake_audio_frame(num_channels, samples_per_channel,
+                                         initial_signal_level);
+  gain_applier.ApplyGain(next_fake_audio_frame.float_frame_view());
+
+  // The last sample should have the new gain.
+  EXPECT_NEAR(next_fake_audio_frame.float_frame_view().channel(0)[0],
+              initial_signal_level * target_gain_factor, 0.1f);
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,196 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/interpolated_gain_curve.h"
+
+#include <algorithm>
+#include <iterator>
+
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+constexpr std::array<float, kInterpolatedGainCurveTotalPoints>
+    InterpolatedGainCurve::approximation_params_x_;
+
+constexpr std::array<float, kInterpolatedGainCurveTotalPoints>
+    InterpolatedGainCurve::approximation_params_m_;
+
+constexpr std::array<float, kInterpolatedGainCurveTotalPoints>
+    InterpolatedGainCurve::approximation_params_q_;
+
+InterpolatedGainCurve::InterpolatedGainCurve(
+    ApmDataDumper* apm_data_dumper,
+    const std::string& histogram_name_prefix)
+    : region_logger_("WebRTC.Audio." + histogram_name_prefix +
+                         ".FixedDigitalGainCurveRegion.Identity",
+                     "WebRTC.Audio." + histogram_name_prefix +
+                         ".FixedDigitalGainCurveRegion.Knee",
+                     "WebRTC.Audio." + histogram_name_prefix +
+                         ".FixedDigitalGainCurveRegion.Limiter",
+                     "WebRTC.Audio." + histogram_name_prefix +
+                         ".FixedDigitalGainCurveRegion.Saturation"),
+      apm_data_dumper_(apm_data_dumper) {}
+
+InterpolatedGainCurve::~InterpolatedGainCurve() {
+  if (stats_.available) {
+    RTC_DCHECK(apm_data_dumper_);
+    apm_data_dumper_->DumpRaw("agc2_interp_gain_curve_lookups_identity",
+                              stats_.look_ups_identity_region);
+    apm_data_dumper_->DumpRaw("agc2_interp_gain_curve_lookups_knee",
+                              stats_.look_ups_knee_region);
+    apm_data_dumper_->DumpRaw("agc2_interp_gain_curve_lookups_limiter",
+                              stats_.look_ups_limiter_region);
+    apm_data_dumper_->DumpRaw("agc2_interp_gain_curve_lookups_saturation",
+                              stats_.look_ups_saturation_region);
+    region_logger_.LogRegionStats(stats_);
+  }
+}
+
+InterpolatedGainCurve::RegionLogger::RegionLogger(
+    const std::string& identity_histogram_name,
+    const std::string& knee_histogram_name,
+    const std::string& limiter_histogram_name,
+    const std::string& saturation_histogram_name)
+    : identity_histogram(
+          metrics::HistogramFactoryGetCounts(identity_histogram_name,
+                                             1,
+                                             10000,
+                                             50)),
+      knee_histogram(metrics::HistogramFactoryGetCounts(knee_histogram_name,
+                                                        1,
+                                                        10000,
+                                                        50)),
+      limiter_histogram(
+          metrics::HistogramFactoryGetCounts(limiter_histogram_name,
+                                             1,
+                                             10000,
+                                             50)),
+      saturation_histogram(
+          metrics::HistogramFactoryGetCounts(saturation_histogram_name,
+                                             1,
+                                             10000,
+                                             50)) {}
+
+InterpolatedGainCurve::RegionLogger::~RegionLogger() = default;
+
+void InterpolatedGainCurve::RegionLogger::LogRegionStats(
+    const InterpolatedGainCurve::Stats& stats) const {
+  using Region = InterpolatedGainCurve::GainCurveRegion;
+  const int duration_s =
+      stats.region_duration_frames / (1000 / kFrameDurationMs);
+
+  switch (stats.region) {
+    case Region::kIdentity: {
+      if (identity_histogram) {
+        metrics::HistogramAdd(identity_histogram, duration_s);
+      }
+      break;
+    }
+    case Region::kKnee: {
+      if (knee_histogram) {
+        metrics::HistogramAdd(knee_histogram, duration_s);
+      }
+      break;
+    }
+    case Region::kLimiter: {
+      if (limiter_histogram) {
+        metrics::HistogramAdd(limiter_histogram, duration_s);
+      }
+      break;
+    }
+    case Region::kSaturation: {
+      if (saturation_histogram) {
+        metrics::HistogramAdd(saturation_histogram, duration_s);
+      }
+      break;
+    }
+    default: {
+      RTC_NOTREACHED();
+    }
+  }
+}
+
+void InterpolatedGainCurve::UpdateStats(float input_level) const {
+  stats_.available = true;
+
+  GainCurveRegion region;
+
+  if (input_level < approximation_params_x_[0]) {
+    stats_.look_ups_identity_region++;
+    region = GainCurveRegion::kIdentity;
+  } else if (input_level <
+             approximation_params_x_[kInterpolatedGainCurveKneePoints - 1]) {
+    stats_.look_ups_knee_region++;
+    region = GainCurveRegion::kKnee;
+  } else if (input_level < kMaxInputLevelLinear) {
+    stats_.look_ups_limiter_region++;
+    region = GainCurveRegion::kLimiter;
+  } else {
+    stats_.look_ups_saturation_region++;
+    region = GainCurveRegion::kSaturation;
+  }
+
+  if (region == stats_.region) {
+    ++stats_.region_duration_frames;
+  } else {
+    region_logger_.LogRegionStats(stats_);
+
+    stats_.region_duration_frames = 0;
+    stats_.region = region;
+  }
+}
+
+// Looks up a gain to apply given a non-negative input level.
+// The cost of this operation depends on the region in which |input_level|
+// falls.
+// For the identity and the saturation regions the cost is O(1).
+// For the other regions, namely knee and limiter, the cost is
+// O(2 + log2(|LightkInterpolatedGainCurveTotalPoints|), plus O(1) for the
+// linear interpolation (one product and one sum).
+float InterpolatedGainCurve::LookUpGainToApply(float input_level) const {
+  UpdateStats(input_level);
+
+  if (input_level <= approximation_params_x_[0]) {
+    // Identity region.
+    return 1.0f;
+  }
+
+  if (input_level >= kMaxInputLevelLinear) {
+    // Saturating lower bound. The saturing samples exactly hit the clipping
+    // level. This method achieves has the lowest harmonic distorsion, but it
+    // may reduce the amplitude of the non-saturating samples too much.
+    return 32768.f / input_level;
+  }
+
+  // Knee and limiter regions; find the linear piece index. Spelling
+  // out the complete type was the only way to silence both the clang
+  // plugin and the windows compilers.
+  std::array<float, kInterpolatedGainCurveTotalPoints>::const_iterator it =
+      std::lower_bound(approximation_params_x_.begin(),
+                       approximation_params_x_.end(), input_level);
+  const size_t index = std::distance(approximation_params_x_.begin(), it) - 1;
+  RTC_DCHECK_LE(0, index);
+  RTC_DCHECK_LT(index, approximation_params_m_.size());
+  RTC_DCHECK_LE(approximation_params_x_[index], input_level);
+  if (index < approximation_params_m_.size() - 1) {
+    RTC_DCHECK_LE(input_level, approximation_params_x_[index + 1]);
+  }
+
+  // Piece-wise linear interploation.
+  const float gain = approximation_params_m_[index] * input_level +
+                     approximation_params_q_[index];
+  RTC_DCHECK_LE(0.f, gain);
+  return gain;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,152 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_INTERPOLATED_GAIN_CURVE_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_INTERPOLATED_GAIN_CURVE_H_
+
+#include <array>
+#include <string>
+
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/gtest_prod_util.h"
+#include "system_wrappers/include/metrics.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+
+constexpr float kInputLevelScalingFactor = 32768.0f;
+
+// Defined as DbfsToLinear(kLimiterMaxInputLevelDbFs)
+constexpr float kMaxInputLevelLinear = static_cast<float>(36766.300710566735);
+
+// Interpolated gain curve using under-approximation to avoid saturation.
+//
+// The goal of this class is allowing fast look ups to get an accurate
+// estimates of the gain to apply given an estimated input level.
+class InterpolatedGainCurve {
+ public:
+  enum class GainCurveRegion {
+    kIdentity = 0,
+    kKnee = 1,
+    kLimiter = 2,
+    kSaturation = 3
+  };
+
+  struct Stats {
+    // Region in which the output level equals the input one.
+    size_t look_ups_identity_region = 0;
+    // Smoothing between the identity and the limiter regions.
+    size_t look_ups_knee_region = 0;
+    // Limiter region in which the output and input levels are linearly related.
+    size_t look_ups_limiter_region = 0;
+    // Region in which saturation may occur since the input level is beyond the
+    // maximum expected by the limiter.
+    size_t look_ups_saturation_region = 0;
+    // True if stats have been populated.
+    bool available = false;
+
+    // The current region, and for how many frames the level has been
+    // in that region.
+    GainCurveRegion region = GainCurveRegion::kIdentity;
+    int64_t region_duration_frames = 0;
+  };
+
+  InterpolatedGainCurve(ApmDataDumper* apm_data_dumper,
+                        const std::string& histogram_name_prefix);
+  ~InterpolatedGainCurve();
+
+  Stats get_stats() const { return stats_; }
+
+  // Given a non-negative input level (linear scale), a scalar factor to apply
+  // to a sub-frame is returned.
+  // Levels above kLimiterMaxInputLevelDbFs will be reduced to 0 dBFS
+  // after applying this gain
+  float LookUpGainToApply(float input_level) const;
+
+ private:
+  // For comparing 'approximation_params_*_' with ones computed by
+  // ComputeInterpolatedGainCurve.
+  FRIEND_TEST_ALL_PREFIXES(GainController2InterpolatedGainCurve,
+                           CheckApproximationParams);
+
+  struct RegionLogger {
+    metrics::Histogram* identity_histogram;
+    metrics::Histogram* knee_histogram;
+    metrics::Histogram* limiter_histogram;
+    metrics::Histogram* saturation_histogram;
+
+    RegionLogger(const std::string& identity_histogram_name,
+                 const std::string& knee_histogram_name,
+                 const std::string& limiter_histogram_name,
+                 const std::string& saturation_histogram_name);
+
+    ~RegionLogger();
+
+    void LogRegionStats(const InterpolatedGainCurve::Stats& stats) const;
+  } region_logger_;
+
+  void UpdateStats(float input_level) const;
+
+  ApmDataDumper* const apm_data_dumper_;
+
+  static constexpr std::array<float, kInterpolatedGainCurveTotalPoints>
+      approximation_params_x_ = {
+          {30057.296875,    30148.986328125, 30240.67578125,  30424.052734375,
+           30607.4296875,   30790.806640625, 30974.18359375,  31157.560546875,
+           31340.939453125, 31524.31640625,  31707.693359375, 31891.0703125,
+           32074.447265625, 32257.82421875,  32441.201171875, 32624.580078125,
+           32807.95703125,  32991.33203125,  33174.7109375,   33358.08984375,
+           33541.46484375,  33724.84375,     33819.53515625,  34009.5390625,
+           34200.05859375,  34389.81640625,  34674.48828125,  35054.375,
+           35434.86328125,  35814.81640625,  36195.16796875,  36575.03125}};
+  static constexpr std::array<float, kInterpolatedGainCurveTotalPoints>
+      approximation_params_m_ = {
+          {-3.515235675877192989e-07, -1.050251626111275982e-06,
+           -2.085213736791047268e-06, -3.443004743530764244e-06,
+           -4.773849468620028347e-06, -6.077375928725814447e-06,
+           -7.353257842623861507e-06, -8.601219633419532329e-06,
+           -9.821013009059242904e-06, -1.101243378798244521e-05,
+           -1.217532644659513608e-05, -1.330956911260727793e-05,
+           -1.441507538402220234e-05, -1.549179251014720649e-05,
+           -1.653970684856176376e-05, -1.755882840370759368e-05,
+           -1.854918446042574942e-05, -1.951086778717581183e-05,
+           -2.044398024736437947e-05, -2.1348627342376858e-05,
+           -2.222496914328075945e-05, -2.265374678245279938e-05,
+           -2.242570917587727308e-05, -2.220122041762806475e-05,
+           -2.19802095671184361e-05,  -2.176260204578284174e-05,
+           -2.133731686626560986e-05, -2.092481918225530535e-05,
+           -2.052459603874012828e-05, -2.013615448959171772e-05,
+           -1.975903069251216948e-05, -1.939277899509761482e-05}};
+
+  static constexpr std::array<float, kInterpolatedGainCurveTotalPoints>
+      approximation_params_q_ = {
+          {1.010565876960754395, 1.031631827354431152, 1.062929749488830566,
+           1.104239225387573242, 1.144973039627075195, 1.185109615325927734,
+           1.224629044532775879, 1.263512492179870605, 1.301741957664489746,
+           1.339300632476806641, 1.376173257827758789, 1.412345528602600098,
+           1.447803974151611328, 1.482536554336547852, 1.516532182693481445,
+           1.549780607223510742, 1.582272171974182129, 1.613999366760253906,
+           1.644955039024353027, 1.675132393836975098, 1.704526185989379883,
+           1.718986630439758301, 1.711274504661560059, 1.703639745712280273,
+           1.696081161499023438, 1.688597679138183594, 1.673851132392883301,
+           1.659391283988952637, 1.645209431648254395, 1.631297469139099121,
+           1.617647409439086914, 1.604251742362976074}};
+
+  // Stats.
+  mutable Stats stats_;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(InterpolatedGainCurve);
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_INTERPOLATED_GAIN_CURVE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/interpolated_gain_curve_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,203 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/interpolated_gain_curve.h"
+
+#include <array>
+#include <type_traits>
+#include <vector>
+
+#include "api/array_view.h"
+#include "common_audio/include/audio_util.h"
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/agc2/compute_interpolated_gain_curve.h"
+#include "modules/audio_processing/agc2/limiter_db_gain_curve.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/gunit.h"
+
+namespace webrtc {
+namespace {
+
+constexpr double kLevelEpsilon = 1e-2 * kMaxAbsFloatS16Value;
+constexpr float kInterpolatedGainCurveTolerance = 1.f / 32768.f;
+ApmDataDumper apm_data_dumper(0);
+static_assert(std::is_trivially_destructible<LimiterDbGainCurve>::value, "");
+const LimiterDbGainCurve limiter;
+
+}  // namespace
+
+TEST(GainController2InterpolatedGainCurve, CreateUse) {
+  InterpolatedGainCurve igc(&apm_data_dumper, "");
+
+  const auto levels = test::LinSpace(
+      kLevelEpsilon, DbfsToFloatS16(limiter.max_input_level_db() + 1), 500);
+  for (const auto level : levels) {
+    EXPECT_GE(igc.LookUpGainToApply(level), 0.0f);
+  }
+}
+
+TEST(GainController2InterpolatedGainCurve, CheckValidOutput) {
+  InterpolatedGainCurve igc(&apm_data_dumper, "");
+
+  const auto levels = test::LinSpace(
+      kLevelEpsilon, limiter.max_input_level_linear() * 2.0, 500);
+  for (const auto level : levels) {
+    SCOPED_TRACE(std::to_string(level));
+    const float gain = igc.LookUpGainToApply(level);
+    EXPECT_LE(0.0f, gain);
+    EXPECT_LE(gain, 1.0f);
+  }
+}
+
+TEST(GainController2InterpolatedGainCurve, CheckMonotonicity) {
+  InterpolatedGainCurve igc(&apm_data_dumper, "");
+
+  const auto levels = test::LinSpace(
+      kLevelEpsilon, limiter.max_input_level_linear() + kLevelEpsilon + 0.5,
+      500);
+  float prev_gain = igc.LookUpGainToApply(0.0f);
+  for (const auto level : levels) {
+    const float gain = igc.LookUpGainToApply(level);
+    EXPECT_GE(prev_gain, gain);
+    prev_gain = gain;
+  }
+}
+
+TEST(GainController2InterpolatedGainCurve, CheckApproximation) {
+  InterpolatedGainCurve igc(&apm_data_dumper, "");
+
+  const auto levels = test::LinSpace(
+      kLevelEpsilon, limiter.max_input_level_linear() - kLevelEpsilon, 500);
+  for (const auto level : levels) {
+    SCOPED_TRACE(std::to_string(level));
+    EXPECT_LT(
+        std::fabs(limiter.GetGainLinear(level) - igc.LookUpGainToApply(level)),
+        kInterpolatedGainCurveTolerance);
+  }
+}
+
+TEST(GainController2InterpolatedGainCurve, CheckRegionBoundaries) {
+  InterpolatedGainCurve igc(&apm_data_dumper, "");
+
+  const std::vector<double> levels{
+      {kLevelEpsilon, limiter.knee_start_linear() + kLevelEpsilon,
+       limiter.limiter_start_linear() + kLevelEpsilon,
+       limiter.max_input_level_linear() + kLevelEpsilon}};
+  for (const auto level : levels) {
+    igc.LookUpGainToApply(level);
+  }
+
+  const auto stats = igc.get_stats();
+  EXPECT_EQ(1ul, stats.look_ups_identity_region);
+  EXPECT_EQ(1ul, stats.look_ups_knee_region);
+  EXPECT_EQ(1ul, stats.look_ups_limiter_region);
+  EXPECT_EQ(1ul, stats.look_ups_saturation_region);
+}
+
+TEST(GainController2InterpolatedGainCurve, CheckIdentityRegion) {
+  constexpr size_t kNumSteps = 10;
+  InterpolatedGainCurve igc(&apm_data_dumper, "");
+
+  const auto levels =
+      test::LinSpace(kLevelEpsilon, limiter.knee_start_linear(), kNumSteps);
+  for (const auto level : levels) {
+    SCOPED_TRACE(std::to_string(level));
+    EXPECT_EQ(1.0f, igc.LookUpGainToApply(level));
+  }
+
+  const auto stats = igc.get_stats();
+  EXPECT_EQ(kNumSteps - 1, stats.look_ups_identity_region);
+  EXPECT_EQ(1ul, stats.look_ups_knee_region);
+  EXPECT_EQ(0ul, stats.look_ups_limiter_region);
+  EXPECT_EQ(0ul, stats.look_ups_saturation_region);
+}
+
+TEST(GainController2InterpolatedGainCurve, CheckNoOverApproximationKnee) {
+  constexpr size_t kNumSteps = 10;
+  InterpolatedGainCurve igc(&apm_data_dumper, "");
+
+  const auto levels =
+      test::LinSpace(limiter.knee_start_linear() + kLevelEpsilon,
+                     limiter.limiter_start_linear(), kNumSteps);
+  for (const auto level : levels) {
+    SCOPED_TRACE(std::to_string(level));
+    // Small tolerance added (needed because comparing a float with a double).
+    EXPECT_LE(igc.LookUpGainToApply(level),
+              limiter.GetGainLinear(level) + 1e-7);
+  }
+
+  const auto stats = igc.get_stats();
+  EXPECT_EQ(0ul, stats.look_ups_identity_region);
+  EXPECT_EQ(kNumSteps - 1, stats.look_ups_knee_region);
+  EXPECT_EQ(1ul, stats.look_ups_limiter_region);
+  EXPECT_EQ(0ul, stats.look_ups_saturation_region);
+}
+
+TEST(GainController2InterpolatedGainCurve, CheckNoOverApproximationBeyondKnee) {
+  constexpr size_t kNumSteps = 10;
+  InterpolatedGainCurve igc(&apm_data_dumper, "");
+
+  const auto levels = test::LinSpace(
+      limiter.limiter_start_linear() + kLevelEpsilon,
+      limiter.max_input_level_linear() - kLevelEpsilon, kNumSteps);
+  for (const auto level : levels) {
+    SCOPED_TRACE(std::to_string(level));
+    // Small tolerance added (needed because comparing a float with a double).
+    EXPECT_LE(igc.LookUpGainToApply(level),
+              limiter.GetGainLinear(level) + 1e-7);
+  }
+
+  const auto stats = igc.get_stats();
+  EXPECT_EQ(0ul, stats.look_ups_identity_region);
+  EXPECT_EQ(0ul, stats.look_ups_knee_region);
+  EXPECT_EQ(kNumSteps, stats.look_ups_limiter_region);
+  EXPECT_EQ(0ul, stats.look_ups_saturation_region);
+}
+
+TEST(GainController2InterpolatedGainCurve,
+     CheckNoOverApproximationWithSaturation) {
+  constexpr size_t kNumSteps = 3;
+  InterpolatedGainCurve igc(&apm_data_dumper, "");
+
+  const auto levels = test::LinSpace(
+      limiter.max_input_level_linear() + kLevelEpsilon,
+      limiter.max_input_level_linear() + kLevelEpsilon + 0.5, kNumSteps);
+  for (const auto level : levels) {
+    SCOPED_TRACE(std::to_string(level));
+    EXPECT_LE(igc.LookUpGainToApply(level), limiter.GetGainLinear(level));
+  }
+
+  const auto stats = igc.get_stats();
+  EXPECT_EQ(0ul, stats.look_ups_identity_region);
+  EXPECT_EQ(0ul, stats.look_ups_knee_region);
+  EXPECT_EQ(0ul, stats.look_ups_limiter_region);
+  EXPECT_EQ(kNumSteps, stats.look_ups_saturation_region);
+}
+
+TEST(GainController2InterpolatedGainCurve, CheckApproximationParams) {
+  test::InterpolatedParameters parameters =
+      test::ComputeInterpolatedGainCurveApproximationParams();
+
+  InterpolatedGainCurve igc(&apm_data_dumper, "");
+
+  for (size_t i = 0; i < kInterpolatedGainCurveTotalPoints; ++i) {
+    // The tolerance levels are chosen to account for deviations due
+    // to computing with single precision floating point numbers.
+    EXPECT_NEAR(igc.approximation_params_x_[i],
+                parameters.computed_approximation_params_x[i], 0.9f);
+    EXPECT_NEAR(igc.approximation_params_m_[i],
+                parameters.computed_approximation_params_m[i], 0.00001f);
+    EXPECT_NEAR(igc.approximation_params_q_[i],
+                parameters.computed_approximation_params_q[i], 0.001f);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,152 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/limiter.h"
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_minmax.h"
+
+namespace webrtc {
+namespace {
+
+// This constant affects the way scaling factors are interpolated for the first
+// sub-frame of a frame. Only in the case in which the first sub-frame has an
+// estimated level which is greater than the that of the previous analyzed
+// sub-frame, linear interpolation is replaced with a power function which
+// reduces the chances of over-shooting (and hence saturation), however reducing
+// the fixed gain effectiveness.
+constexpr float kAttackFirstSubframeInterpolationPower = 8.f;
+
+void InterpolateFirstSubframe(float last_factor,
+                              float current_factor,
+                              rtc::ArrayView<float> subframe) {
+  const auto n = subframe.size();
+  constexpr auto p = kAttackFirstSubframeInterpolationPower;
+  for (size_t i = 0; i < n; ++i) {
+    subframe[i] = std::pow(1.f - i / n, p) * (last_factor - current_factor) +
+                  current_factor;
+  }
+}
+
+void ComputePerSampleSubframeFactors(
+    const std::array<float, kSubFramesInFrame + 1>& scaling_factors,
+    size_t samples_per_channel,
+    rtc::ArrayView<float> per_sample_scaling_factors) {
+  const size_t num_subframes = scaling_factors.size() - 1;
+  const size_t subframe_size =
+      rtc::CheckedDivExact(samples_per_channel, num_subframes);
+
+  // Handle first sub-frame differently in case of attack.
+  const bool is_attack = scaling_factors[0] > scaling_factors[1];
+  if (is_attack) {
+    InterpolateFirstSubframe(
+        scaling_factors[0], scaling_factors[1],
+        rtc::ArrayView<float>(
+            per_sample_scaling_factors.subview(0, subframe_size)));
+  }
+
+  for (size_t i = is_attack ? 1 : 0; i < num_subframes; ++i) {
+    const size_t subframe_start = i * subframe_size;
+    const float scaling_start = scaling_factors[i];
+    const float scaling_end = scaling_factors[i + 1];
+    const float scaling_diff = (scaling_end - scaling_start) / subframe_size;
+    for (size_t j = 0; j < subframe_size; ++j) {
+      per_sample_scaling_factors[subframe_start + j] =
+          scaling_start + scaling_diff * j;
+    }
+  }
+}
+
+void ScaleSamples(rtc::ArrayView<const float> per_sample_scaling_factors,
+                  AudioFrameView<float> signal) {
+  const size_t samples_per_channel = signal.samples_per_channel();
+  RTC_DCHECK_EQ(samples_per_channel, per_sample_scaling_factors.size());
+  for (size_t i = 0; i < signal.num_channels(); ++i) {
+    auto channel = signal.channel(i);
+    for (size_t j = 0; j < samples_per_channel; ++j) {
+      channel[j] = rtc::SafeClamp(channel[j] * per_sample_scaling_factors[j],
+                                  kMinFloatS16Value, kMaxFloatS16Value);
+    }
+  }
+}
+
+void CheckLimiterSampleRate(size_t sample_rate_hz) {
+  // Check that per_sample_scaling_factors_ is large enough.
+  RTC_DCHECK_LE(sample_rate_hz,
+                kMaximalNumberOfSamplesPerChannel * 1000 / kFrameDurationMs);
+}
+
+}  // namespace
+
+Limiter::Limiter(size_t sample_rate_hz,
+                 ApmDataDumper* apm_data_dumper,
+                 const std::string& histogram_name)
+    : interp_gain_curve_(apm_data_dumper, histogram_name),
+      level_estimator_(sample_rate_hz, apm_data_dumper),
+      apm_data_dumper_(apm_data_dumper) {
+  CheckLimiterSampleRate(sample_rate_hz);
+}
+
+Limiter::~Limiter() = default;
+
+void Limiter::Process(AudioFrameView<float> signal) {
+  const auto level_estimate = level_estimator_.ComputeLevel(signal);
+
+  RTC_DCHECK_EQ(level_estimate.size() + 1, scaling_factors_.size());
+  scaling_factors_[0] = last_scaling_factor_;
+  std::transform(level_estimate.begin(), level_estimate.end(),
+                 scaling_factors_.begin() + 1, [this](float x) {
+                   return interp_gain_curve_.LookUpGainToApply(x);
+                 });
+
+  const size_t samples_per_channel = signal.samples_per_channel();
+  RTC_DCHECK_LE(samples_per_channel, kMaximalNumberOfSamplesPerChannel);
+
+  auto per_sample_scaling_factors = rtc::ArrayView<float>(
+      &per_sample_scaling_factors_[0], samples_per_channel);
+  ComputePerSampleSubframeFactors(scaling_factors_, samples_per_channel,
+                                  per_sample_scaling_factors);
+  ScaleSamples(per_sample_scaling_factors, signal);
+
+  last_scaling_factor_ = scaling_factors_.back();
+
+  // Dump data for debug.
+  apm_data_dumper_->DumpRaw("agc2_limiter_last_scaling_factor",
+                            last_scaling_factor_);
+  apm_data_dumper_->DumpRaw(
+      "agc2_limiter_region",
+      static_cast<int>(interp_gain_curve_.get_stats().region));
+}
+
+InterpolatedGainCurve::Stats Limiter::GetGainCurveStats() const {
+  return interp_gain_curve_.get_stats();
+}
+
+void Limiter::SetSampleRate(size_t sample_rate_hz) {
+  CheckLimiterSampleRate(sample_rate_hz);
+  level_estimator_.SetSampleRate(sample_rate_hz);
+}
+
+void Limiter::Reset() {
+  level_estimator_.Reset();
+}
+
+float Limiter::LastAudioLevel() const {
+  return level_estimator_.LastAudioLevel();
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,138 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/limiter_db_gain_curve.h"
+
+#include <cmath>
+
+#include "common_audio/include/audio_util.h"
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+double ComputeKneeStart(double max_input_level_db,
+                        double knee_smoothness_db,
+                        double compression_ratio) {
+  RTC_CHECK_LT((compression_ratio - 1.0) * knee_smoothness_db /
+                   (2.0 * compression_ratio),
+               max_input_level_db);
+  return -knee_smoothness_db / 2.0 -
+         max_input_level_db / (compression_ratio - 1.0);
+}
+
+std::array<double, 3> ComputeKneeRegionPolynomial(double knee_start_dbfs,
+                                                  double knee_smoothness_db,
+                                                  double compression_ratio) {
+  const double a = (1.0 - compression_ratio) /
+                   (2.0 * knee_smoothness_db * compression_ratio);
+  const double b = 1.0 - 2.0 * a * knee_start_dbfs;
+  const double c = a * knee_start_dbfs * knee_start_dbfs;
+  return {{a, b, c}};
+}
+
+double ComputeLimiterD1(double max_input_level_db, double compression_ratio) {
+  return (std::pow(10.0, -max_input_level_db / (20.0 * compression_ratio)) *
+          (1.0 - compression_ratio) / compression_ratio) /
+         kMaxAbsFloatS16Value;
+}
+
+constexpr double ComputeLimiterD2(double compression_ratio) {
+  return (1.0 - 2.0 * compression_ratio) / compression_ratio;
+}
+
+double ComputeLimiterI2(double max_input_level_db,
+                        double compression_ratio,
+                        double gain_curve_limiter_i1) {
+  RTC_CHECK_NE(gain_curve_limiter_i1, 0.f);
+  return std::pow(10.0, -max_input_level_db / (20.0 * compression_ratio)) /
+         gain_curve_limiter_i1 /
+         std::pow(kMaxAbsFloatS16Value, gain_curve_limiter_i1 - 1);
+}
+
+}  // namespace
+
+LimiterDbGainCurve::LimiterDbGainCurve()
+    : max_input_level_linear_(DbfsToFloatS16(max_input_level_db_)),
+      knee_start_dbfs_(ComputeKneeStart(max_input_level_db_,
+                                        knee_smoothness_db_,
+                                        compression_ratio_)),
+      knee_start_linear_(DbfsToFloatS16(knee_start_dbfs_)),
+      limiter_start_dbfs_(knee_start_dbfs_ + knee_smoothness_db_),
+      limiter_start_linear_(DbfsToFloatS16(limiter_start_dbfs_)),
+      knee_region_polynomial_(ComputeKneeRegionPolynomial(knee_start_dbfs_,
+                                                          knee_smoothness_db_,
+                                                          compression_ratio_)),
+      gain_curve_limiter_d1_(
+          ComputeLimiterD1(max_input_level_db_, compression_ratio_)),
+      gain_curve_limiter_d2_(ComputeLimiterD2(compression_ratio_)),
+      gain_curve_limiter_i1_(1.0 / compression_ratio_),
+      gain_curve_limiter_i2_(ComputeLimiterI2(max_input_level_db_,
+                                              compression_ratio_,
+                                              gain_curve_limiter_i1_)) {
+  static_assert(knee_smoothness_db_ > 0.0f, "");
+  static_assert(compression_ratio_ > 1.0f, "");
+  RTC_CHECK_GE(max_input_level_db_, knee_start_dbfs_ + knee_smoothness_db_);
+}
+
+constexpr double LimiterDbGainCurve::max_input_level_db_;
+constexpr double LimiterDbGainCurve::knee_smoothness_db_;
+constexpr double LimiterDbGainCurve::compression_ratio_;
+
+double LimiterDbGainCurve::GetOutputLevelDbfs(double input_level_dbfs) const {
+  if (input_level_dbfs < knee_start_dbfs_) {
+    return input_level_dbfs;
+  } else if (input_level_dbfs < limiter_start_dbfs_) {
+    return GetKneeRegionOutputLevelDbfs(input_level_dbfs);
+  }
+  return GetCompressorRegionOutputLevelDbfs(input_level_dbfs);
+}
+
+double LimiterDbGainCurve::GetGainLinear(double input_level_linear) const {
+  if (input_level_linear < knee_start_linear_) {
+    return 1.0;
+  }
+  return DbfsToFloatS16(
+             GetOutputLevelDbfs(FloatS16ToDbfs(input_level_linear))) /
+         input_level_linear;
+}
+
+// Computes the first derivative of GetGainLinear() in |x|.
+double LimiterDbGainCurve::GetGainFirstDerivativeLinear(double x) const {
+  // Beyond-knee region only.
+  RTC_CHECK_GE(x, limiter_start_linear_ - 1e-7 * kMaxAbsFloatS16Value);
+  return gain_curve_limiter_d1_ *
+         std::pow(x / kMaxAbsFloatS16Value, gain_curve_limiter_d2_);
+}
+
+// Computes the integral of GetGainLinear() in the range [x0, x1].
+double LimiterDbGainCurve::GetGainIntegralLinear(double x0, double x1) const {
+  RTC_CHECK_LE(x0, x1);                     // Valid interval.
+  RTC_CHECK_GE(x0, limiter_start_linear_);  // Beyond-knee region only.
+  auto limiter_integral = [this](const double& x) {
+    return gain_curve_limiter_i2_ * std::pow(x, gain_curve_limiter_i1_);
+  };
+  return limiter_integral(x1) - limiter_integral(x0);
+}
+
+double LimiterDbGainCurve::GetKneeRegionOutputLevelDbfs(
+    double input_level_dbfs) const {
+  return knee_region_polynomial_[0] * input_level_dbfs * input_level_dbfs +
+         knee_region_polynomial_[1] * input_level_dbfs +
+         knee_region_polynomial_[2];
+}
+
+double LimiterDbGainCurve::GetCompressorRegionOutputLevelDbfs(
+    double input_level_dbfs) const {
+  return (input_level_dbfs - max_input_level_db_) / compression_ratio_;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_LIMITER_DB_GAIN_CURVE_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_LIMITER_DB_GAIN_CURVE_H_
+
+#include <array>
+
+#include "modules/audio_processing/agc2/agc2_testing_common.h"
+
+namespace webrtc {
+
+// A class for computing a limiter gain curve (in dB scale) given a set of
+// hard-coded parameters (namely, kLimiterDbGainCurveMaxInputLevelDbFs,
+// kLimiterDbGainCurveKneeSmoothnessDb, and
+// kLimiterDbGainCurveCompressionRatio). The generated curve consists of four
+// regions: identity (linear), knee (quadratic polynomial), compression
+// (linear), saturation (linear). The aforementioned constants are used to shape
+// the different regions.
+class LimiterDbGainCurve {
+ public:
+  LimiterDbGainCurve();
+
+  double max_input_level_db() const { return max_input_level_db_; }
+  double max_input_level_linear() const { return max_input_level_linear_; }
+  double knee_start_linear() const { return knee_start_linear_; }
+  double limiter_start_linear() const { return limiter_start_linear_; }
+
+  // These methods can be marked 'constexpr' in C++ 14.
+  double GetOutputLevelDbfs(double input_level_dbfs) const;
+  double GetGainLinear(double input_level_linear) const;
+  double GetGainFirstDerivativeLinear(double x) const;
+  double GetGainIntegralLinear(double x0, double x1) const;
+
+ private:
+  double GetKneeRegionOutputLevelDbfs(double input_level_dbfs) const;
+  double GetCompressorRegionOutputLevelDbfs(double input_level_dbfs) const;
+
+  static constexpr double max_input_level_db_ = test::kLimiterMaxInputLevelDbFs;
+  static constexpr double knee_smoothness_db_ = test::kLimiterKneeSmoothnessDb;
+  static constexpr double compression_ratio_ = test::kLimiterCompressionRatio;
+
+  const double max_input_level_linear_;
+
+  // Do not modify signal with level <= knee_start_dbfs_.
+  const double knee_start_dbfs_;
+  const double knee_start_linear_;
+
+  // The upper end of the knee region, which is between knee_start_dbfs_ and
+  // limiter_start_dbfs_.
+  const double limiter_start_dbfs_;
+  const double limiter_start_linear_;
+
+  // Coefficients {a, b, c} of the knee region polynomial
+  // ax^2 + bx + c in the DB scale.
+  const std::array<double, 3> knee_region_polynomial_;
+
+  // Parameters for the computation of the first derivative of GetGainLinear().
+  const double gain_curve_limiter_d1_;
+  const double gain_curve_limiter_d2_;
+
+  // Parameters for the computation of the integral of GetGainLinear().
+  const double gain_curve_limiter_i1_;
+  const double gain_curve_limiter_i2_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_LIMITER_DB_GAIN_CURVE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_db_gain_curve_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/limiter_db_gain_curve.h"
+
+#include "rtc_base/gunit.h"
+
+namespace webrtc {
+
+TEST(FixedDigitalGainController2Limiter, ConstructDestruct) {
+  LimiterDbGainCurve l;
+}
+
+TEST(FixedDigitalGainController2Limiter, GainCurveShouldBeMonotone) {
+  LimiterDbGainCurve l;
+  float last_output_level = 0.f;
+  bool has_last_output_level = false;
+  for (float level = -90.f; level <= l.max_input_level_db(); level += 0.5f) {
+    const float current_output_level = l.GetOutputLevelDbfs(level);
+    if (!has_last_output_level) {
+      last_output_level = current_output_level;
+      has_last_output_level = true;
+    }
+    EXPECT_LE(last_output_level, current_output_level);
+    last_output_level = current_output_level;
+  }
+}
+
+TEST(FixedDigitalGainController2Limiter, GainCurveShouldBeContinuous) {
+  LimiterDbGainCurve l;
+  float last_output_level = 0.f;
+  bool has_last_output_level = false;
+  constexpr float kMaxDelta = 0.5f;
+  for (float level = -90.f; level <= l.max_input_level_db(); level += 0.5f) {
+    const float current_output_level = l.GetOutputLevelDbfs(level);
+    if (!has_last_output_level) {
+      last_output_level = current_output_level;
+      has_last_output_level = true;
+    }
+    EXPECT_LE(current_output_level, last_output_level + kMaxDelta);
+    last_output_level = current_output_level;
+  }
+}
+
+TEST(FixedDigitalGainController2Limiter, OutputGainShouldBeLessThanFullScale) {
+  LimiterDbGainCurve l;
+  for (float level = -90.f; level <= l.max_input_level_db(); level += 0.5f) {
+    const float current_output_level = l.GetOutputLevelDbfs(level);
+    EXPECT_LE(current_output_level, 0.f);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_LIMITER_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_LIMITER_H_
+
+#include <string>
+#include <vector>
+
+#include "modules/audio_processing/agc2/fixed_digital_level_estimator.h"
+#include "modules/audio_processing/agc2/interpolated_gain_curve.h"
+#include "modules/audio_processing/include/audio_frame_view.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+class ApmDataDumper;
+
+class Limiter {
+ public:
+  Limiter(size_t sample_rate_hz,
+          ApmDataDumper* apm_data_dumper,
+          const std::string& histogram_name_prefix);
+  Limiter(const Limiter& limiter) = delete;
+  Limiter& operator=(const Limiter& limiter) = delete;
+  ~Limiter();
+
+  // Applies limiter and hard-clipping to |signal|.
+  void Process(AudioFrameView<float> signal);
+  InterpolatedGainCurve::Stats GetGainCurveStats() const;
+
+  // Supported rates must be
+  // * supported by FixedDigitalLevelEstimator
+  // * below kMaximalNumberOfSamplesPerChannel*1000/kFrameDurationMs
+  //   so that samples_per_channel fit in the
+  //   per_sample_scaling_factors_ array.
+  void SetSampleRate(size_t sample_rate_hz);
+
+  // Resets the internal state.
+  void Reset();
+
+  float LastAudioLevel() const;
+
+ private:
+  const InterpolatedGainCurve interp_gain_curve_;
+  FixedDigitalLevelEstimator level_estimator_;
+  ApmDataDumper* const apm_data_dumper_ = nullptr;
+
+  // Work array containing the sub-frame scaling factors to be interpolated.
+  std::array<float, kSubFramesInFrame + 1> scaling_factors_ = {};
+  std::array<float, kMaximalNumberOfSamplesPerChannel>
+      per_sample_scaling_factors_ = {};
+  float last_scaling_factor_ = 1.f;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_LIMITER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/limiter_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/limiter.h"
+
+#include "common_audio/include/audio_util.h"
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/agc2/agc2_testing_common.h"
+#include "modules/audio_processing/agc2/vector_float_frame.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/gunit.h"
+
+namespace webrtc {
+
+TEST(Limiter, LimiterShouldConstructAndRun) {
+  const int sample_rate_hz = 48000;
+  ApmDataDumper apm_data_dumper(0);
+
+  Limiter limiter(sample_rate_hz, &apm_data_dumper, "");
+
+  VectorFloatFrame vectors_with_float_frame(1, sample_rate_hz / 100,
+                                            kMaxAbsFloatS16Value);
+  limiter.Process(vectors_with_float_frame.float_frame_view());
+}
+
+TEST(Limiter, OutputVolumeAboveThreshold) {
+  const int sample_rate_hz = 48000;
+  const float input_level =
+      (kMaxAbsFloatS16Value + DbfsToFloatS16(test::kLimiterMaxInputLevelDbFs)) /
+      2.f;
+  ApmDataDumper apm_data_dumper(0);
+
+  Limiter limiter(sample_rate_hz, &apm_data_dumper, "");
+
+  // Give the level estimator time to adapt.
+  for (int i = 0; i < 5; ++i) {
+    VectorFloatFrame vectors_with_float_frame(1, sample_rate_hz / 100,
+                                              input_level);
+    limiter.Process(vectors_with_float_frame.float_frame_view());
+  }
+
+  VectorFloatFrame vectors_with_float_frame(1, sample_rate_hz / 100,
+                                            input_level);
+  limiter.Process(vectors_with_float_frame.float_frame_view());
+  rtc::ArrayView<const float> channel =
+      vectors_with_float_frame.float_frame_view().channel(0);
+
+  for (const auto& sample : channel) {
+    EXPECT_LT(0.9f * kMaxAbsFloatS16Value, sample);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,260 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/noise_level_estimator.h"
+
+#include <stddef.h>
+
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+
+#include "api/array_view.h"
+#include "common_audio/include/audio_util.h"
+#include "modules/audio_processing/agc2/signal_classifier.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+constexpr int kFramesPerSecond = 100;
+
+float FrameEnergy(const AudioFrameView<const float>& audio) {
+  float energy = 0.0f;
+  for (size_t k = 0; k < audio.num_channels(); ++k) {
+    float channel_energy =
+        std::accumulate(audio.channel(k).begin(), audio.channel(k).end(), 0.0f,
+                        [](float a, float b) -> float { return a + b * b; });
+    energy = std::max(channel_energy, energy);
+  }
+  return energy;
+}
+
+float EnergyToDbfs(float signal_energy, size_t num_samples) {
+  const float rms = std::sqrt(signal_energy / num_samples);
+  return FloatS16ToDbfs(rms);
+}
+
+class NoiseLevelEstimatorImpl : public NoiseLevelEstimator {
+ public:
+  NoiseLevelEstimatorImpl(ApmDataDumper* data_dumper)
+      : data_dumper_(data_dumper), signal_classifier_(data_dumper) {
+    // Initially assume that 48 kHz will be used. `Analyze()` will detect the
+    // used sample rate and call `Initialize()` again if needed.
+    Initialize(/*sample_rate_hz=*/48000);
+  }
+  NoiseLevelEstimatorImpl(const NoiseLevelEstimatorImpl&) = delete;
+  NoiseLevelEstimatorImpl& operator=(const NoiseLevelEstimatorImpl&) = delete;
+  ~NoiseLevelEstimatorImpl() = default;
+
+  float Analyze(const AudioFrameView<const float>& frame) override {
+    data_dumper_->DumpRaw("agc2_noise_level_estimator_hold_counter",
+                          noise_energy_hold_counter_);
+    const int sample_rate_hz =
+        static_cast<int>(frame.samples_per_channel() * kFramesPerSecond);
+    if (sample_rate_hz != sample_rate_hz_) {
+      Initialize(sample_rate_hz);
+    }
+    const float frame_energy = FrameEnergy(frame);
+    if (frame_energy <= 0.f) {
+      RTC_DCHECK_GE(frame_energy, 0.f);
+      data_dumper_->DumpRaw("agc2_noise_level_estimator_signal_type", -1);
+      return EnergyToDbfs(noise_energy_, frame.samples_per_channel());
+    }
+
+    if (first_update_) {
+      // Initialize the noise energy to the frame energy.
+      first_update_ = false;
+      data_dumper_->DumpRaw("agc2_noise_level_estimator_signal_type", -1);
+      noise_energy_ = std::max(frame_energy, min_noise_energy_);
+      return EnergyToDbfs(noise_energy_, frame.samples_per_channel());
+    }
+
+    const SignalClassifier::SignalType signal_type =
+        signal_classifier_.Analyze(frame.channel(0));
+    data_dumper_->DumpRaw("agc2_noise_level_estimator_signal_type",
+                          static_cast<int>(signal_type));
+
+    // Update the noise estimate in a minimum statistics-type manner.
+    if (signal_type == SignalClassifier::SignalType::kStationary) {
+      if (frame_energy > noise_energy_) {
+        // Leak the estimate upwards towards the frame energy if no recent
+        // downward update.
+        noise_energy_hold_counter_ =
+            std::max(noise_energy_hold_counter_ - 1, 0);
+
+        if (noise_energy_hold_counter_ == 0) {
+          constexpr float kMaxNoiseEnergyFactor = 1.01f;
+          noise_energy_ =
+              std::min(noise_energy_ * kMaxNoiseEnergyFactor, frame_energy);
+        }
+      } else {
+        // Update smoothly downwards with a limited maximum update magnitude.
+        constexpr float kMinNoiseEnergyFactor = 0.9f;
+        constexpr float kNoiseEnergyDeltaFactor = 0.05f;
+        noise_energy_ =
+            std::max(noise_energy_ * kMinNoiseEnergyFactor,
+                     noise_energy_ - kNoiseEnergyDeltaFactor *
+                                         (noise_energy_ - frame_energy));
+        // Prevent an energy increase for the next 10 seconds.
+        constexpr int kNumFramesToEnergyIncreaseAllowed = 1000;
+        noise_energy_hold_counter_ = kNumFramesToEnergyIncreaseAllowed;
+      }
+    } else {
+      // TODO(bugs.webrtc.org/7494): Remove to not forget the estimated level.
+      // For a non-stationary signal, leak the estimate downwards in order to
+      // avoid estimate locking due to incorrect signal classification.
+      noise_energy_ = noise_energy_ * 0.99f;
+    }
+
+    // Ensure a minimum of the estimate.
+    noise_energy_ = std::max(noise_energy_, min_noise_energy_);
+    return EnergyToDbfs(noise_energy_, frame.samples_per_channel());
+  }
+
+ private:
+  void Initialize(int sample_rate_hz) {
+    sample_rate_hz_ = sample_rate_hz;
+    noise_energy_ = 1.0f;
+    first_update_ = true;
+    // Initialize the minimum noise energy to -84 dBFS.
+    min_noise_energy_ = sample_rate_hz * 2.0f * 2.0f / kFramesPerSecond;
+    noise_energy_hold_counter_ = 0;
+    signal_classifier_.Initialize(sample_rate_hz);
+  }
+
+  ApmDataDumper* const data_dumper_;
+  int sample_rate_hz_;
+  float min_noise_energy_;
+  bool first_update_;
+  float noise_energy_;
+  int noise_energy_hold_counter_;
+  SignalClassifier signal_classifier_;
+};
+
+// Updates the noise floor with instant decay and slow attack. This tuning is
+// specific for AGC2, so that (i) it can promptly increase the gain if the noise
+// floor drops (instant decay) and (ii) in case of music or fast speech, due to
+// which the noise floor can be overestimated, the gain reduction is slowed
+// down.
+float SmoothNoiseFloorEstimate(float current_estimate, float new_estimate) {
+  constexpr float kAttack = 0.5f;
+  if (current_estimate < new_estimate) {
+    // Attack phase.
+    return kAttack * new_estimate + (1.0f - kAttack) * current_estimate;
+  }
+  // Instant attack.
+  return new_estimate;
+}
+
+class NoiseFloorEstimator : public NoiseLevelEstimator {
+ public:
+  // Update the noise floor every 5 seconds.
+  static constexpr int kUpdatePeriodNumFrames = 500;
+  static_assert(kUpdatePeriodNumFrames >= 200,
+                "A too small value may cause noise level overestimation.");
+  static_assert(kUpdatePeriodNumFrames <= 1500,
+                "A too large value may make AGC2 slow at reacting to increased "
+                "noise levels.");
+
+  NoiseFloorEstimator(ApmDataDumper* data_dumper) : data_dumper_(data_dumper) {
+    // Initially assume that 48 kHz will be used. `Analyze()` will detect the
+    // used sample rate and call `Initialize()` again if needed.
+    Initialize(/*sample_rate_hz=*/48000);
+  }
+  NoiseFloorEstimator(const NoiseFloorEstimator&) = delete;
+  NoiseFloorEstimator& operator=(const NoiseFloorEstimator&) = delete;
+  ~NoiseFloorEstimator() = default;
+
+  float Analyze(const AudioFrameView<const float>& frame) override {
+    // Detect sample rate changes.
+    const int sample_rate_hz =
+        static_cast<int>(frame.samples_per_channel() * kFramesPerSecond);
+    if (sample_rate_hz != sample_rate_hz_) {
+      Initialize(sample_rate_hz);
+    }
+
+    const float frame_energy = FrameEnergy(frame);
+    if (frame_energy <= min_noise_energy_) {
+      // Ignore frames when muted or below the minimum measurable energy.
+      data_dumper_->DumpRaw("agc2_noise_floor_estimator_preliminary_level",
+                            noise_energy_);
+      return EnergyToDbfs(noise_energy_, frame.samples_per_channel());
+    }
+
+    if (preliminary_noise_energy_set_) {
+      preliminary_noise_energy_ =
+          std::min(preliminary_noise_energy_, frame_energy);
+    } else {
+      preliminary_noise_energy_ = frame_energy;
+      preliminary_noise_energy_set_ = true;
+    }
+    data_dumper_->DumpRaw("agc2_noise_floor_estimator_preliminary_level",
+                          preliminary_noise_energy_);
+
+    if (counter_ == 0) {
+      // Full period observed.
+      first_period_ = false;
+      // Update the estimated noise floor energy with the preliminary
+      // estimation.
+      noise_energy_ = SmoothNoiseFloorEstimate(
+          /*current_estimate=*/noise_energy_,
+          /*new_estimate=*/preliminary_noise_energy_);
+      // Reset for a new observation period.
+      counter_ = kUpdatePeriodNumFrames;
+      preliminary_noise_energy_set_ = false;
+    } else if (first_period_) {
+      // While analyzing the signal during the initial period, continuously
+      // update the estimated noise energy, which is monotonic.
+      noise_energy_ = preliminary_noise_energy_;
+      counter_--;
+    } else {
+      // During the observation period it's only allowed to lower the energy.
+      noise_energy_ = std::min(noise_energy_, preliminary_noise_energy_);
+      counter_--;
+    }
+    return EnergyToDbfs(noise_energy_, frame.samples_per_channel());
+  }
+
+ private:
+  void Initialize(int sample_rate_hz) {
+    sample_rate_hz_ = sample_rate_hz;
+    first_period_ = true;
+    preliminary_noise_energy_set_ = false;
+    // Initialize the minimum noise energy to -84 dBFS.
+    min_noise_energy_ = sample_rate_hz * 2.0f * 2.0f / kFramesPerSecond;
+    preliminary_noise_energy_ = min_noise_energy_;
+    noise_energy_ = min_noise_energy_;
+    counter_ = kUpdatePeriodNumFrames;
+  }
+
+  ApmDataDumper* const data_dumper_;
+  int sample_rate_hz_;
+  float min_noise_energy_;
+  bool first_period_;
+  bool preliminary_noise_energy_set_;
+  float preliminary_noise_energy_;
+  float noise_energy_;
+  int counter_;
+};
+
+}  // namespace
+
+std::unique_ptr<NoiseLevelEstimator> CreateStationaryNoiseEstimator(
+    ApmDataDumper* data_dumper) {
+  return std::make_unique<NoiseLevelEstimatorImpl>(data_dumper);
+}
+
+std::unique_ptr<NoiseLevelEstimator> CreateNoiseFloorEstimator(
+    ApmDataDumper* data_dumper) {
+  return std::make_unique<NoiseFloorEstimator>(data_dumper);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_NOISE_LEVEL_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_NOISE_LEVEL_ESTIMATOR_H_
+
+#include <memory>
+
+#include "modules/audio_processing/include/audio_frame_view.h"
+
+namespace webrtc {
+class ApmDataDumper;
+
+// Noise level estimator interface.
+class NoiseLevelEstimator {
+ public:
+  virtual ~NoiseLevelEstimator() = default;
+  // Analyzes a 10 ms `frame`, updates the noise level estimation and returns
+  // the value for the latter in dBFS.
+  virtual float Analyze(const AudioFrameView<const float>& frame) = 0;
+};
+
+// Creates a noise level estimator based on stationarity detection.
+std::unique_ptr<NoiseLevelEstimator> CreateStationaryNoiseEstimator(
+    ApmDataDumper* data_dumper);
+
+// Creates a noise level estimator based on noise floor detection.
+std::unique_ptr<NoiseLevelEstimator> CreateNoiseFloorEstimator(
+    ApmDataDumper* data_dumper);
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_NOISE_LEVEL_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_level_estimator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,136 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/noise_level_estimator.h"
+
+#include <array>
+#include <cmath>
+#include <functional>
+#include <limits>
+
+#include "api/function_view.h"
+#include "modules/audio_processing/agc2/agc2_testing_common.h"
+#include "modules/audio_processing/agc2/vector_float_frame.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/gunit.h"
+
+namespace webrtc {
+namespace {
+
+constexpr int kNumIterations = 200;
+constexpr int kFramesPerSecond = 100;
+
+// Runs the noise estimator on audio generated by 'sample_generator'
+// for kNumIterations. Returns the last noise level estimate.
+float RunEstimator(rtc::FunctionView<float()> sample_generator,
+                   NoiseLevelEstimator& estimator,
+                   int sample_rate_hz) {
+  const int samples_per_channel =
+      rtc::CheckedDivExact(sample_rate_hz, kFramesPerSecond);
+  VectorFloatFrame signal(1, samples_per_channel, 0.0f);
+  for (int i = 0; i < kNumIterations; ++i) {
+    AudioFrameView<float> frame_view = signal.float_frame_view();
+    for (int j = 0; j < samples_per_channel; ++j) {
+      frame_view.channel(0)[j] = sample_generator();
+    }
+    estimator.Analyze(frame_view);
+  }
+  return estimator.Analyze(signal.float_frame_view());
+}
+
+class NoiseEstimatorParametrization : public ::testing::TestWithParam<int> {
+ protected:
+  int sample_rate_hz() const { return GetParam(); }
+};
+
+// White random noise is stationary, but does not trigger the detector
+// every frame due to the randomness.
+TEST_P(NoiseEstimatorParametrization, StationaryNoiseEstimatorWithRandomNoise) {
+  ApmDataDumper data_dumper(0);
+  auto estimator = CreateStationaryNoiseEstimator(&data_dumper);
+
+  test::WhiteNoiseGenerator gen(/*min_amplitude=*/test::kMinS16,
+                                /*max_amplitude=*/test::kMaxS16);
+  const float noise_level_dbfs =
+      RunEstimator(gen, *estimator, sample_rate_hz());
+  EXPECT_NEAR(noise_level_dbfs, -5.5f, 1.0f);
+}
+
+// Sine curves are (very) stationary. They trigger the detector all
+// the time. Except for a few initial frames.
+TEST_P(NoiseEstimatorParametrization, StationaryNoiseEstimatorWithSineTone) {
+  ApmDataDumper data_dumper(0);
+  auto estimator = CreateStationaryNoiseEstimator(&data_dumper);
+
+  test::SineGenerator gen(/*amplitude=*/test::kMaxS16, /*frequency_hz=*/600.0f,
+                          sample_rate_hz());
+  const float noise_level_dbfs =
+      RunEstimator(gen, *estimator, sample_rate_hz());
+  EXPECT_NEAR(noise_level_dbfs, -3.0f, 1.0f);
+}
+
+// Pulses are transient if they are far enough apart. They shouldn't
+// trigger the noise detector.
+TEST_P(NoiseEstimatorParametrization, StationaryNoiseEstimatorWithPulseTone) {
+  ApmDataDumper data_dumper(0);
+  auto estimator = CreateStationaryNoiseEstimator(&data_dumper);
+
+  test::PulseGenerator gen(/*pulse_amplitude=*/test::kMaxS16,
+                           /*no_pulse_amplitude=*/10.0f, /*frequency_hz=*/20.0f,
+                           sample_rate_hz());
+  const int noise_level_dbfs = RunEstimator(gen, *estimator, sample_rate_hz());
+  EXPECT_NEAR(noise_level_dbfs, -79.0f, 1.0f);
+}
+
+// Checks that full scale white noise maps to about -5.5 dBFS.
+TEST_P(NoiseEstimatorParametrization, NoiseFloorEstimatorWithRandomNoise) {
+  ApmDataDumper data_dumper(0);
+  auto estimator = CreateNoiseFloorEstimator(&data_dumper);
+
+  test::WhiteNoiseGenerator gen(/*min_amplitude=*/test::kMinS16,
+                                /*max_amplitude=*/test::kMaxS16);
+  const float noise_level_dbfs =
+      RunEstimator(gen, *estimator, sample_rate_hz());
+  EXPECT_NEAR(noise_level_dbfs, -5.5f, 0.5f);
+}
+
+// Checks that a full scale sine wave maps to about -3 dBFS.
+TEST_P(NoiseEstimatorParametrization, NoiseFloorEstimatorWithSineTone) {
+  ApmDataDumper data_dumper(0);
+  auto estimator = CreateNoiseFloorEstimator(&data_dumper);
+
+  test::SineGenerator gen(/*amplitude=*/test::kMaxS16, /*frequency_hz=*/600.0f,
+                          sample_rate_hz());
+  const float noise_level_dbfs =
+      RunEstimator(gen, *estimator, sample_rate_hz());
+  EXPECT_NEAR(noise_level_dbfs, -3.0f, 0.1f);
+}
+
+// Check that sufficiently spaced periodic pulses do not raise the estimated
+// noise floor, which is determined by the amplitude of the non-pulse samples.
+TEST_P(NoiseEstimatorParametrization, NoiseFloorEstimatorWithPulseTone) {
+  ApmDataDumper data_dumper(0);
+  auto estimator = CreateNoiseFloorEstimator(&data_dumper);
+
+  constexpr float kNoPulseAmplitude = 10.0f;
+  test::PulseGenerator gen(/*pulse_amplitude=*/test::kMaxS16, kNoPulseAmplitude,
+                           /*frequency_hz=*/20.0f, sample_rate_hz());
+  const int noise_level_dbfs = RunEstimator(gen, *estimator, sample_rate_hz());
+  const float expected_noise_floor_dbfs =
+      20.0f * std::log10f(kNoPulseAmplitude / test::kMaxS16);
+  EXPECT_NEAR(noise_level_dbfs, expected_noise_floor_dbfs, 0.5f);
+}
+
+INSTANTIATE_TEST_SUITE_P(GainController2NoiseEstimator,
+                         NoiseEstimatorParametrization,
+                         ::testing::Values(8000, 16000, 32000, 48000));
+
+}  // namespace
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_spectrum_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_spectrum_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_spectrum_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_spectrum_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/noise_spectrum_estimator.h"
+
+#include <string.h>
+
+#include <algorithm>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/arraysize.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+constexpr float kMinNoisePower = 100.f;
+}  // namespace
+
+NoiseSpectrumEstimator::NoiseSpectrumEstimator(ApmDataDumper* data_dumper)
+    : data_dumper_(data_dumper) {
+  Initialize();
+}
+
+void NoiseSpectrumEstimator::Initialize() {
+  std::fill(noise_spectrum_, noise_spectrum_ + arraysize(noise_spectrum_),
+            kMinNoisePower);
+}
+
+void NoiseSpectrumEstimator::Update(rtc::ArrayView<const float> spectrum,
+                                    bool first_update) {
+  RTC_DCHECK_EQ(65, spectrum.size());
+
+  if (first_update) {
+    // Initialize the noise spectral estimate with the signal spectrum.
+    std::copy(spectrum.data(), spectrum.data() + spectrum.size(),
+              noise_spectrum_);
+  } else {
+    // Smoothly update the noise spectral estimate towards the signal spectrum
+    // such that the magnitude of the updates are limited.
+    for (size_t k = 0; k < spectrum.size(); ++k) {
+      if (noise_spectrum_[k] < spectrum[k]) {
+        noise_spectrum_[k] = std::min(
+            1.01f * noise_spectrum_[k],
+            noise_spectrum_[k] + 0.05f * (spectrum[k] - noise_spectrum_[k]));
+      } else {
+        noise_spectrum_[k] = std::max(
+            0.99f * noise_spectrum_[k],
+            noise_spectrum_[k] + 0.05f * (spectrum[k] - noise_spectrum_[k]));
+      }
+    }
+  }
+
+  // Ensure that the noise spectal estimate does not become too low.
+  for (auto& v : noise_spectrum_) {
+    v = std::max(v, kMinNoisePower);
+  }
+
+  data_dumper_->DumpRaw("agc2_noise_spectrum", 65, noise_spectrum_);
+  data_dumper_->DumpRaw("agc2_signal_spectrum", spectrum);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_spectrum_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_spectrum_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_spectrum_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/noise_spectrum_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_NOISE_SPECTRUM_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_NOISE_SPECTRUM_ESTIMATOR_H_
+
+#include "api/array_view.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+
+class NoiseSpectrumEstimator {
+ public:
+  explicit NoiseSpectrumEstimator(ApmDataDumper* data_dumper);
+
+  NoiseSpectrumEstimator() = delete;
+  NoiseSpectrumEstimator(const NoiseSpectrumEstimator&) = delete;
+  NoiseSpectrumEstimator& operator=(const NoiseSpectrumEstimator&) = delete;
+
+  void Initialize();
+  void Update(rtc::ArrayView<const float> spectrum, bool first_update);
+
+  rtc::ArrayView<const float> GetNoiseSpectrum() const {
+    return rtc::ArrayView<const float>(noise_spectrum_);
+  }
+
+ private:
+  ApmDataDumper* data_dumper_;
+  float noise_spectrum_[65];
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_NOISE_SPECTRUM_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,91 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/auto_correlation.h"
+
+#include <algorithm>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+constexpr int kAutoCorrelationFftOrder = 9;  // Length-512 FFT.
+static_assert(1 << kAutoCorrelationFftOrder >
+                  kNumLags12kHz + kBufSize12kHz - kMaxPitch12kHz,
+              "");
+
+}  // namespace
+
+AutoCorrelationCalculator::AutoCorrelationCalculator()
+    : fft_(1 << kAutoCorrelationFftOrder, Pffft::FftType::kReal),
+      tmp_(fft_.CreateBuffer()),
+      X_(fft_.CreateBuffer()),
+      H_(fft_.CreateBuffer()) {}
+
+AutoCorrelationCalculator::~AutoCorrelationCalculator() = default;
+
+// The auto-correlations coefficients are computed as follows:
+// |.........|...........|  <- pitch buffer
+//           [ x (fixed) ]
+// [   y_0   ]
+//         [ y_{m-1} ]
+// x and y are sub-array of equal length; x is never moved, whereas y slides.
+// The cross-correlation between y_0 and x corresponds to the auto-correlation
+// for the maximum pitch period. Hence, the first value in |auto_corr| has an
+// inverted lag equal to 0 that corresponds to a lag equal to the maximum
+// pitch period.
+void AutoCorrelationCalculator::ComputeOnPitchBuffer(
+    rtc::ArrayView<const float, kBufSize12kHz> pitch_buf,
+    rtc::ArrayView<float, kNumLags12kHz> auto_corr) {
+  RTC_DCHECK_LT(auto_corr.size(), kMaxPitch12kHz);
+  RTC_DCHECK_GT(pitch_buf.size(), kMaxPitch12kHz);
+  constexpr int kFftFrameSize = 1 << kAutoCorrelationFftOrder;
+  constexpr int kConvolutionLength = kBufSize12kHz - kMaxPitch12kHz;
+  static_assert(kConvolutionLength == kFrameSize20ms12kHz,
+                "Mismatch between pitch buffer size, frame size and maximum "
+                "pitch period.");
+  static_assert(kFftFrameSize > kNumLags12kHz + kConvolutionLength,
+                "The FFT length is not sufficiently big to avoid cyclic "
+                "convolution errors.");
+  auto tmp = tmp_->GetView();
+
+  // Compute the FFT for the reversed reference frame - i.e.,
+  // pitch_buf[-kConvolutionLength:].
+  std::reverse_copy(pitch_buf.end() - kConvolutionLength, pitch_buf.end(),
+                    tmp.begin());
+  std::fill(tmp.begin() + kConvolutionLength, tmp.end(), 0.f);
+  fft_.ForwardTransform(*tmp_, H_.get(), /*ordered=*/false);
+
+  // Compute the FFT for the sliding frames chunk. The sliding frames are
+  // defined as pitch_buf[i:i+kConvolutionLength] where i in
+  // [0, kNumLags12kHz). The chunk includes all of them, hence it is
+  // defined as pitch_buf[:kNumLags12kHz+kConvolutionLength].
+  std::copy(pitch_buf.begin(),
+            pitch_buf.begin() + kConvolutionLength + kNumLags12kHz,
+            tmp.begin());
+  std::fill(tmp.begin() + kNumLags12kHz + kConvolutionLength, tmp.end(), 0.f);
+  fft_.ForwardTransform(*tmp_, X_.get(), /*ordered=*/false);
+
+  // Convolve in the frequency domain.
+  constexpr float kScalingFactor = 1.f / static_cast<float>(kFftFrameSize);
+  std::fill(tmp.begin(), tmp.end(), 0.f);
+  fft_.FrequencyDomainConvolve(*X_, *H_, tmp_.get(), kScalingFactor);
+  fft_.BackwardTransform(*tmp_, tmp_.get(), /*ordered=*/false);
+
+  // Extract the auto-correlation coefficients.
+  std::copy(tmp.begin() + kConvolutionLength - 1,
+            tmp.begin() + kConvolutionLength + kNumLags12kHz - 1,
+            auto_corr.begin());
+}
+
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_AUTO_CORRELATION_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_AUTO_CORRELATION_H_
+
+#include <memory>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+#include "modules/audio_processing/utility/pffft_wrapper.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Class to compute the auto correlation on the pitch buffer for a target pitch
+// interval.
+class AutoCorrelationCalculator {
+ public:
+  AutoCorrelationCalculator();
+  AutoCorrelationCalculator(const AutoCorrelationCalculator&) = delete;
+  AutoCorrelationCalculator& operator=(const AutoCorrelationCalculator&) =
+      delete;
+  ~AutoCorrelationCalculator();
+
+  // Computes the auto-correlation coefficients for a target pitch interval.
+  // |auto_corr| indexes are inverted lags.
+  void ComputeOnPitchBuffer(
+      rtc::ArrayView<const float, kBufSize12kHz> pitch_buf,
+      rtc::ArrayView<float, kNumLags12kHz> auto_corr);
+
+ private:
+  Pffft fft_;
+  std::unique_ptr<Pffft::FloatBuffer> tmp_;
+  std::unique_ptr<Pffft::FloatBuffer> X_;
+  std::unique_ptr<Pffft::FloatBuffer> H_;
+};
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_AUTO_CORRELATION_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/auto_correlation_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/auto_correlation.h"
+
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+#include "modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h"
+#include "modules/audio_processing/agc2/rnn_vad/test_utils.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+// Checks that the auto correlation function produces output within tolerance
+// given test input data.
+TEST(RnnVadTest, PitchBufferAutoCorrelationWithinTolerance) {
+  PitchTestData test_data;
+  std::array<float, kBufSize12kHz> pitch_buf_decimated;
+  Decimate2x(test_data.PitchBuffer24kHzView(), pitch_buf_decimated);
+  std::array<float, kNumLags12kHz> computed_output;
+  {
+    // TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+    // FloatingPointExceptionObserver fpe_observer;
+    AutoCorrelationCalculator auto_corr_calculator;
+    auto_corr_calculator.ComputeOnPitchBuffer(pitch_buf_decimated,
+                                              computed_output);
+  }
+  auto auto_corr_view = test_data.AutoCorrelation12kHzView();
+  ExpectNearAbsolute({auto_corr_view.data(), auto_corr_view.size()},
+                     computed_output, 3e-3f);
+}
+
+// Checks that the auto correlation function computes the right thing for a
+// simple use case.
+TEST(RnnVadTest, CheckAutoCorrelationOnConstantPitchBuffer) {
+  // Create constant signal with no pitch.
+  std::array<float, kBufSize12kHz> pitch_buf_decimated;
+  std::fill(pitch_buf_decimated.begin(), pitch_buf_decimated.end(), 1.f);
+  std::array<float, kNumLags12kHz> computed_output;
+  {
+    // TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+    // FloatingPointExceptionObserver fpe_observer;
+    AutoCorrelationCalculator auto_corr_calculator;
+    auto_corr_calculator.ComputeOnPitchBuffer(pitch_buf_decimated,
+                                              computed_output);
+  }
+  // The expected output is a vector filled with the same expected
+  // auto-correlation value. The latter equals the length of a 20 ms frame.
+  constexpr int kFrameSize20ms12kHz = kFrameSize20ms24kHz / 2;
+  std::array<float, kNumLags12kHz> expected_output;
+  std::fill(expected_output.begin(), expected_output.end(),
+            static_cast<float>(kFrameSize20ms12kHz));
+  ExpectNearAbsolute(expected_output, computed_output, 4e-5f);
+}
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/BUILD.gn asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/BUILD.gn
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/BUILD.gn	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,333 @@
+# Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+import("../../../../webrtc.gni")
+
+rtc_library("rnn_vad") {
+  visibility = [ "../*" ]
+  sources = [
+    "features_extraction.cc",
+    "features_extraction.h",
+    "rnn.cc",
+    "rnn.h",
+  ]
+
+  defines = []
+  if (rtc_build_with_neon && current_cpu != "arm64") {
+    suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+    cflags = [ "-mfpu=neon" ]
+  }
+
+  deps = [
+    ":rnn_vad_common",
+    ":rnn_vad_layers",
+    ":rnn_vad_lp_residual",
+    ":rnn_vad_pitch",
+    ":rnn_vad_sequence_buffer",
+    ":rnn_vad_spectral_features",
+    "..:biquad_filter",
+    "..:cpu_features",
+    "../../../../api:array_view",
+    "../../../../rtc_base:checks",
+    "../../../../rtc_base:safe_compare",
+    "../../../../rtc_base:safe_conversions",
+    "//third_party/rnnoise:rnn_vad",
+  ]
+}
+
+rtc_library("rnn_vad_auto_correlation") {
+  sources = [
+    "auto_correlation.cc",
+    "auto_correlation.h",
+  ]
+  deps = [
+    ":rnn_vad_common",
+    "../../../../api:array_view",
+    "../../../../rtc_base:checks",
+    "../../utility:pffft_wrapper",
+  ]
+}
+
+rtc_source_set("rnn_vad_common") {
+  # TODO(alessiob): Make this target visibility private.
+  visibility = [
+    ":*",
+    "..:rnn_vad_with_level",
+  ]
+  sources = [ "common.h" ]
+  deps = [
+    "../../../../rtc_base/system:arch",
+    "../../../../system_wrappers",
+  ]
+}
+
+rtc_library("rnn_vad_lp_residual") {
+  sources = [
+    "lp_residual.cc",
+    "lp_residual.h",
+  ]
+  deps = [
+    "../../../../api:array_view",
+    "../../../../rtc_base:checks",
+    "../../../../rtc_base:safe_compare",
+  ]
+}
+
+rtc_source_set("rnn_vad_layers") {
+  sources = [
+    "rnn_fc.cc",
+    "rnn_fc.h",
+    "rnn_gru.cc",
+    "rnn_gru.h",
+  ]
+
+  defines = []
+  if (rtc_build_with_neon && current_cpu != "arm64") {
+    suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+    cflags = [ "-mfpu=neon" ]
+  }
+
+  deps = [
+    ":rnn_vad_common",
+    ":vector_math",
+    "..:cpu_features",
+    "../../../../api:array_view",
+    "../../../../api:function_view",
+    "../../../../rtc_base:checks",
+    "../../../../rtc_base:safe_conversions",
+    "//third_party/rnnoise:rnn_vad",
+  ]
+  if (current_cpu == "x86" || current_cpu == "x64") {
+    deps += [ ":vector_math_avx2" ]
+  }
+  absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
+}
+
+rtc_source_set("vector_math") {
+  sources = [ "vector_math.h" ]
+  deps = [
+    "..:cpu_features",
+    "../../../../api:array_view",
+    "../../../../rtc_base:checks",
+    "../../../../rtc_base:safe_conversions",
+    "../../../../rtc_base/system:arch",
+  ]
+}
+
+if (current_cpu == "x86" || current_cpu == "x64") {
+  rtc_library("vector_math_avx2") {
+    sources = [ "vector_math_avx2.cc" ]
+    if (is_win) {
+      cflags = [ "/arch:AVX2" ]
+    } else {
+      cflags = [
+        "-mavx2",
+        "-mfma",
+      ]
+    }
+    deps = [
+      ":vector_math",
+      "../../../../api:array_view",
+      "../../../../rtc_base:checks",
+      "../../../../rtc_base:safe_conversions",
+    ]
+  }
+}
+
+rtc_library("rnn_vad_pitch") {
+  sources = [
+    "pitch_search.cc",
+    "pitch_search.h",
+    "pitch_search_internal.cc",
+    "pitch_search_internal.h",
+  ]
+
+  defines = []
+  if (rtc_build_with_neon && current_cpu != "arm64") {
+    suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+    cflags = [ "-mfpu=neon" ]
+  }
+
+  deps = [
+    ":rnn_vad_auto_correlation",
+    ":rnn_vad_common",
+    ":vector_math",
+    "..:cpu_features",
+    "../../../../api:array_view",
+    "../../../../rtc_base:checks",
+    "../../../../rtc_base:gtest_prod",
+    "../../../../rtc_base:safe_compare",
+    "../../../../rtc_base:safe_conversions",
+    "../../../../rtc_base/system:arch",
+  ]
+  if (current_cpu == "x86" || current_cpu == "x64") {
+    deps += [ ":vector_math_avx2" ]
+  }
+}
+
+rtc_source_set("rnn_vad_ring_buffer") {
+  sources = [ "ring_buffer.h" ]
+  deps = [
+    "../../../../api:array_view",
+    "../../../../rtc_base:checks",
+  ]
+}
+
+rtc_source_set("rnn_vad_sequence_buffer") {
+  sources = [ "sequence_buffer.h" ]
+  deps = [
+    "../../../../api:array_view",
+    "../../../../rtc_base:checks",
+  ]
+}
+
+rtc_library("rnn_vad_spectral_features") {
+  sources = [
+    "spectral_features.cc",
+    "spectral_features.h",
+    "spectral_features_internal.cc",
+    "spectral_features_internal.h",
+  ]
+  deps = [
+    ":rnn_vad_common",
+    ":rnn_vad_ring_buffer",
+    ":rnn_vad_symmetric_matrix_buffer",
+    "../../../../api:array_view",
+    "../../../../rtc_base:checks",
+    "../../../../rtc_base:safe_compare",
+    "../../utility:pffft_wrapper",
+  ]
+}
+
+rtc_source_set("rnn_vad_symmetric_matrix_buffer") {
+  sources = [ "symmetric_matrix_buffer.h" ]
+  deps = [
+    "../../../../api:array_view",
+    "../../../../rtc_base:checks",
+    "../../../../rtc_base:safe_compare",
+  ]
+}
+
+if (rtc_include_tests) {
+  rtc_library("test_utils") {
+    testonly = true
+    sources = [
+      "test_utils.cc",
+      "test_utils.h",
+    ]
+    deps = [
+      ":rnn_vad",
+      ":rnn_vad_common",
+      "../../../../api:array_view",
+      "../../../../api:scoped_refptr",
+      "../../../../rtc_base:checks",
+      "../../../../rtc_base:safe_compare",
+      "../../../../test:fileutils",
+      "../../../../test:test_support",
+    ]
+  }
+
+  unittest_resources = [
+    "../../../../resources/audio_processing/agc2/rnn_vad/band_energies.dat",
+    "../../../../resources/audio_processing/agc2/rnn_vad/pitch_buf_24k.dat",
+    "../../../../resources/audio_processing/agc2/rnn_vad/pitch_lp_res.dat",
+    "../../../../resources/audio_processing/agc2/rnn_vad/pitch_search_int.dat",
+    "../../../../resources/audio_processing/agc2/rnn_vad/samples.pcm",
+    "../../../../resources/audio_processing/agc2/rnn_vad/vad_prob.dat",
+  ]
+
+  if (is_ios) {
+    bundle_data("unittests_bundle_data") {
+      testonly = true
+      sources = unittest_resources
+      outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ]
+    }
+  }
+
+  rtc_library("unittests") {
+    testonly = true
+    sources = [
+      "auto_correlation_unittest.cc",
+      "features_extraction_unittest.cc",
+      "lp_residual_unittest.cc",
+      "pitch_search_internal_unittest.cc",
+      "pitch_search_unittest.cc",
+      "ring_buffer_unittest.cc",
+      "rnn_fc_unittest.cc",
+      "rnn_gru_unittest.cc",
+      "rnn_unittest.cc",
+      "rnn_vad_unittest.cc",
+      "sequence_buffer_unittest.cc",
+      "spectral_features_internal_unittest.cc",
+      "spectral_features_unittest.cc",
+      "symmetric_matrix_buffer_unittest.cc",
+      "vector_math_unittest.cc",
+    ]
+
+    defines = []
+    if (rtc_build_with_neon && current_cpu != "arm64") {
+      suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+      cflags = [ "-mfpu=neon" ]
+    }
+
+    deps = [
+      ":rnn_vad",
+      ":rnn_vad_auto_correlation",
+      ":rnn_vad_common",
+      ":rnn_vad_layers",
+      ":rnn_vad_lp_residual",
+      ":rnn_vad_pitch",
+      ":rnn_vad_ring_buffer",
+      ":rnn_vad_sequence_buffer",
+      ":rnn_vad_spectral_features",
+      ":rnn_vad_symmetric_matrix_buffer",
+      ":test_utils",
+      ":vector_math",
+      "..:cpu_features",
+      "../..:audioproc_test_utils",
+      "../../../../api:array_view",
+      "../../../../common_audio/",
+      "../../../../rtc_base:checks",
+      "../../../../rtc_base:logging",
+      "../../../../rtc_base:safe_compare",
+      "../../../../rtc_base:safe_conversions",
+      "../../../../rtc_base:stringutils",
+      "../../../../rtc_base/system:arch",
+      "../../../../test:test_support",
+      "../../utility:pffft_wrapper",
+      "//third_party/rnnoise:rnn_vad",
+    ]
+    if (current_cpu == "x86" || current_cpu == "x64") {
+      deps += [ ":vector_math_avx2" ]
+    }
+    absl_deps = [ "//third_party/abseil-cpp/absl/memory" ]
+    data = unittest_resources
+    if (is_ios) {
+      deps += [ ":unittests_bundle_data" ]
+    }
+  }
+
+  if (!build_with_chromium) {
+    rtc_executable("rnn_vad_tool") {
+      testonly = true
+      sources = [ "rnn_vad_tool.cc" ]
+      deps = [
+        ":rnn_vad",
+        ":rnn_vad_common",
+        "..:cpu_features",
+        "../../../../api:array_view",
+        "../../../../common_audio",
+        "../../../../rtc_base:rtc_base_approved",
+        "../../../../rtc_base:safe_compare",
+        "../../../../test:test_support",
+        "//third_party/abseil-cpp/absl/flags:flag",
+        "//third_party/abseil-cpp/absl/flags:parse",
+      ]
+    }
+  }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/common.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/common.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/common.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/common.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_COMMON_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_COMMON_H_
+
+#include <stddef.h>
+
+namespace webrtc {
+namespace rnn_vad {
+
+constexpr double kPi = 3.14159265358979323846;
+
+constexpr int kSampleRate24kHz = 24000;
+constexpr int kFrameSize10ms24kHz = kSampleRate24kHz / 100;
+constexpr int kFrameSize20ms24kHz = kFrameSize10ms24kHz * 2;
+
+// Pitch buffer.
+constexpr int kMinPitch24kHz = kSampleRate24kHz / 800;   // 0.00125 s.
+constexpr int kMaxPitch24kHz = kSampleRate24kHz / 62.5;  // 0.016 s.
+constexpr int kBufSize24kHz = kMaxPitch24kHz + kFrameSize20ms24kHz;
+static_assert((kBufSize24kHz & 1) == 0, "The buffer size must be even.");
+
+// 24 kHz analysis.
+// Define a higher minimum pitch period for the initial search. This is used to
+// avoid searching for very short periods, for which a refinement step is
+// responsible.
+constexpr int kInitialMinPitch24kHz = 3 * kMinPitch24kHz;
+static_assert(kMinPitch24kHz < kInitialMinPitch24kHz, "");
+static_assert(kInitialMinPitch24kHz < kMaxPitch24kHz, "");
+static_assert(kMaxPitch24kHz > kInitialMinPitch24kHz, "");
+// Number of (inverted) lags during the initial pitch search phase at 24 kHz.
+constexpr int kInitialNumLags24kHz = kMaxPitch24kHz - kInitialMinPitch24kHz;
+// Number of (inverted) lags during the pitch search refinement phase at 24 kHz.
+constexpr int kRefineNumLags24kHz = kMaxPitch24kHz + 1;
+static_assert(
+    kRefineNumLags24kHz > kInitialNumLags24kHz,
+    "The refinement step must search the pitch in an extended pitch range.");
+
+// 12 kHz analysis.
+constexpr int kSampleRate12kHz = 12000;
+constexpr int kFrameSize10ms12kHz = kSampleRate12kHz / 100;
+constexpr int kFrameSize20ms12kHz = kFrameSize10ms12kHz * 2;
+constexpr int kBufSize12kHz = kBufSize24kHz / 2;
+constexpr int kInitialMinPitch12kHz = kInitialMinPitch24kHz / 2;
+constexpr int kMaxPitch12kHz = kMaxPitch24kHz / 2;
+static_assert(kMaxPitch12kHz > kInitialMinPitch12kHz, "");
+// The inverted lags for the pitch interval [|kInitialMinPitch12kHz|,
+// |kMaxPitch12kHz|] are in the range [0, |kNumLags12kHz|].
+constexpr int kNumLags12kHz = kMaxPitch12kHz - kInitialMinPitch12kHz;
+
+// 48 kHz constants.
+constexpr int kMinPitch48kHz = kMinPitch24kHz * 2;
+constexpr int kMaxPitch48kHz = kMaxPitch24kHz * 2;
+
+// Spectral features.
+constexpr int kNumBands = 22;
+constexpr int kNumLowerBands = 6;
+static_assert((0 < kNumLowerBands) && (kNumLowerBands < kNumBands), "");
+constexpr int kCepstralCoeffsHistorySize = 8;
+static_assert(kCepstralCoeffsHistorySize > 2,
+              "The history size must at least be 3 to compute first and second "
+              "derivatives.");
+
+constexpr int kFeatureVectorSize = 42;
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_COMMON_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/DEPS asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/DEPS
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/DEPS	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/DEPS	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,3 @@
+include_rules = [
+  "+third_party/rnnoise",
+]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,89 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/features_extraction.h"
+
+#include <array>
+
+#include "modules/audio_processing/agc2/rnn_vad/lp_residual.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+// Generated via "B, A = scipy.signal.butter(2, 30/12000, btype='highpass')"
+const BiQuadFilter::BiQuadCoefficients kHpfConfig24k = {
+    {0.99446179f, -1.98892358f, 0.99446179f},
+    {-1.98889291f, 0.98895425f}};
+
+}  // namespace
+
+FeaturesExtractor::FeaturesExtractor(const AvailableCpuFeatures& cpu_features)
+    : use_high_pass_filter_(false),
+      pitch_buf_24kHz_(),
+      pitch_buf_24kHz_view_(pitch_buf_24kHz_.GetBufferView()),
+      lp_residual_(kBufSize24kHz),
+      lp_residual_view_(lp_residual_.data(), kBufSize24kHz),
+      pitch_estimator_(cpu_features),
+      reference_frame_view_(pitch_buf_24kHz_.GetMostRecentValuesView()) {
+  RTC_DCHECK_EQ(kBufSize24kHz, lp_residual_.size());
+  hpf_.Initialize(kHpfConfig24k);
+  Reset();
+}
+
+FeaturesExtractor::~FeaturesExtractor() = default;
+
+void FeaturesExtractor::Reset() {
+  pitch_buf_24kHz_.Reset();
+  spectral_features_extractor_.Reset();
+  if (use_high_pass_filter_)
+    hpf_.Reset();
+}
+
+bool FeaturesExtractor::CheckSilenceComputeFeatures(
+    rtc::ArrayView<const float, kFrameSize10ms24kHz> samples,
+    rtc::ArrayView<float, kFeatureVectorSize> feature_vector) {
+  // Pre-processing.
+  if (use_high_pass_filter_) {
+    std::array<float, kFrameSize10ms24kHz> samples_filtered;
+    hpf_.Process(samples, samples_filtered);
+    // Feed buffer with the pre-processed version of |samples|.
+    pitch_buf_24kHz_.Push(samples_filtered);
+  } else {
+    // Feed buffer with |samples|.
+    pitch_buf_24kHz_.Push(samples);
+  }
+  // Extract the LP residual.
+  float lpc_coeffs[kNumLpcCoefficients];
+  ComputeAndPostProcessLpcCoefficients(pitch_buf_24kHz_view_, lpc_coeffs);
+  ComputeLpResidual(lpc_coeffs, pitch_buf_24kHz_view_, lp_residual_view_);
+  // Estimate pitch on the LP-residual and write the normalized pitch period
+  // into the output vector (normalization based on training data stats).
+  pitch_period_48kHz_ = pitch_estimator_.Estimate(lp_residual_view_);
+  feature_vector[kFeatureVectorSize - 2] = 0.01f * (pitch_period_48kHz_ - 300);
+  // Extract lagged frames (according to the estimated pitch period).
+  RTC_DCHECK_LE(pitch_period_48kHz_ / 2, kMaxPitch24kHz);
+  auto lagged_frame = pitch_buf_24kHz_view_.subview(
+      kMaxPitch24kHz - pitch_period_48kHz_ / 2, kFrameSize20ms24kHz);
+  // Analyze reference and lagged frames checking if silence has been detected
+  // and write the feature vector.
+  return spectral_features_extractor_.CheckSilenceComputeFeatures(
+      reference_frame_view_, {lagged_frame.data(), kFrameSize20ms24kHz},
+      {feature_vector.data() + kNumLowerBands, kNumBands - kNumLowerBands},
+      {feature_vector.data(), kNumLowerBands},
+      {feature_vector.data() + kNumBands, kNumLowerBands},
+      {feature_vector.data() + kNumBands + kNumLowerBands, kNumLowerBands},
+      {feature_vector.data() + kNumBands + 2 * kNumLowerBands, kNumLowerBands},
+      &feature_vector[kFeatureVectorSize - 1]);
+}
+
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_FEATURES_EXTRACTION_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_FEATURES_EXTRACTION_H_
+
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/biquad_filter.h"
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+#include "modules/audio_processing/agc2/rnn_vad/pitch_search.h"
+#include "modules/audio_processing/agc2/rnn_vad/sequence_buffer.h"
+#include "modules/audio_processing/agc2/rnn_vad/spectral_features.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Feature extractor to feed the VAD RNN.
+class FeaturesExtractor {
+ public:
+  explicit FeaturesExtractor(const AvailableCpuFeatures& cpu_features);
+  FeaturesExtractor(const FeaturesExtractor&) = delete;
+  FeaturesExtractor& operator=(const FeaturesExtractor&) = delete;
+  ~FeaturesExtractor();
+  void Reset();
+  // Analyzes the samples, computes the feature vector and returns true if
+  // silence is detected (false if not). When silence is detected,
+  // |feature_vector| is partially written and therefore must not be used to
+  // feed the VAD RNN.
+  bool CheckSilenceComputeFeatures(
+      rtc::ArrayView<const float, kFrameSize10ms24kHz> samples,
+      rtc::ArrayView<float, kFeatureVectorSize> feature_vector);
+
+ private:
+  const bool use_high_pass_filter_;
+  // TODO(bugs.webrtc.org/7494): Remove HPF depending on how AGC2 is used in APM
+  // and on whether an HPF is already used as pre-processing step in APM.
+  BiQuadFilter hpf_;
+  SequenceBuffer<float, kBufSize24kHz, kFrameSize10ms24kHz, kFrameSize20ms24kHz>
+      pitch_buf_24kHz_;
+  rtc::ArrayView<const float, kBufSize24kHz> pitch_buf_24kHz_view_;
+  std::vector<float> lp_residual_;
+  rtc::ArrayView<float, kBufSize24kHz> lp_residual_view_;
+  PitchEstimator pitch_estimator_;
+  rtc::ArrayView<const float, kFrameSize20ms24kHz> reference_frame_view_;
+  SpectralFeaturesExtractor spectral_features_extractor_;
+  int pitch_period_48kHz_;
+};
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_FEATURES_EXTRACTION_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/features_extraction_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,103 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/features_extraction.h"
+
+#include <cmath>
+#include <vector>
+
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "rtc_base/numerics/safe_compare.h"
+#include "rtc_base/numerics/safe_conversions.h"
+// TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+// #include "test/fpe_observer.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+constexpr int ceil(int n, int m) {
+  return (n + m - 1) / m;
+}
+
+// Number of 10 ms frames required to fill a pitch buffer having size
+// |kBufSize24kHz|.
+constexpr int kNumTestDataFrames = ceil(kBufSize24kHz, kFrameSize10ms24kHz);
+// Number of samples for the test data.
+constexpr int kNumTestDataSize = kNumTestDataFrames * kFrameSize10ms24kHz;
+
+// Verifies that the pitch in Hz is in the detectable range.
+bool PitchIsValid(float pitch_hz) {
+  const int pitch_period = static_cast<float>(kSampleRate24kHz) / pitch_hz;
+  return kInitialMinPitch24kHz <= pitch_period &&
+         pitch_period <= kMaxPitch24kHz;
+}
+
+void CreatePureTone(float amplitude, float freq_hz, rtc::ArrayView<float> dst) {
+  for (int i = 0; rtc::SafeLt(i, dst.size()); ++i) {
+    dst[i] = amplitude * std::sin(2.f * kPi * freq_hz * i / kSampleRate24kHz);
+  }
+}
+
+// Feeds |features_extractor| with |samples| splitting it in 10 ms frames.
+// For every frame, the output is written into |feature_vector|. Returns true
+// if silence is detected in the last frame.
+bool FeedTestData(FeaturesExtractor& features_extractor,
+                  rtc::ArrayView<const float> samples,
+                  rtc::ArrayView<float, kFeatureVectorSize> feature_vector) {
+  // TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+  // FloatingPointExceptionObserver fpe_observer;
+  bool is_silence = true;
+  const int num_frames = samples.size() / kFrameSize10ms24kHz;
+  for (int i = 0; i < num_frames; ++i) {
+    is_silence = features_extractor.CheckSilenceComputeFeatures(
+        {samples.data() + i * kFrameSize10ms24kHz, kFrameSize10ms24kHz},
+        feature_vector);
+  }
+  return is_silence;
+}
+
+// Extracts the features for two pure tones and verifies that the pitch field
+// values reflect the known tone frequencies.
+TEST(RnnVadTest, FeatureExtractionLowHighPitch) {
+  constexpr float amplitude = 1000.f;
+  constexpr float low_pitch_hz = 150.f;
+  constexpr float high_pitch_hz = 250.f;
+  ASSERT_TRUE(PitchIsValid(low_pitch_hz));
+  ASSERT_TRUE(PitchIsValid(high_pitch_hz));
+
+  const AvailableCpuFeatures cpu_features = GetAvailableCpuFeatures();
+  FeaturesExtractor features_extractor(cpu_features);
+  std::vector<float> samples(kNumTestDataSize);
+  std::vector<float> feature_vector(kFeatureVectorSize);
+  ASSERT_EQ(kFeatureVectorSize, rtc::dchecked_cast<int>(feature_vector.size()));
+  rtc::ArrayView<float, kFeatureVectorSize> feature_vector_view(
+      feature_vector.data(), kFeatureVectorSize);
+
+  // Extract the normalized scalar feature that is proportional to the estimated
+  // pitch period.
+  constexpr int pitch_feature_index = kFeatureVectorSize - 2;
+  // Low frequency tone - i.e., high period.
+  CreatePureTone(amplitude, low_pitch_hz, samples);
+  ASSERT_FALSE(FeedTestData(features_extractor, samples, feature_vector_view));
+  float high_pitch_period = feature_vector_view[pitch_feature_index];
+  // High frequency tone - i.e., low period.
+  features_extractor.Reset();
+  CreatePureTone(amplitude, high_pitch_hz, samples);
+  ASSERT_FALSE(FeedTestData(features_extractor, samples, feature_vector_view));
+  float low_pitch_period = feature_vector_view[pitch_feature_index];
+  // Check.
+  EXPECT_LT(low_pitch_period, high_pitch_period);
+}
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,141 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/lp_residual.h"
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <numeric>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_compare.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+// Computes auto-correlation coefficients for |x| and writes them in
+// |auto_corr|. The lag values are in {0, ..., max_lag - 1}, where max_lag
+// equals the size of |auto_corr|.
+void ComputeAutoCorrelation(
+    rtc::ArrayView<const float> x,
+    rtc::ArrayView<float, kNumLpcCoefficients> auto_corr) {
+  constexpr int max_lag = auto_corr.size();
+  RTC_DCHECK_LT(max_lag, x.size());
+  for (int lag = 0; lag < max_lag; ++lag) {
+    auto_corr[lag] =
+        std::inner_product(x.begin(), x.end() - lag, x.begin() + lag, 0.f);
+  }
+}
+
+// Applies denoising to the auto-correlation coefficients.
+void DenoiseAutoCorrelation(
+    rtc::ArrayView<float, kNumLpcCoefficients> auto_corr) {
+  // Assume -40 dB white noise floor.
+  auto_corr[0] *= 1.0001f;
+  // Hard-coded values obtained as
+  // [np.float32((0.008*0.008*i*i)) for i in range(1,5)].
+  auto_corr[1] -= auto_corr[1] * 0.000064f;
+  auto_corr[2] -= auto_corr[2] * 0.000256f;
+  auto_corr[3] -= auto_corr[3] * 0.000576f;
+  auto_corr[4] -= auto_corr[4] * 0.001024f;
+  static_assert(kNumLpcCoefficients == 5, "Update `auto_corr`.");
+}
+
+// Computes the initial inverse filter coefficients given the auto-correlation
+// coefficients of an input frame.
+void ComputeInitialInverseFilterCoefficients(
+    rtc::ArrayView<const float, kNumLpcCoefficients> auto_corr,
+    rtc::ArrayView<float, kNumLpcCoefficients - 1> lpc_coeffs) {
+  float error = auto_corr[0];
+  for (int i = 0; i < kNumLpcCoefficients - 1; ++i) {
+    float reflection_coeff = 0.f;
+    for (int j = 0; j < i; ++j) {
+      reflection_coeff += lpc_coeffs[j] * auto_corr[i - j];
+    }
+    reflection_coeff += auto_corr[i + 1];
+
+    // Avoid division by numbers close to zero.
+    constexpr float kMinErrorMagnitude = 1e-6f;
+    if (std::fabs(error) < kMinErrorMagnitude) {
+      error = std::copysign(kMinErrorMagnitude, error);
+    }
+
+    reflection_coeff /= -error;
+    // Update LPC coefficients and total error.
+    lpc_coeffs[i] = reflection_coeff;
+    for (int j = 0; j < ((i + 1) >> 1); ++j) {
+      const float tmp1 = lpc_coeffs[j];
+      const float tmp2 = lpc_coeffs[i - 1 - j];
+      lpc_coeffs[j] = tmp1 + reflection_coeff * tmp2;
+      lpc_coeffs[i - 1 - j] = tmp2 + reflection_coeff * tmp1;
+    }
+    error -= reflection_coeff * reflection_coeff * error;
+    if (error < 0.001f * auto_corr[0]) {
+      break;
+    }
+  }
+}
+
+}  // namespace
+
+void ComputeAndPostProcessLpcCoefficients(
+    rtc::ArrayView<const float> x,
+    rtc::ArrayView<float, kNumLpcCoefficients> lpc_coeffs) {
+  std::array<float, kNumLpcCoefficients> auto_corr;
+  ComputeAutoCorrelation(x, auto_corr);
+  if (auto_corr[0] == 0.f) {  // Empty frame.
+    std::fill(lpc_coeffs.begin(), lpc_coeffs.end(), 0);
+    return;
+  }
+  DenoiseAutoCorrelation(auto_corr);
+  std::array<float, kNumLpcCoefficients - 1> lpc_coeffs_pre{};
+  ComputeInitialInverseFilterCoefficients(auto_corr, lpc_coeffs_pre);
+  // LPC coefficients post-processing.
+  // TODO(bugs.webrtc.org/9076): Consider removing these steps.
+  lpc_coeffs_pre[0] *= 0.9f;
+  lpc_coeffs_pre[1] *= 0.9f * 0.9f;
+  lpc_coeffs_pre[2] *= 0.9f * 0.9f * 0.9f;
+  lpc_coeffs_pre[3] *= 0.9f * 0.9f * 0.9f * 0.9f;
+  constexpr float kC = 0.8f;
+  lpc_coeffs[0] = lpc_coeffs_pre[0] + kC;
+  lpc_coeffs[1] = lpc_coeffs_pre[1] + kC * lpc_coeffs_pre[0];
+  lpc_coeffs[2] = lpc_coeffs_pre[2] + kC * lpc_coeffs_pre[1];
+  lpc_coeffs[3] = lpc_coeffs_pre[3] + kC * lpc_coeffs_pre[2];
+  lpc_coeffs[4] = kC * lpc_coeffs_pre[3];
+  static_assert(kNumLpcCoefficients == 5, "Update `lpc_coeffs(_pre)`.");
+}
+
+void ComputeLpResidual(
+    rtc::ArrayView<const float, kNumLpcCoefficients> lpc_coeffs,
+    rtc::ArrayView<const float> x,
+    rtc::ArrayView<float> y) {
+  RTC_DCHECK_GT(x.size(), kNumLpcCoefficients);
+  RTC_DCHECK_EQ(x.size(), y.size());
+  // The code below implements the following operation:
+  // y[i] = x[i] + dot_product({x[i], ..., x[i - kNumLpcCoefficients + 1]},
+  //                           lpc_coeffs)
+  // Edge case: i < kNumLpcCoefficients.
+  y[0] = x[0];
+  for (int i = 1; i < kNumLpcCoefficients; ++i) {
+    y[i] =
+        std::inner_product(x.crend() - i, x.crend(), lpc_coeffs.cbegin(), x[i]);
+  }
+  // Regular case.
+  auto last = x.crend();
+  for (int i = kNumLpcCoefficients; rtc::SafeLt(i, y.size()); ++i, --last) {
+    y[i] = std::inner_product(last - kNumLpcCoefficients, last,
+                              lpc_coeffs.cbegin(), x[i]);
+  }
+}
+
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_LP_RESIDUAL_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_LP_RESIDUAL_H_
+
+#include <stddef.h>
+
+#include "api/array_view.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Linear predictive coding (LPC) inverse filter length.
+constexpr int kNumLpcCoefficients = 5;
+
+// Given a frame |x|, computes a post-processed version of LPC coefficients
+// tailored for pitch estimation.
+void ComputeAndPostProcessLpcCoefficients(
+    rtc::ArrayView<const float> x,
+    rtc::ArrayView<float, kNumLpcCoefficients> lpc_coeffs);
+
+// Computes the LP residual for the input frame |x| and the LPC coefficients
+// |lpc_coeffs|. |y| and |x| can point to the same array for in-place
+// computation.
+void ComputeLpResidual(
+    rtc::ArrayView<const float, kNumLpcCoefficients> lpc_coeffs,
+    rtc::ArrayView<const float> x,
+    rtc::ArrayView<float> y);
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_LP_RESIDUAL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/lp_residual_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/lp_residual.h"
+
+#include <algorithm>
+#include <array>
+#include <vector>
+
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+#include "modules/audio_processing/agc2/rnn_vad/test_utils.h"
+// TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+// #include "test/fpe_observer.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+// Checks that the LP residual can be computed on an empty frame.
+TEST(RnnVadTest, LpResidualOfEmptyFrame) {
+  // TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+  // FloatingPointExceptionObserver fpe_observer;
+
+  // Input frame (empty, i.e., all samples set to 0).
+  std::array<float, kFrameSize10ms24kHz> empty_frame;
+  empty_frame.fill(0.f);
+  // Compute inverse filter coefficients.
+  std::array<float, kNumLpcCoefficients> lpc;
+  ComputeAndPostProcessLpcCoefficients(empty_frame, lpc);
+  // Compute LP residual.
+  std::array<float, kFrameSize10ms24kHz> lp_residual;
+  ComputeLpResidual(lpc, empty_frame, lp_residual);
+}
+
+// Checks that the computed LP residual is bit-exact given test input data.
+TEST(RnnVadTest, LpResidualPipelineBitExactness) {
+  // Input and expected output readers.
+  ChunksFileReader pitch_buffer_reader = CreatePitchBuffer24kHzReader();
+  ChunksFileReader lp_pitch_reader = CreateLpResidualAndPitchInfoReader();
+
+  // Buffers.
+  std::vector<float> pitch_buffer_24kHz(kBufSize24kHz);
+  std::array<float, kNumLpcCoefficients> lpc;
+  std::vector<float> computed_lp_residual(kBufSize24kHz);
+  std::vector<float> expected_lp_residual(kBufSize24kHz);
+
+  // Test length.
+  const int num_frames =
+      std::min(pitch_buffer_reader.num_chunks, 300);  // Max 3 s.
+  ASSERT_GE(lp_pitch_reader.num_chunks, num_frames);
+
+  // TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+  // FloatingPointExceptionObserver fpe_observer;
+  for (int i = 0; i < num_frames; ++i) {
+    SCOPED_TRACE(i);
+    // Read input.
+    ASSERT_TRUE(pitch_buffer_reader.reader->ReadChunk(pitch_buffer_24kHz));
+    // Read expected output (ignore pitch gain and period).
+    ASSERT_TRUE(lp_pitch_reader.reader->ReadChunk(expected_lp_residual));
+    lp_pitch_reader.reader->SeekForward(2);  // Pitch period and strength.
+    // Check every 200 ms.
+    if (i % 20 == 0) {
+      ComputeAndPostProcessLpcCoefficients(pitch_buffer_24kHz, lpc);
+      ComputeLpResidual(lpc, pitch_buffer_24kHz, computed_lp_residual);
+      ExpectNearAbsolute(expected_lp_residual, computed_lp_residual, kFloatMin);
+    }
+  }
+}
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/pitch_search.h"
+
+#include <array>
+#include <cstddef>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+PitchEstimator::PitchEstimator(const AvailableCpuFeatures& cpu_features)
+    : cpu_features_(cpu_features),
+      y_energy_24kHz_(kRefineNumLags24kHz, 0.f),
+      pitch_buffer_12kHz_(kBufSize12kHz),
+      auto_correlation_12kHz_(kNumLags12kHz) {}
+
+PitchEstimator::~PitchEstimator() = default;
+
+int PitchEstimator::Estimate(
+    rtc::ArrayView<const float, kBufSize24kHz> pitch_buffer) {
+  rtc::ArrayView<float, kBufSize12kHz> pitch_buffer_12kHz_view(
+      pitch_buffer_12kHz_.data(), kBufSize12kHz);
+  RTC_DCHECK_EQ(pitch_buffer_12kHz_.size(), pitch_buffer_12kHz_view.size());
+  rtc::ArrayView<float, kNumLags12kHz> auto_correlation_12kHz_view(
+      auto_correlation_12kHz_.data(), kNumLags12kHz);
+  RTC_DCHECK_EQ(auto_correlation_12kHz_.size(),
+                auto_correlation_12kHz_view.size());
+
+  // TODO(bugs.chromium.org/10480): Use `cpu_features_` to estimate pitch.
+  // Perform the initial pitch search at 12 kHz.
+  Decimate2x(pitch_buffer, pitch_buffer_12kHz_view);
+  auto_corr_calculator_.ComputeOnPitchBuffer(pitch_buffer_12kHz_view,
+                                             auto_correlation_12kHz_view);
+  CandidatePitchPeriods pitch_periods = ComputePitchPeriod12kHz(
+      pitch_buffer_12kHz_view, auto_correlation_12kHz_view, cpu_features_);
+  // The refinement is done using the pitch buffer that contains 24 kHz samples.
+  // Therefore, adapt the inverted lags in |pitch_candidates_inv_lags| from 12
+  // to 24 kHz.
+  pitch_periods.best *= 2;
+  pitch_periods.second_best *= 2;
+
+  // Refine the initial pitch period estimation from 12 kHz to 48 kHz.
+  // Pre-compute frame energies at 24 kHz.
+  rtc::ArrayView<float, kRefineNumLags24kHz> y_energy_24kHz_view(
+      y_energy_24kHz_.data(), kRefineNumLags24kHz);
+  RTC_DCHECK_EQ(y_energy_24kHz_.size(), y_energy_24kHz_view.size());
+  ComputeSlidingFrameSquareEnergies24kHz(pitch_buffer, y_energy_24kHz_view,
+                                         cpu_features_);
+  // Estimation at 48 kHz.
+  const int pitch_lag_48kHz = ComputePitchPeriod48kHz(
+      pitch_buffer, y_energy_24kHz_view, pitch_periods, cpu_features_);
+  last_pitch_48kHz_ = ComputeExtendedPitchPeriod48kHz(
+      pitch_buffer, y_energy_24kHz_view,
+      /*initial_pitch_period_48kHz=*/kMaxPitch48kHz - pitch_lag_48kHz,
+      last_pitch_48kHz_, cpu_features_);
+  return last_pitch_48kHz_.period;
+}
+
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_H_
+
+#include <memory>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "modules/audio_processing/agc2/rnn_vad/auto_correlation.h"
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+#include "modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h"
+#include "rtc_base/gtest_prod_util.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Pitch estimator.
+class PitchEstimator {
+ public:
+  explicit PitchEstimator(const AvailableCpuFeatures& cpu_features);
+  PitchEstimator(const PitchEstimator&) = delete;
+  PitchEstimator& operator=(const PitchEstimator&) = delete;
+  ~PitchEstimator();
+  // Returns the estimated pitch period at 48 kHz.
+  int Estimate(rtc::ArrayView<const float, kBufSize24kHz> pitch_buffer);
+
+ private:
+  FRIEND_TEST_ALL_PREFIXES(RnnVadTest, PitchSearchWithinTolerance);
+  float GetLastPitchStrengthForTesting() const {
+    return last_pitch_48kHz_.strength;
+  }
+
+  const AvailableCpuFeatures cpu_features_;
+  PitchInfo last_pitch_48kHz_{};
+  AutoCorrelationCalculator auto_corr_calculator_;
+  std::vector<float> y_energy_24kHz_;
+  std::vector<float> pitch_buffer_12kHz_;
+  std::vector<float> auto_correlation_12kHz_;
+};
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,513 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h"
+
+#include <stdlib.h>
+
+#include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <numeric>
+
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+#include "modules/audio_processing/agc2/rnn_vad/vector_math.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_compare.h"
+#include "rtc_base/numerics/safe_conversions.h"
+#include "rtc_base/system/arch.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+float ComputeAutoCorrelation(
+    int inverted_lag,
+    rtc::ArrayView<const float, kBufSize24kHz> pitch_buffer,
+    const VectorMath& vector_math) {
+  RTC_DCHECK_LT(inverted_lag, kBufSize24kHz);
+  RTC_DCHECK_LT(inverted_lag, kRefineNumLags24kHz);
+  static_assert(kMaxPitch24kHz < kBufSize24kHz, "");
+  return vector_math.DotProduct(
+      pitch_buffer.subview(/*offset=*/kMaxPitch24kHz),
+      pitch_buffer.subview(inverted_lag, kFrameSize20ms24kHz));
+}
+
+// Given an auto-correlation coefficient `curr_auto_correlation` and its
+// neighboring values `prev_auto_correlation` and `next_auto_correlation`
+// computes a pseudo-interpolation offset to be applied to the pitch period
+// associated to `curr`. The output is a lag in {-1, 0, +1}.
+// TODO(bugs.webrtc.org/9076): Consider removing this method.
+// `GetPitchPseudoInterpolationOffset()` it is relevant only if the spectral
+// analysis works at a sample rate that is twice as that of the pitch buffer;
+// In particular, it is not relevant for the estimated pitch period feature fed
+// into the RNN.
+int GetPitchPseudoInterpolationOffset(float prev_auto_correlation,
+                                      float curr_auto_correlation,
+                                      float next_auto_correlation) {
+  if ((next_auto_correlation - prev_auto_correlation) >
+      0.7f * (curr_auto_correlation - prev_auto_correlation)) {
+    return 1;  // |next_auto_correlation| is the largest auto-correlation
+               // coefficient.
+  } else if ((prev_auto_correlation - next_auto_correlation) >
+             0.7f * (curr_auto_correlation - next_auto_correlation)) {
+    return -1;  // |prev_auto_correlation| is the largest auto-correlation
+                // coefficient.
+  }
+  return 0;
+}
+
+// Refines a pitch period |lag| encoded as lag with pseudo-interpolation. The
+// output sample rate is twice as that of |lag|.
+int PitchPseudoInterpolationLagPitchBuf(
+    int lag,
+    rtc::ArrayView<const float, kBufSize24kHz> pitch_buffer,
+    const VectorMath& vector_math) {
+  int offset = 0;
+  // Cannot apply pseudo-interpolation at the boundaries.
+  if (lag > 0 && lag < kMaxPitch24kHz) {
+    const int inverted_lag = kMaxPitch24kHz - lag;
+    offset = GetPitchPseudoInterpolationOffset(
+        ComputeAutoCorrelation(inverted_lag + 1, pitch_buffer, vector_math),
+        ComputeAutoCorrelation(inverted_lag, pitch_buffer, vector_math),
+        ComputeAutoCorrelation(inverted_lag - 1, pitch_buffer, vector_math));
+  }
+  return 2 * lag + offset;
+}
+
+// Integer multipliers used in ComputeExtendedPitchPeriod48kHz() when
+// looking for sub-harmonics.
+// The values have been chosen to serve the following algorithm. Given the
+// initial pitch period T, we examine whether one of its harmonics is the true
+// fundamental frequency. We consider T/k with k in {2, ..., 15}. For each of
+// these harmonics, in addition to the pitch strength of itself, we choose one
+// multiple of its pitch period, n*T/k, to validate it (by averaging their pitch
+// strengths). The multiplier n is chosen so that n*T/k is used only one time
+// over all k. When for example k = 4, we should also expect a peak at 3*T/4.
+// When k = 8 instead we don't want to look at 2*T/8, since we have already
+// checked T/4 before. Instead, we look at T*3/8.
+// The array can be generate in Python as follows:
+//   from fractions import Fraction
+//   # Smallest positive integer not in X.
+//   def mex(X):
+//     for i in range(1, int(max(X)+2)):
+//       if i not in X:
+//         return i
+//   # Visited multiples of the period.
+//   S = {1}
+//   for n in range(2, 16):
+//     sn = mex({n * i for i in S} | {1})
+//     S = S | {Fraction(1, n), Fraction(sn, n)}
+//     print(sn, end=', ')
+constexpr std::array<int, 14> kSubHarmonicMultipliers = {
+    {3, 2, 3, 2, 5, 2, 3, 2, 3, 2, 5, 2, 3, 2}};
+
+struct Range {
+  int min;
+  int max;
+};
+
+// Number of analyzed pitches to the left(right) of a pitch candidate.
+constexpr int kPitchNeighborhoodRadius = 2;
+
+// Creates a pitch period interval centered in `inverted_lag` with hard-coded
+// radius. Clipping is applied so that the interval is always valid for a 24 kHz
+// pitch buffer.
+Range CreateInvertedLagRange(int inverted_lag) {
+  return {std::max(inverted_lag - kPitchNeighborhoodRadius, 0),
+          std::min(inverted_lag + kPitchNeighborhoodRadius,
+                   kInitialNumLags24kHz - 1)};
+}
+
+constexpr int kNumPitchCandidates = 2;  // Best and second best.
+// Maximum number of analyzed pitch periods.
+constexpr int kMaxPitchPeriods24kHz =
+    kNumPitchCandidates * (2 * kPitchNeighborhoodRadius + 1);
+
+// Collection of inverted lags.
+class InvertedLagsIndex {
+ public:
+  InvertedLagsIndex() : num_entries_(0) {}
+  // Adds an inverted lag to the index. Cannot add more than
+  // `kMaxPitchPeriods24kHz` values.
+  void Append(int inverted_lag) {
+    RTC_DCHECK_LT(num_entries_, kMaxPitchPeriods24kHz);
+    inverted_lags_[num_entries_++] = inverted_lag;
+  }
+  const int* data() const { return inverted_lags_.data(); }
+  int size() const { return num_entries_; }
+
+ private:
+  std::array<int, kMaxPitchPeriods24kHz> inverted_lags_;
+  int num_entries_;
+};
+
+// Computes the auto correlation coefficients for the inverted lags in the
+// closed interval `inverted_lags`. Updates `inverted_lags_index` by appending
+// the inverted lags for the computed auto correlation values.
+void ComputeAutoCorrelation(
+    Range inverted_lags,
+    rtc::ArrayView<const float, kBufSize24kHz> pitch_buffer,
+    rtc::ArrayView<float, kInitialNumLags24kHz> auto_correlation,
+    InvertedLagsIndex& inverted_lags_index,
+    const VectorMath& vector_math) {
+  // Check valid range.
+  RTC_DCHECK_LE(inverted_lags.min, inverted_lags.max);
+  // Trick to avoid zero initialization of `auto_correlation`.
+  // Needed by the pseudo-interpolation.
+  if (inverted_lags.min > 0) {
+    auto_correlation[inverted_lags.min - 1] = 0.f;
+  }
+  if (inverted_lags.max < kInitialNumLags24kHz - 1) {
+    auto_correlation[inverted_lags.max + 1] = 0.f;
+  }
+  // Check valid `inverted_lag` indexes.
+  RTC_DCHECK_GE(inverted_lags.min, 0);
+  RTC_DCHECK_LT(inverted_lags.max, kInitialNumLags24kHz);
+  for (int inverted_lag = inverted_lags.min; inverted_lag <= inverted_lags.max;
+       ++inverted_lag) {
+    auto_correlation[inverted_lag] =
+        ComputeAutoCorrelation(inverted_lag, pitch_buffer, vector_math);
+    inverted_lags_index.Append(inverted_lag);
+  }
+}
+
+// Searches the strongest pitch period at 24 kHz and returns its inverted lag at
+// 48 kHz.
+int ComputePitchPeriod48kHz(
+    rtc::ArrayView<const float, kBufSize24kHz> pitch_buffer,
+    rtc::ArrayView<const int> inverted_lags,
+    rtc::ArrayView<const float, kInitialNumLags24kHz> auto_correlation,
+    rtc::ArrayView<const float, kRefineNumLags24kHz> y_energy,
+    const VectorMath& vector_math) {
+  static_assert(kMaxPitch24kHz > kInitialNumLags24kHz, "");
+  static_assert(kMaxPitch24kHz < kBufSize24kHz, "");
+  int best_inverted_lag = 0;     // Pitch period.
+  float best_numerator = -1.f;   // Pitch strength numerator.
+  float best_denominator = 0.f;  // Pitch strength denominator.
+  for (int inverted_lag : inverted_lags) {
+    // A pitch candidate must have positive correlation.
+    if (auto_correlation[inverted_lag] > 0.f) {
+      // Auto-correlation energy normalized by frame energy.
+      const float numerator =
+          auto_correlation[inverted_lag] * auto_correlation[inverted_lag];
+      const float denominator = y_energy[inverted_lag];
+      // Compare numerator/denominator ratios without using divisions.
+      if (numerator * best_denominator > best_numerator * denominator) {
+        best_inverted_lag = inverted_lag;
+        best_numerator = numerator;
+        best_denominator = denominator;
+      }
+    }
+  }
+  // Pseudo-interpolation to transform `best_inverted_lag` (24 kHz pitch) to a
+  // 48 kHz pitch period.
+  if (best_inverted_lag == 0 || best_inverted_lag >= kInitialNumLags24kHz - 1) {
+    // Cannot apply pseudo-interpolation at the boundaries.
+    return best_inverted_lag * 2;
+  }
+  int offset = GetPitchPseudoInterpolationOffset(
+      auto_correlation[best_inverted_lag + 1],
+      auto_correlation[best_inverted_lag],
+      auto_correlation[best_inverted_lag - 1]);
+  // TODO(bugs.webrtc.org/9076): When retraining, check if |offset| below should
+  // be subtracted since |inverted_lag| is an inverted lag but offset is a lag.
+  return 2 * best_inverted_lag + offset;
+}
+
+// Returns an alternative pitch period for `pitch_period` given a `multiplier`
+// and a `divisor` of the period.
+constexpr int GetAlternativePitchPeriod(int pitch_period,
+                                        int multiplier,
+                                        int divisor) {
+  RTC_DCHECK_GT(divisor, 0);
+  // Same as `round(multiplier * pitch_period / divisor)`.
+  return (2 * multiplier * pitch_period + divisor) / (2 * divisor);
+}
+
+// Returns true if the alternative pitch period is stronger than the initial one
+// given the last estimated pitch and the value of `period_divisor` used to
+// compute the alternative pitch period via `GetAlternativePitchPeriod()`.
+bool IsAlternativePitchStrongerThanInitial(PitchInfo last,
+                                           PitchInfo initial,
+                                           PitchInfo alternative,
+                                           int period_divisor) {
+  // Initial pitch period candidate thresholds for a sample rate of 24 kHz.
+  // Computed as [5*k*k for k in range(16)].
+  constexpr std::array<int, 14> kInitialPitchPeriodThresholds = {
+      {20, 45, 80, 125, 180, 245, 320, 405, 500, 605, 720, 845, 980, 1125}};
+  static_assert(
+      kInitialPitchPeriodThresholds.size() == kSubHarmonicMultipliers.size(),
+      "");
+  RTC_DCHECK_GE(last.period, 0);
+  RTC_DCHECK_GE(initial.period, 0);
+  RTC_DCHECK_GE(alternative.period, 0);
+  RTC_DCHECK_GE(period_divisor, 2);
+  // Compute a term that lowers the threshold when |alternative.period| is close
+  // to the last estimated period |last.period| - i.e., pitch tracking.
+  float lower_threshold_term = 0.f;
+  if (std::abs(alternative.period - last.period) <= 1) {
+    // The candidate pitch period is within 1 sample from the last one.
+    // Make the candidate at |alternative.period| very easy to be accepted.
+    lower_threshold_term = last.strength;
+  } else if (std::abs(alternative.period - last.period) == 2 &&
+             initial.period >
+                 kInitialPitchPeriodThresholds[period_divisor - 2]) {
+    // The candidate pitch period is 2 samples far from the last one and the
+    // period |initial.period| (from which |alternative.period| has been
+    // derived) is greater than a threshold. Make |alternative.period| easy to
+    // be accepted.
+    lower_threshold_term = 0.5f * last.strength;
+  }
+  // Set the threshold based on the strength of the initial estimate
+  // |initial.period|. Also reduce the chance of false positives caused by a
+  // bias towards high frequencies (originating from short-term correlations).
+  float threshold =
+      std::max(0.3f, 0.7f * initial.strength - lower_threshold_term);
+  if (alternative.period < 3 * kMinPitch24kHz) {
+    // High frequency.
+    threshold = std::max(0.4f, 0.85f * initial.strength - lower_threshold_term);
+  } else if (alternative.period < 2 * kMinPitch24kHz) {
+    // Even higher frequency.
+    threshold = std::max(0.5f, 0.9f * initial.strength - lower_threshold_term);
+  }
+  return alternative.strength > threshold;
+}
+
+}  // namespace
+
+void Decimate2x(rtc::ArrayView<const float, kBufSize24kHz> src,
+                rtc::ArrayView<float, kBufSize12kHz> dst) {
+  // TODO(bugs.webrtc.org/9076): Consider adding anti-aliasing filter.
+  static_assert(2 * kBufSize12kHz == kBufSize24kHz, "");
+  for (int i = 0; i < kBufSize12kHz; ++i) {
+    dst[i] = src[2 * i];
+  }
+}
+
+void ComputeSlidingFrameSquareEnergies24kHz(
+    rtc::ArrayView<const float, kBufSize24kHz> pitch_buffer,
+    rtc::ArrayView<float, kRefineNumLags24kHz> y_energy,
+    AvailableCpuFeatures cpu_features) {
+  VectorMath vector_math(cpu_features);
+  static_assert(kFrameSize20ms24kHz < kBufSize24kHz, "");
+  const auto frame_20ms_view = pitch_buffer.subview(0, kFrameSize20ms24kHz);
+  float yy = vector_math.DotProduct(frame_20ms_view, frame_20ms_view);
+  y_energy[0] = yy;
+  static_assert(kMaxPitch24kHz - 1 + kFrameSize20ms24kHz < kBufSize24kHz, "");
+  static_assert(kMaxPitch24kHz < kRefineNumLags24kHz, "");
+  for (int inverted_lag = 0; inverted_lag < kMaxPitch24kHz; ++inverted_lag) {
+    yy -= pitch_buffer[inverted_lag] * pitch_buffer[inverted_lag];
+    yy += pitch_buffer[inverted_lag + kFrameSize20ms24kHz] *
+          pitch_buffer[inverted_lag + kFrameSize20ms24kHz];
+    yy = std::max(1.f, yy);
+    y_energy[inverted_lag + 1] = yy;
+  }
+}
+
+CandidatePitchPeriods ComputePitchPeriod12kHz(
+    rtc::ArrayView<const float, kBufSize12kHz> pitch_buffer,
+    rtc::ArrayView<const float, kNumLags12kHz> auto_correlation,
+    AvailableCpuFeatures cpu_features) {
+  static_assert(kMaxPitch12kHz > kNumLags12kHz, "");
+  static_assert(kMaxPitch12kHz < kBufSize12kHz, "");
+
+  // Stores a pitch candidate period and strength information.
+  struct PitchCandidate {
+    // Pitch period encoded as inverted lag.
+    int period_inverted_lag = 0;
+    // Pitch strength encoded as a ratio.
+    float strength_numerator = -1.f;
+    float strength_denominator = 0.f;
+    // Compare the strength of two pitch candidates.
+    bool HasStrongerPitchThan(const PitchCandidate& b) const {
+      // Comparing the numerator/denominator ratios without using divisions.
+      return strength_numerator * b.strength_denominator >
+             b.strength_numerator * strength_denominator;
+    }
+  };
+
+  VectorMath vector_math(cpu_features);
+  static_assert(kFrameSize20ms12kHz + 1 < kBufSize12kHz, "");
+  const auto frame_view = pitch_buffer.subview(0, kFrameSize20ms12kHz + 1);
+  float denominator = 1.f + vector_math.DotProduct(frame_view, frame_view);
+  // Search best and second best pitches by looking at the scaled
+  // auto-correlation.
+  PitchCandidate best;
+  PitchCandidate second_best;
+  second_best.period_inverted_lag = 1;
+  for (int inverted_lag = 0; inverted_lag < kNumLags12kHz; ++inverted_lag) {
+    // A pitch candidate must have positive correlation.
+    if (auto_correlation[inverted_lag] > 0.f) {
+      PitchCandidate candidate{
+          inverted_lag,
+          auto_correlation[inverted_lag] * auto_correlation[inverted_lag],
+          denominator};
+      if (candidate.HasStrongerPitchThan(second_best)) {
+        if (candidate.HasStrongerPitchThan(best)) {
+          second_best = best;
+          best = candidate;
+        } else {
+          second_best = candidate;
+        }
+      }
+    }
+    // Update |squared_energy_y| for the next inverted lag.
+    const float y_old = pitch_buffer[inverted_lag];
+    const float y_new = pitch_buffer[inverted_lag + kFrameSize20ms12kHz];
+    denominator -= y_old * y_old;
+    denominator += y_new * y_new;
+    denominator = std::max(0.f, denominator);
+  }
+  return {best.period_inverted_lag, second_best.period_inverted_lag};
+}
+
+int ComputePitchPeriod48kHz(
+    rtc::ArrayView<const float, kBufSize24kHz> pitch_buffer,
+    rtc::ArrayView<const float, kRefineNumLags24kHz> y_energy,
+    CandidatePitchPeriods pitch_candidates,
+    AvailableCpuFeatures cpu_features) {
+  // Compute the auto-correlation terms only for neighbors of the two pitch
+  // candidates (best and second best).
+  std::array<float, kInitialNumLags24kHz> auto_correlation;
+  InvertedLagsIndex inverted_lags_index;
+  // Create two inverted lag ranges so that `r1` precedes `r2`.
+  const bool swap_candidates =
+      pitch_candidates.best > pitch_candidates.second_best;
+  const Range r1 = CreateInvertedLagRange(
+      swap_candidates ? pitch_candidates.second_best : pitch_candidates.best);
+  const Range r2 = CreateInvertedLagRange(
+      swap_candidates ? pitch_candidates.best : pitch_candidates.second_best);
+  // Check valid ranges.
+  RTC_DCHECK_LE(r1.min, r1.max);
+  RTC_DCHECK_LE(r2.min, r2.max);
+  // Check `r1` precedes `r2`.
+  RTC_DCHECK_LE(r1.min, r2.min);
+  RTC_DCHECK_LE(r1.max, r2.max);
+  VectorMath vector_math(cpu_features);
+  if (r1.max + 1 >= r2.min) {
+    // Overlapping or adjacent ranges.
+    ComputeAutoCorrelation({r1.min, r2.max}, pitch_buffer, auto_correlation,
+                           inverted_lags_index, vector_math);
+  } else {
+    // Disjoint ranges.
+    ComputeAutoCorrelation(r1, pitch_buffer, auto_correlation,
+                           inverted_lags_index, vector_math);
+    ComputeAutoCorrelation(r2, pitch_buffer, auto_correlation,
+                           inverted_lags_index, vector_math);
+  }
+  return ComputePitchPeriod48kHz(pitch_buffer, inverted_lags_index,
+                                 auto_correlation, y_energy, vector_math);
+}
+
+PitchInfo ComputeExtendedPitchPeriod48kHz(
+    rtc::ArrayView<const float, kBufSize24kHz> pitch_buffer,
+    rtc::ArrayView<const float, kRefineNumLags24kHz> y_energy,
+    int initial_pitch_period_48kHz,
+    PitchInfo last_pitch_48kHz,
+    AvailableCpuFeatures cpu_features) {
+  RTC_DCHECK_LE(kMinPitch48kHz, initial_pitch_period_48kHz);
+  RTC_DCHECK_LE(initial_pitch_period_48kHz, kMaxPitch48kHz);
+
+  // Stores information for a refined pitch candidate.
+  struct RefinedPitchCandidate {
+    int period;
+    float strength;
+    // Additional strength data used for the final pitch estimation.
+    float xy;        // Auto-correlation.
+    float y_energy;  // Energy of the sliding frame `y`.
+  };
+
+  const float x_energy = y_energy[kMaxPitch24kHz];
+  const auto pitch_strength = [x_energy](float xy, float y_energy) {
+    RTC_DCHECK_GE(x_energy * y_energy, 0.f);
+    return xy / std::sqrt(1.f + x_energy * y_energy);
+  };
+  VectorMath vector_math(cpu_features);
+
+  // Initialize the best pitch candidate with `initial_pitch_period_48kHz`.
+  RefinedPitchCandidate best_pitch;
+  best_pitch.period =
+      std::min(initial_pitch_period_48kHz / 2, kMaxPitch24kHz - 1);
+  best_pitch.xy = ComputeAutoCorrelation(kMaxPitch24kHz - best_pitch.period,
+                                         pitch_buffer, vector_math);
+  best_pitch.y_energy = y_energy[kMaxPitch24kHz - best_pitch.period];
+  best_pitch.strength = pitch_strength(best_pitch.xy, best_pitch.y_energy);
+  // Keep a copy of the initial pitch candidate.
+  const PitchInfo initial_pitch{best_pitch.period, best_pitch.strength};
+  // 24 kHz version of the last estimated pitch.
+  const PitchInfo last_pitch{last_pitch_48kHz.period / 2,
+                             last_pitch_48kHz.strength};
+
+  // Find `max_period_divisor` such that the result of
+  // `GetAlternativePitchPeriod(initial_pitch_period, 1, max_period_divisor)`
+  // equals `kMinPitch24kHz`.
+  const int max_period_divisor =
+      (2 * initial_pitch.period) / (2 * kMinPitch24kHz - 1);
+  for (int period_divisor = 2; period_divisor <= max_period_divisor;
+       ++period_divisor) {
+    PitchInfo alternative_pitch;
+    alternative_pitch.period = GetAlternativePitchPeriod(
+        initial_pitch.period, /*multiplier=*/1, period_divisor);
+    RTC_DCHECK_GE(alternative_pitch.period, kMinPitch24kHz);
+    // When looking at |alternative_pitch.period|, we also look at one of its
+    // sub-harmonics. |kSubHarmonicMultipliers| is used to know where to look.
+    // |period_divisor| == 2 is a special case since |dual_alternative_period|
+    // might be greater than the maximum pitch period.
+    int dual_alternative_period = GetAlternativePitchPeriod(
+        initial_pitch.period, kSubHarmonicMultipliers[period_divisor - 2],
+        period_divisor);
+    RTC_DCHECK_GT(dual_alternative_period, 0);
+    if (period_divisor == 2 && dual_alternative_period > kMaxPitch24kHz) {
+      dual_alternative_period = initial_pitch.period;
+    }
+    RTC_DCHECK_NE(alternative_pitch.period, dual_alternative_period)
+        << "The lower pitch period and the additional sub-harmonic must not "
+           "coincide.";
+    // Compute an auto-correlation score for the primary pitch candidate
+    // |alternative_pitch.period| by also looking at its possible sub-harmonic
+    // |dual_alternative_period|.
+    const float xy_primary_period = ComputeAutoCorrelation(
+        kMaxPitch24kHz - alternative_pitch.period, pitch_buffer, vector_math);
+    // TODO(webrtc:10480): Copy `xy_primary_period` if the secondary period is
+    // equal to the primary one.
+    const float xy_secondary_period = ComputeAutoCorrelation(
+        kMaxPitch24kHz - dual_alternative_period, pitch_buffer, vector_math);
+    const float xy = 0.5f * (xy_primary_period + xy_secondary_period);
+    const float yy =
+        0.5f * (y_energy[kMaxPitch24kHz - alternative_pitch.period] +
+                y_energy[kMaxPitch24kHz - dual_alternative_period]);
+    alternative_pitch.strength = pitch_strength(xy, yy);
+
+    // Maybe update best period.
+    if (IsAlternativePitchStrongerThanInitial(
+            last_pitch, initial_pitch, alternative_pitch, period_divisor)) {
+      best_pitch = {alternative_pitch.period, alternative_pitch.strength, xy,
+                    yy};
+    }
+  }
+
+  // Final pitch strength and period.
+  best_pitch.xy = std::max(0.f, best_pitch.xy);
+  RTC_DCHECK_LE(0.f, best_pitch.y_energy);
+  float final_pitch_strength =
+      (best_pitch.y_energy <= best_pitch.xy)
+          ? 1.f
+          : best_pitch.xy / (best_pitch.y_energy + 1.f);
+  final_pitch_strength = std::min(best_pitch.strength, final_pitch_strength);
+  int final_pitch_period_48kHz = std::max(
+      kMinPitch48kHz, PitchPseudoInterpolationLagPitchBuf(
+                          best_pitch.period, pitch_buffer, vector_math));
+
+  return {final_pitch_period_48kHz, final_pitch_strength};
+}
+
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,114 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_INTERNAL_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_INTERNAL_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <utility>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Performs 2x decimation without any anti-aliasing filter.
+void Decimate2x(rtc::ArrayView<const float, kBufSize24kHz> src,
+                rtc::ArrayView<float, kBufSize12kHz> dst);
+
+// Key concepts and keywords used below in this file.
+//
+// The pitch estimation relies on a pitch buffer, which is an array-like data
+// structured designed as follows:
+//
+// |....A....|.....B.....|
+//
+// The part on the left, named `A` contains the oldest samples, whereas `B`
+// contains the most recent ones. The size of `A` corresponds to the maximum
+// pitch period, that of `B` to the analysis frame size (e.g., 16 ms and 20 ms
+// respectively).
+//
+// Pitch estimation is essentially based on the analysis of two 20 ms frames
+// extracted from the pitch buffer. One frame, called `x`, is kept fixed and
+// corresponds to `B` - i.e., the most recent 20 ms. The other frame, called
+// `y`, is extracted from different parts of the buffer instead.
+//
+// The offset between `x` and `y` corresponds to a specific pitch period.
+// For instance, if `y` is positioned at the beginning of the pitch buffer, then
+// the cross-correlation between `x` and `y` can be used as an indication of the
+// strength for the maximum pitch.
+//
+// Such an offset can be encoded in two ways:
+// - As a lag, which is the index in the pitch buffer for the first item in `y`
+// - As an inverted lag, which is the number of samples from the beginning of
+//   `x` and the end of `y`
+//
+// |---->| lag
+// |....A....|.....B.....|
+//       |<--| inverted lag
+//       |.....y.....| `y` 20 ms frame
+//
+// The inverted lag has the advantage of being directly proportional to the
+// corresponding pitch period.
+
+// Computes the sum of squared samples for every sliding frame `y` in the pitch
+// buffer. The indexes of `y_energy` are inverted lags.
+void ComputeSlidingFrameSquareEnergies24kHz(
+    rtc::ArrayView<const float, kBufSize24kHz> pitch_buffer,
+    rtc::ArrayView<float, kRefineNumLags24kHz> y_energy,
+    AvailableCpuFeatures cpu_features);
+
+// Top-2 pitch period candidates. Unit: number of samples - i.e., inverted lags.
+struct CandidatePitchPeriods {
+  int best;
+  int second_best;
+};
+
+// Computes the candidate pitch periods at 12 kHz given a view on the 12 kHz
+// pitch buffer and the auto-correlation values (having inverted lags as
+// indexes).
+CandidatePitchPeriods ComputePitchPeriod12kHz(
+    rtc::ArrayView<const float, kBufSize12kHz> pitch_buffer,
+    rtc::ArrayView<const float, kNumLags12kHz> auto_correlation,
+    AvailableCpuFeatures cpu_features);
+
+// Computes the pitch period at 48 kHz given a view on the 24 kHz pitch buffer,
+// the energies for the sliding frames `y` at 24 kHz and the pitch period
+// candidates at 24 kHz (encoded as inverted lag).
+int ComputePitchPeriod48kHz(
+    rtc::ArrayView<const float, kBufSize24kHz> pitch_buffer,
+    rtc::ArrayView<const float, kRefineNumLags24kHz> y_energy,
+    CandidatePitchPeriods pitch_candidates_24kHz,
+    AvailableCpuFeatures cpu_features);
+
+struct PitchInfo {
+  int period;
+  float strength;
+};
+
+// Computes the pitch period at 48 kHz searching in an extended pitch range
+// given a view on the 24 kHz pitch buffer, the energies for the sliding frames
+// `y` at 24 kHz, the initial 48 kHz estimation (computed by
+// `ComputePitchPeriod48kHz()`) and the last estimated pitch.
+PitchInfo ComputeExtendedPitchPeriod48kHz(
+    rtc::ArrayView<const float, kBufSize24kHz> pitch_buffer,
+    rtc::ArrayView<const float, kRefineNumLags24kHz> y_energy,
+    int initial_pitch_period_48kHz,
+    PitchInfo last_pitch_48kHz,
+    AvailableCpuFeatures cpu_features);
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_PITCH_SEARCH_INTERNAL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_internal_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,217 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h"
+
+#include <array>
+#include <string>
+#include <tuple>
+
+#include "modules/audio_processing/agc2/rnn_vad/test_utils.h"
+#include "rtc_base/strings/string_builder.h"
+// TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+// #include "test/fpe_observer.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+constexpr int kTestPitchPeriodsLow = 3 * kMinPitch48kHz / 2;
+constexpr int kTestPitchPeriodsHigh = (3 * kMinPitch48kHz + kMaxPitch48kHz) / 2;
+
+constexpr float kTestPitchStrengthLow = 0.35f;
+constexpr float kTestPitchStrengthHigh = 0.75f;
+
+template <class T>
+std::string PrintTestIndexAndCpuFeatures(
+    const ::testing::TestParamInfo<T>& info) {
+  rtc::StringBuilder builder;
+  builder << info.index << "_" << info.param.cpu_features.ToString();
+  return builder.str();
+}
+
+// Finds the relevant CPU features combinations to test.
+std::vector<AvailableCpuFeatures> GetCpuFeaturesToTest() {
+  std::vector<AvailableCpuFeatures> v;
+  v.push_back(NoAvailableCpuFeatures());
+  AvailableCpuFeatures available = GetAvailableCpuFeatures();
+  if (available.avx2) {
+    v.push_back({/*sse2=*/false, /*avx2=*/true, /*neon=*/false});
+  }
+  if (available.sse2) {
+    v.push_back({/*sse2=*/true, /*avx2=*/false, /*neon=*/false});
+  }
+  return v;
+}
+
+// Checks that the frame-wise sliding square energy function produces output
+// within tolerance given test input data.
+TEST(RnnVadTest, ComputeSlidingFrameSquareEnergies24kHzWithinTolerance) {
+  const AvailableCpuFeatures cpu_features = GetAvailableCpuFeatures();
+
+  PitchTestData test_data;
+  std::array<float, kRefineNumLags24kHz> computed_output;
+  // TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+  // FloatingPointExceptionObserver fpe_observer;
+  ComputeSlidingFrameSquareEnergies24kHz(test_data.PitchBuffer24kHzView(),
+                                         computed_output, cpu_features);
+  auto square_energies_view = test_data.SquareEnergies24kHzView();
+  ExpectNearAbsolute({square_energies_view.data(), square_energies_view.size()},
+                     computed_output, 1e-3f);
+}
+
+// Checks that the estimated pitch period is bit-exact given test input data.
+TEST(RnnVadTest, ComputePitchPeriod12kHzBitExactness) {
+  const AvailableCpuFeatures cpu_features = GetAvailableCpuFeatures();
+
+  PitchTestData test_data;
+  std::array<float, kBufSize12kHz> pitch_buf_decimated;
+  Decimate2x(test_data.PitchBuffer24kHzView(), pitch_buf_decimated);
+  CandidatePitchPeriods pitch_candidates;
+  // TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+  // FloatingPointExceptionObserver fpe_observer;
+  pitch_candidates = ComputePitchPeriod12kHz(
+      pitch_buf_decimated, test_data.AutoCorrelation12kHzView(), cpu_features);
+  EXPECT_EQ(pitch_candidates.best, 140);
+  EXPECT_EQ(pitch_candidates.second_best, 142);
+}
+
+// Checks that the refined pitch period is bit-exact given test input data.
+TEST(RnnVadTest, ComputePitchPeriod48kHzBitExactness) {
+  const AvailableCpuFeatures cpu_features = GetAvailableCpuFeatures();
+
+  PitchTestData test_data;
+  std::vector<float> y_energy(kRefineNumLags24kHz);
+  rtc::ArrayView<float, kRefineNumLags24kHz> y_energy_view(y_energy.data(),
+                                                           kRefineNumLags24kHz);
+  ComputeSlidingFrameSquareEnergies24kHz(test_data.PitchBuffer24kHzView(),
+                                         y_energy_view, cpu_features);
+  // TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+  // FloatingPointExceptionObserver fpe_observer;
+  EXPECT_EQ(
+      ComputePitchPeriod48kHz(test_data.PitchBuffer24kHzView(), y_energy_view,
+                              /*pitch_candidates=*/{280, 284}, cpu_features),
+      560);
+  EXPECT_EQ(
+      ComputePitchPeriod48kHz(test_data.PitchBuffer24kHzView(), y_energy_view,
+                              /*pitch_candidates=*/{260, 284}, cpu_features),
+      568);
+}
+
+struct PitchCandidatesParameters {
+  CandidatePitchPeriods pitch_candidates;
+  AvailableCpuFeatures cpu_features;
+};
+
+class PitchCandidatesParametrization
+    : public ::testing::TestWithParam<PitchCandidatesParameters> {};
+
+// Checks that the result of `ComputePitchPeriod48kHz()` does not depend on the
+// order of the input pitch candidates.
+TEST_P(PitchCandidatesParametrization,
+       ComputePitchPeriod48kHzOrderDoesNotMatter) {
+  const PitchCandidatesParameters params = GetParam();
+  const CandidatePitchPeriods swapped_pitch_candidates{
+      params.pitch_candidates.second_best, params.pitch_candidates.best};
+
+  PitchTestData test_data;
+  std::vector<float> y_energy(kRefineNumLags24kHz);
+  rtc::ArrayView<float, kRefineNumLags24kHz> y_energy_view(y_energy.data(),
+                                                           kRefineNumLags24kHz);
+  ComputeSlidingFrameSquareEnergies24kHz(test_data.PitchBuffer24kHzView(),
+                                         y_energy_view, params.cpu_features);
+  EXPECT_EQ(
+      ComputePitchPeriod48kHz(test_data.PitchBuffer24kHzView(), y_energy_view,
+                              params.pitch_candidates, params.cpu_features),
+      ComputePitchPeriod48kHz(test_data.PitchBuffer24kHzView(), y_energy_view,
+                              swapped_pitch_candidates, params.cpu_features));
+}
+
+std::vector<PitchCandidatesParameters> CreatePitchCandidatesParameters() {
+  std::vector<PitchCandidatesParameters> v;
+  for (AvailableCpuFeatures cpu_features : GetCpuFeaturesToTest()) {
+    v.push_back({{0, 2}, cpu_features});
+    v.push_back({{260, 284}, cpu_features});
+    v.push_back({{280, 284}, cpu_features});
+    v.push_back(
+        {{kInitialNumLags24kHz - 2, kInitialNumLags24kHz - 1}, cpu_features});
+  }
+  return v;
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    RnnVadTest,
+    PitchCandidatesParametrization,
+    ::testing::ValuesIn(CreatePitchCandidatesParameters()),
+    PrintTestIndexAndCpuFeatures<PitchCandidatesParameters>);
+
+struct ExtendedPitchPeriodSearchParameters {
+  int initial_pitch_period;
+  PitchInfo last_pitch;
+  PitchInfo expected_pitch;
+  AvailableCpuFeatures cpu_features;
+};
+
+class ExtendedPitchPeriodSearchParametrizaion
+    : public ::testing::TestWithParam<ExtendedPitchPeriodSearchParameters> {};
+
+// Checks that the computed pitch period is bit-exact and that the computed
+// pitch strength is within tolerance given test input data.
+TEST_P(ExtendedPitchPeriodSearchParametrizaion,
+       PeriodBitExactnessGainWithinTolerance) {
+  const ExtendedPitchPeriodSearchParameters params = GetParam();
+
+  PitchTestData test_data;
+  std::vector<float> y_energy(kRefineNumLags24kHz);
+  rtc::ArrayView<float, kRefineNumLags24kHz> y_energy_view(y_energy.data(),
+                                                           kRefineNumLags24kHz);
+  ComputeSlidingFrameSquareEnergies24kHz(test_data.PitchBuffer24kHzView(),
+                                         y_energy_view, params.cpu_features);
+  // TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+  // FloatingPointExceptionObserver fpe_observer;
+  const auto computed_output = ComputeExtendedPitchPeriod48kHz(
+      test_data.PitchBuffer24kHzView(), y_energy_view,
+      params.initial_pitch_period, params.last_pitch, params.cpu_features);
+  EXPECT_EQ(params.expected_pitch.period, computed_output.period);
+  EXPECT_NEAR(params.expected_pitch.strength, computed_output.strength, 1e-6f);
+}
+
+std::vector<ExtendedPitchPeriodSearchParameters>
+CreateExtendedPitchPeriodSearchParameters() {
+  std::vector<ExtendedPitchPeriodSearchParameters> v;
+  for (AvailableCpuFeatures cpu_features : GetCpuFeaturesToTest()) {
+    for (int last_pitch_period :
+         {kTestPitchPeriodsLow, kTestPitchPeriodsHigh}) {
+      for (float last_pitch_strength :
+           {kTestPitchStrengthLow, kTestPitchStrengthHigh}) {
+        v.push_back({kTestPitchPeriodsLow,
+                     {last_pitch_period, last_pitch_strength},
+                     {91, -0.0188608f},
+                     cpu_features});
+        v.push_back({kTestPitchPeriodsHigh,
+                     {last_pitch_period, last_pitch_strength},
+                     {475, -0.0904344f},
+                     cpu_features});
+      }
+    }
+  }
+  return v;
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    RnnVadTest,
+    ExtendedPitchPeriodSearchParametrizaion,
+    ::testing::ValuesIn(CreateExtendedPitchPeriodSearchParameters()),
+    PrintTestIndexAndCpuFeatures<ExtendedPitchPeriodSearchParameters>);
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/pitch_search_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/pitch_search.h"
+
+#include <algorithm>
+#include <vector>
+
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "modules/audio_processing/agc2/rnn_vad/pitch_search_internal.h"
+#include "modules/audio_processing/agc2/rnn_vad/test_utils.h"
+// TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+// #include "test/fpe_observer.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Checks that the computed pitch period is bit-exact and that the computed
+// pitch gain is within tolerance given test input data.
+TEST(RnnVadTest, PitchSearchWithinTolerance) {
+  ChunksFileReader reader = CreateLpResidualAndPitchInfoReader();
+  const int num_frames = std::min(reader.num_chunks, 300);  // Max 3 s.
+  std::vector<float> lp_residual(kBufSize24kHz);
+  float expected_pitch_period, expected_pitch_strength;
+  const AvailableCpuFeatures cpu_features = GetAvailableCpuFeatures();
+  PitchEstimator pitch_estimator(cpu_features);
+  {
+    // TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+    // FloatingPointExceptionObserver fpe_observer;
+    for (int i = 0; i < num_frames; ++i) {
+      SCOPED_TRACE(i);
+      ASSERT_TRUE(reader.reader->ReadChunk(lp_residual));
+      ASSERT_TRUE(reader.reader->ReadValue(expected_pitch_period));
+      ASSERT_TRUE(reader.reader->ReadValue(expected_pitch_strength));
+      int pitch_period =
+          pitch_estimator.Estimate({lp_residual.data(), kBufSize24kHz});
+      EXPECT_EQ(expected_pitch_period, pitch_period);
+      EXPECT_NEAR(expected_pitch_strength,
+                  pitch_estimator.GetLastPitchStrengthForTesting(), 15e-6f);
+    }
+  }
+}
+
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/ring_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/ring_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/ring_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/ring_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,65 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RING_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RING_BUFFER_H_
+
+#include <array>
+#include <cstring>
+#include <type_traits>
+
+#include "api/array_view.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Ring buffer for N arrays of type T each one with size S.
+template <typename T, int S, int N>
+class RingBuffer {
+  static_assert(S > 0, "");
+  static_assert(N > 0, "");
+  static_assert(std::is_arithmetic<T>::value,
+                "Integral or floating point required.");
+
+ public:
+  RingBuffer() : tail_(0) {}
+  RingBuffer(const RingBuffer&) = delete;
+  RingBuffer& operator=(const RingBuffer&) = delete;
+  ~RingBuffer() = default;
+  // Set the ring buffer values to zero.
+  void Reset() { buffer_.fill(0); }
+  // Replace the least recently pushed array in the buffer with |new_values|.
+  void Push(rtc::ArrayView<const T, S> new_values) {
+    std::memcpy(buffer_.data() + S * tail_, new_values.data(), S * sizeof(T));
+    tail_ += 1;
+    if (tail_ == N)
+      tail_ = 0;
+  }
+  // Return an array view onto the array with a given delay. A view on the last
+  // and least recently push array is returned when |delay| is 0 and N - 1
+  // respectively.
+  rtc::ArrayView<const T, S> GetArrayView(int delay) const {
+    RTC_DCHECK_LE(0, delay);
+    RTC_DCHECK_LT(delay, N);
+    int offset = tail_ - 1 - delay;
+    if (offset < 0)
+      offset += N;
+    return {buffer_.data() + S * offset, S};
+  }
+
+ private:
+  int tail_;  // Index of the least recently pushed sub-array.
+  std::array<T, S * N> buffer_{};
+};
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RING_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/ring_buffer_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/ring_buffer_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/ring_buffer_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/ring_buffer_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,112 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/ring_buffer.h"
+
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+// Compare the elements of two given array views.
+template <typename T, std::ptrdiff_t S>
+void ExpectEq(rtc::ArrayView<const T, S> a, rtc::ArrayView<const T, S> b) {
+  for (int i = 0; i < S; ++i) {
+    SCOPED_TRACE(i);
+    EXPECT_EQ(a[i], b[i]);
+  }
+}
+
+// Test push/read sequences.
+template <typename T, int S, int N>
+void TestRingBuffer() {
+  SCOPED_TRACE(N);
+  SCOPED_TRACE(S);
+  std::array<T, S> prev_pushed_array;
+  std::array<T, S> pushed_array;
+  rtc::ArrayView<const T, S> pushed_array_view(pushed_array.data(), S);
+
+  // Init.
+  RingBuffer<T, S, N> ring_buf;
+  ring_buf.GetArrayView(0);
+  pushed_array.fill(0);
+  ring_buf.Push(pushed_array_view);
+  ExpectEq(pushed_array_view, ring_buf.GetArrayView(0));
+
+  // Push N times and check most recent and second most recent.
+  for (T v = 1; v <= static_cast<T>(N); ++v) {
+    SCOPED_TRACE(v);
+    prev_pushed_array = pushed_array;
+    pushed_array.fill(v);
+    ring_buf.Push(pushed_array_view);
+    ExpectEq(pushed_array_view, ring_buf.GetArrayView(0));
+    if (N > 1) {
+      pushed_array.fill(v - 1);
+      ExpectEq(pushed_array_view, ring_buf.GetArrayView(1));
+    }
+  }
+
+  // Check buffer.
+  for (int delay = 2; delay < N; ++delay) {
+    SCOPED_TRACE(delay);
+    T expected_value = N - static_cast<T>(delay);
+    pushed_array.fill(expected_value);
+    ExpectEq(pushed_array_view, ring_buf.GetArrayView(delay));
+  }
+}
+
+// Check that for different delays, different views are returned.
+TEST(RnnVadTest, RingBufferArrayViews) {
+  constexpr int s = 3;
+  constexpr int n = 4;
+  RingBuffer<int, s, n> ring_buf;
+  std::array<int, s> pushed_array;
+  pushed_array.fill(1);
+  for (int k = 0; k <= n; ++k) {  // Push data n + 1 times.
+    SCOPED_TRACE(k);
+    // Check array views.
+    for (int i = 0; i < n; ++i) {
+      SCOPED_TRACE(i);
+      auto view_i = ring_buf.GetArrayView(i);
+      for (int j = i + 1; j < n; ++j) {
+        SCOPED_TRACE(j);
+        auto view_j = ring_buf.GetArrayView(j);
+        EXPECT_NE(view_i, view_j);
+      }
+    }
+    ring_buf.Push(pushed_array);
+  }
+}
+
+TEST(RnnVadTest, RingBufferUnsigned) {
+  TestRingBuffer<uint8_t, 1, 1>();
+  TestRingBuffer<uint8_t, 2, 5>();
+  TestRingBuffer<uint8_t, 5, 2>();
+  TestRingBuffer<uint8_t, 5, 5>();
+}
+
+TEST(RnnVadTest, RingBufferSigned) {
+  TestRingBuffer<int, 1, 1>();
+  TestRingBuffer<int, 2, 5>();
+  TestRingBuffer<int, 5, 2>();
+  TestRingBuffer<int, 5, 5>();
+}
+
+TEST(RnnVadTest, RingBufferFloating) {
+  TestRingBuffer<float, 1, 1>();
+  TestRingBuffer<float, 2, 5>();
+  TestRingBuffer<float, 5, 2>();
+  TestRingBuffer<float, 5, 5>();
+}
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,91 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/rnn.h"
+
+#include "rtc_base/checks.h"
+#include "third_party/rnnoise/src/rnn_vad_weights.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+using ::rnnoise::kInputLayerInputSize;
+static_assert(kFeatureVectorSize == kInputLayerInputSize, "");
+using ::rnnoise::kInputDenseBias;
+using ::rnnoise::kInputDenseWeights;
+using ::rnnoise::kInputLayerOutputSize;
+static_assert(kInputLayerOutputSize <= kFullyConnectedLayerMaxUnits, "");
+
+using ::rnnoise::kHiddenGruBias;
+using ::rnnoise::kHiddenGruRecurrentWeights;
+using ::rnnoise::kHiddenGruWeights;
+using ::rnnoise::kHiddenLayerOutputSize;
+static_assert(kHiddenLayerOutputSize <= kGruLayerMaxUnits, "");
+
+using ::rnnoise::kOutputDenseBias;
+using ::rnnoise::kOutputDenseWeights;
+using ::rnnoise::kOutputLayerOutputSize;
+static_assert(kOutputLayerOutputSize <= kFullyConnectedLayerMaxUnits, "");
+
+}  // namespace
+
+RnnVad::RnnVad(const AvailableCpuFeatures& cpu_features)
+    : input_(kInputLayerInputSize,
+             kInputLayerOutputSize,
+             kInputDenseBias,
+             kInputDenseWeights,
+             ActivationFunction::kTansigApproximated,
+             cpu_features,
+             /*layer_name=*/"FC1"),
+      hidden_(kInputLayerOutputSize,
+              kHiddenLayerOutputSize,
+              kHiddenGruBias,
+              kHiddenGruWeights,
+              kHiddenGruRecurrentWeights,
+              cpu_features,
+              /*layer_name=*/"GRU1"),
+      output_(kHiddenLayerOutputSize,
+              kOutputLayerOutputSize,
+              kOutputDenseBias,
+              kOutputDenseWeights,
+              ActivationFunction::kSigmoidApproximated,
+              // The output layer is just 24x1. The unoptimized code is faster.
+              NoAvailableCpuFeatures(),
+              /*layer_name=*/"FC2") {
+  // Input-output chaining size checks.
+  RTC_DCHECK_EQ(input_.size(), hidden_.input_size())
+      << "The input and the hidden layers sizes do not match.";
+  RTC_DCHECK_EQ(hidden_.size(), output_.input_size())
+      << "The hidden and the output layers sizes do not match.";
+}
+
+RnnVad::~RnnVad() = default;
+
+void RnnVad::Reset() {
+  hidden_.Reset();
+}
+
+float RnnVad::ComputeVadProbability(
+    rtc::ArrayView<const float, kFeatureVectorSize> feature_vector,
+    bool is_silence) {
+  if (is_silence) {
+    Reset();
+    return 0.f;
+  }
+  input_.ComputeOutput(feature_vector);
+  hidden_.ComputeOutput(input_);
+  output_.ComputeOutput(hidden_);
+  RTC_DCHECK_EQ(output_.size(), 1);
+  return output_.data()[0];
+}
+
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <algorithm>
+#include <numeric>
+
+#include "modules/audio_processing/agc2/rnn_vad/rnn_fc.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_conversions.h"
+#include "third_party/rnnoise/src/rnn_activations.h"
+#include "third_party/rnnoise/src/rnn_vad_weights.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+std::vector<float> GetScaledParams(rtc::ArrayView<const int8_t> params) {
+  std::vector<float> scaled_params(params.size());
+  std::transform(params.begin(), params.end(), scaled_params.begin(),
+                 [](int8_t x) -> float {
+                   return ::rnnoise::kWeightsScale * static_cast<float>(x);
+                 });
+  return scaled_params;
+}
+
+// TODO(bugs.chromium.org/10480): Hard-code optimized layout and remove this
+// function to improve setup time.
+// Casts and scales |weights| and re-arranges the layout.
+std::vector<float> PreprocessWeights(rtc::ArrayView<const int8_t> weights,
+                                     int output_size) {
+  if (output_size == 1) {
+    return GetScaledParams(weights);
+  }
+  // Transpose, scale and cast.
+  const int input_size = rtc::CheckedDivExact(
+      rtc::dchecked_cast<int>(weights.size()), output_size);
+  std::vector<float> w(weights.size());
+  for (int o = 0; o < output_size; ++o) {
+    for (int i = 0; i < input_size; ++i) {
+      w[o * input_size + i] = rnnoise::kWeightsScale *
+                              static_cast<float>(weights[i * output_size + o]);
+    }
+  }
+  return w;
+}
+
+rtc::FunctionView<float(float)> GetActivationFunction(
+    ActivationFunction activation_function) {
+  switch (activation_function) {
+    case ActivationFunction::kTansigApproximated:
+      return ::rnnoise::TansigApproximated;
+      break;
+    case ActivationFunction::kSigmoidApproximated:
+      return ::rnnoise::SigmoidApproximated;
+      break;
+  }
+}
+
+}  // namespace
+
+FullyConnectedLayer::FullyConnectedLayer(
+    const int input_size,
+    const int output_size,
+    const rtc::ArrayView<const int8_t> bias,
+    const rtc::ArrayView<const int8_t> weights,
+    ActivationFunction activation_function,
+    const AvailableCpuFeatures& cpu_features,
+    absl::string_view layer_name)
+    : input_size_(input_size),
+      output_size_(output_size),
+      bias_(GetScaledParams(bias)),
+      weights_(PreprocessWeights(weights, output_size)),
+      vector_math_(cpu_features),
+      activation_function_(GetActivationFunction(activation_function)) {
+  RTC_DCHECK_LE(output_size_, kFullyConnectedLayerMaxUnits)
+      << "Insufficient FC layer over-allocation (" << layer_name << ").";
+  RTC_DCHECK_EQ(output_size_, bias_.size())
+      << "Mismatching output size and bias terms array size (" << layer_name
+      << ").";
+  RTC_DCHECK_EQ(input_size_ * output_size_, weights_.size())
+      << "Mismatching input-output size and weight coefficients array size ("
+      << layer_name << ").";
+}
+
+FullyConnectedLayer::~FullyConnectedLayer() = default;
+
+void FullyConnectedLayer::ComputeOutput(rtc::ArrayView<const float> input) {
+  RTC_DCHECK_EQ(input.size(), input_size_);
+  rtc::ArrayView<const float> weights(weights_);
+  for (int o = 0; o < output_size_; ++o) {
+    output_[o] = activation_function_(
+        bias_[o] + vector_math_.DotProduct(
+                       input, weights.subview(o * input_size_, input_size_)));
+  }
+}
+
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,72 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_FC_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_FC_H_
+
+#include <array>
+#include <vector>
+
+#include "absl/strings/string_view.h"
+#include "api/array_view.h"
+#include "api/function_view.h"
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "modules/audio_processing/agc2/rnn_vad/vector_math.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Activation function for a neural network cell.
+enum class ActivationFunction { kTansigApproximated, kSigmoidApproximated };
+
+// Maximum number of units for an FC layer.
+constexpr int kFullyConnectedLayerMaxUnits = 24;
+
+// Fully-connected layer with a custom activation function which owns the output
+// buffer.
+class FullyConnectedLayer {
+ public:
+  // Ctor. `output_size` cannot be greater than `kFullyConnectedLayerMaxUnits`.
+  FullyConnectedLayer(int input_size,
+                      int output_size,
+                      rtc::ArrayView<const int8_t> bias,
+                      rtc::ArrayView<const int8_t> weights,
+                      ActivationFunction activation_function,
+                      const AvailableCpuFeatures& cpu_features,
+                      absl::string_view layer_name);
+  FullyConnectedLayer(const FullyConnectedLayer&) = delete;
+  FullyConnectedLayer& operator=(const FullyConnectedLayer&) = delete;
+  ~FullyConnectedLayer();
+
+  // Returns the size of the input vector.
+  int input_size() const { return input_size_; }
+  // Returns the pointer to the first element of the output buffer.
+  const float* data() const { return output_.data(); }
+  // Returns the size of the output buffer.
+  int size() const { return output_size_; }
+
+  // Computes the fully-connected layer output.
+  void ComputeOutput(rtc::ArrayView<const float> input);
+
+ private:
+  const int input_size_;
+  const int output_size_;
+  const std::vector<float> bias_;
+  const std::vector<float> weights_;
+  const VectorMath vector_math_;
+  rtc::FunctionView<float(float)> activation_function_;
+  // Over-allocated array with size equal to `output_size_`.
+  std::array<float, kFullyConnectedLayerMaxUnits> output_;
+};
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_FC_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_fc_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,111 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/rnn_fc.h"
+
+#include <array>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "modules/audio_processing/agc2/rnn_vad/test_utils.h"
+#include "modules/audio_processing/test/performance_timer.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/system/arch.h"
+#include "test/gtest.h"
+#include "third_party/rnnoise/src/rnn_vad_weights.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+using ::rnnoise::kInputDenseBias;
+using ::rnnoise::kInputDenseWeights;
+using ::rnnoise::kInputLayerInputSize;
+using ::rnnoise::kInputLayerOutputSize;
+
+// Fully connected layer test data.
+constexpr std::array<float, 42> kFullyConnectedInputVector = {
+    -1.00131f,   -0.627069f, -7.81097f,  7.86285f,    -2.87145f,  3.32365f,
+    -0.653161f,  0.529839f,  -0.425307f, 0.25583f,    0.235094f,  0.230527f,
+    -0.144687f,  0.182785f,  0.57102f,   0.125039f,   0.479482f,  -0.0255439f,
+    -0.0073141f, -0.147346f, -0.217106f, -0.0846906f, -8.34943f,  3.09065f,
+    1.42628f,    -0.85235f,  -0.220207f, -0.811163f,  2.09032f,   -2.01425f,
+    -0.690268f,  -0.925327f, -0.541354f, 0.58455f,    -0.606726f, -0.0372358f,
+    0.565991f,   0.435854f,  0.420812f,  0.162198f,   -2.13f,     10.0089f};
+constexpr std::array<float, 24> kFullyConnectedExpectedOutput = {
+    -0.623293f, -0.988299f, 0.999378f,  0.967168f,  0.103087f,  -0.978545f,
+    -0.856347f, 0.346675f,  1.f,        -0.717442f, -0.544176f, 0.960363f,
+    0.983443f,  0.999991f,  -0.824335f, 0.984742f,  0.990208f,  0.938179f,
+    0.875092f,  0.999846f,  0.997707f,  -0.999382f, 0.973153f,  -0.966605f};
+
+class RnnFcParametrization
+    : public ::testing::TestWithParam<AvailableCpuFeatures> {};
+
+// Checks that the output of a fully connected layer is within tolerance given
+// test input data.
+TEST_P(RnnFcParametrization, CheckFullyConnectedLayerOutput) {
+  FullyConnectedLayer fc(kInputLayerInputSize, kInputLayerOutputSize,
+                         kInputDenseBias, kInputDenseWeights,
+                         ActivationFunction::kTansigApproximated,
+                         /*cpu_features=*/GetParam(),
+                         /*layer_name=*/"FC");
+  fc.ComputeOutput(kFullyConnectedInputVector);
+  ExpectNearAbsolute(kFullyConnectedExpectedOutput, fc, 1e-5f);
+}
+
+TEST_P(RnnFcParametrization, DISABLED_BenchmarkFullyConnectedLayer) {
+  const AvailableCpuFeatures cpu_features = GetParam();
+  FullyConnectedLayer fc(kInputLayerInputSize, kInputLayerOutputSize,
+                         kInputDenseBias, kInputDenseWeights,
+                         ActivationFunction::kTansigApproximated, cpu_features,
+                         /*layer_name=*/"FC");
+
+  constexpr int kNumTests = 10000;
+  ::webrtc::test::PerformanceTimer perf_timer(kNumTests);
+  for (int k = 0; k < kNumTests; ++k) {
+    perf_timer.StartTimer();
+    fc.ComputeOutput(kFullyConnectedInputVector);
+    perf_timer.StopTimer();
+  }
+  RTC_LOG(LS_INFO) << "CPU features: " << cpu_features.ToString() << " | "
+                   << (perf_timer.GetDurationAverage() / 1000) << " +/- "
+                   << (perf_timer.GetDurationStandardDeviation() / 1000)
+                   << " ms";
+}
+
+// Finds the relevant CPU features combinations to test.
+std::vector<AvailableCpuFeatures> GetCpuFeaturesToTest() {
+  std::vector<AvailableCpuFeatures> v;
+  v.push_back(NoAvailableCpuFeatures());
+  AvailableCpuFeatures available = GetAvailableCpuFeatures();
+  if (available.sse2) {
+    v.push_back({/*sse2=*/true, /*avx2=*/false, /*neon=*/false});
+  }
+  if (available.avx2) {
+    v.push_back({/*sse2=*/false, /*avx2=*/true, /*neon=*/false});
+  }
+  if (available.neon) {
+    v.push_back({/*sse2=*/false, /*avx2=*/false, /*neon=*/true});
+  }
+  return v;
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    RnnVadTest,
+    RnnFcParametrization,
+    ::testing::ValuesIn(GetCpuFeaturesToTest()),
+    [](const ::testing::TestParamInfo<AvailableCpuFeatures>& info) {
+      return info.param.ToString();
+    });
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,198 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/rnn_gru.h"
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_conversions.h"
+#include "third_party/rnnoise/src/rnn_activations.h"
+#include "third_party/rnnoise/src/rnn_vad_weights.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+constexpr int kNumGruGates = 3;  // Update, reset, output.
+
+std::vector<float> PreprocessGruTensor(rtc::ArrayView<const int8_t> tensor_src,
+                                       int output_size) {
+  // Transpose, cast and scale.
+  // |n| is the size of the first dimension of the 3-dim tensor |weights|.
+  const int n = rtc::CheckedDivExact(rtc::dchecked_cast<int>(tensor_src.size()),
+                                     output_size * kNumGruGates);
+  const int stride_src = kNumGruGates * output_size;
+  const int stride_dst = n * output_size;
+  std::vector<float> tensor_dst(tensor_src.size());
+  for (int g = 0; g < kNumGruGates; ++g) {
+    for (int o = 0; o < output_size; ++o) {
+      for (int i = 0; i < n; ++i) {
+        tensor_dst[g * stride_dst + o * n + i] =
+            ::rnnoise::kWeightsScale *
+            static_cast<float>(
+                tensor_src[i * stride_src + g * output_size + o]);
+      }
+    }
+  }
+  return tensor_dst;
+}
+
+// Computes the output for the update or the reset gate.
+// Operation: `g = sigmoid(W^T∙i + R^T∙s + b)` where
+// - `g`: output gate vector
+// - `W`: weights matrix
+// - `i`: input vector
+// - `R`: recurrent weights matrix
+// - `s`: state gate vector
+// - `b`: bias vector
+void ComputeUpdateResetGate(int input_size,
+                            int output_size,
+                            const VectorMath& vector_math,
+                            rtc::ArrayView<const float> input,
+                            rtc::ArrayView<const float> state,
+                            rtc::ArrayView<const float> bias,
+                            rtc::ArrayView<const float> weights,
+                            rtc::ArrayView<const float> recurrent_weights,
+                            rtc::ArrayView<float> gate) {
+  RTC_DCHECK_EQ(input.size(), input_size);
+  RTC_DCHECK_EQ(state.size(), output_size);
+  RTC_DCHECK_EQ(bias.size(), output_size);
+  RTC_DCHECK_EQ(weights.size(), input_size * output_size);
+  RTC_DCHECK_EQ(recurrent_weights.size(), output_size * output_size);
+  RTC_DCHECK_GE(gate.size(), output_size);  // `gate` is over-allocated.
+  for (int o = 0; o < output_size; ++o) {
+    float x = bias[o];
+    x += vector_math.DotProduct(input,
+                                weights.subview(o * input_size, input_size));
+    x += vector_math.DotProduct(
+        state, recurrent_weights.subview(o * output_size, output_size));
+    gate[o] = ::rnnoise::SigmoidApproximated(x);
+  }
+}
+
+// Computes the output for the state gate.
+// Operation: `s' = u .* s + (1 - u) .* ReLU(W^T∙i + R^T∙(s .* r) + b)` where
+// - `s'`: output state gate vector
+// - `s`: previous state gate vector
+// - `u`: update gate vector
+// - `W`: weights matrix
+// - `i`: input vector
+// - `R`: recurrent weights matrix
+// - `r`: reset gate vector
+// - `b`: bias vector
+// - `.*` element-wise product
+void ComputeStateGate(int input_size,
+                      int output_size,
+                      const VectorMath& vector_math,
+                      rtc::ArrayView<const float> input,
+                      rtc::ArrayView<const float> update,
+                      rtc::ArrayView<const float> reset,
+                      rtc::ArrayView<const float> bias,
+                      rtc::ArrayView<const float> weights,
+                      rtc::ArrayView<const float> recurrent_weights,
+                      rtc::ArrayView<float> state) {
+  RTC_DCHECK_EQ(input.size(), input_size);
+  RTC_DCHECK_GE(update.size(), output_size);  // `update` is over-allocated.
+  RTC_DCHECK_GE(reset.size(), output_size);   // `reset` is over-allocated.
+  RTC_DCHECK_EQ(bias.size(), output_size);
+  RTC_DCHECK_EQ(weights.size(), input_size * output_size);
+  RTC_DCHECK_EQ(recurrent_weights.size(), output_size * output_size);
+  RTC_DCHECK_EQ(state.size(), output_size);
+  std::array<float, kGruLayerMaxUnits> reset_x_state;
+  for (int o = 0; o < output_size; ++o) {
+    reset_x_state[o] = state[o] * reset[o];
+  }
+  for (int o = 0; o < output_size; ++o) {
+    float x = bias[o];
+    x += vector_math.DotProduct(input,
+                                weights.subview(o * input_size, input_size));
+    x += vector_math.DotProduct(
+        {reset_x_state.data(), static_cast<size_t>(output_size)},
+        recurrent_weights.subview(o * output_size, output_size));
+    state[o] = update[o] * state[o] + (1.f - update[o]) * std::max(0.f, x);
+  }
+}
+
+}  // namespace
+
+GatedRecurrentLayer::GatedRecurrentLayer(
+    const int input_size,
+    const int output_size,
+    const rtc::ArrayView<const int8_t> bias,
+    const rtc::ArrayView<const int8_t> weights,
+    const rtc::ArrayView<const int8_t> recurrent_weights,
+    const AvailableCpuFeatures& cpu_features,
+    absl::string_view layer_name)
+    : input_size_(input_size),
+      output_size_(output_size),
+      bias_(PreprocessGruTensor(bias, output_size)),
+      weights_(PreprocessGruTensor(weights, output_size)),
+      recurrent_weights_(PreprocessGruTensor(recurrent_weights, output_size)),
+      vector_math_(cpu_features) {
+  RTC_DCHECK_LE(output_size_, kGruLayerMaxUnits)
+      << "Insufficient GRU layer over-allocation (" << layer_name << ").";
+  RTC_DCHECK_EQ(kNumGruGates * output_size_, bias_.size())
+      << "Mismatching output size and bias terms array size (" << layer_name
+      << ").";
+  RTC_DCHECK_EQ(kNumGruGates * input_size_ * output_size_, weights_.size())
+      << "Mismatching input-output size and weight coefficients array size ("
+      << layer_name << ").";
+  RTC_DCHECK_EQ(kNumGruGates * output_size_ * output_size_,
+                recurrent_weights_.size())
+      << "Mismatching input-output size and recurrent weight coefficients array"
+         " size ("
+      << layer_name << ").";
+  Reset();
+}
+
+GatedRecurrentLayer::~GatedRecurrentLayer() = default;
+
+void GatedRecurrentLayer::Reset() {
+  state_.fill(0.f);
+}
+
+void GatedRecurrentLayer::ComputeOutput(rtc::ArrayView<const float> input) {
+  RTC_DCHECK_EQ(input.size(), input_size_);
+
+  // The tensors below are organized as a sequence of flattened tensors for the
+  // `update`, `reset` and `state` gates.
+  rtc::ArrayView<const float> bias(bias_);
+  rtc::ArrayView<const float> weights(weights_);
+  rtc::ArrayView<const float> recurrent_weights(recurrent_weights_);
+  // Strides to access to the flattened tensors for a specific gate.
+  const int stride_weights = input_size_ * output_size_;
+  const int stride_recurrent_weights = output_size_ * output_size_;
+
+  rtc::ArrayView<float> state(state_.data(), output_size_);
+
+  // Update gate.
+  std::array<float, kGruLayerMaxUnits> update;
+  ComputeUpdateResetGate(
+      input_size_, output_size_, vector_math_, input, state,
+      bias.subview(0, output_size_), weights.subview(0, stride_weights),
+      recurrent_weights.subview(0, stride_recurrent_weights), update);
+  // Reset gate.
+  std::array<float, kGruLayerMaxUnits> reset;
+  ComputeUpdateResetGate(input_size_, output_size_, vector_math_, input, state,
+                         bias.subview(output_size_, output_size_),
+                         weights.subview(stride_weights, stride_weights),
+                         recurrent_weights.subview(stride_recurrent_weights,
+                                                   stride_recurrent_weights),
+                         reset);
+  // State gate.
+  ComputeStateGate(input_size_, output_size_, vector_math_, input, update,
+                   reset, bias.subview(2 * output_size_, output_size_),
+                   weights.subview(2 * stride_weights, stride_weights),
+                   recurrent_weights.subview(2 * stride_recurrent_weights,
+                                             stride_recurrent_weights),
+                   state);
+}
+
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_GRU_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_GRU_H_
+
+#include <array>
+#include <vector>
+
+#include "absl/strings/string_view.h"
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "modules/audio_processing/agc2/rnn_vad/vector_math.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Maximum number of units for a GRU layer.
+constexpr int kGruLayerMaxUnits = 24;
+
+// Recurrent layer with gated recurrent units (GRUs) with sigmoid and ReLU as
+// activation functions for the update/reset and output gates respectively.
+class GatedRecurrentLayer {
+ public:
+  // Ctor. `output_size` cannot be greater than `kGruLayerMaxUnits`.
+  GatedRecurrentLayer(int input_size,
+                      int output_size,
+                      rtc::ArrayView<const int8_t> bias,
+                      rtc::ArrayView<const int8_t> weights,
+                      rtc::ArrayView<const int8_t> recurrent_weights,
+                      const AvailableCpuFeatures& cpu_features,
+                      absl::string_view layer_name);
+  GatedRecurrentLayer(const GatedRecurrentLayer&) = delete;
+  GatedRecurrentLayer& operator=(const GatedRecurrentLayer&) = delete;
+  ~GatedRecurrentLayer();
+
+  // Returns the size of the input vector.
+  int input_size() const { return input_size_; }
+  // Returns the pointer to the first element of the output buffer.
+  const float* data() const { return state_.data(); }
+  // Returns the size of the output buffer.
+  int size() const { return output_size_; }
+
+  // Resets the GRU state.
+  void Reset();
+  // Computes the recurrent layer output and updates the status.
+  void ComputeOutput(rtc::ArrayView<const float> input);
+
+ private:
+  const int input_size_;
+  const int output_size_;
+  const std::vector<float> bias_;
+  const std::vector<float> weights_;
+  const std::vector<float> recurrent_weights_;
+  const VectorMath vector_math_;
+  // Over-allocated array with size equal to `output_size_`.
+  std::array<float, kGruLayerMaxUnits> state_;
+};
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_GRU_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_gru_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,186 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/rnn_gru.h"
+
+#include <array>
+#include <memory>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/rnn_vad/test_utils.h"
+#include "modules/audio_processing/test/performance_timer.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "test/gtest.h"
+#include "third_party/rnnoise/src/rnn_vad_weights.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+void TestGatedRecurrentLayer(
+    GatedRecurrentLayer& gru,
+    rtc::ArrayView<const float> input_sequence,
+    rtc::ArrayView<const float> expected_output_sequence) {
+  const int input_sequence_length = rtc::CheckedDivExact(
+      rtc::dchecked_cast<int>(input_sequence.size()), gru.input_size());
+  const int output_sequence_length = rtc::CheckedDivExact(
+      rtc::dchecked_cast<int>(expected_output_sequence.size()), gru.size());
+  ASSERT_EQ(input_sequence_length, output_sequence_length)
+      << "The test data length is invalid.";
+  // Feed the GRU layer and check the output at every step.
+  gru.Reset();
+  for (int i = 0; i < input_sequence_length; ++i) {
+    SCOPED_TRACE(i);
+    gru.ComputeOutput(
+        input_sequence.subview(i * gru.input_size(), gru.input_size()));
+    const auto expected_output =
+        expected_output_sequence.subview(i * gru.size(), gru.size());
+    ExpectNearAbsolute(expected_output, gru, 3e-6f);
+  }
+}
+
+// Gated recurrent units layer test data.
+constexpr int kGruInputSize = 5;
+constexpr int kGruOutputSize = 4;
+constexpr std::array<int8_t, 12> kGruBias = {96,   -99, -81, -114, 49,  119,
+                                             -118, 68,  -76, 91,   121, 125};
+constexpr std::array<int8_t, 60> kGruWeights = {
+    // Input 0.
+    124, 9, 1, 116,        // Update.
+    -66, -21, -118, -110,  // Reset.
+    104, 75, -23, -51,     // Output.
+    // Input 1.
+    -72, -111, 47, 93,   // Update.
+    77, -98, 41, -8,     // Reset.
+    40, -23, -43, -107,  // Output.
+    // Input 2.
+    9, -73, 30, -32,      // Update.
+    -2, 64, -26, 91,      // Reset.
+    -48, -24, -28, -104,  // Output.
+    // Input 3.
+    74, -46, 116, 15,    // Update.
+    32, 52, -126, -38,   // Reset.
+    -121, 12, -16, 110,  // Output.
+    // Input 4.
+    -95, 66, -103, -35,  // Update.
+    -38, 3, -126, -61,   // Reset.
+    28, 98, -117, -43    // Output.
+};
+constexpr std::array<int8_t, 48> kGruRecurrentWeights = {
+    // Output 0.
+    -3, 87, 50, 51,     // Update.
+    -22, 27, -39, 62,   // Reset.
+    31, -83, -52, -48,  // Output.
+    // Output 1.
+    -6, 83, -19, 104,  // Update.
+    105, 48, 23, 68,   // Reset.
+    23, 40, 7, -120,   // Output.
+    // Output 2.
+    64, -62, 117, 85,     // Update.
+    51, -43, 54, -105,    // Reset.
+    120, 56, -128, -107,  // Output.
+    // Output 3.
+    39, 50, -17, -47,   // Update.
+    -117, 14, 108, 12,  // Reset.
+    -7, -72, 103, -87,  // Output.
+};
+constexpr std::array<float, 20> kGruInputSequence = {
+    0.89395463f, 0.93224651f, 0.55788344f, 0.32341808f, 0.93355054f,
+    0.13475326f, 0.97370994f, 0.14253306f, 0.93710381f, 0.76093364f,
+    0.65780413f, 0.41657975f, 0.49403164f, 0.46843281f, 0.75138855f,
+    0.24517593f, 0.47657707f, 0.57064998f, 0.435184f,   0.19319285f};
+constexpr std::array<float, 16> kGruExpectedOutputSequence = {
+    0.0239123f,  0.5773077f,  0.f,         0.f,
+    0.01282811f, 0.64330572f, 0.f,         0.04863098f,
+    0.00781069f, 0.75267816f, 0.f,         0.02579715f,
+    0.00471378f, 0.59162533f, 0.11087593f, 0.01334511f};
+
+class RnnGruParametrization
+    : public ::testing::TestWithParam<AvailableCpuFeatures> {};
+
+// Checks that the output of a GRU layer is within tolerance given test input
+// data.
+TEST_P(RnnGruParametrization, CheckGatedRecurrentLayer) {
+  GatedRecurrentLayer gru(kGruInputSize, kGruOutputSize, kGruBias, kGruWeights,
+                          kGruRecurrentWeights,
+                          /*cpu_features=*/GetParam(),
+                          /*layer_name=*/"GRU");
+  TestGatedRecurrentLayer(gru, kGruInputSequence, kGruExpectedOutputSequence);
+}
+
+TEST_P(RnnGruParametrization, DISABLED_BenchmarkGatedRecurrentLayer) {
+  // Prefetch test data.
+  std::unique_ptr<FileReader> reader = CreateGruInputReader();
+  std::vector<float> gru_input_sequence(reader->size());
+  reader->ReadChunk(gru_input_sequence);
+
+  using ::rnnoise::kHiddenGruBias;
+  using ::rnnoise::kHiddenGruRecurrentWeights;
+  using ::rnnoise::kHiddenGruWeights;
+  using ::rnnoise::kHiddenLayerOutputSize;
+  using ::rnnoise::kInputLayerOutputSize;
+
+  GatedRecurrentLayer gru(kInputLayerOutputSize, kHiddenLayerOutputSize,
+                          kHiddenGruBias, kHiddenGruWeights,
+                          kHiddenGruRecurrentWeights,
+                          /*cpu_features=*/GetParam(),
+                          /*layer_name=*/"GRU");
+
+  rtc::ArrayView<const float> input_sequence(gru_input_sequence);
+  ASSERT_EQ(input_sequence.size() % kInputLayerOutputSize,
+            static_cast<size_t>(0));
+  const int input_sequence_length =
+      input_sequence.size() / kInputLayerOutputSize;
+
+  constexpr int kNumTests = 100;
+  ::webrtc::test::PerformanceTimer perf_timer(kNumTests);
+  for (int k = 0; k < kNumTests; ++k) {
+    perf_timer.StartTimer();
+    for (int i = 0; i < input_sequence_length; ++i) {
+      gru.ComputeOutput(
+          input_sequence.subview(i * gru.input_size(), gru.input_size()));
+    }
+    perf_timer.StopTimer();
+  }
+  RTC_LOG(LS_INFO) << (perf_timer.GetDurationAverage() / 1000) << " +/- "
+                   << (perf_timer.GetDurationStandardDeviation() / 1000)
+                   << " ms";
+}
+
+// Finds the relevant CPU features combinations to test.
+std::vector<AvailableCpuFeatures> GetCpuFeaturesToTest() {
+  std::vector<AvailableCpuFeatures> v;
+  v.push_back(NoAvailableCpuFeatures());
+  AvailableCpuFeatures available = GetAvailableCpuFeatures();
+  if (available.sse2) {
+    v.push_back({/*sse2=*/true, /*avx2=*/false, /*neon=*/false});
+  }
+  if (available.avx2) {
+    v.push_back({/*sse2=*/false, /*avx2=*/true, /*neon=*/false});
+  }
+  if (available.neon) {
+    v.push_back({/*sse2=*/false, /*avx2=*/false, /*neon=*/true});
+  }
+  return v;
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    RnnVadTest,
+    RnnGruParametrization,
+    ::testing::ValuesIn(GetCpuFeaturesToTest()),
+    [](const ::testing::TestParamInfo<AvailableCpuFeatures>& info) {
+      return info.param.ToString();
+    });
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_H_
+
+#include <stddef.h>
+#include <sys/types.h>
+
+#include <array>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+#include "modules/audio_processing/agc2/rnn_vad/rnn_fc.h"
+#include "modules/audio_processing/agc2/rnn_vad/rnn_gru.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Recurrent network with hard-coded architecture and weights for voice activity
+// detection.
+class RnnVad {
+ public:
+  explicit RnnVad(const AvailableCpuFeatures& cpu_features);
+  RnnVad(const RnnVad&) = delete;
+  RnnVad& operator=(const RnnVad&) = delete;
+  ~RnnVad();
+  void Reset();
+  // Observes `feature_vector` and `is_silence`, updates the RNN and returns the
+  // current voice probability.
+  float ComputeVadProbability(
+      rtc::ArrayView<const float, kFeatureVectorSize> feature_vector,
+      bool is_silence);
+
+ private:
+  FullyConnectedLayer input_;
+  GatedRecurrentLayer hidden_;
+  FullyConnectedLayer output_;
+};
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_RNN_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/rnn.h"
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+constexpr std::array<float, kFeatureVectorSize> kFeatures = {
+    -1.00131f,   -0.627069f, -7.81097f,  7.86285f,    -2.87145f,  3.32365f,
+    -0.653161f,  0.529839f,  -0.425307f, 0.25583f,    0.235094f,  0.230527f,
+    -0.144687f,  0.182785f,  0.57102f,   0.125039f,   0.479482f,  -0.0255439f,
+    -0.0073141f, -0.147346f, -0.217106f, -0.0846906f, -8.34943f,  3.09065f,
+    1.42628f,    -0.85235f,  -0.220207f, -0.811163f,  2.09032f,   -2.01425f,
+    -0.690268f,  -0.925327f, -0.541354f, 0.58455f,    -0.606726f, -0.0372358f,
+    0.565991f,   0.435854f,  0.420812f,  0.162198f,   -2.13f,     10.0089f};
+
+void WarmUpRnnVad(RnnVad& rnn_vad) {
+  for (int i = 0; i < 10; ++i) {
+    rnn_vad.ComputeVadProbability(kFeatures, /*is_silence=*/false);
+  }
+}
+
+// Checks that the speech probability is zero with silence.
+TEST(RnnVadTest, CheckZeroProbabilityWithSilence) {
+  RnnVad rnn_vad(GetAvailableCpuFeatures());
+  WarmUpRnnVad(rnn_vad);
+  EXPECT_EQ(rnn_vad.ComputeVadProbability(kFeatures, /*is_silence=*/true), 0.f);
+}
+
+// Checks that the same output is produced after reset given the same input
+// sequence.
+TEST(RnnVadTest, CheckRnnVadReset) {
+  RnnVad rnn_vad(GetAvailableCpuFeatures());
+  WarmUpRnnVad(rnn_vad);
+  float pre = rnn_vad.ComputeVadProbability(kFeatures, /*is_silence=*/false);
+  rnn_vad.Reset();
+  WarmUpRnnVad(rnn_vad);
+  float post = rnn_vad.ComputeVadProbability(kFeatures, /*is_silence=*/false);
+  EXPECT_EQ(pre, post);
+}
+
+// Checks that the same output is produced after silence is observed given the
+// same input sequence.
+TEST(RnnVadTest, CheckRnnVadSilence) {
+  RnnVad rnn_vad(GetAvailableCpuFeatures());
+  WarmUpRnnVad(rnn_vad);
+  float pre = rnn_vad.ComputeVadProbability(kFeatures, /*is_silence=*/false);
+  rnn_vad.ComputeVadProbability(kFeatures, /*is_silence=*/true);
+  WarmUpRnnVad(rnn_vad);
+  float post = rnn_vad.ComputeVadProbability(kFeatures, /*is_silence=*/false);
+  EXPECT_EQ(pre, post);
+}
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vad_tool.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vad_tool.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vad_tool.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vad_tool.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,123 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <array>
+#include <string>
+#include <vector>
+
+#include "absl/flags/flag.h"
+#include "absl/flags/parse.h"
+#include "common_audio/resampler/push_sinc_resampler.h"
+#include "common_audio/wav_file.h"
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+#include "modules/audio_processing/agc2/rnn_vad/features_extraction.h"
+#include "modules/audio_processing/agc2/rnn_vad/rnn.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/numerics/safe_compare.h"
+
+ABSL_FLAG(std::string, i, "", "Path to the input wav file");
+ABSL_FLAG(std::string, f, "", "Path to the output features file");
+ABSL_FLAG(std::string, o, "", "Path to the output VAD probabilities file");
+
+namespace webrtc {
+namespace rnn_vad {
+namespace test {
+
+int main(int argc, char* argv[]) {
+  absl::ParseCommandLine(argc, argv);
+  rtc::LogMessage::LogToDebug(rtc::LS_INFO);
+
+  // Open wav input file and check properties.
+  const std::string input_wav_file = absl::GetFlag(FLAGS_i);
+  WavReader wav_reader(input_wav_file);
+  if (wav_reader.num_channels() != 1) {
+    RTC_LOG(LS_ERROR) << "Only mono wav files are supported";
+    return 1;
+  }
+  if (wav_reader.sample_rate() % 100 != 0) {
+    RTC_LOG(LS_ERROR) << "The sample rate rate must allow 10 ms frames.";
+    return 1;
+  }
+  RTC_LOG(LS_INFO) << "Input sample rate: " << wav_reader.sample_rate();
+
+  // Init output files.
+  const std::string output_vad_probs_file = absl::GetFlag(FLAGS_o);
+  FILE* vad_probs_file = fopen(output_vad_probs_file.c_str(), "wb");
+  FILE* features_file = nullptr;
+  const std::string output_feature_file = absl::GetFlag(FLAGS_f);
+  if (!output_feature_file.empty()) {
+    features_file = fopen(output_feature_file.c_str(), "wb");
+  }
+
+  // Initialize.
+  const int frame_size_10ms =
+      rtc::CheckedDivExact(wav_reader.sample_rate(), 100);
+  std::vector<float> samples_10ms;
+  samples_10ms.resize(frame_size_10ms);
+  std::array<float, kFrameSize10ms24kHz> samples_10ms_24kHz;
+  PushSincResampler resampler(frame_size_10ms, kFrameSize10ms24kHz);
+  const AvailableCpuFeatures cpu_features = GetAvailableCpuFeatures();
+  FeaturesExtractor features_extractor(cpu_features);
+  std::array<float, kFeatureVectorSize> feature_vector;
+  RnnVad rnn_vad(cpu_features);
+
+  // Compute VAD probabilities.
+  while (true) {
+    // Read frame at the input sample rate.
+    const size_t read_samples =
+        wav_reader.ReadSamples(frame_size_10ms, samples_10ms.data());
+    if (rtc::SafeLt(read_samples, frame_size_10ms)) {
+      break;  // EOF.
+    }
+    // Resample input.
+    resampler.Resample(samples_10ms.data(), samples_10ms.size(),
+                       samples_10ms_24kHz.data(), samples_10ms_24kHz.size());
+
+    // Extract features and feed the RNN.
+    bool is_silence = features_extractor.CheckSilenceComputeFeatures(
+        samples_10ms_24kHz, feature_vector);
+    float vad_probability =
+        rnn_vad.ComputeVadProbability(feature_vector, is_silence);
+    // Write voice probability.
+    RTC_DCHECK_GE(vad_probability, 0.f);
+    RTC_DCHECK_GE(1.f, vad_probability);
+    fwrite(&vad_probability, sizeof(float), 1, vad_probs_file);
+    // Write features.
+    if (features_file) {
+      const float float_is_silence = is_silence ? 1.f : 0.f;
+      fwrite(&float_is_silence, sizeof(float), 1, features_file);
+      if (is_silence) {
+        // Do not write uninitialized values.
+        feature_vector.fill(0.f);
+      }
+      fwrite(feature_vector.data(), sizeof(float), kFeatureVectorSize,
+             features_file);
+    }
+  }
+
+  // Close output file(s).
+  fclose(vad_probs_file);
+  RTC_LOG(LS_INFO) << "VAD probabilities written to " << output_vad_probs_file;
+  if (features_file) {
+    fclose(features_file);
+    RTC_LOG(LS_INFO) << "features written to " << output_feature_file;
+  }
+
+  return 0;
+}
+
+}  // namespace test
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+int main(int argc, char* argv[]) {
+  return webrtc::rnn_vad::test::main(argc, argv);
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vad_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vad_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vad_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vad_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,185 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <array>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "common_audio/resampler/push_sinc_resampler.h"
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "modules/audio_processing/agc2/rnn_vad/features_extraction.h"
+#include "modules/audio_processing/agc2/rnn_vad/rnn.h"
+#include "modules/audio_processing/agc2/rnn_vad/test_utils.h"
+#include "modules/audio_processing/test/performance_timer.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "test/gtest.h"
+#include "third_party/rnnoise/src/rnn_activations.h"
+#include "third_party/rnnoise/src/rnn_vad_weights.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+constexpr int kFrameSize10ms48kHz = 480;
+
+void DumpPerfStats(int num_samples,
+                   int sample_rate,
+                   double average_us,
+                   double standard_deviation) {
+  float audio_track_length_ms =
+      1e3f * static_cast<float>(num_samples) / static_cast<float>(sample_rate);
+  float average_ms = static_cast<float>(average_us) / 1e3f;
+  float speed = audio_track_length_ms / average_ms;
+  RTC_LOG(LS_INFO) << "track duration (ms): " << audio_track_length_ms;
+  RTC_LOG(LS_INFO) << "average processing time (ms): " << average_ms << " +/- "
+                   << (standard_deviation / 1e3);
+  RTC_LOG(LS_INFO) << "speed: " << speed << "x";
+}
+
+// When the RNN VAD model is updated and the expected output changes, set the
+// constant below to true in order to write new expected output binary files.
+constexpr bool kWriteComputedOutputToFile = false;
+
+// Avoids that one forgets to set |kWriteComputedOutputToFile| back to false
+// when the expected output files are re-exported.
+TEST(RnnVadTest, CheckWriteComputedOutputIsFalse) {
+  ASSERT_FALSE(kWriteComputedOutputToFile)
+      << "Cannot land if kWriteComputedOutput is true.";
+}
+
+class RnnVadProbabilityParametrization
+    : public ::testing::TestWithParam<AvailableCpuFeatures> {};
+
+// Checks that the computed VAD probability for a test input sequence sampled at
+// 48 kHz is within tolerance.
+TEST_P(RnnVadProbabilityParametrization, RnnVadProbabilityWithinTolerance) {
+  // Init resampler, feature extractor and RNN.
+  PushSincResampler decimator(kFrameSize10ms48kHz, kFrameSize10ms24kHz);
+  const AvailableCpuFeatures cpu_features = GetParam();
+  FeaturesExtractor features_extractor(cpu_features);
+  RnnVad rnn_vad(cpu_features);
+
+  // Init input samples and expected output readers.
+  std::unique_ptr<FileReader> samples_reader = CreatePcmSamplesReader();
+  std::unique_ptr<FileReader> expected_vad_prob_reader = CreateVadProbsReader();
+
+  // Input length. The last incomplete frame is ignored.
+  const int num_frames = samples_reader->size() / kFrameSize10ms48kHz;
+
+  // Init buffers.
+  std::vector<float> samples_48k(kFrameSize10ms48kHz);
+  std::vector<float> samples_24k(kFrameSize10ms24kHz);
+  std::vector<float> feature_vector(kFeatureVectorSize);
+  std::vector<float> computed_vad_prob(num_frames);
+  std::vector<float> expected_vad_prob(num_frames);
+
+  // Read expected output.
+  ASSERT_TRUE(expected_vad_prob_reader->ReadChunk(expected_vad_prob));
+
+  // Compute VAD probabilities on the downsampled input.
+  float cumulative_error = 0.f;
+  for (int i = 0; i < num_frames; ++i) {
+    ASSERT_TRUE(samples_reader->ReadChunk(samples_48k));
+    decimator.Resample(samples_48k.data(), samples_48k.size(),
+                       samples_24k.data(), samples_24k.size());
+    bool is_silence = features_extractor.CheckSilenceComputeFeatures(
+        {samples_24k.data(), kFrameSize10ms24kHz},
+        {feature_vector.data(), kFeatureVectorSize});
+    computed_vad_prob[i] = rnn_vad.ComputeVadProbability(
+        {feature_vector.data(), kFeatureVectorSize}, is_silence);
+    EXPECT_NEAR(computed_vad_prob[i], expected_vad_prob[i], 1e-3f);
+    cumulative_error += std::abs(computed_vad_prob[i] - expected_vad_prob[i]);
+  }
+  // Check average error.
+  EXPECT_LT(cumulative_error / num_frames, 1e-4f);
+
+  if (kWriteComputedOutputToFile) {
+    FileWriter vad_prob_writer("new_vad_prob.dat");
+    vad_prob_writer.WriteChunk(computed_vad_prob);
+  }
+}
+
+// Performance test for the RNN VAD (pre-fetching and downsampling are
+// excluded). Keep disabled and only enable locally to measure performance as
+// follows:
+// - on desktop: run the this unit test adding "--logs";
+// - on android: run the this unit test adding "--logcat-output-file".
+TEST_P(RnnVadProbabilityParametrization, DISABLED_RnnVadPerformance) {
+  // PCM samples reader and buffers.
+  std::unique_ptr<FileReader> samples_reader = CreatePcmSamplesReader();
+  // The last incomplete frame is ignored.
+  const int num_frames = samples_reader->size() / kFrameSize10ms48kHz;
+  std::array<float, kFrameSize10ms48kHz> samples;
+  // Pre-fetch and decimate samples.
+  PushSincResampler decimator(kFrameSize10ms48kHz, kFrameSize10ms24kHz);
+  std::vector<float> prefetched_decimated_samples;
+  prefetched_decimated_samples.resize(num_frames * kFrameSize10ms24kHz);
+  for (int i = 0; i < num_frames; ++i) {
+    ASSERT_TRUE(samples_reader->ReadChunk(samples));
+    decimator.Resample(samples.data(), samples.size(),
+                       &prefetched_decimated_samples[i * kFrameSize10ms24kHz],
+                       kFrameSize10ms24kHz);
+  }
+  // Initialize.
+  const AvailableCpuFeatures cpu_features = GetParam();
+  FeaturesExtractor features_extractor(cpu_features);
+  std::array<float, kFeatureVectorSize> feature_vector;
+  RnnVad rnn_vad(cpu_features);
+  constexpr int number_of_tests = 100;
+  ::webrtc::test::PerformanceTimer perf_timer(number_of_tests);
+  for (int k = 0; k < number_of_tests; ++k) {
+    features_extractor.Reset();
+    rnn_vad.Reset();
+    // Process frames.
+    perf_timer.StartTimer();
+    for (int i = 0; i < num_frames; ++i) {
+      bool is_silence = features_extractor.CheckSilenceComputeFeatures(
+          {&prefetched_decimated_samples[i * kFrameSize10ms24kHz],
+           kFrameSize10ms24kHz},
+          feature_vector);
+      rnn_vad.ComputeVadProbability(feature_vector, is_silence);
+    }
+    perf_timer.StopTimer();
+  }
+  DumpPerfStats(num_frames * kFrameSize10ms24kHz, kSampleRate24kHz,
+                perf_timer.GetDurationAverage(),
+                perf_timer.GetDurationStandardDeviation());
+}
+
+// Finds the relevant CPU features combinations to test.
+std::vector<AvailableCpuFeatures> GetCpuFeaturesToTest() {
+  std::vector<AvailableCpuFeatures> v;
+  v.push_back(NoAvailableCpuFeatures());
+  AvailableCpuFeatures available = GetAvailableCpuFeatures();
+  if (available.avx2 && available.sse2) {
+    v.push_back({/*sse2=*/true, /*avx2=*/true, /*neon=*/false});
+  }
+  if (available.sse2) {
+    v.push_back({/*sse2=*/true, /*avx2=*/false, /*neon=*/false});
+  }
+  if (available.neon) {
+    v.push_back({/*sse2=*/false, /*avx2=*/false, /*neon=*/true});
+  }
+  return v;
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    RnnVadTest,
+    RnnVadProbabilityParametrization,
+    ::testing::ValuesIn(GetCpuFeaturesToTest()),
+    [](const ::testing::TestParamInfo<AvailableCpuFeatures>& info) {
+      return info.param.ToString();
+    });
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vector_math_avx2.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vector_math_avx2.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vector_math_avx2.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/rnn_vector_math_avx2.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/vector_math.h"
+
+#include <immintrin.h>
+
+#include "api/array_view.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_conversions.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+float VectorMath::DotProductAvx2(rtc::ArrayView<const float> x,
+                                 rtc::ArrayView<const float> y) const {
+  RTC_DCHECK(cpu_features_.avx2);
+  RTC_DCHECK_EQ(x.size(), y.size());
+  __m256 accumulator = _mm256_setzero_ps();
+  constexpr int kBlockSizeLog2 = 3;
+  constexpr int kBlockSize = 1 << kBlockSizeLog2;
+  const int incomplete_block_index = (x.size() >> kBlockSizeLog2)
+                                     << kBlockSizeLog2;
+  for (int i = 0; i < incomplete_block_index; i += kBlockSize) {
+    RTC_DCHECK_LE(i + kBlockSize, x.size());
+    const __m256 x_i = _mm256_loadu_ps(&x[i]);
+    const __m256 y_i = _mm256_loadu_ps(&y[i]);
+    accumulator = _mm256_fmadd_ps(x_i, y_i, accumulator);
+  }
+  // Reduce `accumulator` by addition.
+  __m128 high = _mm256_extractf128_ps(accumulator, 1);
+  __m128 low = _mm256_extractf128_ps(accumulator, 0);
+  low = _mm_add_ps(high, low);
+  high = _mm_movehl_ps(high, low);
+  low = _mm_add_ps(high, low);
+  high = _mm_shuffle_ps(low, low, 1);
+  low = _mm_add_ss(high, low);
+  float dot_product = _mm_cvtss_f32(low);
+  // Add the result for the last block if incomplete.
+  for (int i = incomplete_block_index; i < rtc::dchecked_cast<int>(x.size());
+       ++i) {
+    dot_product += x[i] * y[i];
+  }
+  return dot_product;
+}
+
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/sequence_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/sequence_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/sequence_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/sequence_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,79 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SEQUENCE_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SEQUENCE_BUFFER_H_
+
+#include <algorithm>
+#include <cstring>
+#include <type_traits>
+#include <vector>
+
+#include "api/array_view.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Linear buffer implementation to (i) push fixed size chunks of sequential data
+// and (ii) view contiguous parts of the buffer. The buffer and the pushed
+// chunks have size S and N respectively. For instance, when S = 2N the first
+// half of the sequence buffer is replaced with its second half, and the new N
+// values are written at the end of the buffer.
+// The class also provides a view on the most recent M values, where 0 < M <= S
+// and by default M = N.
+template <typename T, int S, int N, int M = N>
+class SequenceBuffer {
+  static_assert(N <= S,
+                "The new chunk size cannot be larger than the sequence buffer "
+                "size.");
+  static_assert(std::is_arithmetic<T>::value,
+                "Integral or floating point required.");
+
+ public:
+  SequenceBuffer() : buffer_(S) {
+    RTC_DCHECK_EQ(S, buffer_.size());
+    Reset();
+  }
+  SequenceBuffer(const SequenceBuffer&) = delete;
+  SequenceBuffer& operator=(const SequenceBuffer&) = delete;
+  ~SequenceBuffer() = default;
+  int size() const { return S; }
+  int chunks_size() const { return N; }
+  // Sets the sequence buffer values to zero.
+  void Reset() { std::fill(buffer_.begin(), buffer_.end(), 0); }
+  // Returns a view on the whole buffer.
+  rtc::ArrayView<const T, S> GetBufferView() const {
+    return {buffer_.data(), S};
+  }
+  // Returns a view on the M most recent values of the buffer.
+  rtc::ArrayView<const T, M> GetMostRecentValuesView() const {
+    static_assert(M <= S,
+                  "The number of most recent values cannot be larger than the "
+                  "sequence buffer size.");
+    return {buffer_.data() + S - M, M};
+  }
+  // Shifts left the buffer by N items and add new N items at the end.
+  void Push(rtc::ArrayView<const T, N> new_values) {
+    // Make space for the new values.
+    if (S > N)
+      std::memmove(buffer_.data(), buffer_.data() + N, (S - N) * sizeof(T));
+    // Copy the new values at the end of the buffer.
+    std::memcpy(buffer_.data() + S - N, new_values.data(), N * sizeof(T));
+  }
+
+ private:
+  std::vector<T> buffer_;
+};
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SEQUENCE_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/sequence_buffer_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/sequence_buffer_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/sequence_buffer_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/sequence_buffer_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,102 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/sequence_buffer.h"
+
+#include <algorithm>
+#include <array>
+
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+template <typename T, int S, int N>
+void TestSequenceBufferPushOp() {
+  SCOPED_TRACE(S);
+  SCOPED_TRACE(N);
+  SequenceBuffer<T, S, N> seq_buf;
+  auto seq_buf_view = seq_buf.GetBufferView();
+  std::array<T, N> chunk;
+
+  // Check that a chunk is fully gone after ceil(S / N) push ops.
+  chunk.fill(1);
+  seq_buf.Push(chunk);
+  chunk.fill(0);
+  constexpr int required_push_ops = (S % N) ? S / N + 1 : S / N;
+  for (int i = 0; i < required_push_ops - 1; ++i) {
+    SCOPED_TRACE(i);
+    seq_buf.Push(chunk);
+    // Still in the buffer.
+    const auto* m = std::max_element(seq_buf_view.begin(), seq_buf_view.end());
+    EXPECT_EQ(1, *m);
+  }
+  // Gone after another push.
+  seq_buf.Push(chunk);
+  const auto* m = std::max_element(seq_buf_view.begin(), seq_buf_view.end());
+  EXPECT_EQ(0, *m);
+
+  // Check that the last item moves left by N positions after a push op.
+  if (S > N) {
+    // Fill in with non-zero values.
+    for (int i = 0; i < N; ++i)
+      chunk[i] = static_cast<T>(i + 1);
+    seq_buf.Push(chunk);
+    // With the next Push(), |last| will be moved left by N positions.
+    const T last = chunk[N - 1];
+    for (int i = 0; i < N; ++i)
+      chunk[i] = static_cast<T>(last + i + 1);
+    seq_buf.Push(chunk);
+    EXPECT_EQ(last, seq_buf_view[S - N - 1]);
+  }
+}
+
+TEST(RnnVadTest, SequenceBufferGetters) {
+  constexpr int buffer_size = 8;
+  constexpr int chunk_size = 8;
+  SequenceBuffer<int, buffer_size, chunk_size> seq_buf;
+  EXPECT_EQ(buffer_size, seq_buf.size());
+  EXPECT_EQ(chunk_size, seq_buf.chunks_size());
+  // Test view.
+  auto seq_buf_view = seq_buf.GetBufferView();
+  EXPECT_EQ(0, seq_buf_view[0]);
+  EXPECT_EQ(0, seq_buf_view[seq_buf_view.size() - 1]);
+  constexpr std::array<int, chunk_size> chunk = {10, 20, 30, 40,
+                                                 50, 60, 70, 80};
+  seq_buf.Push(chunk);
+  EXPECT_EQ(10, *seq_buf_view.begin());
+  EXPECT_EQ(80, *(seq_buf_view.end() - 1));
+}
+
+TEST(RnnVadTest, SequenceBufferPushOpsUnsigned) {
+  TestSequenceBufferPushOp<uint8_t, 32, 8>();   // Chunk size: 25%.
+  TestSequenceBufferPushOp<uint8_t, 32, 16>();  // Chunk size: 50%.
+  TestSequenceBufferPushOp<uint8_t, 32, 32>();  // Chunk size: 100%.
+  TestSequenceBufferPushOp<uint8_t, 23, 7>();   // Non-integer ratio.
+}
+
+TEST(RnnVadTest, SequenceBufferPushOpsSigned) {
+  TestSequenceBufferPushOp<int, 32, 8>();   // Chunk size: 25%.
+  TestSequenceBufferPushOp<int, 32, 16>();  // Chunk size: 50%.
+  TestSequenceBufferPushOp<int, 32, 32>();  // Chunk size: 100%.
+  TestSequenceBufferPushOp<int, 23, 7>();   // Non-integer ratio.
+}
+
+TEST(RnnVadTest, SequenceBufferPushOpsFloating) {
+  TestSequenceBufferPushOp<float, 32, 8>();   // Chunk size: 25%.
+  TestSequenceBufferPushOp<float, 32, 16>();  // Chunk size: 50%.
+  TestSequenceBufferPushOp<float, 32, 32>();  // Chunk size: 100%.
+  TestSequenceBufferPushOp<float, 23, 7>();   // Non-integer ratio.
+}
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,214 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/spectral_features.h"
+
+#include <algorithm>
+#include <cmath>
+#include <limits>
+#include <numeric>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_compare.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+constexpr float kSilenceThreshold = 0.04f;
+
+// Computes the new cepstral difference stats and pushes them into the passed
+// symmetric matrix buffer.
+void UpdateCepstralDifferenceStats(
+    rtc::ArrayView<const float, kNumBands> new_cepstral_coeffs,
+    const RingBuffer<float, kNumBands, kCepstralCoeffsHistorySize>& ring_buf,
+    SymmetricMatrixBuffer<float, kCepstralCoeffsHistorySize>* sym_matrix_buf) {
+  RTC_DCHECK(sym_matrix_buf);
+  // Compute the new cepstral distance stats.
+  std::array<float, kCepstralCoeffsHistorySize - 1> distances;
+  for (int i = 0; i < kCepstralCoeffsHistorySize - 1; ++i) {
+    const int delay = i + 1;
+    auto old_cepstral_coeffs = ring_buf.GetArrayView(delay);
+    distances[i] = 0.f;
+    for (int k = 0; k < kNumBands; ++k) {
+      const float c = new_cepstral_coeffs[k] - old_cepstral_coeffs[k];
+      distances[i] += c * c;
+    }
+  }
+  // Push the new spectral distance stats into the symmetric matrix buffer.
+  sym_matrix_buf->Push(distances);
+}
+
+// Computes the first half of the Vorbis window.
+std::array<float, kFrameSize20ms24kHz / 2> ComputeScaledHalfVorbisWindow(
+    float scaling = 1.f) {
+  constexpr int kHalfSize = kFrameSize20ms24kHz / 2;
+  std::array<float, kHalfSize> half_window{};
+  for (int i = 0; i < kHalfSize; ++i) {
+    half_window[i] =
+        scaling *
+        std::sin(0.5 * kPi * std::sin(0.5 * kPi * (i + 0.5) / kHalfSize) *
+                 std::sin(0.5 * kPi * (i + 0.5) / kHalfSize));
+  }
+  return half_window;
+}
+
+// Computes the forward FFT on a 20 ms frame to which a given window function is
+// applied. The Fourier coefficient corresponding to the Nyquist frequency is
+// set to zero (it is never used and this allows to simplify the code).
+void ComputeWindowedForwardFft(
+    rtc::ArrayView<const float, kFrameSize20ms24kHz> frame,
+    const std::array<float, kFrameSize20ms24kHz / 2>& half_window,
+    Pffft::FloatBuffer* fft_input_buffer,
+    Pffft::FloatBuffer* fft_output_buffer,
+    Pffft* fft) {
+  RTC_DCHECK_EQ(frame.size(), 2 * half_window.size());
+  // Apply windowing.
+  auto in = fft_input_buffer->GetView();
+  for (int i = 0, j = kFrameSize20ms24kHz - 1;
+       rtc::SafeLt(i, half_window.size()); ++i, --j) {
+    in[i] = frame[i] * half_window[i];
+    in[j] = frame[j] * half_window[i];
+  }
+  fft->ForwardTransform(*fft_input_buffer, fft_output_buffer, /*ordered=*/true);
+  // Set the Nyquist frequency coefficient to zero.
+  auto out = fft_output_buffer->GetView();
+  out[1] = 0.f;
+}
+
+}  // namespace
+
+SpectralFeaturesExtractor::SpectralFeaturesExtractor()
+    : half_window_(ComputeScaledHalfVorbisWindow(
+          1.f / static_cast<float>(kFrameSize20ms24kHz))),
+      fft_(kFrameSize20ms24kHz, Pffft::FftType::kReal),
+      fft_buffer_(fft_.CreateBuffer()),
+      reference_frame_fft_(fft_.CreateBuffer()),
+      lagged_frame_fft_(fft_.CreateBuffer()),
+      dct_table_(ComputeDctTable()) {}
+
+SpectralFeaturesExtractor::~SpectralFeaturesExtractor() = default;
+
+void SpectralFeaturesExtractor::Reset() {
+  cepstral_coeffs_ring_buf_.Reset();
+  cepstral_diffs_buf_.Reset();
+}
+
+bool SpectralFeaturesExtractor::CheckSilenceComputeFeatures(
+    rtc::ArrayView<const float, kFrameSize20ms24kHz> reference_frame,
+    rtc::ArrayView<const float, kFrameSize20ms24kHz> lagged_frame,
+    rtc::ArrayView<float, kNumBands - kNumLowerBands> higher_bands_cepstrum,
+    rtc::ArrayView<float, kNumLowerBands> average,
+    rtc::ArrayView<float, kNumLowerBands> first_derivative,
+    rtc::ArrayView<float, kNumLowerBands> second_derivative,
+    rtc::ArrayView<float, kNumLowerBands> bands_cross_corr,
+    float* variability) {
+  // Compute the Opus band energies for the reference frame.
+  ComputeWindowedForwardFft(reference_frame, half_window_, fft_buffer_.get(),
+                            reference_frame_fft_.get(), &fft_);
+  spectral_correlator_.ComputeAutoCorrelation(
+      reference_frame_fft_->GetConstView(), reference_frame_bands_energy_);
+  // Check if the reference frame has silence.
+  const float tot_energy =
+      std::accumulate(reference_frame_bands_energy_.begin(),
+                      reference_frame_bands_energy_.end(), 0.f);
+  if (tot_energy < kSilenceThreshold) {
+    return true;
+  }
+  // Compute the Opus band energies for the lagged frame.
+  ComputeWindowedForwardFft(lagged_frame, half_window_, fft_buffer_.get(),
+                            lagged_frame_fft_.get(), &fft_);
+  spectral_correlator_.ComputeAutoCorrelation(lagged_frame_fft_->GetConstView(),
+                                              lagged_frame_bands_energy_);
+  // Log of the band energies for the reference frame.
+  std::array<float, kNumBands> log_bands_energy;
+  ComputeSmoothedLogMagnitudeSpectrum(reference_frame_bands_energy_,
+                                      log_bands_energy);
+  // Reference frame cepstrum.
+  std::array<float, kNumBands> cepstrum;
+  ComputeDct(log_bands_energy, dct_table_, cepstrum);
+  // Ad-hoc correction terms for the first two cepstral coefficients.
+  cepstrum[0] -= 12.f;
+  cepstrum[1] -= 4.f;
+  // Update the ring buffer and the cepstral difference stats.
+  cepstral_coeffs_ring_buf_.Push(cepstrum);
+  UpdateCepstralDifferenceStats(cepstrum, cepstral_coeffs_ring_buf_,
+                                &cepstral_diffs_buf_);
+  // Write the higher bands cepstral coefficients.
+  RTC_DCHECK_EQ(cepstrum.size() - kNumLowerBands, higher_bands_cepstrum.size());
+  std::copy(cepstrum.begin() + kNumLowerBands, cepstrum.end(),
+            higher_bands_cepstrum.begin());
+  // Compute and write remaining features.
+  ComputeAvgAndDerivatives(average, first_derivative, second_derivative);
+  ComputeNormalizedCepstralCorrelation(bands_cross_corr);
+  RTC_DCHECK(variability);
+  *variability = ComputeVariability();
+  return false;
+}
+
+void SpectralFeaturesExtractor::ComputeAvgAndDerivatives(
+    rtc::ArrayView<float, kNumLowerBands> average,
+    rtc::ArrayView<float, kNumLowerBands> first_derivative,
+    rtc::ArrayView<float, kNumLowerBands> second_derivative) const {
+  auto curr = cepstral_coeffs_ring_buf_.GetArrayView(0);
+  auto prev1 = cepstral_coeffs_ring_buf_.GetArrayView(1);
+  auto prev2 = cepstral_coeffs_ring_buf_.GetArrayView(2);
+  RTC_DCHECK_EQ(average.size(), first_derivative.size());
+  RTC_DCHECK_EQ(first_derivative.size(), second_derivative.size());
+  RTC_DCHECK_LE(average.size(), curr.size());
+  for (int i = 0; rtc::SafeLt(i, average.size()); ++i) {
+    // Average, kernel: [1, 1, 1].
+    average[i] = curr[i] + prev1[i] + prev2[i];
+    // First derivative, kernel: [1, 0, - 1].
+    first_derivative[i] = curr[i] - prev2[i];
+    // Second derivative, Laplacian kernel: [1, -2, 1].
+    second_derivative[i] = curr[i] - 2 * prev1[i] + prev2[i];
+  }
+}
+
+void SpectralFeaturesExtractor::ComputeNormalizedCepstralCorrelation(
+    rtc::ArrayView<float, kNumLowerBands> bands_cross_corr) {
+  spectral_correlator_.ComputeCrossCorrelation(
+      reference_frame_fft_->GetConstView(), lagged_frame_fft_->GetConstView(),
+      bands_cross_corr_);
+  // Normalize.
+  for (int i = 0; rtc::SafeLt(i, bands_cross_corr_.size()); ++i) {
+    bands_cross_corr_[i] =
+        bands_cross_corr_[i] /
+        std::sqrt(0.001f + reference_frame_bands_energy_[i] *
+                               lagged_frame_bands_energy_[i]);
+  }
+  // Cepstrum.
+  ComputeDct(bands_cross_corr_, dct_table_, bands_cross_corr);
+  // Ad-hoc correction terms for the first two cepstral coefficients.
+  bands_cross_corr[0] -= 1.3f;
+  bands_cross_corr[1] -= 0.9f;
+}
+
+float SpectralFeaturesExtractor::ComputeVariability() const {
+  // Compute cepstral variability score.
+  float variability = 0.f;
+  for (int delay1 = 0; delay1 < kCepstralCoeffsHistorySize; ++delay1) {
+    float min_dist = std::numeric_limits<float>::max();
+    for (int delay2 = 0; delay2 < kCepstralCoeffsHistorySize; ++delay2) {
+      if (delay1 == delay2)  // The distance would be 0.
+        continue;
+      min_dist =
+          std::min(min_dist, cepstral_diffs_buf_.GetValue(delay1, delay2));
+    }
+    variability += min_dist;
+  }
+  // Normalize (based on training set stats).
+  // TODO(bugs.webrtc.org/10480): Isolate normalization from feature extraction.
+  return variability / kCepstralCoeffsHistorySize - 2.1f;
+}
+
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,79 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_H_
+
+#include <array>
+#include <cstddef>
+#include <memory>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+#include "modules/audio_processing/agc2/rnn_vad/ring_buffer.h"
+#include "modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h"
+#include "modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h"
+#include "modules/audio_processing/utility/pffft_wrapper.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Class to compute spectral features.
+class SpectralFeaturesExtractor {
+ public:
+  SpectralFeaturesExtractor();
+  SpectralFeaturesExtractor(const SpectralFeaturesExtractor&) = delete;
+  SpectralFeaturesExtractor& operator=(const SpectralFeaturesExtractor&) =
+      delete;
+  ~SpectralFeaturesExtractor();
+  // Resets the internal state of the feature extractor.
+  void Reset();
+  // Analyzes a pair of reference and lagged frames from the pitch buffer,
+  // detects silence and computes features. If silence is detected, the output
+  // is neither computed nor written.
+  bool CheckSilenceComputeFeatures(
+      rtc::ArrayView<const float, kFrameSize20ms24kHz> reference_frame,
+      rtc::ArrayView<const float, kFrameSize20ms24kHz> lagged_frame,
+      rtc::ArrayView<float, kNumBands - kNumLowerBands> higher_bands_cepstrum,
+      rtc::ArrayView<float, kNumLowerBands> average,
+      rtc::ArrayView<float, kNumLowerBands> first_derivative,
+      rtc::ArrayView<float, kNumLowerBands> second_derivative,
+      rtc::ArrayView<float, kNumLowerBands> bands_cross_corr,
+      float* variability);
+
+ private:
+  void ComputeAvgAndDerivatives(
+      rtc::ArrayView<float, kNumLowerBands> average,
+      rtc::ArrayView<float, kNumLowerBands> first_derivative,
+      rtc::ArrayView<float, kNumLowerBands> second_derivative) const;
+  void ComputeNormalizedCepstralCorrelation(
+      rtc::ArrayView<float, kNumLowerBands> bands_cross_corr);
+  float ComputeVariability() const;
+
+  const std::array<float, kFrameSize20ms24kHz / 2> half_window_;
+  Pffft fft_;
+  std::unique_ptr<Pffft::FloatBuffer> fft_buffer_;
+  std::unique_ptr<Pffft::FloatBuffer> reference_frame_fft_;
+  std::unique_ptr<Pffft::FloatBuffer> lagged_frame_fft_;
+  SpectralCorrelator spectral_correlator_;
+  std::array<float, kOpusBands24kHz> reference_frame_bands_energy_;
+  std::array<float, kOpusBands24kHz> lagged_frame_bands_energy_;
+  std::array<float, kOpusBands24kHz> bands_cross_corr_;
+  const std::array<float, kNumBands * kNumBands> dct_table_;
+  RingBuffer<float, kNumBands, kCepstralCoeffsHistorySize>
+      cepstral_coeffs_ring_buf_;
+  SymmetricMatrixBuffer<float, kCepstralCoeffsHistorySize> cepstral_diffs_buf_;
+};
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,188 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h"
+
+#include <algorithm>
+#include <cmath>
+#include <cstddef>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_compare.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+// Weights for each FFT coefficient for each Opus band (Nyquist frequency
+// excluded). The size of each band is specified in
+// |kOpusScaleNumBins24kHz20ms|.
+constexpr std::array<float, kFrameSize20ms24kHz / 2> kOpusBandWeights24kHz20ms =
+    {{
+        0.f,       0.25f,      0.5f,       0.75f,  // Band 0
+        0.f,       0.25f,      0.5f,       0.75f,  // Band 1
+        0.f,       0.25f,      0.5f,       0.75f,  // Band 2
+        0.f,       0.25f,      0.5f,       0.75f,  // Band 3
+        0.f,       0.25f,      0.5f,       0.75f,  // Band 4
+        0.f,       0.25f,      0.5f,       0.75f,  // Band 5
+        0.f,       0.25f,      0.5f,       0.75f,  // Band 6
+        0.f,       0.25f,      0.5f,       0.75f,  // Band 7
+        0.f,       0.125f,     0.25f,      0.375f,    0.5f,
+        0.625f,    0.75f,      0.875f,  // Band 8
+        0.f,       0.125f,     0.25f,      0.375f,    0.5f,
+        0.625f,    0.75f,      0.875f,  // Band 9
+        0.f,       0.125f,     0.25f,      0.375f,    0.5f,
+        0.625f,    0.75f,      0.875f,  // Band 10
+        0.f,       0.125f,     0.25f,      0.375f,    0.5f,
+        0.625f,    0.75f,      0.875f,  // Band 11
+        0.f,       0.0625f,    0.125f,     0.1875f,   0.25f,
+        0.3125f,   0.375f,     0.4375f,    0.5f,      0.5625f,
+        0.625f,    0.6875f,    0.75f,      0.8125f,   0.875f,
+        0.9375f,  // Band 12
+        0.f,       0.0625f,    0.125f,     0.1875f,   0.25f,
+        0.3125f,   0.375f,     0.4375f,    0.5f,      0.5625f,
+        0.625f,    0.6875f,    0.75f,      0.8125f,   0.875f,
+        0.9375f,  // Band 13
+        0.f,       0.0625f,    0.125f,     0.1875f,   0.25f,
+        0.3125f,   0.375f,     0.4375f,    0.5f,      0.5625f,
+        0.625f,    0.6875f,    0.75f,      0.8125f,   0.875f,
+        0.9375f,  // Band 14
+        0.f,       0.0416667f, 0.0833333f, 0.125f,    0.166667f,
+        0.208333f, 0.25f,      0.291667f,  0.333333f, 0.375f,
+        0.416667f, 0.458333f,  0.5f,       0.541667f, 0.583333f,
+        0.625f,    0.666667f,  0.708333f,  0.75f,     0.791667f,
+        0.833333f, 0.875f,     0.916667f,  0.958333f,  // Band 15
+        0.f,       0.0416667f, 0.0833333f, 0.125f,    0.166667f,
+        0.208333f, 0.25f,      0.291667f,  0.333333f, 0.375f,
+        0.416667f, 0.458333f,  0.5f,       0.541667f, 0.583333f,
+        0.625f,    0.666667f,  0.708333f,  0.75f,     0.791667f,
+        0.833333f, 0.875f,     0.916667f,  0.958333f,  // Band 16
+        0.f,       0.03125f,   0.0625f,    0.09375f,  0.125f,
+        0.15625f,  0.1875f,    0.21875f,   0.25f,     0.28125f,
+        0.3125f,   0.34375f,   0.375f,     0.40625f,  0.4375f,
+        0.46875f,  0.5f,       0.53125f,   0.5625f,   0.59375f,
+        0.625f,    0.65625f,   0.6875f,    0.71875f,  0.75f,
+        0.78125f,  0.8125f,    0.84375f,   0.875f,    0.90625f,
+        0.9375f,   0.96875f,  // Band 17
+        0.f,       0.0208333f, 0.0416667f, 0.0625f,   0.0833333f,
+        0.104167f, 0.125f,     0.145833f,  0.166667f, 0.1875f,
+        0.208333f, 0.229167f,  0.25f,      0.270833f, 0.291667f,
+        0.3125f,   0.333333f,  0.354167f,  0.375f,    0.395833f,
+        0.416667f, 0.4375f,    0.458333f,  0.479167f, 0.5f,
+        0.520833f, 0.541667f,  0.5625f,    0.583333f, 0.604167f,
+        0.625f,    0.645833f,  0.666667f,  0.6875f,   0.708333f,
+        0.729167f, 0.75f,      0.770833f,  0.791667f, 0.8125f,
+        0.833333f, 0.854167f,  0.875f,     0.895833f, 0.916667f,
+        0.9375f,   0.958333f,  0.979167f  // Band 18
+    }};
+
+}  // namespace
+
+SpectralCorrelator::SpectralCorrelator()
+    : weights_(kOpusBandWeights24kHz20ms.begin(),
+               kOpusBandWeights24kHz20ms.end()) {}
+
+SpectralCorrelator::~SpectralCorrelator() = default;
+
+void SpectralCorrelator::ComputeAutoCorrelation(
+    rtc::ArrayView<const float> x,
+    rtc::ArrayView<float, kOpusBands24kHz> auto_corr) const {
+  ComputeCrossCorrelation(x, x, auto_corr);
+}
+
+void SpectralCorrelator::ComputeCrossCorrelation(
+    rtc::ArrayView<const float> x,
+    rtc::ArrayView<const float> y,
+    rtc::ArrayView<float, kOpusBands24kHz> cross_corr) const {
+  RTC_DCHECK_EQ(x.size(), kFrameSize20ms24kHz);
+  RTC_DCHECK_EQ(x.size(), y.size());
+  RTC_DCHECK_EQ(x[1], 0.f) << "The Nyquist coefficient must be zeroed.";
+  RTC_DCHECK_EQ(y[1], 0.f) << "The Nyquist coefficient must be zeroed.";
+  constexpr auto kOpusScaleNumBins24kHz20ms = GetOpusScaleNumBins24kHz20ms();
+  int k = 0;  // Next Fourier coefficient index.
+  cross_corr[0] = 0.f;
+  for (int i = 0; i < kOpusBands24kHz - 1; ++i) {
+    cross_corr[i + 1] = 0.f;
+    for (int j = 0; j < kOpusScaleNumBins24kHz20ms[i]; ++j) {  // Band size.
+      const float v = x[2 * k] * y[2 * k] + x[2 * k + 1] * y[2 * k + 1];
+      const float tmp = weights_[k] * v;
+      cross_corr[i] += v - tmp;
+      cross_corr[i + 1] += tmp;
+      k++;
+    }
+  }
+  cross_corr[0] *= 2.f;  // The first band only gets half contribution.
+  RTC_DCHECK_EQ(k, kFrameSize20ms24kHz / 2);  // Nyquist coefficient never used.
+}
+
+void ComputeSmoothedLogMagnitudeSpectrum(
+    rtc::ArrayView<const float> bands_energy,
+    rtc::ArrayView<float, kNumBands> log_bands_energy) {
+  RTC_DCHECK_LE(bands_energy.size(), kNumBands);
+  constexpr float kOneByHundred = 1e-2f;
+  constexpr float kLogOneByHundred = -2.f;
+  // Init.
+  float log_max = kLogOneByHundred;
+  float follow = kLogOneByHundred;
+  const auto smooth = [&log_max, &follow](float x) {
+    x = std::max(log_max - 7.f, std::max(follow - 1.5f, x));
+    log_max = std::max(log_max, x);
+    follow = std::max(follow - 1.5f, x);
+    return x;
+  };
+  // Smoothing over the bands for which the band energy is defined.
+  for (int i = 0; rtc::SafeLt(i, bands_energy.size()); ++i) {
+    log_bands_energy[i] = smooth(std::log10(kOneByHundred + bands_energy[i]));
+  }
+  // Smoothing over the remaining bands (zero energy).
+  for (int i = bands_energy.size(); i < kNumBands; ++i) {
+    log_bands_energy[i] = smooth(kLogOneByHundred);
+  }
+}
+
+std::array<float, kNumBands * kNumBands> ComputeDctTable() {
+  std::array<float, kNumBands * kNumBands> dct_table;
+  const double k = std::sqrt(0.5);
+  for (int i = 0; i < kNumBands; ++i) {
+    for (int j = 0; j < kNumBands; ++j)
+      dct_table[i * kNumBands + j] = std::cos((i + 0.5) * j * kPi / kNumBands);
+    dct_table[i * kNumBands] *= k;
+  }
+  return dct_table;
+}
+
+void ComputeDct(rtc::ArrayView<const float> in,
+                rtc::ArrayView<const float, kNumBands * kNumBands> dct_table,
+                rtc::ArrayView<float> out) {
+  // DCT scaling factor - i.e., sqrt(2 / kNumBands).
+  constexpr float kDctScalingFactor = 0.301511345f;
+  constexpr float kDctScalingFactorError =
+      kDctScalingFactor * kDctScalingFactor -
+      2.f / static_cast<float>(kNumBands);
+  static_assert(
+      (kDctScalingFactorError >= 0.f && kDctScalingFactorError < 1e-1f) ||
+          (kDctScalingFactorError < 0.f && kDctScalingFactorError > -1e-1f),
+      "kNumBands changed and kDctScalingFactor has not been updated.");
+  RTC_DCHECK_NE(in.data(), out.data()) << "In-place DCT is not supported.";
+  RTC_DCHECK_LE(in.size(), kNumBands);
+  RTC_DCHECK_LE(1, out.size());
+  RTC_DCHECK_LE(out.size(), in.size());
+  for (int i = 0; rtc::SafeLt(i, out.size()); ++i) {
+    out[i] = 0.f;
+    for (int j = 0; rtc::SafeLt(j, in.size()); ++j) {
+      out[i] += in[j] * dct_table[j * kNumBands + i];
+    }
+    // TODO(bugs.webrtc.org/10480): Scaling factor in the DCT table.
+    out[i] *= kDctScalingFactor;
+  }
+}
+
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,100 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_INTERNAL_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_INTERNAL_H_
+
+#include <stddef.h>
+
+#include <array>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// At a sample rate of 24 kHz, the last 3 Opus bands are beyond the Nyquist
+// frequency. However, band #19 gets the contributions from band #18 because
+// of the symmetric triangular filter with peak response at 12 kHz.
+constexpr int kOpusBands24kHz = 20;
+static_assert(kOpusBands24kHz < kNumBands,
+              "The number of bands at 24 kHz must be less than those defined "
+              "in the Opus scale at 48 kHz.");
+
+// Number of FFT frequency bins covered by each band in the Opus scale at a
+// sample rate of 24 kHz for 20 ms frames.
+// Declared here for unit testing.
+constexpr std::array<int, kOpusBands24kHz - 1> GetOpusScaleNumBins24kHz20ms() {
+  return {4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 8, 8, 16, 16, 16, 24, 24, 32, 48};
+}
+
+// TODO(bugs.webrtc.org/10480): Move to a separate file.
+// Class to compute band-wise spectral features in the Opus perceptual scale
+// for 20 ms frames sampled at 24 kHz. The analysis methods apply triangular
+// filters with peak response at the each band boundary.
+class SpectralCorrelator {
+ public:
+  // Ctor.
+  SpectralCorrelator();
+  SpectralCorrelator(const SpectralCorrelator&) = delete;
+  SpectralCorrelator& operator=(const SpectralCorrelator&) = delete;
+  ~SpectralCorrelator();
+
+  // Computes the band-wise spectral auto-correlations.
+  // |x| must:
+  //  - have size equal to |kFrameSize20ms24kHz|;
+  //  - be encoded as vectors of interleaved real-complex FFT coefficients
+  //    where x[1] = y[1] = 0 (the Nyquist frequency coefficient is omitted).
+  void ComputeAutoCorrelation(
+      rtc::ArrayView<const float> x,
+      rtc::ArrayView<float, kOpusBands24kHz> auto_corr) const;
+
+  // Computes the band-wise spectral cross-correlations.
+  // |x| and |y| must:
+  //  - have size equal to |kFrameSize20ms24kHz|;
+  //  - be encoded as vectors of interleaved real-complex FFT coefficients where
+  //    x[1] = y[1] = 0 (the Nyquist frequency coefficient is omitted).
+  void ComputeCrossCorrelation(
+      rtc::ArrayView<const float> x,
+      rtc::ArrayView<const float> y,
+      rtc::ArrayView<float, kOpusBands24kHz> cross_corr) const;
+
+ private:
+  const std::vector<float> weights_;  // Weights for each Fourier coefficient.
+};
+
+// TODO(bugs.webrtc.org/10480): Move to anonymous namespace in
+// spectral_features.cc. Given a vector of Opus-bands energy coefficients,
+// computes the log magnitude spectrum applying smoothing both over time and
+// over frequency. Declared here for unit testing.
+void ComputeSmoothedLogMagnitudeSpectrum(
+    rtc::ArrayView<const float> bands_energy,
+    rtc::ArrayView<float, kNumBands> log_bands_energy);
+
+// TODO(bugs.webrtc.org/10480): Move to anonymous namespace in
+// spectral_features.cc. Creates a DCT table for arrays having size equal to
+// |kNumBands|. Declared here for unit testing.
+std::array<float, kNumBands * kNumBands> ComputeDctTable();
+
+// TODO(bugs.webrtc.org/10480): Move to anonymous namespace in
+// spectral_features.cc. Computes DCT for |in| given a pre-computed DCT table.
+// In-place computation is not allowed and |out| can be smaller than |in| in
+// order to only compute the first DCT coefficients. Declared here for unit
+// testing.
+void ComputeDct(rtc::ArrayView<const float> in,
+                rtc::ArrayView<const float, kNumBands * kNumBands> dct_table,
+                rtc::ArrayView<float> out);
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SPECTRAL_FEATURES_INTERNAL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_internal_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,160 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/spectral_features_internal.h"
+
+#include <algorithm>
+#include <array>
+#include <complex>
+#include <numeric>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/rnn_vad/test_utils.h"
+#include "modules/audio_processing/utility/pffft_wrapper.h"
+#include "rtc_base/numerics/safe_compare.h"
+// TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+// #include "test/fpe_observer.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+// Generates the values for the array named |kOpusBandWeights24kHz20ms| in the
+// anonymous namespace of the .cc file, which is the array of FFT coefficient
+// weights for the Opus scale triangular filters.
+std::vector<float> ComputeTriangularFiltersWeights() {
+  constexpr auto kOpusScaleNumBins24kHz20ms = GetOpusScaleNumBins24kHz20ms();
+  const auto& v = kOpusScaleNumBins24kHz20ms;  // Alias.
+  const int num_weights = std::accumulate(kOpusScaleNumBins24kHz20ms.begin(),
+                                          kOpusScaleNumBins24kHz20ms.end(), 0);
+  std::vector<float> weights(num_weights);
+  int next_fft_coeff_index = 0;
+  for (int band = 0; rtc::SafeLt(band, v.size()); ++band) {
+    const int band_size = v[band];
+    for (int j = 0; rtc::SafeLt(j, band_size); ++j) {
+      weights[next_fft_coeff_index + j] = static_cast<float>(j) / band_size;
+    }
+    next_fft_coeff_index += band_size;
+  }
+  return weights;
+}
+
+// Checks that the values returned by GetOpusScaleNumBins24kHz20ms() match the
+// Opus scale frequency boundaries.
+TEST(RnnVadTest, TestOpusScaleBoundaries) {
+  constexpr int kBandFrequencyBoundariesHz[kNumBands - 1] = {
+      200,  400,  600,  800,  1000, 1200, 1400, 1600,  2000,  2400, 2800,
+      3200, 4000, 4800, 5600, 6800, 8000, 9600, 12000, 15600, 20000};
+  constexpr auto kOpusScaleNumBins24kHz20ms = GetOpusScaleNumBins24kHz20ms();
+  int prev = 0;
+  for (int i = 0; rtc::SafeLt(i, kOpusScaleNumBins24kHz20ms.size()); ++i) {
+    int boundary =
+        kBandFrequencyBoundariesHz[i] * kFrameSize20ms24kHz / kSampleRate24kHz;
+    EXPECT_EQ(kOpusScaleNumBins24kHz20ms[i], boundary - prev);
+    prev = boundary;
+  }
+}
+
+// Checks that the computed triangular filters weights for the Opus scale are
+// monotonic withing each Opus band. This test should only be enabled when
+// ComputeTriangularFiltersWeights() is changed and |kOpusBandWeights24kHz20ms|
+// is updated accordingly.
+TEST(RnnVadTest, DISABLED_TestOpusScaleWeights) {
+  auto weights = ComputeTriangularFiltersWeights();
+  int i = 0;
+  for (int band_size : GetOpusScaleNumBins24kHz20ms()) {
+    SCOPED_TRACE(band_size);
+    rtc::ArrayView<float> band_weights(weights.data() + i, band_size);
+    float prev = -1.f;
+    for (float weight : band_weights) {
+      EXPECT_LT(prev, weight);
+      prev = weight;
+    }
+    i += band_size;
+  }
+}
+
+// Checks that the computed band-wise auto-correlation is non-negative for a
+// simple input vector of FFT coefficients.
+TEST(RnnVadTest, SpectralCorrelatorValidOutput) {
+  // Input: vector of (1, 1j) values.
+  Pffft fft(kFrameSize20ms24kHz, Pffft::FftType::kReal);
+  auto in = fft.CreateBuffer();
+  std::array<float, kOpusBands24kHz> out;
+  auto in_view = in->GetView();
+  std::fill(in_view.begin(), in_view.end(), 1.f);
+  in_view[1] = 0.f;  // Nyquist frequency.
+  // Compute and check output.
+  SpectralCorrelator e;
+  e.ComputeAutoCorrelation(in_view, out);
+  for (int i = 0; i < kOpusBands24kHz; ++i) {
+    SCOPED_TRACE(i);
+    EXPECT_GT(out[i], 0.f);
+  }
+}
+
+// Checks that the computed smoothed log magnitude spectrum is within tolerance
+// given hard-coded test input data.
+TEST(RnnVadTest, ComputeSmoothedLogMagnitudeSpectrumWithinTolerance) {
+  constexpr std::array<float, kNumBands> input = {
+      {86.060539245605f, 275.668334960938f, 43.406528472900f, 6.541896820068f,
+       17.964015960693f, 8.090919494629f,   1.261920094490f,  1.212702631950f,
+       1.619154453278f,  0.508935272694f,   0.346316039562f,  0.237035423517f,
+       0.172424271703f,  0.271657168865f,   0.126088857651f,  0.139967113733f,
+       0.207200810313f,  0.155893072486f,   0.091090843081f,  0.033391401172f,
+       0.013879744336f,  0.011973354965f}};
+  constexpr std::array<float, kNumBands> expected_output = {
+      {1.934854507446f,  2.440402746201f,  1.637655138969f,  0.816367030144f,
+       1.254645109177f,  0.908534288406f,  0.104459829628f,  0.087320849299f,
+       0.211962252855f,  -0.284886807203f, -0.448164641857f, -0.607240796089f,
+       -0.738917350769f, -0.550279200077f, -0.866177439690f, -0.824003994465f,
+       -0.663138568401f, -0.780171751976f, -0.995288193226f, -1.362596273422f,
+       -1.621970295906f, -1.658103585243f}};
+  std::array<float, kNumBands> computed_output;
+  {
+    // TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+    // FloatingPointExceptionObserver fpe_observer;
+    ComputeSmoothedLogMagnitudeSpectrum(input, computed_output);
+    ExpectNearAbsolute(expected_output, computed_output, 1e-5f);
+  }
+}
+
+// Checks that the computed DCT is within tolerance given hard-coded test input
+// data.
+TEST(RnnVadTest, ComputeDctWithinTolerance) {
+  constexpr std::array<float, kNumBands> input = {
+      {0.232155621052f,  0.678957760334f, 0.220818966627f,  -0.077363930643f,
+       -0.559227049351f, 0.432545185089f, 0.353900641203f,  0.398993015289f,
+       0.409774333239f,  0.454977899790f, 0.300520688295f,  -0.010286616161f,
+       0.272525429726f,  0.098067551851f, 0.083649002016f,  0.046226885170f,
+       -0.033228103071f, 0.144773483276f, -0.117661058903f, -0.005628800020f,
+       -0.009547689930f, -0.045382082462f}};
+  constexpr std::array<float, kNumBands> expected_output = {
+      {0.697072803974f,  0.442710995674f,  -0.293156713247f, -0.060711503029f,
+       0.292050391436f,  0.489301353693f,  0.402255415916f,  0.134404733777f,
+       -0.086305990815f, -0.199605688453f, -0.234511867166f, -0.413774639368f,
+       -0.388507157564f, -0.032798115164f, 0.044605545700f,  0.112466648221f,
+       -0.050096966326f, 0.045971218497f,  -0.029815061018f, -0.410366982222f,
+       -0.209233760834f, -0.128037497401f}};
+  auto dct_table = ComputeDctTable();
+  std::array<float, kNumBands> computed_output;
+  {
+    // TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+    // FloatingPointExceptionObserver fpe_observer;
+    ComputeDct(input, dct_table, computed_output);
+    ExpectNearAbsolute(expected_output, computed_output, 1e-5f);
+  }
+}
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/spectral_features_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,161 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/spectral_features.h"
+
+#include <algorithm>
+
+#include "modules/audio_processing/agc2/rnn_vad/test_utils.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_compare.h"
+// TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+// #include "test/fpe_observer.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+constexpr int kTestFeatureVectorSize = kNumBands + 3 * kNumLowerBands + 1;
+
+// Writes non-zero sample values.
+void WriteTestData(rtc::ArrayView<float> samples) {
+  for (int i = 0; rtc::SafeLt(i, samples.size()); ++i) {
+    samples[i] = i % 100;
+  }
+}
+
+rtc::ArrayView<float, kNumBands - kNumLowerBands> GetHigherBandsSpectrum(
+    std::array<float, kTestFeatureVectorSize>* feature_vector) {
+  return {feature_vector->data() + kNumLowerBands, kNumBands - kNumLowerBands};
+}
+
+rtc::ArrayView<float, kNumLowerBands> GetAverage(
+    std::array<float, kTestFeatureVectorSize>* feature_vector) {
+  return {feature_vector->data(), kNumLowerBands};
+}
+
+rtc::ArrayView<float, kNumLowerBands> GetFirstDerivative(
+    std::array<float, kTestFeatureVectorSize>* feature_vector) {
+  return {feature_vector->data() + kNumBands, kNumLowerBands};
+}
+
+rtc::ArrayView<float, kNumLowerBands> GetSecondDerivative(
+    std::array<float, kTestFeatureVectorSize>* feature_vector) {
+  return {feature_vector->data() + kNumBands + kNumLowerBands, kNumLowerBands};
+}
+
+rtc::ArrayView<float, kNumLowerBands> GetCepstralCrossCorrelation(
+    std::array<float, kTestFeatureVectorSize>* feature_vector) {
+  return {feature_vector->data() + kNumBands + 2 * kNumLowerBands,
+          kNumLowerBands};
+}
+
+float* GetCepstralVariability(
+    std::array<float, kTestFeatureVectorSize>* feature_vector) {
+  return feature_vector->data() + kNumBands + 3 * kNumLowerBands;
+}
+
+constexpr float kInitialFeatureVal = -9999.f;
+
+// Checks that silence is detected when the input signal is 0 and that the
+// feature vector is written only if the input signal is not tagged as silence.
+TEST(RnnVadTest, SpectralFeaturesWithAndWithoutSilence) {
+  // Initialize.
+  SpectralFeaturesExtractor sfe;
+  std::array<float, kFrameSize20ms24kHz> samples;
+  rtc::ArrayView<float, kFrameSize20ms24kHz> samples_view(samples);
+  bool is_silence;
+  std::array<float, kTestFeatureVectorSize> feature_vector;
+
+  // Write an initial value in the feature vector to detect changes.
+  std::fill(feature_vector.begin(), feature_vector.end(), kInitialFeatureVal);
+
+  // TODO(bugs.webrtc.org/8948): Add when the issue is fixed.
+  // FloatingPointExceptionObserver fpe_observer;
+
+  // With silence.
+  std::fill(samples.begin(), samples.end(), 0.f);
+  is_silence = sfe.CheckSilenceComputeFeatures(
+      samples_view, samples_view, GetHigherBandsSpectrum(&feature_vector),
+      GetAverage(&feature_vector), GetFirstDerivative(&feature_vector),
+      GetSecondDerivative(&feature_vector),
+      GetCepstralCrossCorrelation(&feature_vector),
+      GetCepstralVariability(&feature_vector));
+  // Silence is expected, the output won't be overwritten.
+  EXPECT_TRUE(is_silence);
+  EXPECT_TRUE(std::all_of(feature_vector.begin(), feature_vector.end(),
+                          [](float x) { return x == kInitialFeatureVal; }));
+
+  // With no silence.
+  WriteTestData(samples);
+  is_silence = sfe.CheckSilenceComputeFeatures(
+      samples_view, samples_view, GetHigherBandsSpectrum(&feature_vector),
+      GetAverage(&feature_vector), GetFirstDerivative(&feature_vector),
+      GetSecondDerivative(&feature_vector),
+      GetCepstralCrossCorrelation(&feature_vector),
+      GetCepstralVariability(&feature_vector));
+  // Silence is not expected, the output will be overwritten.
+  EXPECT_FALSE(is_silence);
+  EXPECT_FALSE(std::all_of(feature_vector.begin(), feature_vector.end(),
+                           [](float x) { return x == kInitialFeatureVal; }));
+}
+
+// Feeds a constant input signal and checks that:
+// - the cepstral coefficients average does not change;
+// - the derivatives are zero;
+// - the cepstral variability score does not change.
+TEST(RnnVadTest, CepstralFeaturesConstantAverageZeroDerivative) {
+  // Initialize.
+  SpectralFeaturesExtractor sfe;
+  std::array<float, kFrameSize20ms24kHz> samples;
+  rtc::ArrayView<float, kFrameSize20ms24kHz> samples_view(samples);
+  WriteTestData(samples);
+  bool is_silence;
+
+  // Fill the spectral features with test data.
+  std::array<float, kTestFeatureVectorSize> feature_vector;
+  for (int i = 0; i < kCepstralCoeffsHistorySize; ++i) {
+    is_silence = sfe.CheckSilenceComputeFeatures(
+        samples_view, samples_view, GetHigherBandsSpectrum(&feature_vector),
+        GetAverage(&feature_vector), GetFirstDerivative(&feature_vector),
+        GetSecondDerivative(&feature_vector),
+        GetCepstralCrossCorrelation(&feature_vector),
+        GetCepstralVariability(&feature_vector));
+  }
+
+  // Feed the test data one last time but using a different output vector.
+  std::array<float, kTestFeatureVectorSize> feature_vector_last;
+  is_silence = sfe.CheckSilenceComputeFeatures(
+      samples_view, samples_view, GetHigherBandsSpectrum(&feature_vector_last),
+      GetAverage(&feature_vector_last),
+      GetFirstDerivative(&feature_vector_last),
+      GetSecondDerivative(&feature_vector_last),
+      GetCepstralCrossCorrelation(&feature_vector_last),
+      GetCepstralVariability(&feature_vector_last));
+
+  // Average is unchanged.
+  ExpectEqualFloatArray({feature_vector.data(), kNumLowerBands},
+                        {feature_vector_last.data(), kNumLowerBands});
+  // First and second derivatives are zero.
+  constexpr std::array<float, kNumLowerBands> zeros{};
+  ExpectEqualFloatArray(
+      {feature_vector_last.data() + kNumBands, kNumLowerBands}, zeros);
+  ExpectEqualFloatArray(
+      {feature_vector_last.data() + kNumBands + kNumLowerBands, kNumLowerBands},
+      zeros);
+  // Variability is unchanged.
+  EXPECT_FLOAT_EQ(feature_vector[kNumBands + 3 * kNumLowerBands],
+                  feature_vector_last[kNumBands + 3 * kNumLowerBands]);
+}
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,95 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SYMMETRIC_MATRIX_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SYMMETRIC_MATRIX_BUFFER_H_
+
+#include <algorithm>
+#include <array>
+#include <cstring>
+#include <utility>
+
+#include "api/array_view.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_compare.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Data structure to buffer the results of pair-wise comparisons between items
+// stored in a ring buffer. Every time that the oldest item is replaced in the
+// ring buffer, the new one is compared to the remaining items in the ring
+// buffer. The results of such comparisons need to be buffered and automatically
+// removed when one of the two corresponding items that have been compared is
+// removed from the ring buffer. It is assumed that the comparison is symmetric
+// and that comparing an item with itself is not needed.
+template <typename T, int S>
+class SymmetricMatrixBuffer {
+  static_assert(S > 2, "");
+
+ public:
+  SymmetricMatrixBuffer() = default;
+  SymmetricMatrixBuffer(const SymmetricMatrixBuffer&) = delete;
+  SymmetricMatrixBuffer& operator=(const SymmetricMatrixBuffer&) = delete;
+  ~SymmetricMatrixBuffer() = default;
+  // Sets the buffer values to zero.
+  void Reset() {
+    static_assert(std::is_arithmetic<T>::value,
+                  "Integral or floating point required.");
+    buf_.fill(0);
+  }
+  // Pushes the results from the comparison between the most recent item and
+  // those that are still in the ring buffer. The first element in |values| must
+  // correspond to the comparison between the most recent item and the second
+  // most recent one in the ring buffer, whereas the last element in |values|
+  // must correspond to the comparison between the most recent item and the
+  // oldest one in the ring buffer.
+  void Push(rtc::ArrayView<T, S - 1> values) {
+    // Move the lower-right sub-matrix of size (S-2) x (S-2) one row up and one
+    // column left.
+    std::memmove(buf_.data(), buf_.data() + S, (buf_.size() - S) * sizeof(T));
+    // Copy new values in the last column in the right order.
+    for (int i = 0; rtc::SafeLt(i, values.size()); ++i) {
+      const int index = (S - 1 - i) * (S - 1) - 1;
+      RTC_DCHECK_GE(index, 0);
+      RTC_DCHECK_LT(index, buf_.size());
+      buf_[index] = values[i];
+    }
+  }
+  // Reads the value that corresponds to comparison of two items in the ring
+  // buffer having delay |delay1| and |delay2|. The two arguments must not be
+  // equal and both must be in {0, ..., S - 1}.
+  T GetValue(int delay1, int delay2) const {
+    int row = S - 1 - delay1;
+    int col = S - 1 - delay2;
+    RTC_DCHECK_NE(row, col) << "The diagonal cannot be accessed.";
+    if (row > col)
+      std::swap(row, col);  // Swap to access the upper-right triangular part.
+    RTC_DCHECK_LE(0, row);
+    RTC_DCHECK_LT(row, S - 1) << "Not enforcing row < col and row != col.";
+    RTC_DCHECK_LE(1, col) << "Not enforcing row < col and row != col.";
+    RTC_DCHECK_LT(col, S);
+    const int index = row * (S - 1) + (col - 1);
+    RTC_DCHECK_LE(0, index);
+    RTC_DCHECK_LT(index, buf_.size());
+    return buf_[index];
+  }
+
+ private:
+  // Encode an upper-right triangular matrix (excluding its diagonal) using a
+  // square matrix. This allows to move the data in Push() with one single
+  // operation.
+  std::array<T, (S - 1) * (S - 1)> buf_{};
+};
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_SYMMETRIC_MATRIX_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,107 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/symmetric_matrix_buffer.h"
+
+#include "modules/audio_processing/agc2/rnn_vad/ring_buffer.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+template <typename T, int S>
+void CheckSymmetry(const SymmetricMatrixBuffer<T, S>* sym_matrix_buf) {
+  for (int row = 0; row < S - 1; ++row)
+    for (int col = row + 1; col < S; ++col)
+      EXPECT_EQ(sym_matrix_buf->GetValue(row, col),
+                sym_matrix_buf->GetValue(col, row));
+}
+
+using PairType = std::pair<int, int>;
+
+// Checks that the symmetric matrix buffer contains any pair with a value equal
+// to the given one.
+template <int S>
+bool CheckPairsWithValueExist(
+    const SymmetricMatrixBuffer<PairType, S>* sym_matrix_buf,
+    const int value) {
+  for (int row = 0; row < S - 1; ++row) {
+    for (int col = row + 1; col < S; ++col) {
+      auto p = sym_matrix_buf->GetValue(row, col);
+      if (p.first == value || p.second == value)
+        return true;
+    }
+  }
+  return false;
+}
+
+// Test that shows how to combine RingBuffer and SymmetricMatrixBuffer to
+// efficiently compute pair-wise scores. This test verifies that the evolution
+// of a SymmetricMatrixBuffer instance follows that of RingBuffer.
+TEST(RnnVadTest, SymmetricMatrixBufferUseCase) {
+  // Instance a ring buffer which will be fed with a series of integer values.
+  constexpr int kRingBufSize = 10;
+  RingBuffer<int, 1, kRingBufSize> ring_buf;
+  // Instance a symmetric matrix buffer for the ring buffer above. It stores
+  // pairs of integers with which this test can easily check that the evolution
+  // of RingBuffer and SymmetricMatrixBuffer match.
+  SymmetricMatrixBuffer<PairType, kRingBufSize> sym_matrix_buf;
+  for (int t = 1; t <= 100; ++t) {  // Evolution steps.
+    SCOPED_TRACE(t);
+    const int t_removed = ring_buf.GetArrayView(kRingBufSize - 1)[0];
+    ring_buf.Push({&t, 1});
+    // The head of the ring buffer is |t|.
+    ASSERT_EQ(t, ring_buf.GetArrayView(0)[0]);
+    // Create the comparisons between |t| and the older elements in the ring
+    // buffer.
+    std::array<PairType, kRingBufSize - 1> new_comparions;
+    for (int i = 0; i < kRingBufSize - 1; ++i) {
+      // Start comparing |t| to the second newest element in the ring buffer.
+      const int delay = i + 1;
+      const auto t_prev = ring_buf.GetArrayView(delay)[0];
+      ASSERT_EQ(std::max(0, t - delay), t_prev);
+      // Compare the last element |t| with |t_prev|.
+      new_comparions[i].first = t_prev;
+      new_comparions[i].second = t;
+    }
+    // Push the new comparisons in the symmetric matrix buffer.
+    sym_matrix_buf.Push({new_comparions.data(), new_comparions.size()});
+    // Tests.
+    CheckSymmetry(&sym_matrix_buf);
+    // Check that the pairs resulting from the content in the ring buffer are
+    // in the right position.
+    for (int delay1 = 0; delay1 < kRingBufSize - 1; ++delay1) {
+      for (int delay2 = delay1 + 1; delay2 < kRingBufSize; ++delay2) {
+        const auto t1 = ring_buf.GetArrayView(delay1)[0];
+        const auto t2 = ring_buf.GetArrayView(delay2)[0];
+        ASSERT_LE(t2, t1);
+        const auto p = sym_matrix_buf.GetValue(delay1, delay2);
+        EXPECT_EQ(p.first, t2);
+        EXPECT_EQ(p.second, t1);
+      }
+    }
+    // Check that every older element in the ring buffer still has a
+    // corresponding pair in the symmetric matrix buffer.
+    for (int delay = 1; delay < kRingBufSize; ++delay) {
+      const auto t_prev = ring_buf.GetArrayView(delay)[0];
+      EXPECT_TRUE(CheckPairsWithValueExist(&sym_matrix_buf, t_prev));
+    }
+    // Check that the element removed from the ring buffer has no corresponding
+    // pairs in the symmetric matrix buffer.
+    if (t > kRingBufSize - 1) {
+      EXPECT_FALSE(CheckPairsWithValueExist(&sym_matrix_buf, t_removed));
+    }
+  }
+}
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/test_utils.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/test_utils.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/test_utils.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/test_utils.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,141 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/test_utils.h"
+
+#include <algorithm>
+#include <fstream>
+#include <memory>
+#include <type_traits>
+#include <vector>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_compare.h"
+#include "test/gtest.h"
+#include "test/testsupport/file_utils.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+// File reader for binary files that contain a sequence of values with
+// arithmetic type `T`. The values of type `T` that are read are cast to float.
+template <typename T>
+class FloatFileReader : public FileReader {
+ public:
+  static_assert(std::is_arithmetic<T>::value, "");
+  FloatFileReader(const std::string& filename)
+      : is_(filename, std::ios::binary | std::ios::ate),
+        size_(is_.tellg() / sizeof(T)) {
+    RTC_CHECK(is_);
+    SeekBeginning();
+  }
+  FloatFileReader(const FloatFileReader&) = delete;
+  FloatFileReader& operator=(const FloatFileReader&) = delete;
+  ~FloatFileReader() = default;
+
+  int size() const override { return size_; }
+  bool ReadChunk(rtc::ArrayView<float> dst) override {
+    const std::streamsize bytes_to_read = dst.size() * sizeof(T);
+    if (std::is_same<T, float>::value) {
+      is_.read(reinterpret_cast<char*>(dst.data()), bytes_to_read);
+    } else {
+      buffer_.resize(dst.size());
+      is_.read(reinterpret_cast<char*>(buffer_.data()), bytes_to_read);
+      std::transform(buffer_.begin(), buffer_.end(), dst.begin(),
+                     [](const T& v) -> float { return static_cast<float>(v); });
+    }
+    return is_.gcount() == bytes_to_read;
+  }
+  bool ReadValue(float& dst) override { return ReadChunk({&dst, 1}); }
+  void SeekForward(int hop) override { is_.seekg(hop * sizeof(T), is_.cur); }
+  void SeekBeginning() override { is_.seekg(0, is_.beg); }
+
+ private:
+  std::ifstream is_;
+  const int size_;
+  std::vector<T> buffer_;
+};
+
+}  // namespace
+
+using webrtc::test::ResourcePath;
+
+void ExpectEqualFloatArray(rtc::ArrayView<const float> expected,
+                           rtc::ArrayView<const float> computed) {
+  ASSERT_EQ(expected.size(), computed.size());
+  for (int i = 0; rtc::SafeLt(i, expected.size()); ++i) {
+    SCOPED_TRACE(i);
+    EXPECT_FLOAT_EQ(expected[i], computed[i]);
+  }
+}
+
+void ExpectNearAbsolute(rtc::ArrayView<const float> expected,
+                        rtc::ArrayView<const float> computed,
+                        float tolerance) {
+  ASSERT_EQ(expected.size(), computed.size());
+  for (int i = 0; rtc::SafeLt(i, expected.size()); ++i) {
+    SCOPED_TRACE(i);
+    EXPECT_NEAR(expected[i], computed[i], tolerance);
+  }
+}
+
+std::unique_ptr<FileReader> CreatePcmSamplesReader() {
+  return std::make_unique<FloatFileReader<int16_t>>(
+      /*filename=*/test::ResourcePath("audio_processing/agc2/rnn_vad/samples",
+                                      "pcm"));
+}
+
+ChunksFileReader CreatePitchBuffer24kHzReader() {
+  auto reader = std::make_unique<FloatFileReader<float>>(
+      /*filename=*/test::ResourcePath(
+          "audio_processing/agc2/rnn_vad/pitch_buf_24k", "dat"));
+  const int num_chunks = rtc::CheckedDivExact(reader->size(), kBufSize24kHz);
+  return {/*chunk_size=*/kBufSize24kHz, num_chunks, std::move(reader)};
+}
+
+ChunksFileReader CreateLpResidualAndPitchInfoReader() {
+  constexpr int kPitchInfoSize = 2;  // Pitch period and strength.
+  constexpr int kChunkSize = kBufSize24kHz + kPitchInfoSize;
+  auto reader = std::make_unique<FloatFileReader<float>>(
+      /*filename=*/test::ResourcePath(
+          "audio_processing/agc2/rnn_vad/pitch_lp_res", "dat"));
+  const int num_chunks = rtc::CheckedDivExact(reader->size(), kChunkSize);
+  return {kChunkSize, num_chunks, std::move(reader)};
+}
+
+std::unique_ptr<FileReader> CreateGruInputReader() {
+  return std::make_unique<FloatFileReader<float>>(
+      /*filename=*/test::ResourcePath("audio_processing/agc2/rnn_vad/gru_in",
+                                      "dat"));
+}
+
+std::unique_ptr<FileReader> CreateVadProbsReader() {
+  return std::make_unique<FloatFileReader<float>>(
+      /*filename=*/test::ResourcePath("audio_processing/agc2/rnn_vad/vad_prob",
+                                      "dat"));
+}
+
+PitchTestData::PitchTestData() {
+  FloatFileReader<float> reader(
+      /*filename=*/ResourcePath(
+          "audio_processing/agc2/rnn_vad/pitch_search_int", "dat"));
+  reader.ReadChunk(pitch_buffer_24k_);
+  reader.ReadChunk(square_energies_24k_);
+  reader.ReadChunk(auto_correlation_12k_);
+  // Reverse the order of the squared energy values.
+  // Required after the WebRTC CL 191703 which switched to forward computation.
+  std::reverse(square_energies_24k_.begin(), square_energies_24k_.end());
+}
+
+PitchTestData::~PitchTestData() = default;
+
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/test_utils.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/test_utils.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/test_utils.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/test_utils.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,129 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_TEST_UTILS_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_TEST_UTILS_H_
+
+#include <array>
+#include <fstream>
+#include <memory>
+#include <string>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_compare.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+constexpr float kFloatMin = std::numeric_limits<float>::min();
+
+// Fails for every pair from two equally sized rtc::ArrayView<float> views such
+// that the values in the pair do not match.
+void ExpectEqualFloatArray(rtc::ArrayView<const float> expected,
+                           rtc::ArrayView<const float> computed);
+
+// Fails for every pair from two equally sized rtc::ArrayView<float> views such
+// that their absolute error is above a given threshold.
+void ExpectNearAbsolute(rtc::ArrayView<const float> expected,
+                        rtc::ArrayView<const float> computed,
+                        float tolerance);
+
+// File reader interface.
+class FileReader {
+ public:
+  virtual ~FileReader() = default;
+  // Number of values in the file.
+  virtual int size() const = 0;
+  // Reads `dst.size()` float values into `dst`, advances the internal file
+  // position according to the number of read bytes and returns true if the
+  // values are correctly read. If the number of remaining bytes in the file is
+  // not sufficient to read `dst.size()` float values, `dst` is partially
+  // modified and false is returned.
+  virtual bool ReadChunk(rtc::ArrayView<float> dst) = 0;
+  // Reads a single float value, advances the internal file position according
+  // to the number of read bytes and returns true if the value is correctly
+  // read. If the number of remaining bytes in the file is not sufficient to
+  // read one float, `dst` is not modified and false is returned.
+  virtual bool ReadValue(float& dst) = 0;
+  // Advances the internal file position by `hop` float values.
+  virtual void SeekForward(int hop) = 0;
+  // Resets the internal file position to BOF.
+  virtual void SeekBeginning() = 0;
+};
+
+// File reader for files that contain `num_chunks` chunks with size equal to
+// `chunk_size`.
+struct ChunksFileReader {
+  const int chunk_size;
+  const int num_chunks;
+  std::unique_ptr<FileReader> reader;
+};
+
+// Creates a reader for the PCM S16 samples file.
+std::unique_ptr<FileReader> CreatePcmSamplesReader();
+
+// Creates a reader for the 24 kHz pitch buffer test data.
+ChunksFileReader CreatePitchBuffer24kHzReader();
+
+// Creates a reader for the LP residual and pitch information test data.
+ChunksFileReader CreateLpResidualAndPitchInfoReader();
+
+// Creates a reader for the sequence of GRU input vectors.
+std::unique_ptr<FileReader> CreateGruInputReader();
+
+// Creates a reader for the VAD probabilities test data.
+std::unique_ptr<FileReader> CreateVadProbsReader();
+
+// Class to retrieve a test pitch buffer content and the expected output for the
+// analysis steps.
+class PitchTestData {
+ public:
+  PitchTestData();
+  ~PitchTestData();
+  rtc::ArrayView<const float, kBufSize24kHz> PitchBuffer24kHzView() const {
+    return pitch_buffer_24k_;
+  }
+  rtc::ArrayView<const float, kRefineNumLags24kHz> SquareEnergies24kHzView()
+      const {
+    return square_energies_24k_;
+  }
+  rtc::ArrayView<const float, kNumLags12kHz> AutoCorrelation12kHzView() const {
+    return auto_correlation_12k_;
+  }
+
+ private:
+  std::array<float, kBufSize24kHz> pitch_buffer_24k_;
+  std::array<float, kRefineNumLags24kHz> square_energies_24k_;
+  std::array<float, kNumLags12kHz> auto_correlation_12k_;
+};
+
+// Writer for binary files.
+class FileWriter {
+ public:
+  explicit FileWriter(const std::string& file_path)
+      : os_(file_path, std::ios::binary) {}
+  FileWriter(const FileWriter&) = delete;
+  FileWriter& operator=(const FileWriter&) = delete;
+  ~FileWriter() = default;
+  void WriteChunk(rtc::ArrayView<const float> value) {
+    const std::streamsize bytes_to_write = value.size() * sizeof(float);
+    os_.write(reinterpret_cast<const char*>(value.data()), bytes_to_write);
+  }
+
+ private:
+  std::ofstream os_;
+};
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_TEST_UTILS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/vector_math.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/vector_math.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/vector_math.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/vector_math.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,114 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_VECTOR_MATH_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_VECTOR_MATH_H_
+
+// Defines WEBRTC_ARCH_X86_FAMILY, used below.
+#include "rtc_base/system/arch.h"
+
+#if defined(WEBRTC_HAS_NEON)
+#include <arm_neon.h>
+#endif
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+#include <emmintrin.h>
+#endif
+
+#include <numeric>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_conversions.h"
+#include "rtc_base/system/arch.h"
+
+namespace webrtc {
+namespace rnn_vad {
+
+// Provides optimizations for mathematical operations having vectors as
+// operand(s).
+class VectorMath {
+ public:
+  explicit VectorMath(AvailableCpuFeatures cpu_features)
+      : cpu_features_(cpu_features) {}
+
+  // Computes the dot product between two equally sized vectors.
+  float DotProduct(rtc::ArrayView<const float> x,
+                   rtc::ArrayView<const float> y) const {
+    RTC_DCHECK_EQ(x.size(), y.size());
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+    if (cpu_features_.avx2) {
+      return DotProductAvx2(x, y);
+    } else if (cpu_features_.sse2) {
+      __m128 accumulator = _mm_setzero_ps();
+      constexpr int kBlockSizeLog2 = 2;
+      constexpr int kBlockSize = 1 << kBlockSizeLog2;
+      const int incomplete_block_index = (x.size() >> kBlockSizeLog2)
+                                         << kBlockSizeLog2;
+      for (int i = 0; i < incomplete_block_index; i += kBlockSize) {
+        RTC_DCHECK_LE(i + kBlockSize, x.size());
+        const __m128 x_i = _mm_loadu_ps(&x[i]);
+        const __m128 y_i = _mm_loadu_ps(&y[i]);
+        // Multiply-add.
+        const __m128 z_j = _mm_mul_ps(x_i, y_i);
+        accumulator = _mm_add_ps(accumulator, z_j);
+      }
+      // Reduce `accumulator` by addition.
+      __m128 high = _mm_movehl_ps(accumulator, accumulator);
+      accumulator = _mm_add_ps(accumulator, high);
+      high = _mm_shuffle_ps(accumulator, accumulator, 1);
+      accumulator = _mm_add_ps(accumulator, high);
+      float dot_product = _mm_cvtss_f32(accumulator);
+      // Add the result for the last block if incomplete.
+      for (int i = incomplete_block_index;
+           i < rtc::dchecked_cast<int>(x.size()); ++i) {
+        dot_product += x[i] * y[i];
+      }
+      return dot_product;
+    }
+#elif defined(WEBRTC_HAS_NEON) && defined(WEBRTC_ARCH_ARM64)
+    if (cpu_features_.neon) {
+      float32x4_t accumulator = vdupq_n_f32(0.f);
+      constexpr int kBlockSizeLog2 = 2;
+      constexpr int kBlockSize = 1 << kBlockSizeLog2;
+      const int incomplete_block_index = (x.size() >> kBlockSizeLog2)
+                                         << kBlockSizeLog2;
+      for (int i = 0; i < incomplete_block_index; i += kBlockSize) {
+        RTC_DCHECK_LE(i + kBlockSize, x.size());
+        const float32x4_t x_i = vld1q_f32(&x[i]);
+        const float32x4_t y_i = vld1q_f32(&y[i]);
+        accumulator = vfmaq_f32(accumulator, x_i, y_i);
+      }
+      // Reduce `accumulator` by addition.
+      const float32x2_t tmp =
+          vpadd_f32(vget_low_f32(accumulator), vget_high_f32(accumulator));
+      float dot_product = vget_lane_f32(vpadd_f32(tmp, vrev64_f32(tmp)), 0);
+      // Add the result for the last block if incomplete.
+      for (int i = incomplete_block_index;
+           i < rtc::dchecked_cast<int>(x.size()); ++i) {
+        dot_product += x[i] * y[i];
+      }
+      return dot_product;
+    }
+#endif
+    return std::inner_product(x.begin(), x.end(), y.begin(), 0.f);
+  }
+
+ private:
+  float DotProductAvx2(rtc::ArrayView<const float> x,
+                       rtc::ArrayView<const float> y) const;
+
+  const AvailableCpuFeatures cpu_features_;
+};
+
+}  // namespace rnn_vad
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_RNN_VAD_VECTOR_MATH_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/vector_math_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/vector_math_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/vector_math_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/rnn_vad/vector_math_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+ *  Copyright (c) 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/rnn_vad/vector_math.h"
+
+#include <vector>
+
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace rnn_vad {
+namespace {
+
+constexpr int kSizeOfX = 19;
+constexpr float kX[kSizeOfX] = {
+    0.31593041f, 0.9350786f,   -0.25252445f, -0.86956251f, -0.9673632f,
+    0.54571901f, -0.72504495f, -0.79509912f, -0.25525012f, -0.73340473f,
+    0.15747377f, -0.04370565f, 0.76135145f,  -0.57239645f, 0.68616848f,
+    0.3740298f,  0.34710799f,  -0.92207423f, 0.10738454f};
+constexpr int kSizeOfXSubSpan = 16;
+static_assert(kSizeOfXSubSpan < kSizeOfX, "");
+constexpr float kEnergyOfX = 7.315563958160327f;
+constexpr float kEnergyOfXSubspan = 6.333327669592963f;
+
+class VectorMathParametrization
+    : public ::testing::TestWithParam<AvailableCpuFeatures> {};
+
+TEST_P(VectorMathParametrization, TestDotProduct) {
+  VectorMath vector_math(/*cpu_features=*/GetParam());
+  EXPECT_FLOAT_EQ(vector_math.DotProduct(kX, kX), kEnergyOfX);
+  EXPECT_FLOAT_EQ(
+      vector_math.DotProduct({kX, kSizeOfXSubSpan}, {kX, kSizeOfXSubSpan}),
+      kEnergyOfXSubspan);
+}
+
+// Finds the relevant CPU features combinations to test.
+std::vector<AvailableCpuFeatures> GetCpuFeaturesToTest() {
+  std::vector<AvailableCpuFeatures> v;
+  v.push_back({/*sse2=*/false, /*avx2=*/false, /*neon=*/false});
+  AvailableCpuFeatures available = GetAvailableCpuFeatures();
+  if (available.avx2) {
+    v.push_back({/*sse2=*/false, /*avx2=*/true, /*neon=*/false});
+  }
+  if (available.sse2) {
+    v.push_back({/*sse2=*/true, /*avx2=*/false, /*neon=*/false});
+  }
+  if (available.neon) {
+    v.push_back({/*sse2=*/false, /*avx2=*/false, /*neon=*/true});
+  }
+  return v;
+}
+
+INSTANTIATE_TEST_SUITE_P(
+    RnnVadTest,
+    VectorMathParametrization,
+    ::testing::ValuesIn(GetCpuFeaturesToTest()),
+    [](const ::testing::TestParamInfo<AvailableCpuFeatures>& info) {
+      return info.param.ToString();
+    });
+
+}  // namespace
+}  // namespace rnn_vad
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+ *  Copyright (c) 2021 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/saturation_protector_buffer.h"
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_compare.h"
+
+namespace webrtc {
+
+SaturationProtectorBuffer::SaturationProtectorBuffer() = default;
+
+SaturationProtectorBuffer::~SaturationProtectorBuffer() = default;
+
+bool SaturationProtectorBuffer::operator==(
+    const SaturationProtectorBuffer& b) const {
+  RTC_DCHECK_LE(size_, buffer_.size());
+  RTC_DCHECK_LE(b.size_, b.buffer_.size());
+  if (size_ != b.size_) {
+    return false;
+  }
+  for (int i = 0, i0 = FrontIndex(), i1 = b.FrontIndex(); i < size_;
+       ++i, ++i0, ++i1) {
+    if (buffer_[i0 % buffer_.size()] != b.buffer_[i1 % b.buffer_.size()]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+int SaturationProtectorBuffer::Capacity() const {
+  return buffer_.size();
+}
+
+int SaturationProtectorBuffer::Size() const {
+  return size_;
+}
+
+void SaturationProtectorBuffer::Reset() {
+  next_ = 0;
+  size_ = 0;
+}
+
+void SaturationProtectorBuffer::PushBack(float v) {
+  RTC_DCHECK_GE(next_, 0);
+  RTC_DCHECK_GE(size_, 0);
+  RTC_DCHECK_LT(next_, buffer_.size());
+  RTC_DCHECK_LE(size_, buffer_.size());
+  buffer_[next_++] = v;
+  if (rtc::SafeEq(next_, buffer_.size())) {
+    next_ = 0;
+  }
+  if (rtc::SafeLt(size_, buffer_.size())) {
+    size_++;
+  }
+}
+
+absl::optional<float> SaturationProtectorBuffer::Front() const {
+  if (size_ == 0) {
+    return absl::nullopt;
+  }
+  RTC_DCHECK_LT(FrontIndex(), buffer_.size());
+  return buffer_[FrontIndex()];
+}
+
+int SaturationProtectorBuffer::FrontIndex() const {
+  return rtc::SafeEq(size_, buffer_.size()) ? next_ : 0;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,59 @@
+/*
+ *  Copyright (c) 2021 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_SATURATION_PROTECTOR_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_SATURATION_PROTECTOR_BUFFER_H_
+
+#include <array>
+
+#include "absl/types/optional.h"
+#include "modules/audio_processing/agc2/agc2_common.h"
+
+namespace webrtc {
+
+// Ring buffer for the saturation protector which only supports (i) push back
+// and (ii) read oldest item.
+class SaturationProtectorBuffer {
+ public:
+  SaturationProtectorBuffer();
+  ~SaturationProtectorBuffer();
+
+  bool operator==(const SaturationProtectorBuffer& b) const;
+  inline bool operator!=(const SaturationProtectorBuffer& b) const {
+    return !(*this == b);
+  }
+
+  // Maximum number of values that the buffer can contain.
+  int Capacity() const;
+
+  // Number of values in the buffer.
+  int Size() const;
+
+  void Reset();
+
+  // Pushes back `v`. If the buffer is full, the oldest value is replaced.
+  void PushBack(float v);
+
+  // Returns the oldest item in the buffer. Returns an empty value if the
+  // buffer is empty.
+  absl::optional<float> Front() const;
+
+ private:
+  int FrontIndex() const;
+  // `buffer_` has `size_` elements (up to the size of `buffer_`) and `next_` is
+  // the position where the next new value is written in `buffer_`.
+  std::array<float, kSaturationProtectorBufferSize> buffer_;
+  int next_ = 0;
+  int size_ = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_SATURATION_PROTECTOR_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_buffer_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,73 @@
+/*
+ *  Copyright (c) 2021 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/saturation_protector_buffer.h"
+
+#include "test/gmock.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+using ::testing::Eq;
+using ::testing::Optional;
+
+TEST(GainController2SaturationProtectorBuffer, Init) {
+  SaturationProtectorBuffer b;
+  EXPECT_EQ(b.Size(), 0);
+  EXPECT_FALSE(b.Front().has_value());
+}
+
+TEST(GainController2SaturationProtectorBuffer, PushBack) {
+  SaturationProtectorBuffer b;
+  constexpr float kValue = 123.0f;
+  b.PushBack(kValue);
+  EXPECT_EQ(b.Size(), 1);
+  EXPECT_THAT(b.Front(), Optional(Eq(kValue)));
+}
+
+TEST(GainController2SaturationProtectorBuffer, Reset) {
+  SaturationProtectorBuffer b;
+  b.PushBack(123.0f);
+  b.Reset();
+  EXPECT_EQ(b.Size(), 0);
+  EXPECT_FALSE(b.Front().has_value());
+}
+
+// Checks that the front value does not change until the ring buffer gets full.
+TEST(GainController2SaturationProtectorBuffer, FrontUntilBufferIsFull) {
+  SaturationProtectorBuffer b;
+  constexpr float kValue = 123.0f;
+  b.PushBack(kValue);
+  for (int i = 1; i < b.Capacity(); ++i) {
+    SCOPED_TRACE(i);
+    EXPECT_THAT(b.Front(), Optional(Eq(kValue)));
+    b.PushBack(kValue + i);
+  }
+}
+
+// Checks that when the buffer is full it behaves as a shift register.
+TEST(GainController2SaturationProtectorBuffer, FrontIsDelayed) {
+  SaturationProtectorBuffer b;
+  // Fill the buffer.
+  for (int i = 0; i < b.Capacity(); ++i) {
+    b.PushBack(i);
+  }
+  // The ring buffer should now behave as a shift register with a delay equal to
+  // its capacity.
+  for (int i = b.Capacity(); i < 2 * b.Capacity() + 1; ++i) {
+    SCOPED_TRACE(i);
+    EXPECT_THAT(b.Front(), Optional(Eq(i - b.Capacity())));
+    b.PushBack(i);
+  }
+}
+
+}  // namespace
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,188 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/saturation_protector.h"
+
+#include <memory>
+
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/agc2/saturation_protector_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_minmax.h"
+
+namespace webrtc {
+namespace {
+
+constexpr int kPeakEnveloperSuperFrameLengthMs = 400;
+constexpr float kMinMarginDb = 12.0f;
+constexpr float kMaxMarginDb = 25.0f;
+constexpr float kAttack = 0.9988493699365052f;
+constexpr float kDecay = 0.9997697679981565f;
+
+// Saturation protector state. Defined outside of `SaturationProtectorImpl` to
+// implement check-point and restore ops.
+struct SaturationProtectorState {
+  bool operator==(const SaturationProtectorState& s) const {
+    return headroom_db == s.headroom_db &&
+           peak_delay_buffer == s.peak_delay_buffer &&
+           max_peaks_dbfs == s.max_peaks_dbfs &&
+           time_since_push_ms == s.time_since_push_ms;
+  }
+  inline bool operator!=(const SaturationProtectorState& s) const {
+    return !(*this == s);
+  }
+
+  float headroom_db;
+  SaturationProtectorBuffer peak_delay_buffer;
+  float max_peaks_dbfs;
+  int time_since_push_ms;  // Time since the last ring buffer push operation.
+};
+
+// Resets the saturation protector state.
+void ResetSaturationProtectorState(float initial_headroom_db,
+                                   SaturationProtectorState& state) {
+  state.headroom_db = initial_headroom_db;
+  state.peak_delay_buffer.Reset();
+  state.max_peaks_dbfs = kMinLevelDbfs;
+  state.time_since_push_ms = 0;
+}
+
+// Updates `state` by analyzing the estimated speech level `speech_level_dbfs`
+// and the peak level `peak_dbfs` for an observed frame. `state` must not be
+// modified without calling this function.
+void UpdateSaturationProtectorState(float peak_dbfs,
+                                    float speech_level_dbfs,
+                                    SaturationProtectorState& state) {
+  // Get the max peak over `kPeakEnveloperSuperFrameLengthMs` ms.
+  state.max_peaks_dbfs = std::max(state.max_peaks_dbfs, peak_dbfs);
+  state.time_since_push_ms += kFrameDurationMs;
+  if (rtc::SafeGt(state.time_since_push_ms, kPeakEnveloperSuperFrameLengthMs)) {
+    // Push `max_peaks_dbfs` back into the ring buffer.
+    state.peak_delay_buffer.PushBack(state.max_peaks_dbfs);
+    // Reset.
+    state.max_peaks_dbfs = kMinLevelDbfs;
+    state.time_since_push_ms = 0;
+  }
+
+  // Update the headroom by comparing the estimated speech level and the delayed
+  // max speech peak.
+  const float delayed_peak_dbfs =
+      state.peak_delay_buffer.Front().value_or(state.max_peaks_dbfs);
+  const float difference_db = delayed_peak_dbfs - speech_level_dbfs;
+  if (difference_db > state.headroom_db) {
+    // Attack.
+    state.headroom_db =
+        state.headroom_db * kAttack + difference_db * (1.0f - kAttack);
+  } else {
+    // Decay.
+    state.headroom_db =
+        state.headroom_db * kDecay + difference_db * (1.0f - kDecay);
+  }
+
+  state.headroom_db =
+      rtc::SafeClamp<float>(state.headroom_db, kMinMarginDb, kMaxMarginDb);
+}
+
+// Saturation protector which recommends a headroom based on the recent peaks.
+class SaturationProtectorImpl : public SaturationProtector {
+ public:
+  explicit SaturationProtectorImpl(float initial_headroom_db,
+                                   float extra_headroom_db,
+                                   int adjacent_speech_frames_threshold,
+                                   ApmDataDumper* apm_data_dumper)
+      : apm_data_dumper_(apm_data_dumper),
+        initial_headroom_db_(initial_headroom_db),
+        extra_headroom_db_(extra_headroom_db),
+        adjacent_speech_frames_threshold_(adjacent_speech_frames_threshold) {
+    Reset();
+  }
+  SaturationProtectorImpl(const SaturationProtectorImpl&) = delete;
+  SaturationProtectorImpl& operator=(const SaturationProtectorImpl&) = delete;
+  ~SaturationProtectorImpl() = default;
+
+  float HeadroomDb() override { return headroom_db_; }
+
+  void Analyze(float speech_probability,
+               float peak_dbfs,
+               float speech_level_dbfs) override {
+    if (speech_probability < kVadConfidenceThreshold) {
+      // Not a speech frame.
+      if (adjacent_speech_frames_threshold_ > 1) {
+        // When two or more adjacent speech frames are required in order to
+        // update the state, we need to decide whether to discard or confirm the
+        // updates based on the speech sequence length.
+        if (num_adjacent_speech_frames_ >= adjacent_speech_frames_threshold_) {
+          // First non-speech frame after a long enough sequence of speech
+          // frames. Update the reliable state.
+          reliable_state_ = preliminary_state_;
+        } else if (num_adjacent_speech_frames_ > 0) {
+          // First non-speech frame after a too short sequence of speech frames.
+          // Reset to the last reliable state.
+          preliminary_state_ = reliable_state_;
+        }
+      }
+      num_adjacent_speech_frames_ = 0;
+    } else {
+      // Speech frame observed.
+      num_adjacent_speech_frames_++;
+
+      // Update preliminary level estimate.
+      UpdateSaturationProtectorState(peak_dbfs, speech_level_dbfs,
+                                     preliminary_state_);
+
+      if (num_adjacent_speech_frames_ >= adjacent_speech_frames_threshold_) {
+        // `preliminary_state_` is now reliable. Update the headroom.
+        headroom_db_ = preliminary_state_.headroom_db + extra_headroom_db_;
+      }
+    }
+    DumpDebugData();
+  }
+
+  void Reset() override {
+    num_adjacent_speech_frames_ = 0;
+    headroom_db_ = initial_headroom_db_ + extra_headroom_db_;
+    ResetSaturationProtectorState(initial_headroom_db_, preliminary_state_);
+    ResetSaturationProtectorState(initial_headroom_db_, reliable_state_);
+  }
+
+ private:
+  void DumpDebugData() {
+    apm_data_dumper_->DumpRaw(
+        "agc2_saturation_protector_preliminary_max_peak_dbfs",
+        preliminary_state_.max_peaks_dbfs);
+    apm_data_dumper_->DumpRaw(
+        "agc2_saturation_protector_reliable_max_peak_dbfs",
+        reliable_state_.max_peaks_dbfs);
+  }
+
+  ApmDataDumper* const apm_data_dumper_;
+  const float initial_headroom_db_;
+  const float extra_headroom_db_;
+  const int adjacent_speech_frames_threshold_;
+  int num_adjacent_speech_frames_;
+  float headroom_db_;
+  SaturationProtectorState preliminary_state_;
+  SaturationProtectorState reliable_state_;
+};
+
+}  // namespace
+
+std::unique_ptr<SaturationProtector> CreateSaturationProtector(
+    float initial_headroom_db,
+    float extra_headroom_db,
+    int adjacent_speech_frames_threshold,
+    ApmDataDumper* apm_data_dumper) {
+  return std::make_unique<SaturationProtectorImpl>(
+      initial_headroom_db, extra_headroom_db, adjacent_speech_frames_threshold,
+      apm_data_dumper);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_SATURATION_PROTECTOR_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_SATURATION_PROTECTOR_H_
+
+#include <memory>
+
+namespace webrtc {
+class ApmDataDumper;
+
+// Saturation protector. Analyzes peak levels and recommends a headroom to
+// reduce the chances of clipping.
+class SaturationProtector {
+ public:
+  virtual ~SaturationProtector() = default;
+
+  // Returns the recommended headroom in dB.
+  virtual float HeadroomDb() = 0;
+
+  // Analyzes the peak level of a 10 ms frame along with its speech probability
+  // and the current speech level estimate to update the recommended headroom.
+  virtual void Analyze(float speech_probability,
+                       float peak_dbfs,
+                       float speech_level_dbfs) = 0;
+
+  // Resets the internal state.
+  virtual void Reset() = 0;
+};
+
+// Creates a saturation protector that starts at `initial_headroom_db`.
+std::unique_ptr<SaturationProtector> CreateSaturationProtector(
+    float initial_headroom_db,
+    float extra_headroom_db,
+    int adjacent_speech_frames_threshold,
+    ApmDataDumper* apm_data_dumper);
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_SATURATION_PROTECTOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/saturation_protector_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,175 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/saturation_protector.h"
+
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/gunit.h"
+
+namespace webrtc {
+namespace {
+
+constexpr float kInitialHeadroomDb = 20.0f;
+constexpr float kNoExtraHeadroomDb = 0.0f;
+constexpr int kNoAdjacentSpeechFramesRequired = 1;
+constexpr float kMaxSpeechProbability = 1.0f;
+
+// Calls `Analyze(speech_probability, peak_dbfs, speech_level_dbfs)`
+// `num_iterations` times on `saturation_protector` and return the largest
+// headroom difference between two consecutive calls.
+float RunOnConstantLevel(int num_iterations,
+                         float speech_probability,
+                         float peak_dbfs,
+                         float speech_level_dbfs,
+                         SaturationProtector& saturation_protector) {
+  float last_headroom = saturation_protector.HeadroomDb();
+  float max_difference = 0.0f;
+  for (int i = 0; i < num_iterations; ++i) {
+    saturation_protector.Analyze(speech_probability, peak_dbfs,
+                                 speech_level_dbfs);
+    const float new_headroom = saturation_protector.HeadroomDb();
+    max_difference =
+        std::max(max_difference, std::fabs(new_headroom - last_headroom));
+    last_headroom = new_headroom;
+  }
+  return max_difference;
+}
+
+// Checks that the returned headroom value is correctly reset.
+TEST(GainController2SaturationProtector, Reset) {
+  ApmDataDumper apm_data_dumper(0);
+  auto saturation_protector = CreateSaturationProtector(
+      kInitialHeadroomDb, kNoExtraHeadroomDb, kNoAdjacentSpeechFramesRequired,
+      &apm_data_dumper);
+  const float initial_headroom_db = saturation_protector->HeadroomDb();
+  RunOnConstantLevel(/*num_iterations=*/10, kMaxSpeechProbability,
+                     /*peak_dbfs=*/0.0f,
+                     /*speech_level_dbfs=*/-10.0f, *saturation_protector);
+  // Make sure that there are side-effects.
+  ASSERT_NE(initial_headroom_db, saturation_protector->HeadroomDb());
+  saturation_protector->Reset();
+  EXPECT_EQ(initial_headroom_db, saturation_protector->HeadroomDb());
+}
+
+// Checks that the estimate converges to the ratio between peaks and level
+// estimator values after a while.
+TEST(GainController2SaturationProtector, EstimatesCrestRatio) {
+  constexpr int kNumIterations = 2000;
+  constexpr float kPeakLevelDbfs = -20.0f;
+  constexpr float kCrestFactorDb = kInitialHeadroomDb + 1.0f;
+  constexpr float kSpeechLevelDbfs = kPeakLevelDbfs - kCrestFactorDb;
+  const float kMaxDifferenceDb =
+      0.5f * std::fabs(kInitialHeadroomDb - kCrestFactorDb);
+
+  ApmDataDumper apm_data_dumper(0);
+  auto saturation_protector = CreateSaturationProtector(
+      kInitialHeadroomDb, kNoExtraHeadroomDb, kNoAdjacentSpeechFramesRequired,
+      &apm_data_dumper);
+  RunOnConstantLevel(kNumIterations, kMaxSpeechProbability, kPeakLevelDbfs,
+                     kSpeechLevelDbfs, *saturation_protector);
+  EXPECT_NEAR(saturation_protector->HeadroomDb(), kCrestFactorDb,
+              kMaxDifferenceDb);
+}
+
+// Checks that the extra headroom is applied.
+TEST(GainController2SaturationProtector, ExtraHeadroomApplied) {
+  constexpr float kExtraHeadroomDb = 5.1234f;
+  constexpr int kNumIterations = 10;
+  constexpr float kPeakLevelDbfs = -20.0f;
+  constexpr float kSpeechLevelDbfs = kPeakLevelDbfs - 15.0f;
+
+  ApmDataDumper apm_data_dumper(0);
+
+  auto saturation_protector_no_extra = CreateSaturationProtector(
+      kInitialHeadroomDb, kNoExtraHeadroomDb, kNoAdjacentSpeechFramesRequired,
+      &apm_data_dumper);
+  for (int i = 0; i < kNumIterations; ++i) {
+    saturation_protector_no_extra->Analyze(kMaxSpeechProbability,
+                                           kPeakLevelDbfs, kSpeechLevelDbfs);
+  }
+
+  auto saturation_protector_extra = CreateSaturationProtector(
+      kInitialHeadroomDb, kExtraHeadroomDb, kNoAdjacentSpeechFramesRequired,
+      &apm_data_dumper);
+  for (int i = 0; i < kNumIterations; ++i) {
+    saturation_protector_extra->Analyze(kMaxSpeechProbability, kPeakLevelDbfs,
+                                        kSpeechLevelDbfs);
+  }
+
+  EXPECT_EQ(saturation_protector_no_extra->HeadroomDb() + kExtraHeadroomDb,
+            saturation_protector_extra->HeadroomDb());
+}
+
+// Checks that the headroom does not change too quickly.
+TEST(GainController2SaturationProtector, ChangeSlowly) {
+  constexpr int kNumIterations = 1000;
+  constexpr float kPeakLevelDbfs = -20.f;
+  constexpr float kCrestFactorDb = kInitialHeadroomDb - 5.f;
+  constexpr float kOtherCrestFactorDb = kInitialHeadroomDb;
+  constexpr float kSpeechLevelDbfs = kPeakLevelDbfs - kCrestFactorDb;
+  constexpr float kOtherSpeechLevelDbfs = kPeakLevelDbfs - kOtherCrestFactorDb;
+
+  ApmDataDumper apm_data_dumper(0);
+  auto saturation_protector = CreateSaturationProtector(
+      kInitialHeadroomDb, kNoExtraHeadroomDb, kNoAdjacentSpeechFramesRequired,
+      &apm_data_dumper);
+  float max_difference_db =
+      RunOnConstantLevel(kNumIterations, kMaxSpeechProbability, kPeakLevelDbfs,
+                         kSpeechLevelDbfs, *saturation_protector);
+  max_difference_db = std::max(
+      RunOnConstantLevel(kNumIterations, kMaxSpeechProbability, kPeakLevelDbfs,
+                         kOtherSpeechLevelDbfs, *saturation_protector),
+      max_difference_db);
+  constexpr float kMaxChangeSpeedDbPerSecond = 0.5f;  // 1 db / 2 seconds.
+  EXPECT_LE(max_difference_db,
+            kMaxChangeSpeedDbPerSecond / 1000 * kFrameDurationMs);
+}
+
+class SaturationProtectorParametrization
+    : public ::testing::TestWithParam<int> {
+ protected:
+  int adjacent_speech_frames_threshold() const { return GetParam(); }
+};
+
+TEST_P(SaturationProtectorParametrization, DoNotAdaptToShortSpeechSegments) {
+  ApmDataDumper apm_data_dumper(0);
+  auto saturation_protector = CreateSaturationProtector(
+      kInitialHeadroomDb, kNoExtraHeadroomDb,
+      adjacent_speech_frames_threshold(), &apm_data_dumper);
+  const float initial_headroom_db = saturation_protector->HeadroomDb();
+  RunOnConstantLevel(/*num_iterations=*/adjacent_speech_frames_threshold() - 1,
+                     kMaxSpeechProbability,
+                     /*peak_dbfs=*/0.0f,
+                     /*speech_level_dbfs=*/-10.0f, *saturation_protector);
+  // No adaptation expected.
+  EXPECT_EQ(initial_headroom_db, saturation_protector->HeadroomDb());
+}
+
+TEST_P(SaturationProtectorParametrization, AdaptToEnoughSpeechSegments) {
+  ApmDataDumper apm_data_dumper(0);
+  auto saturation_protector = CreateSaturationProtector(
+      kInitialHeadroomDb, kNoExtraHeadroomDb,
+      adjacent_speech_frames_threshold(), &apm_data_dumper);
+  const float initial_headroom_db = saturation_protector->HeadroomDb();
+  RunOnConstantLevel(/*num_iterations=*/adjacent_speech_frames_threshold() + 1,
+                     kMaxSpeechProbability,
+                     /*peak_dbfs=*/0.0f,
+                     /*speech_level_dbfs=*/-10.0f, *saturation_protector);
+  // Adaptation expected.
+  EXPECT_NE(initial_headroom_db, saturation_protector->HeadroomDb());
+}
+
+INSTANTIATE_TEST_SUITE_P(GainController2,
+                         SaturationProtectorParametrization,
+                         ::testing::Values(2, 9, 17));
+
+}  // namespace
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,177 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/signal_classifier.h"
+
+#include <algorithm>
+#include <numeric>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/agc2/down_sampler.h"
+#include "modules/audio_processing/agc2/noise_spectrum_estimator.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/checks.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+
+namespace webrtc {
+namespace {
+
+bool IsSse2Available() {
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+  return GetCPUInfo(kSSE2) != 0;
+#else
+  return false;
+#endif
+}
+
+void RemoveDcLevel(rtc::ArrayView<float> x) {
+  RTC_DCHECK_LT(0, x.size());
+  float mean = std::accumulate(x.data(), x.data() + x.size(), 0.f);
+  mean /= x.size();
+
+  for (float& v : x) {
+    v -= mean;
+  }
+}
+
+void PowerSpectrum(const OouraFft* ooura_fft,
+                   rtc::ArrayView<const float> x,
+                   rtc::ArrayView<float> spectrum) {
+  RTC_DCHECK_EQ(65, spectrum.size());
+  RTC_DCHECK_EQ(128, x.size());
+  float X[128];
+  std::copy(x.data(), x.data() + x.size(), X);
+  ooura_fft->Fft(X);
+
+  float* X_p = X;
+  RTC_DCHECK_EQ(X_p, &X[0]);
+  spectrum[0] = (*X_p) * (*X_p);
+  ++X_p;
+  RTC_DCHECK_EQ(X_p, &X[1]);
+  spectrum[64] = (*X_p) * (*X_p);
+  for (int k = 1; k < 64; ++k) {
+    ++X_p;
+    RTC_DCHECK_EQ(X_p, &X[2 * k]);
+    spectrum[k] = (*X_p) * (*X_p);
+    ++X_p;
+    RTC_DCHECK_EQ(X_p, &X[2 * k + 1]);
+    spectrum[k] += (*X_p) * (*X_p);
+  }
+}
+
+webrtc::SignalClassifier::SignalType ClassifySignal(
+    rtc::ArrayView<const float> signal_spectrum,
+    rtc::ArrayView<const float> noise_spectrum,
+    ApmDataDumper* data_dumper) {
+  int num_stationary_bands = 0;
+  int num_highly_nonstationary_bands = 0;
+
+  // Detect stationary and highly nonstationary bands.
+  for (size_t k = 1; k < 40; k++) {
+    if (signal_spectrum[k] < 3 * noise_spectrum[k] &&
+        signal_spectrum[k] * 3 > noise_spectrum[k]) {
+      ++num_stationary_bands;
+    } else if (signal_spectrum[k] > 9 * noise_spectrum[k]) {
+      ++num_highly_nonstationary_bands;
+    }
+  }
+
+  data_dumper->DumpRaw("agc2_num_stationary_bands", 1, &num_stationary_bands);
+  data_dumper->DumpRaw("agc2_num_highly_nonstationary_bands", 1,
+                       &num_highly_nonstationary_bands);
+
+  // Use the detected number of bands to classify the overall signal
+  // stationarity.
+  if (num_stationary_bands > 15) {
+    return SignalClassifier::SignalType::kStationary;
+  } else {
+    return SignalClassifier::SignalType::kNonStationary;
+  }
+}
+
+}  // namespace
+
+SignalClassifier::FrameExtender::FrameExtender(size_t frame_size,
+                                               size_t extended_frame_size)
+    : x_old_(extended_frame_size - frame_size, 0.f) {}
+
+SignalClassifier::FrameExtender::~FrameExtender() = default;
+
+void SignalClassifier::FrameExtender::ExtendFrame(
+    rtc::ArrayView<const float> x,
+    rtc::ArrayView<float> x_extended) {
+  RTC_DCHECK_EQ(x_old_.size() + x.size(), x_extended.size());
+  std::copy(x_old_.data(), x_old_.data() + x_old_.size(), x_extended.data());
+  std::copy(x.data(), x.data() + x.size(), x_extended.data() + x_old_.size());
+  std::copy(x_extended.data() + x_extended.size() - x_old_.size(),
+            x_extended.data() + x_extended.size(), x_old_.data());
+}
+
+SignalClassifier::SignalClassifier(ApmDataDumper* data_dumper)
+    : data_dumper_(data_dumper),
+      down_sampler_(data_dumper_),
+      noise_spectrum_estimator_(data_dumper_),
+      ooura_fft_(IsSse2Available()) {
+  Initialize(48000);
+}
+SignalClassifier::~SignalClassifier() {}
+
+void SignalClassifier::Initialize(int sample_rate_hz) {
+  down_sampler_.Initialize(sample_rate_hz);
+  noise_spectrum_estimator_.Initialize();
+  frame_extender_.reset(new FrameExtender(80, 128));
+  sample_rate_hz_ = sample_rate_hz;
+  initialization_frames_left_ = 2;
+  consistent_classification_counter_ = 3;
+  last_signal_type_ = SignalClassifier::SignalType::kNonStationary;
+}
+
+SignalClassifier::SignalType SignalClassifier::Analyze(
+    rtc::ArrayView<const float> signal) {
+  RTC_DCHECK_EQ(signal.size(), sample_rate_hz_ / 100);
+
+  // Compute the signal power spectrum.
+  float downsampled_frame[80];
+  down_sampler_.DownSample(signal, downsampled_frame);
+  float extended_frame[128];
+  frame_extender_->ExtendFrame(downsampled_frame, extended_frame);
+  RemoveDcLevel(extended_frame);
+  float signal_spectrum[65];
+  PowerSpectrum(&ooura_fft_, extended_frame, signal_spectrum);
+
+  // Classify the signal based on the estimate of the noise spectrum and the
+  // signal spectrum estimate.
+  const SignalType signal_type = ClassifySignal(
+      signal_spectrum, noise_spectrum_estimator_.GetNoiseSpectrum(),
+      data_dumper_);
+
+  // Update the noise spectrum based on the signal spectrum.
+  noise_spectrum_estimator_.Update(signal_spectrum,
+                                   initialization_frames_left_ > 0);
+
+  // Update the number of frames until a reliable signal spectrum is achieved.
+  initialization_frames_left_ = std::max(0, initialization_frames_left_ - 1);
+
+  if (last_signal_type_ == signal_type) {
+    consistent_classification_counter_ =
+        std::max(0, consistent_classification_counter_ - 1);
+  } else {
+    last_signal_type_ = signal_type;
+    consistent_classification_counter_ = 3;
+  }
+
+  if (consistent_classification_counter_ > 0) {
+    return SignalClassifier::SignalType::kNonStationary;
+  }
+  return signal_type;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,73 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_SIGNAL_CLASSIFIER_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_SIGNAL_CLASSIFIER_H_
+
+#include <memory>
+#include <vector>
+
+#include "api/array_view.h"
+#include "common_audio/third_party/ooura/fft_size_128/ooura_fft.h"
+#include "modules/audio_processing/agc2/down_sampler.h"
+#include "modules/audio_processing/agc2/noise_spectrum_estimator.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+class AudioBuffer;
+
+class SignalClassifier {
+ public:
+  enum class SignalType { kNonStationary, kStationary };
+
+  explicit SignalClassifier(ApmDataDumper* data_dumper);
+
+  SignalClassifier() = delete;
+  SignalClassifier(const SignalClassifier&) = delete;
+  SignalClassifier& operator=(const SignalClassifier&) = delete;
+
+  ~SignalClassifier();
+
+  void Initialize(int sample_rate_hz);
+  SignalType Analyze(rtc::ArrayView<const float> signal);
+
+ private:
+  class FrameExtender {
+   public:
+    FrameExtender(size_t frame_size, size_t extended_frame_size);
+
+    FrameExtender() = delete;
+    FrameExtender(const FrameExtender&) = delete;
+    FrameExtender& operator=(const FrameExtender&) = delete;
+
+    ~FrameExtender();
+
+    void ExtendFrame(rtc::ArrayView<const float> x,
+                     rtc::ArrayView<float> x_extended);
+
+   private:
+    std::vector<float> x_old_;
+  };
+
+  ApmDataDumper* const data_dumper_;
+  DownSampler down_sampler_;
+  std::unique_ptr<FrameExtender> frame_extender_;
+  NoiseSpectrumEstimator noise_spectrum_estimator_;
+  int sample_rate_hz_;
+  int initialization_frames_left_;
+  int consistent_classification_counter_;
+  SignalType last_signal_type_;
+  const OouraFft ooura_fft_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_SIGNAL_CLASSIFIER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/signal_classifier_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,86 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/signal_classifier.h"
+
+#include <array>
+#include <functional>
+#include <limits>
+
+#include "api/function_view.h"
+#include "modules/audio_processing/agc2/agc2_testing_common.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/random.h"
+
+namespace webrtc {
+namespace {
+constexpr int kNumIterations = 100;
+
+// Runs the signal classifier on audio generated by 'sample_generator'
+// for kNumIterations. Returns the number of frames classified as noise.
+float RunClassifier(rtc::FunctionView<float()> sample_generator,
+                    int sample_rate_hz) {
+  ApmDataDumper data_dumper(0);
+  SignalClassifier classifier(&data_dumper);
+  std::array<float, 480> signal;
+  classifier.Initialize(sample_rate_hz);
+  const size_t samples_per_channel = rtc::CheckedDivExact(sample_rate_hz, 100);
+  int number_of_noise_frames = 0;
+  for (int i = 0; i < kNumIterations; ++i) {
+    for (size_t j = 0; j < samples_per_channel; ++j) {
+      signal[j] = sample_generator();
+    }
+    number_of_noise_frames +=
+        classifier.Analyze({&signal[0], samples_per_channel}) ==
+        SignalClassifier::SignalType::kStationary;
+  }
+  return number_of_noise_frames;
+}
+
+class SignalClassifierParametrization : public ::testing::TestWithParam<int> {
+ protected:
+  int sample_rate_hz() const { return GetParam(); }
+};
+
+// White random noise is stationary, but does not trigger the detector
+// every frame due to the randomness.
+TEST_P(SignalClassifierParametrization, WhiteNoise) {
+  test::WhiteNoiseGenerator gen(/*min_amplitude=*/test::kMinS16,
+                                /*max_amplitude=*/test::kMaxS16);
+  const int number_of_noise_frames = RunClassifier(gen, sample_rate_hz());
+  EXPECT_GT(number_of_noise_frames, kNumIterations / 2);
+}
+
+// Sine curves are (very) stationary. They trigger the detector all
+// the time. Except for a few initial frames.
+TEST_P(SignalClassifierParametrization, SineTone) {
+  test::SineGenerator gen(/*amplitude=*/test::kMaxS16, /*frequency_hz=*/600.0f,
+                          sample_rate_hz());
+  const int number_of_noise_frames = RunClassifier(gen, sample_rate_hz());
+  EXPECT_GE(number_of_noise_frames, kNumIterations - 5);
+}
+
+// Pulses are transient if they are far enough apart. They shouldn't
+// trigger the noise detector.
+TEST_P(SignalClassifierParametrization, PulseTone) {
+  test::PulseGenerator gen(/*pulse_amplitude=*/test::kMaxS16,
+                           /*no_pulse_amplitude=*/10.0f, /*frequency_hz=*/20.0f,
+                           sample_rate_hz());
+  const int number_of_noise_frames = RunClassifier(gen, sample_rate_hz());
+  EXPECT_EQ(number_of_noise_frames, 0);
+}
+
+INSTANTIATE_TEST_SUITE_P(GainController2SignalClassifier,
+                         SignalClassifierParametrization,
+                         ::testing::Values(8000, 16000, 32000, 48000));
+
+}  // namespace
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,111 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/vad_with_level.h"
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+
+#include "api/array_view.h"
+#include "common_audio/include/audio_util.h"
+#include "common_audio/resampler/include/push_resampler.h"
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/agc2/rnn_vad/common.h"
+#include "modules/audio_processing/agc2/rnn_vad/features_extraction.h"
+#include "modules/audio_processing/agc2/rnn_vad/rnn.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+using VoiceActivityDetector = VadLevelAnalyzer::VoiceActivityDetector;
+
+// Default VAD that combines a resampler and the RNN VAD.
+// Computes the speech probability on the first channel.
+class Vad : public VoiceActivityDetector {
+ public:
+  explicit Vad(const AvailableCpuFeatures& cpu_features)
+      : features_extractor_(cpu_features), rnn_vad_(cpu_features) {}
+  Vad(const Vad&) = delete;
+  Vad& operator=(const Vad&) = delete;
+  ~Vad() = default;
+
+  void Reset() override { rnn_vad_.Reset(); }
+
+  float ComputeProbability(AudioFrameView<const float> frame) override {
+    // The source number of channels is 1, because we always use the 1st
+    // channel.
+    resampler_.InitializeIfNeeded(
+        /*sample_rate_hz=*/static_cast<int>(frame.samples_per_channel() * 100),
+        rnn_vad::kSampleRate24kHz,
+        /*num_channels=*/1);
+
+    std::array<float, rnn_vad::kFrameSize10ms24kHz> work_frame;
+    // Feed the 1st channel to the resampler.
+    resampler_.Resample(frame.channel(0).data(), frame.samples_per_channel(),
+                        work_frame.data(), rnn_vad::kFrameSize10ms24kHz);
+
+    std::array<float, rnn_vad::kFeatureVectorSize> feature_vector;
+    const bool is_silence = features_extractor_.CheckSilenceComputeFeatures(
+        work_frame, feature_vector);
+    return rnn_vad_.ComputeVadProbability(feature_vector, is_silence);
+  }
+
+ private:
+  PushResampler<float> resampler_;
+  rnn_vad::FeaturesExtractor features_extractor_;
+  rnn_vad::RnnVad rnn_vad_;
+};
+
+}  // namespace
+
+VadLevelAnalyzer::VadLevelAnalyzer()
+    : VadLevelAnalyzer(kDefaultVadRnnResetPeriodMs, GetAvailableCpuFeatures()) {
+}
+
+VadLevelAnalyzer::VadLevelAnalyzer(int vad_reset_period_ms,
+                                   const AvailableCpuFeatures& cpu_features)
+    : VadLevelAnalyzer(vad_reset_period_ms,
+                       std::make_unique<Vad>(cpu_features)) {}
+
+VadLevelAnalyzer::VadLevelAnalyzer(int vad_reset_period_ms,
+                                   std::unique_ptr<VoiceActivityDetector> vad)
+    : vad_(std::move(vad)),
+      vad_reset_period_frames_(
+          rtc::CheckedDivExact(vad_reset_period_ms, kFrameDurationMs)),
+      time_to_vad_reset_(vad_reset_period_frames_) {
+  RTC_DCHECK(vad_);
+  RTC_DCHECK_GT(vad_reset_period_frames_, 1);
+}
+
+VadLevelAnalyzer::~VadLevelAnalyzer() = default;
+
+VadLevelAnalyzer::Result VadLevelAnalyzer::AnalyzeFrame(
+    AudioFrameView<const float> frame) {
+  // Periodically reset the VAD.
+  time_to_vad_reset_--;
+  if (time_to_vad_reset_ <= 0) {
+    vad_->Reset();
+    time_to_vad_reset_ = vad_reset_period_frames_;
+  }
+  // Compute levels.
+  float peak = 0.0f;
+  float rms = 0.0f;
+  for (const auto& x : frame.channel(0)) {
+    peak = std::max(std::fabs(x), peak);
+    rms += x * x;
+  }
+  return {vad_->ComputeProbability(frame),
+          FloatS16ToDbfs(std::sqrt(rms / frame.samples_per_channel())),
+          FloatS16ToDbfs(peak)};
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_VAD_WITH_LEVEL_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_VAD_WITH_LEVEL_H_
+
+#include <memory>
+
+#include "modules/audio_processing/agc2/cpu_features.h"
+#include "modules/audio_processing/include/audio_frame_view.h"
+
+namespace webrtc {
+
+// Class to analyze voice activity and audio levels.
+class VadLevelAnalyzer {
+ public:
+  struct Result {
+    float speech_probability;  // Range: [0, 1].
+    float rms_dbfs;            // Root mean square power (dBFS).
+    float peak_dbfs;           // Peak power (dBFS).
+  };
+
+  // Voice Activity Detector (VAD) interface.
+  class VoiceActivityDetector {
+   public:
+    virtual ~VoiceActivityDetector() = default;
+    // Resets the internal state.
+    virtual void Reset() = 0;
+    // Analyzes an audio frame and returns the speech probability.
+    virtual float ComputeProbability(AudioFrameView<const float> frame) = 0;
+  };
+
+  // Ctor. Uses the default VAD with the default settings.
+  VadLevelAnalyzer();
+  // Ctor. `vad_reset_period_ms` indicates the period in milliseconds to call
+  // `VadLevelAnalyzer::Reset()`; it must be equal to or greater than the
+  // duration of two frames. Uses `cpu_features` to instantiate the default VAD.
+  VadLevelAnalyzer(int vad_reset_period_ms,
+                   const AvailableCpuFeatures& cpu_features);
+  // Ctor. Uses a custom `vad`.
+  VadLevelAnalyzer(int vad_reset_period_ms,
+                   std::unique_ptr<VoiceActivityDetector> vad);
+
+  VadLevelAnalyzer(const VadLevelAnalyzer&) = delete;
+  VadLevelAnalyzer& operator=(const VadLevelAnalyzer&) = delete;
+  ~VadLevelAnalyzer();
+
+  // Computes the speech probability and the level for `frame`.
+  Result AnalyzeFrame(AudioFrameView<const float> frame);
+
+ private:
+  std::unique_ptr<VoiceActivityDetector> vad_;
+  const int vad_reset_period_frames_;
+  int time_to_vad_reset_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_VAD_WITH_LEVEL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vad_with_level_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,139 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/vad_with_level.h"
+
+#include <limits>
+#include <memory>
+#include <vector>
+
+#include "modules/audio_processing/agc2/agc2_common.h"
+#include "modules/audio_processing/include/audio_frame_view.h"
+#include "rtc_base/gunit.h"
+#include "rtc_base/numerics/safe_compare.h"
+#include "test/gmock.h"
+
+namespace webrtc {
+namespace {
+
+using ::testing::AnyNumber;
+using ::testing::ReturnRoundRobin;
+
+constexpr int kNoVadPeriodicReset =
+    kFrameDurationMs * (std::numeric_limits<int>::max() / kFrameDurationMs);
+
+constexpr int kSampleRateHz = 8000;
+
+class MockVad : public VadLevelAnalyzer::VoiceActivityDetector {
+ public:
+  MOCK_METHOD(void, Reset, (), (override));
+  MOCK_METHOD(float,
+              ComputeProbability,
+              (AudioFrameView<const float> frame),
+              (override));
+};
+
+// Creates a `VadLevelAnalyzer` injecting a mock VAD which repeatedly returns
+// the next value from `speech_probabilities` until it reaches the end and will
+// restart from the beginning.
+std::unique_ptr<VadLevelAnalyzer> CreateVadLevelAnalyzerWithMockVad(
+    int vad_reset_period_ms,
+    const std::vector<float>& speech_probabilities,
+    int expected_vad_reset_calls = 0) {
+  auto vad = std::make_unique<MockVad>();
+  EXPECT_CALL(*vad, ComputeProbability)
+      .Times(AnyNumber())
+      .WillRepeatedly(ReturnRoundRobin(speech_probabilities));
+  if (expected_vad_reset_calls >= 0) {
+    EXPECT_CALL(*vad, Reset).Times(expected_vad_reset_calls);
+  }
+  return std::make_unique<VadLevelAnalyzer>(vad_reset_period_ms,
+                                            std::move(vad));
+}
+
+// 10 ms mono frame.
+struct FrameWithView {
+  // Ctor. Initializes the frame samples with `value`.
+  FrameWithView(float value = 0.0f)
+      : channel0(samples.data()),
+        view(&channel0, /*num_channels=*/1, samples.size()) {
+    samples.fill(value);
+  }
+  std::array<float, kSampleRateHz / 100> samples;
+  const float* const channel0;
+  const AudioFrameView<const float> view;
+};
+
+TEST(GainController2VadLevelAnalyzer, PeakLevelGreaterThanRmsLevel) {
+  // Handcrafted frame so that the average is lower than the peak value.
+  FrameWithView frame(1000.0f);  // Constant frame.
+  frame.samples[10] = 2000.0f;   // Except for one peak value.
+
+  // Compute audio frame levels (the VAD result is ignored).
+  VadLevelAnalyzer analyzer;
+  auto levels_and_vad_prob = analyzer.AnalyzeFrame(frame.view);
+
+  // Compare peak and RMS levels.
+  EXPECT_LT(levels_and_vad_prob.rms_dbfs, levels_and_vad_prob.peak_dbfs);
+}
+
+// Checks that the expect VAD probabilities are returned.
+TEST(GainController2VadLevelAnalyzer, NoSpeechProbabilitySmoothing) {
+  const std::vector<float> speech_probabilities{0.709f, 0.484f, 0.882f, 0.167f,
+                                                0.44f,  0.525f, 0.858f, 0.314f,
+                                                0.653f, 0.965f, 0.413f, 0.0f};
+  auto analyzer = CreateVadLevelAnalyzerWithMockVad(kNoVadPeriodicReset,
+                                                    speech_probabilities);
+  FrameWithView frame;
+  for (int i = 0; rtc::SafeLt(i, speech_probabilities.size()); ++i) {
+    SCOPED_TRACE(i);
+    EXPECT_EQ(speech_probabilities[i],
+              analyzer->AnalyzeFrame(frame.view).speech_probability);
+  }
+}
+
+// Checks that the VAD is not periodically reset.
+TEST(GainController2VadLevelAnalyzer, VadNoPeriodicReset) {
+  constexpr int kNumFrames = 19;
+  auto analyzer = CreateVadLevelAnalyzerWithMockVad(
+      kNoVadPeriodicReset, /*speech_probabilities=*/{1.0f},
+      /*expected_vad_reset_calls=*/0);
+  FrameWithView frame;
+  for (int i = 0; i < kNumFrames; ++i) {
+    analyzer->AnalyzeFrame(frame.view);
+  }
+}
+
+class VadPeriodResetParametrization
+    : public ::testing::TestWithParam<std::tuple<int, int>> {
+ protected:
+  int num_frames() const { return std::get<0>(GetParam()); }
+  int vad_reset_period_frames() const { return std::get<1>(GetParam()); }
+};
+
+// Checks that the VAD is periodically reset with the expected period.
+TEST_P(VadPeriodResetParametrization, VadPeriodicReset) {
+  auto analyzer = CreateVadLevelAnalyzerWithMockVad(
+      /*vad_reset_period_ms=*/vad_reset_period_frames() * kFrameDurationMs,
+      /*speech_probabilities=*/{1.0f},
+      /*expected_vad_reset_calls=*/num_frames() / vad_reset_period_frames());
+  FrameWithView frame;
+  for (int i = 0; i < num_frames(); ++i) {
+    analyzer->AnalyzeFrame(frame.view);
+  }
+}
+
+INSTANTIATE_TEST_SUITE_P(GainController2VadLevelAnalyzer,
+                         VadPeriodResetParametrization,
+                         ::testing::Combine(::testing::Values(1, 19, 123),
+                                            ::testing::Values(2, 5, 20, 53)));
+
+}  // namespace
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vector_float_frame.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vector_float_frame.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vector_float_frame.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vector_float_frame.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/agc2/vector_float_frame.h"
+
+namespace webrtc {
+
+namespace {
+
+std::vector<float*> ConstructChannelPointers(
+    std::vector<std::vector<float>>* x) {
+  std::vector<float*> channel_ptrs;
+  for (auto& v : *x) {
+    channel_ptrs.push_back(v.data());
+  }
+  return channel_ptrs;
+}
+}  // namespace
+
+VectorFloatFrame::VectorFloatFrame(int num_channels,
+                                   int samples_per_channel,
+                                   float start_value)
+    : channels_(num_channels,
+                std::vector<float>(samples_per_channel, start_value)),
+      channel_ptrs_(ConstructChannelPointers(&channels_)),
+      float_frame_view_(channel_ptrs_.data(),
+                        channels_.size(),
+                        samples_per_channel) {}
+
+VectorFloatFrame::~VectorFloatFrame() = default;
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vector_float_frame.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vector_float_frame.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vector_float_frame.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/agc2/vector_float_frame.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AGC2_VECTOR_FLOAT_FRAME_H_
+#define MODULES_AUDIO_PROCESSING_AGC2_VECTOR_FLOAT_FRAME_H_
+
+#include <vector>
+
+#include "modules/audio_processing/include/audio_frame_view.h"
+
+namespace webrtc {
+
+// A construct consisting of a multi-channel audio frame, and a FloatFrame view
+// of it.
+class VectorFloatFrame {
+ public:
+  VectorFloatFrame(int num_channels,
+                   int samples_per_channel,
+                   float start_value);
+  const AudioFrameView<float>& float_frame_view() { return float_frame_view_; }
+  AudioFrameView<const float> float_frame_view() const {
+    return float_frame_view_;
+  }
+
+  ~VectorFloatFrame();
+
+ private:
+  std::vector<std::vector<float>> channels_;
+  std::vector<float*> channel_ptrs_;
+  AudioFrameView<float> float_frame_view_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AGC2_VECTOR_FLOAT_FRAME_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/audio_buffer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/audio_buffer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/audio_buffer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/audio_buffer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,407 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/audio_buffer.h"
+
+#include <string.h>
+
+#include <cstdint>
+
+#include "common_audio/channel_buffer.h"
+#include "common_audio/include/audio_util.h"
+#include "common_audio/resampler/push_sinc_resampler.h"
+#include "modules/audio_processing/splitting_filter.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+constexpr size_t kSamplesPer32kHzChannel = 320;
+constexpr size_t kSamplesPer48kHzChannel = 480;
+constexpr size_t kMaxSamplesPerChannel = AudioBuffer::kMaxSampleRate / 100;
+
+size_t NumBandsFromFramesPerChannel(size_t num_frames) {
+  if (num_frames == kSamplesPer32kHzChannel) {
+    return 2;
+  }
+  if (num_frames == kSamplesPer48kHzChannel) {
+    return 3;
+  }
+  return 1;
+}
+
+}  // namespace
+
+AudioBuffer::AudioBuffer(size_t input_rate,
+                         size_t input_num_channels,
+                         size_t buffer_rate,
+                         size_t buffer_num_channels,
+                         size_t output_rate,
+                         size_t output_num_channels)
+    : AudioBuffer(static_cast<int>(input_rate) / 100,
+                  input_num_channels,
+                  static_cast<int>(buffer_rate) / 100,
+                  buffer_num_channels,
+                  static_cast<int>(output_rate) / 100) {}
+
+AudioBuffer::AudioBuffer(size_t input_num_frames,
+                         size_t input_num_channels,
+                         size_t buffer_num_frames,
+                         size_t buffer_num_channels,
+                         size_t output_num_frames)
+    : input_num_frames_(input_num_frames),
+      input_num_channels_(input_num_channels),
+      buffer_num_frames_(buffer_num_frames),
+      buffer_num_channels_(buffer_num_channels),
+      output_num_frames_(output_num_frames),
+      output_num_channels_(0),
+      num_channels_(buffer_num_channels),
+      num_bands_(NumBandsFromFramesPerChannel(buffer_num_frames_)),
+      num_split_frames_(rtc::CheckedDivExact(buffer_num_frames_, num_bands_)),
+      data_(
+          new ChannelBuffer<float>(buffer_num_frames_, buffer_num_channels_)) {
+  RTC_DCHECK_GT(input_num_frames_, 0);
+  RTC_DCHECK_GT(buffer_num_frames_, 0);
+  RTC_DCHECK_GT(output_num_frames_, 0);
+  RTC_DCHECK_GT(input_num_channels_, 0);
+  RTC_DCHECK_GT(buffer_num_channels_, 0);
+  RTC_DCHECK_LE(buffer_num_channels_, input_num_channels_);
+
+  const bool input_resampling_needed = input_num_frames_ != buffer_num_frames_;
+  const bool output_resampling_needed =
+      output_num_frames_ != buffer_num_frames_;
+  if (input_resampling_needed) {
+    for (size_t i = 0; i < buffer_num_channels_; ++i) {
+      input_resamplers_.push_back(std::unique_ptr<PushSincResampler>(
+          new PushSincResampler(input_num_frames_, buffer_num_frames_)));
+    }
+  }
+
+  if (output_resampling_needed) {
+    for (size_t i = 0; i < buffer_num_channels_; ++i) {
+      output_resamplers_.push_back(std::unique_ptr<PushSincResampler>(
+          new PushSincResampler(buffer_num_frames_, output_num_frames_)));
+    }
+  }
+
+  if (num_bands_ > 1) {
+    split_data_.reset(new ChannelBuffer<float>(
+        buffer_num_frames_, buffer_num_channels_, num_bands_));
+    splitting_filter_.reset(new SplittingFilter(
+        buffer_num_channels_, num_bands_, buffer_num_frames_));
+  }
+}
+
+AudioBuffer::~AudioBuffer() {}
+
+void AudioBuffer::set_downmixing_to_specific_channel(size_t channel) {
+  downmix_by_averaging_ = false;
+  RTC_DCHECK_GT(input_num_channels_, channel);
+  channel_for_downmixing_ = std::min(channel, input_num_channels_ - 1);
+}
+
+void AudioBuffer::set_downmixing_by_averaging() {
+  downmix_by_averaging_ = true;
+}
+
+void AudioBuffer::CopyFrom(const float* const* stacked_data,
+                           const StreamConfig& stream_config) {
+  RTC_DCHECK_EQ(stream_config.num_frames(), input_num_frames_);
+  RTC_DCHECK_EQ(stream_config.num_channels(), input_num_channels_);
+  RestoreNumChannels();
+  const bool downmix_needed = input_num_channels_ > 1 && num_channels_ == 1;
+
+  const bool resampling_needed = input_num_frames_ != buffer_num_frames_;
+
+  if (downmix_needed) {
+    RTC_DCHECK_GE(kMaxSamplesPerChannel, input_num_frames_);
+
+    std::array<float, kMaxSamplesPerChannel> downmix;
+    if (downmix_by_averaging_) {
+      const float kOneByNumChannels = 1.f / input_num_channels_;
+      for (size_t i = 0; i < input_num_frames_; ++i) {
+        float value = stacked_data[0][i];
+        for (size_t j = 1; j < input_num_channels_; ++j) {
+          value += stacked_data[j][i];
+        }
+        downmix[i] = value * kOneByNumChannels;
+      }
+    }
+    const float* downmixed_data = downmix_by_averaging_
+                                      ? downmix.data()
+                                      : stacked_data[channel_for_downmixing_];
+
+    if (resampling_needed) {
+      input_resamplers_[0]->Resample(downmixed_data, input_num_frames_,
+                                     data_->channels()[0], buffer_num_frames_);
+    }
+    const float* data_to_convert =
+        resampling_needed ? data_->channels()[0] : downmixed_data;
+    FloatToFloatS16(data_to_convert, buffer_num_frames_, data_->channels()[0]);
+  } else {
+    if (resampling_needed) {
+      for (size_t i = 0; i < num_channels_; ++i) {
+        input_resamplers_[i]->Resample(stacked_data[i], input_num_frames_,
+                                       data_->channels()[i],
+                                       buffer_num_frames_);
+        FloatToFloatS16(data_->channels()[i], buffer_num_frames_,
+                        data_->channels()[i]);
+      }
+    } else {
+      for (size_t i = 0; i < num_channels_; ++i) {
+        FloatToFloatS16(stacked_data[i], buffer_num_frames_,
+                        data_->channels()[i]);
+      }
+    }
+  }
+}
+
+void AudioBuffer::CopyTo(const StreamConfig& stream_config,
+                         float* const* stacked_data) {
+  RTC_DCHECK_EQ(stream_config.num_frames(), output_num_frames_);
+
+  const bool resampling_needed = output_num_frames_ != buffer_num_frames_;
+  if (resampling_needed) {
+    for (size_t i = 0; i < num_channels_; ++i) {
+      FloatS16ToFloat(data_->channels()[i], buffer_num_frames_,
+                      data_->channels()[i]);
+      output_resamplers_[i]->Resample(data_->channels()[i], buffer_num_frames_,
+                                      stacked_data[i], output_num_frames_);
+    }
+  } else {
+    for (size_t i = 0; i < num_channels_; ++i) {
+      FloatS16ToFloat(data_->channels()[i], buffer_num_frames_,
+                      stacked_data[i]);
+    }
+  }
+
+  for (size_t i = num_channels_; i < stream_config.num_channels(); ++i) {
+    memcpy(stacked_data[i], stacked_data[0],
+           output_num_frames_ * sizeof(**stacked_data));
+  }
+}
+
+void AudioBuffer::CopyTo(AudioBuffer* buffer) const {
+  RTC_DCHECK_EQ(buffer->num_frames(), output_num_frames_);
+
+  const bool resampling_needed = output_num_frames_ != buffer_num_frames_;
+  if (resampling_needed) {
+    for (size_t i = 0; i < num_channels_; ++i) {
+      output_resamplers_[i]->Resample(data_->channels()[i], buffer_num_frames_,
+                                      buffer->channels()[i],
+                                      buffer->num_frames());
+    }
+  } else {
+    for (size_t i = 0; i < num_channels_; ++i) {
+      memcpy(buffer->channels()[i], data_->channels()[i],
+             buffer_num_frames_ * sizeof(**buffer->channels()));
+    }
+  }
+
+  for (size_t i = num_channels_; i < buffer->num_channels(); ++i) {
+    memcpy(buffer->channels()[i], buffer->channels()[0],
+           output_num_frames_ * sizeof(**buffer->channels()));
+  }
+}
+
+void AudioBuffer::RestoreNumChannels() {
+  num_channels_ = buffer_num_channels_;
+  data_->set_num_channels(buffer_num_channels_);
+  if (split_data_.get()) {
+    split_data_->set_num_channels(buffer_num_channels_);
+  }
+}
+
+void AudioBuffer::set_num_channels(size_t num_channels) {
+  RTC_DCHECK_GE(buffer_num_channels_, num_channels);
+  num_channels_ = num_channels;
+  data_->set_num_channels(num_channels);
+  if (split_data_.get()) {
+    split_data_->set_num_channels(num_channels);
+  }
+}
+
+// The resampler is only for supporting 48kHz to 16kHz in the reverse stream.
+void AudioBuffer::CopyFrom(const int16_t* const interleaved_data,
+                           const StreamConfig& stream_config) {
+  RTC_DCHECK_EQ(stream_config.num_channels(), input_num_channels_);
+  RTC_DCHECK_EQ(stream_config.num_frames(), input_num_frames_);
+  RestoreNumChannels();
+
+  const bool resampling_required = input_num_frames_ != buffer_num_frames_;
+
+  const int16_t* interleaved = interleaved_data;
+  if (num_channels_ == 1) {
+    if (input_num_channels_ == 1) {
+      if (resampling_required) {
+        std::array<float, kMaxSamplesPerChannel> float_buffer;
+        S16ToFloatS16(interleaved, input_num_frames_, float_buffer.data());
+        input_resamplers_[0]->Resample(float_buffer.data(), input_num_frames_,
+                                       data_->channels()[0],
+                                       buffer_num_frames_);
+      } else {
+        S16ToFloatS16(interleaved, input_num_frames_, data_->channels()[0]);
+      }
+    } else {
+      std::array<float, kMaxSamplesPerChannel> float_buffer;
+      float* downmixed_data =
+          resampling_required ? float_buffer.data() : data_->channels()[0];
+      if (downmix_by_averaging_) {
+        for (size_t j = 0, k = 0; j < input_num_frames_; ++j) {
+          int32_t sum = 0;
+          for (size_t i = 0; i < input_num_channels_; ++i, ++k) {
+            sum += interleaved[k];
+          }
+          downmixed_data[j] = sum / static_cast<int16_t>(input_num_channels_);
+        }
+      } else {
+        for (size_t j = 0, k = channel_for_downmixing_; j < input_num_frames_;
+             ++j, k += input_num_channels_) {
+          downmixed_data[j] = interleaved[k];
+        }
+      }
+
+      if (resampling_required) {
+        input_resamplers_[0]->Resample(downmixed_data, input_num_frames_,
+                                       data_->channels()[0],
+                                       buffer_num_frames_);
+      }
+    }
+  } else {
+    auto deinterleave_channel = [](size_t channel, size_t num_channels,
+                                   size_t samples_per_channel, const int16_t* x,
+                                   float* y) {
+      for (size_t j = 0, k = channel; j < samples_per_channel;
+           ++j, k += num_channels) {
+        y[j] = x[k];
+      }
+    };
+
+    if (resampling_required) {
+      std::array<float, kMaxSamplesPerChannel> float_buffer;
+      for (size_t i = 0; i < num_channels_; ++i) {
+        deinterleave_channel(i, num_channels_, input_num_frames_, interleaved,
+                             float_buffer.data());
+        input_resamplers_[i]->Resample(float_buffer.data(), input_num_frames_,
+                                       data_->channels()[i],
+                                       buffer_num_frames_);
+      }
+    } else {
+      for (size_t i = 0; i < num_channels_; ++i) {
+        deinterleave_channel(i, num_channels_, input_num_frames_, interleaved,
+                             data_->channels()[i]);
+      }
+    }
+  }
+}
+
+void AudioBuffer::CopyTo(const StreamConfig& stream_config,
+                         int16_t* const interleaved_data) {
+  const size_t config_num_channels = stream_config.num_channels();
+
+  RTC_DCHECK(config_num_channels == num_channels_ || num_channels_ == 1);
+  RTC_DCHECK_EQ(stream_config.num_frames(), output_num_frames_);
+
+  const bool resampling_required = buffer_num_frames_ != output_num_frames_;
+
+  int16_t* interleaved = interleaved_data;
+  if (num_channels_ == 1) {
+    std::array<float, kMaxSamplesPerChannel> float_buffer;
+
+    if (resampling_required) {
+      output_resamplers_[0]->Resample(data_->channels()[0], buffer_num_frames_,
+                                      float_buffer.data(), output_num_frames_);
+    }
+    const float* deinterleaved =
+        resampling_required ? float_buffer.data() : data_->channels()[0];
+
+    if (config_num_channels == 1) {
+      for (size_t j = 0; j < output_num_frames_; ++j) {
+        interleaved[j] = FloatS16ToS16(deinterleaved[j]);
+      }
+    } else {
+      for (size_t i = 0, k = 0; i < output_num_frames_; ++i) {
+        float tmp = FloatS16ToS16(deinterleaved[i]);
+        for (size_t j = 0; j < config_num_channels; ++j, ++k) {
+          interleaved[k] = tmp;
+        }
+      }
+    }
+  } else {
+    auto interleave_channel = [](size_t channel, size_t num_channels,
+                                 size_t samples_per_channel, const float* x,
+                                 int16_t* y) {
+      for (size_t k = 0, j = channel; k < samples_per_channel;
+           ++k, j += num_channels) {
+        y[j] = FloatS16ToS16(x[k]);
+      }
+    };
+
+    if (resampling_required) {
+      for (size_t i = 0; i < num_channels_; ++i) {
+        std::array<float, kMaxSamplesPerChannel> float_buffer;
+        output_resamplers_[i]->Resample(data_->channels()[i],
+                                        buffer_num_frames_, float_buffer.data(),
+                                        output_num_frames_);
+        interleave_channel(i, config_num_channels, output_num_frames_,
+                           float_buffer.data(), interleaved);
+      }
+    } else {
+      for (size_t i = 0; i < num_channels_; ++i) {
+        interleave_channel(i, config_num_channels, output_num_frames_,
+                           data_->channels()[i], interleaved);
+      }
+    }
+
+    for (size_t i = num_channels_; i < config_num_channels; ++i) {
+      for (size_t j = 0, k = i, n = num_channels_; j < output_num_frames_;
+           ++j, k += config_num_channels, n += config_num_channels) {
+        interleaved[k] = interleaved[n];
+      }
+    }
+  }
+}
+
+void AudioBuffer::SplitIntoFrequencyBands() {
+  splitting_filter_->Analysis(data_.get(), split_data_.get());
+}
+
+void AudioBuffer::MergeFrequencyBands() {
+  splitting_filter_->Synthesis(split_data_.get(), data_.get());
+}
+
+void AudioBuffer::ExportSplitChannelData(
+    size_t channel,
+    int16_t* const* split_band_data) const {
+  for (size_t k = 0; k < num_bands(); ++k) {
+    const float* band_data = split_bands_const(channel)[k];
+
+    RTC_DCHECK(split_band_data[k]);
+    RTC_DCHECK(band_data);
+    for (size_t i = 0; i < num_frames_per_band(); ++i) {
+      split_band_data[k][i] = FloatS16ToS16(band_data[i]);
+    }
+  }
+}
+
+void AudioBuffer::ImportSplitChannelData(
+    size_t channel,
+    const int16_t* const* split_band_data) {
+  for (size_t k = 0; k < num_bands(); ++k) {
+    float* band_data = split_bands(channel)[k];
+    RTC_DCHECK(split_band_data[k]);
+    RTC_DCHECK(band_data);
+    for (size_t i = 0; i < num_frames_per_band(); ++i) {
+      band_data[i] = split_band_data[k][i];
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/audio_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/audio_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/audio_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/audio_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,178 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include <memory>
+#include <vector>
+
+#include "common_audio/channel_buffer.h"
+#include "modules/audio_processing/include/audio_processing.h"
+
+namespace webrtc {
+
+class PushSincResampler;
+class SplittingFilter;
+
+enum Band { kBand0To8kHz = 0, kBand8To16kHz = 1, kBand16To24kHz = 2 };
+
+// Stores any audio data in a way that allows the audio processing module to
+// operate on it in a controlled manner.
+class AudioBuffer {
+ public:
+  static const int kSplitBandSize = 160;
+  static const size_t kMaxSampleRate = 384000;
+  AudioBuffer(size_t input_rate,
+              size_t input_num_channels,
+              size_t buffer_rate,
+              size_t buffer_num_channels,
+              size_t output_rate,
+              size_t output_num_channels);
+
+  // The constructor below will be deprecated.
+  AudioBuffer(size_t input_num_frames,
+              size_t input_num_channels,
+              size_t buffer_num_frames,
+              size_t buffer_num_channels,
+              size_t output_num_frames);
+  virtual ~AudioBuffer();
+
+  AudioBuffer(const AudioBuffer&) = delete;
+  AudioBuffer& operator=(const AudioBuffer&) = delete;
+
+  // Specify that downmixing should be done by selecting a single channel.
+  void set_downmixing_to_specific_channel(size_t channel);
+
+  // Specify that downmixing should be done by averaging all channels,.
+  void set_downmixing_by_averaging();
+
+  // Set the number of channels in the buffer. The specified number of channels
+  // cannot be larger than the specified buffer_num_channels. The number is also
+  // reset at each call to CopyFrom or InterleaveFrom.
+  void set_num_channels(size_t num_channels);
+
+  size_t num_channels() const { return num_channels_; }
+  size_t num_frames() const { return buffer_num_frames_; }
+  size_t num_frames_per_band() const { return num_split_frames_; }
+  size_t num_bands() const { return num_bands_; }
+
+  // Returns pointer arrays to the full-band channels.
+  // Usage:
+  // channels()[channel][sample].
+  // Where:
+  // 0 <= channel < |buffer_num_channels_|
+  // 0 <= sample < |buffer_num_frames_|
+  float* const* channels() { return data_->channels(); }
+  const float* const* channels_const() const { return data_->channels(); }
+
+  // Returns pointer arrays to the bands for a specific channel.
+  // Usage:
+  // split_bands(channel)[band][sample].
+  // Where:
+  // 0 <= channel < |buffer_num_channels_|
+  // 0 <= band < |num_bands_|
+  // 0 <= sample < |num_split_frames_|
+  const float* const* split_bands_const(size_t channel) const {
+    return split_data_.get() ? split_data_->bands(channel)
+                             : data_->bands(channel);
+  }
+  float* const* split_bands(size_t channel) {
+    return split_data_.get() ? split_data_->bands(channel)
+                             : data_->bands(channel);
+  }
+
+  // Returns a pointer array to the channels for a specific band.
+  // Usage:
+  // split_channels(band)[channel][sample].
+  // Where:
+  // 0 <= band < |num_bands_|
+  // 0 <= channel < |buffer_num_channels_|
+  // 0 <= sample < |num_split_frames_|
+  const float* const* split_channels_const(Band band) const {
+    if (split_data_.get()) {
+      return split_data_->channels(band);
+    } else {
+      return band == kBand0To8kHz ? data_->channels() : nullptr;
+    }
+  }
+
+  // Copies data into the buffer.
+  void CopyFrom(const int16_t* const interleaved_data,
+                const StreamConfig& stream_config);
+  void CopyFrom(const float* const* stacked_data,
+                const StreamConfig& stream_config);
+
+  // Copies data from the buffer.
+  void CopyTo(const StreamConfig& stream_config,
+              int16_t* const interleaved_data);
+  void CopyTo(const StreamConfig& stream_config, float* const* stacked_data);
+  void CopyTo(AudioBuffer* buffer) const;
+
+  // Splits the buffer data into frequency bands.
+  void SplitIntoFrequencyBands();
+
+  // Recombines the frequency bands into a full-band signal.
+  void MergeFrequencyBands();
+
+  // Copies the split bands data into the integer two-dimensional array.
+  void ExportSplitChannelData(size_t channel,
+                              int16_t* const* split_band_data) const;
+
+  // Copies the data in the integer two-dimensional array into the split_bands
+  // data.
+  void ImportSplitChannelData(size_t channel,
+                              const int16_t* const* split_band_data);
+
+  static const size_t kMaxSplitFrameLength = 160;
+  static const size_t kMaxNumBands = 3;
+
+  // Deprecated methods, will be removed soon.
+  float* const* channels_f() { return channels(); }
+  const float* const* channels_const_f() const { return channels_const(); }
+  const float* const* split_bands_const_f(size_t channel) const {
+    return split_bands_const(channel);
+  }
+  float* const* split_bands_f(size_t channel) { return split_bands(channel); }
+  const float* const* split_channels_const_f(Band band) const {
+    return split_channels_const(band);
+  }
+
+ private:
+  FRIEND_TEST_ALL_PREFIXES(AudioBufferTest,
+                           SetNumChannelsSetsChannelBuffersNumChannels);
+  void RestoreNumChannels();
+
+  const size_t input_num_frames_;
+  const size_t input_num_channels_;
+  const size_t buffer_num_frames_;
+  const size_t buffer_num_channels_;
+  const size_t output_num_frames_;
+  const size_t output_num_channels_;
+
+  size_t num_channels_;
+  size_t num_bands_;
+  size_t num_split_frames_;
+
+  std::unique_ptr<ChannelBuffer<float>> data_;
+  std::unique_ptr<ChannelBuffer<float>> split_data_;
+  std::unique_ptr<SplittingFilter> splitting_filter_;
+  std::vector<std::unique_ptr<PushSincResampler>> input_resamplers_;
+  std::vector<std::unique_ptr<PushSincResampler>> output_resamplers_;
+  bool downmix_by_averaging_ = true;
+  size_t channel_for_downmixing_ = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/echo_detector/circular_buffer.h"
+
+#include <algorithm>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+CircularBuffer::CircularBuffer(size_t size) : buffer_(size) {}
+CircularBuffer::~CircularBuffer() = default;
+
+void CircularBuffer::Push(float value) {
+  buffer_[next_insertion_index_] = value;
+  ++next_insertion_index_;
+  next_insertion_index_ %= buffer_.size();
+  RTC_DCHECK_LT(next_insertion_index_, buffer_.size());
+  nr_elements_in_buffer_ = std::min(nr_elements_in_buffer_ + 1, buffer_.size());
+  RTC_DCHECK_LE(nr_elements_in_buffer_, buffer_.size());
+}
+
+absl::optional<float> CircularBuffer::Pop() {
+  if (nr_elements_in_buffer_ == 0) {
+    return absl::nullopt;
+  }
+  const size_t index =
+      (buffer_.size() + next_insertion_index_ - nr_elements_in_buffer_) %
+      buffer_.size();
+  RTC_DCHECK_LT(index, buffer_.size());
+  --nr_elements_in_buffer_;
+  return buffer_[index];
+}
+
+void CircularBuffer::Clear() {
+  std::fill(buffer_.begin(), buffer_.end(), 0.f);
+  next_insertion_index_ = 0;
+  nr_elements_in_buffer_ = 0;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_
+#define MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_
+
+#include <stddef.h>
+
+#include <vector>
+
+#include "absl/types/optional.h"
+
+namespace webrtc {
+
+// Ring buffer containing floating point values.
+struct CircularBuffer {
+ public:
+  explicit CircularBuffer(size_t size);
+  ~CircularBuffer();
+
+  void Push(float value);
+  absl::optional<float> Pop();
+  size_t Size() const { return nr_elements_in_buffer_; }
+  // This function fills the buffer with zeros, but does not change its size.
+  void Clear();
+
+ private:
+  std::vector<float> buffer_;
+  size_t next_insertion_index_ = 0;
+  // This is the number of elements that have been pushed into the circular
+  // buffer, not the allocated buffer size.
+  size_t nr_elements_in_buffer_ = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_CIRCULAR_BUFFER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/circular_buffer_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,53 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/echo_detector/circular_buffer.h"
+
+#include "test/gtest.h"
+
+namespace webrtc {
+
+TEST(CircularBufferTests, LessThanMaxTest) {
+  CircularBuffer test_buffer(3);
+  test_buffer.Push(1.f);
+  test_buffer.Push(2.f);
+  EXPECT_EQ(1.f, test_buffer.Pop());
+  EXPECT_EQ(2.f, test_buffer.Pop());
+}
+
+TEST(CircularBufferTests, FillTest) {
+  CircularBuffer test_buffer(3);
+  test_buffer.Push(1.f);
+  test_buffer.Push(2.f);
+  test_buffer.Push(3.f);
+  EXPECT_EQ(1.f, test_buffer.Pop());
+  EXPECT_EQ(2.f, test_buffer.Pop());
+  EXPECT_EQ(3.f, test_buffer.Pop());
+}
+
+TEST(CircularBufferTests, OverflowTest) {
+  CircularBuffer test_buffer(3);
+  test_buffer.Push(1.f);
+  test_buffer.Push(2.f);
+  test_buffer.Push(3.f);
+  test_buffer.Push(4.f);
+  // Because the circular buffer has a size of 3, the first insert should have
+  // been forgotten.
+  EXPECT_EQ(2.f, test_buffer.Pop());
+  EXPECT_EQ(3.f, test_buffer.Pop());
+  EXPECT_EQ(4.f, test_buffer.Pop());
+}
+
+TEST(CircularBufferTests, ReadFromEmpty) {
+  CircularBuffer test_buffer(3);
+  EXPECT_EQ(absl::nullopt, test_buffer.Pop());
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/echo_detector/mean_variance_estimator.h"
+
+#include <math.h>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+// Parameter controlling the adaptation speed.
+constexpr float kAlpha = 0.001f;
+
+}  // namespace
+
+void MeanVarianceEstimator::Update(float value) {
+  mean_ = (1.f - kAlpha) * mean_ + kAlpha * value;
+  variance_ =
+      (1.f - kAlpha) * variance_ + kAlpha * (value - mean_) * (value - mean_);
+  RTC_DCHECK(isfinite(mean_));
+  RTC_DCHECK(isfinite(variance_));
+}
+
+float MeanVarianceEstimator::std_deviation() const {
+  RTC_DCHECK_GE(variance_, 0.f);
+  return sqrtf(variance_);
+}
+
+float MeanVarianceEstimator::mean() const {
+  return mean_;
+}
+
+void MeanVarianceEstimator::Clear() {
+  mean_ = 0.f;
+  variance_ = 0.f;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MEAN_VARIANCE_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MEAN_VARIANCE_ESTIMATOR_H_
+
+namespace webrtc {
+
+// This class iteratively estimates the mean and variance of a signal.
+class MeanVarianceEstimator {
+ public:
+  void Update(float value);
+  float std_deviation() const;
+  float mean() const;
+  void Clear();
+
+ private:
+  // Estimate of the expected value of the input values.
+  float mean_ = 0.f;
+  // Estimate of the variance of the input values.
+  float variance_ = 0.f;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MEAN_VARIANCE_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/mean_variance_estimator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,65 @@
+
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/echo_detector/mean_variance_estimator.h"
+
+#include "test/gtest.h"
+
+namespace webrtc {
+
+TEST(MeanVarianceEstimatorTests, InsertTwoValues) {
+  MeanVarianceEstimator test_estimator;
+  // Insert two values.
+  test_estimator.Update(3.f);
+  test_estimator.Update(5.f);
+
+  EXPECT_GT(test_estimator.mean(), 0.f);
+  EXPECT_GT(test_estimator.std_deviation(), 0.f);
+  // Test Clear method
+  test_estimator.Clear();
+  EXPECT_EQ(test_estimator.mean(), 0.f);
+  EXPECT_EQ(test_estimator.std_deviation(), 0.f);
+}
+
+TEST(MeanVarianceEstimatorTests, InsertZeroes) {
+  MeanVarianceEstimator test_estimator;
+  // Insert the same value many times.
+  for (size_t i = 0; i < 20000; i++) {
+    test_estimator.Update(0.f);
+  }
+  EXPECT_EQ(test_estimator.mean(), 0.f);
+  EXPECT_EQ(test_estimator.std_deviation(), 0.f);
+}
+
+TEST(MeanVarianceEstimatorTests, ConstantValueTest) {
+  MeanVarianceEstimator test_estimator;
+  for (size_t i = 0; i < 20000; i++) {
+    test_estimator.Update(3.f);
+  }
+  // The mean should be close to three, and the standard deviation should be
+  // close to zero.
+  EXPECT_NEAR(3.0f, test_estimator.mean(), 0.01f);
+  EXPECT_NEAR(0.0f, test_estimator.std_deviation(), 0.01f);
+}
+
+TEST(MeanVarianceEstimatorTests, AlternatingValueTest) {
+  MeanVarianceEstimator test_estimator;
+  for (size_t i = 0; i < 20000; i++) {
+    test_estimator.Update(1.f);
+    test_estimator.Update(-1.f);
+  }
+  // The mean should be close to zero, and the standard deviation should be
+  // close to one.
+  EXPECT_NEAR(0.0f, test_estimator.mean(), 0.01f);
+  EXPECT_NEAR(1.0f, test_estimator.std_deviation(), 0.01f);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/echo_detector/moving_max.h"
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+// Parameter for controlling how fast the estimated maximum decays after the
+// previous maximum is no longer valid. With a value of 0.99, the maximum will
+// decay to 1% of its former value after 460 updates.
+constexpr float kDecayFactor = 0.99f;
+
+}  // namespace
+
+MovingMax::MovingMax(size_t window_size) : window_size_(window_size) {
+  RTC_DCHECK_GT(window_size, 0);
+}
+
+MovingMax::~MovingMax() {}
+
+void MovingMax::Update(float value) {
+  if (counter_ >= window_size_ - 1) {
+    max_value_ *= kDecayFactor;
+  } else {
+    ++counter_;
+  }
+  if (value > max_value_) {
+    max_value_ = value;
+    counter_ = 0;
+  }
+}
+
+float MovingMax::max() const {
+  return max_value_;
+}
+
+void MovingMax::Clear() {
+  max_value_ = 0.f;
+  counter_ = 0;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MOVING_MAX_H_
+#define MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MOVING_MAX_H_
+
+#include <stddef.h>
+
+namespace webrtc {
+
+class MovingMax {
+ public:
+  explicit MovingMax(size_t window_size);
+  ~MovingMax();
+
+  void Update(float value);
+  float max() const;
+  // Reset all of the state in this class.
+  void Clear();
+
+ private:
+  float max_value_ = 0.f;
+  size_t counter_ = 0;
+  size_t window_size_ = 1;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_MOVING_MAX_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/moving_max_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/echo_detector/moving_max.h"
+
+#include "test/gtest.h"
+
+namespace webrtc {
+
+// Test if the maximum is correctly found.
+TEST(MovingMaxTests, SimpleTest) {
+  MovingMax test_moving_max(5);
+  test_moving_max.Update(1.0f);
+  test_moving_max.Update(1.1f);
+  test_moving_max.Update(1.9f);
+  test_moving_max.Update(1.87f);
+  test_moving_max.Update(1.89f);
+  EXPECT_EQ(1.9f, test_moving_max.max());
+}
+
+// Test if values fall out of the window when expected.
+TEST(MovingMaxTests, SlidingWindowTest) {
+  MovingMax test_moving_max(5);
+  test_moving_max.Update(1.0f);
+  test_moving_max.Update(1.9f);
+  test_moving_max.Update(1.7f);
+  test_moving_max.Update(1.87f);
+  test_moving_max.Update(1.89f);
+  test_moving_max.Update(1.3f);
+  test_moving_max.Update(1.2f);
+  EXPECT_LT(test_moving_max.max(), 1.9f);
+}
+
+// Test if Clear() works as expected.
+TEST(MovingMaxTests, ClearTest) {
+  MovingMax test_moving_max(5);
+  test_moving_max.Update(1.0f);
+  test_moving_max.Update(1.1f);
+  test_moving_max.Update(1.9f);
+  test_moving_max.Update(1.87f);
+  test_moving_max.Update(1.89f);
+  EXPECT_EQ(1.9f, test_moving_max.max());
+  test_moving_max.Clear();
+  EXPECT_EQ(0.f, test_moving_max.max());
+}
+
+// Test the decay of the estimated maximum.
+TEST(MovingMaxTests, DecayTest) {
+  MovingMax test_moving_max(1);
+  test_moving_max.Update(1.0f);
+  float previous_value = 1.0f;
+  for (int i = 0; i < 500; i++) {
+    test_moving_max.Update(0.0f);
+    EXPECT_LT(test_moving_max.max(), previous_value);
+    EXPECT_GT(test_moving_max.max(), 0.0f);
+    previous_value = test_moving_max.max();
+  }
+  EXPECT_LT(test_moving_max.max(), 0.01f);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/echo_detector/normalized_covariance_estimator.h"
+
+#include <math.h>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+// Parameter controlling the adaptation speed.
+constexpr float kAlpha = 0.001f;
+
+}  // namespace
+
+void NormalizedCovarianceEstimator::Update(float x,
+                                           float x_mean,
+                                           float x_sigma,
+                                           float y,
+                                           float y_mean,
+                                           float y_sigma) {
+  covariance_ =
+      (1.f - kAlpha) * covariance_ + kAlpha * (x - x_mean) * (y - y_mean);
+  normalized_cross_correlation_ = covariance_ / (x_sigma * y_sigma + .0001f);
+  RTC_DCHECK(isfinite(covariance_));
+  RTC_DCHECK(isfinite(normalized_cross_correlation_));
+}
+
+void NormalizedCovarianceEstimator::Clear() {
+  covariance_ = 0.f;
+  normalized_cross_correlation_ = 0.f;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_NORMALIZED_COVARIANCE_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_NORMALIZED_COVARIANCE_ESTIMATOR_H_
+
+namespace webrtc {
+
+// This class iteratively estimates the normalized covariance between two
+// signals.
+class NormalizedCovarianceEstimator {
+ public:
+  void Update(float x,
+              float x_mean,
+              float x_var,
+              float y,
+              float y_mean,
+              float y_var);
+  // This function returns an estimate of the Pearson product-moment correlation
+  // coefficient of the two signals.
+  float normalized_cross_correlation() const {
+    return normalized_cross_correlation_;
+  }
+  float covariance() const { return covariance_; }
+  // This function resets the estimated values to zero.
+  void Clear();
+
+ private:
+  float normalized_cross_correlation_ = 0.f;
+  // Estimate of the covariance value.
+  float covariance_ = 0.f;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_ECHO_DETECTOR_NORMALIZED_COVARIANCE_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/echo_detector/normalized_covariance_estimator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,41 @@
+
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/echo_detector/normalized_covariance_estimator.h"
+
+#include "test/gtest.h"
+
+namespace webrtc {
+
+TEST(NormalizedCovarianceEstimatorTests, IdenticalSignalTest) {
+  NormalizedCovarianceEstimator test_estimator;
+  for (size_t i = 0; i < 10000; i++) {
+    test_estimator.Update(1.f, 0.f, 1.f, 1.f, 0.f, 1.f);
+    test_estimator.Update(-1.f, 0.f, 1.f, -1.f, 0.f, 1.f);
+  }
+  // A normalized covariance value close to 1 is expected.
+  EXPECT_NEAR(1.f, test_estimator.normalized_cross_correlation(), 0.01f);
+  test_estimator.Clear();
+  EXPECT_EQ(0.f, test_estimator.normalized_cross_correlation());
+}
+
+TEST(NormalizedCovarianceEstimatorTests, OppositeSignalTest) {
+  NormalizedCovarianceEstimator test_estimator;
+  // Insert the same value many times.
+  for (size_t i = 0; i < 10000; i++) {
+    test_estimator.Update(1.f, 0.f, 1.f, -1.f, 0.f, 1.f);
+    test_estimator.Update(-1.f, 0.f, 1.f, 1.f, 0.f, 1.f);
+  }
+  // A normalized covariance value close to -1 is expected.
+  EXPECT_NEAR(-1.f, test_estimator.normalized_cross_correlation(), 0.01f);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/gain_controller2.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/gain_controller2.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/gain_controller2.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/gain_controller2.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,117 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/gain_controller2.h"
+
+#include "common_audio/include/audio_util.h"
+#include "modules/audio_processing/audio_buffer.h"
+#include "modules/audio_processing/include/audio_frame_view.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/strings/string_builder.h"
+
+namespace webrtc {
+
+int GainController2::instance_count_ = 0;
+
+GainController2::GainController2()
+    : data_dumper_(rtc::AtomicOps::Increment(&instance_count_)),
+      gain_applier_(/*hard_clip_samples=*/false,
+                    /*initial_gain_factor=*/0.f),
+      limiter_(static_cast<size_t>(48000), &data_dumper_, "Agc2"),
+      calls_since_last_limiter_log_(0) {
+  if (config_.adaptive_digital.enabled) {
+    adaptive_agc_ = std::make_unique<AdaptiveAgc>(&data_dumper_);
+  }
+}
+
+GainController2::~GainController2() = default;
+
+void GainController2::Initialize(int sample_rate_hz) {
+  RTC_DCHECK(sample_rate_hz == AudioProcessing::kSampleRate8kHz ||
+             sample_rate_hz == AudioProcessing::kSampleRate16kHz ||
+             sample_rate_hz == AudioProcessing::kSampleRate32kHz ||
+             sample_rate_hz == AudioProcessing::kSampleRate48kHz);
+  limiter_.SetSampleRate(sample_rate_hz);
+  data_dumper_.InitiateNewSetOfRecordings();
+  data_dumper_.DumpRaw("sample_rate_hz", sample_rate_hz);
+  calls_since_last_limiter_log_ = 0;
+}
+
+void GainController2::Process(AudioBuffer* audio) {
+  data_dumper_.DumpRaw("agc2_notified_analog_level", analog_level_);
+  AudioFrameView<float> float_frame(audio->channels(), audio->num_channels(),
+                                    audio->num_frames());
+  // Apply fixed gain first, then the adaptive one.
+  gain_applier_.ApplyGain(float_frame);
+  if (adaptive_agc_) {
+    adaptive_agc_->Process(float_frame, limiter_.LastAudioLevel());
+  }
+  limiter_.Process(float_frame);
+
+  // Log limiter stats every 30 seconds.
+  ++calls_since_last_limiter_log_;
+  if (calls_since_last_limiter_log_ == 3000) {
+    calls_since_last_limiter_log_ = 0;
+    InterpolatedGainCurve::Stats stats = limiter_.GetGainCurveStats();
+    RTC_LOG(LS_INFO) << "AGC2 limiter stats"
+                     << " | identity: " << stats.look_ups_identity_region
+                     << " | knee: " << stats.look_ups_knee_region
+                     << " | limiter: " << stats.look_ups_limiter_region
+                     << " | saturation: " << stats.look_ups_saturation_region;
+  }
+}
+
+void GainController2::NotifyAnalogLevel(int level) {
+  if (analog_level_ != level && adaptive_agc_) {
+    adaptive_agc_->HandleInputGainChange();
+  }
+  analog_level_ = level;
+}
+
+void GainController2::ApplyConfig(
+    const AudioProcessing::Config::GainController2& config) {
+  RTC_DCHECK(Validate(config));
+
+  config_ = config;
+  if (config.fixed_digital.gain_db != config_.fixed_digital.gain_db) {
+    // Reset the limiter to quickly react on abrupt level changes caused by
+    // large changes of the fixed gain.
+    limiter_.Reset();
+  }
+  gain_applier_.SetGainFactor(DbToRatio(config_.fixed_digital.gain_db));
+  if (config_.adaptive_digital.enabled) {
+    adaptive_agc_ =
+        std::make_unique<AdaptiveAgc>(&data_dumper_, config_.adaptive_digital);
+  } else {
+    adaptive_agc_.reset();
+  }
+}
+
+bool GainController2::Validate(
+    const AudioProcessing::Config::GainController2& config) {
+  const auto& fixed = config.fixed_digital;
+  const auto& adaptive = config.adaptive_digital;
+  return fixed.gain_db >= 0.f && fixed.gain_db < 50.f &&
+         adaptive.vad_probability_attack > 0.f &&
+         adaptive.vad_probability_attack <= 1.f &&
+         adaptive.level_estimator_adjacent_speech_frames_threshold >= 1 &&
+         adaptive.initial_saturation_margin_db >= 0.f &&
+         adaptive.initial_saturation_margin_db <= 100.f &&
+         adaptive.extra_saturation_margin_db >= 0.f &&
+         adaptive.extra_saturation_margin_db <= 100.f &&
+         adaptive.gain_applier_adjacent_speech_frames_threshold >= 1 &&
+         adaptive.max_gain_change_db_per_second > 0.f &&
+         adaptive.max_output_noise_level_dbfs <= 0.f;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/gain_controller2.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/gain_controller2.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/gain_controller2.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/gain_controller2.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_GAIN_CONTROLLER2_H_
+#define MODULES_AUDIO_PROCESSING_GAIN_CONTROLLER2_H_
+
+#include <memory>
+#include <string>
+
+#include "modules/audio_processing/agc2/adaptive_agc.h"
+#include "modules/audio_processing/agc2/gain_applier.h"
+#include "modules/audio_processing/agc2/limiter.h"
+#include "modules/audio_processing/include/audio_processing.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/constructor_magic.h"
+
+namespace webrtc {
+
+class AudioBuffer;
+
+// Gain Controller 2 aims to automatically adjust levels by acting on the
+// microphone gain and/or applying digital gain.
+class GainController2 {
+ public:
+  GainController2();
+  GainController2(const GainController2&) = delete;
+  GainController2& operator=(const GainController2&) = delete;
+  ~GainController2();
+
+  void Initialize(int sample_rate_hz);
+  void Process(AudioBuffer* audio);
+  void NotifyAnalogLevel(int level);
+
+  void ApplyConfig(const AudioProcessing::Config::GainController2& config);
+  static bool Validate(const AudioProcessing::Config::GainController2& config);
+
+ private:
+  static int instance_count_;
+  ApmDataDumper data_dumper_;
+  AudioProcessing::Config::GainController2 config_;
+  GainApplier gain_applier_;
+  std::unique_ptr<AdaptiveAgc> adaptive_agc_;
+  Limiter limiter_;
+  int calls_since_last_limiter_log_;
+  int analog_level_ = -1;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_GAIN_CONTROLLER2_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/high_pass_filter.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/high_pass_filter.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/high_pass_filter.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/high_pass_filter.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,115 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/high_pass_filter.h"
+
+#include "api/array_view.h"
+#include "modules/audio_processing/audio_buffer.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace {
+// [B,A] = butter(2,100/8000,'high')
+constexpr CascadedBiQuadFilter::BiQuadCoefficients
+    kHighPassFilterCoefficients16kHz = {{0.97261f, -1.94523f, 0.97261f},
+                                        {-1.94448f, 0.94598f}};
+
+// [B,A] = butter(2,100/16000,'high')
+constexpr CascadedBiQuadFilter::BiQuadCoefficients
+    kHighPassFilterCoefficients32kHz = {{0.98621f, -1.97242f, 0.98621f},
+                                        {-1.97223f, 0.97261f}};
+
+// [B,A] = butter(2,100/24000,'high')
+constexpr CascadedBiQuadFilter::BiQuadCoefficients
+    kHighPassFilterCoefficients48kHz = {{0.99079f, -1.98157f, 0.99079f},
+                                        {-1.98149f, 0.98166f}};
+
+constexpr size_t kNumberOfHighPassBiQuads = 1;
+
+const CascadedBiQuadFilter::BiQuadCoefficients& ChooseCoefficients(
+    int sample_rate_hz) {
+  switch (sample_rate_hz) {
+    case 16000:
+      return kHighPassFilterCoefficients16kHz;
+    case 32000:
+      return kHighPassFilterCoefficients32kHz;
+    case 48000:
+      return kHighPassFilterCoefficients48kHz;
+    default:
+      RTC_NOTREACHED();
+  }
+  RTC_NOTREACHED();
+  return kHighPassFilterCoefficients16kHz;
+}
+
+}  // namespace
+
+HighPassFilter::HighPassFilter(int sample_rate_hz, size_t num_channels)
+    : sample_rate_hz_(sample_rate_hz) {
+  filters_.resize(num_channels);
+  const auto& coefficients = ChooseCoefficients(sample_rate_hz_);
+  for (size_t k = 0; k < filters_.size(); ++k) {
+    filters_[k].reset(
+        new CascadedBiQuadFilter(coefficients, kNumberOfHighPassBiQuads));
+  }
+}
+
+HighPassFilter::~HighPassFilter() = default;
+
+void HighPassFilter::Process(AudioBuffer* audio, bool use_split_band_data) {
+  RTC_DCHECK(audio);
+  RTC_DCHECK_EQ(filters_.size(), audio->num_channels());
+  if (use_split_band_data) {
+    for (size_t k = 0; k < audio->num_channels(); ++k) {
+      rtc::ArrayView<float> channel_data = rtc::ArrayView<float>(
+          audio->split_bands(k)[0], audio->num_frames_per_band());
+      filters_[k]->Process(channel_data);
+    }
+  } else {
+    for (size_t k = 0; k < audio->num_channels(); ++k) {
+      rtc::ArrayView<float> channel_data =
+          rtc::ArrayView<float>(&audio->channels()[k][0], audio->num_frames());
+      filters_[k]->Process(channel_data);
+    }
+  }
+}
+
+void HighPassFilter::Process(std::vector<std::vector<float>>* audio) {
+  RTC_DCHECK_EQ(filters_.size(), audio->size());
+  for (size_t k = 0; k < audio->size(); ++k) {
+    filters_[k]->Process((*audio)[k]);
+  }
+}
+
+void HighPassFilter::Reset() {
+  for (size_t k = 0; k < filters_.size(); ++k) {
+    filters_[k]->Reset();
+  }
+}
+
+void HighPassFilter::Reset(size_t num_channels) {
+  const size_t old_num_channels = filters_.size();
+  filters_.resize(num_channels);
+  if (filters_.size() < old_num_channels) {
+    Reset();
+  } else {
+    for (size_t k = 0; k < old_num_channels; ++k) {
+      filters_[k]->Reset();
+    }
+    const auto& coefficients = ChooseCoefficients(sample_rate_hz_);
+    for (size_t k = old_num_channels; k < filters_.size(); ++k) {
+      filters_[k].reset(
+          new CascadedBiQuadFilter(coefficients, kNumberOfHighPassBiQuads));
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/high_pass_filter.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/high_pass_filter.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/high_pass_filter.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/high_pass_filter.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_HIGH_PASS_FILTER_H_
+#define MODULES_AUDIO_PROCESSING_HIGH_PASS_FILTER_H_
+
+#include <memory>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/utility/cascaded_biquad_filter.h"
+
+namespace webrtc {
+
+class AudioBuffer;
+
+class HighPassFilter {
+ public:
+  HighPassFilter(int sample_rate_hz, size_t num_channels);
+  ~HighPassFilter();
+  HighPassFilter(const HighPassFilter&) = delete;
+  HighPassFilter& operator=(const HighPassFilter&) = delete;
+
+  void Process(AudioBuffer* audio, bool use_split_band_data);
+  void Process(std::vector<std::vector<float>>* audio);
+  void Reset();
+  void Reset(size_t num_channels);
+
+  int sample_rate_hz() const { return sample_rate_hz_; }
+  size_t num_channels() const { return filters_.size(); }
+
+ private:
+  const int sample_rate_hz_;
+  std::vector<std::unique_ptr<CascadedBiQuadFilter>> filters_;
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_HIGH_PASS_FILTER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_frame_view.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_frame_view.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_frame_view.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_frame_view.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,67 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_FRAME_VIEW_H_
+#define MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_FRAME_VIEW_H_
+
+#include "api/array_view.h"
+
+namespace webrtc {
+
+// Class to pass audio data in T** format, where T is a numeric type.
+template <class T>
+class AudioFrameView {
+ public:
+  // |num_channels| and |channel_size| describe the T**
+  // |audio_samples|. |audio_samples| is assumed to point to a
+  // two-dimensional |num_channels * channel_size| array of floats.
+  AudioFrameView(T* const* audio_samples,
+                 size_t num_channels,
+                 size_t channel_size)
+      : audio_samples_(audio_samples),
+        num_channels_(num_channels),
+        channel_size_(channel_size) {}
+
+  // Implicit cast to allow converting Frame<float> to
+  // Frame<const float>.
+  template <class U>
+  AudioFrameView(AudioFrameView<U> other)
+      : audio_samples_(other.data()),
+        num_channels_(other.num_channels()),
+        channel_size_(other.samples_per_channel()) {}
+
+  AudioFrameView() = delete;
+
+  size_t num_channels() const { return num_channels_; }
+
+  size_t samples_per_channel() const { return channel_size_; }
+
+  rtc::ArrayView<T> channel(size_t idx) {
+    RTC_DCHECK_LE(0, idx);
+    RTC_DCHECK_LE(idx, num_channels_);
+    return rtc::ArrayView<T>(audio_samples_[idx], channel_size_);
+  }
+
+  rtc::ArrayView<const T> channel(size_t idx) const {
+    RTC_DCHECK_LE(0, idx);
+    RTC_DCHECK_LE(idx, num_channels_);
+    return rtc::ArrayView<const T>(audio_samples_[idx], channel_size_);
+  }
+
+  T* const* data() { return audio_samples_; }
+
+ private:
+  T* const* audio_samples_;
+  size_t num_channels_;
+  size_t channel_size_;
+};
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_FRAME_VIEW_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,184 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/include/audio_processing.h"
+
+#include "rtc_base/strings/string_builder.h"
+#include "rtc_base/system/arch.h"
+
+namespace webrtc {
+namespace {
+
+using Agc1Config = AudioProcessing::Config::GainController1;
+using Agc2Config = AudioProcessing::Config::GainController2;
+
+std::string NoiseSuppressionLevelToString(
+    const AudioProcessing::Config::NoiseSuppression::Level& level) {
+  switch (level) {
+    case AudioProcessing::Config::NoiseSuppression::Level::kLow:
+      return "Low";
+    case AudioProcessing::Config::NoiseSuppression::Level::kModerate:
+      return "Moderate";
+    case AudioProcessing::Config::NoiseSuppression::Level::kHigh:
+      return "High";
+    case AudioProcessing::Config::NoiseSuppression::Level::kVeryHigh:
+      return "VeryHigh";
+  }
+  RTC_CHECK_NOTREACHED();
+}
+
+std::string GainController1ModeToString(const Agc1Config::Mode& mode) {
+  switch (mode) {
+    case Agc1Config::Mode::kAdaptiveAnalog:
+      return "AdaptiveAnalog";
+    case Agc1Config::Mode::kAdaptiveDigital:
+      return "AdaptiveDigital";
+    case Agc1Config::Mode::kFixedDigital:
+      return "FixedDigital";
+  }
+  RTC_CHECK_NOTREACHED();
+}
+
+std::string GainController2NoiseEstimatorToString(
+    const Agc2Config::NoiseEstimator& type) {
+  switch (type) {
+    case Agc2Config::NoiseEstimator::kStationaryNoise:
+      return "StationaryNoise";
+    case Agc2Config::NoiseEstimator::kNoiseFloor:
+      return "NoiseFloor";
+  }
+  RTC_CHECK_NOTREACHED();
+}
+
+}  // namespace
+
+constexpr int AudioProcessing::kNativeSampleRatesHz[];
+
+void CustomProcessing::SetRuntimeSetting(
+    AudioProcessing::RuntimeSetting setting) {}
+
+bool Agc1Config::operator==(const Agc1Config& rhs) const {
+  const auto& analog_lhs = analog_gain_controller;
+  const auto& analog_rhs = rhs.analog_gain_controller;
+  return enabled == rhs.enabled && mode == rhs.mode &&
+         target_level_dbfs == rhs.target_level_dbfs &&
+         compression_gain_db == rhs.compression_gain_db &&
+         enable_limiter == rhs.enable_limiter &&
+         analog_level_minimum == rhs.analog_level_minimum &&
+         analog_level_maximum == rhs.analog_level_maximum &&
+         analog_lhs.enabled == analog_rhs.enabled &&
+         analog_lhs.startup_min_volume == analog_rhs.startup_min_volume &&
+         analog_lhs.clipped_level_min == analog_rhs.clipped_level_min &&
+         analog_lhs.enable_digital_adaptive ==
+             analog_rhs.enable_digital_adaptive;
+}
+
+bool Agc2Config::operator==(const Agc2Config& rhs) const {
+  const auto& adaptive_lhs = adaptive_digital;
+  const auto& adaptive_rhs = rhs.adaptive_digital;
+
+  return enabled == rhs.enabled &&
+         fixed_digital.gain_db == rhs.fixed_digital.gain_db &&
+         adaptive_lhs.enabled == adaptive_rhs.enabled &&
+         adaptive_lhs.vad_probability_attack ==
+             adaptive_rhs.vad_probability_attack &&
+         adaptive_lhs.level_estimator == adaptive_rhs.level_estimator &&
+         adaptive_lhs.level_estimator_adjacent_speech_frames_threshold ==
+             adaptive_rhs.level_estimator_adjacent_speech_frames_threshold &&
+         adaptive_lhs.use_saturation_protector ==
+             adaptive_rhs.use_saturation_protector &&
+         adaptive_lhs.initial_saturation_margin_db ==
+             adaptive_rhs.initial_saturation_margin_db &&
+         adaptive_lhs.extra_saturation_margin_db ==
+             adaptive_rhs.extra_saturation_margin_db &&
+         adaptive_lhs.gain_applier_adjacent_speech_frames_threshold ==
+             adaptive_rhs.gain_applier_adjacent_speech_frames_threshold &&
+         adaptive_lhs.max_gain_change_db_per_second ==
+             adaptive_rhs.max_gain_change_db_per_second &&
+         adaptive_lhs.max_output_noise_level_dbfs ==
+             adaptive_rhs.max_output_noise_level_dbfs;
+}
+
+bool AudioProcessing::Config::CaptureLevelAdjustment::operator==(
+    const AudioProcessing::Config::CaptureLevelAdjustment& rhs) const {
+  return enabled == rhs.enabled && pre_gain_factor == rhs.pre_gain_factor &&
+         post_gain_factor && rhs.post_gain_factor &&
+         analog_mic_gain_emulation == rhs.analog_mic_gain_emulation;
+}
+
+bool AudioProcessing::Config::CaptureLevelAdjustment::AnalogMicGainEmulation::
+operator==(const AudioProcessing::Config::CaptureLevelAdjustment::
+               AnalogMicGainEmulation& rhs) const {
+  return enabled == rhs.enabled && initial_level == rhs.initial_level;
+}
+
+std::string AudioProcessing::Config::ToString() const {
+  char buf[2048];
+  rtc::SimpleStringBuilder builder(buf);
+  builder
+      << "AudioProcessing::Config{ "
+         "pipeline: { "
+         "maximum_internal_processing_rate: "
+      << pipeline.maximum_internal_processing_rate
+      << ", multi_channel_render: " << pipeline.multi_channel_render
+      << ", multi_channel_capture: " << pipeline.multi_channel_capture
+      << " }, pre_amplifier: { enabled: " << pre_amplifier.enabled
+      << ", fixed_gain_factor: " << pre_amplifier.fixed_gain_factor
+      << " },capture_level_adjustment: { enabled: "
+      << capture_level_adjustment.enabled
+      << ", pre_gain_factor: " << capture_level_adjustment.pre_gain_factor
+      << ", post_gain_factor: " << capture_level_adjustment.post_gain_factor
+      << ", analog_mic_gain_emulation: { enabled: "
+      << capture_level_adjustment.analog_mic_gain_emulation.enabled
+      << ", initial_level: "
+      << capture_level_adjustment.analog_mic_gain_emulation.initial_level
+      << " }}, high_pass_filter: { enabled: " << high_pass_filter.enabled
+      << " }, echo_canceller: { enabled: " << echo_canceller.enabled
+      << ", mobile_mode: " << echo_canceller.mobile_mode
+      << ", enforce_high_pass_filtering: "
+      << echo_canceller.enforce_high_pass_filtering
+      << " }, noise_suppression: { enabled: " << noise_suppression.enabled
+      << ", level: " << NoiseSuppressionLevelToString(noise_suppression.level)
+      << " }, transient_suppression: { enabled: "
+      << transient_suppression.enabled
+      << " }, voice_detection: { enabled: " << voice_detection.enabled
+      << " }, gain_controller1: { enabled: " << gain_controller1.enabled
+      << ", mode: " << GainController1ModeToString(gain_controller1.mode)
+      << ", target_level_dbfs: " << gain_controller1.target_level_dbfs
+      << ", compression_gain_db: " << gain_controller1.compression_gain_db
+      << ", enable_limiter: " << gain_controller1.enable_limiter
+      << ", analog_level_minimum: " << gain_controller1.analog_level_minimum
+      << ", analog_level_maximum: " << gain_controller1.analog_level_maximum
+      << " }, gain_controller2: { enabled: " << gain_controller2.enabled
+      << ", fixed_digital: { gain_db: "
+      << gain_controller2.fixed_digital.gain_db
+      << " }, adaptive_digital: { enabled: "
+      << gain_controller2.adaptive_digital.enabled << ", noise_estimator: "
+      << GainController2NoiseEstimatorToString(
+             gain_controller2.adaptive_digital.noise_estimator)
+      << ", vad_reset_period_ms: "
+      << gain_controller2.adaptive_digital.vad_reset_period_ms
+      << ", adjacent_speech_frames_threshold: "
+      << gain_controller2.adaptive_digital.adjacent_speech_frames_threshold
+      << ", max_gain_change_db_per_second: "
+      << gain_controller2.adaptive_digital.max_gain_change_db_per_second
+      << ", max_output_noise_level_dbfs: "
+      << gain_controller2.adaptive_digital.max_output_noise_level_dbfs
+      << ", sse2_allowed: " << gain_controller2.adaptive_digital.sse2_allowed
+      << ", avx2_allowed: " << gain_controller2.adaptive_digital.avx2_allowed
+      << ", neon_allowed: " << gain_controller2.adaptive_digital.neon_allowed
+      << "}}, residual_echo_detector: { enabled: "
+      << residual_echo_detector.enabled
+      << " }, level_estimation: { enabled: " << level_estimation.enabled
+      << " }}";
+  return builder.str();
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,953 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_
+#define MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_
+
+// MSVC++ requires this to be set before any other includes to get M_PI.
+#ifndef _USE_MATH_DEFINES
+#define _USE_MATH_DEFINES
+#endif
+
+#include <math.h>
+#include <stddef.h>  // size_t
+#include <stdio.h>   // FILE
+#include <string.h>
+
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "api/audio/echo_canceller3_config.h"
+#include "api/audio/echo_control.h"
+#include "api/scoped_refptr.h"
+#include "modules/audio_processing/include/audio_processing_statistics.h"
+#include "modules/audio_processing/include/config.h"
+#include "rtc_base/arraysize.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/system/file_wrapper.h"
+#include "rtc_base/system/rtc_export.h"
+
+namespace rtc {
+class TaskQueue;
+}  // namespace rtc
+
+namespace webrtc {
+
+class AecDump;
+class AudioBuffer;
+
+class StreamConfig;
+class ProcessingConfig;
+
+class EchoDetector;
+class CustomAudioAnalyzer;
+class CustomProcessing;
+
+// Use to enable experimental gain control (AGC). At startup the experimental
+// AGC moves the microphone volume up to |startup_min_volume| if the current
+// microphone volume is set too low. The value is clamped to its operating range
+// [12, 255]. Here, 255 maps to 100%.
+//
+// Must be provided through AudioProcessingBuilder().Create(config).
+#if defined(WEBRTC_CHROMIUM_BUILD)
+static const int kAgcStartupMinVolume = 85;
+#else
+static const int kAgcStartupMinVolume = 0;
+#endif  // defined(WEBRTC_CHROMIUM_BUILD)
+static constexpr int kClippedLevelMin = 70;
+
+// To be deprecated: Please instead use the flag in the
+// AudioProcessing::Config::AnalogGainController.
+// TODO(webrtc:5298): Remove.
+struct ExperimentalAgc {
+  ExperimentalAgc() = default;
+  explicit ExperimentalAgc(bool enabled) : enabled(enabled) {}
+  ExperimentalAgc(bool enabled, int startup_min_volume)
+      : enabled(enabled), startup_min_volume(startup_min_volume) {}
+  static const ConfigOptionID identifier = ConfigOptionID::kExperimentalAgc;
+  bool enabled = true;
+  int startup_min_volume = kAgcStartupMinVolume;
+  // Lowest microphone level that will be applied in response to clipping.
+  int clipped_level_min = kClippedLevelMin;
+  bool digital_adaptive_disabled = false;
+};
+
+// To be deprecated: Please instead use the flag in the
+// AudioProcessing::Config::TransientSuppression.
+//
+// Use to enable experimental noise suppression. It can be set in the
+// constructor.
+// TODO(webrtc:5298): Remove.
+struct ExperimentalNs {
+  ExperimentalNs() : enabled(false) {}
+  explicit ExperimentalNs(bool enabled) : enabled(enabled) {}
+  static const ConfigOptionID identifier = ConfigOptionID::kExperimentalNs;
+  bool enabled;
+};
+
+// The Audio Processing Module (APM) provides a collection of voice processing
+// components designed for real-time communications software.
+//
+// APM operates on two audio streams on a frame-by-frame basis. Frames of the
+// primary stream, on which all processing is applied, are passed to
+// |ProcessStream()|. Frames of the reverse direction stream are passed to
+// |ProcessReverseStream()|. On the client-side, this will typically be the
+// near-end (capture) and far-end (render) streams, respectively. APM should be
+// placed in the signal chain as close to the audio hardware abstraction layer
+// (HAL) as possible.
+//
+// On the server-side, the reverse stream will normally not be used, with
+// processing occurring on each incoming stream.
+//
+// Component interfaces follow a similar pattern and are accessed through
+// corresponding getters in APM. All components are disabled at create-time,
+// with default settings that are recommended for most situations. New settings
+// can be applied without enabling a component. Enabling a component triggers
+// memory allocation and initialization to allow it to start processing the
+// streams.
+//
+// Thread safety is provided with the following assumptions to reduce locking
+// overhead:
+//   1. The stream getters and setters are called from the same thread as
+//      ProcessStream(). More precisely, stream functions are never called
+//      concurrently with ProcessStream().
+//   2. Parameter getters are never called concurrently with the corresponding
+//      setter.
+//
+// APM accepts only linear PCM audio data in chunks of 10 ms. The int16
+// interfaces use interleaved data, while the float interfaces use deinterleaved
+// data.
+//
+// Usage example, omitting error checking:
+// AudioProcessing* apm = AudioProcessingBuilder().Create();
+//
+// AudioProcessing::Config config;
+// config.echo_canceller.enabled = true;
+// config.echo_canceller.mobile_mode = false;
+//
+// config.gain_controller1.enabled = true;
+// config.gain_controller1.mode =
+// AudioProcessing::Config::GainController1::kAdaptiveAnalog;
+// config.gain_controller1.analog_level_minimum = 0;
+// config.gain_controller1.analog_level_maximum = 255;
+//
+// config.gain_controller2.enabled = true;
+//
+// config.high_pass_filter.enabled = true;
+//
+// config.voice_detection.enabled = true;
+//
+// apm->ApplyConfig(config)
+//
+// apm->noise_reduction()->set_level(kHighSuppression);
+// apm->noise_reduction()->Enable(true);
+//
+// // Start a voice call...
+//
+// // ... Render frame arrives bound for the audio HAL ...
+// apm->ProcessReverseStream(render_frame);
+//
+// // ... Capture frame arrives from the audio HAL ...
+// // Call required set_stream_ functions.
+// apm->set_stream_delay_ms(delay_ms);
+// apm->set_stream_analog_level(analog_level);
+//
+// apm->ProcessStream(capture_frame);
+//
+// // Call required stream_ functions.
+// analog_level = apm->recommended_stream_analog_level();
+// has_voice = apm->stream_has_voice();
+//
+// // Repeat render and capture processing for the duration of the call...
+// // Start a new call...
+// apm->Initialize();
+//
+// // Close the application...
+// delete apm;
+//
+class RTC_EXPORT AudioProcessing : public rtc::RefCountInterface {
+ public:
+  // The struct below constitutes the new parameter scheme for the audio
+  // processing. It is being introduced gradually and until it is fully
+  // introduced, it is prone to change.
+  // TODO(peah): Remove this comment once the new config scheme is fully rolled
+  // out.
+  //
+  // The parameters and behavior of the audio processing module are controlled
+  // by changing the default values in the AudioProcessing::Config struct.
+  // The config is applied by passing the struct to the ApplyConfig method.
+  //
+  // This config is intended to be used during setup, and to enable/disable
+  // top-level processing effects. Use during processing may cause undesired
+  // submodule resets, affecting the audio quality. Use the RuntimeSetting
+  // construct for runtime configuration.
+  struct RTC_EXPORT Config {
+
+    // Sets the properties of the audio processing pipeline.
+    struct RTC_EXPORT Pipeline {
+      // Maximum allowed processing rate used internally. May only be set to
+      // 32000 or 48000 and any differing values will be treated as 48000.
+      int maximum_internal_processing_rate = 48000;
+      // Allow multi-channel processing of render audio.
+      bool multi_channel_render = false;
+      // Allow multi-channel processing of capture audio when AEC3 is active
+      // or a custom AEC is injected..
+      bool multi_channel_capture = false;
+    } pipeline;
+
+    // Enabled the pre-amplifier. It amplifies the capture signal
+    // before any other processing is done.
+    // TODO(webrtc:5298): Deprecate and use the pre-gain functionality in
+    // capture_level_adjustment instead.
+    struct PreAmplifier {
+      bool enabled = false;
+      float fixed_gain_factor = 1.0f;
+    } pre_amplifier;
+
+    // Functionality for general level adjustment in the capture pipeline. This
+    // should not be used together with the legacy PreAmplifier functionality.
+    struct CaptureLevelAdjustment {
+      bool operator==(const CaptureLevelAdjustment& rhs) const;
+      bool operator!=(const CaptureLevelAdjustment& rhs) const {
+        return !(*this == rhs);
+      }
+      bool enabled = false;
+      // The `pre_gain_factor` scales the signal before any processing is done.
+      float pre_gain_factor = 1.0f;
+      // The `post_gain_factor` scales the signal after all processing is done.
+      float post_gain_factor = 1.0f;
+      struct AnalogMicGainEmulation {
+        bool operator==(const AnalogMicGainEmulation& rhs) const;
+        bool operator!=(const AnalogMicGainEmulation& rhs) const {
+          return !(*this == rhs);
+        }
+        bool enabled = false;
+        // Initial analog gain level to use for the emulated analog gain. Must
+        // be in the range [0...255].
+        int initial_level = 255;
+      } analog_mic_gain_emulation;
+    } capture_level_adjustment;
+
+    struct HighPassFilter {
+      bool enabled = false;
+      bool apply_in_full_band = true;
+    } high_pass_filter;
+
+    struct EchoCanceller {
+      bool enabled = false;
+      bool mobile_mode = false;
+      bool export_linear_aec_output = false;
+      // Enforce the highpass filter to be on (has no effect for the mobile
+      // mode).
+      bool enforce_high_pass_filtering = true;
+    } echo_canceller;
+
+    // Enables background noise suppression.
+    struct NoiseSuppression {
+      bool enabled = false;
+      enum Level { kLow, kModerate, kHigh, kVeryHigh };
+      Level level = kModerate;
+      bool analyze_linear_aec_output_when_available = false;
+    } noise_suppression;
+
+    // Enables transient suppression.
+    struct TransientSuppression {
+      bool enabled = false;
+    } transient_suppression;
+
+    // Enables reporting of |voice_detected| in webrtc::AudioProcessingStats.
+    struct VoiceDetection {
+      bool enabled = false;
+    } voice_detection;
+
+    // Enables automatic gain control (AGC) functionality.
+    // The automatic gain control (AGC) component brings the signal to an
+    // appropriate range. This is done by applying a digital gain directly and,
+    // in the analog mode, prescribing an analog gain to be applied at the audio
+    // HAL.
+    // Recommended to be enabled on the client-side.
+    struct GainController1 {
+      bool operator==(const GainController1& rhs) const;
+      bool operator!=(const GainController1& rhs) const {
+        return !(*this == rhs);
+      }
+
+      bool enabled = false;
+      enum Mode {
+        // Adaptive mode intended for use if an analog volume control is
+        // available on the capture device. It will require the user to provide
+        // coupling between the OS mixer controls and AGC through the
+        // stream_analog_level() functions.
+        // It consists of an analog gain prescription for the audio device and a
+        // digital compression stage.
+        kAdaptiveAnalog,
+        // Adaptive mode intended for situations in which an analog volume
+        // control is unavailable. It operates in a similar fashion to the
+        // adaptive analog mode, but with scaling instead applied in the digital
+        // domain. As with the analog mode, it additionally uses a digital
+        // compression stage.
+        kAdaptiveDigital,
+        // Fixed mode which enables only the digital compression stage also used
+        // by the two adaptive modes.
+        // It is distinguished from the adaptive modes by considering only a
+        // short time-window of the input signal. It applies a fixed gain
+        // through most of the input level range, and compresses (gradually
+        // reduces gain with increasing level) the input signal at higher
+        // levels. This mode is preferred on embedded devices where the capture
+        // signal level is predictable, so that a known gain can be applied.
+        kFixedDigital
+      };
+      Mode mode = kAdaptiveAnalog;
+      // Sets the target peak level (or envelope) of the AGC in dBFs (decibels
+      // from digital full-scale). The convention is to use positive values. For
+      // instance, passing in a value of 3 corresponds to -3 dBFs, or a target
+      // level 3 dB below full-scale. Limited to [0, 31].
+      int target_level_dbfs = 3;
+      // Sets the maximum gain the digital compression stage may apply, in dB. A
+      // higher number corresponds to greater compression, while a value of 0
+      // will leave the signal uncompressed. Limited to [0, 90].
+      // For updates after APM setup, use a RuntimeSetting instead.
+      int compression_gain_db = 9;
+      // When enabled, the compression stage will hard limit the signal to the
+      // target level. Otherwise, the signal will be compressed but not limited
+      // above the target level.
+      bool enable_limiter = true;
+      // Sets the minimum and maximum analog levels of the audio capture device.
+      // Must be set if an analog mode is used. Limited to [0, 65535].
+      int analog_level_minimum = 0;
+      int analog_level_maximum = 255;
+
+      // Enables the analog gain controller functionality.
+      struct AnalogGainController {
+        bool enabled = true;
+        int startup_min_volume = kAgcStartupMinVolume;
+        // Lowest analog microphone level that will be applied in response to
+        // clipping.
+        int clipped_level_min = kClippedLevelMin;
+        bool enable_digital_adaptive = true;
+      } analog_gain_controller;
+    } gain_controller1;
+
+    // Enables the next generation AGC functionality. This feature replaces the
+    // standard methods of gain control in the previous AGC. Enabling this
+    // submodule enables an adaptive digital AGC followed by a limiter. By
+    // setting |fixed_gain_db|, the limiter can be turned into a compressor that
+    // first applies a fixed gain. The adaptive digital AGC can be turned off by
+    // setting |adaptive_digital_mode=false|.
+    struct GainController2 {
+      bool operator==(const GainController2& rhs) const;
+      bool operator!=(const GainController2& rhs) const {
+        return !(*this == rhs);
+      }
+
+      // TODO(crbug.com/webrtc/7494): Remove `LevelEstimator`.
+      enum LevelEstimator { kRms, kPeak };
+      enum NoiseEstimator { kStationaryNoise, kNoiseFloor };
+      bool enabled = false;
+      struct FixedDigital {
+        float gain_db = 0.0f;
+      } fixed_digital;
+      struct AdaptiveDigital {
+        bool enabled = false;
+        NoiseEstimator noise_estimator = kNoiseFloor;
+        int vad_reset_period_ms = 1500;
+        int adjacent_speech_frames_threshold = 12;
+        float max_gain_change_db_per_second = 3.0f;
+        float max_output_noise_level_dbfs = -50.0f;
+        bool sse2_allowed = true;
+        bool avx2_allowed = true;
+        bool neon_allowed = true;
+        // TODO(crbug.com/webrtc/7494): Remove deprecated settings below.
+        float vad_probability_attack = 1.0f;
+        LevelEstimator level_estimator = kRms;
+        int level_estimator_adjacent_speech_frames_threshold = 12;
+        bool use_saturation_protector = true;
+        float initial_saturation_margin_db = 25.0f;
+        float extra_saturation_margin_db = 5.0f;
+        int gain_applier_adjacent_speech_frames_threshold = 12;
+      } adaptive_digital;
+    } gain_controller2;
+
+    struct ResidualEchoDetector {
+      bool enabled = true;
+    } residual_echo_detector;
+
+    // Enables reporting of |output_rms_dbfs| in webrtc::AudioProcessingStats.
+    struct LevelEstimation {
+      bool enabled = false;
+    } level_estimation;
+
+    std::string ToString() const;
+  };
+
+  // TODO(mgraczyk): Remove once all methods that use ChannelLayout are gone.
+  enum ChannelLayout {
+    kMono,
+    // Left, right.
+    kStereo,
+    // Mono, keyboard, and mic.
+    kMonoAndKeyboard,
+    // Left, right, keyboard, and mic.
+    kStereoAndKeyboard
+  };
+
+  // Specifies the properties of a setting to be passed to AudioProcessing at
+  // runtime.
+  class RuntimeSetting {
+   public:
+    enum class Type {
+      kNotSpecified,
+      kCapturePreGain,
+      kCaptureCompressionGain,
+      kCaptureFixedPostGain,
+      kPlayoutVolumeChange,
+      kCustomRenderProcessingRuntimeSetting,
+      kPlayoutAudioDeviceChange,
+      kCapturePostGain,
+      kCaptureOutputUsed
+    };
+
+    // Play-out audio device properties.
+    struct PlayoutAudioDeviceInfo {
+      int id;          // Identifies the audio device.
+      int max_volume;  // Maximum play-out volume.
+    };
+
+    RuntimeSetting() : type_(Type::kNotSpecified), value_(0.0f) {}
+    ~RuntimeSetting() = default;
+
+    static RuntimeSetting CreateCapturePreGain(float gain) {
+      return {Type::kCapturePreGain, gain};
+    }
+
+    static RuntimeSetting CreateCapturePostGain(float gain) {
+      return {Type::kCapturePostGain, gain};
+    }
+
+    // Corresponds to Config::GainController1::compression_gain_db, but for
+    // runtime configuration.
+    static RuntimeSetting CreateCompressionGainDb(int gain_db) {
+      RTC_DCHECK_GE(gain_db, 0);
+      RTC_DCHECK_LE(gain_db, 90);
+      return {Type::kCaptureCompressionGain, static_cast<float>(gain_db)};
+    }
+
+    // Corresponds to Config::GainController2::fixed_digital::gain_db, but for
+    // runtime configuration.
+    static RuntimeSetting CreateCaptureFixedPostGain(float gain_db) {
+      RTC_DCHECK_GE(gain_db, 0.0f);
+      RTC_DCHECK_LE(gain_db, 90.0f);
+      return {Type::kCaptureFixedPostGain, gain_db};
+    }
+
+    // Creates a runtime setting to notify play-out (aka render) audio device
+    // changes.
+    static RuntimeSetting CreatePlayoutAudioDeviceChange(
+        PlayoutAudioDeviceInfo audio_device) {
+      return {Type::kPlayoutAudioDeviceChange, audio_device};
+    }
+
+    // Creates a runtime setting to notify play-out (aka render) volume changes.
+    // |volume| is the unnormalized volume, the maximum of which
+    static RuntimeSetting CreatePlayoutVolumeChange(int volume) {
+      return {Type::kPlayoutVolumeChange, volume};
+    }
+
+    static RuntimeSetting CreateCustomRenderSetting(float payload) {
+      return {Type::kCustomRenderProcessingRuntimeSetting, payload};
+    }
+
+    static RuntimeSetting CreateCaptureOutputUsedSetting(
+        bool capture_output_used) {
+      return {Type::kCaptureOutputUsed, capture_output_used};
+    }
+
+    Type type() const { return type_; }
+    // Getters do not return a value but instead modify the argument to protect
+    // from implicit casting.
+    void GetFloat(float* value) const {
+      RTC_DCHECK(value);
+      *value = value_.float_value;
+    }
+    void GetInt(int* value) const {
+      RTC_DCHECK(value);
+      *value = value_.int_value;
+    }
+    void GetBool(bool* value) const {
+      RTC_DCHECK(value);
+      *value = value_.bool_value;
+    }
+    void GetPlayoutAudioDeviceInfo(PlayoutAudioDeviceInfo* value) const {
+      RTC_DCHECK(value);
+      *value = value_.playout_audio_device_info;
+    }
+
+   private:
+    RuntimeSetting(Type id, float value) : type_(id), value_(value) {}
+    RuntimeSetting(Type id, int value) : type_(id), value_(value) {}
+    RuntimeSetting(Type id, PlayoutAudioDeviceInfo value)
+        : type_(id), value_(value) {}
+    Type type_;
+    union U {
+      U() {}
+      U(int value) : int_value(value) {}
+      U(float value) : float_value(value) {}
+      U(PlayoutAudioDeviceInfo value) : playout_audio_device_info(value) {}
+      float float_value;
+      int int_value;
+      bool bool_value;
+      PlayoutAudioDeviceInfo playout_audio_device_info;
+    } value_;
+  };
+
+  ~AudioProcessing() override {}
+
+  // Initializes internal states, while retaining all user settings. This
+  // should be called before beginning to process a new audio stream. However,
+  // it is not necessary to call before processing the first stream after
+  // creation.
+  //
+  // It is also not necessary to call if the audio parameters (sample
+  // rate and number of channels) have changed. Passing updated parameters
+  // directly to |ProcessStream()| and |ProcessReverseStream()| is permissible.
+  // If the parameters are known at init-time though, they may be provided.
+  // TODO(webrtc:5298): Change to return void.
+  virtual int Initialize() = 0;
+
+  // The int16 interfaces require:
+  //   - only |NativeRate|s be used
+  //   - that the input, output and reverse rates must match
+  //   - that |processing_config.output_stream()| matches
+  //     |processing_config.input_stream()|.
+  //
+  // The float interfaces accept arbitrary rates and support differing input and
+  // output layouts, but the output must have either one channel or the same
+  // number of channels as the input.
+  virtual int Initialize(const ProcessingConfig& processing_config) = 0;
+
+  // Initialize with unpacked parameters. See Initialize() above for details.
+  //
+  // TODO(mgraczyk): Remove once clients are updated to use the new interface.
+  virtual int Initialize(int capture_input_sample_rate_hz,
+                         int capture_output_sample_rate_hz,
+                         int render_sample_rate_hz,
+                         ChannelLayout capture_input_layout,
+                         ChannelLayout capture_output_layout,
+                         ChannelLayout render_input_layout) = 0;
+
+  // TODO(peah): This method is a temporary solution used to take control
+  // over the parameters in the audio processing module and is likely to change.
+  virtual void ApplyConfig(const Config& config) = 0;
+
+  // TODO(ajm): Only intended for internal use. Make private and friend the
+  // necessary classes?
+  virtual int proc_sample_rate_hz() const = 0;
+  virtual int proc_split_sample_rate_hz() const = 0;
+  virtual size_t num_input_channels() const = 0;
+  virtual size_t num_proc_channels() const = 0;
+  virtual size_t num_output_channels() const = 0;
+  virtual size_t num_reverse_channels() const = 0;
+
+  // Set to true when the output of AudioProcessing will be muted or in some
+  // other way not used. Ideally, the captured audio would still be processed,
+  // but some components may change behavior based on this information.
+  // Default false. This method takes a lock. To achieve this in a lock-less
+  // manner the PostRuntimeSetting can instead be used.
+  virtual void set_output_will_be_muted(bool muted) = 0;
+
+  // Enqueues a runtime setting.
+  virtual void SetRuntimeSetting(RuntimeSetting setting) = 0;
+
+  // Enqueues a runtime setting. Returns a bool indicating whether the
+  // enqueueing was successfull.
+  virtual bool PostRuntimeSetting(RuntimeSetting setting) = 0;
+
+  // Accepts and produces a 10 ms frame interleaved 16 bit integer audio as
+  // specified in |input_config| and |output_config|. |src| and |dest| may use
+  // the same memory, if desired.
+  virtual int ProcessStream(const int16_t* const src,
+                            const StreamConfig& input_config,
+                            const StreamConfig& output_config,
+                            int16_t* const dest) = 0;
+
+  // Accepts deinterleaved float audio with the range [-1, 1]. Each element of
+  // |src| points to a channel buffer, arranged according to |input_stream|. At
+  // output, the channels will be arranged according to |output_stream| in
+  // |dest|.
+  //
+  // The output must have one channel or as many channels as the input. |src|
+  // and |dest| may use the same memory, if desired.
+  virtual int ProcessStream(const float* const* src,
+                            const StreamConfig& input_config,
+                            const StreamConfig& output_config,
+                            float* const* dest) = 0;
+
+  // Accepts and produces a 10 ms frame of interleaved 16 bit integer audio for
+  // the reverse direction audio stream as specified in |input_config| and
+  // |output_config|. |src| and |dest| may use the same memory, if desired.
+  virtual int ProcessReverseStream(const int16_t* const src,
+                                   const StreamConfig& input_config,
+                                   const StreamConfig& output_config,
+                                   int16_t* const dest) = 0;
+
+  // Accepts deinterleaved float audio with the range [-1, 1]. Each element of
+  // |data| points to a channel buffer, arranged according to |reverse_config|.
+  virtual int ProcessReverseStream(const float* const* src,
+                                   const StreamConfig& input_config,
+                                   const StreamConfig& output_config,
+                                   float* const* dest) = 0;
+
+  // Accepts deinterleaved float audio with the range [-1, 1]. Each element
+  // of |data| points to a channel buffer, arranged according to
+  // |reverse_config|.
+  virtual int AnalyzeReverseStream(const float* const* data,
+                                   const StreamConfig& reverse_config) = 0;
+
+  // Returns the most recently produced 10 ms of the linear AEC output at a rate
+  // of 16 kHz. If there is more than one capture channel, a mono representation
+  // of the input is returned. Returns true/false to indicate whether an output
+  // returned.
+  virtual bool GetLinearAecOutput(
+      rtc::ArrayView<std::array<float, 160>> linear_output) const = 0;
+
+  // This must be called prior to ProcessStream() if and only if adaptive analog
+  // gain control is enabled, to pass the current analog level from the audio
+  // HAL. Must be within the range provided in Config::GainController1.
+  virtual void set_stream_analog_level(int level) = 0;
+
+  // When an analog mode is set, this should be called after ProcessStream()
+  // to obtain the recommended new analog level for the audio HAL. It is the
+  // user's responsibility to apply this level.
+  virtual int recommended_stream_analog_level() const = 0;
+
+  // This must be called if and only if echo processing is enabled.
+  //
+  // Sets the |delay| in ms between ProcessReverseStream() receiving a far-end
+  // frame and ProcessStream() receiving a near-end frame containing the
+  // corresponding echo. On the client-side this can be expressed as
+  //   delay = (t_render - t_analyze) + (t_process - t_capture)
+  // where,
+  //   - t_analyze is the time a frame is passed to ProcessReverseStream() and
+  //     t_render is the time the first sample of the same frame is rendered by
+  //     the audio hardware.
+  //   - t_capture is the time the first sample of a frame is captured by the
+  //     audio hardware and t_process is the time the same frame is passed to
+  //     ProcessStream().
+  virtual int set_stream_delay_ms(int delay) = 0;
+  virtual int stream_delay_ms() const = 0;
+
+  // Call to signal that a key press occurred (true) or did not occur (false)
+  // with this chunk of audio.
+  virtual void set_stream_key_pressed(bool key_pressed) = 0;
+
+  // Creates and attaches an webrtc::AecDump for recording debugging
+  // information.
+  // The |worker_queue| may not be null and must outlive the created
+  // AecDump instance. |max_log_size_bytes == -1| means the log size
+  // will be unlimited. |handle| may not be null. The AecDump takes
+  // responsibility for |handle| and closes it in the destructor. A
+  // return value of true indicates that the file has been
+  // sucessfully opened, while a value of false indicates that
+  // opening the file failed.
+  virtual bool CreateAndAttachAecDump(const std::string& file_name,
+                                      int64_t max_log_size_bytes,
+                                      rtc::TaskQueue* worker_queue) = 0;
+  virtual bool CreateAndAttachAecDump(FILE* handle,
+                                      int64_t max_log_size_bytes,
+                                      rtc::TaskQueue* worker_queue) = 0;
+
+  // TODO(webrtc:5298) Deprecated variant.
+  // Attaches provided webrtc::AecDump for recording debugging
+  // information. Log file and maximum file size logic is supposed to
+  // be handled by implementing instance of AecDump. Calling this
+  // method when another AecDump is attached resets the active AecDump
+  // with a new one. This causes the d-tor of the earlier AecDump to
+  // be called. The d-tor call may block until all pending logging
+  // tasks are completed.
+  virtual void AttachAecDump(std::unique_ptr<AecDump> aec_dump) = 0;
+
+  // If no AecDump is attached, this has no effect. If an AecDump is
+  // attached, it's destructor is called. The d-tor may block until
+  // all pending logging tasks are completed.
+  virtual void DetachAecDump() = 0;
+
+  // Get audio processing statistics.
+  virtual AudioProcessingStats GetStatistics() = 0;
+  // TODO(webrtc:5298) Deprecated variant. The |has_remote_tracks| argument
+  // should be set if there are active remote tracks (this would usually be true
+  // during a call). If there are no remote tracks some of the stats will not be
+  // set by AudioProcessing, because they only make sense if there is at least
+  // one remote track.
+  virtual AudioProcessingStats GetStatistics(bool has_remote_tracks) = 0;
+
+  // Returns the last applied configuration.
+  virtual AudioProcessing::Config GetConfig() const = 0;
+
+  enum Error {
+    // Fatal errors.
+    kNoError = 0,
+    kUnspecifiedError = -1,
+    kCreationFailedError = -2,
+    kUnsupportedComponentError = -3,
+    kUnsupportedFunctionError = -4,
+    kNullPointerError = -5,
+    kBadParameterError = -6,
+    kBadSampleRateError = -7,
+    kBadDataLengthError = -8,
+    kBadNumberChannelsError = -9,
+    kFileError = -10,
+    kStreamParameterNotSetError = -11,
+    kNotEnabledError = -12,
+
+    // Warnings are non-fatal.
+    // This results when a set_stream_ parameter is out of range. Processing
+    // will continue, but the parameter may have been truncated.
+    kBadStreamParameterWarning = -13
+  };
+
+  // Native rates supported by the integer interfaces.
+  enum NativeRate {
+    kSampleRate8kHz = 8000,
+    kSampleRate16kHz = 16000,
+    kSampleRate32kHz = 32000,
+    kSampleRate48kHz = 48000
+  };
+
+  // TODO(kwiberg): We currently need to support a compiler (Visual C++) that
+  // complains if we don't explicitly state the size of the array here. Remove
+  // the size when that's no longer the case.
+  static constexpr int kNativeSampleRatesHz[4] = {
+      kSampleRate8kHz, kSampleRate16kHz, kSampleRate32kHz, kSampleRate48kHz};
+  static constexpr size_t kNumNativeSampleRates =
+      arraysize(kNativeSampleRatesHz);
+  static constexpr int kMaxNativeSampleRateHz =
+      kNativeSampleRatesHz[kNumNativeSampleRates - 1];
+
+  static constexpr int kChunkSizeMs = 10;
+};
+
+class RTC_EXPORT AudioProcessingBuilder {
+ public:
+  AudioProcessingBuilder();
+  ~AudioProcessingBuilder();
+  // The AudioProcessingBuilder takes ownership of the echo_control_factory.
+  AudioProcessingBuilder& SetEchoControlFactory(
+      std::unique_ptr<EchoControlFactory> echo_control_factory) {
+    echo_control_factory_ = std::move(echo_control_factory);
+    return *this;
+  }
+  // The AudioProcessingBuilder takes ownership of the capture_post_processing.
+  AudioProcessingBuilder& SetCapturePostProcessing(
+      std::unique_ptr<CustomProcessing> capture_post_processing) {
+    capture_post_processing_ = std::move(capture_post_processing);
+    return *this;
+  }
+  // The AudioProcessingBuilder takes ownership of the render_pre_processing.
+  AudioProcessingBuilder& SetRenderPreProcessing(
+      std::unique_ptr<CustomProcessing> render_pre_processing) {
+    render_pre_processing_ = std::move(render_pre_processing);
+    return *this;
+  }
+  // The AudioProcessingBuilder takes ownership of the echo_detector.
+  AudioProcessingBuilder& SetEchoDetector(
+      rtc::scoped_refptr<EchoDetector> echo_detector) {
+    echo_detector_ = std::move(echo_detector);
+    return *this;
+  }
+  // The AudioProcessingBuilder takes ownership of the capture_analyzer.
+  AudioProcessingBuilder& SetCaptureAnalyzer(
+      std::unique_ptr<CustomAudioAnalyzer> capture_analyzer) {
+    capture_analyzer_ = std::move(capture_analyzer);
+    return *this;
+  }
+  // This creates an APM instance using the previously set components. Calling
+  // the Create function resets the AudioProcessingBuilder to its initial state.
+  AudioProcessing* Create();
+  AudioProcessing* Create(const webrtc::Config& config);
+
+ private:
+  std::unique_ptr<EchoControlFactory> echo_control_factory_;
+  std::unique_ptr<CustomProcessing> capture_post_processing_;
+  std::unique_ptr<CustomProcessing> render_pre_processing_;
+  rtc::scoped_refptr<EchoDetector> echo_detector_;
+  std::unique_ptr<CustomAudioAnalyzer> capture_analyzer_;
+  RTC_DISALLOW_COPY_AND_ASSIGN(AudioProcessingBuilder);
+};
+
+class StreamConfig {
+ public:
+  // sample_rate_hz: The sampling rate of the stream.
+  //
+  // num_channels: The number of audio channels in the stream, excluding the
+  //               keyboard channel if it is present. When passing a
+  //               StreamConfig with an array of arrays T*[N],
+  //
+  //                N == {num_channels + 1  if  has_keyboard
+  //                     {num_channels      if  !has_keyboard
+  //
+  // has_keyboard: True if the stream has a keyboard channel. When has_keyboard
+  //               is true, the last channel in any corresponding list of
+  //               channels is the keyboard channel.
+  StreamConfig(int sample_rate_hz = 0,
+               size_t num_channels = 0,
+               bool has_keyboard = false)
+      : sample_rate_hz_(sample_rate_hz),
+        num_channels_(num_channels),
+        has_keyboard_(has_keyboard),
+        num_frames_(calculate_frames(sample_rate_hz)) {}
+
+  void set_sample_rate_hz(int value) {
+    sample_rate_hz_ = value;
+    num_frames_ = calculate_frames(value);
+  }
+  void set_num_channels(size_t value) { num_channels_ = value; }
+  void set_has_keyboard(bool value) { has_keyboard_ = value; }
+
+  int sample_rate_hz() const { return sample_rate_hz_; }
+
+  // The number of channels in the stream, not including the keyboard channel if
+  // present.
+  size_t num_channels() const { return num_channels_; }
+
+  bool has_keyboard() const { return has_keyboard_; }
+  size_t num_frames() const { return num_frames_; }
+  size_t num_samples() const { return num_channels_ * num_frames_; }
+
+  bool operator==(const StreamConfig& other) const {
+    return sample_rate_hz_ == other.sample_rate_hz_ &&
+           num_channels_ == other.num_channels_ &&
+           has_keyboard_ == other.has_keyboard_;
+  }
+
+  bool operator!=(const StreamConfig& other) const { return !(*this == other); }
+
+ private:
+  static size_t calculate_frames(int sample_rate_hz) {
+    return static_cast<size_t>(AudioProcessing::kChunkSizeMs * sample_rate_hz /
+                               1000);
+  }
+
+  int sample_rate_hz_;
+  size_t num_channels_;
+  bool has_keyboard_;
+  size_t num_frames_;
+};
+
+class ProcessingConfig {
+ public:
+  enum StreamName {
+    kInputStream,
+    kOutputStream,
+    kReverseInputStream,
+    kReverseOutputStream,
+    kNumStreamNames,
+  };
+
+  const StreamConfig& input_stream() const {
+    return streams[StreamName::kInputStream];
+  }
+  const StreamConfig& output_stream() const {
+    return streams[StreamName::kOutputStream];
+  }
+  const StreamConfig& reverse_input_stream() const {
+    return streams[StreamName::kReverseInputStream];
+  }
+  const StreamConfig& reverse_output_stream() const {
+    return streams[StreamName::kReverseOutputStream];
+  }
+
+  StreamConfig& input_stream() { return streams[StreamName::kInputStream]; }
+  StreamConfig& output_stream() { return streams[StreamName::kOutputStream]; }
+  StreamConfig& reverse_input_stream() {
+    return streams[StreamName::kReverseInputStream];
+  }
+  StreamConfig& reverse_output_stream() {
+    return streams[StreamName::kReverseOutputStream];
+  }
+
+  bool operator==(const ProcessingConfig& other) const {
+    for (int i = 0; i < StreamName::kNumStreamNames; ++i) {
+      if (this->streams[i] != other.streams[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  bool operator!=(const ProcessingConfig& other) const {
+    return !(*this == other);
+  }
+
+  StreamConfig streams[StreamName::kNumStreamNames];
+};
+
+// Experimental interface for a custom analysis submodule.
+class CustomAudioAnalyzer {
+ public:
+  // (Re-) Initializes the submodule.
+  virtual void Initialize(int sample_rate_hz, int num_channels) = 0;
+  // Analyzes the given capture or render signal.
+  virtual void Analyze(const AudioBuffer* audio) = 0;
+  // Returns a string representation of the module state.
+  virtual std::string ToString() const = 0;
+
+  virtual ~CustomAudioAnalyzer() {}
+};
+
+// Interface for a custom processing submodule.
+class CustomProcessing {
+ public:
+  // (Re-)Initializes the submodule.
+  virtual void Initialize(int sample_rate_hz, int num_channels) = 0;
+  // Processes the given capture or render signal.
+  virtual void Process(AudioBuffer* audio) = 0;
+  // Returns a string representation of the module state.
+  virtual std::string ToString() const = 0;
+  // Handles RuntimeSettings. TODO(webrtc:9262): make pure virtual
+  // after updating dependencies.
+  virtual void SetRuntimeSetting(AudioProcessing::RuntimeSetting setting);
+
+  virtual ~CustomProcessing() {}
+};
+
+// Interface for an echo detector submodule.
+class EchoDetector : public rtc::RefCountInterface {
+ public:
+  // (Re-)Initializes the submodule.
+  virtual void Initialize(int capture_sample_rate_hz,
+                          int num_capture_channels,
+                          int render_sample_rate_hz,
+                          int num_render_channels) = 0;
+
+  // Analysis (not changing) of the render signal.
+  virtual void AnalyzeRenderAudio(rtc::ArrayView<const float> render_audio) = 0;
+
+  // Analysis (not changing) of the capture signal.
+  virtual void AnalyzeCaptureAudio(
+      rtc::ArrayView<const float> capture_audio) = 0;
+
+  // Pack an AudioBuffer into a vector<float>.
+  static void PackRenderAudioBuffer(AudioBuffer* audio,
+                                    std::vector<float>* packed_buffer);
+
+  struct Metrics {
+    absl::optional<double> echo_likelihood;
+    absl::optional<double> echo_likelihood_recent_max;
+  };
+
+  // Collect current metrics from the echo detector.
+  virtual Metrics GetMetrics() const = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing_statistics.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing_statistics.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing_statistics.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing_statistics.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,22 @@
+/*
+ *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/include/audio_processing_statistics.h"
+
+namespace webrtc {
+
+AudioProcessingStats::AudioProcessingStats() = default;
+
+AudioProcessingStats::AudioProcessingStats(const AudioProcessingStats& other) =
+    default;
+
+AudioProcessingStats::~AudioProcessingStats() = default;
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing_statistics.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing_statistics.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing_statistics.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/audio_processing_statistics.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,73 @@
+/*
+ *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_STATISTICS_H_
+#define MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_STATISTICS_H_
+
+#include <stdint.h>
+
+#include "absl/types/optional.h"
+#include "rtc_base/system/rtc_export.h"
+
+namespace webrtc {
+// This version of the stats uses Optionals, it will replace the regular
+// AudioProcessingStatistics struct.
+struct RTC_EXPORT AudioProcessingStats {
+  AudioProcessingStats();
+  AudioProcessingStats(const AudioProcessingStats& other);
+  ~AudioProcessingStats();
+
+  // The root mean square (RMS) level in dBFS (decibels from digital
+  // full-scale) of the last capture frame, after processing. It is
+  // constrained to [-127, 0].
+  // The computation follows: https://tools.ietf.org/html/rfc6465
+  // with the intent that it can provide the RTP audio level indication.
+  // Only reported if level estimation is enabled in AudioProcessing::Config.
+  absl::optional<int> output_rms_dbfs;
+
+  // True if voice is detected in the last capture frame, after processing.
+  // It is conservative in flagging audio as speech, with low likelihood of
+  // incorrectly flagging a frame as voice.
+  // Only reported if voice detection is enabled in AudioProcessing::Config.
+  absl::optional<bool> voice_detected;
+
+  // AEC Statistics.
+  // ERL = 10log_10(P_far / P_echo)
+  absl::optional<double> echo_return_loss;
+  // ERLE = 10log_10(P_echo / P_out)
+  absl::optional<double> echo_return_loss_enhancement;
+  // Fraction of time that the AEC linear filter is divergent, in a 1-second
+  // non-overlapped aggregation window.
+  absl::optional<double> divergent_filter_fraction;
+
+  // The delay metrics consists of the delay median and standard deviation. It
+  // also consists of the fraction of delay estimates that can make the echo
+  // cancellation perform poorly. The values are aggregated until the first
+  // call to |GetStatistics()| and afterwards aggregated and updated every
+  // second. Note that if there are several clients pulling metrics from
+  // |GetStatistics()| during a session the first call from any of them will
+  // change to one second aggregation window for all.
+  absl::optional<int32_t> delay_median_ms;
+  absl::optional<int32_t> delay_standard_deviation_ms;
+
+  // Residual echo detector likelihood.
+  absl::optional<double> residual_echo_likelihood;
+  // Maximum residual echo likelihood from the last time period.
+  absl::optional<double> residual_echo_likelihood_recent_max;
+
+  // The instantaneous delay estimate produced in the AEC. The unit is in
+  // milliseconds and the value is the instantaneous value at the time of the
+  // call to |GetStatistics()|.
+  absl::optional<int32_t> delay_ms;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_STATISTICS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/config.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/config.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/config.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/config.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,23 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/include/config.h"
+
+namespace webrtc {
+
+Config::Config() {}
+
+Config::~Config() {
+  for (OptionMap::iterator it = options_.begin(); it != options_.end(); ++it) {
+    delete it->second;
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/config.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/config.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/config.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/include/config.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,131 @@
+/*
+ *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_INCLUDE_CONFIG_H_
+#define MODULES_AUDIO_PROCESSING_INCLUDE_CONFIG_H_
+
+#include <map>
+
+#include "rtc_base/system/rtc_export.h"
+
+namespace webrtc {
+
+// Only add new values to the end of the enumeration and never remove (only
+// deprecate) to maintain binary compatibility.
+enum class ConfigOptionID {
+  kMyExperimentForTest,
+  kAlgo1CostFunctionForTest,
+  kTemporalLayersFactory,  // Deprecated
+  kNetEqCapacityConfig,    // Deprecated
+  kNetEqFastAccelerate,    // Deprecated
+  kVoicePacing,            // Deprecated
+  kExtendedFilter,         // Deprecated
+  kDelayAgnostic,          // Deprecated
+  kExperimentalAgc,
+  kExperimentalNs,
+  kBeamforming,               // Deprecated
+  kIntelligibility,           // Deprecated
+  kEchoCanceller3,            // Deprecated
+  kAecRefinedAdaptiveFilter,  // Deprecated
+  kLevelControl               // Deprecated
+};
+
+// Class Config is designed to ease passing a set of options across webrtc code.
+// Options are identified by typename in order to avoid incorrect casts.
+//
+// Usage:
+// * declaring an option:
+//    struct Algo1_CostFunction {
+//      virtual float cost(int x) const { return x; }
+//      virtual ~Algo1_CostFunction() {}
+//    };
+//
+// * accessing an option:
+//    config.Get<Algo1_CostFunction>().cost(value);
+//
+// * setting an option:
+//    struct SqrCost : Algo1_CostFunction {
+//      virtual float cost(int x) const { return x*x; }
+//    };
+//    config.Set<Algo1_CostFunction>(new SqrCost());
+//
+// Note: This class is thread-compatible (like STL containers).
+class RTC_EXPORT Config {
+ public:
+  // Returns the option if set or a default constructed one.
+  // Callers that access options too often are encouraged to cache the result.
+  // Returned references are owned by this.
+  //
+  // Requires std::is_default_constructible<T>
+  template <typename T>
+  const T& Get() const;
+
+  // Set the option, deleting any previous instance of the same.
+  // This instance gets ownership of the newly set value.
+  template <typename T>
+  void Set(T* value);
+
+  Config();
+  ~Config();
+
+ private:
+  struct BaseOption {
+    virtual ~BaseOption() {}
+  };
+
+  template <typename T>
+  struct Option : BaseOption {
+    explicit Option(T* v) : value(v) {}
+    ~Option() { delete value; }
+    T* value;
+  };
+
+  template <typename T>
+  static ConfigOptionID identifier() {
+    return T::identifier;
+  }
+
+  // Used to instantiate a default constructed object that doesn't needs to be
+  // owned. This allows Get<T> to be implemented without requiring explicitly
+  // locks.
+  template <typename T>
+  static const T& default_value() {
+    static const T* const def = new T();
+    return *def;
+  }
+
+  typedef std::map<ConfigOptionID, BaseOption*> OptionMap;
+  OptionMap options_;
+
+  Config(const Config&);
+  void operator=(const Config&);
+};
+
+template <typename T>
+const T& Config::Get() const {
+  OptionMap::const_iterator it = options_.find(identifier<T>());
+  if (it != options_.end()) {
+    const T* t = static_cast<Option<T>*>(it->second)->value;
+    if (t) {
+      return *t;
+    }
+  }
+  return default_value<T>();
+}
+
+template <typename T>
+void Config::Set(T* value) {
+  BaseOption*& it = options_[identifier<T>()];
+  delete it;
+  it = new Option<T>(value);
+}
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_INCLUDE_CONFIG_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/logging/apm_data_dumper.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/logging/apm_data_dumper.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/logging/apm_data_dumper.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/logging/apm_data_dumper.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,93 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+
+#include "rtc_base/strings/string_builder.h"
+
+// Check to verify that the define is properly set.
+#if !defined(WEBRTC_APM_DEBUG_DUMP) || \
+    (WEBRTC_APM_DEBUG_DUMP != 0 && WEBRTC_APM_DEBUG_DUMP != 1)
+#error "Set WEBRTC_APM_DEBUG_DUMP to either 0 or 1"
+#endif
+
+namespace webrtc {
+namespace {
+
+#if WEBRTC_APM_DEBUG_DUMP == 1
+
+#if defined(WEBRTC_WIN)
+constexpr char kPathDelimiter = '\\';
+#else
+constexpr char kPathDelimiter = '/';
+#endif
+
+std::string FormFileName(const char* output_dir,
+                         const char* name,
+                         int instance_index,
+                         int reinit_index,
+                         const std::string& suffix) {
+  char buf[1024];
+  rtc::SimpleStringBuilder ss(buf);
+  const size_t output_dir_size = strlen(output_dir);
+  if (output_dir_size > 0) {
+    ss << output_dir;
+    if (output_dir[output_dir_size - 1] != kPathDelimiter) {
+      ss << kPathDelimiter;
+    }
+  }
+  ss << name << "_" << instance_index << "-" << reinit_index << suffix;
+  return ss.str();
+}
+#endif
+
+}  // namespace
+
+#if WEBRTC_APM_DEBUG_DUMP == 1
+ApmDataDumper::ApmDataDumper(int instance_index)
+    : instance_index_(instance_index) {}
+#else
+ApmDataDumper::ApmDataDumper(int instance_index) {}
+#endif
+
+ApmDataDumper::~ApmDataDumper() = default;
+
+#if WEBRTC_APM_DEBUG_DUMP == 1
+bool ApmDataDumper::recording_activated_ = false;
+absl::optional<int> ApmDataDumper::dump_set_to_use_;
+char ApmDataDumper::output_dir_[] = "";
+
+FILE* ApmDataDumper::GetRawFile(const char* name) {
+  std::string filename = FormFileName(output_dir_, name, instance_index_,
+                                      recording_set_index_, ".dat");
+  auto& f = raw_files_[filename];
+  if (!f) {
+    f.reset(fopen(filename.c_str(), "wb"));
+    RTC_CHECK(f.get()) << "Cannot write to " << filename << ".";
+  }
+  return f.get();
+}
+
+WavWriter* ApmDataDumper::GetWavFile(const char* name,
+                                     int sample_rate_hz,
+                                     int num_channels,
+                                     WavFile::SampleFormat format) {
+  std::string filename = FormFileName(output_dir_, name, instance_index_,
+                                      recording_set_index_, ".wav");
+  auto& f = wav_files_[filename];
+  if (!f) {
+    f.reset(
+        new WavWriter(filename.c_str(), sample_rate_hz, num_channels, format));
+  }
+  return f.get();
+}
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/logging/apm_data_dumper.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/logging/apm_data_dumper.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/logging/apm_data_dumper.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/logging/apm_data_dumper.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,393 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_
+#define MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <string>
+#if WEBRTC_APM_DEBUG_DUMP == 1
+#include <memory>
+#include <unordered_map>
+#endif
+
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#if WEBRTC_APM_DEBUG_DUMP == 1
+#include "common_audio/wav_file.h"
+#include "rtc_base/checks.h"
+#endif
+
+// Check to verify that the define is properly set.
+#if !defined(WEBRTC_APM_DEBUG_DUMP) || \
+    (WEBRTC_APM_DEBUG_DUMP != 0 && WEBRTC_APM_DEBUG_DUMP != 1)
+#error "Set WEBRTC_APM_DEBUG_DUMP to either 0 or 1"
+#endif
+
+namespace webrtc {
+
+#if WEBRTC_APM_DEBUG_DUMP == 1
+// Functor used to use as a custom deleter in the map of file pointers to raw
+// files.
+struct RawFileCloseFunctor {
+  void operator()(FILE* f) const { fclose(f); }
+};
+#endif
+
+// Class that handles dumping of variables into files.
+class ApmDataDumper {
+ public:
+  // Constructor that takes an instance index that may
+  // be used to distinguish data dumped from different
+  // instances of the code.
+  explicit ApmDataDumper(int instance_index);
+
+  ApmDataDumper() = delete;
+  ApmDataDumper(const ApmDataDumper&) = delete;
+  ApmDataDumper& operator=(const ApmDataDumper&) = delete;
+
+  ~ApmDataDumper();
+
+  // Activates or deactivate the dumping functionality.
+  static void SetActivated(bool activated) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    recording_activated_ = activated;
+#endif
+  }
+
+  // Default dump set.
+  static constexpr size_t kDefaultDumpSet = 0;
+
+  // Specifies what dump set to use. All dump commands with a different dump set
+  // than the one specified will be discarded. If not specificed, all dump sets
+  // will be used.
+  static void SetDumpSetToUse(int dump_set_to_use) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    dump_set_to_use_ = dump_set_to_use;
+#endif
+  }
+
+  // Set an optional output directory.
+  static void SetOutputDirectory(const std::string& output_dir) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    RTC_CHECK_LT(output_dir.size(), kOutputDirMaxLength);
+    strncpy(output_dir_, output_dir.c_str(), output_dir.size());
+#endif
+  }
+
+  // Reinitializes the data dumping such that new versions
+  // of all files being dumped to are created.
+  void InitiateNewSetOfRecordings() {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    ++recording_set_index_;
+#endif
+  }
+
+  // Methods for performing dumping of data of various types into
+  // various formats.
+  void DumpRaw(const char* name, double v, int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      FILE* file = GetRawFile(name);
+      fwrite(&v, sizeof(v), 1, file);
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name,
+               size_t v_length,
+               const double* v,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      FILE* file = GetRawFile(name);
+      fwrite(v, sizeof(v[0]), v_length, file);
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name,
+               rtc::ArrayView<const double> v,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      DumpRaw(name, v.size(), v.data());
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name, float v, int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      FILE* file = GetRawFile(name);
+      fwrite(&v, sizeof(v), 1, file);
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name,
+               size_t v_length,
+               const float* v,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      FILE* file = GetRawFile(name);
+      fwrite(v, sizeof(v[0]), v_length, file);
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name,
+               rtc::ArrayView<const float> v,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      DumpRaw(name, v.size(), v.data());
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name, bool v, int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      DumpRaw(name, static_cast<int16_t>(v));
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name,
+               size_t v_length,
+               const bool* v,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      FILE* file = GetRawFile(name);
+      for (size_t k = 0; k < v_length; ++k) {
+        int16_t value = static_cast<int16_t>(v[k]);
+        fwrite(&value, sizeof(value), 1, file);
+      }
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name,
+               rtc::ArrayView<const bool> v,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      DumpRaw(name, v.size(), v.data());
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name, int16_t v, int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      FILE* file = GetRawFile(name);
+      fwrite(&v, sizeof(v), 1, file);
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name,
+               size_t v_length,
+               const int16_t* v,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      FILE* file = GetRawFile(name);
+      fwrite(v, sizeof(v[0]), v_length, file);
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name,
+               rtc::ArrayView<const int16_t> v,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      DumpRaw(name, v.size(), v.data());
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name, int32_t v, int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      FILE* file = GetRawFile(name);
+      fwrite(&v, sizeof(v), 1, file);
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name,
+               size_t v_length,
+               const int32_t* v,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      FILE* file = GetRawFile(name);
+      fwrite(v, sizeof(v[0]), v_length, file);
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name, size_t v, int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      FILE* file = GetRawFile(name);
+      fwrite(&v, sizeof(v), 1, file);
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name,
+               size_t v_length,
+               const size_t* v,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      FILE* file = GetRawFile(name);
+      fwrite(v, sizeof(v[0]), v_length, file);
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name,
+               rtc::ArrayView<const int32_t> v,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      DumpRaw(name, v.size(), v.data());
+    }
+#endif
+  }
+
+  void DumpRaw(const char* name,
+               rtc::ArrayView<const size_t> v,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    DumpRaw(name, v.size(), v.data());
+#endif
+  }
+
+  void DumpWav(const char* name,
+               size_t v_length,
+               const float* v,
+               int sample_rate_hz,
+               int num_channels,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      WavWriter* file = GetWavFile(name, sample_rate_hz, num_channels,
+                                   WavFile::SampleFormat::kFloat);
+      file->WriteSamples(v, v_length);
+    }
+#endif
+  }
+
+  void DumpWav(const char* name,
+               rtc::ArrayView<const float> v,
+               int sample_rate_hz,
+               int num_channels,
+               int dump_set = kDefaultDumpSet) {
+#if WEBRTC_APM_DEBUG_DUMP == 1
+    if (dump_set_to_use_ && *dump_set_to_use_ != dump_set)
+      return;
+
+    if (recording_activated_) {
+      DumpWav(name, v.size(), v.data(), sample_rate_hz, num_channels);
+    }
+#endif
+  }
+
+ private:
+#if WEBRTC_APM_DEBUG_DUMP == 1
+  static bool recording_activated_;
+  static absl::optional<int> dump_set_to_use_;
+  static constexpr size_t kOutputDirMaxLength = 1024;
+  static char output_dir_[kOutputDirMaxLength];
+  const int instance_index_;
+  int recording_set_index_ = 0;
+  std::unordered_map<std::string, std::unique_ptr<FILE, RawFileCloseFunctor>>
+      raw_files_;
+  std::unordered_map<std::string, std::unique_ptr<WavWriter>> wav_files_;
+
+  FILE* GetRawFile(const char* name);
+  WavWriter* GetWavFile(const char* name,
+                        int sample_rate_hz,
+                        int num_channels,
+                        WavFile::SampleFormat format);
+#endif
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_LOGGING_APM_DATA_DUMPER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/BUILD.gn asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/BUILD.gn
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/BUILD.gn	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,105 @@
+# Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+import("../../../webrtc.gni")
+
+rtc_static_library("ns") {
+  visibility = [ "*" ]
+  configs += [ "..:apm_debug_dump" ]
+  sources = [
+    "fast_math.cc",
+    "fast_math.h",
+    "histograms.cc",
+    "histograms.h",
+    "noise_estimator.cc",
+    "noise_estimator.h",
+    "noise_suppressor.cc",
+    "noise_suppressor.h",
+    "ns_common.h",
+    "ns_config.h",
+    "ns_fft.cc",
+    "ns_fft.h",
+    "prior_signal_model.cc",
+    "prior_signal_model.h",
+    "prior_signal_model_estimator.cc",
+    "prior_signal_model_estimator.h",
+    "quantile_noise_estimator.cc",
+    "quantile_noise_estimator.h",
+    "signal_model.cc",
+    "signal_model.h",
+    "signal_model_estimator.cc",
+    "signal_model_estimator.h",
+    "speech_probability_estimator.cc",
+    "speech_probability_estimator.h",
+    "suppression_params.cc",
+    "suppression_params.h",
+    "wiener_filter.cc",
+    "wiener_filter.h",
+  ]
+
+  defines = []
+  if (rtc_build_with_neon && current_cpu != "arm64") {
+    suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+    cflags = [ "-mfpu=neon" ]
+  }
+
+  deps = [
+    "..:apm_logging",
+    "..:audio_buffer",
+    "..:high_pass_filter",
+    "../../../api:array_view",
+    "../../../common_audio:common_audio_c",
+    "../../../common_audio/third_party/ooura:fft_size_128",
+    "../../../common_audio/third_party/ooura:fft_size_256",
+    "../../../rtc_base:checks",
+    "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_minmax",
+    "../../../rtc_base/system:arch",
+    "../../../system_wrappers",
+    "../../../system_wrappers:field_trial",
+    "../../../system_wrappers:metrics",
+    "../utility:cascaded_biquad_filter",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+}
+
+if (rtc_include_tests) {
+  rtc_source_set("ns_unittests") {
+    testonly = true
+
+    configs += [ "..:apm_debug_dump" ]
+    sources = [ "noise_suppressor_unittest.cc" ]
+
+    deps = [
+      ":ns",
+      "..:apm_logging",
+      "..:audio_buffer",
+      "..:audio_processing",
+      "..:high_pass_filter",
+      "../../../api:array_view",
+      "../../../rtc_base:checks",
+      "../../../rtc_base:rtc_base_approved",
+      "../../../rtc_base:safe_minmax",
+      "../../../rtc_base/system:arch",
+      "../../../system_wrappers",
+      "../../../test:test_support",
+      "../utility:cascaded_biquad_filter",
+    ]
+    absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+
+    defines = []
+
+    if (rtc_enable_protobuf) {
+      sources += []
+    }
+
+    if (!build_with_chromium) {
+      deps += [ "..:audio_processing_unittests" ]
+    }
+  }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/fast_math.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/fast_math.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/fast_math.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/fast_math.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,84 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/fast_math.h"
+
+#include <math.h>
+#include <stdint.h>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace {
+
+float FastLog2f(float in) {
+  RTC_DCHECK_GT(in, .0f);
+  // Read and interpret float as uint32_t and then cast to float.
+  // This is done to extract the exponent (bits 30 - 23).
+  // "Right shift" of the exponent is then performed by multiplying
+  // with the constant (1/2^23). Finally, we subtract a constant to
+  // remove the bias (https://en.wikipedia.org/wiki/Exponent_bias).
+  union {
+    float dummy;
+    uint32_t a;
+  } x = {in};
+  float out = x.a;
+  out *= 1.1920929e-7f;  // 1/2^23
+  out -= 126.942695f;    // Remove bias.
+  return out;
+}
+
+}  // namespace
+
+float SqrtFastApproximation(float f) {
+  // TODO(peah): Add fast approximate implementation.
+  return sqrtf(f);
+}
+
+float Pow2Approximation(float p) {
+  // TODO(peah): Add fast approximate implementation.
+  return powf(2.f, p);
+}
+
+float PowApproximation(float x, float p) {
+  return Pow2Approximation(p * FastLog2f(x));
+}
+
+float LogApproximation(float x) {
+  constexpr float kLogOf2 = 0.69314718056f;
+  return FastLog2f(x) * kLogOf2;
+}
+
+void LogApproximation(rtc::ArrayView<const float> x, rtc::ArrayView<float> y) {
+  for (size_t k = 0; k < x.size(); ++k) {
+    y[k] = LogApproximation(x[k]);
+  }
+}
+
+float ExpApproximation(float x) {
+  constexpr float kLog10Ofe = 0.4342944819f;
+  return PowApproximation(10.f, x * kLog10Ofe);
+}
+
+void ExpApproximation(rtc::ArrayView<const float> x, rtc::ArrayView<float> y) {
+  for (size_t k = 0; k < x.size(); ++k) {
+    y[k] = ExpApproximation(x[k]);
+  }
+}
+
+void ExpApproximationSignFlip(rtc::ArrayView<const float> x,
+                              rtc::ArrayView<float> y) {
+  for (size_t k = 0; k < x.size(); ++k) {
+    y[k] = ExpApproximation(-x[k]);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/fast_math.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/fast_math.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/fast_math.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/fast_math.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_FAST_MATH_H_
+#define MODULES_AUDIO_PROCESSING_NS_FAST_MATH_H_
+
+#include "api/array_view.h"
+
+namespace webrtc {
+
+// Sqrt approximation.
+float SqrtFastApproximation(float f);
+
+// Log base conversion log(x) = log2(x)/log2(e).
+float LogApproximation(float x);
+void LogApproximation(rtc::ArrayView<const float> x, rtc::ArrayView<float> y);
+
+// 2^x approximation.
+float Pow2Approximation(float p);
+
+// x^p approximation.
+float PowApproximation(float x, float p);
+
+// e^x approximation.
+float ExpApproximation(float x);
+void ExpApproximation(rtc::ArrayView<const float> x, rtc::ArrayView<float> y);
+void ExpApproximationSignFlip(rtc::ArrayView<const float> x,
+                              rtc::ArrayView<float> y);
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_FAST_MATH_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/histograms.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/histograms.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/histograms.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/histograms.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/histograms.h"
+
+namespace webrtc {
+
+Histograms::Histograms() {
+  Clear();
+}
+
+void Histograms::Clear() {
+  lrt_.fill(0);
+  spectral_flatness_.fill(0);
+  spectral_diff_.fill(0);
+}
+
+void Histograms::Update(const SignalModel& features_) {
+  // Update the histogram for the LRT.
+  constexpr float kOneByBinSizeLrt = 1.f / kBinSizeLrt;
+  if (features_.lrt < kHistogramSize * kBinSizeLrt && features_.lrt >= 0.f) {
+    ++lrt_[kOneByBinSizeLrt * features_.lrt];
+  }
+
+  // Update histogram for the spectral flatness.
+  constexpr float kOneByBinSizeSpecFlat = 1.f / kBinSizeSpecFlat;
+  if (features_.spectral_flatness < kHistogramSize * kBinSizeSpecFlat &&
+      features_.spectral_flatness >= 0.f) {
+    ++spectral_flatness_[features_.spectral_flatness * kOneByBinSizeSpecFlat];
+  }
+
+  // Update histogram for the spectral difference.
+  constexpr float kOneByBinSizeSpecDiff = 1.f / kBinSizeSpecDiff;
+  if (features_.spectral_diff < kHistogramSize * kBinSizeSpecDiff &&
+      features_.spectral_diff >= 0.f) {
+    ++spectral_diff_[features_.spectral_diff * kOneByBinSizeSpecDiff];
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/histograms.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/histograms.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/histograms.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/histograms.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_HISTOGRAMS_H_
+#define MODULES_AUDIO_PROCESSING_NS_HISTOGRAMS_H_
+
+#include <array>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/ns/ns_common.h"
+#include "modules/audio_processing/ns/signal_model.h"
+
+namespace webrtc {
+
+constexpr int kHistogramSize = 1000;
+
+// Class for handling the updating of histograms.
+class Histograms {
+ public:
+  Histograms();
+  Histograms(const Histograms&) = delete;
+  Histograms& operator=(const Histograms&) = delete;
+
+  // Clears the histograms.
+  void Clear();
+
+  // Extracts thresholds for feature parameters and updates the corresponding
+  // histogram.
+  void Update(const SignalModel& features_);
+
+  // Methods for accessing the histograms.
+  rtc::ArrayView<const int, kHistogramSize> get_lrt() const { return lrt_; }
+  rtc::ArrayView<const int, kHistogramSize> get_spectral_flatness() const {
+    return spectral_flatness_;
+  }
+  rtc::ArrayView<const int, kHistogramSize> get_spectral_diff() const {
+    return spectral_diff_;
+  }
+
+ private:
+  std::array<int, kHistogramSize> lrt_;
+  std::array<int, kHistogramSize> spectral_flatness_;
+  std::array<int, kHistogramSize> spectral_diff_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_HISTOGRAMS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,195 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/noise_estimator.h"
+
+#include <algorithm>
+
+#include "modules/audio_processing/ns/fast_math.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace {
+
+// Log(i).
+constexpr std::array<float, 129> log_table = {
+    0.f,       0.f,       0.f,       0.f,       0.f,       1.609438f, 1.791759f,
+    1.945910f, 2.079442f, 2.197225f, 2.302585f, 2.397895f, 2.484907f, 2.564949f,
+    2.639057f, 2.708050f, 2.772589f, 2.833213f, 2.890372f, 2.944439f, 2.995732f,
+    3.044522f, 3.091043f, 3.135494f, 3.178054f, 3.218876f, 3.258097f, 3.295837f,
+    3.332205f, 3.367296f, 3.401197f, 3.433987f, 3.465736f, 3.496507f, 3.526361f,
+    3.555348f, 3.583519f, 3.610918f, 3.637586f, 3.663562f, 3.688879f, 3.713572f,
+    3.737669f, 3.761200f, 3.784190f, 3.806663f, 3.828641f, 3.850147f, 3.871201f,
+    3.891820f, 3.912023f, 3.931826f, 3.951244f, 3.970292f, 3.988984f, 4.007333f,
+    4.025352f, 4.043051f, 4.060443f, 4.077538f, 4.094345f, 4.110874f, 4.127134f,
+    4.143135f, 4.158883f, 4.174387f, 4.189655f, 4.204693f, 4.219508f, 4.234107f,
+    4.248495f, 4.262680f, 4.276666f, 4.290460f, 4.304065f, 4.317488f, 4.330733f,
+    4.343805f, 4.356709f, 4.369448f, 4.382027f, 4.394449f, 4.406719f, 4.418841f,
+    4.430817f, 4.442651f, 4.454347f, 4.465908f, 4.477337f, 4.488636f, 4.499810f,
+    4.510859f, 4.521789f, 4.532599f, 4.543295f, 4.553877f, 4.564348f, 4.574711f,
+    4.584968f, 4.595119f, 4.605170f, 4.615121f, 4.624973f, 4.634729f, 4.644391f,
+    4.653960f, 4.663439f, 4.672829f, 4.682131f, 4.691348f, 4.700480f, 4.709530f,
+    4.718499f, 4.727388f, 4.736198f, 4.744932f, 4.753591f, 4.762174f, 4.770685f,
+    4.779124f, 4.787492f, 4.795791f, 4.804021f, 4.812184f, 4.820282f, 4.828314f,
+    4.836282f, 4.844187f, 4.852030f};
+
+}  // namespace
+
+NoiseEstimator::NoiseEstimator(const SuppressionParams& suppression_params)
+    : suppression_params_(suppression_params) {
+  noise_spectrum_.fill(0.f);
+  prev_noise_spectrum_.fill(0.f);
+  conservative_noise_spectrum_.fill(0.f);
+  parametric_noise_spectrum_.fill(0.f);
+}
+
+void NoiseEstimator::PrepareAnalysis() {
+  std::copy(noise_spectrum_.begin(), noise_spectrum_.end(),
+            prev_noise_spectrum_.begin());
+}
+
+void NoiseEstimator::PreUpdate(
+    int32_t num_analyzed_frames,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum,
+    float signal_spectral_sum) {
+  quantile_noise_estimator_.Estimate(signal_spectrum, noise_spectrum_);
+
+  if (num_analyzed_frames < kShortStartupPhaseBlocks) {
+    // Compute simplified noise model during startup.
+    const size_t kStartBand = 5;
+    float sum_log_i_log_magn = 0.f;
+    float sum_log_i = 0.f;
+    float sum_log_i_square = 0.f;
+    float sum_log_magn = 0.f;
+    for (size_t i = kStartBand; i < kFftSizeBy2Plus1; ++i) {
+      float log_i = log_table[i];
+      sum_log_i += log_i;
+      sum_log_i_square += log_i * log_i;
+      float log_signal = LogApproximation(signal_spectrum[i]);
+      sum_log_magn += log_signal;
+      sum_log_i_log_magn += log_i * log_signal;
+    }
+
+    // Estimate the parameter for the level of the white noise.
+    constexpr float kOneByFftSizeBy2Plus1 = 1.f / kFftSizeBy2Plus1;
+    white_noise_level_ += signal_spectral_sum * kOneByFftSizeBy2Plus1 *
+                          suppression_params_.over_subtraction_factor;
+
+    // Estimate pink noise parameters.
+    float denom = sum_log_i_square * (kFftSizeBy2Plus1 - kStartBand) -
+                  sum_log_i * sum_log_i;
+    float num =
+        sum_log_i_square * sum_log_magn - sum_log_i * sum_log_i_log_magn;
+    RTC_DCHECK_NE(denom, 0.f);
+    float pink_noise_adjustment = num / denom;
+
+    // Constrain the estimated spectrum to be positive.
+    pink_noise_adjustment = std::max(pink_noise_adjustment, 0.f);
+    pink_noise_numerator_ += pink_noise_adjustment;
+    num = sum_log_i * sum_log_magn -
+          (kFftSizeBy2Plus1 - kStartBand) * sum_log_i_log_magn;
+    RTC_DCHECK_NE(denom, 0.f);
+    pink_noise_adjustment = num / denom;
+
+    // Constrain the pink noise power to be in the interval [0, 1].
+    pink_noise_adjustment = std::max(std::min(pink_noise_adjustment, 1.f), 0.f);
+
+    pink_noise_exp_ += pink_noise_adjustment;
+
+    const float one_by_num_analyzed_frames_plus_1 =
+        1.f / (num_analyzed_frames + 1.f);
+
+    // Calculate the frequency-independent parts of parametric noise estimate.
+    float parametric_exp = 0.f;
+    float parametric_num = 0.f;
+    if (pink_noise_exp_ > 0.f) {
+      // Use pink noise estimate.
+      parametric_num = ExpApproximation(pink_noise_numerator_ *
+                                        one_by_num_analyzed_frames_plus_1);
+      parametric_num *= num_analyzed_frames + 1.f;
+      parametric_exp = pink_noise_exp_ * one_by_num_analyzed_frames_plus_1;
+    }
+
+    constexpr float kOneByShortStartupPhaseBlocks =
+        1.f / kShortStartupPhaseBlocks;
+    for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+      // Estimate the background noise using the white and pink noise
+      // parameters.
+      if (pink_noise_exp_ == 0.f) {
+        // Use white noise estimate.
+        parametric_noise_spectrum_[i] = white_noise_level_;
+      } else {
+        // Use pink noise estimate.
+        float use_band = i < kStartBand ? kStartBand : i;
+        float denom = PowApproximation(use_band, parametric_exp);
+        RTC_DCHECK_NE(denom, 0.f);
+        parametric_noise_spectrum_[i] = parametric_num / denom;
+      }
+    }
+
+    // Weight quantile noise with modeled noise.
+    for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+      noise_spectrum_[i] *= num_analyzed_frames;
+      float tmp = parametric_noise_spectrum_[i] *
+                  (kShortStartupPhaseBlocks - num_analyzed_frames);
+      noise_spectrum_[i] += tmp * one_by_num_analyzed_frames_plus_1;
+      noise_spectrum_[i] *= kOneByShortStartupPhaseBlocks;
+    }
+  }
+}
+
+void NoiseEstimator::PostUpdate(
+    rtc::ArrayView<const float> speech_probability,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum) {
+  // Time-avg parameter for noise_spectrum update.
+  constexpr float kNoiseUpdate = 0.9f;
+
+  float gamma = kNoiseUpdate;
+  for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+    const float prob_speech = speech_probability[i];
+    const float prob_non_speech = 1.f - prob_speech;
+
+    // Temporary noise update used for speech frames if update value is less
+    // than previous.
+    float noise_update_tmp =
+        gamma * prev_noise_spectrum_[i] +
+        (1.f - gamma) * (prob_non_speech * signal_spectrum[i] +
+                         prob_speech * prev_noise_spectrum_[i]);
+
+    // Time-constant based on speech/noise_spectrum state.
+    float gamma_old = gamma;
+
+    // Increase gamma for frame likely to be seech.
+    constexpr float kProbRange = .2f;
+    gamma = prob_speech > kProbRange ? .99f : kNoiseUpdate;
+
+    // Conservative noise_spectrum update.
+    if (prob_speech < kProbRange) {
+      conservative_noise_spectrum_[i] +=
+          0.05f * (signal_spectrum[i] - conservative_noise_spectrum_[i]);
+    }
+
+    // Noise_spectrum update.
+    if (gamma == gamma_old) {
+      noise_spectrum_[i] = noise_update_tmp;
+    } else {
+      noise_spectrum_[i] =
+          gamma * prev_noise_spectrum_[i] +
+          (1.f - gamma) * (prob_non_speech * signal_spectrum[i] +
+                           prob_speech * prev_noise_spectrum_[i]);
+      // Allow for noise_spectrum update downwards: If noise_spectrum update
+      // decreases the noise_spectrum, it is safe, so allow it to happen.
+      noise_spectrum_[i] = std::min(noise_spectrum_[i], noise_update_tmp);
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_NOISE_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_NS_NOISE_ESTIMATOR_H_
+
+#include <array>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/ns/ns_common.h"
+#include "modules/audio_processing/ns/quantile_noise_estimator.h"
+#include "modules/audio_processing/ns/suppression_params.h"
+
+namespace webrtc {
+
+// Class for estimating the spectral characteristics of the noise in an incoming
+// signal.
+class NoiseEstimator {
+ public:
+  explicit NoiseEstimator(const SuppressionParams& suppression_params);
+
+  // Prepare the estimator for analysis of a new frame.
+  void PrepareAnalysis();
+
+  // Performs the first step of the estimator update.
+  void PreUpdate(int32_t num_analyzed_frames,
+                 rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum,
+                 float signal_spectral_sum);
+
+  // Performs the second step of the estimator update.
+  void PostUpdate(
+      rtc::ArrayView<const float> speech_probability,
+      rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum);
+
+  // Returns the noise spectral estimate.
+  rtc::ArrayView<const float, kFftSizeBy2Plus1> get_noise_spectrum() const {
+    return noise_spectrum_;
+  }
+
+  // Returns the noise from the previous frame.
+  rtc::ArrayView<const float, kFftSizeBy2Plus1> get_prev_noise_spectrum()
+      const {
+    return prev_noise_spectrum_;
+  }
+
+  // Returns a noise spectral estimate based on white and pink noise parameters.
+  rtc::ArrayView<const float, kFftSizeBy2Plus1> get_parametric_noise_spectrum()
+      const {
+    return parametric_noise_spectrum_;
+  }
+  rtc::ArrayView<const float, kFftSizeBy2Plus1>
+  get_conservative_noise_spectrum() const {
+    return conservative_noise_spectrum_;
+  }
+
+ private:
+  const SuppressionParams& suppression_params_;
+  float white_noise_level_ = 0.f;
+  float pink_noise_numerator_ = 0.f;
+  float pink_noise_exp_ = 0.f;
+  std::array<float, kFftSizeBy2Plus1> prev_noise_spectrum_;
+  std::array<float, kFftSizeBy2Plus1> conservative_noise_spectrum_;
+  std::array<float, kFftSizeBy2Plus1> parametric_noise_spectrum_;
+  std::array<float, kFftSizeBy2Plus1> noise_spectrum_;
+  QuantileNoiseEstimator quantile_noise_estimator_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_NOISE_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,555 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/noise_suppressor.h"
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+
+#include "modules/audio_processing/ns/fast_math.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace {
+
+// Maps sample rate to number of bands.
+size_t NumBandsForRate(size_t sample_rate_hz) {
+  RTC_DCHECK(sample_rate_hz == 16000 || sample_rate_hz == 32000 ||
+             sample_rate_hz == 48000);
+  return sample_rate_hz / 16000;
+}
+
+// Maximum number of channels for which the channel data is stored on
+// the stack. If the number of channels are larger than this, they are stored
+// using scratch memory that is pre-allocated on the heap. The reason for this
+// partitioning is not to waste heap space for handling the more common numbers
+// of channels, while at the same time not limiting the support for higher
+// numbers of channels by enforcing the channel data to be stored on the
+// stack using a fixed maximum value.
+constexpr size_t kMaxNumChannelsOnStack = 2;
+
+// Chooses the number of channels to store on the heap when that is required due
+// to the number of channels being larger than the pre-defined number
+// of channels to store on the stack.
+size_t NumChannelsOnHeap(size_t num_channels) {
+  return num_channels > kMaxNumChannelsOnStack ? num_channels : 0;
+}
+
+// Hybrib Hanning and flat window for the filterbank.
+constexpr std::array<float, 96> kBlocks160w256FirstHalf = {
+    0.00000000f, 0.01636173f, 0.03271908f, 0.04906767f, 0.06540313f,
+    0.08172107f, 0.09801714f, 0.11428696f, 0.13052619f, 0.14673047f,
+    0.16289547f, 0.17901686f, 0.19509032f, 0.21111155f, 0.22707626f,
+    0.24298018f, 0.25881905f, 0.27458862f, 0.29028468f, 0.30590302f,
+    0.32143947f, 0.33688985f, 0.35225005f, 0.36751594f, 0.38268343f,
+    0.39774847f, 0.41270703f, 0.42755509f, 0.44228869f, 0.45690388f,
+    0.47139674f, 0.48576339f, 0.50000000f, 0.51410274f, 0.52806785f,
+    0.54189158f, 0.55557023f, 0.56910015f, 0.58247770f, 0.59569930f,
+    0.60876143f, 0.62166057f, 0.63439328f, 0.64695615f, 0.65934582f,
+    0.67155895f, 0.68359230f, 0.69544264f, 0.70710678f, 0.71858162f,
+    0.72986407f, 0.74095113f, 0.75183981f, 0.76252720f, 0.77301045f,
+    0.78328675f, 0.79335334f, 0.80320753f, 0.81284668f, 0.82226822f,
+    0.83146961f, 0.84044840f, 0.84920218f, 0.85772861f, 0.86602540f,
+    0.87409034f, 0.88192126f, 0.88951608f, 0.89687274f, 0.90398929f,
+    0.91086382f, 0.91749450f, 0.92387953f, 0.93001722f, 0.93590593f,
+    0.94154407f, 0.94693013f, 0.95206268f, 0.95694034f, 0.96156180f,
+    0.96592583f, 0.97003125f, 0.97387698f, 0.97746197f, 0.98078528f,
+    0.98384601f, 0.98664333f, 0.98917651f, 0.99144486f, 0.99344778f,
+    0.99518473f, 0.99665524f, 0.99785892f, 0.99879546f, 0.99946459f,
+    0.99986614f};
+
+// Applies the filterbank window to a buffer.
+void ApplyFilterBankWindow(rtc::ArrayView<float, kFftSize> x) {
+  for (size_t i = 0; i < 96; ++i) {
+    x[i] = kBlocks160w256FirstHalf[i] * x[i];
+  }
+
+  for (size_t i = 161, k = 95; i < kFftSize; ++i, --k) {
+    RTC_DCHECK_NE(0, k);
+    x[i] = kBlocks160w256FirstHalf[k] * x[i];
+  }
+}
+
+// Extends a frame with previous data.
+void FormExtendedFrame(rtc::ArrayView<const float, kNsFrameSize> frame,
+                       rtc::ArrayView<float, kFftSize - kNsFrameSize> old_data,
+                       rtc::ArrayView<float, kFftSize> extended_frame) {
+  std::copy(old_data.begin(), old_data.end(), extended_frame.begin());
+  std::copy(frame.begin(), frame.end(),
+            extended_frame.begin() + old_data.size());
+  std::copy(extended_frame.end() - old_data.size(), extended_frame.end(),
+            old_data.begin());
+}
+
+// Uses overlap-and-add to produce an output frame.
+void OverlapAndAdd(rtc::ArrayView<const float, kFftSize> extended_frame,
+                   rtc::ArrayView<float, kOverlapSize> overlap_memory,
+                   rtc::ArrayView<float, kNsFrameSize> output_frame) {
+  for (size_t i = 0; i < kOverlapSize; ++i) {
+    output_frame[i] = overlap_memory[i] + extended_frame[i];
+  }
+  std::copy(extended_frame.begin() + kOverlapSize,
+            extended_frame.begin() + kNsFrameSize,
+            output_frame.begin() + kOverlapSize);
+  std::copy(extended_frame.begin() + kNsFrameSize, extended_frame.end(),
+            overlap_memory.begin());
+}
+
+// Produces a delayed frame.
+void DelaySignal(rtc::ArrayView<const float, kNsFrameSize> frame,
+                 rtc::ArrayView<float, kFftSize - kNsFrameSize> delay_buffer,
+                 rtc::ArrayView<float, kNsFrameSize> delayed_frame) {
+  constexpr size_t kSamplesFromFrame = kNsFrameSize - (kFftSize - kNsFrameSize);
+  std::copy(delay_buffer.begin(), delay_buffer.end(), delayed_frame.begin());
+  std::copy(frame.begin(), frame.begin() + kSamplesFromFrame,
+            delayed_frame.begin() + delay_buffer.size());
+
+  std::copy(frame.begin() + kSamplesFromFrame, frame.end(),
+            delay_buffer.begin());
+}
+
+// Computes the energy of an extended frame.
+float ComputeEnergyOfExtendedFrame(rtc::ArrayView<const float, kFftSize> x) {
+  float energy = 0.f;
+  for (float x_k : x) {
+    energy += x_k * x_k;
+  }
+
+  return energy;
+}
+
+// Computes the energy of an extended frame based on its subcomponents.
+float ComputeEnergyOfExtendedFrame(
+    rtc::ArrayView<const float, kNsFrameSize> frame,
+    rtc::ArrayView<float, kFftSize - kNsFrameSize> old_data) {
+  float energy = 0.f;
+  for (float v : old_data) {
+    energy += v * v;
+  }
+  for (float v : frame) {
+    energy += v * v;
+  }
+
+  return energy;
+}
+
+// Computes the magnitude spectrum based on an FFT output.
+void ComputeMagnitudeSpectrum(
+    rtc::ArrayView<const float, kFftSize> real,
+    rtc::ArrayView<const float, kFftSize> imag,
+    rtc::ArrayView<float, kFftSizeBy2Plus1> signal_spectrum) {
+  signal_spectrum[0] = fabsf(real[0]) + 1.f;
+  signal_spectrum[kFftSizeBy2Plus1 - 1] =
+      fabsf(real[kFftSizeBy2Plus1 - 1]) + 1.f;
+
+  for (size_t i = 1; i < kFftSizeBy2Plus1 - 1; ++i) {
+    signal_spectrum[i] =
+        SqrtFastApproximation(real[i] * real[i] + imag[i] * imag[i]) + 1.f;
+  }
+}
+
+// Compute prior and post SNR.
+void ComputeSnr(rtc::ArrayView<const float, kFftSizeBy2Plus1> filter,
+                rtc::ArrayView<const float> prev_signal_spectrum,
+                rtc::ArrayView<const float> signal_spectrum,
+                rtc::ArrayView<const float> prev_noise_spectrum,
+                rtc::ArrayView<const float> noise_spectrum,
+                rtc::ArrayView<float> prior_snr,
+                rtc::ArrayView<float> post_snr) {
+  for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+    // Previous post SNR.
+    // Previous estimate: based on previous frame with gain filter.
+    float prev_estimate = prev_signal_spectrum[i] /
+                          (prev_noise_spectrum[i] + 0.0001f) * filter[i];
+    // Post SNR.
+    if (signal_spectrum[i] > noise_spectrum[i]) {
+      post_snr[i] = signal_spectrum[i] / (noise_spectrum[i] + 0.0001f) - 1.f;
+    } else {
+      post_snr[i] = 0.f;
+    }
+    // The directed decision estimate of the prior SNR is a sum the current and
+    // previous estimates.
+    prior_snr[i] = 0.98f * prev_estimate + (1.f - 0.98f) * post_snr[i];
+  }
+}
+
+// Computes the attenuating gain for the noise suppression of the upper bands.
+float ComputeUpperBandsGain(
+    float minimum_attenuating_gain,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> filter,
+    rtc::ArrayView<const float> speech_probability,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> prev_analysis_signal_spectrum,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum) {
+  // Average speech prob and filter gain for the end of the lowest band.
+  constexpr int kNumAvgBins = 32;
+  constexpr float kOneByNumAvgBins = 1.f / kNumAvgBins;
+
+  float avg_prob_speech = 0.f;
+  float avg_filter_gain = 0.f;
+  for (size_t i = kFftSizeBy2Plus1 - kNumAvgBins - 1; i < kFftSizeBy2Plus1 - 1;
+       i++) {
+    avg_prob_speech += speech_probability[i];
+    avg_filter_gain += filter[i];
+  }
+  avg_prob_speech = avg_prob_speech * kOneByNumAvgBins;
+  avg_filter_gain = avg_filter_gain * kOneByNumAvgBins;
+
+  // If the speech was suppressed by a component between Analyze and Process, an
+  // example being by an AEC, it should not be considered speech for the purpose
+  // of high band suppression. To that end, the speech probability is scaled
+  // accordingly.
+  float sum_analysis_spectrum = 0.f;
+  float sum_processing_spectrum = 0.f;
+  for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+    sum_analysis_spectrum += prev_analysis_signal_spectrum[i];
+    sum_processing_spectrum += signal_spectrum[i];
+  }
+
+  // The magnitude spectrum computation enforces the spectrum to be strictly
+  // positive.
+  RTC_DCHECK_GT(sum_analysis_spectrum, 0.f);
+  avg_prob_speech *= sum_processing_spectrum / sum_analysis_spectrum;
+
+  // Compute gain based on speech probability.
+  float gain =
+      0.5f * (1.f + static_cast<float>(tanh(2.f * avg_prob_speech - 1.f)));
+
+  // Combine gain with low band gain.
+  if (avg_prob_speech >= 0.5f) {
+    gain = 0.25f * gain + 0.75f * avg_filter_gain;
+  } else {
+    gain = 0.5f * gain + 0.5f * avg_filter_gain;
+  }
+
+  // Make sure gain is within flooring range.
+  return std::min(std::max(gain, minimum_attenuating_gain), 1.f);
+}
+
+}  // namespace
+
+NoiseSuppressor::ChannelState::ChannelState(
+    const SuppressionParams& suppression_params,
+    size_t num_bands)
+    : wiener_filter(suppression_params),
+      noise_estimator(suppression_params),
+      process_delay_memory(num_bands > 1 ? num_bands - 1 : 0) {
+  analyze_analysis_memory.fill(0.f);
+  prev_analysis_signal_spectrum.fill(1.f);
+  process_analysis_memory.fill(0.f);
+  process_synthesis_memory.fill(0.f);
+  for (auto& d : process_delay_memory) {
+    d.fill(0.f);
+  }
+}
+
+NoiseSuppressor::NoiseSuppressor(const NsConfig& config,
+                                 size_t sample_rate_hz,
+                                 size_t num_channels)
+    : num_bands_(NumBandsForRate(sample_rate_hz)),
+      num_channels_(num_channels),
+      suppression_params_(config.target_level),
+      filter_bank_states_heap_(NumChannelsOnHeap(num_channels_)),
+      upper_band_gains_heap_(NumChannelsOnHeap(num_channels_)),
+      energies_before_filtering_heap_(NumChannelsOnHeap(num_channels_)),
+      gain_adjustments_heap_(NumChannelsOnHeap(num_channels_)),
+      channels_(num_channels_) {
+  for (size_t ch = 0; ch < num_channels_; ++ch) {
+    channels_[ch] =
+        std::make_unique<ChannelState>(suppression_params_, num_bands_);
+  }
+}
+
+void NoiseSuppressor::AggregateWienerFilters(
+    rtc::ArrayView<float, kFftSizeBy2Plus1> filter) const {
+  rtc::ArrayView<const float, kFftSizeBy2Plus1> filter0 =
+      channels_[0]->wiener_filter.get_filter();
+  std::copy(filter0.begin(), filter0.end(), filter.begin());
+
+  for (size_t ch = 1; ch < num_channels_; ++ch) {
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> filter_ch =
+        channels_[ch]->wiener_filter.get_filter();
+
+    for (size_t k = 0; k < kFftSizeBy2Plus1; ++k) {
+      filter[k] = std::min(filter[k], filter_ch[k]);
+    }
+  }
+}
+
+void NoiseSuppressor::Analyze(const AudioBuffer& audio) {
+  // Prepare the noise estimator for the analysis stage.
+  for (size_t ch = 0; ch < num_channels_; ++ch) {
+    channels_[ch]->noise_estimator.PrepareAnalysis();
+  }
+
+  // Check for zero frames.
+  bool zero_frame = true;
+  for (size_t ch = 0; ch < num_channels_; ++ch) {
+    rtc::ArrayView<const float, kNsFrameSize> y_band0(
+        &audio.split_bands_const(ch)[0][0], kNsFrameSize);
+    float energy = ComputeEnergyOfExtendedFrame(
+        y_band0, channels_[ch]->analyze_analysis_memory);
+    if (energy > 0.f) {
+      zero_frame = false;
+      break;
+    }
+  }
+
+  if (zero_frame) {
+    // We want to avoid updating statistics in this case:
+    // Updating feature statistics when we have zeros only will cause
+    // thresholds to move towards zero signal situations. This in turn has the
+    // effect that once the signal is "turned on" (non-zero values) everything
+    // will be treated as speech and there is no noise suppression effect.
+    // Depending on the duration of the inactive signal it takes a
+    // considerable amount of time for the system to learn what is noise and
+    // what is speech.
+    return;
+  }
+
+  // Only update analysis counter for frames that are properly analyzed.
+  if (++num_analyzed_frames_ < 0) {
+    num_analyzed_frames_ = 0;
+  }
+
+  // Analyze all channels.
+  for (size_t ch = 0; ch < num_channels_; ++ch) {
+    std::unique_ptr<ChannelState>& ch_p = channels_[ch];
+    rtc::ArrayView<const float, kNsFrameSize> y_band0(
+        &audio.split_bands_const(ch)[0][0], kNsFrameSize);
+
+    // Form an extended frame and apply analysis filter bank windowing.
+    std::array<float, kFftSize> extended_frame;
+    FormExtendedFrame(y_band0, ch_p->analyze_analysis_memory, extended_frame);
+    ApplyFilterBankWindow(extended_frame);
+
+    // Compute the magnitude spectrum.
+    std::array<float, kFftSize> real;
+    std::array<float, kFftSize> imag;
+    fft_.Fft(extended_frame, real, imag);
+
+    std::array<float, kFftSizeBy2Plus1> signal_spectrum;
+    ComputeMagnitudeSpectrum(real, imag, signal_spectrum);
+
+    // Compute energies.
+    float signal_energy = 0.f;
+    for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+      signal_energy += real[i] * real[i] + imag[i] * imag[i];
+    }
+    signal_energy /= kFftSizeBy2Plus1;
+
+    float signal_spectral_sum = 0.f;
+    for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+      signal_spectral_sum += signal_spectrum[i];
+    }
+
+    // Estimate the noise spectra and the probability estimates of speech
+    // presence.
+    ch_p->noise_estimator.PreUpdate(num_analyzed_frames_, signal_spectrum,
+                                    signal_spectral_sum);
+
+    std::array<float, kFftSizeBy2Plus1> post_snr;
+    std::array<float, kFftSizeBy2Plus1> prior_snr;
+    ComputeSnr(ch_p->wiener_filter.get_filter(),
+               ch_p->prev_analysis_signal_spectrum, signal_spectrum,
+               ch_p->noise_estimator.get_prev_noise_spectrum(),
+               ch_p->noise_estimator.get_noise_spectrum(), prior_snr, post_snr);
+
+    ch_p->speech_probability_estimator.Update(
+        num_analyzed_frames_, prior_snr, post_snr,
+        ch_p->noise_estimator.get_conservative_noise_spectrum(),
+        signal_spectrum, signal_spectral_sum, signal_energy);
+
+    ch_p->noise_estimator.PostUpdate(
+        ch_p->speech_probability_estimator.get_probability(), signal_spectrum);
+
+    // Store the magnitude spectrum to make it avalilable for the process
+    // method.
+    std::copy(signal_spectrum.begin(), signal_spectrum.end(),
+              ch_p->prev_analysis_signal_spectrum.begin());
+  }
+}
+
+void NoiseSuppressor::Process(AudioBuffer* audio) {
+  // Select the space for storing data during the processing.
+  std::array<FilterBankState, kMaxNumChannelsOnStack> filter_bank_states_stack;
+  rtc::ArrayView<FilterBankState> filter_bank_states(
+      filter_bank_states_stack.data(), num_channels_);
+  std::array<float, kMaxNumChannelsOnStack> upper_band_gains_stack;
+  rtc::ArrayView<float> upper_band_gains(upper_band_gains_stack.data(),
+                                         num_channels_);
+  std::array<float, kMaxNumChannelsOnStack> energies_before_filtering_stack;
+  rtc::ArrayView<float> energies_before_filtering(
+      energies_before_filtering_stack.data(), num_channels_);
+  std::array<float, kMaxNumChannelsOnStack> gain_adjustments_stack;
+  rtc::ArrayView<float> gain_adjustments(gain_adjustments_stack.data(),
+                                         num_channels_);
+  if (NumChannelsOnHeap(num_channels_) > 0) {
+    // If the stack-allocated space is too small, use the heap for storing the
+    // data.
+    filter_bank_states = rtc::ArrayView<FilterBankState>(
+        filter_bank_states_heap_.data(), num_channels_);
+    upper_band_gains =
+        rtc::ArrayView<float>(upper_band_gains_heap_.data(), num_channels_);
+    energies_before_filtering = rtc::ArrayView<float>(
+        energies_before_filtering_heap_.data(), num_channels_);
+    gain_adjustments =
+        rtc::ArrayView<float>(gain_adjustments_heap_.data(), num_channels_);
+  }
+
+  // Compute the suppression filters for all channels.
+  for (size_t ch = 0; ch < num_channels_; ++ch) {
+    // Form an extended frame and apply analysis filter bank windowing.
+    rtc::ArrayView<float, kNsFrameSize> y_band0(&audio->split_bands(ch)[0][0],
+                                                kNsFrameSize);
+
+    FormExtendedFrame(y_band0, channels_[ch]->process_analysis_memory,
+                      filter_bank_states[ch].extended_frame);
+
+    ApplyFilterBankWindow(filter_bank_states[ch].extended_frame);
+
+    energies_before_filtering[ch] =
+        ComputeEnergyOfExtendedFrame(filter_bank_states[ch].extended_frame);
+
+    // Perform filter bank analysis and compute the magnitude spectrum.
+    fft_.Fft(filter_bank_states[ch].extended_frame, filter_bank_states[ch].real,
+             filter_bank_states[ch].imag);
+
+    std::array<float, kFftSizeBy2Plus1> signal_spectrum;
+    ComputeMagnitudeSpectrum(filter_bank_states[ch].real,
+                             filter_bank_states[ch].imag, signal_spectrum);
+
+    // Compute the frequency domain gain filter for noise attenuation.
+    channels_[ch]->wiener_filter.Update(
+        num_analyzed_frames_,
+        channels_[ch]->noise_estimator.get_noise_spectrum(),
+        channels_[ch]->noise_estimator.get_prev_noise_spectrum(),
+        channels_[ch]->noise_estimator.get_parametric_noise_spectrum(),
+        signal_spectrum);
+
+    if (num_bands_ > 1) {
+      // Compute the time-domain gain for attenuating the noise in the upper
+      // bands.
+
+      upper_band_gains[ch] = ComputeUpperBandsGain(
+          suppression_params_.minimum_attenuating_gain,
+          channels_[ch]->wiener_filter.get_filter(),
+          channels_[ch]->speech_probability_estimator.get_probability(),
+          channels_[ch]->prev_analysis_signal_spectrum, signal_spectrum);
+    }
+  }
+
+  // Only do the below processing if the output of the audio processing module
+  // is used.
+  if (!capture_output_used_) {
+    return;
+  }
+
+  // Aggregate the Wiener filters for all channels.
+  std::array<float, kFftSizeBy2Plus1> filter_data;
+  rtc::ArrayView<const float, kFftSizeBy2Plus1> filter = filter_data;
+  if (num_channels_ == 1) {
+    filter = channels_[0]->wiener_filter.get_filter();
+  } else {
+    AggregateWienerFilters(filter_data);
+  }
+
+  for (size_t ch = 0; ch < num_channels_; ++ch) {
+    // Apply the filter to the lower band.
+    for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+      filter_bank_states[ch].real[i] *= filter[i];
+      filter_bank_states[ch].imag[i] *= filter[i];
+    }
+  }
+
+  // Perform filter bank synthesis
+  for (size_t ch = 0; ch < num_channels_; ++ch) {
+    fft_.Ifft(filter_bank_states[ch].real, filter_bank_states[ch].imag,
+              filter_bank_states[ch].extended_frame);
+  }
+
+  for (size_t ch = 0; ch < num_channels_; ++ch) {
+    const float energy_after_filtering =
+        ComputeEnergyOfExtendedFrame(filter_bank_states[ch].extended_frame);
+
+    // Apply synthesis window.
+    ApplyFilterBankWindow(filter_bank_states[ch].extended_frame);
+
+    // Compute the adjustment of the noise attenuation filter based on the
+    // effect of the attenuation.
+    gain_adjustments[ch] =
+        channels_[ch]->wiener_filter.ComputeOverallScalingFactor(
+            num_analyzed_frames_,
+            channels_[ch]->speech_probability_estimator.get_prior_probability(),
+            energies_before_filtering[ch], energy_after_filtering);
+  }
+
+  // Select and apply adjustment of the noise attenuation filter based on the
+  // effect of the attenuation.
+  float gain_adjustment = gain_adjustments[0];
+  for (size_t ch = 1; ch < num_channels_; ++ch) {
+    gain_adjustment = std::min(gain_adjustment, gain_adjustments[ch]);
+  }
+  for (size_t ch = 0; ch < num_channels_; ++ch) {
+    for (size_t i = 0; i < kFftSize; ++i) {
+      filter_bank_states[ch].extended_frame[i] =
+          gain_adjustment * filter_bank_states[ch].extended_frame[i];
+    }
+  }
+
+  // Use overlap-and-add to form the output frame of the lowest band.
+  for (size_t ch = 0; ch < num_channels_; ++ch) {
+    rtc::ArrayView<float, kNsFrameSize> y_band0(&audio->split_bands(ch)[0][0],
+                                                kNsFrameSize);
+    OverlapAndAdd(filter_bank_states[ch].extended_frame,
+                  channels_[ch]->process_synthesis_memory, y_band0);
+  }
+
+  if (num_bands_ > 1) {
+    // Select the noise attenuating gain to apply to the upper band.
+    float upper_band_gain = upper_band_gains[0];
+    for (size_t ch = 1; ch < num_channels_; ++ch) {
+      upper_band_gain = std::min(upper_band_gain, upper_band_gains[ch]);
+    }
+
+    // Process the upper bands.
+    for (size_t ch = 0; ch < num_channels_; ++ch) {
+      for (size_t b = 1; b < num_bands_; ++b) {
+        // Delay the upper bands to match the delay of the filterbank applied to
+        // the lowest band.
+        rtc::ArrayView<float, kNsFrameSize> y_band(
+            &audio->split_bands(ch)[b][0], kNsFrameSize);
+        std::array<float, kNsFrameSize> delayed_frame;
+        DelaySignal(y_band, channels_[ch]->process_delay_memory[b - 1],
+                    delayed_frame);
+
+        // Apply the time-domain noise-attenuating gain.
+        for (size_t j = 0; j < kNsFrameSize; j++) {
+          y_band[j] = upper_band_gain * delayed_frame[j];
+        }
+      }
+    }
+  }
+
+  // Limit the output the allowed range.
+  for (size_t ch = 0; ch < num_channels_; ++ch) {
+    for (size_t b = 0; b < num_bands_; ++b) {
+      rtc::ArrayView<float, kNsFrameSize> y_band(&audio->split_bands(ch)[b][0],
+                                                 kNsFrameSize);
+      for (size_t j = 0; j < kNsFrameSize; j++) {
+        y_band[j] = std::min(std::max(y_band[j], -32768.f), 32767.f);
+      }
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,92 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSOR_H_
+#define MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSOR_H_
+
+#include <memory>
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/audio_buffer.h"
+#include "modules/audio_processing/ns/noise_estimator.h"
+#include "modules/audio_processing/ns/ns_common.h"
+#include "modules/audio_processing/ns/ns_config.h"
+#include "modules/audio_processing/ns/ns_fft.h"
+#include "modules/audio_processing/ns/speech_probability_estimator.h"
+#include "modules/audio_processing/ns/wiener_filter.h"
+
+namespace webrtc {
+
+// Class for suppressing noise in a signal.
+class NoiseSuppressor {
+ public:
+  NoiseSuppressor(const NsConfig& config,
+                  size_t sample_rate_hz,
+                  size_t num_channels);
+  NoiseSuppressor(const NoiseSuppressor&) = delete;
+  NoiseSuppressor& operator=(const NoiseSuppressor&) = delete;
+
+  // Analyses the signal (typically applied before the AEC to avoid analyzing
+  // any comfort noise signal).
+  void Analyze(const AudioBuffer& audio);
+
+  // Applies noise suppression.
+  void Process(AudioBuffer* audio);
+
+  // Specifies whether the capture output will be used. The purpose of this is
+  // to allow the noise suppressor to deactivate some of the processing when the
+  // resulting output is anyway not used, for instance when the endpoint is
+  // muted.
+  void SetCaptureOutputUsage(bool capture_output_used) {
+    capture_output_used_ = capture_output_used;
+  }
+
+ private:
+  const size_t num_bands_;
+  const size_t num_channels_;
+  const SuppressionParams suppression_params_;
+  int32_t num_analyzed_frames_ = -1;
+  NrFft fft_;
+  bool capture_output_used_ = true;
+
+  struct ChannelState {
+    ChannelState(const SuppressionParams& suppression_params, size_t num_bands);
+
+    SpeechProbabilityEstimator speech_probability_estimator;
+    WienerFilter wiener_filter;
+    NoiseEstimator noise_estimator;
+    std::array<float, kFftSizeBy2Plus1> prev_analysis_signal_spectrum;
+    std::array<float, kFftSize - kNsFrameSize> analyze_analysis_memory;
+    std::array<float, kOverlapSize> process_analysis_memory;
+    std::array<float, kOverlapSize> process_synthesis_memory;
+    std::vector<std::array<float, kOverlapSize>> process_delay_memory;
+  };
+
+  struct FilterBankState {
+    std::array<float, kFftSize> real;
+    std::array<float, kFftSize> imag;
+    std::array<float, kFftSize> extended_frame;
+  };
+
+  std::vector<FilterBankState> filter_bank_states_heap_;
+  std::vector<float> upper_band_gains_heap_;
+  std::vector<float> energies_before_filtering_heap_;
+  std::vector<float> gain_adjustments_heap_;
+  std::vector<std::unique_ptr<ChannelState>> channels_;
+
+  // Aggregates the Wiener filters into a single filter to use.
+  void AggregateWienerFilters(
+      rtc::ArrayView<float, kFftSizeBy2Plus1> filter) const;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_NOISE_SUPPRESSOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/noise_suppressor_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,102 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/noise_suppressor.h"
+
+#include <deque>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "rtc_base/strings/string_builder.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+namespace {
+
+std::string ProduceDebugText(int sample_rate_hz,
+                             size_t num_channels,
+                             NsConfig::SuppressionLevel level) {
+  rtc::StringBuilder ss;
+  ss << "Sample rate: " << sample_rate_hz << ", num_channels: " << num_channels
+     << ", level: " << static_cast<int>(level);
+  return ss.Release();
+}
+
+void PopulateInputFrameWithIdenticalChannels(size_t num_channels,
+                                             size_t num_bands,
+                                             size_t frame_index,
+                                             AudioBuffer* audio) {
+  for (size_t ch = 0; ch < num_channels; ++ch) {
+    for (size_t b = 0; b < num_bands; ++b) {
+      for (size_t i = 0; i < 160; ++i) {
+        float value = static_cast<int>(frame_index * 160 + i);
+        audio->split_bands(ch)[b][i] = (value > 0 ? 5000 * b + value : 0);
+      }
+    }
+  }
+}
+
+void VerifyIdenticalChannels(size_t num_channels,
+                             size_t num_bands,
+                             size_t frame_index,
+                             const AudioBuffer& audio) {
+  EXPECT_GT(num_channels, 1u);
+  for (size_t ch = 1; ch < num_channels; ++ch) {
+    for (size_t b = 0; b < num_bands; ++b) {
+      for (size_t i = 0; i < 160; ++i) {
+        EXPECT_EQ(audio.split_bands_const(ch)[b][i],
+                  audio.split_bands_const(0)[b][i]);
+      }
+    }
+  }
+}
+
+}  // namespace
+
+// Verifies that the same noise reduction effect is applied to all channels.
+TEST(NoiseSuppressor, IdenticalChannelEffects) {
+  for (auto rate : {16000, 32000, 48000}) {
+    for (auto num_channels : {1, 4, 8}) {
+      for (auto level :
+           {NsConfig::SuppressionLevel::k6dB, NsConfig::SuppressionLevel::k12dB,
+            NsConfig::SuppressionLevel::k18dB,
+            NsConfig::SuppressionLevel::k21dB}) {
+        SCOPED_TRACE(ProduceDebugText(rate, num_channels, level));
+
+        const size_t num_bands = rate / 16000;
+        // const int frame_length = rtc::CheckedDivExact(rate, 100);
+        AudioBuffer audio(rate, num_channels, rate, num_channels, rate,
+                          num_channels);
+        NsConfig cfg;
+        NoiseSuppressor ns(cfg, rate, num_channels);
+        for (size_t frame_index = 0; frame_index < 1000; ++frame_index) {
+          if (rate > 16000) {
+            audio.SplitIntoFrequencyBands();
+          }
+
+          PopulateInputFrameWithIdenticalChannels(num_channels, num_bands,
+                                                  frame_index, &audio);
+
+          ns.Analyze(audio);
+          ns.Process(&audio);
+          if (num_channels > 1) {
+            VerifyIdenticalChannels(num_channels, num_bands, frame_index,
+                                    audio);
+          }
+        }
+      }
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_common.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_common.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_common.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_common.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_NS_COMMON_H_
+#define MODULES_AUDIO_PROCESSING_NS_NS_COMMON_H_
+
+#include <cstddef>
+
+namespace webrtc {
+
+constexpr size_t kFftSize = 256;
+constexpr size_t kFftSizeBy2Plus1 = kFftSize / 2 + 1;
+constexpr size_t kNsFrameSize = 160;
+constexpr size_t kOverlapSize = kFftSize - kNsFrameSize;
+
+constexpr int kShortStartupPhaseBlocks = 50;
+constexpr int kLongStartupPhaseBlocks = 200;
+constexpr int kFeatureUpdateWindowSize = 500;
+
+constexpr float kLtrFeatureThr = 0.5f;
+constexpr float kBinSizeLrt = 0.1f;
+constexpr float kBinSizeSpecFlat = 0.05f;
+constexpr float kBinSizeSpecDiff = 0.1f;
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_NS_COMMON_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_config.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_config.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_config.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_config.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,24 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_NS_CONFIG_H_
+#define MODULES_AUDIO_PROCESSING_NS_NS_CONFIG_H_
+
+namespace webrtc {
+
+// Config struct for the noise suppressor
+struct NsConfig {
+  enum class SuppressionLevel { k6dB, k12dB, k18dB, k21dB };
+  SuppressionLevel target_level = SuppressionLevel::k12dB;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_NS_CONFIG_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_fft.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_fft.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_fft.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_fft.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/ns_fft.h"
+
+#include "common_audio/third_party/ooura/fft_size_256/fft4g.h"
+
+namespace webrtc {
+
+NrFft::NrFft() : bit_reversal_state_(kFftSize / 2), tables_(kFftSize / 2) {
+  // Initialize WebRtc_rdt (setting (bit_reversal_state_[0] to 0 triggers
+  // initialization)
+  bit_reversal_state_[0] = 0.f;
+  std::array<float, kFftSize> tmp_buffer;
+  tmp_buffer.fill(0.f);
+  WebRtc_rdft(kFftSize, 1, tmp_buffer.data(), bit_reversal_state_.data(),
+              tables_.data());
+}
+
+void NrFft::Fft(rtc::ArrayView<float, kFftSize> time_data,
+                rtc::ArrayView<float, kFftSize> real,
+                rtc::ArrayView<float, kFftSize> imag) {
+  WebRtc_rdft(kFftSize, 1, time_data.data(), bit_reversal_state_.data(),
+              tables_.data());
+
+  imag[0] = 0;
+  real[0] = time_data[0];
+
+  imag[kFftSizeBy2Plus1 - 1] = 0;
+  real[kFftSizeBy2Plus1 - 1] = time_data[1];
+
+  for (size_t i = 1; i < kFftSizeBy2Plus1 - 1; ++i) {
+    real[i] = time_data[2 * i];
+    imag[i] = time_data[2 * i + 1];
+  }
+}
+
+void NrFft::Ifft(rtc::ArrayView<const float> real,
+                 rtc::ArrayView<const float> imag,
+                 rtc::ArrayView<float> time_data) {
+  time_data[0] = real[0];
+  time_data[1] = real[kFftSizeBy2Plus1 - 1];
+  for (size_t i = 1; i < kFftSizeBy2Plus1 - 1; ++i) {
+    time_data[2 * i] = real[i];
+    time_data[2 * i + 1] = imag[i];
+  }
+  WebRtc_rdft(kFftSize, -1, time_data.data(), bit_reversal_state_.data(),
+              tables_.data());
+
+  // Scale the output
+  constexpr float kScaling = 2.f / kFftSize;
+  for (float& d : time_data) {
+    d *= kScaling;
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_fft.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_fft.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_fft.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/ns_fft.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_NS_FFT_H_
+#define MODULES_AUDIO_PROCESSING_NS_NS_FFT_H_
+
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/ns/ns_common.h"
+
+namespace webrtc {
+
+// Wrapper class providing 256 point FFT functionality.
+class NrFft {
+ public:
+  NrFft();
+  NrFft(const NrFft&) = delete;
+  NrFft& operator=(const NrFft&) = delete;
+
+  // Transforms the signal from time to frequency domain.
+  void Fft(rtc::ArrayView<float, kFftSize> time_data,
+           rtc::ArrayView<float, kFftSize> real,
+           rtc::ArrayView<float, kFftSize> imag);
+
+  // Transforms the signal from frequency to time domain.
+  void Ifft(rtc::ArrayView<const float> real,
+            rtc::ArrayView<const float> imag,
+            rtc::ArrayView<float> time_data);
+
+ private:
+  std::vector<size_t> bit_reversal_state_;
+  std::vector<float> tables_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_NS_FFT_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,18 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/prior_signal_model.h"
+
+namespace webrtc {
+
+PriorSignalModel::PriorSignalModel(float lrt_initial_value)
+    : lrt(lrt_initial_value) {}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,170 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/prior_signal_model_estimator.h"
+
+#include <math.h>
+#include <algorithm>
+
+#include "modules/audio_processing/ns/fast_math.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace {
+
+// Identifies the first of the two largest peaks in the histogram.
+void FindFirstOfTwoLargestPeaks(
+    float bin_size,
+    rtc::ArrayView<const int, kHistogramSize> spectral_flatness,
+    float* peak_position,
+    int* peak_weight) {
+  RTC_DCHECK(peak_position);
+  RTC_DCHECK(peak_weight);
+
+  int peak_value = 0;
+  int secondary_peak_value = 0;
+  *peak_position = 0.f;
+  float secondary_peak_position = 0.f;
+  *peak_weight = 0;
+  int secondary_peak_weight = 0;
+
+  // Identify the two largest peaks.
+  for (int i = 0; i < kHistogramSize; ++i) {
+    const float bin_mid = (i + 0.5f) * bin_size;
+    if (spectral_flatness[i] > peak_value) {
+      // Found new "first" peak candidate.
+      secondary_peak_value = peak_value;
+      secondary_peak_weight = *peak_weight;
+      secondary_peak_position = *peak_position;
+
+      peak_value = spectral_flatness[i];
+      *peak_weight = spectral_flatness[i];
+      *peak_position = bin_mid;
+    } else if (spectral_flatness[i] > secondary_peak_value) {
+      // Found new "second" peak candidate.
+      secondary_peak_value = spectral_flatness[i];
+      secondary_peak_weight = spectral_flatness[i];
+      secondary_peak_position = bin_mid;
+    }
+  }
+
+  // Merge the peaks if they are close.
+  if ((fabs(secondary_peak_position - *peak_position) < 2 * bin_size) &&
+      (secondary_peak_weight > 0.5f * (*peak_weight))) {
+    *peak_weight += secondary_peak_weight;
+    *peak_position = 0.5f * (*peak_position + secondary_peak_position);
+  }
+}
+
+void UpdateLrt(rtc::ArrayView<const int, kHistogramSize> lrt_histogram,
+               float* prior_model_lrt,
+               bool* low_lrt_fluctuations) {
+  RTC_DCHECK(prior_model_lrt);
+  RTC_DCHECK(low_lrt_fluctuations);
+
+  float average = 0.f;
+  float average_compl = 0.f;
+  float average_squared = 0.f;
+  int count = 0;
+
+  for (int i = 0; i < 10; ++i) {
+    float bin_mid = (i + 0.5f) * kBinSizeLrt;
+    average += lrt_histogram[i] * bin_mid;
+    count += lrt_histogram[i];
+  }
+  if (count > 0) {
+    average = average / count;
+  }
+
+  for (int i = 0; i < kHistogramSize; ++i) {
+    float bin_mid = (i + 0.5f) * kBinSizeLrt;
+    average_squared += lrt_histogram[i] * bin_mid * bin_mid;
+    average_compl += lrt_histogram[i] * bin_mid;
+  }
+  constexpr float kOneFeatureUpdateWindowSize = 1.f / kFeatureUpdateWindowSize;
+  average_squared = average_squared * kOneFeatureUpdateWindowSize;
+  average_compl = average_compl * kOneFeatureUpdateWindowSize;
+
+  // Fluctuation limit of LRT feature.
+  *low_lrt_fluctuations = average_squared - average * average_compl < 0.05f;
+
+  // Get threshold for LRT feature.
+  constexpr float kMaxLrt = 1.f;
+  constexpr float kMinLrt = .2f;
+  if (*low_lrt_fluctuations) {
+    // Very low fluctuation, so likely noise.
+    *prior_model_lrt = kMaxLrt;
+  } else {
+    *prior_model_lrt = std::min(kMaxLrt, std::max(kMinLrt, 1.2f * average));
+  }
+}
+
+}  // namespace
+
+PriorSignalModelEstimator::PriorSignalModelEstimator(float lrt_initial_value)
+    : prior_model_(lrt_initial_value) {}
+
+// Extract thresholds for feature parameters and computes the threshold/weights.
+void PriorSignalModelEstimator::Update(const Histograms& histograms) {
+  bool low_lrt_fluctuations;
+  UpdateLrt(histograms.get_lrt(), &prior_model_.lrt, &low_lrt_fluctuations);
+
+  // For spectral flatness and spectral difference: compute the main peaks of
+  // the histograms.
+  float spectral_flatness_peak_position;
+  int spectral_flatness_peak_weight;
+  FindFirstOfTwoLargestPeaks(
+      kBinSizeSpecFlat, histograms.get_spectral_flatness(),
+      &spectral_flatness_peak_position, &spectral_flatness_peak_weight);
+
+  float spectral_diff_peak_position = 0.f;
+  int spectral_diff_peak_weight = 0;
+  FindFirstOfTwoLargestPeaks(kBinSizeSpecDiff, histograms.get_spectral_diff(),
+                             &spectral_diff_peak_position,
+                             &spectral_diff_peak_weight);
+
+  // Reject if weight of peaks is not large enough, or peak value too small.
+  // Peak limit for spectral flatness (varies between 0 and 1).
+  const int use_spec_flat = spectral_flatness_peak_weight < 0.3f * 500 ||
+                                    spectral_flatness_peak_position < 0.6f
+                                ? 0
+                                : 1;
+
+  // Reject if weight of peaks is not large enough or if fluctuation of the LRT
+  // feature are very low, indicating a noise state.
+  const int use_spec_diff =
+      spectral_diff_peak_weight < 0.3f * 500 || low_lrt_fluctuations ? 0 : 1;
+
+  // Update the model.
+  prior_model_.template_diff_threshold = 1.2f * spectral_diff_peak_position;
+  prior_model_.template_diff_threshold =
+      std::min(1.f, std::max(0.16f, prior_model_.template_diff_threshold));
+
+  float one_by_feature_sum = 1.f / (1.f + use_spec_flat + use_spec_diff);
+  prior_model_.lrt_weighting = one_by_feature_sum;
+
+  if (use_spec_flat == 1) {
+    prior_model_.flatness_threshold = 0.9f * spectral_flatness_peak_position;
+    prior_model_.flatness_threshold =
+        std::min(.95f, std::max(0.1f, prior_model_.flatness_threshold));
+    prior_model_.flatness_weighting = one_by_feature_sum;
+  } else {
+    prior_model_.flatness_weighting = 0.f;
+  }
+
+  if (use_spec_diff == 1) {
+    prior_model_.difference_weighting = one_by_feature_sum;
+  } else {
+    prior_model_.difference_weighting = 0.f;
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_PRIOR_SIGNAL_MODEL_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_NS_PRIOR_SIGNAL_MODEL_ESTIMATOR_H_
+
+#include "modules/audio_processing/ns/histograms.h"
+#include "modules/audio_processing/ns/prior_signal_model.h"
+
+namespace webrtc {
+
+// Estimator of the prior signal model parameters.
+class PriorSignalModelEstimator {
+ public:
+  explicit PriorSignalModelEstimator(float lrt_initial_value);
+  PriorSignalModelEstimator(const PriorSignalModelEstimator&) = delete;
+  PriorSignalModelEstimator& operator=(const PriorSignalModelEstimator&) =
+      delete;
+
+  // Updates the model estimate.
+  void Update(const Histograms& h);
+
+  // Returns the estimated model.
+  const PriorSignalModel& get_prior_model() const { return prior_model_; }
+
+ private:
+  PriorSignalModel prior_model_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_PRIOR_SIGNAL_MODEL_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/prior_signal_model.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_PRIOR_SIGNAL_MODEL_H_
+#define MODULES_AUDIO_PROCESSING_NS_PRIOR_SIGNAL_MODEL_H_
+
+namespace webrtc {
+
+// Struct for storing the prior signal model parameters.
+struct PriorSignalModel {
+  explicit PriorSignalModel(float lrt_initial_value);
+  PriorSignalModel(const PriorSignalModel&) = delete;
+  PriorSignalModel& operator=(const PriorSignalModel&) = delete;
+
+  float lrt;
+  float flatness_threshold = .5f;
+  float template_diff_threshold = .5f;
+  float lrt_weighting = 1.f;
+  float flatness_weighting = 0.f;
+  float difference_weighting = 0.f;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_PRIOR_SIGNAL_MODEL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/quantile_noise_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/quantile_noise_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/quantile_noise_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/quantile_noise_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,88 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/quantile_noise_estimator.h"
+
+#include <algorithm>
+
+#include "modules/audio_processing/ns/fast_math.h"
+
+namespace webrtc {
+
+QuantileNoiseEstimator::QuantileNoiseEstimator() {
+  quantile_.fill(0.f);
+  density_.fill(0.3f);
+  log_quantile_.fill(8.f);
+
+  constexpr float kOneBySimult = 1.f / kSimult;
+  for (size_t i = 0; i < kSimult; ++i) {
+    counter_[i] = floor(kLongStartupPhaseBlocks * (i + 1.f) * kOneBySimult);
+  }
+}
+
+void QuantileNoiseEstimator::Estimate(
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum,
+    rtc::ArrayView<float, kFftSizeBy2Plus1> noise_spectrum) {
+  std::array<float, kFftSizeBy2Plus1> log_spectrum;
+  LogApproximation(signal_spectrum, log_spectrum);
+
+  int quantile_index_to_return = -1;
+  // Loop over simultaneous estimates.
+  for (int s = 0, k = 0; s < kSimult;
+       ++s, k += static_cast<int>(kFftSizeBy2Plus1)) {
+    const float one_by_counter_plus_1 = 1.f / (counter_[s] + 1.f);
+    for (int i = 0, j = k; i < static_cast<int>(kFftSizeBy2Plus1); ++i, ++j) {
+      // Update log quantile estimate.
+      const float delta = density_[j] > 1.f ? 40.f / density_[j] : 40.f;
+
+      const float multiplier = delta * one_by_counter_plus_1;
+      if (log_spectrum[i] > log_quantile_[j]) {
+        log_quantile_[j] += 0.25f * multiplier;
+      } else {
+        log_quantile_[j] -= 0.75f * multiplier;
+      }
+
+      // Update density estimate.
+      constexpr float kWidth = 0.01f;
+      constexpr float kOneByWidthPlus2 = 1.f / (2.f * kWidth);
+      if (fabs(log_spectrum[i] - log_quantile_[j]) < kWidth) {
+        density_[j] = (counter_[s] * density_[j] + kOneByWidthPlus2) *
+                      one_by_counter_plus_1;
+      }
+    }
+
+    if (counter_[s] >= kLongStartupPhaseBlocks) {
+      counter_[s] = 0;
+      if (num_updates_ >= kLongStartupPhaseBlocks) {
+        quantile_index_to_return = k;
+      }
+    }
+
+    ++counter_[s];
+  }
+
+  // Sequentially update the noise during startup.
+  if (num_updates_ < kLongStartupPhaseBlocks) {
+    // Use the last "s" to get noise during startup that differ from zero.
+    quantile_index_to_return = kFftSizeBy2Plus1 * (kSimult - 1);
+    ++num_updates_;
+  }
+
+  if (quantile_index_to_return >= 0) {
+    ExpApproximation(
+        rtc::ArrayView<const float>(&log_quantile_[quantile_index_to_return],
+                                    kFftSizeBy2Plus1),
+        quantile_);
+  }
+
+  std::copy(quantile_.begin(), quantile_.end(), noise_spectrum.begin());
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/quantile_noise_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/quantile_noise_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/quantile_noise_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/quantile_noise_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_QUANTILE_NOISE_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_NS_QUANTILE_NOISE_ESTIMATOR_H_
+
+#include <math.h>
+#include <array>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/ns/ns_common.h"
+
+namespace webrtc {
+
+constexpr int kSimult = 3;
+
+// For quantile noise estimation.
+class QuantileNoiseEstimator {
+ public:
+  QuantileNoiseEstimator();
+  QuantileNoiseEstimator(const QuantileNoiseEstimator&) = delete;
+  QuantileNoiseEstimator& operator=(const QuantileNoiseEstimator&) = delete;
+
+  // Estimate noise.
+  void Estimate(rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum,
+                rtc::ArrayView<float, kFftSizeBy2Plus1> noise_spectrum);
+
+ private:
+  std::array<float, kSimult * kFftSizeBy2Plus1> density_;
+  std::array<float, kSimult * kFftSizeBy2Plus1> log_quantile_;
+  std::array<float, kFftSizeBy2Plus1> quantile_;
+  std::array<int, kSimult> counter_;
+  int num_updates_ = 1;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_QUANTILE_NOISE_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,24 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/signal_model.h"
+
+namespace webrtc {
+
+SignalModel::SignalModel() {
+  constexpr float kSfFeatureThr = 0.5f;
+
+  lrt = kLtrFeatureThr;
+  spectral_flatness = kSfFeatureThr;
+  spectral_diff = kSfFeatureThr;
+  avg_log_lrt.fill(kLtrFeatureThr);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,175 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/signal_model_estimator.h"
+
+#include "modules/audio_processing/ns/fast_math.h"
+
+namespace webrtc {
+
+namespace {
+
+constexpr float kOneByFftSizeBy2Plus1 = 1.f / kFftSizeBy2Plus1;
+
+// Computes the difference measure between input spectrum and a template/learned
+// noise spectrum.
+float ComputeSpectralDiff(
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> conservative_noise_spectrum,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum,
+    float signal_spectral_sum,
+    float diff_normalization) {
+  // spectral_diff = var(signal_spectrum) - cov(signal_spectrum, magnAvgPause)^2
+  // / var(magnAvgPause)
+
+  // Compute average quantities.
+  float noise_average = 0.f;
+  for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+    // Conservative smooth noise spectrum from pause frames.
+    noise_average += conservative_noise_spectrum[i];
+  }
+  noise_average = noise_average * kOneByFftSizeBy2Plus1;
+  float signal_average = signal_spectral_sum * kOneByFftSizeBy2Plus1;
+
+  // Compute variance and covariance quantities.
+  float covariance = 0.f;
+  float noise_variance = 0.f;
+  float signal_variance = 0.f;
+  for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+    float signal_diff = signal_spectrum[i] - signal_average;
+    float noise_diff = conservative_noise_spectrum[i] - noise_average;
+    covariance += signal_diff * noise_diff;
+    noise_variance += noise_diff * noise_diff;
+    signal_variance += signal_diff * signal_diff;
+  }
+  covariance *= kOneByFftSizeBy2Plus1;
+  noise_variance *= kOneByFftSizeBy2Plus1;
+  signal_variance *= kOneByFftSizeBy2Plus1;
+
+  // Update of average magnitude spectrum.
+  float spectral_diff =
+      signal_variance - (covariance * covariance) / (noise_variance + 0.0001f);
+  // Normalize.
+  return spectral_diff / (diff_normalization + 0.0001f);
+}
+
+// Updates the spectral flatness based on the input spectrum.
+void UpdateSpectralFlatness(
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum,
+    float signal_spectral_sum,
+    float* spectral_flatness) {
+  RTC_DCHECK(spectral_flatness);
+
+  // Compute log of ratio of the geometric to arithmetic mean (handle the log(0)
+  // separately).
+  constexpr float kAveraging = 0.3f;
+  float avg_spect_flatness_num = 0.f;
+  for (size_t i = 1; i < kFftSizeBy2Plus1; ++i) {
+    if (signal_spectrum[i] == 0.f) {
+      *spectral_flatness -= kAveraging * (*spectral_flatness);
+      return;
+    }
+  }
+
+  for (size_t i = 1; i < kFftSizeBy2Plus1; ++i) {
+    avg_spect_flatness_num += LogApproximation(signal_spectrum[i]);
+  }
+
+  float avg_spect_flatness_denom = signal_spectral_sum - signal_spectrum[0];
+
+  avg_spect_flatness_denom = avg_spect_flatness_denom * kOneByFftSizeBy2Plus1;
+  avg_spect_flatness_num = avg_spect_flatness_num * kOneByFftSizeBy2Plus1;
+
+  float spectral_tmp =
+      ExpApproximation(avg_spect_flatness_num) / avg_spect_flatness_denom;
+
+  // Time-avg update of spectral flatness feature.
+  *spectral_flatness += kAveraging * (spectral_tmp - *spectral_flatness);
+}
+
+// Updates the log LRT measures.
+void UpdateSpectralLrt(rtc::ArrayView<const float, kFftSizeBy2Plus1> prior_snr,
+                       rtc::ArrayView<const float, kFftSizeBy2Plus1> post_snr,
+                       rtc::ArrayView<float, kFftSizeBy2Plus1> avg_log_lrt,
+                       float* lrt) {
+  RTC_DCHECK(lrt);
+
+  for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+    float tmp1 = 1.f + 2.f * prior_snr[i];
+    float tmp2 = 2.f * prior_snr[i] / (tmp1 + 0.0001f);
+    float bessel_tmp = (post_snr[i] + 1.f) * tmp2;
+    avg_log_lrt[i] +=
+        .5f * (bessel_tmp - LogApproximation(tmp1) - avg_log_lrt[i]);
+  }
+
+  float log_lrt_time_avg_k_sum = 0.f;
+  for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+    log_lrt_time_avg_k_sum += avg_log_lrt[i];
+  }
+  *lrt = log_lrt_time_avg_k_sum * kOneByFftSizeBy2Plus1;
+}
+
+}  // namespace
+
+SignalModelEstimator::SignalModelEstimator()
+    : prior_model_estimator_(kLtrFeatureThr) {}
+
+void SignalModelEstimator::AdjustNormalization(int32_t num_analyzed_frames,
+                                               float signal_energy) {
+  diff_normalization_ *= num_analyzed_frames;
+  diff_normalization_ += signal_energy;
+  diff_normalization_ /= (num_analyzed_frames + 1);
+}
+
+// Update the noise features.
+void SignalModelEstimator::Update(
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> prior_snr,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> post_snr,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> conservative_noise_spectrum,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum,
+    float signal_spectral_sum,
+    float signal_energy) {
+  // Compute spectral flatness on input spectrum.
+  UpdateSpectralFlatness(signal_spectrum, signal_spectral_sum,
+                         &features_.spectral_flatness);
+
+  // Compute difference of input spectrum with learned/estimated noise spectrum.
+  float spectral_diff =
+      ComputeSpectralDiff(conservative_noise_spectrum, signal_spectrum,
+                          signal_spectral_sum, diff_normalization_);
+  // Compute time-avg update of difference feature.
+  features_.spectral_diff += 0.3f * (spectral_diff - features_.spectral_diff);
+
+  signal_energy_sum_ += signal_energy;
+
+  // Compute histograms for parameter decisions (thresholds and weights for
+  // features). Parameters are extracted periodically.
+  if (--histogram_analysis_counter_ > 0) {
+    histograms_.Update(features_);
+  } else {
+    // Compute model parameters.
+    prior_model_estimator_.Update(histograms_);
+
+    // Clear histograms for next update.
+    histograms_.Clear();
+
+    histogram_analysis_counter_ = kFeatureUpdateWindowSize;
+
+    // Update every window:
+    // Compute normalization for the spectral difference for next estimation.
+    signal_energy_sum_ = signal_energy_sum_ / kFeatureUpdateWindowSize;
+    diff_normalization_ = 0.5f * (signal_energy_sum_ + diff_normalization_);
+    signal_energy_sum_ = 0.f;
+  }
+
+  // Compute the LRT.
+  UpdateSpectralLrt(prior_snr, post_snr, features_.avg_log_lrt, &features_.lrt);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_SIGNAL_MODEL_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_NS_SIGNAL_MODEL_ESTIMATOR_H_
+
+#include <array>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/ns/histograms.h"
+#include "modules/audio_processing/ns/ns_common.h"
+#include "modules/audio_processing/ns/prior_signal_model.h"
+#include "modules/audio_processing/ns/prior_signal_model_estimator.h"
+#include "modules/audio_processing/ns/signal_model.h"
+
+namespace webrtc {
+
+class SignalModelEstimator {
+ public:
+  SignalModelEstimator();
+  SignalModelEstimator(const SignalModelEstimator&) = delete;
+  SignalModelEstimator& operator=(const SignalModelEstimator&) = delete;
+
+  // Compute signal normalization during the initial startup phase.
+  void AdjustNormalization(int32_t num_analyzed_frames, float signal_energy);
+
+  void Update(
+      rtc::ArrayView<const float, kFftSizeBy2Plus1> prior_snr,
+      rtc::ArrayView<const float, kFftSizeBy2Plus1> post_snr,
+      rtc::ArrayView<const float, kFftSizeBy2Plus1> conservative_noise_spectrum,
+      rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum,
+      float signal_spectral_sum,
+      float signal_energy);
+
+  const PriorSignalModel& get_prior_model() const {
+    return prior_model_estimator_.get_prior_model();
+  }
+  const SignalModel& get_model() { return features_; }
+
+ private:
+  float diff_normalization_ = 0.f;
+  float signal_energy_sum_ = 0.f;
+  Histograms histograms_;
+  int histogram_analysis_counter_ = 500;
+  PriorSignalModelEstimator prior_model_estimator_;
+  SignalModel features_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_SIGNAL_MODEL_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/signal_model.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_SIGNAL_MODEL_H_
+#define MODULES_AUDIO_PROCESSING_NS_SIGNAL_MODEL_H_
+
+#include <array>
+
+#include "modules/audio_processing/ns/ns_common.h"
+
+namespace webrtc {
+
+struct SignalModel {
+  SignalModel();
+  SignalModel(const SignalModel&) = delete;
+  SignalModel& operator=(const SignalModel&) = delete;
+
+  float lrt;
+  float spectral_diff;
+  float spectral_flatness;
+  // Log LRT factor with time-smoothing.
+  std::array<float, kFftSizeBy2Plus1> avg_log_lrt;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_SIGNAL_MODEL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/speech_probability_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/speech_probability_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/speech_probability_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/speech_probability_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,103 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/speech_probability_estimator.h"
+
+#include <math.h>
+#include <algorithm>
+
+#include "modules/audio_processing/ns/fast_math.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+SpeechProbabilityEstimator::SpeechProbabilityEstimator() {
+  speech_probability_.fill(0.f);
+}
+
+void SpeechProbabilityEstimator::Update(
+    int32_t num_analyzed_frames,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> prior_snr,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> post_snr,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> conservative_noise_spectrum,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum,
+    float signal_spectral_sum,
+    float signal_energy) {
+  // Update models.
+  if (num_analyzed_frames < kLongStartupPhaseBlocks) {
+    signal_model_estimator_.AdjustNormalization(num_analyzed_frames,
+                                                signal_energy);
+  }
+  signal_model_estimator_.Update(prior_snr, post_snr,
+                                 conservative_noise_spectrum, signal_spectrum,
+                                 signal_spectral_sum, signal_energy);
+
+  const SignalModel& model = signal_model_estimator_.get_model();
+  const PriorSignalModel& prior_model =
+      signal_model_estimator_.get_prior_model();
+
+  // Width parameter in sigmoid map for prior model.
+  constexpr float kWidthPrior0 = 4.f;
+  // Width for pause region: lower range, so increase width in tanh map.
+  constexpr float kWidthPrior1 = 2.f * kWidthPrior0;
+
+  // Average LRT feature: use larger width in tanh map for pause regions.
+  float width_prior = model.lrt < prior_model.lrt ? kWidthPrior1 : kWidthPrior0;
+
+  // Compute indicator function: sigmoid map.
+  float indicator0 =
+      0.5f * (tanh(width_prior * (model.lrt - prior_model.lrt)) + 1.f);
+
+  // Spectral flatness feature: use larger width in tanh map for pause regions.
+  width_prior = model.spectral_flatness > prior_model.flatness_threshold
+                    ? kWidthPrior1
+                    : kWidthPrior0;
+
+  // Compute indicator function: sigmoid map.
+  float indicator1 =
+      0.5f * (tanh(1.f * width_prior *
+                   (prior_model.flatness_threshold - model.spectral_flatness)) +
+              1.f);
+
+  // For template spectrum-difference : use larger width in tanh map for pause
+  // regions.
+  width_prior = model.spectral_diff < prior_model.template_diff_threshold
+                    ? kWidthPrior1
+                    : kWidthPrior0;
+
+  // Compute indicator function: sigmoid map.
+  float indicator2 =
+      0.5f * (tanh(width_prior * (model.spectral_diff -
+                                  prior_model.template_diff_threshold)) +
+              1.f);
+
+  // Combine the indicator function with the feature weights.
+  float ind_prior = prior_model.lrt_weighting * indicator0 +
+                    prior_model.flatness_weighting * indicator1 +
+                    prior_model.difference_weighting * indicator2;
+
+  // Compute the prior probability.
+  prior_speech_prob_ += 0.1f * (ind_prior - prior_speech_prob_);
+
+  // Make sure probabilities are within range: keep floor to 0.01.
+  prior_speech_prob_ = std::max(std::min(prior_speech_prob_, 1.f), 0.01f);
+
+  // Final speech probability: combine prior model with LR factor:.
+  float gain_prior =
+      (1.f - prior_speech_prob_) / (prior_speech_prob_ + 0.0001f);
+
+  std::array<float, kFftSizeBy2Plus1> inv_lrt;
+  ExpApproximationSignFlip(model.avg_log_lrt, inv_lrt);
+  for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+    speech_probability_[i] = 1.f / (1.f + gain_prior * inv_lrt[i]);
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/speech_probability_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/speech_probability_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/speech_probability_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/speech_probability_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_SPEECH_PROBABILITY_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_NS_SPEECH_PROBABILITY_ESTIMATOR_H_
+
+#include <array>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/ns/ns_common.h"
+#include "modules/audio_processing/ns/signal_model_estimator.h"
+
+namespace webrtc {
+
+// Class for estimating the probability of speech.
+class SpeechProbabilityEstimator {
+ public:
+  SpeechProbabilityEstimator();
+  SpeechProbabilityEstimator(const SpeechProbabilityEstimator&) = delete;
+  SpeechProbabilityEstimator& operator=(const SpeechProbabilityEstimator&) =
+      delete;
+
+  // Compute speech probability.
+  void Update(
+      int32_t num_analyzed_frames,
+      rtc::ArrayView<const float, kFftSizeBy2Plus1> prior_snr,
+      rtc::ArrayView<const float, kFftSizeBy2Plus1> post_snr,
+      rtc::ArrayView<const float, kFftSizeBy2Plus1> conservative_noise_spectrum,
+      rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum,
+      float signal_spectral_sum,
+      float signal_energy);
+
+  float get_prior_probability() const { return prior_speech_prob_; }
+  rtc::ArrayView<const float> get_probability() { return speech_probability_; }
+
+ private:
+  SignalModelEstimator signal_model_estimator_;
+  float prior_speech_prob_ = .5f;
+  std::array<float, kFftSizeBy2Plus1> speech_probability_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_SPEECH_PROBABILITY_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/suppression_params.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/suppression_params.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/suppression_params.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/suppression_params.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/suppression_params.h"
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+SuppressionParams::SuppressionParams(
+    NsConfig::SuppressionLevel suppression_level) {
+  switch (suppression_level) {
+    case NsConfig::SuppressionLevel::k6dB:
+      over_subtraction_factor = 1.f;
+      // 6 dB attenuation.
+      minimum_attenuating_gain = 0.5f;
+      use_attenuation_adjustment = false;
+      break;
+    case NsConfig::SuppressionLevel::k12dB:
+      over_subtraction_factor = 1.f;
+      // 12 dB attenuation.
+      minimum_attenuating_gain = 0.25f;
+      use_attenuation_adjustment = true;
+      break;
+    case NsConfig::SuppressionLevel::k18dB:
+      over_subtraction_factor = 1.1f;
+      // 18 dB attenuation.
+      minimum_attenuating_gain = 0.125f;
+      use_attenuation_adjustment = true;
+      break;
+    case NsConfig::SuppressionLevel::k21dB:
+      over_subtraction_factor = 1.25f;
+      // 20.9 dB attenuation.
+      minimum_attenuating_gain = 0.09f;
+      use_attenuation_adjustment = true;
+      break;
+    default:
+      RTC_NOTREACHED();
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/suppression_params.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/suppression_params.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/suppression_params.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/suppression_params.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_SUPPRESSION_PARAMS_H_
+#define MODULES_AUDIO_PROCESSING_NS_SUPPRESSION_PARAMS_H_
+
+#include "modules/audio_processing/ns/ns_config.h"
+
+namespace webrtc {
+
+struct SuppressionParams {
+  explicit SuppressionParams(NsConfig::SuppressionLevel suppression_level);
+  SuppressionParams(const SuppressionParams&) = delete;
+  SuppressionParams& operator=(const SuppressionParams&) = delete;
+
+  float over_subtraction_factor;
+  float minimum_attenuating_gain;
+  bool use_attenuation_adjustment;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_SUPPRESSION_PARAMS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/wiener_filter.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/wiener_filter.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/wiener_filter.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/wiener_filter.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,120 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/ns/wiener_filter.h"
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+
+#include "modules/audio_processing/ns/fast_math.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+WienerFilter::WienerFilter(const SuppressionParams& suppression_params)
+    : suppression_params_(suppression_params) {
+  filter_.fill(1.f);
+  initial_spectral_estimate_.fill(0.f);
+  spectrum_prev_process_.fill(0.f);
+}
+
+void WienerFilter::Update(
+    int32_t num_analyzed_frames,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> noise_spectrum,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> prev_noise_spectrum,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> parametric_noise_spectrum,
+    rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum) {
+  for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+    // Previous estimate based on previous frame with gain filter.
+    float prev_tsa = spectrum_prev_process_[i] /
+                     (prev_noise_spectrum[i] + 0.0001f) * filter_[i];
+
+    // Current estimate.
+    float current_tsa;
+    if (signal_spectrum[i] > noise_spectrum[i]) {
+      current_tsa = signal_spectrum[i] / (noise_spectrum[i] + 0.0001f) - 1.f;
+    } else {
+      current_tsa = 0.f;
+    }
+
+    // Directed decision estimate is sum of two terms: current estimate and
+    // previous estimate.
+    float snr_prior = 0.98f * prev_tsa + (1.f - 0.98f) * current_tsa;
+    filter_[i] =
+        snr_prior / (suppression_params_.over_subtraction_factor + snr_prior);
+    filter_[i] = std::max(std::min(filter_[i], 1.f),
+                          suppression_params_.minimum_attenuating_gain);
+  }
+
+  if (num_analyzed_frames < kShortStartupPhaseBlocks) {
+    for (size_t i = 0; i < kFftSizeBy2Plus1; ++i) {
+      initial_spectral_estimate_[i] += signal_spectrum[i];
+      float filter_initial = initial_spectral_estimate_[i] -
+                             suppression_params_.over_subtraction_factor *
+                                 parametric_noise_spectrum[i];
+      filter_initial /= initial_spectral_estimate_[i] + 0.0001f;
+
+      filter_initial = std::max(std::min(filter_initial, 1.f),
+                                suppression_params_.minimum_attenuating_gain);
+
+      // Weight the two suppression filters.
+      constexpr float kOnyByShortStartupPhaseBlocks =
+          1.f / kShortStartupPhaseBlocks;
+      filter_initial *= kShortStartupPhaseBlocks - num_analyzed_frames;
+      filter_[i] *= num_analyzed_frames;
+      filter_[i] += filter_initial;
+      filter_[i] *= kOnyByShortStartupPhaseBlocks;
+    }
+  }
+
+  std::copy(signal_spectrum.begin(), signal_spectrum.end(),
+            spectrum_prev_process_.begin());
+}
+
+float WienerFilter::ComputeOverallScalingFactor(
+    int32_t num_analyzed_frames,
+    float prior_speech_probability,
+    float energy_before_filtering,
+    float energy_after_filtering) const {
+  if (!suppression_params_.use_attenuation_adjustment ||
+      num_analyzed_frames <= kLongStartupPhaseBlocks) {
+    return 1.f;
+  }
+
+  float gain = SqrtFastApproximation(energy_after_filtering /
+                                     (energy_before_filtering + 1.f));
+
+  // Scaling for new version. Threshold in final energy gain factor calculation.
+  constexpr float kBLim = 0.5f;
+  float scale_factor1 = 1.f;
+  if (gain > kBLim) {
+    scale_factor1 = 1.f + 1.3f * (gain - kBLim);
+    if (gain * scale_factor1 > 1.f) {
+      scale_factor1 = 1.f / gain;
+    }
+  }
+
+  float scale_factor2 = 1.f;
+  if (gain < kBLim) {
+    // Do not reduce scale too much for pause regions: attenuation here should
+    // be controlled by flooring.
+    gain = std::max(gain, suppression_params_.minimum_attenuating_gain);
+    scale_factor2 = 1.f - 0.3f * (kBLim - gain);
+  }
+
+  // Combine both scales with speech/noise prob: note prior
+  // (prior_speech_probability) is not frequency dependent.
+  return prior_speech_probability * scale_factor1 +
+         (1.f - prior_speech_probability) * scale_factor2;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/wiener_filter.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/wiener_filter.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/wiener_filter.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/ns/wiener_filter.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_NS_WIENER_FILTER_H_
+#define MODULES_AUDIO_PROCESSING_NS_WIENER_FILTER_H_
+
+#include <array>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/ns/ns_common.h"
+#include "modules/audio_processing/ns/suppression_params.h"
+
+namespace webrtc {
+
+// Estimates a Wiener-filter based frequency domain noise reduction filter.
+class WienerFilter {
+ public:
+  explicit WienerFilter(const SuppressionParams& suppression_params);
+  WienerFilter(const WienerFilter&) = delete;
+  WienerFilter& operator=(const WienerFilter&) = delete;
+
+  // Updates the filter estimate.
+  void Update(
+      int32_t num_analyzed_frames,
+      rtc::ArrayView<const float, kFftSizeBy2Plus1> noise_spectrum,
+      rtc::ArrayView<const float, kFftSizeBy2Plus1> prev_noise_spectrum,
+      rtc::ArrayView<const float, kFftSizeBy2Plus1> parametric_noise_spectrum,
+      rtc::ArrayView<const float, kFftSizeBy2Plus1> signal_spectrum);
+
+  // Compute an overall gain scaling factor.
+  float ComputeOverallScalingFactor(int32_t num_analyzed_frames,
+                                    float prior_speech_probability,
+                                    float energy_before_filtering,
+                                    float energy_after_filtering) const;
+
+  // Returns the filter.
+  rtc::ArrayView<const float, kFftSizeBy2Plus1> get_filter() const {
+    return filter_;
+  }
+
+ private:
+  const SuppressionParams& suppression_params_;
+  std::array<float, kFftSizeBy2Plus1> spectrum_prev_process_;
+  std::array<float, kFftSizeBy2Plus1> initial_spectral_estimate_;
+  std::array<float, kFftSizeBy2Plus1> filter_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_NS_WIENER_FILTER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/residual_echo_detector.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/residual_echo_detector.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/residual_echo_detector.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/residual_echo_detector.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,215 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/residual_echo_detector.h"
+
+#include <algorithm>
+#include <numeric>
+
+#include "absl/types/optional.h"
+#include "modules/audio_processing/audio_buffer.h"
+#include "modules/audio_processing/logging/apm_data_dumper.h"
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/metrics.h"
+
+namespace {
+
+float Power(rtc::ArrayView<const float> input) {
+  if (input.empty()) {
+    return 0.f;
+  }
+  return std::inner_product(input.begin(), input.end(), input.begin(), 0.f) /
+         input.size();
+}
+
+constexpr size_t kLookbackFrames = 650;
+// TODO(ivoc): Verify the size of this buffer.
+constexpr size_t kRenderBufferSize = 30;
+constexpr float kAlpha = 0.001f;
+// 10 seconds of data, updated every 10 ms.
+constexpr size_t kAggregationBufferSize = 10 * 100;
+
+}  // namespace
+
+namespace webrtc {
+
+int ResidualEchoDetector::instance_count_ = 0;
+
+ResidualEchoDetector::ResidualEchoDetector()
+    : data_dumper_(
+          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
+      render_buffer_(kRenderBufferSize),
+      render_power_(kLookbackFrames),
+      render_power_mean_(kLookbackFrames),
+      render_power_std_dev_(kLookbackFrames),
+      covariances_(kLookbackFrames),
+      recent_likelihood_max_(kAggregationBufferSize) {}
+
+ResidualEchoDetector::~ResidualEchoDetector() = default;
+
+void ResidualEchoDetector::AnalyzeRenderAudio(
+    rtc::ArrayView<const float> render_audio) {
+  // Dump debug data assuming 48 kHz sample rate (if this assumption is not
+  // valid the dumped audio will need to be converted offline accordingly).
+  data_dumper_->DumpWav("ed_render", render_audio.size(), render_audio.data(),
+                        48000, 1);
+
+  if (render_buffer_.Size() == 0) {
+    frames_since_zero_buffer_size_ = 0;
+  } else if (frames_since_zero_buffer_size_ >= kRenderBufferSize) {
+    // This can happen in a few cases: at the start of a call, due to a glitch
+    // or due to clock drift. The excess capture value will be ignored.
+    // TODO(ivoc): Include how often this happens in APM stats.
+    render_buffer_.Pop();
+    frames_since_zero_buffer_size_ = 0;
+  }
+  ++frames_since_zero_buffer_size_;
+  float power = Power(render_audio);
+  render_buffer_.Push(power);
+}
+
+void ResidualEchoDetector::AnalyzeCaptureAudio(
+    rtc::ArrayView<const float> capture_audio) {
+  // Dump debug data assuming 48 kHz sample rate (if this assumption is not
+  // valid the dumped audio will need to be converted offline accordingly).
+  data_dumper_->DumpWav("ed_capture", capture_audio.size(),
+                        capture_audio.data(), 48000, 1);
+
+  if (first_process_call_) {
+    // On the first process call (so the start of a call), we must flush the
+    // render buffer, otherwise the render data will be delayed.
+    render_buffer_.Clear();
+    first_process_call_ = false;
+  }
+
+  // Get the next render value.
+  const absl::optional<float> buffered_render_power = render_buffer_.Pop();
+  if (!buffered_render_power) {
+    // This can happen in a few cases: at the start of a call, due to a glitch
+    // or due to clock drift. The excess capture value will be ignored.
+    // TODO(ivoc): Include how often this happens in APM stats.
+    return;
+  }
+  // Update the render statistics, and store the statistics in circular buffers.
+  render_statistics_.Update(*buffered_render_power);
+  RTC_DCHECK_LT(next_insertion_index_, kLookbackFrames);
+  render_power_[next_insertion_index_] = *buffered_render_power;
+  render_power_mean_[next_insertion_index_] = render_statistics_.mean();
+  render_power_std_dev_[next_insertion_index_] =
+      render_statistics_.std_deviation();
+
+  // Get the next capture value, update capture statistics and add the relevant
+  // values to the buffers.
+  const float capture_power = Power(capture_audio);
+  capture_statistics_.Update(capture_power);
+  const float capture_mean = capture_statistics_.mean();
+  const float capture_std_deviation = capture_statistics_.std_deviation();
+
+  // Update the covariance values and determine the new echo likelihood.
+  echo_likelihood_ = 0.f;
+  size_t read_index = next_insertion_index_;
+
+  int best_delay = -1;
+  for (size_t delay = 0; delay < covariances_.size(); ++delay) {
+    RTC_DCHECK_LT(read_index, render_power_.size());
+    covariances_[delay].Update(capture_power, capture_mean,
+                               capture_std_deviation, render_power_[read_index],
+                               render_power_mean_[read_index],
+                               render_power_std_dev_[read_index]);
+    read_index = read_index > 0 ? read_index - 1 : kLookbackFrames - 1;
+
+    if (covariances_[delay].normalized_cross_correlation() > echo_likelihood_) {
+      echo_likelihood_ = covariances_[delay].normalized_cross_correlation();
+      best_delay = static_cast<int>(delay);
+    }
+  }
+  // This is a temporary log message to help find the underlying cause for echo
+  // likelihoods > 1.0.
+  // TODO(ivoc): Remove once the issue is resolved.
+  if (echo_likelihood_ > 1.1f) {
+    // Make sure we don't spam the log.
+    if (log_counter_ < 5 && best_delay != -1) {
+      size_t read_index = kLookbackFrames + next_insertion_index_ - best_delay;
+      if (read_index >= kLookbackFrames) {
+        read_index -= kLookbackFrames;
+      }
+      RTC_DCHECK_LT(read_index, render_power_.size());
+      RTC_LOG_F(LS_ERROR) << "Echo detector internal state: {"
+                             "Echo likelihood: "
+                          << echo_likelihood_ << ", Best Delay: " << best_delay
+                          << ", Covariance: "
+                          << covariances_[best_delay].covariance()
+                          << ", Last capture power: " << capture_power
+                          << ", Capture mean: " << capture_mean
+                          << ", Capture_standard deviation: "
+                          << capture_std_deviation << ", Last render power: "
+                          << render_power_[read_index]
+                          << ", Render mean: " << render_power_mean_[read_index]
+                          << ", Render standard deviation: "
+                          << render_power_std_dev_[read_index]
+                          << ", Reliability: " << reliability_ << "}";
+      log_counter_++;
+    }
+  }
+  RTC_DCHECK_LT(echo_likelihood_, 1.1f);
+
+  reliability_ = (1.0f - kAlpha) * reliability_ + kAlpha * 1.0f;
+  echo_likelihood_ *= reliability_;
+  // This is a temporary fix to prevent echo likelihood values > 1.0.
+  // TODO(ivoc): Find the root cause of this issue and fix it.
+  echo_likelihood_ = std::min(echo_likelihood_, 1.0f);
+  int echo_percentage = static_cast<int>(echo_likelihood_ * 100);
+  RTC_HISTOGRAM_COUNTS("WebRTC.Audio.ResidualEchoDetector.EchoLikelihood",
+                       echo_percentage, 0, 100, 100 /* number of bins */);
+
+  // Update the buffer of recent likelihood values.
+  recent_likelihood_max_.Update(echo_likelihood_);
+
+  // Update the next insertion index.
+  next_insertion_index_ = next_insertion_index_ < (kLookbackFrames - 1)
+                              ? next_insertion_index_ + 1
+                              : 0;
+}
+
+void ResidualEchoDetector::Initialize(int /*capture_sample_rate_hz*/,
+                                      int /*num_capture_channels*/,
+                                      int /*render_sample_rate_hz*/,
+                                      int /*num_render_channels*/) {
+  render_buffer_.Clear();
+  std::fill(render_power_.begin(), render_power_.end(), 0.f);
+  std::fill(render_power_mean_.begin(), render_power_mean_.end(), 0.f);
+  std::fill(render_power_std_dev_.begin(), render_power_std_dev_.end(), 0.f);
+  render_statistics_.Clear();
+  capture_statistics_.Clear();
+  recent_likelihood_max_.Clear();
+  for (auto& cov : covariances_) {
+    cov.Clear();
+  }
+  echo_likelihood_ = 0.f;
+  next_insertion_index_ = 0;
+  reliability_ = 0.f;
+}
+
+void EchoDetector::PackRenderAudioBuffer(AudioBuffer* audio,
+                                         std::vector<float>* packed_buffer) {
+  packed_buffer->clear();
+  packed_buffer->insert(packed_buffer->end(), audio->channels()[0],
+                        audio->channels()[0] + audio->num_frames());
+}
+
+EchoDetector::Metrics ResidualEchoDetector::GetMetrics() const {
+  EchoDetector::Metrics metrics;
+  metrics.echo_likelihood = echo_likelihood_;
+  metrics.echo_likelihood_recent_max = recent_likelihood_max_.max();
+  return metrics;
+}
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/residual_echo_detector.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/residual_echo_detector.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/residual_echo_detector.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/residual_echo_detector.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_RESIDUAL_ECHO_DETECTOR_H_
+#define MODULES_AUDIO_PROCESSING_RESIDUAL_ECHO_DETECTOR_H_
+
+#include <vector>
+
+#include "api/array_view.h"
+#include "modules/audio_processing/echo_detector/circular_buffer.h"
+#include "modules/audio_processing/echo_detector/mean_variance_estimator.h"
+#include "modules/audio_processing/echo_detector/moving_max.h"
+#include "modules/audio_processing/echo_detector/normalized_covariance_estimator.h"
+#include "modules/audio_processing/include/audio_processing.h"
+
+namespace webrtc {
+
+class ApmDataDumper;
+class AudioBuffer;
+
+class ResidualEchoDetector : public EchoDetector {
+ public:
+  ResidualEchoDetector();
+  ~ResidualEchoDetector() override;
+
+  // This function should be called while holding the render lock.
+  void AnalyzeRenderAudio(rtc::ArrayView<const float> render_audio) override;
+
+  // This function should be called while holding the capture lock.
+  void AnalyzeCaptureAudio(rtc::ArrayView<const float> capture_audio) override;
+
+  // This function should be called while holding the capture lock.
+  void Initialize(int capture_sample_rate_hz,
+                  int num_capture_channels,
+                  int render_sample_rate_hz,
+                  int num_render_channels) override;
+
+  // This function is for testing purposes only.
+  void SetReliabilityForTest(float value) { reliability_ = value; }
+
+  // This function should be called while holding the capture lock.
+  EchoDetector::Metrics GetMetrics() const override;
+
+ private:
+  static int instance_count_;
+  std::unique_ptr<ApmDataDumper> data_dumper_;
+  // Keep track if the |Process| function has been previously called.
+  bool first_process_call_ = true;
+  // Buffer for storing the power of incoming farend buffers. This is needed for
+  // cases where calls to BufferFarend and Process are jittery.
+  CircularBuffer render_buffer_;
+  // Count how long ago it was that the size of |render_buffer_| was zero. This
+  // value is also reset to zero when clock drift is detected and a value from
+  // the renderbuffer is discarded, even though the buffer is not actually zero
+  // at that point. This is done to avoid repeatedly removing elements in this
+  // situation.
+  size_t frames_since_zero_buffer_size_ = 0;
+
+  // Circular buffers containing delayed versions of the power, mean and
+  // standard deviation, for calculating the delayed covariance values.
+  std::vector<float> render_power_;
+  std::vector<float> render_power_mean_;
+  std::vector<float> render_power_std_dev_;
+  // Covariance estimates for different delay values.
+  std::vector<NormalizedCovarianceEstimator> covariances_;
+  // Index where next element should be inserted in all of the above circular
+  // buffers.
+  size_t next_insertion_index_ = 0;
+
+  MeanVarianceEstimator render_statistics_;
+  MeanVarianceEstimator capture_statistics_;
+  // Current echo likelihood.
+  float echo_likelihood_ = 0.f;
+  // Reliability of the current likelihood.
+  float reliability_ = 0.f;
+  MovingMax recent_likelihood_max_;
+
+  int log_counter_ = 0;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_RESIDUAL_ECHO_DETECTOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/splitting_filter.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/splitting_filter.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/splitting_filter.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/splitting_filter.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,144 @@
+/*
+ *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/splitting_filter.h"
+
+#include <array>
+
+#include "api/array_view.h"
+#include "common_audio/channel_buffer.h"
+#include "common_audio/signal_processing/include/signal_processing_library.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+constexpr size_t kSamplesPerBand = 160;
+constexpr size_t kTwoBandFilterSamplesPerFrame = 320;
+
+}  // namespace
+
+SplittingFilter::SplittingFilter(size_t num_channels,
+                                 size_t num_bands,
+                                 size_t num_frames)
+    : num_bands_(num_bands),
+      two_bands_states_(num_bands_ == 2 ? num_channels : 0),
+      three_band_filter_banks_(num_bands_ == 3 ? num_channels : 0) {
+  RTC_CHECK(num_bands_ == 2 || num_bands_ == 3);
+}
+
+SplittingFilter::~SplittingFilter() = default;
+
+void SplittingFilter::Analysis(const ChannelBuffer<float>* data,
+                               ChannelBuffer<float>* bands) {
+  RTC_DCHECK_EQ(num_bands_, bands->num_bands());
+  RTC_DCHECK_EQ(data->num_channels(), bands->num_channels());
+  RTC_DCHECK_EQ(data->num_frames(),
+                bands->num_frames_per_band() * bands->num_bands());
+  if (bands->num_bands() == 2) {
+    TwoBandsAnalysis(data, bands);
+  } else if (bands->num_bands() == 3) {
+    ThreeBandsAnalysis(data, bands);
+  }
+}
+
+void SplittingFilter::Synthesis(const ChannelBuffer<float>* bands,
+                                ChannelBuffer<float>* data) {
+  RTC_DCHECK_EQ(num_bands_, bands->num_bands());
+  RTC_DCHECK_EQ(data->num_channels(), bands->num_channels());
+  RTC_DCHECK_EQ(data->num_frames(),
+                bands->num_frames_per_band() * bands->num_bands());
+  if (bands->num_bands() == 2) {
+    TwoBandsSynthesis(bands, data);
+  } else if (bands->num_bands() == 3) {
+    ThreeBandsSynthesis(bands, data);
+  }
+}
+
+void SplittingFilter::TwoBandsAnalysis(const ChannelBuffer<float>* data,
+                                       ChannelBuffer<float>* bands) {
+  RTC_DCHECK_EQ(two_bands_states_.size(), data->num_channels());
+  RTC_DCHECK_EQ(data->num_frames(), kTwoBandFilterSamplesPerFrame);
+
+  for (size_t i = 0; i < two_bands_states_.size(); ++i) {
+    std::array<std::array<int16_t, kSamplesPerBand>, 2> bands16;
+    std::array<int16_t, kTwoBandFilterSamplesPerFrame> full_band16;
+    FloatS16ToS16(data->channels(0)[i], full_band16.size(), full_band16.data());
+    WebRtcSpl_AnalysisQMF(full_band16.data(), data->num_frames(),
+                          bands16[0].data(), bands16[1].data(),
+                          two_bands_states_[i].analysis_state1,
+                          two_bands_states_[i].analysis_state2);
+    S16ToFloatS16(bands16[0].data(), bands16[0].size(), bands->channels(0)[i]);
+    S16ToFloatS16(bands16[1].data(), bands16[1].size(), bands->channels(1)[i]);
+  }
+}
+
+void SplittingFilter::TwoBandsSynthesis(const ChannelBuffer<float>* bands,
+                                        ChannelBuffer<float>* data) {
+  RTC_DCHECK_LE(data->num_channels(), two_bands_states_.size());
+  RTC_DCHECK_EQ(data->num_frames(), kTwoBandFilterSamplesPerFrame);
+  for (size_t i = 0; i < data->num_channels(); ++i) {
+    std::array<std::array<int16_t, kSamplesPerBand>, 2> bands16;
+    std::array<int16_t, kTwoBandFilterSamplesPerFrame> full_band16;
+    FloatS16ToS16(bands->channels(0)[i], bands16[0].size(), bands16[0].data());
+    FloatS16ToS16(bands->channels(1)[i], bands16[1].size(), bands16[1].data());
+    WebRtcSpl_SynthesisQMF(bands16[0].data(), bands16[1].data(),
+                           bands->num_frames_per_band(), full_band16.data(),
+                           two_bands_states_[i].synthesis_state1,
+                           two_bands_states_[i].synthesis_state2);
+    S16ToFloatS16(full_band16.data(), full_band16.size(), data->channels(0)[i]);
+  }
+}
+
+void SplittingFilter::ThreeBandsAnalysis(const ChannelBuffer<float>* data,
+                                         ChannelBuffer<float>* bands) {
+  RTC_DCHECK_EQ(three_band_filter_banks_.size(), data->num_channels());
+  RTC_DCHECK_LE(data->num_channels(), three_band_filter_banks_.size());
+  RTC_DCHECK_LE(data->num_channels(), bands->num_channels());
+  RTC_DCHECK_EQ(data->num_frames(), ThreeBandFilterBank::kFullBandSize);
+  RTC_DCHECK_EQ(bands->num_frames(), ThreeBandFilterBank::kFullBandSize);
+  RTC_DCHECK_EQ(bands->num_bands(), ThreeBandFilterBank::kNumBands);
+  RTC_DCHECK_EQ(bands->num_frames_per_band(),
+                ThreeBandFilterBank::kSplitBandSize);
+
+  for (size_t i = 0; i < three_band_filter_banks_.size(); ++i) {
+    three_band_filter_banks_[i].Analysis(
+        rtc::ArrayView<const float, ThreeBandFilterBank::kFullBandSize>(
+            data->channels_view()[i].data(),
+            ThreeBandFilterBank::kFullBandSize),
+        rtc::ArrayView<const rtc::ArrayView<float>,
+                       ThreeBandFilterBank::kNumBands>(
+            bands->bands_view(i).data(), ThreeBandFilterBank::kNumBands));
+  }
+}
+
+void SplittingFilter::ThreeBandsSynthesis(const ChannelBuffer<float>* bands,
+                                          ChannelBuffer<float>* data) {
+  RTC_DCHECK_LE(data->num_channels(), three_band_filter_banks_.size());
+  RTC_DCHECK_LE(data->num_channels(), bands->num_channels());
+  RTC_DCHECK_LE(data->num_channels(), three_band_filter_banks_.size());
+  RTC_DCHECK_EQ(data->num_frames(), ThreeBandFilterBank::kFullBandSize);
+  RTC_DCHECK_EQ(bands->num_frames(), ThreeBandFilterBank::kFullBandSize);
+  RTC_DCHECK_EQ(bands->num_bands(), ThreeBandFilterBank::kNumBands);
+  RTC_DCHECK_EQ(bands->num_frames_per_band(),
+                ThreeBandFilterBank::kSplitBandSize);
+
+  for (size_t i = 0; i < data->num_channels(); ++i) {
+    three_band_filter_banks_[i].Synthesis(
+        rtc::ArrayView<const rtc::ArrayView<float>,
+                       ThreeBandFilterBank::kNumBands>(
+            bands->bands_view(i).data(), ThreeBandFilterBank::kNumBands),
+        rtc::ArrayView<float, ThreeBandFilterBank::kFullBandSize>(
+            data->channels_view()[i].data(),
+            ThreeBandFilterBank::kFullBandSize));
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/splitting_filter.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/splitting_filter.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/splitting_filter.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/splitting_filter.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,72 @@
+/*
+ *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_SPLITTING_FILTER_H_
+#define MODULES_AUDIO_PROCESSING_SPLITTING_FILTER_H_
+
+#include <cstring>
+#include <memory>
+#include <vector>
+
+#include "common_audio/channel_buffer.h"
+#include "modules/audio_processing/three_band_filter_bank.h"
+
+namespace webrtc {
+
+struct TwoBandsStates {
+  TwoBandsStates() {
+    memset(analysis_state1, 0, sizeof(analysis_state1));
+    memset(analysis_state2, 0, sizeof(analysis_state2));
+    memset(synthesis_state1, 0, sizeof(synthesis_state1));
+    memset(synthesis_state2, 0, sizeof(synthesis_state2));
+  }
+
+  static const int kStateSize = 6;
+  int analysis_state1[kStateSize];
+  int analysis_state2[kStateSize];
+  int synthesis_state1[kStateSize];
+  int synthesis_state2[kStateSize];
+};
+
+// Splitting filter which is able to split into and merge from 2 or 3 frequency
+// bands. The number of channels needs to be provided at construction time.
+//
+// For each block, Analysis() is called to split into bands and then Synthesis()
+// to merge these bands again. The input and output signals are contained in
+// ChannelBuffers and for the different bands an array of ChannelBuffers is
+// used.
+class SplittingFilter {
+ public:
+  SplittingFilter(size_t num_channels, size_t num_bands, size_t num_frames);
+  ~SplittingFilter();
+
+  void Analysis(const ChannelBuffer<float>* data, ChannelBuffer<float>* bands);
+  void Synthesis(const ChannelBuffer<float>* bands, ChannelBuffer<float>* data);
+
+ private:
+  // Two-band analysis and synthesis work for 640 samples or less.
+  void TwoBandsAnalysis(const ChannelBuffer<float>* data,
+                        ChannelBuffer<float>* bands);
+  void TwoBandsSynthesis(const ChannelBuffer<float>* bands,
+                         ChannelBuffer<float>* data);
+  void ThreeBandsAnalysis(const ChannelBuffer<float>* data,
+                          ChannelBuffer<float>* bands);
+  void ThreeBandsSynthesis(const ChannelBuffer<float>* bands,
+                           ChannelBuffer<float>* data);
+  void InitBuffers();
+
+  const size_t num_bands_;
+  std::vector<TwoBandsStates> two_bands_states_;
+  std::vector<ThreeBandFilterBank> three_band_filter_banks_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_SPLITTING_FILTER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/three_band_filter_bank.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/three_band_filter_bank.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/three_band_filter_bank.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/three_band_filter_bank.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,276 @@
+/*
+ *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// An implementation of a 3-band FIR filter-bank with DCT modulation, similar to
+// the proposed in "Multirate Signal Processing for Communication Systems" by
+// Fredric J Harris.
+//
+// The idea is to take a heterodyne system and change the order of the
+// components to get something which is efficient to implement digitally.
+//
+// It is possible to separate the filter using the noble identity as follows:
+//
+// H(z) = H0(z^3) + z^-1 * H1(z^3) + z^-2 * H2(z^3)
+//
+// This is used in the analysis stage to first downsample serial to parallel
+// and then filter each branch with one of these polyphase decompositions of the
+// lowpass prototype. Because each filter is only a modulation of the prototype,
+// it is enough to multiply each coefficient by the respective cosine value to
+// shift it to the desired band. But because the cosine period is 12 samples,
+// it requires separating the prototype even further using the noble identity.
+// After filtering and modulating for each band, the output of all filters is
+// accumulated to get the downsampled bands.
+//
+// A similar logic can be applied to the synthesis stage.
+
+#include "modules/audio_processing/three_band_filter_bank.h"
+
+#include <array>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+namespace {
+
+// Factors to take into account when choosing |kFilterSize|:
+//   1. Higher |kFilterSize|, means faster transition, which ensures less
+//      aliasing. This is especially important when there is non-linear
+//      processing between the splitting and merging.
+//   2. The delay that this filter bank introduces is
+//      |kNumBands| * |kSparsity| * |kFilterSize| / 2, so it increases linearly
+//      with |kFilterSize|.
+//   3. The computation complexity also increases linearly with |kFilterSize|.
+
+// The Matlab code to generate these |kFilterCoeffs| is:
+//
+// N = kNumBands * kSparsity * kFilterSize - 1;
+// h = fir1(N, 1 / (2 * kNumBands), kaiser(N + 1, 3.5));
+// reshape(h, kNumBands * kSparsity, kFilterSize);
+//
+// The code below uses the values of kFilterSize, kNumBands and kSparsity
+// specified in the header.
+
+// Because the total bandwidth of the lower and higher band is double the middle
+// one (because of the spectrum parity), the low-pass prototype is half the
+// bandwidth of 1 / (2 * |kNumBands|) and is then shifted with cosine modulation
+// to the right places.
+// A Kaiser window is used because of its flexibility and the alpha is set to
+// 3.5, since that sets a stop band attenuation of 40dB ensuring a fast
+// transition.
+
+constexpr int kSubSampling = ThreeBandFilterBank::kNumBands;
+constexpr int kDctSize = ThreeBandFilterBank::kNumBands;
+static_assert(ThreeBandFilterBank::kNumBands *
+                      ThreeBandFilterBank::kSplitBandSize ==
+                  ThreeBandFilterBank::kFullBandSize,
+              "The full band must be split in equally sized subbands");
+
+const float
+    kFilterCoeffs[ThreeBandFilterBank::kNumNonZeroFilters][kFilterSize] = {
+        {-0.00047749f, -0.00496888f, +0.16547118f, +0.00425496f},
+        {-0.00173287f, -0.01585778f, +0.14989004f, +0.00994113f},
+        {-0.00304815f, -0.02536082f, +0.12154542f, +0.01157993f},
+        {-0.00346946f, -0.02587886f, +0.04760441f, +0.00607594f},
+        {-0.00154717f, -0.01136076f, +0.01387458f, +0.00186353f},
+        {+0.00186353f, +0.01387458f, -0.01136076f, -0.00154717f},
+        {+0.00607594f, +0.04760441f, -0.02587886f, -0.00346946f},
+        {+0.00983212f, +0.08543175f, -0.02982767f, -0.00383509f},
+        {+0.00994113f, +0.14989004f, -0.01585778f, -0.00173287f},
+        {+0.00425496f, +0.16547118f, -0.00496888f, -0.00047749f}};
+
+constexpr int kZeroFilterIndex1 = 3;
+constexpr int kZeroFilterIndex2 = 9;
+
+const float kDctModulation[ThreeBandFilterBank::kNumNonZeroFilters][kDctSize] =
+    {{2.f, 2.f, 2.f},
+     {1.73205077f, 0.f, -1.73205077f},
+     {1.f, -2.f, 1.f},
+     {-1.f, 2.f, -1.f},
+     {-1.73205077f, 0.f, 1.73205077f},
+     {-2.f, -2.f, -2.f},
+     {-1.73205077f, 0.f, 1.73205077f},
+     {-1.f, 2.f, -1.f},
+     {1.f, -2.f, 1.f},
+     {1.73205077f, 0.f, -1.73205077f}};
+
+// Filters the input signal |in| with the filter |filter| using a shift by
+// |in_shift|, taking into account the previous state.
+void FilterCore(
+    rtc::ArrayView<const float, kFilterSize> filter,
+    rtc::ArrayView<const float, ThreeBandFilterBank::kSplitBandSize> in,
+    const int in_shift,
+    rtc::ArrayView<float, ThreeBandFilterBank::kSplitBandSize> out,
+    rtc::ArrayView<float, kMemorySize> state) {
+  constexpr int kMaxInShift = (kStride - 1);
+  RTC_DCHECK_GE(in_shift, 0);
+  RTC_DCHECK_LE(in_shift, kMaxInShift);
+  std::fill(out.begin(), out.end(), 0.f);
+
+  for (int k = 0; k < in_shift; ++k) {
+    for (int i = 0, j = kMemorySize + k - in_shift; i < kFilterSize;
+         ++i, j -= kStride) {
+      out[k] += state[j] * filter[i];
+    }
+  }
+
+  for (int k = in_shift, shift = 0; k < kFilterSize * kStride; ++k, ++shift) {
+    RTC_DCHECK_GE(shift, 0);
+    const int loop_limit = std::min(kFilterSize, 1 + (shift >> kStrideLog2));
+    for (int i = 0, j = shift; i < loop_limit; ++i, j -= kStride) {
+      out[k] += in[j] * filter[i];
+    }
+    for (int i = loop_limit, j = kMemorySize + shift - loop_limit * kStride;
+         i < kFilterSize; ++i, j -= kStride) {
+      out[k] += state[j] * filter[i];
+    }
+  }
+
+  for (int k = kFilterSize * kStride, shift = kFilterSize * kStride - in_shift;
+       k < ThreeBandFilterBank::kSplitBandSize; ++k, ++shift) {
+    for (int i = 0, j = shift; i < kFilterSize; ++i, j -= kStride) {
+      out[k] += in[j] * filter[i];
+    }
+  }
+
+  // Update current state.
+  std::copy(in.begin() + ThreeBandFilterBank::kSplitBandSize - kMemorySize,
+            in.end(), state.begin());
+}
+
+}  // namespace
+
+// Because the low-pass filter prototype has half bandwidth it is possible to
+// use a DCT to shift it in both directions at the same time, to the center
+// frequencies [1 / 12, 3 / 12, 5 / 12].
+ThreeBandFilterBank::ThreeBandFilterBank() {
+  RTC_DCHECK_EQ(state_analysis_.size(), kNumNonZeroFilters);
+  RTC_DCHECK_EQ(state_synthesis_.size(), kNumNonZeroFilters);
+  for (int k = 0; k < kNumNonZeroFilters; ++k) {
+    RTC_DCHECK_EQ(state_analysis_[k].size(), kMemorySize);
+    RTC_DCHECK_EQ(state_synthesis_[k].size(), kMemorySize);
+
+    state_analysis_[k].fill(0.f);
+    state_synthesis_[k].fill(0.f);
+  }
+}
+
+ThreeBandFilterBank::~ThreeBandFilterBank() = default;
+
+// The analysis can be separated in these steps:
+//   1. Serial to parallel downsampling by a factor of |kNumBands|.
+//   2. Filtering of |kSparsity| different delayed signals with polyphase
+//      decomposition of the low-pass prototype filter and upsampled by a factor
+//      of |kSparsity|.
+//   3. Modulating with cosines and accumulating to get the desired band.
+void ThreeBandFilterBank::Analysis(
+    rtc::ArrayView<const float, kFullBandSize> in,
+    rtc::ArrayView<const rtc::ArrayView<float>, ThreeBandFilterBank::kNumBands>
+        out) {
+  // Initialize the output to zero.
+  for (int band = 0; band < ThreeBandFilterBank::kNumBands; ++band) {
+    RTC_DCHECK_EQ(out[band].size(), kSplitBandSize);
+    std::fill(out[band].begin(), out[band].end(), 0);
+  }
+
+  for (int downsampling_index = 0; downsampling_index < kSubSampling;
+       ++downsampling_index) {
+    // Downsample to form the filter input.
+    std::array<float, kSplitBandSize> in_subsampled;
+    for (int k = 0; k < kSplitBandSize; ++k) {
+      in_subsampled[k] =
+          in[(kSubSampling - 1) - downsampling_index + kSubSampling * k];
+    }
+
+    for (int in_shift = 0; in_shift < kStride; ++in_shift) {
+      // Choose filter, skip zero filters.
+      const int index = downsampling_index + in_shift * kSubSampling;
+      if (index == kZeroFilterIndex1 || index == kZeroFilterIndex2) {
+        continue;
+      }
+      const int filter_index =
+          index < kZeroFilterIndex1
+              ? index
+              : (index < kZeroFilterIndex2 ? index - 1 : index - 2);
+
+      rtc::ArrayView<const float, kFilterSize> filter(
+          kFilterCoeffs[filter_index]);
+      rtc::ArrayView<const float, kDctSize> dct_modulation(
+          kDctModulation[filter_index]);
+      rtc::ArrayView<float, kMemorySize> state(state_analysis_[filter_index]);
+
+      // Filter.
+      std::array<float, kSplitBandSize> out_subsampled;
+      FilterCore(filter, in_subsampled, in_shift, out_subsampled, state);
+
+      // Band and modulate the output.
+      for (int band = 0; band < ThreeBandFilterBank::kNumBands; ++band) {
+        for (int n = 0; n < kSplitBandSize; ++n) {
+          out[band][n] += dct_modulation[band] * out_subsampled[n];
+        }
+      }
+    }
+  }
+}
+
+// The synthesis can be separated in these steps:
+//   1. Modulating with cosines.
+//   2. Filtering each one with a polyphase decomposition of the low-pass
+//      prototype filter upsampled by a factor of |kSparsity| and accumulating
+//      |kSparsity| signals with different delays.
+//   3. Parallel to serial upsampling by a factor of |kNumBands|.
+void ThreeBandFilterBank::Synthesis(
+    rtc::ArrayView<const rtc::ArrayView<float>, ThreeBandFilterBank::kNumBands>
+        in,
+    rtc::ArrayView<float, kFullBandSize> out) {
+  std::fill(out.begin(), out.end(), 0);
+  for (int upsampling_index = 0; upsampling_index < kSubSampling;
+       ++upsampling_index) {
+    for (int in_shift = 0; in_shift < kStride; ++in_shift) {
+      // Choose filter, skip zero filters.
+      const int index = upsampling_index + in_shift * kSubSampling;
+      if (index == kZeroFilterIndex1 || index == kZeroFilterIndex2) {
+        continue;
+      }
+      const int filter_index =
+          index < kZeroFilterIndex1
+              ? index
+              : (index < kZeroFilterIndex2 ? index - 1 : index - 2);
+
+      rtc::ArrayView<const float, kFilterSize> filter(
+          kFilterCoeffs[filter_index]);
+      rtc::ArrayView<const float, kDctSize> dct_modulation(
+          kDctModulation[filter_index]);
+      rtc::ArrayView<float, kMemorySize> state(state_synthesis_[filter_index]);
+
+      // Prepare filter input by modulating the banded input.
+      std::array<float, kSplitBandSize> in_subsampled;
+      std::fill(in_subsampled.begin(), in_subsampled.end(), 0.f);
+      for (int band = 0; band < ThreeBandFilterBank::kNumBands; ++band) {
+        RTC_DCHECK_EQ(in[band].size(), kSplitBandSize);
+        for (int n = 0; n < kSplitBandSize; ++n) {
+          in_subsampled[n] += dct_modulation[band] * in[band][n];
+        }
+      }
+
+      // Filter.
+      std::array<float, kSplitBandSize> out_subsampled;
+      FilterCore(filter, in_subsampled, in_shift, out_subsampled, state);
+
+      // Upsample.
+      constexpr float kUpsamplingScaling = kSubSampling;
+      for (int k = 0; k < kSplitBandSize; ++k) {
+        out[upsampling_index + kSubSampling * k] +=
+            kUpsamplingScaling * out_subsampled[k];
+      }
+    }
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/three_band_filter_bank.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/three_band_filter_bank.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/three_band_filter_bank.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/three_band_filter_bank.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+ *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_THREE_BAND_FILTER_BANK_H_
+#define MODULES_AUDIO_PROCESSING_THREE_BAND_FILTER_BANK_H_
+
+#include <array>
+#include <cstring>
+#include <memory>
+#include <vector>
+
+#include "api/array_view.h"
+
+namespace webrtc {
+
+constexpr int kSparsity = 4;
+constexpr int kStrideLog2 = 2;
+constexpr int kStride = 1 << kStrideLog2;
+constexpr int kNumZeroFilters = 2;
+constexpr int kFilterSize = 4;
+constexpr int kMemorySize = kFilterSize * kStride - 1;
+static_assert(kMemorySize == 15,
+              "The memory size must be sufficient to provide memory for the "
+              "shifted filters");
+
+// An implementation of a 3-band FIR filter-bank with DCT modulation, similar to
+// the proposed in "Multirate Signal Processing for Communication Systems" by
+// Fredric J Harris.
+// The low-pass filter prototype has these characteristics:
+// * Pass-band ripple = 0.3dB
+// * Pass-band frequency = 0.147 (7kHz at 48kHz)
+// * Stop-band attenuation = 40dB
+// * Stop-band frequency = 0.192 (9.2kHz at 48kHz)
+// * Delay = 24 samples (500us at 48kHz)
+// * Linear phase
+// This filter bank does not satisfy perfect reconstruction. The SNR after
+// analysis and synthesis (with no processing in between) is approximately 9.5dB
+// depending on the input signal after compensating for the delay.
+class ThreeBandFilterBank final {
+ public:
+  static const int kNumBands = 3;
+  static const int kFullBandSize = 480;
+  static const int kSplitBandSize =
+      ThreeBandFilterBank::kFullBandSize / ThreeBandFilterBank::kNumBands;
+  static const int kNumNonZeroFilters =
+      kSparsity * ThreeBandFilterBank::kNumBands - kNumZeroFilters;
+
+  ThreeBandFilterBank();
+  ~ThreeBandFilterBank();
+
+  // Splits |in| of size kFullBandSize into 3 downsampled frequency bands in
+  // |out|, each of size 160.
+  void Analysis(rtc::ArrayView<const float, kFullBandSize> in,
+                rtc::ArrayView<const rtc::ArrayView<float>, kNumBands> out);
+
+  // Merges the 3 downsampled frequency bands in |in|, each of size 160, into
+  // |out|, which is of size kFullBandSize.
+  void Synthesis(rtc::ArrayView<const rtc::ArrayView<float>, kNumBands> in,
+                 rtc::ArrayView<float, kFullBandSize> out);
+
+ private:
+  std::array<std::array<float, kMemorySize>, kNumNonZeroFilters>
+      state_analysis_;
+  std::array<std::array<float, kMemorySize>, kNumNonZeroFilters>
+      state_synthesis_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_THREE_BAND_FILTER_BANK_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/BUILD.gn asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/BUILD.gn
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/BUILD.gn	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/BUILD.gn	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,81 @@
+# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+import("../../../webrtc.gni")
+
+rtc_library("cascaded_biquad_filter") {
+  sources = [
+    "cascaded_biquad_filter.cc",
+    "cascaded_biquad_filter.h",
+  ]
+  deps = [
+    "../../../api:array_view",
+    "../../../rtc_base:checks",
+  ]
+}
+
+rtc_library("legacy_delay_estimator") {
+  sources = [
+    "delay_estimator.cc",
+    "delay_estimator.h",
+    "delay_estimator_internal.h",
+    "delay_estimator_wrapper.cc",
+    "delay_estimator_wrapper.h",
+  ]
+  deps = [ "../../../rtc_base:checks" ]
+}
+
+rtc_library("pffft_wrapper") {
+  visibility = [ "../*" ]
+  sources = [
+    "pffft_wrapper.cc",
+    "pffft_wrapper.h",
+  ]
+  deps = [
+    "../../../api:array_view",
+    "../../../rtc_base:checks",
+    "//third_party/pffft",
+  ]
+}
+
+if (rtc_include_tests) {
+  rtc_library("cascaded_biquad_filter_unittest") {
+    testonly = true
+
+    sources = [ "cascaded_biquad_filter_unittest.cc" ]
+    deps = [
+      ":cascaded_biquad_filter",
+      "../../../rtc_base:rtc_base_approved",
+      "../../../test:test_support",
+      "//testing/gtest",
+    ]
+  }
+
+  rtc_library("legacy_delay_estimator_unittest") {
+    testonly = true
+
+    sources = [ "delay_estimator_unittest.cc" ]
+    deps = [
+      ":legacy_delay_estimator",
+      "../../../rtc_base:rtc_base_approved",
+      "../../../test:test_support",
+      "//testing/gtest",
+    ]
+  }
+
+  rtc_library("pffft_wrapper_unittest") {
+    testonly = true
+    sources = [ "pffft_wrapper_unittest.cc" ]
+    deps = [
+      ":pffft_wrapper",
+      "../../../test:test_support",
+      "//testing/gtest",
+      "//third_party/pffft",
+    ]
+  }
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,117 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "modules/audio_processing/utility/cascaded_biquad_filter.h"
+
+#include <algorithm>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+CascadedBiQuadFilter::BiQuadParam::BiQuadParam(std::complex<float> zero,
+                                               std::complex<float> pole,
+                                               float gain,
+                                               bool mirror_zero_along_i_axis)
+    : zero(zero),
+      pole(pole),
+      gain(gain),
+      mirror_zero_along_i_axis(mirror_zero_along_i_axis) {}
+
+CascadedBiQuadFilter::BiQuadParam::BiQuadParam(const BiQuadParam&) = default;
+
+CascadedBiQuadFilter::BiQuad::BiQuad(
+    const CascadedBiQuadFilter::BiQuadParam& param)
+    : x(), y() {
+  float z_r = std::real(param.zero);
+  float z_i = std::imag(param.zero);
+  float p_r = std::real(param.pole);
+  float p_i = std::imag(param.pole);
+  float gain = param.gain;
+
+  if (param.mirror_zero_along_i_axis) {
+    // Assuming zeroes at z_r and -z_r.
+    RTC_DCHECK(z_i == 0.f);
+    coefficients.b[0] = gain * 1.f;
+    coefficients.b[1] = 0.f;
+    coefficients.b[2] = gain * -(z_r * z_r);
+  } else {
+    // Assuming zeros at (z_r + z_i*i) and (z_r - z_i*i).
+    coefficients.b[0] = gain * 1.f;
+    coefficients.b[1] = gain * -2.f * z_r;
+    coefficients.b[2] = gain * (z_r * z_r + z_i * z_i);
+  }
+
+  // Assuming poles at (p_r + p_i*i) and (p_r - p_i*i).
+  coefficients.a[0] = -2.f * p_r;
+  coefficients.a[1] = p_r * p_r + p_i * p_i;
+}
+
+void CascadedBiQuadFilter::BiQuad::BiQuad::Reset() {
+  x[0] = x[1] = y[0] = y[1] = 0.f;
+}
+
+CascadedBiQuadFilter::CascadedBiQuadFilter(
+    const CascadedBiQuadFilter::BiQuadCoefficients& coefficients,
+    size_t num_biquads)
+    : biquads_(num_biquads, BiQuad(coefficients)) {}
+
+CascadedBiQuadFilter::CascadedBiQuadFilter(
+    const std::vector<CascadedBiQuadFilter::BiQuadParam>& biquad_params) {
+  for (const auto& param : biquad_params) {
+    biquads_.push_back(BiQuad(param));
+  }
+}
+
+CascadedBiQuadFilter::~CascadedBiQuadFilter() = default;
+
+void CascadedBiQuadFilter::Process(rtc::ArrayView<const float> x,
+                                   rtc::ArrayView<float> y) {
+  if (biquads_.size() > 0) {
+    ApplyBiQuad(x, y, &biquads_[0]);
+    for (size_t k = 1; k < biquads_.size(); ++k) {
+      ApplyBiQuad(y, y, &biquads_[k]);
+    }
+  } else {
+    std::copy(x.begin(), x.end(), y.begin());
+  }
+}
+
+void CascadedBiQuadFilter::Process(rtc::ArrayView<float> y) {
+  for (auto& biquad : biquads_) {
+    ApplyBiQuad(y, y, &biquad);
+  }
+}
+
+void CascadedBiQuadFilter::Reset() {
+  for (auto& biquad : biquads_) {
+    biquad.Reset();
+  }
+}
+
+void CascadedBiQuadFilter::ApplyBiQuad(rtc::ArrayView<const float> x,
+                                       rtc::ArrayView<float> y,
+                                       CascadedBiQuadFilter::BiQuad* biquad) {
+  RTC_DCHECK_EQ(x.size(), y.size());
+  const auto* c_b = biquad->coefficients.b;
+  const auto* c_a = biquad->coefficients.a;
+  auto* m_x = biquad->x;
+  auto* m_y = biquad->y;
+  for (size_t k = 0; k < x.size(); ++k) {
+    const float tmp = x[k];
+    y[k] = c_b[0] * tmp + c_b[1] * m_x[0] + c_b[2] * m_x[1] - c_a[0] * m_y[0] -
+           c_a[1] * m_y[1];
+    m_x[1] = m_x[0];
+    m_x[0] = tmp;
+    m_y[1] = m_y[0];
+    m_y[0] = y[k];
+  }
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_UTILITY_CASCADED_BIQUAD_FILTER_H_
+#define MODULES_AUDIO_PROCESSING_UTILITY_CASCADED_BIQUAD_FILTER_H_
+
+#include <stddef.h>
+
+#include <complex>
+#include <vector>
+
+#include "api/array_view.h"
+
+namespace webrtc {
+
+// Applies a number of biquads in a cascaded manner. The filter implementation
+// is direct form 1.
+class CascadedBiQuadFilter {
+ public:
+  struct BiQuadParam {
+    BiQuadParam(std::complex<float> zero,
+                std::complex<float> pole,
+                float gain,
+                bool mirror_zero_along_i_axis = false);
+    explicit BiQuadParam(const BiQuadParam&);
+    std::complex<float> zero;
+    std::complex<float> pole;
+    float gain;
+    bool mirror_zero_along_i_axis;
+  };
+
+  struct BiQuadCoefficients {
+    float b[3];
+    float a[2];
+  };
+
+  struct BiQuad {
+    explicit BiQuad(const BiQuadCoefficients& coefficients)
+        : coefficients(coefficients), x(), y() {}
+    explicit BiQuad(const CascadedBiQuadFilter::BiQuadParam& param);
+    void Reset();
+    BiQuadCoefficients coefficients;
+    float x[2];
+    float y[2];
+  };
+
+  CascadedBiQuadFilter(
+      const CascadedBiQuadFilter::BiQuadCoefficients& coefficients,
+      size_t num_biquads);
+  explicit CascadedBiQuadFilter(
+      const std::vector<CascadedBiQuadFilter::BiQuadParam>& biquad_params);
+  ~CascadedBiQuadFilter();
+  CascadedBiQuadFilter(const CascadedBiQuadFilter&) = delete;
+  CascadedBiQuadFilter& operator=(const CascadedBiQuadFilter&) = delete;
+
+  // Applies the biquads on the values in x in order to form the output in y.
+  void Process(rtc::ArrayView<const float> x, rtc::ArrayView<float> y);
+  // Applies the biquads on the values in y in an in-place manner.
+  void Process(rtc::ArrayView<float> y);
+  // Resets the filter to its initial state.
+  void Reset();
+
+ private:
+  void ApplyBiQuad(rtc::ArrayView<const float> x,
+                   rtc::ArrayView<float> y,
+                   CascadedBiQuadFilter::BiQuad* biquad);
+
+  std::vector<BiQuad> biquads_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_UTILITY_CASCADED_BIQUAD_FILTER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/cascaded_biquad_filter_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,157 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/utility/cascaded_biquad_filter.h"
+
+#include <vector>
+
+#include "test/gtest.h"
+
+namespace webrtc {
+
+namespace {
+
+// Coefficients for a second order Butterworth high-pass filter with cutoff
+// frequency 100 Hz.
+const CascadedBiQuadFilter::BiQuadCoefficients kHighPassFilterCoefficients = {
+    {0.97261f, -1.94523f, 0.97261f},
+    {-1.94448f, 0.94598f}};
+
+const CascadedBiQuadFilter::BiQuadCoefficients kTransparentCoefficients = {
+    {1.f, 0.f, 0.f},
+    {0.f, 0.f}};
+
+const CascadedBiQuadFilter::BiQuadCoefficients kBlockingCoefficients = {
+    {0.f, 0.f, 0.f},
+    {0.f, 0.f}};
+
+std::vector<float> CreateInputWithIncreasingValues(size_t vector_length) {
+  std::vector<float> v(vector_length);
+  for (size_t k = 0; k < v.size(); ++k) {
+    v[k] = k;
+  }
+  return v;
+}
+
+}  // namespace
+
+// Verifies that the filter applies an effect which removes the input signal.
+// The test also verifies that the in-place Process API call works as intended.
+TEST(CascadedBiquadFilter, BlockingConfiguration) {
+  std::vector<float> values = CreateInputWithIncreasingValues(1000);
+
+  CascadedBiQuadFilter filter(kBlockingCoefficients, 1);
+  filter.Process(values);
+
+  EXPECT_EQ(std::vector<float>(1000, 0.f), values);
+}
+
+// Verifies that the filter is able to form a zero-mean output from a
+// non-zeromean input signal when coefficients for a high-pass filter are
+// applied. The test also verifies that the filter works with multiple biquads.
+TEST(CascadedBiquadFilter, HighPassConfiguration) {
+  std::vector<float> values(1000);
+  for (size_t k = 0; k < values.size(); ++k) {
+    values[k] = 1.f;
+  }
+
+  CascadedBiQuadFilter filter(kHighPassFilterCoefficients, 2);
+  filter.Process(values);
+
+  for (size_t k = values.size() / 2; k < values.size(); ++k) {
+    EXPECT_NEAR(0.f, values[k], 1e-4);
+  }
+}
+
+// Verifies that the reset functionality works as intended.
+TEST(CascadedBiquadFilter, HighPassConfigurationResetFunctionality) {
+  CascadedBiQuadFilter filter(kHighPassFilterCoefficients, 2);
+
+  std::vector<float> values1(100, 1.f);
+  filter.Process(values1);
+
+  filter.Reset();
+
+  std::vector<float> values2(100, 1.f);
+  filter.Process(values2);
+
+  for (size_t k = 0; k < values1.size(); ++k) {
+    EXPECT_EQ(values1[k], values2[k]);
+  }
+}
+
+// Verifies that the filter is able to produce a transparent effect with no
+// impact on the data when the proper coefficients are applied. The test also
+// verifies that the non-in-place Process API call works as intended.
+TEST(CascadedBiquadFilter, TransparentConfiguration) {
+  const std::vector<float> input = CreateInputWithIncreasingValues(1000);
+  std::vector<float> output(input.size());
+
+  CascadedBiQuadFilter filter(kTransparentCoefficients, 1);
+  filter.Process(input, output);
+
+  EXPECT_EQ(input, output);
+}
+
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+// Verifies that the check of the lengths for the input and output works for the
+// non-in-place call.
+TEST(CascadedBiquadFilterDeathTest, InputSizeCheckVerification) {
+  const std::vector<float> input = CreateInputWithIncreasingValues(10);
+  std::vector<float> output(input.size() - 1);
+
+  CascadedBiQuadFilter filter(kTransparentCoefficients, 1);
+  EXPECT_DEATH(filter.Process(input, output), "");
+}
+#endif
+
+// Verifies the conversion from zero, pole, gain to filter coefficients for
+// lowpass filter.
+TEST(CascadedBiquadFilter, BiQuadParamLowPass) {
+  CascadedBiQuadFilter::BiQuadParam param(
+      {-1.0f, 0.0f}, {0.23146901f, 0.39514232f}, 0.1866943331163784f);
+  CascadedBiQuadFilter::BiQuad filter(param);
+  const float epsilon = 1e-6f;
+  EXPECT_NEAR(filter.coefficients.b[0], 0.18669433f, epsilon);
+  EXPECT_NEAR(filter.coefficients.b[1], 0.37338867f, epsilon);
+  EXPECT_NEAR(filter.coefficients.b[2], 0.18669433f, epsilon);
+  EXPECT_NEAR(filter.coefficients.a[0], -0.46293803f, epsilon);
+  EXPECT_NEAR(filter.coefficients.a[1], 0.20971536f, epsilon);
+}
+
+// Verifies the conversion from zero, pole, gain to filter coefficients for
+// highpass filter.
+TEST(CascadedBiquadFilter, BiQuadParamHighPass) {
+  CascadedBiQuadFilter::BiQuadParam param(
+      {1.0f, 0.0f}, {0.72712179f, 0.21296904f}, 0.75707637533388494f);
+  CascadedBiQuadFilter::BiQuad filter(param);
+  const float epsilon = 1e-6f;
+  EXPECT_NEAR(filter.coefficients.b[0], 0.75707638f, epsilon);
+  EXPECT_NEAR(filter.coefficients.b[1], -1.51415275f, epsilon);
+  EXPECT_NEAR(filter.coefficients.b[2], 0.75707638f, epsilon);
+  EXPECT_NEAR(filter.coefficients.a[0], -1.45424359f, epsilon);
+  EXPECT_NEAR(filter.coefficients.a[1], 0.57406192f, epsilon);
+}
+
+// Verifies the conversion from zero, pole, gain to filter coefficients for
+// bandpass filter.
+TEST(CascadedBiquadFilter, BiQuadParamBandPass) {
+  CascadedBiQuadFilter::BiQuadParam param(
+      {1.0f, 0.0f}, {1.11022302e-16f, 0.71381051f}, 0.2452372752527856f, true);
+  CascadedBiQuadFilter::BiQuad filter(param);
+  const float epsilon = 1e-6f;
+  EXPECT_NEAR(filter.coefficients.b[0], 0.24523728f, epsilon);
+  EXPECT_NEAR(filter.coefficients.b[1], 0.f, epsilon);
+  EXPECT_NEAR(filter.coefficients.b[2], -0.24523728f, epsilon);
+  EXPECT_NEAR(filter.coefficients.a[0], -2.22044605e-16f, epsilon);
+  EXPECT_NEAR(filter.coefficients.a[1], 5.09525449e-01f, epsilon);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,708 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/utility/delay_estimator.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <algorithm>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace {
+
+// Number of right shifts for scaling is linearly depending on number of bits in
+// the far-end binary spectrum.
+static const int kShiftsAtZero = 13;  // Right shifts at zero binary spectrum.
+static const int kShiftsLinearSlope = 3;
+
+static const int32_t kProbabilityOffset = 1024;      // 2 in Q9.
+static const int32_t kProbabilityLowerLimit = 8704;  // 17 in Q9.
+static const int32_t kProbabilityMinSpread = 2816;   // 5.5 in Q9.
+
+// Robust validation settings
+static const float kHistogramMax = 3000.f;
+static const float kLastHistogramMax = 250.f;
+static const float kMinHistogramThreshold = 1.5f;
+static const int kMinRequiredHits = 10;
+static const int kMaxHitsWhenPossiblyNonCausal = 10;
+static const int kMaxHitsWhenPossiblyCausal = 1000;
+static const float kQ14Scaling = 1.f / (1 << 14);  // Scaling by 2^14 to get Q0.
+static const float kFractionSlope = 0.05f;
+static const float kMinFractionWhenPossiblyCausal = 0.5f;
+static const float kMinFractionWhenPossiblyNonCausal = 0.25f;
+
+}  // namespace
+
+// Counts and returns number of bits of a 32-bit word.
+static int BitCount(uint32_t u32) {
+  uint32_t tmp =
+      u32 - ((u32 >> 1) & 033333333333) - ((u32 >> 2) & 011111111111);
+  tmp = ((tmp + (tmp >> 3)) & 030707070707);
+  tmp = (tmp + (tmp >> 6));
+  tmp = (tmp + (tmp >> 12) + (tmp >> 24)) & 077;
+
+  return ((int)tmp);
+}
+
+// Compares the |binary_vector| with all rows of the |binary_matrix| and counts
+// per row the number of times they have the same value.
+//
+// Inputs:
+//      - binary_vector     : binary "vector" stored in a long
+//      - binary_matrix     : binary "matrix" stored as a vector of long
+//      - matrix_size       : size of binary "matrix"
+//
+// Output:
+//      - bit_counts        : "Vector" stored as a long, containing for each
+//                            row the number of times the matrix row and the
+//                            input vector have the same value
+//
+static void BitCountComparison(uint32_t binary_vector,
+                               const uint32_t* binary_matrix,
+                               int matrix_size,
+                               int32_t* bit_counts) {
+  int n = 0;
+
+  // Compare |binary_vector| with all rows of the |binary_matrix|
+  for (; n < matrix_size; n++) {
+    bit_counts[n] = (int32_t)BitCount(binary_vector ^ binary_matrix[n]);
+  }
+}
+
+// Collects necessary statistics for the HistogramBasedValidation().  This
+// function has to be called prior to calling HistogramBasedValidation().  The
+// statistics updated and used by the HistogramBasedValidation() are:
+//  1. the number of |candidate_hits|, which states for how long we have had the
+//     same |candidate_delay|
+//  2. the |histogram| of candidate delays over time.  This histogram is
+//     weighted with respect to a reliability measure and time-varying to cope
+//     with possible delay shifts.
+// For further description see commented code.
+//
+// Inputs:
+//  - candidate_delay   : The delay to validate.
+//  - valley_depth_q14  : The cost function has a valley/minimum at the
+//                        |candidate_delay| location.  |valley_depth_q14| is the
+//                        cost function difference between the minimum and
+//                        maximum locations.  The value is in the Q14 domain.
+//  - valley_level_q14  : Is the cost function value at the minimum, in Q14.
+static void UpdateRobustValidationStatistics(BinaryDelayEstimator* self,
+                                             int candidate_delay,
+                                             int32_t valley_depth_q14,
+                                             int32_t valley_level_q14) {
+  const float valley_depth = valley_depth_q14 * kQ14Scaling;
+  float decrease_in_last_set = valley_depth;
+  const int max_hits_for_slow_change = (candidate_delay < self->last_delay)
+                                           ? kMaxHitsWhenPossiblyNonCausal
+                                           : kMaxHitsWhenPossiblyCausal;
+  int i = 0;
+
+  RTC_DCHECK_EQ(self->history_size, self->farend->history_size);
+  // Reset |candidate_hits| if we have a new candidate.
+  if (candidate_delay != self->last_candidate_delay) {
+    self->candidate_hits = 0;
+    self->last_candidate_delay = candidate_delay;
+  }
+  self->candidate_hits++;
+
+  // The |histogram| is updated differently across the bins.
+  // 1. The |candidate_delay| histogram bin is increased with the
+  //    |valley_depth|, which is a simple measure of how reliable the
+  //    |candidate_delay| is.  The histogram is not increased above
+  //    |kHistogramMax|.
+  self->histogram[candidate_delay] += valley_depth;
+  if (self->histogram[candidate_delay] > kHistogramMax) {
+    self->histogram[candidate_delay] = kHistogramMax;
+  }
+  // 2. The histogram bins in the neighborhood of |candidate_delay| are
+  //    unaffected.  The neighborhood is defined as x + {-2, -1, 0, 1}.
+  // 3. The histogram bins in the neighborhood of |last_delay| are decreased
+  //    with |decrease_in_last_set|.  This value equals the difference between
+  //    the cost function values at the locations |candidate_delay| and
+  //    |last_delay| until we reach |max_hits_for_slow_change| consecutive hits
+  //    at the |candidate_delay|.  If we exceed this amount of hits the
+  //    |candidate_delay| is a "potential" candidate and we start decreasing
+  //    these histogram bins more rapidly with |valley_depth|.
+  if (self->candidate_hits < max_hits_for_slow_change) {
+    decrease_in_last_set =
+        (self->mean_bit_counts[self->compare_delay] - valley_level_q14) *
+        kQ14Scaling;
+  }
+  // 4. All other bins are decreased with |valley_depth|.
+  // TODO(bjornv): Investigate how to make this loop more efficient.  Split up
+  // the loop?  Remove parts that doesn't add too much.
+  for (i = 0; i < self->history_size; ++i) {
+    int is_in_last_set = (i >= self->last_delay - 2) &&
+                         (i <= self->last_delay + 1) && (i != candidate_delay);
+    int is_in_candidate_set =
+        (i >= candidate_delay - 2) && (i <= candidate_delay + 1);
+    self->histogram[i] -=
+        decrease_in_last_set * is_in_last_set +
+        valley_depth * (!is_in_last_set && !is_in_candidate_set);
+    // 5. No histogram bin can go below 0.
+    if (self->histogram[i] < 0) {
+      self->histogram[i] = 0;
+    }
+  }
+}
+
+// Validates the |candidate_delay|, estimated in WebRtc_ProcessBinarySpectrum(),
+// based on a mix of counting concurring hits with a modified histogram
+// of recent delay estimates.  In brief a candidate is valid (returns 1) if it
+// is the most likely according to the histogram.  There are a couple of
+// exceptions that are worth mentioning:
+//  1. If the |candidate_delay| < |last_delay| it can be that we are in a
+//     non-causal state, breaking a possible echo control algorithm.  Hence, we
+//     open up for a quicker change by allowing the change even if the
+//     |candidate_delay| is not the most likely one according to the histogram.
+//  2. There's a minimum number of hits (kMinRequiredHits) and the histogram
+//     value has to reached a minimum (kMinHistogramThreshold) to be valid.
+//  3. The action is also depending on the filter length used for echo control.
+//     If the delay difference is larger than what the filter can capture, we
+//     also move quicker towards a change.
+// For further description see commented code.
+//
+// Input:
+//  - candidate_delay     : The delay to validate.
+//
+// Return value:
+//  - is_histogram_valid  : 1 - The |candidate_delay| is valid.
+//                          0 - Otherwise.
+static int HistogramBasedValidation(const BinaryDelayEstimator* self,
+                                    int candidate_delay) {
+  float fraction = 1.f;
+  float histogram_threshold = self->histogram[self->compare_delay];
+  const int delay_difference = candidate_delay - self->last_delay;
+  int is_histogram_valid = 0;
+
+  // The histogram based validation of |candidate_delay| is done by comparing
+  // the |histogram| at bin |candidate_delay| with a |histogram_threshold|.
+  // This |histogram_threshold| equals a |fraction| of the |histogram| at bin
+  // |last_delay|.  The |fraction| is a piecewise linear function of the
+  // |delay_difference| between the |candidate_delay| and the |last_delay|
+  // allowing for a quicker move if
+  //  i) a potential echo control filter can not handle these large differences.
+  // ii) keeping |last_delay| instead of updating to |candidate_delay| could
+  //     force an echo control into a non-causal state.
+  // We further require the histogram to have reached a minimum value of
+  // |kMinHistogramThreshold|.  In addition, we also require the number of
+  // |candidate_hits| to be more than |kMinRequiredHits| to remove spurious
+  // values.
+
+  // Calculate a comparison histogram value (|histogram_threshold|) that is
+  // depending on the distance between the |candidate_delay| and |last_delay|.
+  // TODO(bjornv): How much can we gain by turning the fraction calculation
+  // into tables?
+  if (delay_difference > self->allowed_offset) {
+    fraction = 1.f - kFractionSlope * (delay_difference - self->allowed_offset);
+    fraction = (fraction > kMinFractionWhenPossiblyCausal
+                    ? fraction
+                    : kMinFractionWhenPossiblyCausal);
+  } else if (delay_difference < 0) {
+    fraction =
+        kMinFractionWhenPossiblyNonCausal - kFractionSlope * delay_difference;
+    fraction = (fraction > 1.f ? 1.f : fraction);
+  }
+  histogram_threshold *= fraction;
+  histogram_threshold =
+      (histogram_threshold > kMinHistogramThreshold ? histogram_threshold
+                                                    : kMinHistogramThreshold);
+
+  is_histogram_valid =
+      (self->histogram[candidate_delay] >= histogram_threshold) &&
+      (self->candidate_hits > kMinRequiredHits);
+
+  return is_histogram_valid;
+}
+
+// Performs a robust validation of the |candidate_delay| estimated in
+// WebRtc_ProcessBinarySpectrum().  The algorithm takes the
+// |is_instantaneous_valid| and the |is_histogram_valid| and combines them
+// into a robust validation.  The HistogramBasedValidation() has to be called
+// prior to this call.
+// For further description on how the combination is done, see commented code.
+//
+// Inputs:
+//  - candidate_delay         : The delay to validate.
+//  - is_instantaneous_valid  : The instantaneous validation performed in
+//                              WebRtc_ProcessBinarySpectrum().
+//  - is_histogram_valid      : The histogram based validation.
+//
+// Return value:
+//  - is_robust               : 1 - The candidate_delay is valid according to a
+//                                  combination of the two inputs.
+//                            : 0 - Otherwise.
+static int RobustValidation(const BinaryDelayEstimator* self,
+                            int candidate_delay,
+                            int is_instantaneous_valid,
+                            int is_histogram_valid) {
+  int is_robust = 0;
+
+  // The final robust validation is based on the two algorithms; 1) the
+  // |is_instantaneous_valid| and 2) the histogram based with result stored in
+  // |is_histogram_valid|.
+  //   i) Before we actually have a valid estimate (|last_delay| == -2), we say
+  //      a candidate is valid if either algorithm states so
+  //      (|is_instantaneous_valid| OR |is_histogram_valid|).
+  is_robust =
+      (self->last_delay < 0) && (is_instantaneous_valid || is_histogram_valid);
+  //  ii) Otherwise, we need both algorithms to be certain
+  //      (|is_instantaneous_valid| AND |is_histogram_valid|)
+  is_robust |= is_instantaneous_valid && is_histogram_valid;
+  // iii) With one exception, i.e., the histogram based algorithm can overrule
+  //      the instantaneous one if |is_histogram_valid| = 1 and the histogram
+  //      is significantly strong.
+  is_robust |= is_histogram_valid &&
+               (self->histogram[candidate_delay] > self->last_delay_histogram);
+
+  return is_robust;
+}
+
+void WebRtc_FreeBinaryDelayEstimatorFarend(BinaryDelayEstimatorFarend* self) {
+  if (self == NULL) {
+    return;
+  }
+
+  free(self->binary_far_history);
+  self->binary_far_history = NULL;
+
+  free(self->far_bit_counts);
+  self->far_bit_counts = NULL;
+
+  free(self);
+}
+
+BinaryDelayEstimatorFarend* WebRtc_CreateBinaryDelayEstimatorFarend(
+    int history_size) {
+  BinaryDelayEstimatorFarend* self = NULL;
+
+  if (history_size > 1) {
+    // Sanity conditions fulfilled.
+    self = static_cast<BinaryDelayEstimatorFarend*>(
+        malloc(sizeof(BinaryDelayEstimatorFarend)));
+  }
+  if (self == NULL) {
+    return NULL;
+  }
+
+  self->history_size = 0;
+  self->binary_far_history = NULL;
+  self->far_bit_counts = NULL;
+  if (WebRtc_AllocateFarendBufferMemory(self, history_size) == 0) {
+    WebRtc_FreeBinaryDelayEstimatorFarend(self);
+    self = NULL;
+  }
+  return self;
+}
+
+int WebRtc_AllocateFarendBufferMemory(BinaryDelayEstimatorFarend* self,
+                                      int history_size) {
+  RTC_DCHECK(self);
+  // (Re-)Allocate memory for history buffers.
+  self->binary_far_history = static_cast<uint32_t*>(
+      realloc(self->binary_far_history,
+              history_size * sizeof(*self->binary_far_history)));
+  self->far_bit_counts = static_cast<int*>(realloc(
+      self->far_bit_counts, history_size * sizeof(*self->far_bit_counts)));
+  if ((self->binary_far_history == NULL) || (self->far_bit_counts == NULL)) {
+    history_size = 0;
+  }
+  // Fill with zeros if we have expanded the buffers.
+  if (history_size > self->history_size) {
+    int size_diff = history_size - self->history_size;
+    memset(&self->binary_far_history[self->history_size], 0,
+           sizeof(*self->binary_far_history) * size_diff);
+    memset(&self->far_bit_counts[self->history_size], 0,
+           sizeof(*self->far_bit_counts) * size_diff);
+  }
+  self->history_size = history_size;
+
+  return self->history_size;
+}
+
+void WebRtc_InitBinaryDelayEstimatorFarend(BinaryDelayEstimatorFarend* self) {
+  RTC_DCHECK(self);
+  memset(self->binary_far_history, 0, sizeof(uint32_t) * self->history_size);
+  memset(self->far_bit_counts, 0, sizeof(int) * self->history_size);
+}
+
+void WebRtc_SoftResetBinaryDelayEstimatorFarend(
+    BinaryDelayEstimatorFarend* self,
+    int delay_shift) {
+  int abs_shift = abs(delay_shift);
+  int shift_size = 0;
+  int dest_index = 0;
+  int src_index = 0;
+  int padding_index = 0;
+
+  RTC_DCHECK(self);
+  shift_size = self->history_size - abs_shift;
+  RTC_DCHECK_GT(shift_size, 0);
+  if (delay_shift == 0) {
+    return;
+  } else if (delay_shift > 0) {
+    dest_index = abs_shift;
+  } else if (delay_shift < 0) {
+    src_index = abs_shift;
+    padding_index = shift_size;
+  }
+
+  // Shift and zero pad buffers.
+  memmove(&self->binary_far_history[dest_index],
+          &self->binary_far_history[src_index],
+          sizeof(*self->binary_far_history) * shift_size);
+  memset(&self->binary_far_history[padding_index], 0,
+         sizeof(*self->binary_far_history) * abs_shift);
+  memmove(&self->far_bit_counts[dest_index], &self->far_bit_counts[src_index],
+          sizeof(*self->far_bit_counts) * shift_size);
+  memset(&self->far_bit_counts[padding_index], 0,
+         sizeof(*self->far_bit_counts) * abs_shift);
+}
+
+void WebRtc_AddBinaryFarSpectrum(BinaryDelayEstimatorFarend* handle,
+                                 uint32_t binary_far_spectrum) {
+  RTC_DCHECK(handle);
+  // Shift binary spectrum history and insert current |binary_far_spectrum|.
+  memmove(&(handle->binary_far_history[1]), &(handle->binary_far_history[0]),
+          (handle->history_size - 1) * sizeof(uint32_t));
+  handle->binary_far_history[0] = binary_far_spectrum;
+
+  // Shift history of far-end binary spectrum bit counts and insert bit count
+  // of current |binary_far_spectrum|.
+  memmove(&(handle->far_bit_counts[1]), &(handle->far_bit_counts[0]),
+          (handle->history_size - 1) * sizeof(int));
+  handle->far_bit_counts[0] = BitCount(binary_far_spectrum);
+}
+
+void WebRtc_FreeBinaryDelayEstimator(BinaryDelayEstimator* self) {
+  if (self == NULL) {
+    return;
+  }
+
+  free(self->mean_bit_counts);
+  self->mean_bit_counts = NULL;
+
+  free(self->bit_counts);
+  self->bit_counts = NULL;
+
+  free(self->binary_near_history);
+  self->binary_near_history = NULL;
+
+  free(self->histogram);
+  self->histogram = NULL;
+
+  // BinaryDelayEstimator does not have ownership of |farend|, hence we do not
+  // free the memory here. That should be handled separately by the user.
+  self->farend = NULL;
+
+  free(self);
+}
+
+BinaryDelayEstimator* WebRtc_CreateBinaryDelayEstimator(
+    BinaryDelayEstimatorFarend* farend,
+    int max_lookahead) {
+  BinaryDelayEstimator* self = NULL;
+
+  if ((farend != NULL) && (max_lookahead >= 0)) {
+    // Sanity conditions fulfilled.
+    self = static_cast<BinaryDelayEstimator*>(
+        malloc(sizeof(BinaryDelayEstimator)));
+  }
+  if (self == NULL) {
+    return NULL;
+  }
+
+  self->farend = farend;
+  self->near_history_size = max_lookahead + 1;
+  self->history_size = 0;
+  self->robust_validation_enabled = 0;  // Disabled by default.
+  self->allowed_offset = 0;
+
+  self->lookahead = max_lookahead;
+
+  // Allocate memory for spectrum and history buffers.
+  self->mean_bit_counts = NULL;
+  self->bit_counts = NULL;
+  self->histogram = NULL;
+  self->binary_near_history = static_cast<uint32_t*>(
+      malloc((max_lookahead + 1) * sizeof(*self->binary_near_history)));
+  if (self->binary_near_history == NULL ||
+      WebRtc_AllocateHistoryBufferMemory(self, farend->history_size) == 0) {
+    WebRtc_FreeBinaryDelayEstimator(self);
+    self = NULL;
+  }
+
+  return self;
+}
+
+int WebRtc_AllocateHistoryBufferMemory(BinaryDelayEstimator* self,
+                                       int history_size) {
+  BinaryDelayEstimatorFarend* far = self->farend;
+  // (Re-)Allocate memory for spectrum and history buffers.
+  if (history_size != far->history_size) {
+    // Only update far-end buffers if we need.
+    history_size = WebRtc_AllocateFarendBufferMemory(far, history_size);
+  }
+  // The extra array element in |mean_bit_counts| and |histogram| is a dummy
+  // element only used while |last_delay| == -2, i.e., before we have a valid
+  // estimate.
+  self->mean_bit_counts = static_cast<int32_t*>(
+      realloc(self->mean_bit_counts,
+              (history_size + 1) * sizeof(*self->mean_bit_counts)));
+  self->bit_counts = static_cast<int32_t*>(
+      realloc(self->bit_counts, history_size * sizeof(*self->bit_counts)));
+  self->histogram = static_cast<float*>(
+      realloc(self->histogram, (history_size + 1) * sizeof(*self->histogram)));
+
+  if ((self->mean_bit_counts == NULL) || (self->bit_counts == NULL) ||
+      (self->histogram == NULL)) {
+    history_size = 0;
+  }
+  // Fill with zeros if we have expanded the buffers.
+  if (history_size > self->history_size) {
+    int size_diff = history_size - self->history_size;
+    memset(&self->mean_bit_counts[self->history_size], 0,
+           sizeof(*self->mean_bit_counts) * size_diff);
+    memset(&self->bit_counts[self->history_size], 0,
+           sizeof(*self->bit_counts) * size_diff);
+    memset(&self->histogram[self->history_size], 0,
+           sizeof(*self->histogram) * size_diff);
+  }
+  self->history_size = history_size;
+
+  return self->history_size;
+}
+
+void WebRtc_InitBinaryDelayEstimator(BinaryDelayEstimator* self) {
+  int i = 0;
+  RTC_DCHECK(self);
+
+  memset(self->bit_counts, 0, sizeof(int32_t) * self->history_size);
+  memset(self->binary_near_history, 0,
+         sizeof(uint32_t) * self->near_history_size);
+  for (i = 0; i <= self->history_size; ++i) {
+    self->mean_bit_counts[i] = (20 << 9);  // 20 in Q9.
+    self->histogram[i] = 0.f;
+  }
+  self->minimum_probability = kMaxBitCountsQ9;          // 32 in Q9.
+  self->last_delay_probability = (int)kMaxBitCountsQ9;  // 32 in Q9.
+
+  // Default return value if we're unable to estimate. -1 is used for errors.
+  self->last_delay = -2;
+
+  self->last_candidate_delay = -2;
+  self->compare_delay = self->history_size;
+  self->candidate_hits = 0;
+  self->last_delay_histogram = 0.f;
+}
+
+int WebRtc_SoftResetBinaryDelayEstimator(BinaryDelayEstimator* self,
+                                         int delay_shift) {
+  int lookahead = 0;
+  RTC_DCHECK(self);
+  lookahead = self->lookahead;
+  self->lookahead -= delay_shift;
+  if (self->lookahead < 0) {
+    self->lookahead = 0;
+  }
+  if (self->lookahead > self->near_history_size - 1) {
+    self->lookahead = self->near_history_size - 1;
+  }
+  return lookahead - self->lookahead;
+}
+
+int WebRtc_ProcessBinarySpectrum(BinaryDelayEstimator* self,
+                                 uint32_t binary_near_spectrum) {
+  int i = 0;
+  int candidate_delay = -1;
+  int valid_candidate = 0;
+
+  int32_t value_best_candidate = kMaxBitCountsQ9;
+  int32_t value_worst_candidate = 0;
+  int32_t valley_depth = 0;
+
+  RTC_DCHECK(self);
+  if (self->farend->history_size != self->history_size) {
+    // Non matching history sizes.
+    return -1;
+  }
+  if (self->near_history_size > 1) {
+    // If we apply lookahead, shift near-end binary spectrum history. Insert
+    // current |binary_near_spectrum| and pull out the delayed one.
+    memmove(&(self->binary_near_history[1]), &(self->binary_near_history[0]),
+            (self->near_history_size - 1) * sizeof(uint32_t));
+    self->binary_near_history[0] = binary_near_spectrum;
+    binary_near_spectrum = self->binary_near_history[self->lookahead];
+  }
+
+  // Compare with delayed spectra and store the |bit_counts| for each delay.
+  BitCountComparison(binary_near_spectrum, self->farend->binary_far_history,
+                     self->history_size, self->bit_counts);
+
+  // Update |mean_bit_counts|, which is the smoothed version of |bit_counts|.
+  for (i = 0; i < self->history_size; i++) {
+    // |bit_counts| is constrained to [0, 32], meaning we can smooth with a
+    // factor up to 2^26. We use Q9.
+    int32_t bit_count = (self->bit_counts[i] << 9);  // Q9.
+
+    // Update |mean_bit_counts| only when far-end signal has something to
+    // contribute. If |far_bit_counts| is zero the far-end signal is weak and
+    // we likely have a poor echo condition, hence don't update.
+    if (self->farend->far_bit_counts[i] > 0) {
+      // Make number of right shifts piecewise linear w.r.t. |far_bit_counts|.
+      int shifts = kShiftsAtZero;
+      shifts -= (kShiftsLinearSlope * self->farend->far_bit_counts[i]) >> 4;
+      WebRtc_MeanEstimatorFix(bit_count, shifts, &(self->mean_bit_counts[i]));
+    }
+  }
+
+  // Find |candidate_delay|, |value_best_candidate| and |value_worst_candidate|
+  // of |mean_bit_counts|.
+  for (i = 0; i < self->history_size; i++) {
+    if (self->mean_bit_counts[i] < value_best_candidate) {
+      value_best_candidate = self->mean_bit_counts[i];
+      candidate_delay = i;
+    }
+    if (self->mean_bit_counts[i] > value_worst_candidate) {
+      value_worst_candidate = self->mean_bit_counts[i];
+    }
+  }
+  valley_depth = value_worst_candidate - value_best_candidate;
+
+  // The |value_best_candidate| is a good indicator on the probability of
+  // |candidate_delay| being an accurate delay (a small |value_best_candidate|
+  // means a good binary match). In the following sections we make a decision
+  // whether to update |last_delay| or not.
+  // 1) If the difference bit counts between the best and the worst delay
+  //    candidates is too small we consider the situation to be unreliable and
+  //    don't update |last_delay|.
+  // 2) If the situation is reliable we update |last_delay| if the value of the
+  //    best candidate delay has a value less than
+  //     i) an adaptive threshold |minimum_probability|, or
+  //    ii) this corresponding value |last_delay_probability|, but updated at
+  //        this time instant.
+
+  // Update |minimum_probability|.
+  if ((self->minimum_probability > kProbabilityLowerLimit) &&
+      (valley_depth > kProbabilityMinSpread)) {
+    // The "hard" threshold can't be lower than 17 (in Q9).
+    // The valley in the curve also has to be distinct, i.e., the
+    // difference between |value_worst_candidate| and |value_best_candidate| has
+    // to be large enough.
+    int32_t threshold = value_best_candidate + kProbabilityOffset;
+    if (threshold < kProbabilityLowerLimit) {
+      threshold = kProbabilityLowerLimit;
+    }
+    if (self->minimum_probability > threshold) {
+      self->minimum_probability = threshold;
+    }
+  }
+  // Update |last_delay_probability|.
+  // We use a Markov type model, i.e., a slowly increasing level over time.
+  self->last_delay_probability++;
+  // Validate |candidate_delay|.  We have a reliable instantaneous delay
+  // estimate if
+  //  1) The valley is distinct enough (|valley_depth| > |kProbabilityOffset|)
+  // and
+  //  2) The depth of the valley is deep enough
+  //      (|value_best_candidate| < |minimum_probability|)
+  //     and deeper than the best estimate so far
+  //      (|value_best_candidate| < |last_delay_probability|)
+  valid_candidate = ((valley_depth > kProbabilityOffset) &&
+                     ((value_best_candidate < self->minimum_probability) ||
+                      (value_best_candidate < self->last_delay_probability)));
+
+  // Check for nonstationary farend signal.
+  const bool non_stationary_farend =
+      std::any_of(self->farend->far_bit_counts,
+                  self->farend->far_bit_counts + self->history_size,
+                  [](int a) { return a > 0; });
+
+  if (non_stationary_farend) {
+    // Only update the validation statistics when the farend is nonstationary
+    // as the underlying estimates are otherwise frozen.
+    UpdateRobustValidationStatistics(self, candidate_delay, valley_depth,
+                                     value_best_candidate);
+  }
+
+  if (self->robust_validation_enabled) {
+    int is_histogram_valid = HistogramBasedValidation(self, candidate_delay);
+    valid_candidate = RobustValidation(self, candidate_delay, valid_candidate,
+                                       is_histogram_valid);
+  }
+
+  // Only update the delay estimate when the farend is nonstationary and when
+  // a valid delay candidate is available.
+  if (non_stationary_farend && valid_candidate) {
+    if (candidate_delay != self->last_delay) {
+      self->last_delay_histogram =
+          (self->histogram[candidate_delay] > kLastHistogramMax
+               ? kLastHistogramMax
+               : self->histogram[candidate_delay]);
+      // Adjust the histogram if we made a change to |last_delay|, though it was
+      // not the most likely one according to the histogram.
+      if (self->histogram[candidate_delay] <
+          self->histogram[self->compare_delay]) {
+        self->histogram[self->compare_delay] = self->histogram[candidate_delay];
+      }
+    }
+    self->last_delay = candidate_delay;
+    if (value_best_candidate < self->last_delay_probability) {
+      self->last_delay_probability = value_best_candidate;
+    }
+    self->compare_delay = self->last_delay;
+  }
+
+  return self->last_delay;
+}
+
+int WebRtc_binary_last_delay(BinaryDelayEstimator* self) {
+  RTC_DCHECK(self);
+  return self->last_delay;
+}
+
+float WebRtc_binary_last_delay_quality(BinaryDelayEstimator* self) {
+  float quality = 0;
+  RTC_DCHECK(self);
+
+  if (self->robust_validation_enabled) {
+    // Simply a linear function of the histogram height at delay estimate.
+    quality = self->histogram[self->compare_delay] / kHistogramMax;
+  } else {
+    // Note that |last_delay_probability| states how deep the minimum of the
+    // cost function is, so it is rather an error probability.
+    quality = (float)(kMaxBitCountsQ9 - self->last_delay_probability) /
+              kMaxBitCountsQ9;
+    if (quality < 0) {
+      quality = 0;
+    }
+  }
+  return quality;
+}
+
+void WebRtc_MeanEstimatorFix(int32_t new_value,
+                             int factor,
+                             int32_t* mean_value) {
+  int32_t diff = new_value - *mean_value;
+
+  // mean_new = mean_value + ((new_value - mean_value) >> factor);
+  if (diff < 0) {
+    diff = -((-diff) >> factor);
+  } else {
+    diff = (diff >> factor);
+  }
+  *mean_value += diff;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,257 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Performs delay estimation on binary converted spectra.
+// The return value is  0 - OK and -1 - Error, unless otherwise stated.
+
+#ifndef MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_
+#define MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_
+
+#include <stdint.h>
+
+namespace webrtc {
+
+static const int32_t kMaxBitCountsQ9 = (32 << 9);  // 32 matching bits in Q9.
+
+typedef struct {
+  // Pointer to bit counts.
+  int* far_bit_counts;
+  // Binary history variables.
+  uint32_t* binary_far_history;
+  int history_size;
+} BinaryDelayEstimatorFarend;
+
+typedef struct {
+  // Pointer to bit counts.
+  int32_t* mean_bit_counts;
+  // Array only used locally in ProcessBinarySpectrum() but whose size is
+  // determined at run-time.
+  int32_t* bit_counts;
+
+  // Binary history variables.
+  uint32_t* binary_near_history;
+  int near_history_size;
+  int history_size;
+
+  // Delay estimation variables.
+  int32_t minimum_probability;
+  int last_delay_probability;
+
+  // Delay memory.
+  int last_delay;
+
+  // Robust validation
+  int robust_validation_enabled;
+  int allowed_offset;
+  int last_candidate_delay;
+  int compare_delay;
+  int candidate_hits;
+  float* histogram;
+  float last_delay_histogram;
+
+  // For dynamically changing the lookahead when using SoftReset...().
+  int lookahead;
+
+  // Far-end binary spectrum history buffer etc.
+  BinaryDelayEstimatorFarend* farend;
+} BinaryDelayEstimator;
+
+// Releases the memory allocated by
+// WebRtc_CreateBinaryDelayEstimatorFarend(...).
+// Input:
+//    - self              : Pointer to the binary delay estimation far-end
+//                          instance which is the return value of
+//                          WebRtc_CreateBinaryDelayEstimatorFarend().
+//
+void WebRtc_FreeBinaryDelayEstimatorFarend(BinaryDelayEstimatorFarend* self);
+
+// Allocates the memory needed by the far-end part of the binary delay
+// estimation. The memory needs to be initialized separately through
+// WebRtc_InitBinaryDelayEstimatorFarend(...).
+//
+// Inputs:
+//      - history_size    : Size of the far-end binary spectrum history.
+//
+// Return value:
+//      - BinaryDelayEstimatorFarend*
+//                        : Created |handle|. If the memory can't be allocated
+//                          or if any of the input parameters are invalid NULL
+//                          is returned.
+//
+BinaryDelayEstimatorFarend* WebRtc_CreateBinaryDelayEstimatorFarend(
+    int history_size);
+
+// Re-allocates the buffers.
+//
+// Inputs:
+//      - self            : Pointer to the binary estimation far-end instance
+//                          which is the return value of
+//                          WebRtc_CreateBinaryDelayEstimatorFarend().
+//      - history_size    : Size of the far-end binary spectrum history.
+//
+// Return value:
+//      - history_size    : The history size allocated.
+int WebRtc_AllocateFarendBufferMemory(BinaryDelayEstimatorFarend* self,
+                                      int history_size);
+
+// Initializes the delay estimation far-end instance created with
+// WebRtc_CreateBinaryDelayEstimatorFarend(...).
+//
+// Input:
+//    - self              : Pointer to the delay estimation far-end instance.
+//
+// Output:
+//    - self              : Initialized far-end instance.
+//
+void WebRtc_InitBinaryDelayEstimatorFarend(BinaryDelayEstimatorFarend* self);
+
+// Soft resets the delay estimation far-end instance created with
+// WebRtc_CreateBinaryDelayEstimatorFarend(...).
+//
+// Input:
+//    - delay_shift   : The amount of blocks to shift history buffers.
+//
+void WebRtc_SoftResetBinaryDelayEstimatorFarend(
+    BinaryDelayEstimatorFarend* self,
+    int delay_shift);
+
+// Adds the binary far-end spectrum to the internal far-end history buffer. This
+// spectrum is used as reference when calculating the delay using
+// WebRtc_ProcessBinarySpectrum().
+//
+// Inputs:
+//    - self                  : Pointer to the delay estimation far-end
+//                              instance.
+//    - binary_far_spectrum   : Far-end binary spectrum.
+//
+// Output:
+//    - self                  : Updated far-end instance.
+//
+void WebRtc_AddBinaryFarSpectrum(BinaryDelayEstimatorFarend* self,
+                                 uint32_t binary_far_spectrum);
+
+// Releases the memory allocated by WebRtc_CreateBinaryDelayEstimator(...).
+//
+// Note that BinaryDelayEstimator utilizes BinaryDelayEstimatorFarend, but does
+// not take ownership of it, hence the BinaryDelayEstimator has to be torn down
+// before the far-end.
+//
+// Input:
+//    - self              : Pointer to the binary delay estimation instance
+//                          which is the return value of
+//                          WebRtc_CreateBinaryDelayEstimator().
+//
+void WebRtc_FreeBinaryDelayEstimator(BinaryDelayEstimator* self);
+
+// Allocates the memory needed by the binary delay estimation. The memory needs
+// to be initialized separately through WebRtc_InitBinaryDelayEstimator(...).
+//
+// See WebRtc_CreateDelayEstimator(..) in delay_estimator_wrapper.c for detailed
+// description.
+BinaryDelayEstimator* WebRtc_CreateBinaryDelayEstimator(
+    BinaryDelayEstimatorFarend* farend,
+    int max_lookahead);
+
+// Re-allocates |history_size| dependent buffers. The far-end buffers will be
+// updated at the same time if needed.
+//
+// Input:
+//      - self            : Pointer to the binary estimation instance which is
+//                          the return value of
+//                          WebRtc_CreateBinaryDelayEstimator().
+//      - history_size    : Size of the history buffers.
+//
+// Return value:
+//      - history_size    : The history size allocated.
+int WebRtc_AllocateHistoryBufferMemory(BinaryDelayEstimator* self,
+                                       int history_size);
+
+// Initializes the delay estimation instance created with
+// WebRtc_CreateBinaryDelayEstimator(...).
+//
+// Input:
+//    - self              : Pointer to the delay estimation instance.
+//
+// Output:
+//    - self              : Initialized instance.
+//
+void WebRtc_InitBinaryDelayEstimator(BinaryDelayEstimator* self);
+
+// Soft resets the delay estimation instance created with
+// WebRtc_CreateBinaryDelayEstimator(...).
+//
+// Input:
+//    - delay_shift   : The amount of blocks to shift history buffers.
+//
+// Return value:
+//    - actual_shifts : The actual number of shifts performed.
+//
+int WebRtc_SoftResetBinaryDelayEstimator(BinaryDelayEstimator* self,
+                                         int delay_shift);
+
+// Estimates and returns the delay between the binary far-end and binary near-
+// end spectra. It is assumed the binary far-end spectrum has been added using
+// WebRtc_AddBinaryFarSpectrum() prior to this call. The value will be offset by
+// the lookahead (i.e. the lookahead should be subtracted from the returned
+// value).
+//
+// Inputs:
+//    - self                  : Pointer to the delay estimation instance.
+//    - binary_near_spectrum  : Near-end binary spectrum of the current block.
+//
+// Output:
+//    - self                  : Updated instance.
+//
+// Return value:
+//    - delay                 :  >= 0 - Calculated delay value.
+//                              -2    - Insufficient data for estimation.
+//
+int WebRtc_ProcessBinarySpectrum(BinaryDelayEstimator* self,
+                                 uint32_t binary_near_spectrum);
+
+// Returns the last calculated delay updated by the function
+// WebRtc_ProcessBinarySpectrum(...).
+//
+// Input:
+//    - self                  : Pointer to the delay estimation instance.
+//
+// Return value:
+//    - delay                 :  >= 0 - Last calculated delay value
+//                              -2    - Insufficient data for estimation.
+//
+int WebRtc_binary_last_delay(BinaryDelayEstimator* self);
+
+// Returns the estimation quality of the last calculated delay updated by the
+// function WebRtc_ProcessBinarySpectrum(...). The estimation quality is a value
+// in the interval [0, 1].  The higher the value, the better the quality.
+//
+// Return value:
+//    - delay_quality         :  >= 0 - Estimation quality of last calculated
+//                                      delay value.
+float WebRtc_binary_last_delay_quality(BinaryDelayEstimator* self);
+
+// Updates the |mean_value| recursively with a step size of 2^-|factor|. This
+// function is used internally in the Binary Delay Estimator as well as the
+// Fixed point wrapper.
+//
+// Inputs:
+//    - new_value             : The new value the mean should be updated with.
+//    - factor                : The step size, in number of right shifts.
+//
+// Input/Output:
+//    - mean_value            : Pointer to the mean value.
+//
+void WebRtc_MeanEstimatorFix(int32_t new_value,
+                             int factor,
+                             int32_t* mean_value);
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_internal.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_internal.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_internal.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_internal.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Header file including the delay estimator handle used for testing.
+
+#ifndef MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_INTERNAL_H_
+#define MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_INTERNAL_H_
+
+#include "modules/audio_processing/utility/delay_estimator.h"
+
+namespace webrtc {
+
+typedef union {
+  float float_;
+  int32_t int32_;
+} SpectrumType;
+
+typedef struct {
+  // Pointers to mean values of spectrum.
+  SpectrumType* mean_far_spectrum;
+  // |mean_far_spectrum| initialization indicator.
+  int far_spectrum_initialized;
+
+  int spectrum_size;
+
+  // Far-end part of binary spectrum based delay estimation.
+  BinaryDelayEstimatorFarend* binary_farend;
+} DelayEstimatorFarend;
+
+typedef struct {
+  // Pointers to mean values of spectrum.
+  SpectrumType* mean_near_spectrum;
+  // |mean_near_spectrum| initialization indicator.
+  int near_spectrum_initialized;
+
+  int spectrum_size;
+
+  // Binary spectrum based delay estimator
+  BinaryDelayEstimator* binary_handle;
+} DelayEstimator;
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_INTERNAL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,621 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/utility/delay_estimator.h"
+
+#include "modules/audio_processing/utility/delay_estimator_internal.h"
+#include "modules/audio_processing/utility/delay_estimator_wrapper.h"
+#include "test/gtest.h"
+
+namespace webrtc {
+
+namespace {
+
+enum { kSpectrumSize = 65 };
+// Delay history sizes.
+enum { kMaxDelay = 100 };
+enum { kLookahead = 10 };
+enum { kHistorySize = kMaxDelay + kLookahead };
+// Length of binary spectrum sequence.
+enum { kSequenceLength = 400 };
+
+const int kDifferentHistorySize = 3;
+const int kDifferentLookahead = 1;
+
+const int kEnable[] = {0, 1};
+const size_t kSizeEnable = sizeof(kEnable) / sizeof(*kEnable);
+
+class DelayEstimatorTest : public ::testing::Test {
+ protected:
+  DelayEstimatorTest();
+  void SetUp() override;
+  void TearDown() override;
+
+  void Init();
+  void InitBinary();
+  void VerifyDelay(BinaryDelayEstimator* binary_handle, int offset, int delay);
+  void RunBinarySpectra(BinaryDelayEstimator* binary1,
+                        BinaryDelayEstimator* binary2,
+                        int near_offset,
+                        int lookahead_offset,
+                        int far_offset);
+  void RunBinarySpectraTest(int near_offset,
+                            int lookahead_offset,
+                            int ref_robust_validation,
+                            int robust_validation);
+
+  void* handle_;
+  DelayEstimator* self_;
+  void* farend_handle_;
+  DelayEstimatorFarend* farend_self_;
+  BinaryDelayEstimator* binary_;
+  BinaryDelayEstimatorFarend* binary_farend_;
+  int spectrum_size_;
+  // Dummy input spectra.
+  float far_f_[kSpectrumSize];
+  float near_f_[kSpectrumSize];
+  uint16_t far_u16_[kSpectrumSize];
+  uint16_t near_u16_[kSpectrumSize];
+  uint32_t binary_spectrum_[kSequenceLength + kHistorySize];
+};
+
+DelayEstimatorTest::DelayEstimatorTest()
+    : handle_(NULL),
+      self_(NULL),
+      farend_handle_(NULL),
+      farend_self_(NULL),
+      binary_(NULL),
+      binary_farend_(NULL),
+      spectrum_size_(kSpectrumSize) {
+  // Dummy input data are set with more or less arbitrary non-zero values.
+  memset(far_f_, 1, sizeof(far_f_));
+  memset(near_f_, 2, sizeof(near_f_));
+  memset(far_u16_, 1, sizeof(far_u16_));
+  memset(near_u16_, 2, sizeof(near_u16_));
+  // Construct a sequence of binary spectra used to verify delay estimate. The
+  // |kSequenceLength| has to be long enough for the delay estimation to leave
+  // the initialized state.
+  binary_spectrum_[0] = 1;
+  for (int i = 1; i < (kSequenceLength + kHistorySize); i++) {
+    binary_spectrum_[i] = 3 * binary_spectrum_[i - 1];
+  }
+}
+
+void DelayEstimatorTest::SetUp() {
+  farend_handle_ =
+      WebRtc_CreateDelayEstimatorFarend(kSpectrumSize, kHistorySize);
+  ASSERT_TRUE(farend_handle_ != NULL);
+  farend_self_ = reinterpret_cast<DelayEstimatorFarend*>(farend_handle_);
+  handle_ = WebRtc_CreateDelayEstimator(farend_handle_, kLookahead);
+  ASSERT_TRUE(handle_ != NULL);
+  self_ = reinterpret_cast<DelayEstimator*>(handle_);
+  binary_farend_ = WebRtc_CreateBinaryDelayEstimatorFarend(kHistorySize);
+  ASSERT_TRUE(binary_farend_ != NULL);
+  binary_ = WebRtc_CreateBinaryDelayEstimator(binary_farend_, kLookahead);
+  ASSERT_TRUE(binary_ != NULL);
+}
+
+void DelayEstimatorTest::TearDown() {
+  WebRtc_FreeDelayEstimator(handle_);
+  handle_ = NULL;
+  self_ = NULL;
+  WebRtc_FreeDelayEstimatorFarend(farend_handle_);
+  farend_handle_ = NULL;
+  farend_self_ = NULL;
+  WebRtc_FreeBinaryDelayEstimator(binary_);
+  binary_ = NULL;
+  WebRtc_FreeBinaryDelayEstimatorFarend(binary_farend_);
+  binary_farend_ = NULL;
+}
+
+void DelayEstimatorTest::Init() {
+  // Initialize Delay Estimator
+  EXPECT_EQ(0, WebRtc_InitDelayEstimatorFarend(farend_handle_));
+  EXPECT_EQ(0, WebRtc_InitDelayEstimator(handle_));
+  // Verify initialization.
+  EXPECT_EQ(0, farend_self_->far_spectrum_initialized);
+  EXPECT_EQ(0, self_->near_spectrum_initialized);
+  EXPECT_EQ(-2, WebRtc_last_delay(handle_));  // Delay in initial state.
+  EXPECT_FLOAT_EQ(0, WebRtc_last_delay_quality(handle_));  // Zero quality.
+}
+
+void DelayEstimatorTest::InitBinary() {
+  // Initialize Binary Delay Estimator (far-end part).
+  WebRtc_InitBinaryDelayEstimatorFarend(binary_farend_);
+  // Initialize Binary Delay Estimator
+  WebRtc_InitBinaryDelayEstimator(binary_);
+  // Verify initialization. This does not guarantee a complete check, since
+  // |last_delay| may be equal to -2 before initialization if done on the fly.
+  EXPECT_EQ(-2, binary_->last_delay);
+}
+
+void DelayEstimatorTest::VerifyDelay(BinaryDelayEstimator* binary_handle,
+                                     int offset,
+                                     int delay) {
+  // Verify that we WebRtc_binary_last_delay() returns correct delay.
+  EXPECT_EQ(delay, WebRtc_binary_last_delay(binary_handle));
+
+  if (delay != -2) {
+    // Verify correct delay estimate. In the non-causal case the true delay
+    // is equivalent with the |offset|.
+    EXPECT_EQ(offset, delay);
+  }
+}
+
+void DelayEstimatorTest::RunBinarySpectra(BinaryDelayEstimator* binary1,
+                                          BinaryDelayEstimator* binary2,
+                                          int near_offset,
+                                          int lookahead_offset,
+                                          int far_offset) {
+  int different_validations =
+      binary1->robust_validation_enabled ^ binary2->robust_validation_enabled;
+  WebRtc_InitBinaryDelayEstimatorFarend(binary_farend_);
+  WebRtc_InitBinaryDelayEstimator(binary1);
+  WebRtc_InitBinaryDelayEstimator(binary2);
+  // Verify initialization. This does not guarantee a complete check, since
+  // |last_delay| may be equal to -2 before initialization if done on the fly.
+  EXPECT_EQ(-2, binary1->last_delay);
+  EXPECT_EQ(-2, binary2->last_delay);
+  for (int i = kLookahead; i < (kSequenceLength + kLookahead); i++) {
+    WebRtc_AddBinaryFarSpectrum(binary_farend_,
+                                binary_spectrum_[i + far_offset]);
+    int delay_1 = WebRtc_ProcessBinarySpectrum(binary1, binary_spectrum_[i]);
+    int delay_2 = WebRtc_ProcessBinarySpectrum(
+        binary2, binary_spectrum_[i - near_offset]);
+
+    VerifyDelay(binary1, far_offset + kLookahead, delay_1);
+    VerifyDelay(binary2,
+                far_offset + kLookahead + lookahead_offset + near_offset,
+                delay_2);
+    // Expect the two delay estimates to be offset by |lookahead_offset| +
+    // |near_offset| when we have left the initial state.
+    if ((delay_1 != -2) && (delay_2 != -2)) {
+      EXPECT_EQ(delay_1, delay_2 - lookahead_offset - near_offset);
+    }
+    // For the case of identical signals |delay_1| and |delay_2| should match
+    // all the time, unless one of them has robust validation turned on.  In
+    // that case the robust validation leaves the initial state faster.
+    if ((near_offset == 0) && (lookahead_offset == 0)) {
+      if (!different_validations) {
+        EXPECT_EQ(delay_1, delay_2);
+      } else {
+        if (binary1->robust_validation_enabled) {
+          EXPECT_GE(delay_1, delay_2);
+        } else {
+          EXPECT_GE(delay_2, delay_1);
+        }
+      }
+    }
+  }
+  // Verify that we have left the initialized state.
+  EXPECT_NE(-2, WebRtc_binary_last_delay(binary1));
+  EXPECT_LT(0, WebRtc_binary_last_delay_quality(binary1));
+  EXPECT_NE(-2, WebRtc_binary_last_delay(binary2));
+  EXPECT_LT(0, WebRtc_binary_last_delay_quality(binary2));
+}
+
+void DelayEstimatorTest::RunBinarySpectraTest(int near_offset,
+                                              int lookahead_offset,
+                                              int ref_robust_validation,
+                                              int robust_validation) {
+  BinaryDelayEstimator* binary2 = WebRtc_CreateBinaryDelayEstimator(
+      binary_farend_, kLookahead + lookahead_offset);
+  // Verify the delay for both causal and non-causal systems. For causal systems
+  // the delay is equivalent with a positive |offset| of the far-end sequence.
+  // For non-causal systems the delay is equivalent with a negative |offset| of
+  // the far-end sequence.
+  binary_->robust_validation_enabled = ref_robust_validation;
+  binary2->robust_validation_enabled = robust_validation;
+  for (int offset = -kLookahead;
+       offset < kMaxDelay - lookahead_offset - near_offset; offset++) {
+    RunBinarySpectra(binary_, binary2, near_offset, lookahead_offset, offset);
+  }
+  WebRtc_FreeBinaryDelayEstimator(binary2);
+  binary2 = NULL;
+  binary_->robust_validation_enabled = 0;  // Reset reference.
+}
+
+TEST_F(DelayEstimatorTest, CorrectErrorReturnsOfWrapper) {
+  // In this test we verify correct error returns on invalid API calls.
+
+  // WebRtc_CreateDelayEstimatorFarend() and WebRtc_CreateDelayEstimator()
+  // should return a NULL pointer on invalid input values.
+  // Make sure we have a non-NULL value at start, so we can detect NULL after
+  // create failure.
+  void* handle = farend_handle_;
+  handle = WebRtc_CreateDelayEstimatorFarend(33, kHistorySize);
+  EXPECT_TRUE(handle == NULL);
+  handle = WebRtc_CreateDelayEstimatorFarend(kSpectrumSize, 1);
+  EXPECT_TRUE(handle == NULL);
+
+  handle = handle_;
+  handle = WebRtc_CreateDelayEstimator(NULL, kLookahead);
+  EXPECT_TRUE(handle == NULL);
+  handle = WebRtc_CreateDelayEstimator(farend_handle_, -1);
+  EXPECT_TRUE(handle == NULL);
+
+  // WebRtc_InitDelayEstimatorFarend() and WebRtc_InitDelayEstimator() should
+  // return -1 if we have a NULL pointer as |handle|.
+  EXPECT_EQ(-1, WebRtc_InitDelayEstimatorFarend(NULL));
+  EXPECT_EQ(-1, WebRtc_InitDelayEstimator(NULL));
+
+  // WebRtc_AddFarSpectrumFloat() should return -1 if we have:
+  // 1) NULL pointer as |handle|.
+  // 2) NULL pointer as far-end spectrum.
+  // 3) Incorrect spectrum size.
+  EXPECT_EQ(-1, WebRtc_AddFarSpectrumFloat(NULL, far_f_, spectrum_size_));
+  // Use |farend_handle_| which is properly created at SetUp().
+  EXPECT_EQ(-1,
+            WebRtc_AddFarSpectrumFloat(farend_handle_, NULL, spectrum_size_));
+  EXPECT_EQ(-1, WebRtc_AddFarSpectrumFloat(farend_handle_, far_f_,
+                                           spectrum_size_ + 1));
+
+  // WebRtc_AddFarSpectrumFix() should return -1 if we have:
+  // 1) NULL pointer as |handle|.
+  // 2) NULL pointer as far-end spectrum.
+  // 3) Incorrect spectrum size.
+  // 4) Too high precision in far-end spectrum (Q-domain > 15).
+  EXPECT_EQ(-1, WebRtc_AddFarSpectrumFix(NULL, far_u16_, spectrum_size_, 0));
+  EXPECT_EQ(-1,
+            WebRtc_AddFarSpectrumFix(farend_handle_, NULL, spectrum_size_, 0));
+  EXPECT_EQ(-1, WebRtc_AddFarSpectrumFix(farend_handle_, far_u16_,
+                                         spectrum_size_ + 1, 0));
+  EXPECT_EQ(-1, WebRtc_AddFarSpectrumFix(farend_handle_, far_u16_,
+                                         spectrum_size_, 16));
+
+  // WebRtc_set_history_size() should return -1 if:
+  // 1) |handle| is a NULL.
+  // 2) |history_size| <= 1.
+  EXPECT_EQ(-1, WebRtc_set_history_size(NULL, 1));
+  EXPECT_EQ(-1, WebRtc_set_history_size(handle_, 1));
+  // WebRtc_history_size() should return -1 if:
+  // 1) NULL pointer input.
+  EXPECT_EQ(-1, WebRtc_history_size(NULL));
+  // 2) there is a mismatch between history size.
+  void* tmp_handle = WebRtc_CreateDelayEstimator(farend_handle_, kHistorySize);
+  EXPECT_EQ(0, WebRtc_InitDelayEstimator(tmp_handle));
+  EXPECT_EQ(kDifferentHistorySize,
+            WebRtc_set_history_size(tmp_handle, kDifferentHistorySize));
+  EXPECT_EQ(kDifferentHistorySize, WebRtc_history_size(tmp_handle));
+  EXPECT_EQ(kHistorySize, WebRtc_set_history_size(handle_, kHistorySize));
+  EXPECT_EQ(-1, WebRtc_history_size(tmp_handle));
+
+  // WebRtc_set_lookahead() should return -1 if we try a value outside the
+  /// buffer.
+  EXPECT_EQ(-1, WebRtc_set_lookahead(handle_, kLookahead + 1));
+  EXPECT_EQ(-1, WebRtc_set_lookahead(handle_, -1));
+
+  // WebRtc_set_allowed_offset() should return -1 if we have:
+  // 1) NULL pointer as |handle|.
+  // 2) |allowed_offset| < 0.
+  EXPECT_EQ(-1, WebRtc_set_allowed_offset(NULL, 0));
+  EXPECT_EQ(-1, WebRtc_set_allowed_offset(handle_, -1));
+
+  EXPECT_EQ(-1, WebRtc_get_allowed_offset(NULL));
+
+  // WebRtc_enable_robust_validation() should return -1 if we have:
+  // 1) NULL pointer as |handle|.
+  // 2) Incorrect |enable| value (not 0 or 1).
+  EXPECT_EQ(-1, WebRtc_enable_robust_validation(NULL, kEnable[0]));
+  EXPECT_EQ(-1, WebRtc_enable_robust_validation(handle_, -1));
+  EXPECT_EQ(-1, WebRtc_enable_robust_validation(handle_, 2));
+
+  // WebRtc_is_robust_validation_enabled() should return -1 if we have NULL
+  // pointer as |handle|.
+  EXPECT_EQ(-1, WebRtc_is_robust_validation_enabled(NULL));
+
+  // WebRtc_DelayEstimatorProcessFloat() should return -1 if we have:
+  // 1) NULL pointer as |handle|.
+  // 2) NULL pointer as near-end spectrum.
+  // 3) Incorrect spectrum size.
+  // 4) Non matching history sizes if multiple delay estimators using the same
+  //    far-end reference.
+  EXPECT_EQ(-1,
+            WebRtc_DelayEstimatorProcessFloat(NULL, near_f_, spectrum_size_));
+  // Use |handle_| which is properly created at SetUp().
+  EXPECT_EQ(-1,
+            WebRtc_DelayEstimatorProcessFloat(handle_, NULL, spectrum_size_));
+  EXPECT_EQ(-1, WebRtc_DelayEstimatorProcessFloat(handle_, near_f_,
+                                                  spectrum_size_ + 1));
+  // |tmp_handle| is already in a non-matching state.
+  EXPECT_EQ(-1, WebRtc_DelayEstimatorProcessFloat(tmp_handle, near_f_,
+                                                  spectrum_size_));
+
+  // WebRtc_DelayEstimatorProcessFix() should return -1 if we have:
+  // 1) NULL pointer as |handle|.
+  // 2) NULL pointer as near-end spectrum.
+  // 3) Incorrect spectrum size.
+  // 4) Too high precision in near-end spectrum (Q-domain > 15).
+  // 5) Non matching history sizes if multiple delay estimators using the same
+  //    far-end reference.
+  EXPECT_EQ(
+      -1, WebRtc_DelayEstimatorProcessFix(NULL, near_u16_, spectrum_size_, 0));
+  EXPECT_EQ(-1,
+            WebRtc_DelayEstimatorProcessFix(handle_, NULL, spectrum_size_, 0));
+  EXPECT_EQ(-1, WebRtc_DelayEstimatorProcessFix(handle_, near_u16_,
+                                                spectrum_size_ + 1, 0));
+  EXPECT_EQ(-1, WebRtc_DelayEstimatorProcessFix(handle_, near_u16_,
+                                                spectrum_size_, 16));
+  // |tmp_handle| is already in a non-matching state.
+  EXPECT_EQ(-1, WebRtc_DelayEstimatorProcessFix(tmp_handle, near_u16_,
+                                                spectrum_size_, 0));
+  WebRtc_FreeDelayEstimator(tmp_handle);
+
+  // WebRtc_last_delay() should return -1 if we have a NULL pointer as |handle|.
+  EXPECT_EQ(-1, WebRtc_last_delay(NULL));
+
+  // Free any local memory if needed.
+  WebRtc_FreeDelayEstimator(handle);
+}
+
+TEST_F(DelayEstimatorTest, VerifyAllowedOffset) {
+  // Is set to zero by default.
+  EXPECT_EQ(0, WebRtc_get_allowed_offset(handle_));
+  for (int i = 1; i >= 0; i--) {
+    EXPECT_EQ(0, WebRtc_set_allowed_offset(handle_, i));
+    EXPECT_EQ(i, WebRtc_get_allowed_offset(handle_));
+    Init();
+    // Unaffected over a reset.
+    EXPECT_EQ(i, WebRtc_get_allowed_offset(handle_));
+  }
+}
+
+TEST_F(DelayEstimatorTest, VerifyEnableRobustValidation) {
+  // Disabled by default.
+  EXPECT_EQ(0, WebRtc_is_robust_validation_enabled(handle_));
+  for (size_t i = 0; i < kSizeEnable; ++i) {
+    EXPECT_EQ(0, WebRtc_enable_robust_validation(handle_, kEnable[i]));
+    EXPECT_EQ(kEnable[i], WebRtc_is_robust_validation_enabled(handle_));
+    Init();
+    // Unaffected over a reset.
+    EXPECT_EQ(kEnable[i], WebRtc_is_robust_validation_enabled(handle_));
+  }
+}
+
+TEST_F(DelayEstimatorTest, InitializedSpectrumAfterProcess) {
+  // In this test we verify that the mean spectra are initialized after first
+  // time we call WebRtc_AddFarSpectrum() and Process() respectively. The test
+  // also verifies the state is not left for zero spectra.
+  const float kZerosFloat[kSpectrumSize] = {0.0};
+  const uint16_t kZerosU16[kSpectrumSize] = {0};
+
+  // For floating point operations, process one frame and verify initialization
+  // flag.
+  Init();
+  EXPECT_EQ(0, WebRtc_AddFarSpectrumFloat(farend_handle_, kZerosFloat,
+                                          spectrum_size_));
+  EXPECT_EQ(0, farend_self_->far_spectrum_initialized);
+  EXPECT_EQ(0,
+            WebRtc_AddFarSpectrumFloat(farend_handle_, far_f_, spectrum_size_));
+  EXPECT_EQ(1, farend_self_->far_spectrum_initialized);
+  EXPECT_EQ(-2, WebRtc_DelayEstimatorProcessFloat(handle_, kZerosFloat,
+                                                  spectrum_size_));
+  EXPECT_EQ(0, self_->near_spectrum_initialized);
+  EXPECT_EQ(
+      -2, WebRtc_DelayEstimatorProcessFloat(handle_, near_f_, spectrum_size_));
+  EXPECT_EQ(1, self_->near_spectrum_initialized);
+
+  // For fixed point operations, process one frame and verify initialization
+  // flag.
+  Init();
+  EXPECT_EQ(0, WebRtc_AddFarSpectrumFix(farend_handle_, kZerosU16,
+                                        spectrum_size_, 0));
+  EXPECT_EQ(0, farend_self_->far_spectrum_initialized);
+  EXPECT_EQ(
+      0, WebRtc_AddFarSpectrumFix(farend_handle_, far_u16_, spectrum_size_, 0));
+  EXPECT_EQ(1, farend_self_->far_spectrum_initialized);
+  EXPECT_EQ(-2, WebRtc_DelayEstimatorProcessFix(handle_, kZerosU16,
+                                                spectrum_size_, 0));
+  EXPECT_EQ(0, self_->near_spectrum_initialized);
+  EXPECT_EQ(-2, WebRtc_DelayEstimatorProcessFix(handle_, near_u16_,
+                                                spectrum_size_, 0));
+  EXPECT_EQ(1, self_->near_spectrum_initialized);
+}
+
+TEST_F(DelayEstimatorTest, CorrectLastDelay) {
+  // In this test we verify that we get the correct last delay upon valid call.
+  // We simply process the same data until we leave the initialized state
+  // (|last_delay| = -2). Then we compare the Process() output with the
+  // last_delay() call.
+
+  // TODO(bjornv): Update quality values for robust validation.
+  int last_delay = 0;
+  // Floating point operations.
+  Init();
+  for (int i = 0; i < 200; i++) {
+    EXPECT_EQ(
+        0, WebRtc_AddFarSpectrumFloat(farend_handle_, far_f_, spectrum_size_));
+    last_delay =
+        WebRtc_DelayEstimatorProcessFloat(handle_, near_f_, spectrum_size_);
+    if (last_delay != -2) {
+      EXPECT_EQ(last_delay, WebRtc_last_delay(handle_));
+      if (!WebRtc_is_robust_validation_enabled(handle_)) {
+        EXPECT_FLOAT_EQ(7203.f / kMaxBitCountsQ9,
+                        WebRtc_last_delay_quality(handle_));
+      }
+      break;
+    }
+  }
+  // Verify that we have left the initialized state.
+  EXPECT_NE(-2, WebRtc_last_delay(handle_));
+  EXPECT_LT(0, WebRtc_last_delay_quality(handle_));
+
+  // Fixed point operations.
+  Init();
+  for (int i = 0; i < 200; i++) {
+    EXPECT_EQ(0, WebRtc_AddFarSpectrumFix(farend_handle_, far_u16_,
+                                          spectrum_size_, 0));
+    last_delay =
+        WebRtc_DelayEstimatorProcessFix(handle_, near_u16_, spectrum_size_, 0);
+    if (last_delay != -2) {
+      EXPECT_EQ(last_delay, WebRtc_last_delay(handle_));
+      if (!WebRtc_is_robust_validation_enabled(handle_)) {
+        EXPECT_FLOAT_EQ(7203.f / kMaxBitCountsQ9,
+                        WebRtc_last_delay_quality(handle_));
+      }
+      break;
+    }
+  }
+  // Verify that we have left the initialized state.
+  EXPECT_NE(-2, WebRtc_last_delay(handle_));
+  EXPECT_LT(0, WebRtc_last_delay_quality(handle_));
+}
+
+TEST_F(DelayEstimatorTest, CorrectErrorReturnsOfBinaryEstimatorFarend) {
+  // In this test we verify correct output on invalid API calls to the Binary
+  // Delay Estimator (far-end part).
+
+  BinaryDelayEstimatorFarend* binary = binary_farend_;
+  // WebRtc_CreateBinaryDelayEstimatorFarend() should return -1 if the input
+  // history size is less than 2. This is to make sure the buffer shifting
+  // applies properly.
+  // Make sure we have a non-NULL value at start, so we can detect NULL after
+  // create failure.
+  binary = WebRtc_CreateBinaryDelayEstimatorFarend(1);
+  EXPECT_TRUE(binary == NULL);
+}
+
+TEST_F(DelayEstimatorTest, CorrectErrorReturnsOfBinaryEstimator) {
+  // In this test we verify correct output on invalid API calls to the Binary
+  // Delay Estimator.
+
+  BinaryDelayEstimator* binary_handle = binary_;
+  // WebRtc_CreateBinaryDelayEstimator() should return -1 if we have a NULL
+  // pointer as |binary_farend| or invalid input values. Upon failure, the
+  // |binary_handle| should be NULL.
+  // Make sure we have a non-NULL value at start, so we can detect NULL after
+  // create failure.
+  binary_handle = WebRtc_CreateBinaryDelayEstimator(NULL, kLookahead);
+  EXPECT_TRUE(binary_handle == NULL);
+  binary_handle = WebRtc_CreateBinaryDelayEstimator(binary_farend_, -1);
+  EXPECT_TRUE(binary_handle == NULL);
+}
+
+TEST_F(DelayEstimatorTest, MeanEstimatorFix) {
+  // In this test we verify that we update the mean value in correct direction
+  // only. With "direction" we mean increase or decrease.
+
+  int32_t mean_value = 4000;
+  int32_t mean_value_before = mean_value;
+  int32_t new_mean_value = mean_value * 2;
+
+  // Increasing |mean_value|.
+  WebRtc_MeanEstimatorFix(new_mean_value, 10, &mean_value);
+  EXPECT_LT(mean_value_before, mean_value);
+  EXPECT_GT(new_mean_value, mean_value);
+
+  // Decreasing |mean_value|.
+  new_mean_value = mean_value / 2;
+  mean_value_before = mean_value;
+  WebRtc_MeanEstimatorFix(new_mean_value, 10, &mean_value);
+  EXPECT_GT(mean_value_before, mean_value);
+  EXPECT_LT(new_mean_value, mean_value);
+}
+
+TEST_F(DelayEstimatorTest, ExactDelayEstimateMultipleNearSameSpectrum) {
+  // In this test we verify that we get the correct delay estimates if we shift
+  // the signal accordingly. We create two Binary Delay Estimators and feed them
+  // with the same signals, so they should output the same results.
+  // We verify both causal and non-causal delays.
+  // For these noise free signals, the robust validation should not have an
+  // impact, hence we turn robust validation on/off for both reference and
+  // delayed near end.
+
+  for (size_t i = 0; i < kSizeEnable; ++i) {
+    for (size_t j = 0; j < kSizeEnable; ++j) {
+      RunBinarySpectraTest(0, 0, kEnable[i], kEnable[j]);
+    }
+  }
+}
+
+TEST_F(DelayEstimatorTest, ExactDelayEstimateMultipleNearDifferentSpectrum) {
+  // In this test we use the same setup as above, but we now feed the two Binary
+  // Delay Estimators with different signals, so they should output different
+  // results.
+  // For these noise free signals, the robust validation should not have an
+  // impact, hence we turn robust validation on/off for both reference and
+  // delayed near end.
+
+  const int kNearOffset = 1;
+  for (size_t i = 0; i < kSizeEnable; ++i) {
+    for (size_t j = 0; j < kSizeEnable; ++j) {
+      RunBinarySpectraTest(kNearOffset, 0, kEnable[i], kEnable[j]);
+    }
+  }
+}
+
+TEST_F(DelayEstimatorTest, ExactDelayEstimateMultipleNearDifferentLookahead) {
+  // In this test we use the same setup as above, feeding the two Binary
+  // Delay Estimators with the same signals. The difference is that we create
+  // them with different lookahead.
+  // For these noise free signals, the robust validation should not have an
+  // impact, hence we turn robust validation on/off for both reference and
+  // delayed near end.
+
+  const int kLookaheadOffset = 1;
+  for (size_t i = 0; i < kSizeEnable; ++i) {
+    for (size_t j = 0; j < kSizeEnable; ++j) {
+      RunBinarySpectraTest(0, kLookaheadOffset, kEnable[i], kEnable[j]);
+    }
+  }
+}
+
+TEST_F(DelayEstimatorTest, AllowedOffsetNoImpactWhenRobustValidationDisabled) {
+  // The same setup as in ExactDelayEstimateMultipleNearSameSpectrum with the
+  // difference that |allowed_offset| is set for the reference binary delay
+  // estimator.
+
+  binary_->allowed_offset = 10;
+  RunBinarySpectraTest(0, 0, 0, 0);
+  binary_->allowed_offset = 0;  // Reset reference.
+}
+
+TEST_F(DelayEstimatorTest, VerifyLookaheadAtCreate) {
+  void* farend_handle =
+      WebRtc_CreateDelayEstimatorFarend(kSpectrumSize, kMaxDelay);
+  ASSERT_TRUE(farend_handle != NULL);
+  void* handle = WebRtc_CreateDelayEstimator(farend_handle, kLookahead);
+  ASSERT_TRUE(handle != NULL);
+  EXPECT_EQ(kLookahead, WebRtc_lookahead(handle));
+  WebRtc_FreeDelayEstimator(handle);
+  WebRtc_FreeDelayEstimatorFarend(farend_handle);
+}
+
+TEST_F(DelayEstimatorTest, VerifyLookaheadIsSetAndKeptAfterInit) {
+  EXPECT_EQ(kLookahead, WebRtc_lookahead(handle_));
+  EXPECT_EQ(kDifferentLookahead,
+            WebRtc_set_lookahead(handle_, kDifferentLookahead));
+  EXPECT_EQ(kDifferentLookahead, WebRtc_lookahead(handle_));
+  EXPECT_EQ(0, WebRtc_InitDelayEstimatorFarend(farend_handle_));
+  EXPECT_EQ(kDifferentLookahead, WebRtc_lookahead(handle_));
+  EXPECT_EQ(0, WebRtc_InitDelayEstimator(handle_));
+  EXPECT_EQ(kDifferentLookahead, WebRtc_lookahead(handle_));
+}
+
+TEST_F(DelayEstimatorTest, VerifyHistorySizeAtCreate) {
+  EXPECT_EQ(kHistorySize, WebRtc_history_size(handle_));
+}
+
+TEST_F(DelayEstimatorTest, VerifyHistorySizeIsSetAndKeptAfterInit) {
+  EXPECT_EQ(kHistorySize, WebRtc_history_size(handle_));
+  EXPECT_EQ(kDifferentHistorySize,
+            WebRtc_set_history_size(handle_, kDifferentHistorySize));
+  EXPECT_EQ(kDifferentHistorySize, WebRtc_history_size(handle_));
+  EXPECT_EQ(0, WebRtc_InitDelayEstimator(handle_));
+  EXPECT_EQ(kDifferentHistorySize, WebRtc_history_size(handle_));
+  EXPECT_EQ(0, WebRtc_InitDelayEstimatorFarend(farend_handle_));
+  EXPECT_EQ(kDifferentHistorySize, WebRtc_history_size(handle_));
+}
+
+// TODO(bjornv): Add tests for SoftReset...(...).
+
+}  // namespace
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_wrapper.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_wrapper.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_wrapper.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_wrapper.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,489 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/utility/delay_estimator_wrapper.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "modules/audio_processing/utility/delay_estimator.h"
+#include "modules/audio_processing/utility/delay_estimator_internal.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+// Only bit |kBandFirst| through bit |kBandLast| are processed and
+// |kBandFirst| - |kBandLast| must be < 32.
+enum { kBandFirst = 12 };
+enum { kBandLast = 43 };
+
+static __inline uint32_t SetBit(uint32_t in, int pos) {
+  uint32_t mask = (1 << pos);
+  uint32_t out = (in | mask);
+
+  return out;
+}
+
+// Calculates the mean recursively. Same version as WebRtc_MeanEstimatorFix(),
+// but for float.
+//
+// Inputs:
+//    - new_value             : New additional value.
+//    - scale                 : Scale for smoothing (should be less than 1.0).
+//
+// Input/Output:
+//    - mean_value            : Pointer to the mean value for updating.
+//
+static void MeanEstimatorFloat(float new_value,
+                               float scale,
+                               float* mean_value) {
+  RTC_DCHECK_LT(scale, 1.0f);
+  *mean_value += (new_value - *mean_value) * scale;
+}
+
+// Computes the binary spectrum by comparing the input |spectrum| with a
+// |threshold_spectrum|. Float and fixed point versions.
+//
+// Inputs:
+//      - spectrum            : Spectrum of which the binary spectrum should be
+//                              calculated.
+//      - threshold_spectrum  : Threshold spectrum with which the input
+//                              spectrum is compared.
+// Return:
+//      - out                 : Binary spectrum.
+//
+static uint32_t BinarySpectrumFix(const uint16_t* spectrum,
+                                  SpectrumType* threshold_spectrum,
+                                  int q_domain,
+                                  int* threshold_initialized) {
+  int i = kBandFirst;
+  uint32_t out = 0;
+
+  RTC_DCHECK_LT(q_domain, 16);
+
+  if (!(*threshold_initialized)) {
+    // Set the |threshold_spectrum| to half the input |spectrum| as starting
+    // value. This speeds up the convergence.
+    for (i = kBandFirst; i <= kBandLast; i++) {
+      if (spectrum[i] > 0) {
+        // Convert input spectrum from Q(|q_domain|) to Q15.
+        int32_t spectrum_q15 = ((int32_t)spectrum[i]) << (15 - q_domain);
+        threshold_spectrum[i].int32_ = (spectrum_q15 >> 1);
+        *threshold_initialized = 1;
+      }
+    }
+  }
+  for (i = kBandFirst; i <= kBandLast; i++) {
+    // Convert input spectrum from Q(|q_domain|) to Q15.
+    int32_t spectrum_q15 = ((int32_t)spectrum[i]) << (15 - q_domain);
+    // Update the |threshold_spectrum|.
+    WebRtc_MeanEstimatorFix(spectrum_q15, 6, &(threshold_spectrum[i].int32_));
+    // Convert |spectrum| at current frequency bin to a binary value.
+    if (spectrum_q15 > threshold_spectrum[i].int32_) {
+      out = SetBit(out, i - kBandFirst);
+    }
+  }
+
+  return out;
+}
+
+static uint32_t BinarySpectrumFloat(const float* spectrum,
+                                    SpectrumType* threshold_spectrum,
+                                    int* threshold_initialized) {
+  int i = kBandFirst;
+  uint32_t out = 0;
+  const float kScale = 1 / 64.0;
+
+  if (!(*threshold_initialized)) {
+    // Set the |threshold_spectrum| to half the input |spectrum| as starting
+    // value. This speeds up the convergence.
+    for (i = kBandFirst; i <= kBandLast; i++) {
+      if (spectrum[i] > 0.0f) {
+        threshold_spectrum[i].float_ = (spectrum[i] / 2);
+        *threshold_initialized = 1;
+      }
+    }
+  }
+
+  for (i = kBandFirst; i <= kBandLast; i++) {
+    // Update the |threshold_spectrum|.
+    MeanEstimatorFloat(spectrum[i], kScale, &(threshold_spectrum[i].float_));
+    // Convert |spectrum| at current frequency bin to a binary value.
+    if (spectrum[i] > threshold_spectrum[i].float_) {
+      out = SetBit(out, i - kBandFirst);
+    }
+  }
+
+  return out;
+}
+
+void WebRtc_FreeDelayEstimatorFarend(void* handle) {
+  DelayEstimatorFarend* self = (DelayEstimatorFarend*)handle;
+
+  if (handle == NULL) {
+    return;
+  }
+
+  free(self->mean_far_spectrum);
+  self->mean_far_spectrum = NULL;
+
+  WebRtc_FreeBinaryDelayEstimatorFarend(self->binary_farend);
+  self->binary_farend = NULL;
+
+  free(self);
+}
+
+void* WebRtc_CreateDelayEstimatorFarend(int spectrum_size, int history_size) {
+  DelayEstimatorFarend* self = NULL;
+
+  // Check if the sub band used in the delay estimation is small enough to fit
+  // the binary spectra in a uint32_t.
+  static_assert(kBandLast - kBandFirst < 32, "");
+
+  if (spectrum_size >= kBandLast) {
+    self = static_cast<DelayEstimatorFarend*>(
+        malloc(sizeof(DelayEstimatorFarend)));
+  }
+
+  if (self != NULL) {
+    int memory_fail = 0;
+
+    // Allocate memory for the binary far-end spectrum handling.
+    self->binary_farend = WebRtc_CreateBinaryDelayEstimatorFarend(history_size);
+    memory_fail |= (self->binary_farend == NULL);
+
+    // Allocate memory for spectrum buffers.
+    self->mean_far_spectrum = static_cast<SpectrumType*>(
+        malloc(spectrum_size * sizeof(SpectrumType)));
+    memory_fail |= (self->mean_far_spectrum == NULL);
+
+    self->spectrum_size = spectrum_size;
+
+    if (memory_fail) {
+      WebRtc_FreeDelayEstimatorFarend(self);
+      self = NULL;
+    }
+  }
+
+  return self;
+}
+
+int WebRtc_InitDelayEstimatorFarend(void* handle) {
+  DelayEstimatorFarend* self = (DelayEstimatorFarend*)handle;
+
+  if (self == NULL) {
+    return -1;
+  }
+
+  // Initialize far-end part of binary delay estimator.
+  WebRtc_InitBinaryDelayEstimatorFarend(self->binary_farend);
+
+  // Set averaged far and near end spectra to zero.
+  memset(self->mean_far_spectrum, 0,
+         sizeof(SpectrumType) * self->spectrum_size);
+  // Reset initialization indicators.
+  self->far_spectrum_initialized = 0;
+
+  return 0;
+}
+
+void WebRtc_SoftResetDelayEstimatorFarend(void* handle, int delay_shift) {
+  DelayEstimatorFarend* self = (DelayEstimatorFarend*)handle;
+  RTC_DCHECK(self);
+  WebRtc_SoftResetBinaryDelayEstimatorFarend(self->binary_farend, delay_shift);
+}
+
+int WebRtc_AddFarSpectrumFix(void* handle,
+                             const uint16_t* far_spectrum,
+                             int spectrum_size,
+                             int far_q) {
+  DelayEstimatorFarend* self = (DelayEstimatorFarend*)handle;
+  uint32_t binary_spectrum = 0;
+
+  if (self == NULL) {
+    return -1;
+  }
+  if (far_spectrum == NULL) {
+    // Empty far end spectrum.
+    return -1;
+  }
+  if (spectrum_size != self->spectrum_size) {
+    // Data sizes don't match.
+    return -1;
+  }
+  if (far_q > 15) {
+    // If |far_q| is larger than 15 we cannot guarantee no wrap around.
+    return -1;
+  }
+
+  // Get binary spectrum.
+  binary_spectrum = BinarySpectrumFix(far_spectrum, self->mean_far_spectrum,
+                                      far_q, &(self->far_spectrum_initialized));
+  WebRtc_AddBinaryFarSpectrum(self->binary_farend, binary_spectrum);
+
+  return 0;
+}
+
+int WebRtc_AddFarSpectrumFloat(void* handle,
+                               const float* far_spectrum,
+                               int spectrum_size) {
+  DelayEstimatorFarend* self = (DelayEstimatorFarend*)handle;
+  uint32_t binary_spectrum = 0;
+
+  if (self == NULL) {
+    return -1;
+  }
+  if (far_spectrum == NULL) {
+    // Empty far end spectrum.
+    return -1;
+  }
+  if (spectrum_size != self->spectrum_size) {
+    // Data sizes don't match.
+    return -1;
+  }
+
+  // Get binary spectrum.
+  binary_spectrum = BinarySpectrumFloat(far_spectrum, self->mean_far_spectrum,
+                                        &(self->far_spectrum_initialized));
+  WebRtc_AddBinaryFarSpectrum(self->binary_farend, binary_spectrum);
+
+  return 0;
+}
+
+void WebRtc_FreeDelayEstimator(void* handle) {
+  DelayEstimator* self = (DelayEstimator*)handle;
+
+  if (handle == NULL) {
+    return;
+  }
+
+  free(self->mean_near_spectrum);
+  self->mean_near_spectrum = NULL;
+
+  WebRtc_FreeBinaryDelayEstimator(self->binary_handle);
+  self->binary_handle = NULL;
+
+  free(self);
+}
+
+void* WebRtc_CreateDelayEstimator(void* farend_handle, int max_lookahead) {
+  DelayEstimator* self = NULL;
+  DelayEstimatorFarend* farend = (DelayEstimatorFarend*)farend_handle;
+
+  if (farend_handle != NULL) {
+    self = static_cast<DelayEstimator*>(malloc(sizeof(DelayEstimator)));
+  }
+
+  if (self != NULL) {
+    int memory_fail = 0;
+
+    // Allocate memory for the farend spectrum handling.
+    self->binary_handle =
+        WebRtc_CreateBinaryDelayEstimator(farend->binary_farend, max_lookahead);
+    memory_fail |= (self->binary_handle == NULL);
+
+    // Allocate memory for spectrum buffers.
+    self->mean_near_spectrum = static_cast<SpectrumType*>(
+        malloc(farend->spectrum_size * sizeof(SpectrumType)));
+    memory_fail |= (self->mean_near_spectrum == NULL);
+
+    self->spectrum_size = farend->spectrum_size;
+
+    if (memory_fail) {
+      WebRtc_FreeDelayEstimator(self);
+      self = NULL;
+    }
+  }
+
+  return self;
+}
+
+int WebRtc_InitDelayEstimator(void* handle) {
+  DelayEstimator* self = (DelayEstimator*)handle;
+
+  if (self == NULL) {
+    return -1;
+  }
+
+  // Initialize binary delay estimator.
+  WebRtc_InitBinaryDelayEstimator(self->binary_handle);
+
+  // Set averaged far and near end spectra to zero.
+  memset(self->mean_near_spectrum, 0,
+         sizeof(SpectrumType) * self->spectrum_size);
+  // Reset initialization indicators.
+  self->near_spectrum_initialized = 0;
+
+  return 0;
+}
+
+int WebRtc_SoftResetDelayEstimator(void* handle, int delay_shift) {
+  DelayEstimator* self = (DelayEstimator*)handle;
+  RTC_DCHECK(self);
+  return WebRtc_SoftResetBinaryDelayEstimator(self->binary_handle, delay_shift);
+}
+
+int WebRtc_set_history_size(void* handle, int history_size) {
+  DelayEstimator* self = static_cast<DelayEstimator*>(handle);
+
+  if ((self == NULL) || (history_size <= 1)) {
+    return -1;
+  }
+  return WebRtc_AllocateHistoryBufferMemory(self->binary_handle, history_size);
+}
+
+int WebRtc_history_size(const void* handle) {
+  const DelayEstimator* self = static_cast<const DelayEstimator*>(handle);
+
+  if (self == NULL) {
+    return -1;
+  }
+  if (self->binary_handle->farend->history_size !=
+      self->binary_handle->history_size) {
+    // Non matching history sizes.
+    return -1;
+  }
+  return self->binary_handle->history_size;
+}
+
+int WebRtc_set_lookahead(void* handle, int lookahead) {
+  DelayEstimator* self = (DelayEstimator*)handle;
+  RTC_DCHECK(self);
+  RTC_DCHECK(self->binary_handle);
+  if ((lookahead > self->binary_handle->near_history_size - 1) ||
+      (lookahead < 0)) {
+    return -1;
+  }
+  self->binary_handle->lookahead = lookahead;
+  return self->binary_handle->lookahead;
+}
+
+int WebRtc_lookahead(void* handle) {
+  DelayEstimator* self = (DelayEstimator*)handle;
+  RTC_DCHECK(self);
+  RTC_DCHECK(self->binary_handle);
+  return self->binary_handle->lookahead;
+}
+
+int WebRtc_set_allowed_offset(void* handle, int allowed_offset) {
+  DelayEstimator* self = (DelayEstimator*)handle;
+
+  if ((self == NULL) || (allowed_offset < 0)) {
+    return -1;
+  }
+  self->binary_handle->allowed_offset = allowed_offset;
+  return 0;
+}
+
+int WebRtc_get_allowed_offset(const void* handle) {
+  const DelayEstimator* self = (const DelayEstimator*)handle;
+
+  if (self == NULL) {
+    return -1;
+  }
+  return self->binary_handle->allowed_offset;
+}
+
+int WebRtc_enable_robust_validation(void* handle, int enable) {
+  DelayEstimator* self = (DelayEstimator*)handle;
+
+  if (self == NULL) {
+    return -1;
+  }
+  if ((enable < 0) || (enable > 1)) {
+    return -1;
+  }
+  RTC_DCHECK(self->binary_handle);
+  self->binary_handle->robust_validation_enabled = enable;
+  return 0;
+}
+
+int WebRtc_is_robust_validation_enabled(const void* handle) {
+  const DelayEstimator* self = (const DelayEstimator*)handle;
+
+  if (self == NULL) {
+    return -1;
+  }
+  return self->binary_handle->robust_validation_enabled;
+}
+
+int WebRtc_DelayEstimatorProcessFix(void* handle,
+                                    const uint16_t* near_spectrum,
+                                    int spectrum_size,
+                                    int near_q) {
+  DelayEstimator* self = (DelayEstimator*)handle;
+  uint32_t binary_spectrum = 0;
+
+  if (self == NULL) {
+    return -1;
+  }
+  if (near_spectrum == NULL) {
+    // Empty near end spectrum.
+    return -1;
+  }
+  if (spectrum_size != self->spectrum_size) {
+    // Data sizes don't match.
+    return -1;
+  }
+  if (near_q > 15) {
+    // If |near_q| is larger than 15 we cannot guarantee no wrap around.
+    return -1;
+  }
+
+  // Get binary spectra.
+  binary_spectrum =
+      BinarySpectrumFix(near_spectrum, self->mean_near_spectrum, near_q,
+                        &(self->near_spectrum_initialized));
+
+  return WebRtc_ProcessBinarySpectrum(self->binary_handle, binary_spectrum);
+}
+
+int WebRtc_DelayEstimatorProcessFloat(void* handle,
+                                      const float* near_spectrum,
+                                      int spectrum_size) {
+  DelayEstimator* self = (DelayEstimator*)handle;
+  uint32_t binary_spectrum = 0;
+
+  if (self == NULL) {
+    return -1;
+  }
+  if (near_spectrum == NULL) {
+    // Empty near end spectrum.
+    return -1;
+  }
+  if (spectrum_size != self->spectrum_size) {
+    // Data sizes don't match.
+    return -1;
+  }
+
+  // Get binary spectrum.
+  binary_spectrum = BinarySpectrumFloat(near_spectrum, self->mean_near_spectrum,
+                                        &(self->near_spectrum_initialized));
+
+  return WebRtc_ProcessBinarySpectrum(self->binary_handle, binary_spectrum);
+}
+
+int WebRtc_last_delay(void* handle) {
+  DelayEstimator* self = (DelayEstimator*)handle;
+
+  if (self == NULL) {
+    return -1;
+  }
+
+  return WebRtc_binary_last_delay(self->binary_handle);
+}
+
+float WebRtc_last_delay_quality(void* handle) {
+  DelayEstimator* self = (DelayEstimator*)handle;
+  RTC_DCHECK(self);
+  return WebRtc_binary_last_delay_quality(self->binary_handle);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_wrapper.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_wrapper.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_wrapper.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/delay_estimator_wrapper.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,248 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Performs delay estimation on block by block basis.
+// The return value is  0 - OK and -1 - Error, unless otherwise stated.
+
+#ifndef MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_
+#define MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_
+
+#include <stdint.h>
+
+namespace webrtc {
+
+// Releases the memory allocated by WebRtc_CreateDelayEstimatorFarend(...)
+void WebRtc_FreeDelayEstimatorFarend(void* handle);
+
+// Allocates the memory needed by the far-end part of the delay estimation. The
+// memory needs to be initialized separately through
+// WebRtc_InitDelayEstimatorFarend(...).
+//
+// Inputs:
+//  - spectrum_size     : Size of the spectrum used both in far-end and
+//                        near-end. Used to allocate memory for spectrum
+//                        specific buffers.
+//  - history_size      : The far-end history buffer size. A change in buffer
+//                        size can be forced with WebRtc_set_history_size().
+//                        Note that the maximum delay which can be estimated is
+//                        determined together with WebRtc_set_lookahead().
+//
+// Return value:
+//  - void*             : Created |handle|. If the memory can't be allocated or
+//                        if any of the input parameters are invalid NULL is
+//                        returned.
+void* WebRtc_CreateDelayEstimatorFarend(int spectrum_size, int history_size);
+
+// Initializes the far-end part of the delay estimation instance returned by
+// WebRtc_CreateDelayEstimatorFarend(...)
+int WebRtc_InitDelayEstimatorFarend(void* handle);
+
+// Soft resets the far-end part of the delay estimation instance returned by
+// WebRtc_CreateDelayEstimatorFarend(...).
+// Input:
+//      - delay_shift   : The amount of blocks to shift history buffers.
+void WebRtc_SoftResetDelayEstimatorFarend(void* handle, int delay_shift);
+
+// Adds the far-end spectrum to the far-end history buffer. This spectrum is
+// used as reference when calculating the delay using
+// WebRtc_ProcessSpectrum().
+//
+// Inputs:
+//    - far_spectrum    : Far-end spectrum.
+//    - spectrum_size   : The size of the data arrays (same for both far- and
+//                        near-end).
+//    - far_q           : The Q-domain of the far-end data.
+//
+// Output:
+//    - handle          : Updated far-end instance.
+//
+int WebRtc_AddFarSpectrumFix(void* handle,
+                             const uint16_t* far_spectrum,
+                             int spectrum_size,
+                             int far_q);
+
+// See WebRtc_AddFarSpectrumFix() for description.
+int WebRtc_AddFarSpectrumFloat(void* handle,
+                               const float* far_spectrum,
+                               int spectrum_size);
+
+// Releases the memory allocated by WebRtc_CreateDelayEstimator(...)
+void WebRtc_FreeDelayEstimator(void* handle);
+
+// Allocates the memory needed by the delay estimation. The memory needs to be
+// initialized separately through WebRtc_InitDelayEstimator(...).
+//
+// Inputs:
+//      - farend_handle : Pointer to the far-end part of the delay estimation
+//                        instance created prior to this call using
+//                        WebRtc_CreateDelayEstimatorFarend().
+//
+//                        Note that WebRtc_CreateDelayEstimator does not take
+//                        ownership of |farend_handle|, which has to be torn
+//                        down properly after this instance.
+//
+//      - max_lookahead : Maximum amount of non-causal lookahead allowed. The
+//                        actual amount of lookahead used can be controlled by
+//                        WebRtc_set_lookahead(...). The default |lookahead| is
+//                        set to |max_lookahead| at create time. Use
+//                        WebRtc_set_lookahead(...) before start if a different
+//                        value is desired.
+//
+//                        Using lookahead can detect cases in which a near-end
+//                        signal occurs before the corresponding far-end signal.
+//                        It will delay the estimate for the current block by an
+//                        equal amount, and the returned values will be offset
+//                        by it.
+//
+//                        A value of zero is the typical no-lookahead case.
+//                        This also represents the minimum delay which can be
+//                        estimated.
+//
+//                        Note that the effective range of delay estimates is
+//                        [-|lookahead|,... ,|history_size|-|lookahead|)
+//                        where |history_size| is set through
+//                        WebRtc_set_history_size().
+//
+// Return value:
+//      - void*         : Created |handle|. If the memory can't be allocated or
+//                        if any of the input parameters are invalid NULL is
+//                        returned.
+void* WebRtc_CreateDelayEstimator(void* farend_handle, int max_lookahead);
+
+// Initializes the delay estimation instance returned by
+// WebRtc_CreateDelayEstimator(...)
+int WebRtc_InitDelayEstimator(void* handle);
+
+// Soft resets the delay estimation instance returned by
+// WebRtc_CreateDelayEstimator(...)
+// Input:
+//      - delay_shift   : The amount of blocks to shift history buffers.
+//
+// Return value:
+//      - actual_shifts : The actual number of shifts performed.
+int WebRtc_SoftResetDelayEstimator(void* handle, int delay_shift);
+
+// Sets the effective |history_size| used. Valid values from 2. We simply need
+// at least two delays to compare to perform an estimate. If |history_size| is
+// changed, buffers are reallocated filling in with zeros if necessary.
+// Note that changing the |history_size| affects both buffers in far-end and
+// near-end. Hence it is important to change all DelayEstimators that use the
+// same reference far-end, to the same |history_size| value.
+// Inputs:
+//  - handle            : Pointer to the delay estimation instance.
+//  - history_size      : Effective history size to be used.
+// Return value:
+//  - new_history_size  : The new history size used. If the memory was not able
+//                        to be allocated 0 is returned.
+int WebRtc_set_history_size(void* handle, int history_size);
+
+// Returns the history_size currently used.
+// Input:
+//      - handle        : Pointer to the delay estimation instance.
+int WebRtc_history_size(const void* handle);
+
+// Sets the amount of |lookahead| to use. Valid values are [0, max_lookahead]
+// where |max_lookahead| was set at create time through
+// WebRtc_CreateDelayEstimator(...).
+//
+// Input:
+//      - handle        : Pointer to the delay estimation instance.
+//      - lookahead     : The amount of lookahead to be used.
+//
+// Return value:
+//      - new_lookahead : The actual amount of lookahead set, unless |handle| is
+//                        a NULL pointer or |lookahead| is invalid, for which an
+//                        error is returned.
+int WebRtc_set_lookahead(void* handle, int lookahead);
+
+// Returns the amount of lookahead we currently use.
+// Input:
+//      - handle        : Pointer to the delay estimation instance.
+int WebRtc_lookahead(void* handle);
+
+// Sets the |allowed_offset| used in the robust validation scheme.  If the
+// delay estimator is used in an echo control component, this parameter is
+// related to the filter length.  In principle |allowed_offset| should be set to
+// the echo control filter length minus the expected echo duration, i.e., the
+// delay offset the echo control can handle without quality regression.  The
+// default value, used if not set manually, is zero.  Note that |allowed_offset|
+// has to be non-negative.
+// Inputs:
+//  - handle            : Pointer to the delay estimation instance.
+//  - allowed_offset    : The amount of delay offset, measured in partitions,
+//                        the echo control filter can handle.
+int WebRtc_set_allowed_offset(void* handle, int allowed_offset);
+
+// Returns the |allowed_offset| in number of partitions.
+int WebRtc_get_allowed_offset(const void* handle);
+
+// Enables/Disables a robust validation functionality in the delay estimation.
+// This is by default set to disabled at create time.  The state is preserved
+// over a reset.
+// Inputs:
+//      - handle        : Pointer to the delay estimation instance.
+//      - enable        : Enable (1) or disable (0) this feature.
+int WebRtc_enable_robust_validation(void* handle, int enable);
+
+// Returns 1 if robust validation is enabled and 0 if disabled.
+int WebRtc_is_robust_validation_enabled(const void* handle);
+
+// Estimates and returns the delay between the far-end and near-end blocks. The
+// value will be offset by the lookahead (i.e. the lookahead should be
+// subtracted from the returned value).
+// Inputs:
+//      - handle        : Pointer to the delay estimation instance.
+//      - near_spectrum : Pointer to the near-end spectrum data of the current
+//                        block.
+//      - spectrum_size : The size of the data arrays (same for both far- and
+//                        near-end).
+//      - near_q        : The Q-domain of the near-end data.
+//
+// Output:
+//      - handle        : Updated instance.
+//
+// Return value:
+//      - delay         :  >= 0 - Calculated delay value.
+//                        -1    - Error.
+//                        -2    - Insufficient data for estimation.
+int WebRtc_DelayEstimatorProcessFix(void* handle,
+                                    const uint16_t* near_spectrum,
+                                    int spectrum_size,
+                                    int near_q);
+
+// See WebRtc_DelayEstimatorProcessFix() for description.
+int WebRtc_DelayEstimatorProcessFloat(void* handle,
+                                      const float* near_spectrum,
+                                      int spectrum_size);
+
+// Returns the last calculated delay updated by the function
+// WebRtc_DelayEstimatorProcess(...).
+//
+// Input:
+//      - handle        : Pointer to the delay estimation instance.
+//
+// Return value:
+//      - delay         : >= 0  - Last calculated delay value.
+//                        -1    - Error.
+//                        -2    - Insufficient data for estimation.
+int WebRtc_last_delay(void* handle);
+
+// Returns the estimation quality/probability of the last calculated delay
+// updated by the function WebRtc_DelayEstimatorProcess(...). The estimation
+// quality is a value in the interval [0, 1]. The higher the value, the better
+// the quality.
+//
+// Return value:
+//      - delay_quality : >= 0  - Estimation quality of last calculated delay.
+float WebRtc_last_delay_quality(void* handle);
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_UTILITY_DELAY_ESTIMATOR_WRAPPER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/DEPS asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/DEPS
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/DEPS	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/DEPS	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,3 @@
+include_rules = [
+  "+third_party/pffft",
+]
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,135 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/utility/pffft_wrapper.h"
+
+#include "rtc_base/checks.h"
+#include "third_party/pffft/src/pffft.h"
+
+namespace webrtc {
+namespace {
+
+size_t GetBufferSize(size_t fft_size, Pffft::FftType fft_type) {
+  return fft_size * (fft_type == Pffft::FftType::kReal ? 1 : 2);
+}
+
+float* AllocatePffftBuffer(size_t size) {
+  return static_cast<float*>(pffft_aligned_malloc(size * sizeof(float)));
+}
+
+}  // namespace
+
+Pffft::FloatBuffer::FloatBuffer(size_t fft_size, FftType fft_type)
+    : size_(GetBufferSize(fft_size, fft_type)),
+      data_(AllocatePffftBuffer(size_)) {}
+
+Pffft::FloatBuffer::~FloatBuffer() {
+  pffft_aligned_free(data_);
+}
+
+rtc::ArrayView<const float> Pffft::FloatBuffer::GetConstView() const {
+  return {data_, size_};
+}
+
+rtc::ArrayView<float> Pffft::FloatBuffer::GetView() {
+  return {data_, size_};
+}
+
+Pffft::Pffft(size_t fft_size, FftType fft_type)
+    : fft_size_(fft_size),
+      fft_type_(fft_type),
+      pffft_status_(pffft_new_setup(
+          fft_size_,
+          fft_type == Pffft::FftType::kReal ? PFFFT_REAL : PFFFT_COMPLEX)),
+      scratch_buffer_(
+          AllocatePffftBuffer(GetBufferSize(fft_size_, fft_type_))) {
+  RTC_DCHECK(pffft_status_);
+  RTC_DCHECK(scratch_buffer_);
+}
+
+Pffft::~Pffft() {
+  pffft_destroy_setup(pffft_status_);
+  pffft_aligned_free(scratch_buffer_);
+}
+
+bool Pffft::IsValidFftSize(size_t fft_size, FftType fft_type) {
+  if (fft_size == 0) {
+    return false;
+  }
+  // PFFFT only supports transforms for inputs of length N of the form
+  // N = (2^a)*(3^b)*(5^c) where b >=0 and c >= 0 and a >= 5 for the real FFT
+  // and a >= 4 for the complex FFT.
+  constexpr int kFactors[] = {2, 3, 5};
+  int factorization[] = {0, 0, 0};
+  int n = static_cast<int>(fft_size);
+  for (int i = 0; i < 3; ++i) {
+    while (n % kFactors[i] == 0) {
+      n = n / kFactors[i];
+      factorization[i]++;
+    }
+  }
+  int a_min = (fft_type == Pffft::FftType::kReal) ? 5 : 4;
+  return factorization[0] >= a_min && n == 1;
+}
+
+bool Pffft::IsSimdEnabled() {
+  return pffft_simd_size() > 1;
+}
+
+std::unique_ptr<Pffft::FloatBuffer> Pffft::CreateBuffer() const {
+  // Cannot use make_unique from absl because Pffft is the only friend of
+  // Pffft::FloatBuffer.
+  std::unique_ptr<Pffft::FloatBuffer> buffer(
+      new Pffft::FloatBuffer(fft_size_, fft_type_));
+  return buffer;
+}
+
+void Pffft::ForwardTransform(const FloatBuffer& in,
+                             FloatBuffer* out,
+                             bool ordered) {
+  RTC_DCHECK_EQ(in.size(), GetBufferSize(fft_size_, fft_type_));
+  RTC_DCHECK_EQ(in.size(), out->size());
+  RTC_DCHECK(scratch_buffer_);
+  if (ordered) {
+    pffft_transform_ordered(pffft_status_, in.const_data(), out->data(),
+                            scratch_buffer_, PFFFT_FORWARD);
+  } else {
+    pffft_transform(pffft_status_, in.const_data(), out->data(),
+                    scratch_buffer_, PFFFT_FORWARD);
+  }
+}
+
+void Pffft::BackwardTransform(const FloatBuffer& in,
+                              FloatBuffer* out,
+                              bool ordered) {
+  RTC_DCHECK_EQ(in.size(), GetBufferSize(fft_size_, fft_type_));
+  RTC_DCHECK_EQ(in.size(), out->size());
+  RTC_DCHECK(scratch_buffer_);
+  if (ordered) {
+    pffft_transform_ordered(pffft_status_, in.const_data(), out->data(),
+                            scratch_buffer_, PFFFT_BACKWARD);
+  } else {
+    pffft_transform(pffft_status_, in.const_data(), out->data(),
+                    scratch_buffer_, PFFFT_BACKWARD);
+  }
+}
+
+void Pffft::FrequencyDomainConvolve(const FloatBuffer& fft_x,
+                                    const FloatBuffer& fft_y,
+                                    FloatBuffer* out,
+                                    float scaling) {
+  RTC_DCHECK_EQ(fft_x.size(), GetBufferSize(fft_size_, fft_type_));
+  RTC_DCHECK_EQ(fft_x.size(), fft_y.size());
+  RTC_DCHECK_EQ(fft_x.size(), out->size());
+  pffft_zconvolve_accumulate(pffft_status_, fft_x.const_data(),
+                             fft_y.const_data(), out->data(), scaling);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,94 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef MODULES_AUDIO_PROCESSING_UTILITY_PFFFT_WRAPPER_H_
+#define MODULES_AUDIO_PROCESSING_UTILITY_PFFFT_WRAPPER_H_
+
+#include <memory>
+
+#include "api/array_view.h"
+
+// Forward declaration.
+struct PFFFT_Setup;
+
+namespace webrtc {
+
+// Pretty-Fast Fast Fourier Transform (PFFFT) wrapper class.
+// Not thread safe.
+class Pffft {
+ public:
+  enum class FftType { kReal, kComplex };
+
+  // 1D floating point buffer used as input/output data type for the FFT ops.
+  // It must be constructed using Pffft::CreateBuffer().
+  class FloatBuffer {
+   public:
+    FloatBuffer(const FloatBuffer&) = delete;
+    FloatBuffer& operator=(const FloatBuffer&) = delete;
+    ~FloatBuffer();
+
+    rtc::ArrayView<const float> GetConstView() const;
+    rtc::ArrayView<float> GetView();
+
+   private:
+    friend class Pffft;
+    FloatBuffer(size_t fft_size, FftType fft_type);
+    const float* const_data() const { return data_; }
+    float* data() { return data_; }
+    size_t size() const { return size_; }
+
+    const size_t size_;
+    float* const data_;
+  };
+
+  // TODO(https://crbug.com/webrtc/9577): Consider adding a factory and making
+  // the ctor private.
+  // static std::unique_ptr<Pffft> Create(size_t fft_size,
+  // FftType fft_type); Ctor. |fft_size| must be a supported size (see
+  // Pffft::IsValidFftSize()). If not supported, the code will crash.
+  Pffft(size_t fft_size, FftType fft_type);
+  Pffft(const Pffft&) = delete;
+  Pffft& operator=(const Pffft&) = delete;
+  ~Pffft();
+
+  // Returns true if the FFT size is supported.
+  static bool IsValidFftSize(size_t fft_size, FftType fft_type);
+
+  // Returns true if SIMD code optimizations are being used.
+  static bool IsSimdEnabled();
+
+  // Creates a buffer of the right size.
+  std::unique_ptr<FloatBuffer> CreateBuffer() const;
+
+  // TODO(https://crbug.com/webrtc/9577): Overload with rtc::ArrayView args.
+  // Computes the forward fast Fourier transform.
+  void ForwardTransform(const FloatBuffer& in, FloatBuffer* out, bool ordered);
+  // Computes the backward fast Fourier transform.
+  void BackwardTransform(const FloatBuffer& in, FloatBuffer* out, bool ordered);
+
+  // Multiplies the frequency components of |fft_x| and |fft_y| and accumulates
+  // them into |out|. The arrays must have been obtained with
+  // ForwardTransform(..., /*ordered=*/false) - i.e., |fft_x| and |fft_y| must
+  // not be ordered.
+  void FrequencyDomainConvolve(const FloatBuffer& fft_x,
+                               const FloatBuffer& fft_y,
+                               FloatBuffer* out,
+                               float scaling = 1.f);
+
+ private:
+  const size_t fft_size_;
+  const FftType fft_type_;
+  PFFFT_Setup* pffft_status_;
+  float* const scratch_buffer_;
+};
+
+}  // namespace webrtc
+
+#endif  // MODULES_AUDIO_PROCESSING_UTILITY_PFFFT_WRAPPER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper_unittest.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper_unittest.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper_unittest.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/modules/audio_processing/utility/pffft_wrapper_unittest.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,182 @@
+/*
+ *  Copyright (c) 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "modules/audio_processing/utility/pffft_wrapper.h"
+
+#include <algorithm>
+#include <cstdlib>
+#include <memory>
+
+#include "test/gtest.h"
+#include "third_party/pffft/src/pffft.h"
+
+namespace webrtc {
+namespace test {
+namespace {
+
+constexpr size_t kMaxValidSizeCheck = 1024;
+
+static constexpr int kFftSizes[] = {
+    16,  32,      64,  96,  128,  160,  192,  256,  288,  384,   5 * 96, 512,
+    576, 5 * 128, 800, 864, 1024, 2048, 2592, 4000, 4096, 12000, 36864};
+
+void CreatePffftWrapper(size_t fft_size, Pffft::FftType fft_type) {
+  Pffft pffft_wrapper(fft_size, fft_type);
+}
+
+float* AllocateScratchBuffer(size_t fft_size, bool complex_fft) {
+  return static_cast<float*>(
+      pffft_aligned_malloc(fft_size * (complex_fft ? 2 : 1) * sizeof(float)));
+}
+
+double frand() {
+  return std::rand() / static_cast<double>(RAND_MAX);
+}
+
+void ExpectArrayViewsEquality(rtc::ArrayView<const float> a,
+                              rtc::ArrayView<const float> b) {
+  ASSERT_EQ(a.size(), b.size());
+  for (size_t i = 0; i < a.size(); ++i) {
+    SCOPED_TRACE(i);
+    EXPECT_EQ(a[i], b[i]);
+  }
+}
+
+// Compares the output of the PFFFT C++ wrapper to that of the C PFFFT.
+// Bit-exactness is expected.
+void PffftValidateWrapper(size_t fft_size, bool complex_fft) {
+  // Always use the same seed to avoid flakiness.
+  std::srand(0);
+
+  // Init PFFFT.
+  PFFFT_Setup* pffft_status =
+      pffft_new_setup(fft_size, complex_fft ? PFFFT_COMPLEX : PFFFT_REAL);
+  ASSERT_TRUE(pffft_status) << "FFT size (" << fft_size << ") not supported.";
+  size_t num_floats = fft_size * (complex_fft ? 2 : 1);
+  int num_bytes = static_cast<int>(num_floats) * sizeof(float);
+  float* in = static_cast<float*>(pffft_aligned_malloc(num_bytes));
+  float* out = static_cast<float*>(pffft_aligned_malloc(num_bytes));
+  float* scratch = AllocateScratchBuffer(fft_size, complex_fft);
+
+  // Init PFFFT C++ wrapper.
+  Pffft::FftType fft_type =
+      complex_fft ? Pffft::FftType::kComplex : Pffft::FftType::kReal;
+  ASSERT_TRUE(Pffft::IsValidFftSize(fft_size, fft_type));
+  Pffft pffft_wrapper(fft_size, fft_type);
+  auto in_wrapper = pffft_wrapper.CreateBuffer();
+  auto out_wrapper = pffft_wrapper.CreateBuffer();
+
+  // Input and output buffers views.
+  rtc::ArrayView<float> in_view(in, num_floats);
+  rtc::ArrayView<float> out_view(out, num_floats);
+  auto in_wrapper_view = in_wrapper->GetView();
+  EXPECT_EQ(in_wrapper_view.size(), num_floats);
+  auto out_wrapper_view = out_wrapper->GetConstView();
+  EXPECT_EQ(out_wrapper_view.size(), num_floats);
+
+  // Random input data.
+  for (size_t i = 0; i < num_floats; ++i) {
+    in_wrapper_view[i] = in[i] = static_cast<float>(frand() * 2.0 - 1.0);
+  }
+
+  // Forward transform.
+  pffft_transform(pffft_status, in, out, scratch, PFFFT_FORWARD);
+  pffft_wrapper.ForwardTransform(*in_wrapper, out_wrapper.get(),
+                                 /*ordered=*/false);
+  ExpectArrayViewsEquality(out_view, out_wrapper_view);
+
+  // Copy the FFT results into the input buffers to compute the backward FFT.
+  std::copy(out_view.begin(), out_view.end(), in_view.begin());
+  std::copy(out_wrapper_view.begin(), out_wrapper_view.end(),
+            in_wrapper_view.begin());
+
+  // Backward transform.
+  pffft_transform(pffft_status, in, out, scratch, PFFFT_BACKWARD);
+  pffft_wrapper.BackwardTransform(*in_wrapper, out_wrapper.get(),
+                                  /*ordered=*/false);
+  ExpectArrayViewsEquality(out_view, out_wrapper_view);
+
+  pffft_destroy_setup(pffft_status);
+  pffft_aligned_free(in);
+  pffft_aligned_free(out);
+  pffft_aligned_free(scratch);
+}
+
+}  // namespace
+
+TEST(PffftTest, CreateWrapperWithValidSize) {
+  for (size_t fft_size = 0; fft_size < kMaxValidSizeCheck; ++fft_size) {
+    SCOPED_TRACE(fft_size);
+    if (Pffft::IsValidFftSize(fft_size, Pffft::FftType::kReal)) {
+      CreatePffftWrapper(fft_size, Pffft::FftType::kReal);
+    }
+    if (Pffft::IsValidFftSize(fft_size, Pffft::FftType::kComplex)) {
+      CreatePffftWrapper(fft_size, Pffft::FftType::kComplex);
+    }
+  }
+}
+
+#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
+
+class PffftInvalidSizeDeathTest : public ::testing::Test,
+                                  public ::testing::WithParamInterface<size_t> {
+};
+
+TEST_P(PffftInvalidSizeDeathTest, DoNotCreateRealWrapper) {
+  size_t fft_size = GetParam();
+  ASSERT_FALSE(Pffft::IsValidFftSize(fft_size, Pffft::FftType::kReal));
+  EXPECT_DEATH(CreatePffftWrapper(fft_size, Pffft::FftType::kReal), "");
+}
+
+TEST_P(PffftInvalidSizeDeathTest, DoNotCreateComplexWrapper) {
+  size_t fft_size = GetParam();
+  ASSERT_FALSE(Pffft::IsValidFftSize(fft_size, Pffft::FftType::kComplex));
+  EXPECT_DEATH(CreatePffftWrapper(fft_size, Pffft::FftType::kComplex), "");
+}
+
+INSTANTIATE_TEST_SUITE_P(PffftTest,
+                         PffftInvalidSizeDeathTest,
+                         ::testing::Values(17,
+                                           33,
+                                           65,
+                                           97,
+                                           129,
+                                           161,
+                                           193,
+                                           257,
+                                           289,
+                                           385,
+                                           481,
+                                           513,
+                                           577,
+                                           641,
+                                           801,
+                                           865,
+                                           1025));
+
+#endif
+
+// TODO(https://crbug.com/webrtc/9577): Enable once SIMD is always enabled.
+TEST(PffftTest, DISABLED_CheckSimd) {
+  EXPECT_TRUE(Pffft::IsSimdEnabled());
+}
+
+TEST(PffftTest, FftBitExactness) {
+  for (int fft_size : kFftSizes) {
+    SCOPED_TRACE(fft_size);
+    if (fft_size != 16) {
+      PffftValidateWrapper(fft_size, /*complex_fft=*/false);
+    }
+    PffftValidateWrapper(fft_size, /*complex_fft=*/true);
+  }
+}
+
+}  // namespace test
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/arraysize.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/arraysize.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/arraysize.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/arraysize.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_ARRAYSIZE_H_
+#define RTC_BASE_ARRAYSIZE_H_
+
+#include <stddef.h>
+
+// This file defines the arraysize() macro and is derived from Chromium's
+// base/macros.h.
+
+// The arraysize(arr) macro returns the # of elements in an array arr.
+// The expression is a compile-time constant, and therefore can be
+// used in defining new arrays, for example.  If you use arraysize on
+// a pointer by mistake, you will get a compile-time error.
+
+// This template function declaration is used in defining arraysize.
+// Note that the function doesn't need an implementation, as we only
+// use its type.
+template <typename T, size_t N>
+char (&ArraySizeHelper(T (&array)[N]))[N];
+
+#define arraysize(array) (sizeof(ArraySizeHelper(array)))
+
+#endif  // RTC_BASE_ARRAYSIZE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/atomic_ops.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/atomic_ops.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/atomic_ops.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/atomic_ops.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,79 @@
+/*
+ *  Copyright 2011 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_ATOMIC_OPS_H_
+#define RTC_BASE_ATOMIC_OPS_H_
+
+#if defined(WEBRTC_WIN)
+// clang-format off
+// clang formating would change include order.
+
+// Include winsock2.h before including <windows.h> to maintain consistency with
+// win32.h. To include win32.h directly, it must be broken out into its own
+// build target.
+#include <winsock2.h>
+#include <windows.h>
+// clang-format on
+#endif  // defined(WEBRTC_WIN)
+
+namespace rtc {
+class AtomicOps {
+ public:
+#if defined(WEBRTC_WIN)
+  // Assumes sizeof(int) == sizeof(LONG), which it is on Win32 and Win64.
+  static int Increment(volatile int* i) {
+    return ::InterlockedIncrement(reinterpret_cast<volatile LONG*>(i));
+  }
+  static int Decrement(volatile int* i) {
+    return ::InterlockedDecrement(reinterpret_cast<volatile LONG*>(i));
+  }
+  static int AcquireLoad(volatile const int* i) { return *i; }
+  static void ReleaseStore(volatile int* i, int value) { *i = value; }
+  static int CompareAndSwap(volatile int* i, int old_value, int new_value) {
+    return ::InterlockedCompareExchange(reinterpret_cast<volatile LONG*>(i),
+                                        new_value, old_value);
+  }
+  // Pointer variants.
+  template <typename T>
+  static T* AcquireLoadPtr(T* volatile* ptr) {
+    return *ptr;
+  }
+  template <typename T>
+  static T* CompareAndSwapPtr(T* volatile* ptr, T* old_value, T* new_value) {
+    return static_cast<T*>(::InterlockedCompareExchangePointer(
+        reinterpret_cast<PVOID volatile*>(ptr), new_value, old_value));
+  }
+#else
+  static int Increment(volatile int* i) { return __sync_add_and_fetch(i, 1); }
+  static int Decrement(volatile int* i) { return __sync_sub_and_fetch(i, 1); }
+  static int AcquireLoad(volatile const int* i) {
+    return __atomic_load_n(i, __ATOMIC_ACQUIRE);
+  }
+  static void ReleaseStore(volatile int* i, int value) {
+    __atomic_store_n(i, value, __ATOMIC_RELEASE);
+  }
+  static int CompareAndSwap(volatile int* i, int old_value, int new_value) {
+    return __sync_val_compare_and_swap(i, old_value, new_value);
+  }
+  // Pointer variants.
+  template <typename T>
+  static T* AcquireLoadPtr(T* volatile* ptr) {
+    return __atomic_load_n(ptr, __ATOMIC_ACQUIRE);
+  }
+  template <typename T>
+  static T* CompareAndSwapPtr(T* volatile* ptr, T* old_value, T* new_value) {
+    return __sync_val_compare_and_swap(ptr, old_value, new_value);
+  }
+#endif
+};
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_ATOMIC_OPS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/checks.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/checks.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/checks.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/checks.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,228 @@
+/*
+ *  Copyright 2006 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Most of this was borrowed (with minor modifications) from V8's and Chromium's
+// src/base/logging.cc.
+
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+
+#if defined(WEBRTC_ANDROID)
+#define RTC_LOG_TAG_ANDROID "rtc"
+#include <android/log.h>  // NOLINT
+#endif
+
+#if defined(WEBRTC_WIN)
+#include <windows.h>
+#endif
+
+#if defined(WEBRTC_WIN)
+#define LAST_SYSTEM_ERROR (::GetLastError())
+#elif defined(__native_client__) && __native_client__
+#define LAST_SYSTEM_ERROR (0)
+#elif defined(WEBRTC_POSIX)
+#include <errno.h>
+#define LAST_SYSTEM_ERROR (errno)
+#endif  // WEBRTC_WIN
+
+#include "rtc_base/checks.h"
+
+namespace {
+
+RTC_NORETURN void WriteFatalLogAndAbort(const std::string& output) {
+  const char* output_c = output.c_str();
+#if defined(WEBRTC_ANDROID)
+  __android_log_print(ANDROID_LOG_ERROR, RTC_LOG_TAG_ANDROID, "%s\n", output_c);
+#endif
+  fflush(stdout);
+  fprintf(stderr, "%s", output_c);
+  fflush(stderr);
+#if defined(WEBRTC_WIN)
+  DebugBreak();
+#endif
+  abort();
+}
+
+#if defined(__GNUC__)
+__attribute__((__format__(__printf__, 2, 3)))
+#endif
+void AppendFormat(std::string* s, const char* fmt, ...) {
+  va_list args, copy;
+  va_start(args, fmt);
+  va_copy(copy, args);
+  const int predicted_length = std::vsnprintf(nullptr, 0, fmt, copy);
+  va_end(copy);
+
+  if (predicted_length > 0) {
+    const size_t size = s->size();
+    s->resize(size + predicted_length);
+    // Pass "+ 1" to vsnprintf to include space for the '\0'.
+    std::vsnprintf(&((*s)[size]), predicted_length + 1, fmt, args);
+  }
+  va_end(args);
+}
+}  // namespace
+
+namespace rtc {
+namespace webrtc_checks_impl {
+
+#if RTC_CHECK_MSG_ENABLED
+// Reads one argument from args, appends it to s and advances fmt.
+// Returns true iff an argument was sucessfully parsed.
+bool ParseArg(va_list* args, const CheckArgType** fmt, std::string* s) {
+  if (**fmt == CheckArgType::kEnd)
+    return false;
+
+  switch (**fmt) {
+    case CheckArgType::kInt:
+      AppendFormat(s, "%d", va_arg(*args, int));
+      break;
+    case CheckArgType::kLong:
+      AppendFormat(s, "%ld", va_arg(*args, long));
+      break;
+    case CheckArgType::kLongLong:
+      AppendFormat(s, "%lld", va_arg(*args, long long));
+      break;
+    case CheckArgType::kUInt:
+      AppendFormat(s, "%u", va_arg(*args, unsigned));
+      break;
+    case CheckArgType::kULong:
+      AppendFormat(s, "%lu", va_arg(*args, unsigned long));
+      break;
+    case CheckArgType::kULongLong:
+      AppendFormat(s, "%llu", va_arg(*args, unsigned long long));
+      break;
+    case CheckArgType::kDouble:
+      AppendFormat(s, "%g", va_arg(*args, double));
+      break;
+    case CheckArgType::kLongDouble:
+      AppendFormat(s, "%Lg", va_arg(*args, long double));
+      break;
+    case CheckArgType::kCharP:
+      s->append(va_arg(*args, const char*));
+      break;
+    case CheckArgType::kStdString:
+      s->append(*va_arg(*args, const std::string*));
+      break;
+    case CheckArgType::kStringView: {
+      const absl::string_view sv = *va_arg(*args, const absl::string_view*);
+      s->append(sv.data(), sv.size());
+      break;
+    }
+    case CheckArgType::kVoidP:
+      AppendFormat(s, "%p", va_arg(*args, const void*));
+      break;
+    default:
+      s->append("[Invalid CheckArgType]");
+      return false;
+  }
+  (*fmt)++;
+  return true;
+}
+
+RTC_NORETURN void FatalLog(const char* file,
+                           int line,
+                           const char* message,
+                           const CheckArgType* fmt,
+                           ...) {
+  va_list args;
+  va_start(args, fmt);
+
+  std::string s;
+  AppendFormat(&s,
+               "\n\n"
+               "#\n"
+               "# Fatal error in: %s, line %d\n"
+               "# last system error: %u\n"
+               "# Check failed: %s",
+               file, line, LAST_SYSTEM_ERROR, message);
+
+  if (*fmt == CheckArgType::kCheckOp) {
+    // This log message was generated by RTC_CHECK_OP, so we have to complete
+    // the error message using the operands that have been passed as the first
+    // two arguments.
+    fmt++;
+
+    std::string s1, s2;
+    if (ParseArg(&args, &fmt, &s1) && ParseArg(&args, &fmt, &s2))
+      AppendFormat(&s, " (%s vs. %s)\n# ", s1.c_str(), s2.c_str());
+  } else {
+    s.append("\n# ");
+  }
+
+  // Append all the user-supplied arguments to the message.
+  while (ParseArg(&args, &fmt, &s))
+    ;
+
+  va_end(args);
+
+  WriteFatalLogAndAbort(s);
+}
+#else  // RTC_CHECK_MSG_ENABLED
+RTC_NORETURN void FatalLog(const char* file, int line) {
+  std::string s;
+  AppendFormat(&s,
+               "\n\n"
+               "#\n"
+               "# Fatal error in: %s, line %d\n"
+               "# last system error: %u\n"
+               "# Check failed.\n"
+               "# ",
+               file, line, LAST_SYSTEM_ERROR);
+  WriteFatalLogAndAbort(s);
+}
+#endif  // RTC_CHECK_MSG_ENABLED
+
+#if RTC_DCHECK_IS_ON
+
+RTC_NORETURN void UnreachableCodeReached(const char* file, int line) {
+  std::string s;
+  AppendFormat(&s,
+               "\n\n"
+               "#\n"
+               "# Unreachable code reached: %s, line %d\n"
+               "# last system error: %u\n"
+               "# ",
+               file, line, LAST_SYSTEM_ERROR);
+  WriteFatalLogAndAbort(s);
+}
+
+#else  // !RTC_DCHECK_IS_ON
+
+RTC_NORETURN void UnreachableCodeReached() {
+  std::string s;
+  AppendFormat(&s,
+               "\n\n"
+               "#\n"
+               "# Unreachable code reached (file and line unknown)\n"
+               "# last system error: %u\n"
+               "# ",
+               LAST_SYSTEM_ERROR);
+  WriteFatalLogAndAbort(s);
+}
+
+#endif  // !RTC_DCHECK_IS_ON
+
+}  // namespace webrtc_checks_impl
+}  // namespace rtc
+
+// Function to call from the C version of the RTC_CHECK and RTC_DCHECK macros.
+RTC_NORETURN void rtc_FatalMessage(const char* file,
+                                   int line,
+                                   const char* msg) {
+#if RTC_CHECK_MSG_ENABLED
+  static constexpr rtc::webrtc_checks_impl::CheckArgType t[] = {
+      rtc::webrtc_checks_impl::CheckArgType::kEnd};
+  rtc::webrtc_checks_impl::FatalLog(file, line, msg, t);
+#else
+  rtc::webrtc_checks_impl::FatalLog(file, line);
+#endif
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/checks.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/checks.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/checks.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/checks.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,508 @@
+/*
+ *  Copyright 2006 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_CHECKS_H_
+#define RTC_BASE_CHECKS_H_
+
+// If you for some reson need to know if DCHECKs are on, test the value of
+// RTC_DCHECK_IS_ON. (Test its value, not if it's defined; it'll always be
+// defined, to either a true or a false value.)
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
+#define RTC_DCHECK_IS_ON 1
+#else
+#define RTC_DCHECK_IS_ON 0
+#endif
+
+// Annotate a function that will not return control flow to the caller.
+#if defined(_MSC_VER)
+#define RTC_NORETURN __declspec(noreturn)
+#elif defined(__GNUC__)
+#define RTC_NORETURN __attribute__((__noreturn__))
+#else
+#define RTC_NORETURN
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+RTC_NORETURN void rtc_FatalMessage(const char* file, int line, const char* msg);
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#ifdef RTC_DISABLE_CHECK_MSG
+#define RTC_CHECK_MSG_ENABLED 0
+#else
+#define RTC_CHECK_MSG_ENABLED 1
+#endif
+
+#if RTC_CHECK_MSG_ENABLED
+#define RTC_CHECK_EVAL_MESSAGE(message) message
+#else
+#define RTC_CHECK_EVAL_MESSAGE(message) ""
+#endif
+
+#ifdef __cplusplus
+// C++ version.
+
+#include <string>
+
+#include "absl/meta/type_traits.h"
+#include "absl/strings/string_view.h"
+#include "rtc_base/numerics/safe_compare.h"
+#include "rtc_base/system/inline.h"
+#include "rtc_base/system/rtc_export.h"
+
+// The macros here print a message to stderr and abort under various
+// conditions. All will accept additional stream messages. For example:
+// RTC_DCHECK_EQ(foo, bar) << "I'm printed when foo != bar.";
+//
+// - RTC_CHECK(x) is an assertion that x is always true, and that if it isn't,
+//   it's better to terminate the process than to continue. During development,
+//   the reason that it's better to terminate might simply be that the error
+//   handling code isn't in place yet; in production, the reason might be that
+//   the author of the code truly believes that x will always be true, but that
+//   they recognizes that if they are wrong, abrupt and unpleasant process
+//   termination is still better than carrying on with the assumption violated.
+//
+//   RTC_CHECK always evaluates its argument, so it's OK for x to have side
+//   effects.
+//
+// - RTC_DCHECK(x) is the same as RTC_CHECK(x)---an assertion that x is always
+//   true---except that x will only be evaluated in debug builds; in production
+//   builds, x is simply assumed to be true. This is useful if evaluating x is
+//   expensive and the expected cost of failing to detect the violated
+//   assumption is acceptable. You should not handle cases where a production
+//   build fails to spot a violated condition, even those that would result in
+//   crashes. If the code needs to cope with the error, make it cope, but don't
+//   call RTC_DCHECK; if the condition really can't occur, but you'd sleep
+//   better at night knowing that the process will suicide instead of carrying
+//   on in case you were wrong, use RTC_CHECK instead of RTC_DCHECK.
+//
+//   RTC_DCHECK only evaluates its argument in debug builds, so if x has visible
+//   side effects, you need to write e.g.
+//     bool w = x; RTC_DCHECK(w);
+//
+// - RTC_CHECK_EQ, _NE, _GT, ..., and RTC_DCHECK_EQ, _NE, _GT, ... are
+//   specialized variants of RTC_CHECK and RTC_DCHECK that print prettier
+//   messages if the condition doesn't hold. Prefer them to raw RTC_CHECK and
+//   RTC_DCHECK.
+//
+// - RTC_FATAL() aborts unconditionally.
+
+namespace rtc {
+namespace webrtc_checks_impl {
+enum class CheckArgType : int8_t {
+  kEnd = 0,
+  kInt,
+  kLong,
+  kLongLong,
+  kUInt,
+  kULong,
+  kULongLong,
+  kDouble,
+  kLongDouble,
+  kCharP,
+  kStdString,
+  kStringView,
+  kVoidP,
+
+  // kCheckOp doesn't represent an argument type. Instead, it is sent as the
+  // first argument from RTC_CHECK_OP to make FatalLog use the next two
+  // arguments to build the special CHECK_OP error message
+  // (the "a == b (1 vs. 2)" bit).
+  kCheckOp,
+};
+
+#if RTC_CHECK_MSG_ENABLED
+RTC_NORETURN RTC_EXPORT void FatalLog(const char* file,
+                                      int line,
+                                      const char* message,
+                                      const CheckArgType* fmt,
+                                      ...);
+#else
+RTC_NORETURN RTC_EXPORT void FatalLog(const char* file, int line);
+#endif
+
+// Wrapper for log arguments. Only ever make values of this type with the
+// MakeVal() functions.
+template <CheckArgType N, typename T>
+struct Val {
+  static constexpr CheckArgType Type() { return N; }
+  T GetVal() const { return val; }
+  T val;
+};
+
+// Case for when we need to construct a temp string and then print that.
+// (We can't use Val<CheckArgType::kStdString, const std::string*>
+// because we need somewhere to store the temp string.)
+struct ToStringVal {
+  static constexpr CheckArgType Type() { return CheckArgType::kStdString; }
+  const std::string* GetVal() const { return &val; }
+  std::string val;
+};
+
+inline Val<CheckArgType::kInt, int> MakeVal(int x) {
+  return {x};
+}
+inline Val<CheckArgType::kLong, long> MakeVal(long x) {
+  return {x};
+}
+inline Val<CheckArgType::kLongLong, long long> MakeVal(long long x) {
+  return {x};
+}
+inline Val<CheckArgType::kUInt, unsigned int> MakeVal(unsigned int x) {
+  return {x};
+}
+inline Val<CheckArgType::kULong, unsigned long> MakeVal(unsigned long x) {
+  return {x};
+}
+inline Val<CheckArgType::kULongLong, unsigned long long> MakeVal(
+    unsigned long long x) {
+  return {x};
+}
+
+inline Val<CheckArgType::kDouble, double> MakeVal(double x) {
+  return {x};
+}
+inline Val<CheckArgType::kLongDouble, long double> MakeVal(long double x) {
+  return {x};
+}
+
+inline Val<CheckArgType::kCharP, const char*> MakeVal(const char* x) {
+  return {x};
+}
+inline Val<CheckArgType::kStdString, const std::string*> MakeVal(
+    const std::string& x) {
+  return {&x};
+}
+inline Val<CheckArgType::kStringView, const absl::string_view*> MakeVal(
+    const absl::string_view& x) {
+  return {&x};
+}
+
+inline Val<CheckArgType::kVoidP, const void*> MakeVal(const void* x) {
+  return {x};
+}
+
+// The enum class types are not implicitly convertible to arithmetic types.
+template <typename T,
+          absl::enable_if_t<std::is_enum<T>::value &&
+                            !std::is_arithmetic<T>::value>* = nullptr>
+inline decltype(MakeVal(std::declval<absl::underlying_type_t<T>>())) MakeVal(
+    T x) {
+  return {static_cast<absl::underlying_type_t<T>>(x)};
+}
+
+template <typename T, decltype(ToLogString(std::declval<T>()))* = nullptr>
+ToStringVal MakeVal(const T& x) {
+  return {ToLogString(x)};
+}
+
+// Ephemeral type that represents the result of the logging << operator.
+template <typename... Ts>
+class LogStreamer;
+
+// Base case: Before the first << argument.
+template <>
+class LogStreamer<> final {
+ public:
+  template <typename U,
+            typename V = decltype(MakeVal(std::declval<U>())),
+            absl::enable_if_t<std::is_arithmetic<U>::value ||
+                              std::is_enum<U>::value>* = nullptr>
+  RTC_FORCE_INLINE LogStreamer<V> operator<<(U arg) const {
+    return LogStreamer<V>(MakeVal(arg), this);
+  }
+
+  template <typename U,
+            typename V = decltype(MakeVal(std::declval<U>())),
+            absl::enable_if_t<!std::is_arithmetic<U>::value &&
+                              !std::is_enum<U>::value>* = nullptr>
+  RTC_FORCE_INLINE LogStreamer<V> operator<<(const U& arg) const {
+    return LogStreamer<V>(MakeVal(arg), this);
+  }
+
+#if RTC_CHECK_MSG_ENABLED
+  template <typename... Us>
+  RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file,
+                                                 const int line,
+                                                 const char* message,
+                                                 const Us&... args) {
+    static constexpr CheckArgType t[] = {Us::Type()..., CheckArgType::kEnd};
+    FatalLog(file, line, message, t, args.GetVal()...);
+  }
+
+  template <typename... Us>
+  RTC_NORETURN RTC_FORCE_INLINE static void CallCheckOp(const char* file,
+                                                        const int line,
+                                                        const char* message,
+                                                        const Us&... args) {
+    static constexpr CheckArgType t[] = {CheckArgType::kCheckOp, Us::Type()...,
+                                         CheckArgType::kEnd};
+    FatalLog(file, line, message, t, args.GetVal()...);
+  }
+#else
+  template <typename... Us>
+  RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file,
+                                                 const int line) {
+    FatalLog(file, line);
+  }
+#endif
+};
+
+// Inductive case: We've already seen at least one << argument. The most recent
+// one had type `T`, and the earlier ones had types `Ts`.
+template <typename T, typename... Ts>
+class LogStreamer<T, Ts...> final {
+ public:
+  RTC_FORCE_INLINE LogStreamer(T arg, const LogStreamer<Ts...>* prior)
+      : arg_(arg), prior_(prior) {}
+
+  template <typename U,
+            typename V = decltype(MakeVal(std::declval<U>())),
+            absl::enable_if_t<std::is_arithmetic<U>::value ||
+                              std::is_enum<U>::value>* = nullptr>
+  RTC_FORCE_INLINE LogStreamer<V, T, Ts...> operator<<(U arg) const {
+    return LogStreamer<V, T, Ts...>(MakeVal(arg), this);
+  }
+
+  template <typename U,
+            typename V = decltype(MakeVal(std::declval<U>())),
+            absl::enable_if_t<!std::is_arithmetic<U>::value &&
+                              !std::is_enum<U>::value>* = nullptr>
+  RTC_FORCE_INLINE LogStreamer<V, T, Ts...> operator<<(const U& arg) const {
+    return LogStreamer<V, T, Ts...>(MakeVal(arg), this);
+  }
+
+#if RTC_CHECK_MSG_ENABLED
+  template <typename... Us>
+  RTC_NORETURN RTC_FORCE_INLINE void Call(const char* file,
+                                          const int line,
+                                          const char* message,
+                                          const Us&... args) const {
+    prior_->Call(file, line, message, arg_, args...);
+  }
+
+  template <typename... Us>
+  RTC_NORETURN RTC_FORCE_INLINE void CallCheckOp(const char* file,
+                                                 const int line,
+                                                 const char* message,
+                                                 const Us&... args) const {
+    prior_->CallCheckOp(file, line, message, arg_, args...);
+  }
+#else
+  template <typename... Us>
+  RTC_NORETURN RTC_FORCE_INLINE void Call(const char* file,
+                                          const int line) const {
+    prior_->Call(file, line);
+  }
+#endif
+
+ private:
+  // The most recent argument.
+  T arg_;
+
+  // Earlier arguments.
+  const LogStreamer<Ts...>* prior_;
+};
+
+template <bool isCheckOp>
+class FatalLogCall final {
+ public:
+  FatalLogCall(const char* file, int line, const char* message)
+      : file_(file), line_(line), message_(message) {}
+
+  // This can be any binary operator with precedence lower than <<.
+  template <typename... Ts>
+  RTC_NORETURN RTC_FORCE_INLINE void operator&(
+      const LogStreamer<Ts...>& streamer) {
+#if RTC_CHECK_MSG_ENABLED
+    isCheckOp ? streamer.CallCheckOp(file_, line_, message_)
+              : streamer.Call(file_, line_, message_);
+#else
+    streamer.Call(file_, line_);
+#endif
+  }
+
+ private:
+  const char* file_;
+  int line_;
+  const char* message_;
+};
+
+#if RTC_DCHECK_IS_ON
+
+// Be helpful, and include file and line in the RTC_CHECK_NOTREACHED error
+// message.
+#define RTC_UNREACHABLE_FILE_AND_LINE_CALL_ARGS __FILE__, __LINE__
+RTC_NORETURN RTC_EXPORT void UnreachableCodeReached(const char* file, int line);
+
+#else
+
+// Be mindful of binary size, and don't include file and line in the
+// RTC_CHECK_NOTREACHED error message.
+#define RTC_UNREACHABLE_FILE_AND_LINE_CALL_ARGS
+RTC_NORETURN RTC_EXPORT void UnreachableCodeReached();
+
+#endif
+
+}  // namespace webrtc_checks_impl
+
+// The actual stream used isn't important. We reference |ignored| in the code
+// but don't evaluate it; this is to avoid "unused variable" warnings (we do so
+// in a particularly convoluted way with an extra ?: because that appears to be
+// the simplest construct that keeps Visual Studio from complaining about
+// condition being unused).
+#define RTC_EAT_STREAM_PARAMETERS(ignored)                          \
+  (true ? true : ((void)(ignored), true))                           \
+      ? static_cast<void>(0)                                        \
+      : ::rtc::webrtc_checks_impl::FatalLogCall<false>("", 0, "") & \
+            ::rtc::webrtc_checks_impl::LogStreamer<>()
+
+// Call RTC_EAT_STREAM_PARAMETERS with an argument that fails to compile if
+// values of the same types as |a| and |b| can't be compared with the given
+// operation, and that would evaluate |a| and |b| if evaluated.
+#define RTC_EAT_STREAM_PARAMETERS_OP(op, a, b) \
+  RTC_EAT_STREAM_PARAMETERS(((void)::rtc::Safe##op(a, b)))
+
+// RTC_CHECK dies with a fatal error if condition is not true. It is *not*
+// controlled by NDEBUG or anything else, so the check will be executed
+// regardless of compilation mode.
+//
+// We make sure RTC_CHECK et al. always evaluates |condition|, as
+// doing RTC_CHECK(FunctionWithSideEffect()) is a common idiom.
+//
+// RTC_CHECK_OP is a helper macro for binary operators.
+// Don't use this macro directly in your code, use RTC_CHECK_EQ et al below.
+#if RTC_CHECK_MSG_ENABLED
+#define RTC_CHECK(condition)                                    \
+  (condition) ? static_cast<void>(0)                            \
+              : ::rtc::webrtc_checks_impl::FatalLogCall<false>( \
+                    __FILE__, __LINE__, #condition) &           \
+                    ::rtc::webrtc_checks_impl::LogStreamer<>()
+
+#define RTC_CHECK_OP(name, op, val1, val2)                 \
+  ::rtc::Safe##name((val1), (val2))                        \
+      ? static_cast<void>(0)                               \
+      : ::rtc::webrtc_checks_impl::FatalLogCall<true>(     \
+            __FILE__, __LINE__, #val1 " " #op " " #val2) & \
+            ::rtc::webrtc_checks_impl::LogStreamer<>() << (val1) << (val2)
+#else
+#define RTC_CHECK(condition)                                                  \
+  (condition)                                                                 \
+      ? static_cast<void>(0)                                                  \
+      : true ? ::rtc::webrtc_checks_impl::FatalLogCall<false>(__FILE__,       \
+                                                              __LINE__, "") & \
+                   ::rtc::webrtc_checks_impl::LogStreamer<>()                 \
+             : ::rtc::webrtc_checks_impl::FatalLogCall<false>("", 0, "") &    \
+                   ::rtc::webrtc_checks_impl::LogStreamer<>()
+
+#define RTC_CHECK_OP(name, op, val1, val2)                                   \
+  ::rtc::Safe##name((val1), (val2))                                          \
+      ? static_cast<void>(0)                                                 \
+      : true ? ::rtc::webrtc_checks_impl::FatalLogCall<true>(__FILE__,       \
+                                                             __LINE__, "") & \
+                   ::rtc::webrtc_checks_impl::LogStreamer<>()                \
+             : ::rtc::webrtc_checks_impl::FatalLogCall<false>("", 0, "") &   \
+                   ::rtc::webrtc_checks_impl::LogStreamer<>()
+#endif
+
+#define RTC_CHECK_EQ(val1, val2) RTC_CHECK_OP(Eq, ==, val1, val2)
+#define RTC_CHECK_NE(val1, val2) RTC_CHECK_OP(Ne, !=, val1, val2)
+#define RTC_CHECK_LE(val1, val2) RTC_CHECK_OP(Le, <=, val1, val2)
+#define RTC_CHECK_LT(val1, val2) RTC_CHECK_OP(Lt, <, val1, val2)
+#define RTC_CHECK_GE(val1, val2) RTC_CHECK_OP(Ge, >=, val1, val2)
+#define RTC_CHECK_GT(val1, val2) RTC_CHECK_OP(Gt, >, val1, val2)
+
+// The RTC_DCHECK macro is equivalent to RTC_CHECK except that it only generates
+// code in debug builds. It does reference the condition parameter in all cases,
+// though, so callers won't risk getting warnings about unused variables.
+#if RTC_DCHECK_IS_ON
+#define RTC_DCHECK(condition) RTC_CHECK(condition)
+#define RTC_DCHECK_EQ(v1, v2) RTC_CHECK_EQ(v1, v2)
+#define RTC_DCHECK_NE(v1, v2) RTC_CHECK_NE(v1, v2)
+#define RTC_DCHECK_LE(v1, v2) RTC_CHECK_LE(v1, v2)
+#define RTC_DCHECK_LT(v1, v2) RTC_CHECK_LT(v1, v2)
+#define RTC_DCHECK_GE(v1, v2) RTC_CHECK_GE(v1, v2)
+#define RTC_DCHECK_GT(v1, v2) RTC_CHECK_GT(v1, v2)
+#else
+#define RTC_DCHECK(condition) RTC_EAT_STREAM_PARAMETERS(condition)
+#define RTC_DCHECK_EQ(v1, v2) RTC_EAT_STREAM_PARAMETERS_OP(Eq, v1, v2)
+#define RTC_DCHECK_NE(v1, v2) RTC_EAT_STREAM_PARAMETERS_OP(Ne, v1, v2)
+#define RTC_DCHECK_LE(v1, v2) RTC_EAT_STREAM_PARAMETERS_OP(Le, v1, v2)
+#define RTC_DCHECK_LT(v1, v2) RTC_EAT_STREAM_PARAMETERS_OP(Lt, v1, v2)
+#define RTC_DCHECK_GE(v1, v2) RTC_EAT_STREAM_PARAMETERS_OP(Ge, v1, v2)
+#define RTC_DCHECK_GT(v1, v2) RTC_EAT_STREAM_PARAMETERS_OP(Gt, v1, v2)
+#endif
+
+#define RTC_UNREACHABLE_CODE_HIT false
+#define RTC_NOTREACHED() RTC_DCHECK(RTC_UNREACHABLE_CODE_HIT)
+
+// Kills the process with an error message. Never returns. Use when you wish to
+// assert that a point in the code is never reached.
+#define RTC_CHECK_NOTREACHED()                         \
+  do {                                                 \
+    ::rtc::webrtc_checks_impl::UnreachableCodeReached( \
+        RTC_UNREACHABLE_FILE_AND_LINE_CALL_ARGS);      \
+  } while (0)
+
+#define RTC_FATAL()                                                  \
+  ::rtc::webrtc_checks_impl::FatalLogCall<false>(__FILE__, __LINE__, \
+                                                 "FATAL()") &        \
+      ::rtc::webrtc_checks_impl::LogStreamer<>()
+
+// Performs the integer division a/b and returns the result. CHECKs that the
+// remainder is zero.
+template <typename T>
+inline T CheckedDivExact(T a, T b) {
+  RTC_CHECK_EQ(a % b, 0) << a << " is not evenly divisible by " << b;
+  return a / b;
+}
+
+}  // namespace rtc
+
+#else  // __cplusplus not defined
+// C version. Lacks many features compared to the C++ version, but usage
+// guidelines are the same.
+
+#define RTC_CHECK(condition)                                                 \
+  do {                                                                       \
+    if (!(condition)) {                                                      \
+      rtc_FatalMessage(__FILE__, __LINE__,                                   \
+                       RTC_CHECK_EVAL_MESSAGE("CHECK failed: " #condition)); \
+    }                                                                        \
+  } while (0)
+
+#define RTC_CHECK_EQ(a, b) RTC_CHECK((a) == (b))
+#define RTC_CHECK_NE(a, b) RTC_CHECK((a) != (b))
+#define RTC_CHECK_LE(a, b) RTC_CHECK((a) <= (b))
+#define RTC_CHECK_LT(a, b) RTC_CHECK((a) < (b))
+#define RTC_CHECK_GE(a, b) RTC_CHECK((a) >= (b))
+#define RTC_CHECK_GT(a, b) RTC_CHECK((a) > (b))
+
+#define RTC_DCHECK(condition)                                                 \
+  do {                                                                        \
+    if (RTC_DCHECK_IS_ON && !(condition)) {                                   \
+      rtc_FatalMessage(__FILE__, __LINE__,                                    \
+                       RTC_CHECK_EVAL_MESSAGE("DCHECK failed: " #condition)); \
+    }                                                                         \
+  } while (0)
+
+#define RTC_DCHECK_EQ(a, b) RTC_DCHECK((a) == (b))
+#define RTC_DCHECK_NE(a, b) RTC_DCHECK((a) != (b))
+#define RTC_DCHECK_LE(a, b) RTC_DCHECK((a) <= (b))
+#define RTC_DCHECK_LT(a, b) RTC_DCHECK((a) < (b))
+#define RTC_DCHECK_GE(a, b) RTC_DCHECK((a) >= (b))
+#define RTC_DCHECK_GT(a, b) RTC_DCHECK((a) > (b))
+
+#endif  // __cplusplus
+
+#endif  // RTC_BASE_CHECKS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/compile_assert_c.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/compile_assert_c.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/compile_assert_c.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/compile_assert_c.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_COMPILE_ASSERT_C_H_
+#define RTC_BASE_COMPILE_ASSERT_C_H_
+
+// Use this macro to verify at compile time that certain restrictions are met.
+// The argument is the boolean expression to evaluate.
+// Example:
+//   RTC_COMPILE_ASSERT(sizeof(foo) < 128);
+// Note: In C++, use static_assert instead!
+#define RTC_COMPILE_ASSERT(expression) \
+  switch (0) {                         \
+    case 0:                            \
+    case expression:;                  \
+  }
+
+#endif  // RTC_BASE_COMPILE_ASSERT_C_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/constructor_magic.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/constructor_magic.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/constructor_magic.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/constructor_magic.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,20 @@
+/*
+ *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_CONSTRUCTOR_MAGIC_H_
+#define RTC_BASE_CONSTRUCTOR_MAGIC_H_
+
+// A macro to disallow the copy constructor and operator= functions. This should
+// be used in the declarations for a class.
+#define RTC_DISALLOW_COPY_AND_ASSIGN(TypeName) \
+  TypeName(const TypeName&) = delete;          \
+  TypeName& operator=(const TypeName&) = delete
+
+#endif  // RTC_BASE_CONSTRUCTOR_MAGIC_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/experiments/field_trial_parser.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/experiments/field_trial_parser.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/experiments/field_trial_parser.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/experiments/field_trial_parser.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,250 @@
+/*
+ *  Copyright 2019 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "rtc_base/experiments/field_trial_parser.h"
+
+#include <inttypes.h>
+
+#include <algorithm>
+#include <map>
+#include <type_traits>
+#include <utility>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/numerics/safe_conversions.h"
+
+namespace webrtc {
+namespace {
+
+int FindOrEnd(std::string str, size_t start, char delimiter) {
+  size_t pos = str.find(delimiter, start);
+  pos = (pos == std::string::npos) ? str.length() : pos;
+  return static_cast<int>(pos);
+}
+}  // namespace
+
+FieldTrialParameterInterface::FieldTrialParameterInterface(std::string key)
+    : key_(key) {}
+FieldTrialParameterInterface::~FieldTrialParameterInterface() {
+  RTC_DCHECK(used_) << "Field trial parameter with key: '" << key_
+                    << "' never used.";
+}
+
+void ParseFieldTrial(
+    std::initializer_list<FieldTrialParameterInterface*> fields,
+    std::string trial_string) {
+  std::map<std::string, FieldTrialParameterInterface*> field_map;
+  FieldTrialParameterInterface* keyless_field = nullptr;
+  for (FieldTrialParameterInterface* field : fields) {
+    field->MarkAsUsed();
+    if (!field->sub_parameters_.empty()) {
+      for (FieldTrialParameterInterface* sub_field : field->sub_parameters_) {
+        RTC_DCHECK(!sub_field->key_.empty());
+        sub_field->MarkAsUsed();
+        field_map[sub_field->key_] = sub_field;
+      }
+      continue;
+    }
+
+    if (field->key_.empty()) {
+      RTC_DCHECK(!keyless_field);
+      keyless_field = field;
+    } else {
+      field_map[field->key_] = field;
+    }
+  }
+
+  size_t i = 0;
+  while (i < trial_string.length()) {
+    int val_end = FindOrEnd(trial_string, i, ',');
+    int colon_pos = FindOrEnd(trial_string, i, ':');
+    int key_end = std::min(val_end, colon_pos);
+    int val_begin = key_end + 1;
+    std::string key = trial_string.substr(i, key_end - i);
+    absl::optional<std::string> opt_value;
+    if (val_end >= val_begin)
+      opt_value = trial_string.substr(val_begin, val_end - val_begin);
+    i = val_end + 1;
+    auto field = field_map.find(key);
+    if (field != field_map.end()) {
+      if (!field->second->Parse(std::move(opt_value))) {
+        RTC_LOG(LS_WARNING) << "Failed to read field with key: '" << key
+                            << "' in trial: \"" << trial_string << "\"";
+      }
+    } else if (!opt_value && keyless_field && !key.empty()) {
+      if (!keyless_field->Parse(key)) {
+        RTC_LOG(LS_WARNING) << "Failed to read empty key field with value '"
+                            << key << "' in trial: \"" << trial_string << "\"";
+      }
+    } else if (key.empty() || key[0] != '_') {
+      // "_" is be used to prefix keys that are part of the string for
+      // debugging purposes but not neccessarily used.
+      // e.g. WebRTC-Experiment/param: value, _DebuggingString
+      RTC_LOG(LS_INFO) << "No field with key: '" << key
+                       << "' (found in trial: \"" << trial_string << "\")";
+      std::string valid_keys;
+      for (const auto& f : field_map) {
+        valid_keys += f.first;
+        valid_keys += ", ";
+      }
+      RTC_LOG(LS_INFO) << "Valid keys are: " << valid_keys;
+    }
+  }
+
+  for (FieldTrialParameterInterface* field : fields) {
+    field->ParseDone();
+  }
+}
+
+template <>
+absl::optional<bool> ParseTypedParameter<bool>(std::string str) {
+  if (str == "true" || str == "1") {
+    return true;
+  } else if (str == "false" || str == "0") {
+    return false;
+  }
+  return absl::nullopt;
+}
+
+template <>
+absl::optional<double> ParseTypedParameter<double>(std::string str) {
+  double value;
+  char unit[2]{0, 0};
+  if (sscanf(str.c_str(), "%lf%1s", &value, unit) >= 1) {
+    if (unit[0] == '%')
+      return value / 100;
+    return value;
+  } else {
+    return absl::nullopt;
+  }
+}
+
+template <>
+absl::optional<int> ParseTypedParameter<int>(std::string str) {
+  int64_t value;
+  if (sscanf(str.c_str(), "%" SCNd64, &value) == 1) {
+    if (rtc::IsValueInRangeForNumericType<int, int64_t>(value)) {
+      return static_cast<int>(value);
+    }
+  }
+  return absl::nullopt;
+}
+
+template <>
+absl::optional<unsigned> ParseTypedParameter<unsigned>(std::string str) {
+  int64_t value;
+  if (sscanf(str.c_str(), "%" SCNd64, &value) == 1) {
+    if (rtc::IsValueInRangeForNumericType<unsigned, int64_t>(value)) {
+      return static_cast<unsigned>(value);
+    }
+  }
+  return absl::nullopt;
+}
+
+template <>
+absl::optional<std::string> ParseTypedParameter<std::string>(std::string str) {
+  return std::move(str);
+}
+
+template <>
+absl::optional<absl::optional<bool>> ParseTypedParameter<absl::optional<bool>>(
+    std::string str) {
+  return ParseOptionalParameter<bool>(str);
+}
+template <>
+absl::optional<absl::optional<int>> ParseTypedParameter<absl::optional<int>>(
+    std::string str) {
+  return ParseOptionalParameter<int>(str);
+}
+template <>
+absl::optional<absl::optional<unsigned>>
+ParseTypedParameter<absl::optional<unsigned>>(std::string str) {
+  return ParseOptionalParameter<unsigned>(str);
+}
+template <>
+absl::optional<absl::optional<double>>
+ParseTypedParameter<absl::optional<double>>(std::string str) {
+  return ParseOptionalParameter<double>(str);
+}
+
+FieldTrialFlag::FieldTrialFlag(std::string key) : FieldTrialFlag(key, false) {}
+
+FieldTrialFlag::FieldTrialFlag(std::string key, bool default_value)
+    : FieldTrialParameterInterface(key), value_(default_value) {}
+
+bool FieldTrialFlag::Get() const {
+  return value_;
+}
+
+webrtc::FieldTrialFlag::operator bool() const {
+  return value_;
+}
+
+bool FieldTrialFlag::Parse(absl::optional<std::string> str_value) {
+  // Only set the flag if there is no argument provided.
+  if (str_value) {
+    absl::optional<bool> opt_value = ParseTypedParameter<bool>(*str_value);
+    if (!opt_value)
+      return false;
+    value_ = *opt_value;
+  } else {
+    value_ = true;
+  }
+  return true;
+}
+
+AbstractFieldTrialEnum::AbstractFieldTrialEnum(
+    std::string key,
+    int default_value,
+    std::map<std::string, int> mapping)
+    : FieldTrialParameterInterface(key),
+      value_(default_value),
+      enum_mapping_(mapping) {
+  for (auto& key_val : enum_mapping_)
+    valid_values_.insert(key_val.second);
+}
+AbstractFieldTrialEnum::AbstractFieldTrialEnum(const AbstractFieldTrialEnum&) =
+    default;
+AbstractFieldTrialEnum::~AbstractFieldTrialEnum() = default;
+
+bool AbstractFieldTrialEnum::Parse(absl::optional<std::string> str_value) {
+  if (str_value) {
+    auto it = enum_mapping_.find(*str_value);
+    if (it != enum_mapping_.end()) {
+      value_ = it->second;
+      return true;
+    }
+    absl::optional<int> value = ParseTypedParameter<int>(*str_value);
+    if (value.has_value() &&
+        (valid_values_.find(*value) != valid_values_.end())) {
+      value_ = *value;
+      return true;
+    }
+  }
+  return false;
+}
+
+template class FieldTrialParameter<bool>;
+template class FieldTrialParameter<double>;
+template class FieldTrialParameter<int>;
+template class FieldTrialParameter<unsigned>;
+template class FieldTrialParameter<std::string>;
+
+template class FieldTrialConstrained<double>;
+template class FieldTrialConstrained<int>;
+template class FieldTrialConstrained<unsigned>;
+
+template class FieldTrialOptional<double>;
+template class FieldTrialOptional<int>;
+template class FieldTrialOptional<unsigned>;
+template class FieldTrialOptional<bool>;
+template class FieldTrialOptional<std::string>;
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/experiments/field_trial_parser.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/experiments/field_trial_parser.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/experiments/field_trial_parser.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/experiments/field_trial_parser.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,288 @@
+/*
+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#ifndef RTC_BASE_EXPERIMENTS_FIELD_TRIAL_PARSER_H_
+#define RTC_BASE_EXPERIMENTS_FIELD_TRIAL_PARSER_H_
+
+#include <stdint.h>
+
+#include <initializer_list>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+
+#include "absl/types/optional.h"
+
+// Field trial parser functionality. Provides funcitonality to parse field trial
+// argument strings in key:value format. Each parameter is described using
+// key:value, parameters are separated with a ,. Values can't include the comma
+// character, since there's no quote facility. For most types, white space is
+// ignored. Parameters are declared with a given type for which an
+// implementation of ParseTypedParameter should be provided. The
+// ParseTypedParameter implementation is given whatever is between the : and the
+// ,. If the key is provided without : a FieldTrialOptional will use nullopt.
+
+// Example string: "my_optional,my_int:3,my_string:hello"
+
+// For further description of usage and behavior, see the examples in the unit
+// tests.
+
+namespace webrtc {
+class FieldTrialParameterInterface {
+ public:
+  virtual ~FieldTrialParameterInterface();
+  std::string key() const { return key_; }
+
+ protected:
+  // Protected to allow implementations to provide assignment and copy.
+  FieldTrialParameterInterface(const FieldTrialParameterInterface&) = default;
+  FieldTrialParameterInterface& operator=(const FieldTrialParameterInterface&) =
+      default;
+  explicit FieldTrialParameterInterface(std::string key);
+  friend void ParseFieldTrial(
+      std::initializer_list<FieldTrialParameterInterface*> fields,
+      std::string raw_string);
+  void MarkAsUsed() { used_ = true; }
+  virtual bool Parse(absl::optional<std::string> str_value) = 0;
+
+  virtual void ParseDone() {}
+
+  std::vector<FieldTrialParameterInterface*> sub_parameters_;
+
+ private:
+  std::string key_;
+  bool used_ = false;
+};
+
+// ParseFieldTrial function parses the given string and fills the given fields
+// with extracted values if available.
+void ParseFieldTrial(
+    std::initializer_list<FieldTrialParameterInterface*> fields,
+    std::string raw_string);
+
+// Specialize this in code file for custom types. Should return absl::nullopt if
+// the given string cannot be properly parsed.
+template <typename T>
+absl::optional<T> ParseTypedParameter(std::string);
+
+// This class uses the ParseTypedParameter function to implement a parameter
+// implementation with an enforced default value.
+template <typename T>
+class FieldTrialParameter : public FieldTrialParameterInterface {
+ public:
+  FieldTrialParameter(std::string key, T default_value)
+      : FieldTrialParameterInterface(key), value_(default_value) {}
+  T Get() const { return value_; }
+  operator T() const { return Get(); }
+  const T* operator->() const { return &value_; }
+
+  void SetForTest(T value) { value_ = value; }
+
+ protected:
+  bool Parse(absl::optional<std::string> str_value) override {
+    if (str_value) {
+      absl::optional<T> value = ParseTypedParameter<T>(*str_value);
+      if (value.has_value()) {
+        value_ = value.value();
+        return true;
+      }
+    }
+    return false;
+  }
+
+ private:
+  T value_;
+};
+
+// This class uses the ParseTypedParameter function to implement a parameter
+// implementation with an enforced default value and a range constraint. Values
+// outside the configured range will be ignored.
+template <typename T>
+class FieldTrialConstrained : public FieldTrialParameterInterface {
+ public:
+  FieldTrialConstrained(std::string key,
+                        T default_value,
+                        absl::optional<T> lower_limit,
+                        absl::optional<T> upper_limit)
+      : FieldTrialParameterInterface(key),
+        value_(default_value),
+        lower_limit_(lower_limit),
+        upper_limit_(upper_limit) {}
+  T Get() const { return value_; }
+  operator T() const { return Get(); }
+  const T* operator->() const { return &value_; }
+
+ protected:
+  bool Parse(absl::optional<std::string> str_value) override {
+    if (str_value) {
+      absl::optional<T> value = ParseTypedParameter<T>(*str_value);
+      if (value && (!lower_limit_ || *value >= *lower_limit_) &&
+          (!upper_limit_ || *value <= *upper_limit_)) {
+        value_ = *value;
+        return true;
+      }
+    }
+    return false;
+  }
+
+ private:
+  T value_;
+  absl::optional<T> lower_limit_;
+  absl::optional<T> upper_limit_;
+};
+
+class AbstractFieldTrialEnum : public FieldTrialParameterInterface {
+ public:
+  AbstractFieldTrialEnum(std::string key,
+                         int default_value,
+                         std::map<std::string, int> mapping);
+  ~AbstractFieldTrialEnum() override;
+  AbstractFieldTrialEnum(const AbstractFieldTrialEnum&);
+
+ protected:
+  bool Parse(absl::optional<std::string> str_value) override;
+
+ protected:
+  int value_;
+  std::map<std::string, int> enum_mapping_;
+  std::set<int> valid_values_;
+};
+
+// The FieldTrialEnum class can be used to quickly define a parser for a
+// specific enum. It handles values provided as integers and as strings if a
+// mapping is provided.
+template <typename T>
+class FieldTrialEnum : public AbstractFieldTrialEnum {
+ public:
+  FieldTrialEnum(std::string key,
+                 T default_value,
+                 std::map<std::string, T> mapping)
+      : AbstractFieldTrialEnum(key,
+                               static_cast<int>(default_value),
+                               ToIntMap(mapping)) {}
+  T Get() const { return static_cast<T>(value_); }
+  operator T() const { return Get(); }
+
+ private:
+  static std::map<std::string, int> ToIntMap(std::map<std::string, T> mapping) {
+    std::map<std::string, int> res;
+    for (const auto& it : mapping)
+      res[it.first] = static_cast<int>(it.second);
+    return res;
+  }
+};
+
+// This class uses the ParseTypedParameter function to implement an optional
+// parameter implementation that can default to absl::nullopt.
+template <typename T>
+class FieldTrialOptional : public FieldTrialParameterInterface {
+ public:
+  explicit FieldTrialOptional(std::string key)
+      : FieldTrialParameterInterface(key) {}
+  FieldTrialOptional(std::string key, absl::optional<T> default_value)
+      : FieldTrialParameterInterface(key), value_(default_value) {}
+  absl::optional<T> GetOptional() const { return value_; }
+  const T& Value() const { return value_.value(); }
+  const T& operator*() const { return value_.value(); }
+  const T* operator->() const { return &value_.value(); }
+  explicit operator bool() const { return value_.has_value(); }
+
+ protected:
+  bool Parse(absl::optional<std::string> str_value) override {
+    if (str_value) {
+      absl::optional<T> value = ParseTypedParameter<T>(*str_value);
+      if (!value.has_value())
+        return false;
+      value_ = value.value();
+    } else {
+      value_ = absl::nullopt;
+    }
+    return true;
+  }
+
+ private:
+  absl::optional<T> value_;
+};
+
+// Equivalent to a FieldTrialParameter<bool> in the case that both key and value
+// are present. If key is missing, evaluates to false. If key is present, but no
+// explicit value is provided, the flag evaluates to true.
+class FieldTrialFlag : public FieldTrialParameterInterface {
+ public:
+  explicit FieldTrialFlag(std::string key);
+  FieldTrialFlag(std::string key, bool default_value);
+  bool Get() const;
+  operator bool() const;
+
+ protected:
+  bool Parse(absl::optional<std::string> str_value) override;
+
+ private:
+  bool value_;
+};
+
+template <typename T>
+absl::optional<absl::optional<T>> ParseOptionalParameter(std::string str) {
+  if (str.empty())
+    return absl::optional<T>();
+  auto parsed = ParseTypedParameter<T>(str);
+  if (parsed.has_value())
+    return parsed;
+  return absl::nullopt;
+}
+
+template <>
+absl::optional<bool> ParseTypedParameter<bool>(std::string str);
+template <>
+absl::optional<double> ParseTypedParameter<double>(std::string str);
+template <>
+absl::optional<int> ParseTypedParameter<int>(std::string str);
+template <>
+absl::optional<unsigned> ParseTypedParameter<unsigned>(std::string str);
+template <>
+absl::optional<std::string> ParseTypedParameter<std::string>(std::string str);
+
+template <>
+absl::optional<absl::optional<bool>> ParseTypedParameter<absl::optional<bool>>(
+    std::string str);
+template <>
+absl::optional<absl::optional<int>> ParseTypedParameter<absl::optional<int>>(
+    std::string str);
+template <>
+absl::optional<absl::optional<unsigned>>
+ParseTypedParameter<absl::optional<unsigned>>(std::string str);
+template <>
+absl::optional<absl::optional<double>>
+ParseTypedParameter<absl::optional<double>>(std::string str);
+
+// Accepts true, false, else parsed with sscanf %i, true if != 0.
+extern template class FieldTrialParameter<bool>;
+// Interpreted using sscanf %lf.
+extern template class FieldTrialParameter<double>;
+// Interpreted using sscanf %i.
+extern template class FieldTrialParameter<int>;
+// Interpreted using sscanf %u.
+extern template class FieldTrialParameter<unsigned>;
+// Using the given value as is.
+extern template class FieldTrialParameter<std::string>;
+
+extern template class FieldTrialConstrained<double>;
+extern template class FieldTrialConstrained<int>;
+extern template class FieldTrialConstrained<unsigned>;
+
+extern template class FieldTrialOptional<double>;
+extern template class FieldTrialOptional<int>;
+extern template class FieldTrialOptional<unsigned>;
+extern template class FieldTrialOptional<bool>;
+extern template class FieldTrialOptional<std::string>;
+
+}  // namespace webrtc
+
+#endif  // RTC_BASE_EXPERIMENTS_FIELD_TRIAL_PARSER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/gtest_prod_util.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/gtest_prod_util.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/gtest_prod_util.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/gtest_prod_util.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_GTEST_PROD_UTIL_H_
+#define RTC_BASE_GTEST_PROD_UTIL_H_
+
+// Define our own version of FRIEND_TEST here rather than including
+// gtest_prod.h to avoid depending on any part of GTest in production code.
+#define FRIEND_TEST_WEBRTC(test_case_name, test_name) \
+  friend class test_case_name##_##test_name##_Test
+
+// This file is a plain copy of Chromium's base/gtest_prod_util.h.
+//
+// This is a wrapper for gtest's FRIEND_TEST macro that friends
+// test with all possible prefixes. This is very helpful when changing the test
+// prefix, because the friend declarations don't need to be updated.
+//
+// Example usage:
+//
+// class MyClass {
+//  private:
+//   void MyMethod();
+//   FRIEND_TEST_ALL_PREFIXES(MyClassTest, MyMethod);
+// };
+#define FRIEND_TEST_ALL_PREFIXES(test_case_name, test_name) \
+  FRIEND_TEST_WEBRTC(test_case_name, test_name);            \
+  FRIEND_TEST_WEBRTC(test_case_name, DISABLED_##test_name); \
+  FRIEND_TEST_WEBRTC(test_case_name, FLAKY_##test_name);    \
+  FRIEND_TEST_WEBRTC(test_case_name, FAILS_##test_name)
+
+#endif  // RTC_BASE_GTEST_PROD_UTIL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/logging.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/logging.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/logging.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/logging.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,582 @@
+/*
+ *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "rtc_base/logging.h"
+
+#include <string.h>
+
+#if RTC_LOG_ENABLED()
+
+#if defined(WEBRTC_WIN)
+#include <winsock2.h>
+#include <windows.h>
+#if _MSC_VER < 1900
+#define snprintf _snprintf
+#endif
+#undef ERROR  // wingdi.h
+#endif
+
+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
+#include <CoreServices/CoreServices.h>
+#elif defined(WEBRTC_ANDROID)
+#include <android/log.h>
+
+// Android has a 1024 limit on log inputs. We use 60 chars as an
+// approx for the header/tag portion.
+// See android/system/core/liblog/logd_write.c
+static const int kMaxLogLineSize = 1024 - 60;
+#endif  // WEBRTC_MAC && !defined(WEBRTC_IOS) || WEBRTC_ANDROID
+
+#include <inttypes.h>
+#include <stdio.h>
+#include <time.h>
+
+#include <algorithm>
+#include <cstdarg>
+#include <vector>
+
+#include "absl/base/attributes.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/platform_thread_types.h"
+#include "rtc_base/string_encode.h"
+#include "rtc_base/string_utils.h"
+#include "rtc_base/strings/string_builder.h"
+#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
+#include "rtc_base/time_utils.h"
+
+#if defined(WEBRTC_RACE_CHECK_MUTEX)
+#if defined(WEBRTC_ABSL_MUTEX)
+#error Please only define one of WEBRTC_RACE_CHECK_MUTEX and WEBRTC_ABSL_MUTEX.
+#endif
+#include "absl/base/const_init.h"
+#include "absl/synchronization/mutex.h"  // nogncheck
+using LoggingMutexLock = ::absl::MutexLock;
+#else
+using LoggingMutexLock = ::webrtc::MutexLock;
+#endif  // if defined(WEBRTC_RACE_CHECK_MUTEX)
+
+namespace rtc {
+namespace {
+// By default, release builds don't log, debug builds at info level
+#if !defined(NDEBUG)
+static LoggingSeverity g_min_sev = LS_INFO;
+static LoggingSeverity g_dbg_sev = LS_INFO;
+#else
+static LoggingSeverity g_min_sev = LS_NONE;
+static LoggingSeverity g_dbg_sev = LS_NONE;
+#endif
+
+// Return the filename portion of the string (that following the last slash).
+const char* FilenameFromPath(const char* file) {
+  const char* end1 = ::strrchr(file, '/');
+  const char* end2 = ::strrchr(file, '\\');
+  if (!end1 && !end2)
+    return file;
+  else
+    return (end1 > end2) ? end1 + 1 : end2 + 1;
+}
+
+// Global lock for log subsystem, only needed to serialize access to streams_.
+// TODO(bugs.webrtc.org/11665): this is not currently constant initialized and
+// trivially destructible.
+#if defined(WEBRTC_RACE_CHECK_MUTEX)
+// When WEBRTC_RACE_CHECK_MUTEX is defined, even though WebRTC objects are
+// invoked serially, the logging is static, invoked concurrently and hence needs
+// protection.
+absl::Mutex g_log_mutex_(absl::kConstInit);
+#else
+webrtc::Mutex g_log_mutex_;
+#endif
+
+}  // namespace
+
+/////////////////////////////////////////////////////////////////////////////
+// LogMessage
+/////////////////////////////////////////////////////////////////////////////
+
+bool LogMessage::log_to_stderr_ = true;
+
+// The list of logging streams currently configured.
+// Note: we explicitly do not clean this up, because of the uncertain ordering
+// of destructors at program exit.  Let the person who sets the stream trigger
+// cleanup by setting to null, or let it leak (safe at program exit).
+ABSL_CONST_INIT LogSink* LogMessage::streams_ RTC_GUARDED_BY(g_log_mutex_) =
+    nullptr;
+ABSL_CONST_INIT std::atomic<bool> LogMessage::streams_empty_ = {true};
+
+// Boolean options default to false (0)
+bool LogMessage::thread_, LogMessage::timestamp_;
+
+LogMessage::LogMessage(const char* file, int line, LoggingSeverity sev)
+    : LogMessage(file, line, sev, ERRCTX_NONE, 0) {}
+
+LogMessage::LogMessage(const char* file,
+                       int line,
+                       LoggingSeverity sev,
+                       LogErrorContext err_ctx,
+                       int err)
+    : severity_(sev) {
+  if (timestamp_) {
+    // Use SystemTimeMillis so that even if tests use fake clocks, the timestamp
+    // in log messages represents the real system time.
+    int64_t time = TimeDiff(SystemTimeMillis(), LogStartTime());
+    // Also ensure WallClockStartTime is initialized, so that it matches
+    // LogStartTime.
+    WallClockStartTime();
+    // TODO(kwiberg): Switch to absl::StrFormat, if binary size is ok.
+    char timestamp[50];  // Maximum string length of an int64_t is 20.
+    int len =
+        snprintf(timestamp, sizeof(timestamp), "[%03" PRId64 ":%03" PRId64 "]",
+                 time / 1000, time % 1000);
+    RTC_DCHECK_LT(len, sizeof(timestamp));
+    print_stream_ << timestamp;
+  }
+
+  if (thread_) {
+    PlatformThreadId id = CurrentThreadId();
+    print_stream_ << "[" << id << "] ";
+  }
+
+  if (file != nullptr) {
+#if defined(WEBRTC_ANDROID)
+    tag_ = FilenameFromPath(file);
+    print_stream_ << "(line " << line << "): ";
+#else
+    print_stream_ << "(" << FilenameFromPath(file) << ":" << line << "): ";
+#endif
+  }
+
+  if (err_ctx != ERRCTX_NONE) {
+    char tmp_buf[1024];
+    SimpleStringBuilder tmp(tmp_buf);
+    tmp.AppendFormat("[0x%08X]", err);
+    switch (err_ctx) {
+      case ERRCTX_ERRNO:
+        tmp << " " << strerror(err);
+        break;
+#ifdef WEBRTC_WIN
+      case ERRCTX_HRESULT: {
+        char msgbuf[256];
+        DWORD flags =
+            FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS;
+        if (DWORD len = FormatMessageA(
+                flags, nullptr, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                msgbuf, sizeof(msgbuf) / sizeof(msgbuf[0]), nullptr)) {
+          while ((len > 0) &&
+                 isspace(static_cast<unsigned char>(msgbuf[len - 1]))) {
+            msgbuf[--len] = 0;
+          }
+          tmp << " " << msgbuf;
+        }
+        break;
+      }
+#endif  // WEBRTC_WIN
+      default:
+        break;
+    }
+    extra_ = tmp.str();
+  }
+}
+
+#if defined(WEBRTC_ANDROID)
+LogMessage::LogMessage(const char* file,
+                       int line,
+                       LoggingSeverity sev,
+                       const char* tag)
+    : LogMessage(file, line, sev, ERRCTX_NONE, 0 /* err */) {
+  tag_ = tag;
+  print_stream_ << tag << ": ";
+}
+#endif
+
+// DEPRECATED. Currently only used by downstream projects that use
+// implementation details of logging.h. Work is ongoing to remove those
+// dependencies.
+LogMessage::LogMessage(const char* file,
+                       int line,
+                       LoggingSeverity sev,
+                       const std::string& tag)
+    : LogMessage(file, line, sev) {
+  print_stream_ << tag << ": ";
+}
+
+LogMessage::~LogMessage() {
+  FinishPrintStream();
+
+  const std::string str = print_stream_.Release();
+
+  if (severity_ >= g_dbg_sev) {
+#if defined(WEBRTC_ANDROID)
+    OutputToDebug(str, severity_, tag_);
+#else
+    OutputToDebug(str, severity_);
+#endif
+  }
+
+  LoggingMutexLock lock(&g_log_mutex_);
+  for (LogSink* entry = streams_; entry != nullptr; entry = entry->next_) {
+    if (severity_ >= entry->min_severity_) {
+#if defined(WEBRTC_ANDROID)
+      entry->OnLogMessage(str, severity_, tag_);
+#else
+      entry->OnLogMessage(str, severity_);
+#endif
+    }
+  }
+}
+
+void LogMessage::AddTag(const char* tag) {
+#ifdef WEBRTC_ANDROID
+  tag_ = tag;
+#endif
+}
+
+rtc::StringBuilder& LogMessage::stream() {
+  return print_stream_;
+}
+
+int LogMessage::GetMinLogSeverity() {
+  return g_min_sev;
+}
+
+LoggingSeverity LogMessage::GetLogToDebug() {
+  return g_dbg_sev;
+}
+int64_t LogMessage::LogStartTime() {
+  static const int64_t g_start = SystemTimeMillis();
+  return g_start;
+}
+
+uint32_t LogMessage::WallClockStartTime() {
+  static const uint32_t g_start_wallclock = time(nullptr);
+  return g_start_wallclock;
+}
+
+void LogMessage::LogThreads(bool on) {
+  thread_ = on;
+}
+
+void LogMessage::LogTimestamps(bool on) {
+  timestamp_ = on;
+}
+
+void LogMessage::LogToDebug(LoggingSeverity min_sev) {
+  g_dbg_sev = min_sev;
+  LoggingMutexLock lock(&g_log_mutex_);
+  UpdateMinLogSeverity();
+}
+
+void LogMessage::SetLogToStderr(bool log_to_stderr) {
+  log_to_stderr_ = log_to_stderr;
+}
+
+int LogMessage::GetLogToStream(LogSink* stream) {
+  LoggingMutexLock lock(&g_log_mutex_);
+  LoggingSeverity sev = LS_NONE;
+  for (LogSink* entry = streams_; entry != nullptr; entry = entry->next_) {
+    if (stream == nullptr || stream == entry) {
+      sev = std::min(sev, entry->min_severity_);
+    }
+  }
+  return sev;
+}
+
+void LogMessage::AddLogToStream(LogSink* stream, LoggingSeverity min_sev) {
+  LoggingMutexLock lock(&g_log_mutex_);
+  stream->min_severity_ = min_sev;
+  stream->next_ = streams_;
+  streams_ = stream;
+  streams_empty_.store(false, std::memory_order_relaxed);
+  UpdateMinLogSeverity();
+}
+
+void LogMessage::RemoveLogToStream(LogSink* stream) {
+  LoggingMutexLock lock(&g_log_mutex_);
+  for (LogSink** entry = &streams_; *entry != nullptr;
+       entry = &(*entry)->next_) {
+    if (*entry == stream) {
+      *entry = (*entry)->next_;
+      break;
+    }
+  }
+  streams_empty_.store(streams_ == nullptr, std::memory_order_relaxed);
+  UpdateMinLogSeverity();
+}
+
+void LogMessage::ConfigureLogging(const char* params) {
+  LoggingSeverity current_level = LS_VERBOSE;
+  LoggingSeverity debug_level = GetLogToDebug();
+
+  std::vector<std::string> tokens;
+  tokenize(params, ' ', &tokens);
+
+  for (const std::string& token : tokens) {
+    if (token.empty())
+      continue;
+
+    // Logging features
+    if (token == "tstamp") {
+      LogTimestamps();
+    } else if (token == "thread") {
+      LogThreads();
+
+      // Logging levels
+    } else if (token == "verbose") {
+      current_level = LS_VERBOSE;
+    } else if (token == "info") {
+      current_level = LS_INFO;
+    } else if (token == "warning") {
+      current_level = LS_WARNING;
+    } else if (token == "error") {
+      current_level = LS_ERROR;
+    } else if (token == "none") {
+      current_level = LS_NONE;
+
+      // Logging targets
+    } else if (token == "debug") {
+      debug_level = current_level;
+    }
+  }
+
+#if defined(WEBRTC_WIN) && !defined(WINUWP)
+  if ((LS_NONE != debug_level) && !::IsDebuggerPresent()) {
+    // First, attempt to attach to our parent's console... so if you invoke
+    // from the command line, we'll see the output there.  Otherwise, create
+    // our own console window.
+    // Note: These methods fail if a console already exists, which is fine.
+    if (!AttachConsole(ATTACH_PARENT_PROCESS))
+      ::AllocConsole();
+  }
+#endif  // defined(WEBRTC_WIN) && !defined(WINUWP)
+
+  LogToDebug(debug_level);
+}
+
+void LogMessage::UpdateMinLogSeverity()
+    RTC_EXCLUSIVE_LOCKS_REQUIRED(g_log_mutex_) {
+  LoggingSeverity min_sev = g_dbg_sev;
+  for (LogSink* entry = streams_; entry != nullptr; entry = entry->next_) {
+    min_sev = std::min(min_sev, entry->min_severity_);
+  }
+  g_min_sev = min_sev;
+}
+
+#if defined(WEBRTC_ANDROID)
+void LogMessage::OutputToDebug(const std::string& str,
+                               LoggingSeverity severity,
+                               const char* tag) {
+#else
+void LogMessage::OutputToDebug(const std::string& str,
+                               LoggingSeverity severity) {
+#endif
+  bool log_to_stderr = log_to_stderr_;
+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && defined(NDEBUG)
+  // On the Mac, all stderr output goes to the Console log and causes clutter.
+  // So in opt builds, don't log to stderr unless the user specifically sets
+  // a preference to do so.
+  CFStringRef key = CFStringCreateWithCString(
+      kCFAllocatorDefault, "logToStdErr", kCFStringEncodingUTF8);
+  CFStringRef domain = CFBundleGetIdentifier(CFBundleGetMainBundle());
+  if (key != nullptr && domain != nullptr) {
+    Boolean exists_and_is_valid;
+    Boolean should_log =
+        CFPreferencesGetAppBooleanValue(key, domain, &exists_and_is_valid);
+    // If the key doesn't exist or is invalid or is false, we will not log to
+    // stderr.
+    log_to_stderr = exists_and_is_valid && should_log;
+  }
+  if (key != nullptr) {
+    CFRelease(key);
+  }
+#endif  // defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && defined(NDEBUG)
+
+#if defined(WEBRTC_WIN)
+  // Always log to the debugger.
+  // Perhaps stderr should be controlled by a preference, as on Mac?
+  OutputDebugStringA(str.c_str());
+  if (log_to_stderr) {
+    // This handles dynamically allocated consoles, too.
+    if (HANDLE error_handle = ::GetStdHandle(STD_ERROR_HANDLE)) {
+      log_to_stderr = false;
+      DWORD written = 0;
+      ::WriteFile(error_handle, str.data(), static_cast<DWORD>(str.size()),
+                  &written, 0);
+    }
+  }
+#endif  // WEBRTC_WIN
+
+#if defined(WEBRTC_ANDROID)
+  // Android's logging facility uses severity to log messages but we
+  // need to map libjingle's severity levels to Android ones first.
+  // Also write to stderr which maybe available to executable started
+  // from the shell.
+  int prio;
+  switch (severity) {
+    case LS_VERBOSE:
+      prio = ANDROID_LOG_VERBOSE;
+      break;
+    case LS_INFO:
+      prio = ANDROID_LOG_INFO;
+      break;
+    case LS_WARNING:
+      prio = ANDROID_LOG_WARN;
+      break;
+    case LS_ERROR:
+      prio = ANDROID_LOG_ERROR;
+      break;
+    default:
+      prio = ANDROID_LOG_UNKNOWN;
+  }
+
+  int size = str.size();
+  int line = 0;
+  int idx = 0;
+  const int max_lines = size / kMaxLogLineSize + 1;
+  if (max_lines == 1) {
+    __android_log_print(prio, tag, "%.*s", size, str.c_str());
+  } else {
+    while (size > 0) {
+      const int len = std::min(size, kMaxLogLineSize);
+      // Use the size of the string in the format (str may have \0 in the
+      // middle).
+      __android_log_print(prio, tag, "[%d/%d] %.*s", line + 1, max_lines, len,
+                          str.c_str() + idx);
+      idx += len;
+      size -= len;
+      ++line;
+    }
+  }
+#endif  // WEBRTC_ANDROID
+  if (log_to_stderr) {
+    fprintf(stderr, "%s", str.c_str());
+    fflush(stderr);
+  }
+}
+
+// static
+bool LogMessage::IsNoop(LoggingSeverity severity) {
+  if (severity >= g_dbg_sev || severity >= g_min_sev)
+    return false;
+  return streams_empty_.load(std::memory_order_relaxed);
+}
+
+void LogMessage::FinishPrintStream() {
+  if (!extra_.empty())
+    print_stream_ << " : " << extra_;
+  print_stream_ << "\n";
+}
+
+namespace webrtc_logging_impl {
+
+void Log(const LogArgType* fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+
+  LogMetadataErr meta;
+  const char* tag = nullptr;
+  switch (*fmt) {
+    case LogArgType::kLogMetadata: {
+      meta = {va_arg(args, LogMetadata), ERRCTX_NONE, 0};
+      break;
+    }
+    case LogArgType::kLogMetadataErr: {
+      meta = va_arg(args, LogMetadataErr);
+      break;
+    }
+#ifdef WEBRTC_ANDROID
+    case LogArgType::kLogMetadataTag: {
+      const LogMetadataTag tag_meta = va_arg(args, LogMetadataTag);
+      meta = {{nullptr, 0, tag_meta.severity}, ERRCTX_NONE, 0};
+      tag = tag_meta.tag;
+      break;
+    }
+#endif
+    default: {
+      RTC_NOTREACHED();
+      va_end(args);
+      return;
+    }
+  }
+
+  LogMessage log_message(meta.meta.File(), meta.meta.Line(),
+                         meta.meta.Severity(), meta.err_ctx, meta.err);
+  if (tag) {
+    log_message.AddTag(tag);
+  }
+
+  for (++fmt; *fmt != LogArgType::kEnd; ++fmt) {
+    switch (*fmt) {
+      case LogArgType::kInt:
+        log_message.stream() << va_arg(args, int);
+        break;
+      case LogArgType::kLong:
+        log_message.stream() << va_arg(args, long);
+        break;
+      case LogArgType::kLongLong:
+        log_message.stream() << va_arg(args, long long);
+        break;
+      case LogArgType::kUInt:
+        log_message.stream() << va_arg(args, unsigned);
+        break;
+      case LogArgType::kULong:
+        log_message.stream() << va_arg(args, unsigned long);
+        break;
+      case LogArgType::kULongLong:
+        log_message.stream() << va_arg(args, unsigned long long);
+        break;
+      case LogArgType::kDouble:
+        log_message.stream() << va_arg(args, double);
+        break;
+      case LogArgType::kLongDouble:
+        log_message.stream() << va_arg(args, long double);
+        break;
+      case LogArgType::kCharP: {
+        const char* s = va_arg(args, const char*);
+        log_message.stream() << (s ? s : "(null)");
+        break;
+      }
+      case LogArgType::kStdString:
+        log_message.stream() << *va_arg(args, const std::string*);
+        break;
+      case LogArgType::kStringView:
+        log_message.stream() << *va_arg(args, const absl::string_view*);
+        break;
+      case LogArgType::kVoidP:
+        log_message.stream() << rtc::ToHex(
+            reinterpret_cast<uintptr_t>(va_arg(args, const void*)));
+        break;
+      default:
+        RTC_NOTREACHED();
+        va_end(args);
+        return;
+    }
+  }
+
+  va_end(args);
+}
+
+}  // namespace webrtc_logging_impl
+}  // namespace rtc
+#endif
+
+namespace rtc {
+// Inefficient default implementation, override is recommended.
+void LogSink::OnLogMessage(const std::string& msg,
+                           LoggingSeverity severity,
+                           const char* tag) {
+  OnLogMessage(tag + (": " + msg), severity);
+}
+
+void LogSink::OnLogMessage(const std::string& msg,
+                           LoggingSeverity /* severity */) {
+  OnLogMessage(msg);
+}
+}  // namespace rtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/logging.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/logging.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/logging.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/logging.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,712 @@
+/*
+ *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// RTC_LOG(...) an ostream target that can be used to send formatted
+// output to a variety of logging targets, such as debugger console, stderr,
+// or any LogSink.
+// The severity level passed as the first argument to the logging
+// functions is used as a filter, to limit the verbosity of the logging.
+// Static members of LogMessage documented below are used to control the
+// verbosity and target of the output.
+// There are several variations on the RTC_LOG macro which facilitate logging
+// of common error conditions, detailed below.
+
+// RTC_LOG(sev) logs the given stream at severity "sev", which must be a
+//     compile-time constant of the LoggingSeverity type, without the namespace
+//     prefix.
+// RTC_LOG_V(sev) Like RTC_LOG(), but sev is a run-time variable of the
+//     LoggingSeverity type (basically, it just doesn't prepend the namespace).
+// RTC_LOG_F(sev) Like RTC_LOG(), but includes the name of the current function.
+// RTC_LOG_T(sev) Like RTC_LOG(), but includes the this pointer.
+// RTC_LOG_T_F(sev) Like RTC_LOG_F(), but includes the this pointer.
+// RTC_LOG_GLE(sev [, mod]) attempt to add a string description of the
+//     HRESULT returned by GetLastError.
+// RTC_LOG_ERRNO(sev) attempts to add a string description of an errno-derived
+//     error. errno and associated facilities exist on both Windows and POSIX,
+//     but on Windows they only apply to the C/C++ runtime.
+// RTC_LOG_ERR(sev) is an alias for the platform's normal error system, i.e.
+//     _GLE on Windows and _ERRNO on POSIX.
+// (The above three also all have _EX versions that let you specify the error
+// code, rather than using the last one.)
+// RTC_LOG_E(sev, ctx, err, ...) logs a detailed error interpreted using the
+//     specified context.
+// RTC_LOG_CHECK_LEVEL(sev) (and RTC_LOG_CHECK_LEVEL_V(sev)) can be used as a
+//     test before performing expensive or sensitive operations whose sole
+//     purpose is to output logging data at the desired level.
+
+#ifndef RTC_BASE_LOGGING_H_
+#define RTC_BASE_LOGGING_H_
+
+#include <errno.h>
+
+#include <atomic>
+#include <sstream>  // no-presubmit-check TODO(webrtc:8982)
+#include <string>
+#include <utility>
+
+#include "absl/base/attributes.h"
+#include "absl/meta/type_traits.h"
+#include "absl/strings/string_view.h"
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/strings/string_builder.h"
+#include "rtc_base/system/inline.h"
+
+#if !defined(NDEBUG) || defined(DLOG_ALWAYS_ON)
+#define RTC_DLOG_IS_ON 1
+#else
+#define RTC_DLOG_IS_ON 0
+#endif
+
+#if defined(RTC_DISABLE_LOGGING)
+#define RTC_LOG_ENABLED() 0
+#else
+#define RTC_LOG_ENABLED() 1
+#endif
+
+namespace rtc {
+
+//////////////////////////////////////////////////////////////////////
+
+// Note that the non-standard LoggingSeverity aliases exist because they are
+// still in broad use.  The meanings of the levels are:
+//  LS_VERBOSE: This level is for data which we do not want to appear in the
+//   normal debug log, but should appear in diagnostic logs.
+//  LS_INFO: Chatty level used in debugging for all sorts of things, the default
+//   in debug builds.
+//  LS_WARNING: Something that may warrant investigation.
+//  LS_ERROR: Something that should not have occurred.
+//  LS_NONE: Don't log.
+enum LoggingSeverity {
+  LS_VERBOSE,
+  LS_INFO,
+  LS_WARNING,
+  LS_ERROR,
+  LS_NONE,
+  INFO = LS_INFO,
+  WARNING = LS_WARNING,
+  LERROR = LS_ERROR
+};
+
+// LogErrorContext assists in interpreting the meaning of an error value.
+enum LogErrorContext {
+  ERRCTX_NONE,
+  ERRCTX_ERRNO,    // System-local errno
+  ERRCTX_HRESULT,  // Windows HRESULT
+
+  // Abbreviations for LOG_E macro
+  ERRCTX_EN = ERRCTX_ERRNO,    // LOG_E(sev, EN, x)
+  ERRCTX_HR = ERRCTX_HRESULT,  // LOG_E(sev, HR, x)
+};
+
+class LogMessage;
+// Virtual sink interface that can receive log messages.
+class LogSink {
+ public:
+  LogSink() {}
+  virtual ~LogSink() {}
+  virtual void OnLogMessage(const std::string& msg,
+                            LoggingSeverity severity,
+                            const char* tag);
+  virtual void OnLogMessage(const std::string& message,
+                            LoggingSeverity severity);
+  virtual void OnLogMessage(const std::string& message) = 0;
+
+ private:
+  friend class ::rtc::LogMessage;
+#if RTC_LOG_ENABLED()
+  // Members for LogMessage class to keep linked list of the registered sinks.
+  LogSink* next_ = nullptr;
+  LoggingSeverity min_severity_;
+#endif
+};
+
+namespace webrtc_logging_impl {
+
+class LogMetadata {
+ public:
+  LogMetadata(const char* file, int line, LoggingSeverity severity)
+      : file_(file),
+        line_and_sev_(static_cast<uint32_t>(line) << 3 | severity) {}
+  LogMetadata() = default;
+
+  const char* File() const { return file_; }
+  int Line() const { return line_and_sev_ >> 3; }
+  LoggingSeverity Severity() const {
+    return static_cast<LoggingSeverity>(line_and_sev_ & 0x7);
+  }
+
+ private:
+  const char* file_;
+
+  // Line number and severity, the former in the most significant 29 bits, the
+  // latter in the least significant 3 bits. (This is an optimization; since
+  // both numbers are usually compile-time constants, this way we can load them
+  // both with a single instruction.)
+  uint32_t line_and_sev_;
+};
+static_assert(std::is_trivial<LogMetadata>::value, "");
+
+struct LogMetadataErr {
+  LogMetadata meta;
+  LogErrorContext err_ctx;
+  int err;
+};
+
+#ifdef WEBRTC_ANDROID
+struct LogMetadataTag {
+  LoggingSeverity severity;
+  const char* tag;
+};
+#endif
+
+enum class LogArgType : int8_t {
+  kEnd = 0,
+  kInt,
+  kLong,
+  kLongLong,
+  kUInt,
+  kULong,
+  kULongLong,
+  kDouble,
+  kLongDouble,
+  kCharP,
+  kStdString,
+  kStringView,
+  kVoidP,
+  kLogMetadata,
+  kLogMetadataErr,
+#ifdef WEBRTC_ANDROID
+  kLogMetadataTag,
+#endif
+};
+
+// Wrapper for log arguments. Only ever make values of this type with the
+// MakeVal() functions.
+template <LogArgType N, typename T>
+struct Val {
+  static constexpr LogArgType Type() { return N; }
+  T GetVal() const { return val; }
+  T val;
+};
+
+// Case for when we need to construct a temp string and then print that.
+// (We can't use Val<CheckArgType::kStdString, const std::string*>
+// because we need somewhere to store the temp string.)
+struct ToStringVal {
+  static constexpr LogArgType Type() { return LogArgType::kStdString; }
+  const std::string* GetVal() const { return &val; }
+  std::string val;
+};
+
+inline Val<LogArgType::kInt, int> MakeVal(int x) {
+  return {x};
+}
+inline Val<LogArgType::kLong, long> MakeVal(long x) {
+  return {x};
+}
+inline Val<LogArgType::kLongLong, long long> MakeVal(long long x) {
+  return {x};
+}
+inline Val<LogArgType::kUInt, unsigned int> MakeVal(unsigned int x) {
+  return {x};
+}
+inline Val<LogArgType::kULong, unsigned long> MakeVal(unsigned long x) {
+  return {x};
+}
+inline Val<LogArgType::kULongLong, unsigned long long> MakeVal(
+    unsigned long long x) {
+  return {x};
+}
+
+inline Val<LogArgType::kDouble, double> MakeVal(double x) {
+  return {x};
+}
+inline Val<LogArgType::kLongDouble, long double> MakeVal(long double x) {
+  return {x};
+}
+
+inline Val<LogArgType::kCharP, const char*> MakeVal(const char* x) {
+  return {x};
+}
+inline Val<LogArgType::kStdString, const std::string*> MakeVal(
+    const std::string& x) {
+  return {&x};
+}
+inline Val<LogArgType::kStringView, const absl::string_view*> MakeVal(
+    const absl::string_view& x) {
+  return {&x};
+}
+
+inline Val<LogArgType::kVoidP, const void*> MakeVal(const void* x) {
+  return {x};
+}
+
+inline Val<LogArgType::kLogMetadata, LogMetadata> MakeVal(
+    const LogMetadata& x) {
+  return {x};
+}
+inline Val<LogArgType::kLogMetadataErr, LogMetadataErr> MakeVal(
+    const LogMetadataErr& x) {
+  return {x};
+}
+
+// The enum class types are not implicitly convertible to arithmetic types.
+template <typename T,
+          absl::enable_if_t<std::is_enum<T>::value &&
+                            !std::is_arithmetic<T>::value>* = nullptr>
+inline decltype(MakeVal(std::declval<absl::underlying_type_t<T>>())) MakeVal(
+    T x) {
+  return {static_cast<absl::underlying_type_t<T>>(x)};
+}
+
+#ifdef WEBRTC_ANDROID
+inline Val<LogArgType::kLogMetadataTag, LogMetadataTag> MakeVal(
+    const LogMetadataTag& x) {
+  return {x};
+}
+#endif
+
+template <typename T, class = void>
+struct has_to_log_string : std::false_type {};
+template <typename T>
+struct has_to_log_string<T, decltype(ToLogString(std::declval<T>()))>
+    : std::true_type {};
+
+// Handle arbitrary types other than the above by falling back to stringstream.
+// TODO(bugs.webrtc.org/9278): Get rid of this overload when callers don't need
+// it anymore. No in-tree caller does, but some external callers still do.
+template <
+    typename T,
+    typename T1 = absl::decay_t<T>,
+    absl::enable_if_t<std::is_class<T1>::value &&
+                      !std::is_same<T1, std::string>::value &&
+                      !std::is_same<T1, LogMetadata>::value &&
+                      !has_to_log_string<T1>::value &&
+#ifdef WEBRTC_ANDROID
+                      !std::is_same<T1, LogMetadataTag>::value &&
+#endif
+                      !std::is_same<T1, LogMetadataErr>::value>* = nullptr>
+ToStringVal MakeVal(const T& x) {
+  std::ostringstream os;  // no-presubmit-check TODO(webrtc:8982)
+  os << x;
+  return {os.str()};
+}
+
+template <typename T, absl::enable_if_t<has_to_log_string<T>::value>* = nullptr>
+ToStringVal MakeVal(const T& x) {
+  return {ToLogString(x)};
+}
+
+#if RTC_LOG_ENABLED()
+void Log(const LogArgType* fmt, ...);
+#else
+inline void Log(const LogArgType* fmt, ...) {
+  // Do nothing, shouldn't be invoked
+}
+#endif
+
+// Ephemeral type that represents the result of the logging << operator.
+template <typename... Ts>
+class LogStreamer;
+
+// Base case: Before the first << argument.
+template <>
+class LogStreamer<> final {
+ public:
+  template <typename U,
+            typename V = decltype(MakeVal(std::declval<U>())),
+            absl::enable_if_t<std::is_arithmetic<U>::value ||
+                              std::is_enum<U>::value>* = nullptr>
+  RTC_FORCE_INLINE LogStreamer<V> operator<<(U arg) const {
+    return LogStreamer<V>(MakeVal(arg), this);
+  }
+
+  template <typename U,
+            typename V = decltype(MakeVal(std::declval<U>())),
+            absl::enable_if_t<!std::is_arithmetic<U>::value &&
+                              !std::is_enum<U>::value>* = nullptr>
+  RTC_FORCE_INLINE LogStreamer<V> operator<<(const U& arg) const {
+    return LogStreamer<V>(MakeVal(arg), this);
+  }
+
+  template <typename... Us>
+  RTC_FORCE_INLINE static void Call(const Us&... args) {
+    static constexpr LogArgType t[] = {Us::Type()..., LogArgType::kEnd};
+    Log(t, args.GetVal()...);
+  }
+};
+
+// Inductive case: We've already seen at least one << argument. The most recent
+// one had type `T`, and the earlier ones had types `Ts`.
+template <typename T, typename... Ts>
+class LogStreamer<T, Ts...> final {
+ public:
+  RTC_FORCE_INLINE LogStreamer(T arg, const LogStreamer<Ts...>* prior)
+      : arg_(arg), prior_(prior) {}
+
+  template <typename U,
+            typename V = decltype(MakeVal(std::declval<U>())),
+            absl::enable_if_t<std::is_arithmetic<U>::value ||
+                              std::is_enum<U>::value>* = nullptr>
+  RTC_FORCE_INLINE LogStreamer<V, T, Ts...> operator<<(U arg) const {
+    return LogStreamer<V, T, Ts...>(MakeVal(arg), this);
+  }
+
+  template <typename U,
+            typename V = decltype(MakeVal(std::declval<U>())),
+            absl::enable_if_t<!std::is_arithmetic<U>::value &&
+                              !std::is_enum<U>::value>* = nullptr>
+  RTC_FORCE_INLINE LogStreamer<V, T, Ts...> operator<<(const U& arg) const {
+    return LogStreamer<V, T, Ts...>(MakeVal(arg), this);
+  }
+
+  template <typename... Us>
+  RTC_FORCE_INLINE void Call(const Us&... args) const {
+    prior_->Call(arg_, args...);
+  }
+
+ private:
+  // The most recent argument.
+  T arg_;
+
+  // Earlier arguments.
+  const LogStreamer<Ts...>* prior_;
+};
+
+class LogCall final {
+ public:
+  // This can be any binary operator with precedence lower than <<.
+  // We return bool here to be able properly remove logging if
+  // RTC_DISABLE_LOGGING is defined.
+  template <typename... Ts>
+  RTC_FORCE_INLINE bool operator&(const LogStreamer<Ts...>& streamer) {
+    streamer.Call();
+    return true;
+  }
+};
+
+// This class is used to explicitly ignore values in the conditional
+// logging macros.  This avoids compiler warnings like "value computed
+// is not used" and "statement has no effect".
+class LogMessageVoidify {
+ public:
+  LogMessageVoidify() = default;
+  // This has to be an operator with a precedence lower than << but
+  // higher than ?:
+  template <typename... Ts>
+  void operator&(LogStreamer<Ts...>&& streamer) {}
+};
+
+}  // namespace webrtc_logging_impl
+
+// Direct use of this class is deprecated; please use the logging macros
+// instead.
+// TODO(bugs.webrtc.org/9278): Move this class to an unnamed namespace in the
+// .cc file.
+class LogMessage {
+ public:
+  // Same as the above, but using a compile-time constant for the logging
+  // severity. This saves space at the call site, since passing an empty struct
+  // is generally the same as not passing an argument at all.
+  template <LoggingSeverity S>
+  RTC_NO_INLINE LogMessage(const char* file,
+                           int line,
+                           std::integral_constant<LoggingSeverity, S>)
+      : LogMessage(file, line, S) {}
+
+#if RTC_LOG_ENABLED()
+  LogMessage(const char* file, int line, LoggingSeverity sev);
+  LogMessage(const char* file,
+             int line,
+             LoggingSeverity sev,
+             LogErrorContext err_ctx,
+             int err);
+#if defined(WEBRTC_ANDROID)
+  LogMessage(const char* file, int line, LoggingSeverity sev, const char* tag);
+#endif
+  // DEPRECATED - DO NOT USE - PLEASE USE THE MACROS INSTEAD OF THE CLASS.
+  // Android code should use the 'const char*' version since tags are static
+  // and we want to avoid allocating a std::string copy per log line.
+  ABSL_DEPRECATED("Use RTC_LOG macros instead of accessing this class directly")
+  LogMessage(const char* file,
+             int line,
+             LoggingSeverity sev,
+             const std::string& tag);
+  ~LogMessage();
+
+  void AddTag(const char* tag);
+  rtc::StringBuilder& stream();
+  // Returns the time at which this function was called for the first time.
+  // The time will be used as the logging start time.
+  // If this is not called externally, the LogMessage ctor also calls it, in
+  // which case the logging start time will be the time of the first LogMessage
+  // instance is created.
+  static int64_t LogStartTime();
+  // Returns the wall clock equivalent of |LogStartTime|, in seconds from the
+  // epoch.
+  static uint32_t WallClockStartTime();
+  //  LogThreads: Display the thread identifier of the current thread
+  static void LogThreads(bool on = true);
+  //  LogTimestamps: Display the elapsed time of the program
+  static void LogTimestamps(bool on = true);
+  // These are the available logging channels
+  //  Debug: Debug console on Windows, otherwise stderr
+  static void LogToDebug(LoggingSeverity min_sev);
+  static LoggingSeverity GetLogToDebug();
+  // Sets whether logs will be directed to stderr in debug mode.
+  static void SetLogToStderr(bool log_to_stderr);
+  // Stream: Any non-blocking stream interface.
+  // Installs the |stream| to collect logs with severtiy |min_sev| or higher.
+  // |stream| must live until deinstalled by RemoveLogToStream.
+  // If |stream| is the first stream added to the system, we might miss some
+  // early concurrent log statement happening from another thread happening near
+  // this instant.
+  static void AddLogToStream(LogSink* stream, LoggingSeverity min_sev);
+  // Removes the specified stream, without destroying it. When the method
+  // has completed, it's guaranteed that |stream| will receive no more logging
+  // calls.
+  static void RemoveLogToStream(LogSink* stream);
+  // Returns the severity for the specified stream, of if none is specified,
+  // the minimum stream severity.
+  static int GetLogToStream(LogSink* stream = nullptr);
+  // Testing against MinLogSeverity allows code to avoid potentially expensive
+  // logging operations by pre-checking the logging level.
+  static int GetMinLogSeverity();
+  // Parses the provided parameter stream to configure the options above.
+  // Useful for configuring logging from the command line.
+  static void ConfigureLogging(const char* params);
+  // Checks the current global debug severity and if the |streams_| collection
+  // is empty. If |severity| is smaller than the global severity and if the
+  // |streams_| collection is empty, the LogMessage will be considered a noop
+  // LogMessage.
+  static bool IsNoop(LoggingSeverity severity);
+  // Version of IsNoop that uses fewer instructions at the call site, since the
+  // caller doesn't have to pass an argument.
+  template <LoggingSeverity S>
+  RTC_NO_INLINE static bool IsNoop() {
+    return IsNoop(S);
+  }
+#else
+  // Next methods do nothing; no one will call these functions.
+  LogMessage(const char* file, int line, LoggingSeverity sev) {}
+  LogMessage(const char* file,
+             int line,
+             LoggingSeverity sev,
+             LogErrorContext err_ctx,
+             int err) {}
+#if defined(WEBRTC_ANDROID)
+  LogMessage(const char* file, int line, LoggingSeverity sev, const char* tag) {
+  }
+#endif
+  // DEPRECATED - DO NOT USE - PLEASE USE THE MACROS INSTEAD OF THE CLASS.
+  // Android code should use the 'const char*' version since tags are static
+  // and we want to avoid allocating a std::string copy per log line.
+  ABSL_DEPRECATED("Use RTC_LOG macros instead of accessing this class directly")
+  LogMessage(const char* file,
+             int line,
+             LoggingSeverity sev,
+             const std::string& tag) {}
+  ~LogMessage() = default;
+
+  inline void AddTag(const char* tag) {}
+  inline rtc::StringBuilder& stream() { return print_stream_; }
+  inline static int64_t LogStartTime() { return 0; }
+  inline static uint32_t WallClockStartTime() { return 0; }
+  inline static void LogThreads(bool on = true) {}
+  inline static void LogTimestamps(bool on = true) {}
+  inline static void LogToDebug(LoggingSeverity min_sev) {}
+  inline static LoggingSeverity GetLogToDebug() {
+    return LoggingSeverity::LS_INFO;
+  }
+  inline static void SetLogToStderr(bool log_to_stderr) {}
+  inline static void AddLogToStream(LogSink* stream, LoggingSeverity min_sev) {}
+  inline static void RemoveLogToStream(LogSink* stream) {}
+  inline static int GetLogToStream(LogSink* stream = nullptr) { return 0; }
+  inline static int GetMinLogSeverity() { return 0; }
+  inline static void ConfigureLogging(const char* params) {}
+  static constexpr bool IsNoop(LoggingSeverity severity) { return true; }
+  template <LoggingSeverity S>
+  static constexpr bool IsNoop() {
+    return IsNoop(S);
+  }
+#endif  // RTC_LOG_ENABLED()
+
+ private:
+  friend class LogMessageForTesting;
+
+#if RTC_LOG_ENABLED()
+  // Updates min_sev_ appropriately when debug sinks change.
+  static void UpdateMinLogSeverity();
+
+// These write out the actual log messages.
+#if defined(WEBRTC_ANDROID)
+  static void OutputToDebug(const std::string& msg,
+                            LoggingSeverity severity,
+                            const char* tag);
+#else
+  static void OutputToDebug(const std::string& msg, LoggingSeverity severity);
+#endif  // defined(WEBRTC_ANDROID)
+
+  // Called from the dtor (or from a test) to append optional extra error
+  // information to the log stream and a newline character.
+  void FinishPrintStream();
+
+  // The severity level of this message
+  LoggingSeverity severity_;
+
+#if defined(WEBRTC_ANDROID)
+  // The default Android debug output tag.
+  const char* tag_ = "libjingle";
+#endif
+
+  // String data generated in the constructor, that should be appended to
+  // the message before output.
+  std::string extra_;
+
+  // The output streams and their associated severities
+  static LogSink* streams_;
+
+  // Holds true with high probability if |streams_| is empty, false with high
+  // probability otherwise. Operated on with std::memory_order_relaxed because
+  // it's ok to lose or log some additional statements near the instant streams
+  // are added/removed.
+  static std::atomic<bool> streams_empty_;
+
+  // Flags for formatting options
+  static bool thread_, timestamp_;
+
+  // Determines if logs will be directed to stderr in debug mode.
+  static bool log_to_stderr_;
+#else  // RTC_LOG_ENABLED()
+  // Next methods do nothing; no one will call these functions.
+  inline static void UpdateMinLogSeverity() {}
+#if defined(WEBRTC_ANDROID)
+  inline static void OutputToDebug(const std::string& msg,
+                                   LoggingSeverity severity,
+                                   const char* tag) {}
+#else
+  inline static void OutputToDebug(const std::string& msg,
+                                   LoggingSeverity severity) {}
+#endif  // defined(WEBRTC_ANDROID)
+  inline void FinishPrintStream() {}
+#endif  // RTC_LOG_ENABLED()
+
+  // The stringbuilder that buffers the formatted message before output
+  rtc::StringBuilder print_stream_;
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(LogMessage);
+};
+
+//////////////////////////////////////////////////////////////////////
+// Logging Helpers
+//////////////////////////////////////////////////////////////////////
+
+#define RTC_LOG_FILE_LINE(sev, file, line)        \
+  ::rtc::webrtc_logging_impl::LogCall() &         \
+      ::rtc::webrtc_logging_impl::LogStreamer<>() \
+          << ::rtc::webrtc_logging_impl::LogMetadata(file, line, sev)
+
+#define RTC_LOG(sev)                        \
+  !rtc::LogMessage::IsNoop<::rtc::sev>() && \
+      RTC_LOG_FILE_LINE(::rtc::sev, __FILE__, __LINE__)
+
+// The _V version is for when a variable is passed in.
+#define RTC_LOG_V(sev) \
+  !rtc::LogMessage::IsNoop(sev) && RTC_LOG_FILE_LINE(sev, __FILE__, __LINE__)
+
+// The _F version prefixes the message with the current function name.
+#if (defined(__GNUC__) && !defined(NDEBUG)) || defined(WANT_PRETTY_LOG_F)
+#define RTC_LOG_F(sev) RTC_LOG(sev) << __PRETTY_FUNCTION__ << ": "
+#define RTC_LOG_T_F(sev) \
+  RTC_LOG(sev) << this << ": " << __PRETTY_FUNCTION__ << ": "
+#else
+#define RTC_LOG_F(sev) RTC_LOG(sev) << __FUNCTION__ << ": "
+#define RTC_LOG_T_F(sev) RTC_LOG(sev) << this << ": " << __FUNCTION__ << ": "
+#endif
+
+#define RTC_LOG_CHECK_LEVEL(sev) ::rtc::LogCheckLevel(::rtc::sev)
+#define RTC_LOG_CHECK_LEVEL_V(sev) ::rtc::LogCheckLevel(sev)
+
+inline bool LogCheckLevel(LoggingSeverity sev) {
+  return (LogMessage::GetMinLogSeverity() <= sev);
+}
+
+#define RTC_LOG_E(sev, ctx, err)                                 \
+  !rtc::LogMessage::IsNoop<::rtc::sev>() &&                      \
+      ::rtc::webrtc_logging_impl::LogCall() &                    \
+          ::rtc::webrtc_logging_impl::LogStreamer<>()            \
+              << ::rtc::webrtc_logging_impl::LogMetadataErr {    \
+    {__FILE__, __LINE__, ::rtc::sev}, ::rtc::ERRCTX_##ctx, (err) \
+  }
+
+#define RTC_LOG_T(sev) RTC_LOG(sev) << this << ": "
+
+#define RTC_LOG_ERRNO_EX(sev, err) RTC_LOG_E(sev, ERRNO, err)
+#define RTC_LOG_ERRNO(sev) RTC_LOG_ERRNO_EX(sev, errno)
+
+#if defined(WEBRTC_WIN)
+#define RTC_LOG_GLE_EX(sev, err) RTC_LOG_E(sev, HRESULT, err)
+#define RTC_LOG_GLE(sev) RTC_LOG_GLE_EX(sev, static_cast<int>(GetLastError()))
+#define RTC_LOG_ERR_EX(sev, err) RTC_LOG_GLE_EX(sev, err)
+#define RTC_LOG_ERR(sev) RTC_LOG_GLE(sev)
+#elif defined(__native_client__) && __native_client__
+#define RTC_LOG_ERR_EX(sev, err) RTC_LOG(sev)
+#define RTC_LOG_ERR(sev) RTC_LOG(sev)
+#elif defined(WEBRTC_POSIX)
+#define RTC_LOG_ERR_EX(sev, err) RTC_LOG_ERRNO_EX(sev, err)
+#define RTC_LOG_ERR(sev) RTC_LOG_ERRNO(sev)
+#endif  // WEBRTC_WIN
+
+#ifdef WEBRTC_ANDROID
+
+namespace webrtc_logging_impl {
+// TODO(kwiberg): Replace these with absl::string_view.
+inline const char* AdaptString(const char* str) {
+  return str;
+}
+inline const char* AdaptString(const std::string& str) {
+  return str.c_str();
+}
+}  // namespace webrtc_logging_impl
+
+#define RTC_LOG_TAG(sev, tag)                                 \
+  !rtc::LogMessage::IsNoop(sev) &&                            \
+      ::rtc::webrtc_logging_impl::LogCall() &                 \
+          ::rtc::webrtc_logging_impl::LogStreamer<>()         \
+              << ::rtc::webrtc_logging_impl::LogMetadataTag { \
+    sev, ::rtc::webrtc_logging_impl::AdaptString(tag)         \
+  }
+
+#else
+
+// DEPRECATED. This macro is only intended for Android.
+#define RTC_LOG_TAG(sev, tag) RTC_LOG_V(sev)
+
+#endif
+
+// The RTC_DLOG macros are equivalent to their RTC_LOG counterparts except that
+// they only generate code in debug builds.
+#if RTC_DLOG_IS_ON
+#define RTC_DLOG(sev) RTC_LOG(sev)
+#define RTC_DLOG_V(sev) RTC_LOG_V(sev)
+#define RTC_DLOG_F(sev) RTC_LOG_F(sev)
+#else
+#define RTC_DLOG_EAT_STREAM_PARAMS()                \
+  while (false)                                     \
+  ::rtc::webrtc_logging_impl::LogMessageVoidify() & \
+      (::rtc::webrtc_logging_impl::LogStreamer<>())
+#define RTC_DLOG(sev) RTC_DLOG_EAT_STREAM_PARAMS()
+#define RTC_DLOG_V(sev) RTC_DLOG_EAT_STREAM_PARAMS()
+#define RTC_DLOG_F(sev) RTC_DLOG_EAT_STREAM_PARAMS()
+#endif
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_LOGGING_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/memory/aligned_malloc.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/memory/aligned_malloc.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/memory/aligned_malloc.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/memory/aligned_malloc.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,98 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "rtc_base/memory/aligned_malloc.h"
+
+#include <stdlib.h>  // for free, malloc
+#include <string.h>  // for memcpy
+
+#include "rtc_base/checks.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <stdint.h>
+#endif
+
+// Reference on memory alignment:
+// http://stackoverflow.com/questions/227897/solve-the-memory-alignment-in-c-interview-question-that-stumped-me
+namespace webrtc {
+
+uintptr_t GetRightAlign(uintptr_t start_pos, size_t alignment) {
+  // The pointer should be aligned with |alignment| bytes. The - 1 guarantees
+  // that it is aligned towards the closest higher (right) address.
+  return (start_pos + alignment - 1) & ~(alignment - 1);
+}
+
+// Alignment must be an integer power of two.
+bool ValidAlignment(size_t alignment) {
+  if (!alignment) {
+    return false;
+  }
+  return (alignment & (alignment - 1)) == 0;
+}
+
+void* GetRightAlign(const void* pointer, size_t alignment) {
+  if (!pointer) {
+    return NULL;
+  }
+  if (!ValidAlignment(alignment)) {
+    return NULL;
+  }
+  uintptr_t start_pos = reinterpret_cast<uintptr_t>(pointer);
+  return reinterpret_cast<void*>(GetRightAlign(start_pos, alignment));
+}
+
+void* AlignedMalloc(size_t size, size_t alignment) {
+  if (size == 0) {
+    return NULL;
+  }
+  if (!ValidAlignment(alignment)) {
+    return NULL;
+  }
+
+  // The memory is aligned towards the lowest address that so only
+  // alignment - 1 bytes needs to be allocated.
+  // A pointer to the start of the memory must be stored so that it can be
+  // retreived for deletion, ergo the sizeof(uintptr_t).
+  void* memory_pointer = malloc(size + sizeof(uintptr_t) + alignment - 1);
+  RTC_CHECK(memory_pointer) << "Couldn't allocate memory in AlignedMalloc";
+
+  // Aligning after the sizeof(uintptr_t) bytes will leave room for the header
+  // in the same memory block.
+  uintptr_t align_start_pos = reinterpret_cast<uintptr_t>(memory_pointer);
+  align_start_pos += sizeof(uintptr_t);
+  uintptr_t aligned_pos = GetRightAlign(align_start_pos, alignment);
+  void* aligned_pointer = reinterpret_cast<void*>(aligned_pos);
+
+  // Store the address to the beginning of the memory just before the aligned
+  // memory.
+  uintptr_t header_pos = aligned_pos - sizeof(uintptr_t);
+  void* header_pointer = reinterpret_cast<void*>(header_pos);
+  uintptr_t memory_start = reinterpret_cast<uintptr_t>(memory_pointer);
+  memcpy(header_pointer, &memory_start, sizeof(uintptr_t));
+
+  return aligned_pointer;
+}
+
+void AlignedFree(void* mem_block) {
+  if (mem_block == NULL) {
+    return;
+  }
+  uintptr_t aligned_pos = reinterpret_cast<uintptr_t>(mem_block);
+  uintptr_t header_pos = aligned_pos - sizeof(uintptr_t);
+
+  // Read out the address of the AlignedMemory struct from the header.
+  uintptr_t memory_start_pos = *reinterpret_cast<uintptr_t*>(header_pos);
+  void* memory_start = reinterpret_cast<void*>(memory_start_pos);
+  free(memory_start);
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/memory/aligned_malloc.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/memory/aligned_malloc.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/memory/aligned_malloc.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/memory/aligned_malloc.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_MEMORY_ALIGNED_MALLOC_H_
+#define RTC_BASE_MEMORY_ALIGNED_MALLOC_H_
+
+// The functions declared here
+// 1) Allocates block of aligned memory.
+// 2) Re-calculates a pointer such that it is aligned to a higher or equal
+//    address.
+// Note: alignment must be a power of two. The alignment is in bytes.
+
+#include <stddef.h>
+
+namespace webrtc {
+
+// Returns a pointer to the first boundry of |alignment| bytes following the
+// address of |ptr|.
+// Note that there is no guarantee that the memory in question is available.
+// |ptr| has no requirements other than it can't be NULL.
+void* GetRightAlign(const void* ptr, size_t alignment);
+
+// Allocates memory of |size| bytes aligned on an |alignment| boundry.
+// The return value is a pointer to the memory. Note that the memory must
+// be de-allocated using AlignedFree.
+void* AlignedMalloc(size_t size, size_t alignment);
+// De-allocates memory created using the AlignedMalloc() API.
+void AlignedFree(void* mem_block);
+
+// Templated versions to facilitate usage of aligned malloc without casting
+// to and from void*.
+template <typename T>
+T* GetRightAlign(const T* ptr, size_t alignment) {
+  return reinterpret_cast<T*>(
+      GetRightAlign(reinterpret_cast<const void*>(ptr), alignment));
+}
+template <typename T>
+T* AlignedMalloc(size_t size, size_t alignment) {
+  return reinterpret_cast<T*>(AlignedMalloc(size, alignment));
+}
+
+// Deleter for use with unique_ptr. E.g., use as
+//   std::unique_ptr<Foo, AlignedFreeDeleter> foo;
+struct AlignedFreeDeleter {
+  inline void operator()(void* ptr) const { AlignedFree(ptr); }
+};
+
+}  // namespace webrtc
+
+#endif  // RTC_BASE_MEMORY_ALIGNED_MALLOC_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_compare.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_compare.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_compare.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_compare.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,176 @@
+/*
+ *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// This file defines six constexpr functions:
+//
+//   rtc::SafeEq  // ==
+//   rtc::SafeNe  // !=
+//   rtc::SafeLt  // <
+//   rtc::SafeLe  // <=
+//   rtc::SafeGt  // >
+//   rtc::SafeGe  // >=
+//
+// They each accept two arguments of arbitrary types, and in almost all cases,
+// they simply call the appropriate comparison operator. However, if both
+// arguments are integers, they don't compare them using C++'s quirky rules,
+// but instead adhere to the true mathematical definitions. It is as if the
+// arguments were first converted to infinite-range signed integers, and then
+// compared, although of course nothing expensive like that actually takes
+// place. In practice, for signed/signed and unsigned/unsigned comparisons and
+// some mixed-signed comparisons with a compile-time constant, the overhead is
+// zero; in the remaining cases, it is just a few machine instructions (no
+// branches).
+
+#ifndef RTC_BASE_NUMERICS_SAFE_COMPARE_H_
+#define RTC_BASE_NUMERICS_SAFE_COMPARE_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+#include <type_traits>
+#include <utility>
+
+#include "rtc_base/type_traits.h"
+
+namespace rtc {
+
+namespace safe_cmp_impl {
+
+template <size_t N>
+struct LargerIntImpl : std::false_type {};
+template <>
+struct LargerIntImpl<sizeof(int8_t)> : std::true_type {
+  using type = int16_t;
+};
+template <>
+struct LargerIntImpl<sizeof(int16_t)> : std::true_type {
+  using type = int32_t;
+};
+template <>
+struct LargerIntImpl<sizeof(int32_t)> : std::true_type {
+  using type = int64_t;
+};
+
+// LargerInt<T1, T2>::value is true iff there's a signed type that's larger
+// than T1 (and no larger than the larger of T2 and int*, for performance
+// reasons); and if there is such a type, LargerInt<T1, T2>::type is an alias
+// for it.
+template <typename T1, typename T2>
+struct LargerInt
+    : LargerIntImpl<sizeof(T1) < sizeof(T2) || sizeof(T1) < sizeof(int*)
+                        ? sizeof(T1)
+                        : 0> {};
+
+template <typename T>
+constexpr typename std::make_unsigned<T>::type MakeUnsigned(T a) {
+  return static_cast<typename std::make_unsigned<T>::type>(a);
+}
+
+// Overload for when both T1 and T2 have the same signedness.
+template <typename Op,
+          typename T1,
+          typename T2,
+          typename std::enable_if<std::is_signed<T1>::value ==
+                                  std::is_signed<T2>::value>::type* = nullptr>
+constexpr bool Cmp(T1 a, T2 b) {
+  return Op::Op(a, b);
+}
+
+// Overload for signed - unsigned comparison that can be promoted to a bigger
+// signed type.
+template <typename Op,
+          typename T1,
+          typename T2,
+          typename std::enable_if<std::is_signed<T1>::value &&
+                                  std::is_unsigned<T2>::value &&
+                                  LargerInt<T2, T1>::value>::type* = nullptr>
+constexpr bool Cmp(T1 a, T2 b) {
+  return Op::Op(a, static_cast<typename LargerInt<T2, T1>::type>(b));
+}
+
+// Overload for unsigned - signed comparison that can be promoted to a bigger
+// signed type.
+template <typename Op,
+          typename T1,
+          typename T2,
+          typename std::enable_if<std::is_unsigned<T1>::value &&
+                                  std::is_signed<T2>::value &&
+                                  LargerInt<T1, T2>::value>::type* = nullptr>
+constexpr bool Cmp(T1 a, T2 b) {
+  return Op::Op(static_cast<typename LargerInt<T1, T2>::type>(a), b);
+}
+
+// Overload for signed - unsigned comparison that can't be promoted to a bigger
+// signed type.
+template <typename Op,
+          typename T1,
+          typename T2,
+          typename std::enable_if<std::is_signed<T1>::value &&
+                                  std::is_unsigned<T2>::value &&
+                                  !LargerInt<T2, T1>::value>::type* = nullptr>
+constexpr bool Cmp(T1 a, T2 b) {
+  return a < 0 ? Op::Op(-1, 0) : Op::Op(safe_cmp_impl::MakeUnsigned(a), b);
+}
+
+// Overload for unsigned - signed comparison that can't be promoted to a bigger
+// signed type.
+template <typename Op,
+          typename T1,
+          typename T2,
+          typename std::enable_if<std::is_unsigned<T1>::value &&
+                                  std::is_signed<T2>::value &&
+                                  !LargerInt<T1, T2>::value>::type* = nullptr>
+constexpr bool Cmp(T1 a, T2 b) {
+  return b < 0 ? Op::Op(0, -1) : Op::Op(a, safe_cmp_impl::MakeUnsigned(b));
+}
+
+#define RTC_SAFECMP_MAKE_OP(name, op)      \
+  struct name {                            \
+    template <typename T1, typename T2>    \
+    static constexpr bool Op(T1 a, T2 b) { \
+      return a op b;                       \
+    }                                      \
+  };
+RTC_SAFECMP_MAKE_OP(EqOp, ==)
+RTC_SAFECMP_MAKE_OP(NeOp, !=)
+RTC_SAFECMP_MAKE_OP(LtOp, <)
+RTC_SAFECMP_MAKE_OP(LeOp, <=)
+RTC_SAFECMP_MAKE_OP(GtOp, >)
+RTC_SAFECMP_MAKE_OP(GeOp, >=)
+#undef RTC_SAFECMP_MAKE_OP
+
+}  // namespace safe_cmp_impl
+
+#define RTC_SAFECMP_MAKE_FUN(name)                                            \
+  template <typename T1, typename T2>                                         \
+  constexpr                                                                   \
+      typename std::enable_if<IsIntlike<T1>::value && IsIntlike<T2>::value,   \
+                              bool>::type Safe##name(T1 a, T2 b) {            \
+    /* Unary plus here turns enums into real integral types. */               \
+    return safe_cmp_impl::Cmp<safe_cmp_impl::name##Op>(+a, +b);               \
+  }                                                                           \
+  template <typename T1, typename T2>                                         \
+  constexpr                                                                   \
+      typename std::enable_if<!IsIntlike<T1>::value || !IsIntlike<T2>::value, \
+                              bool>::type Safe##name(const T1& a,             \
+                                                     const T2& b) {           \
+    return safe_cmp_impl::name##Op::Op(a, b);                                 \
+  }
+RTC_SAFECMP_MAKE_FUN(Eq)
+RTC_SAFECMP_MAKE_FUN(Ne)
+RTC_SAFECMP_MAKE_FUN(Lt)
+RTC_SAFECMP_MAKE_FUN(Le)
+RTC_SAFECMP_MAKE_FUN(Gt)
+RTC_SAFECMP_MAKE_FUN(Ge)
+#undef RTC_SAFECMP_MAKE_FUN
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_NUMERICS_SAFE_COMPARE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_conversions.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_conversions.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_conversions.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_conversions.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+ *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Borrowed from Chromium's src/base/numerics/safe_conversions.h.
+
+#ifndef RTC_BASE_NUMERICS_SAFE_CONVERSIONS_H_
+#define RTC_BASE_NUMERICS_SAFE_CONVERSIONS_H_
+
+#include <limits>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_conversions_impl.h"
+
+namespace rtc {
+
+// Convenience function that returns true if the supplied value is in range
+// for the destination type.
+template <typename Dst, typename Src>
+inline constexpr bool IsValueInRangeForNumericType(Src value) {
+  return internal::RangeCheck<Dst>(value) == internal::TYPE_VALID;
+}
+
+// checked_cast<> and dchecked_cast<> are analogous to static_cast<> for
+// numeric types, except that they [D]CHECK that the specified numeric
+// conversion will not overflow or underflow. NaN source will always trigger
+// the [D]CHECK.
+template <typename Dst, typename Src>
+inline constexpr Dst checked_cast(Src value) {
+  RTC_CHECK(IsValueInRangeForNumericType<Dst>(value));
+  return static_cast<Dst>(value);
+}
+template <typename Dst, typename Src>
+inline constexpr Dst dchecked_cast(Src value) {
+  RTC_DCHECK(IsValueInRangeForNumericType<Dst>(value));
+  return static_cast<Dst>(value);
+}
+
+// saturated_cast<> is analogous to static_cast<> for numeric types, except
+// that the specified numeric conversion will saturate rather than overflow or
+// underflow. NaN assignment to an integral will trigger a RTC_CHECK condition.
+template <typename Dst, typename Src>
+inline constexpr Dst saturated_cast(Src value) {
+  // Optimization for floating point values, which already saturate.
+  if (std::numeric_limits<Dst>::is_iec559)
+    return static_cast<Dst>(value);
+
+  switch (internal::RangeCheck<Dst>(value)) {
+    case internal::TYPE_VALID:
+      return static_cast<Dst>(value);
+
+    case internal::TYPE_UNDERFLOW:
+      return std::numeric_limits<Dst>::min();
+
+    case internal::TYPE_OVERFLOW:
+      return std::numeric_limits<Dst>::max();
+
+    // Should fail only on attempting to assign NaN to a saturated integer.
+    case internal::TYPE_INVALID:
+      RTC_CHECK_NOTREACHED();
+  }
+
+  RTC_CHECK_NOTREACHED();
+}
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_NUMERICS_SAFE_CONVERSIONS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_conversions_impl.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_conversions_impl.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_conversions_impl.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_conversions_impl.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,177 @@
+/*
+ *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Borrowed from Chromium's src/base/numerics/safe_conversions_impl.h.
+
+#ifndef RTC_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_
+#define RTC_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_
+
+#include <limits>
+
+namespace rtc {
+namespace internal {
+
+enum DstSign { DST_UNSIGNED, DST_SIGNED };
+
+enum SrcSign { SRC_UNSIGNED, SRC_SIGNED };
+
+enum DstRange { OVERLAPS_RANGE, CONTAINS_RANGE };
+
+// Helper templates to statically determine if our destination type can contain
+// all values represented by the source type.
+
+template <typename Dst,
+          typename Src,
+          DstSign IsDstSigned =
+              std::numeric_limits<Dst>::is_signed ? DST_SIGNED : DST_UNSIGNED,
+          SrcSign IsSrcSigned =
+              std::numeric_limits<Src>::is_signed ? SRC_SIGNED : SRC_UNSIGNED>
+struct StaticRangeCheck {};
+
+template <typename Dst, typename Src>
+struct StaticRangeCheck<Dst, Src, DST_SIGNED, SRC_SIGNED> {
+  typedef std::numeric_limits<Dst> DstLimits;
+  typedef std::numeric_limits<Src> SrcLimits;
+  // Compare based on max_exponent, which we must compute for integrals.
+  static const size_t kDstMaxExponent =
+      DstLimits::is_iec559 ? DstLimits::max_exponent : (sizeof(Dst) * 8 - 1);
+  static const size_t kSrcMaxExponent =
+      SrcLimits::is_iec559 ? SrcLimits::max_exponent : (sizeof(Src) * 8 - 1);
+  static const DstRange value =
+      kDstMaxExponent >= kSrcMaxExponent ? CONTAINS_RANGE : OVERLAPS_RANGE;
+};
+
+template <typename Dst, typename Src>
+struct StaticRangeCheck<Dst, Src, DST_UNSIGNED, SRC_UNSIGNED> {
+  static const DstRange value =
+      sizeof(Dst) >= sizeof(Src) ? CONTAINS_RANGE : OVERLAPS_RANGE;
+};
+
+template <typename Dst, typename Src>
+struct StaticRangeCheck<Dst, Src, DST_SIGNED, SRC_UNSIGNED> {
+  typedef std::numeric_limits<Dst> DstLimits;
+  typedef std::numeric_limits<Src> SrcLimits;
+  // Compare based on max_exponent, which we must compute for integrals.
+  static const size_t kDstMaxExponent =
+      DstLimits::is_iec559 ? DstLimits::max_exponent : (sizeof(Dst) * 8 - 1);
+  static const size_t kSrcMaxExponent = sizeof(Src) * 8;
+  static const DstRange value =
+      kDstMaxExponent >= kSrcMaxExponent ? CONTAINS_RANGE : OVERLAPS_RANGE;
+};
+
+template <typename Dst, typename Src>
+struct StaticRangeCheck<Dst, Src, DST_UNSIGNED, SRC_SIGNED> {
+  static const DstRange value = OVERLAPS_RANGE;
+};
+
+enum RangeCheckResult {
+  TYPE_VALID = 0,      // Value can be represented by the destination type.
+  TYPE_UNDERFLOW = 1,  // Value would overflow.
+  TYPE_OVERFLOW = 2,   // Value would underflow.
+  TYPE_INVALID = 3     // Source value is invalid (i.e. NaN).
+};
+
+// This macro creates a RangeCheckResult from an upper and lower bound
+// check by taking advantage of the fact that only NaN can be out of range in
+// both directions at once.
+#define BASE_NUMERIC_RANGE_CHECK_RESULT(is_in_upper_bound, is_in_lower_bound) \
+  RangeCheckResult(((is_in_upper_bound) ? 0 : TYPE_OVERFLOW) |                \
+                   ((is_in_lower_bound) ? 0 : TYPE_UNDERFLOW))
+
+template <typename Dst,
+          typename Src,
+          DstSign IsDstSigned =
+              std::numeric_limits<Dst>::is_signed ? DST_SIGNED : DST_UNSIGNED,
+          SrcSign IsSrcSigned =
+              std::numeric_limits<Src>::is_signed ? SRC_SIGNED : SRC_UNSIGNED,
+          DstRange IsSrcRangeContained = StaticRangeCheck<Dst, Src>::value>
+struct RangeCheckImpl {};
+
+// The following templates are for ranges that must be verified at runtime. We
+// split it into checks based on signedness to avoid confusing casts and
+// compiler warnings on signed an unsigned comparisons.
+
+// Dst range always contains the result: nothing to check.
+template <typename Dst, typename Src, DstSign IsDstSigned, SrcSign IsSrcSigned>
+struct RangeCheckImpl<Dst, Src, IsDstSigned, IsSrcSigned, CONTAINS_RANGE> {
+  static constexpr RangeCheckResult Check(Src value) { return TYPE_VALID; }
+};
+
+// Signed to signed narrowing.
+template <typename Dst, typename Src>
+struct RangeCheckImpl<Dst, Src, DST_SIGNED, SRC_SIGNED, OVERLAPS_RANGE> {
+  static constexpr RangeCheckResult Check(Src value) {
+    typedef std::numeric_limits<Dst> DstLimits;
+    return DstLimits::is_iec559
+               ? BASE_NUMERIC_RANGE_CHECK_RESULT(
+                     value <= static_cast<Src>(DstLimits::max()),
+                     value >= static_cast<Src>(DstLimits::max() * -1))
+               : BASE_NUMERIC_RANGE_CHECK_RESULT(
+                     value <= static_cast<Src>(DstLimits::max()),
+                     value >= static_cast<Src>(DstLimits::min()));
+  }
+};
+
+// Unsigned to unsigned narrowing.
+template <typename Dst, typename Src>
+struct RangeCheckImpl<Dst, Src, DST_UNSIGNED, SRC_UNSIGNED, OVERLAPS_RANGE> {
+  static constexpr RangeCheckResult Check(Src value) {
+    typedef std::numeric_limits<Dst> DstLimits;
+    return BASE_NUMERIC_RANGE_CHECK_RESULT(
+        value <= static_cast<Src>(DstLimits::max()), true);
+  }
+};
+
+// Unsigned to signed.
+template <typename Dst, typename Src>
+struct RangeCheckImpl<Dst, Src, DST_SIGNED, SRC_UNSIGNED, OVERLAPS_RANGE> {
+  static constexpr RangeCheckResult Check(Src value) {
+    typedef std::numeric_limits<Dst> DstLimits;
+    return sizeof(Dst) > sizeof(Src)
+               ? TYPE_VALID
+               : BASE_NUMERIC_RANGE_CHECK_RESULT(
+                     value <= static_cast<Src>(DstLimits::max()), true);
+  }
+};
+
+// Signed to unsigned.
+template <typename Dst, typename Src>
+struct RangeCheckImpl<Dst, Src, DST_UNSIGNED, SRC_SIGNED, OVERLAPS_RANGE> {
+  typedef std::numeric_limits<Dst> DstLimits;
+  typedef std::numeric_limits<Src> SrcLimits;
+  // Compare based on max_exponent, which we must compute for integrals.
+  static constexpr size_t DstMaxExponent() { return sizeof(Dst) * 8; }
+  static constexpr size_t SrcMaxExponent() {
+    return SrcLimits::is_iec559 ? SrcLimits::max_exponent
+                                : (sizeof(Src) * 8 - 1);
+  }
+  static constexpr RangeCheckResult Check(Src value) {
+    return (DstMaxExponent() >= SrcMaxExponent())
+               ? BASE_NUMERIC_RANGE_CHECK_RESULT(true,
+                                                 value >= static_cast<Src>(0))
+               : BASE_NUMERIC_RANGE_CHECK_RESULT(
+                     value <= static_cast<Src>(DstLimits::max()),
+                     value >= static_cast<Src>(0));
+  }
+};
+
+template <typename Dst, typename Src>
+inline constexpr RangeCheckResult RangeCheck(Src value) {
+  static_assert(std::numeric_limits<Src>::is_specialized,
+                "argument must be numeric");
+  static_assert(std::numeric_limits<Dst>::is_specialized,
+                "result must be numeric");
+  return RangeCheckImpl<Dst, Src>::Check(value);
+}
+
+}  // namespace internal
+}  // namespace rtc
+
+#endif  // RTC_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_minmax.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_minmax.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_minmax.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/numerics/safe_minmax.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,335 @@
+/*
+ *  Copyright 2017 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Minimum and maximum
+// ===================
+//
+//   rtc::SafeMin(x, y)
+//   rtc::SafeMax(x, y)
+//
+// (These are both constexpr.)
+//
+// Accept two arguments of either any two integral or any two floating-point
+// types, and return the smaller and larger value, respectively, with no
+// truncation or wrap-around. If only one of the input types is statically
+// guaranteed to be able to represent the result, the return type is that type;
+// if either one would do, the result type is the smaller type. (One of these
+// two cases always applies.)
+//
+//   * The case with one floating-point and one integral type is not allowed,
+//     because the floating-point type will have greater range, but may not
+//     have sufficient precision to represent the integer value exactly.)
+//
+// Clamp (a.k.a. constrain to a given interval)
+// ============================================
+//
+//   rtc::SafeClamp(x, a, b)
+//
+// Accepts three arguments of any mix of integral types or any mix of
+// floating-point types, and returns the value in the closed interval [a, b]
+// that is closest to x (that is, if x < a it returns a; if x > b it returns b;
+// and if a <= x <= b it returns x). As for SafeMin() and SafeMax(), there is
+// no truncation or wrap-around. The result type
+//
+//   1. is statically guaranteed to be able to represent the result;
+//
+//   2. is no larger than the largest of the three argument types; and
+//
+//   3. has the same signedness as the type of the first argument, if this is
+//      possible without violating the First or Second Law.
+//
+// There is always at least one type that meets criteria 1 and 2. If more than
+// one type meets these criteria equally well, the result type is one of the
+// types that is smallest. Note that unlike SafeMin() and SafeMax(),
+// SafeClamp() will sometimes pick a return type that isn't the type of any of
+// its arguments.
+//
+//   * In this context, a type A is smaller than a type B if it has a smaller
+//     range; that is, if A::max() - A::min() < B::max() - B::min(). For
+//     example, int8_t < int16_t == uint16_t < int32_t, and all integral types
+//     are smaller than all floating-point types.)
+//
+//   * As for SafeMin and SafeMax, mixing integer and floating-point arguments
+//     is not allowed, because floating-point types have greater range than
+//     integer types, but do not have sufficient precision to represent the
+//     values of most integer types exactly.
+//
+// Requesting a specific return type
+// =================================
+//
+// All three functions allow callers to explicitly specify the return type as a
+// template parameter, overriding the default return type. E.g.
+//
+//   rtc::SafeMin<int>(x, y)  // returns an int
+//
+// If the requested type is statically guaranteed to be able to represent the
+// result, then everything's fine, and the return type is as requested. But if
+// the requested type is too small, a static_assert is triggered.
+
+#ifndef RTC_BASE_NUMERICS_SAFE_MINMAX_H_
+#define RTC_BASE_NUMERICS_SAFE_MINMAX_H_
+
+#include <limits>
+#include <type_traits>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_compare.h"
+#include "rtc_base/type_traits.h"
+
+namespace rtc {
+
+namespace safe_minmax_impl {
+
+// Make the range of a type available via something other than a constexpr
+// function, to work around MSVC limitations. See
+// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/
+template <typename T>
+struct Limits {
+  static constexpr T lowest = std::numeric_limits<T>::lowest();
+  static constexpr T max = std::numeric_limits<T>::max();
+};
+
+template <typename T, bool is_enum = std::is_enum<T>::value>
+struct UnderlyingType;
+
+template <typename T>
+struct UnderlyingType<T, false> {
+  using type = T;
+};
+
+template <typename T>
+struct UnderlyingType<T, true> {
+  using type = typename std::underlying_type<T>::type;
+};
+
+// Given two types T1 and T2, find types that can hold the smallest (in
+// ::min_t) and the largest (in ::max_t) of the two values.
+template <typename T1,
+          typename T2,
+          bool int1 = IsIntlike<T1>::value,
+          bool int2 = IsIntlike<T2>::value>
+struct MType {
+  static_assert(int1 == int2,
+                "You may not mix integral and floating-point arguments");
+};
+
+// Specialization for when neither type is integral (and therefore presumably
+// floating-point).
+template <typename T1, typename T2>
+struct MType<T1, T2, false, false> {
+  using min_t = typename std::common_type<T1, T2>::type;
+  static_assert(std::is_same<min_t, T1>::value ||
+                    std::is_same<min_t, T2>::value,
+                "");
+
+  using max_t = typename std::common_type<T1, T2>::type;
+  static_assert(std::is_same<max_t, T1>::value ||
+                    std::is_same<max_t, T2>::value,
+                "");
+};
+
+// Specialization for when both types are integral.
+template <typename T1, typename T2>
+struct MType<T1, T2, true, true> {
+  // The type with the lowest minimum value. In case of a tie, the type with
+  // the lowest maximum value. In case that too is a tie, the types have the
+  // same range, and we arbitrarily pick T1.
+  using min_t = typename std::conditional<
+      SafeLt(Limits<T1>::lowest, Limits<T2>::lowest),
+      T1,
+      typename std::conditional<
+          SafeGt(Limits<T1>::lowest, Limits<T2>::lowest),
+          T2,
+          typename std::conditional<SafeLe(Limits<T1>::max, Limits<T2>::max),
+                                    T1,
+                                    T2>::type>::type>::type;
+  static_assert(std::is_same<min_t, T1>::value ||
+                    std::is_same<min_t, T2>::value,
+                "");
+
+  // The type with the highest maximum value. In case of a tie, the types have
+  // the same range (because in C++, integer types with the same maximum also
+  // have the same minimum).
+  static_assert(SafeNe(Limits<T1>::max, Limits<T2>::max) ||
+                    SafeEq(Limits<T1>::lowest, Limits<T2>::lowest),
+                "integer types with the same max should have the same min");
+  using max_t = typename std::
+      conditional<SafeGe(Limits<T1>::max, Limits<T2>::max), T1, T2>::type;
+  static_assert(std::is_same<max_t, T1>::value ||
+                    std::is_same<max_t, T2>::value,
+                "");
+};
+
+// A dummy type that we pass around at compile time but never actually use.
+// Declared but not defined.
+struct DefaultType;
+
+// ::type is A, except we fall back to B if A is DefaultType. We static_assert
+// that the chosen type can hold all values that B can hold.
+template <typename A, typename B>
+struct TypeOr {
+  using type = typename std::
+      conditional<std::is_same<A, DefaultType>::value, B, A>::type;
+  static_assert(SafeLe(Limits<type>::lowest, Limits<B>::lowest) &&
+                    SafeGe(Limits<type>::max, Limits<B>::max),
+                "The specified type isn't large enough");
+  static_assert(IsIntlike<type>::value == IsIntlike<B>::value &&
+                    std::is_floating_point<type>::value ==
+                        std::is_floating_point<type>::value,
+                "float<->int conversions not allowed");
+};
+
+}  // namespace safe_minmax_impl
+
+template <
+    typename R = safe_minmax_impl::DefaultType,
+    typename T1 = safe_minmax_impl::DefaultType,
+    typename T2 = safe_minmax_impl::DefaultType,
+    typename R2 = typename safe_minmax_impl::TypeOr<
+        R,
+        typename safe_minmax_impl::MType<
+            typename safe_minmax_impl::UnderlyingType<T1>::type,
+            typename safe_minmax_impl::UnderlyingType<T2>::type>::min_t>::type>
+constexpr R2 SafeMin(T1 a, T2 b) {
+  static_assert(IsIntlike<T1>::value || std::is_floating_point<T1>::value,
+                "The first argument must be integral or floating-point");
+  static_assert(IsIntlike<T2>::value || std::is_floating_point<T2>::value,
+                "The second argument must be integral or floating-point");
+  return SafeLt(a, b) ? static_cast<R2>(a) : static_cast<R2>(b);
+}
+
+template <
+    typename R = safe_minmax_impl::DefaultType,
+    typename T1 = safe_minmax_impl::DefaultType,
+    typename T2 = safe_minmax_impl::DefaultType,
+    typename R2 = typename safe_minmax_impl::TypeOr<
+        R,
+        typename safe_minmax_impl::MType<
+            typename safe_minmax_impl::UnderlyingType<T1>::type,
+            typename safe_minmax_impl::UnderlyingType<T2>::type>::max_t>::type>
+constexpr R2 SafeMax(T1 a, T2 b) {
+  static_assert(IsIntlike<T1>::value || std::is_floating_point<T1>::value,
+                "The first argument must be integral or floating-point");
+  static_assert(IsIntlike<T2>::value || std::is_floating_point<T2>::value,
+                "The second argument must be integral or floating-point");
+  return SafeGt(a, b) ? static_cast<R2>(a) : static_cast<R2>(b);
+}
+
+namespace safe_minmax_impl {
+
+// Given three types T, L, and H, let ::type be a suitable return value for
+// SafeClamp(T, L, H). See the docs at the top of this file for details.
+template <typename T,
+          typename L,
+          typename H,
+          bool int1 = IsIntlike<T>::value,
+          bool int2 = IsIntlike<L>::value,
+          bool int3 = IsIntlike<H>::value>
+struct ClampType {
+  static_assert(int1 == int2 && int1 == int3,
+                "You may not mix integral and floating-point arguments");
+};
+
+// Specialization for when all three types are floating-point.
+template <typename T, typename L, typename H>
+struct ClampType<T, L, H, false, false, false> {
+  using type = typename std::common_type<T, L, H>::type;
+};
+
+// Specialization for when all three types are integral.
+template <typename T, typename L, typename H>
+struct ClampType<T, L, H, true, true, true> {
+ private:
+  // Range of the return value. The return type must be able to represent this
+  // full range.
+  static constexpr auto r_min =
+      SafeMax(Limits<L>::lowest, SafeMin(Limits<H>::lowest, Limits<T>::lowest));
+  static constexpr auto r_max =
+      SafeMin(Limits<H>::max, SafeMax(Limits<L>::max, Limits<T>::max));
+
+  // Is the given type an acceptable return type? (That is, can it represent
+  // all possible return values, and is it no larger than the largest of the
+  // input types?)
+  template <typename A>
+  struct AcceptableType {
+   private:
+    static constexpr bool not_too_large = sizeof(A) <= sizeof(L) ||
+                                          sizeof(A) <= sizeof(H) ||
+                                          sizeof(A) <= sizeof(T);
+    static constexpr bool range_contained =
+        SafeLe(Limits<A>::lowest, r_min) && SafeLe(r_max, Limits<A>::max);
+
+   public:
+    static constexpr bool value = not_too_large && range_contained;
+  };
+
+  using best_signed_type = typename std::conditional<
+      AcceptableType<int8_t>::value,
+      int8_t,
+      typename std::conditional<
+          AcceptableType<int16_t>::value,
+          int16_t,
+          typename std::conditional<AcceptableType<int32_t>::value,
+                                    int32_t,
+                                    int64_t>::type>::type>::type;
+
+  using best_unsigned_type = typename std::conditional<
+      AcceptableType<uint8_t>::value,
+      uint8_t,
+      typename std::conditional<
+          AcceptableType<uint16_t>::value,
+          uint16_t,
+          typename std::conditional<AcceptableType<uint32_t>::value,
+                                    uint32_t,
+                                    uint64_t>::type>::type>::type;
+
+ public:
+  // Pick the best type, preferring the same signedness as T but falling back
+  // to the other one if necessary.
+  using type = typename std::conditional<
+      std::is_signed<T>::value,
+      typename std::conditional<AcceptableType<best_signed_type>::value,
+                                best_signed_type,
+                                best_unsigned_type>::type,
+      typename std::conditional<AcceptableType<best_unsigned_type>::value,
+                                best_unsigned_type,
+                                best_signed_type>::type>::type;
+  static_assert(AcceptableType<type>::value, "");
+};
+
+}  // namespace safe_minmax_impl
+
+template <
+    typename R = safe_minmax_impl::DefaultType,
+    typename T = safe_minmax_impl::DefaultType,
+    typename L = safe_minmax_impl::DefaultType,
+    typename H = safe_minmax_impl::DefaultType,
+    typename R2 = typename safe_minmax_impl::TypeOr<
+        R,
+        typename safe_minmax_impl::ClampType<
+            typename safe_minmax_impl::UnderlyingType<T>::type,
+            typename safe_minmax_impl::UnderlyingType<L>::type,
+            typename safe_minmax_impl::UnderlyingType<H>::type>::type>::type>
+R2 SafeClamp(T x, L min, H max) {
+  static_assert(IsIntlike<H>::value || std::is_floating_point<H>::value,
+                "The first argument must be integral or floating-point");
+  static_assert(IsIntlike<T>::value || std::is_floating_point<T>::value,
+                "The second argument must be integral or floating-point");
+  static_assert(IsIntlike<L>::value || std::is_floating_point<L>::value,
+                "The third argument must be integral or floating-point");
+  RTC_DCHECK_LE(min, max);
+  return SafeLe(x, min)
+             ? static_cast<R2>(min)
+             : SafeGe(x, max) ? static_cast<R2>(max) : static_cast<R2>(x);
+}
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_NUMERICS_SAFE_MINMAX_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,115 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "rtc_base/platform_thread_types.h"
+
+#if defined(WEBRTC_LINUX)
+#include <sys/prctl.h>
+#include <sys/syscall.h>
+#endif
+
+#if defined(WEBRTC_WIN)
+#include "rtc_base/arraysize.h"
+
+// The SetThreadDescription API was brought in version 1607 of Windows 10.
+// For compatibility with various versions of winuser and avoid clashing with
+// a potentially defined type, we use the RTC_ prefix.
+typedef HRESULT(WINAPI* RTC_SetThreadDescription)(HANDLE hThread,
+                                                  PCWSTR lpThreadDescription);
+#endif
+
+namespace rtc {
+
+PlatformThreadId CurrentThreadId() {
+#if defined(WEBRTC_WIN)
+  return GetCurrentThreadId();
+#elif defined(WEBRTC_POSIX)
+#if defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
+  return pthread_mach_thread_np(pthread_self());
+#elif defined(WEBRTC_ANDROID)
+  return gettid();
+#elif defined(WEBRTC_FUCHSIA)
+  return zx_thread_self();
+#elif defined(WEBRTC_LINUX)
+  return syscall(__NR_gettid);
+#elif defined(__EMSCRIPTEN__)
+  return static_cast<PlatformThreadId>(pthread_self());
+#else
+  // Default implementation for nacl and solaris.
+  return reinterpret_cast<PlatformThreadId>(pthread_self());
+#endif
+#endif  // defined(WEBRTC_POSIX)
+}
+
+PlatformThreadRef CurrentThreadRef() {
+#if defined(WEBRTC_WIN)
+  return GetCurrentThreadId();
+#elif defined(WEBRTC_FUCHSIA)
+  return zx_thread_self();
+#elif defined(WEBRTC_POSIX)
+  return pthread_self();
+#endif
+}
+
+bool IsThreadRefEqual(const PlatformThreadRef& a, const PlatformThreadRef& b) {
+#if defined(WEBRTC_WIN) || defined(WEBRTC_FUCHSIA)
+  return a == b;
+#elif defined(WEBRTC_POSIX)
+  return pthread_equal(a, b);
+#endif
+}
+
+void SetCurrentThreadName(const char* name) {
+#if defined(WEBRTC_WIN)
+  // The SetThreadDescription API works even if no debugger is attached.
+  // The names set with this API also show up in ETW traces. Very handy.
+  static auto set_thread_description_func =
+      reinterpret_cast<RTC_SetThreadDescription>(::GetProcAddress(
+          ::GetModuleHandleA("Kernel32.dll"), "SetThreadDescription"));
+  if (set_thread_description_func) {
+    // Convert from ASCII to UTF-16.
+    wchar_t wide_thread_name[64];
+    for (size_t i = 0; i < arraysize(wide_thread_name) - 1; ++i) {
+      wide_thread_name[i] = name[i];
+      if (wide_thread_name[i] == L'\0')
+        break;
+    }
+    // Guarantee null-termination.
+    wide_thread_name[arraysize(wide_thread_name) - 1] = L'\0';
+    set_thread_description_func(::GetCurrentThread(), wide_thread_name);
+  }
+
+  // For details see:
+  // https://docs.microsoft.com/en-us/visualstudio/debugger/how-to-set-a-thread-name-in-native-code
+#pragma pack(push, 8)
+  struct {
+    DWORD dwType;
+    LPCSTR szName;
+    DWORD dwThreadID;
+    DWORD dwFlags;
+  } threadname_info = {0x1000, name, static_cast<DWORD>(-1), 0};
+#pragma pack(pop)
+
+#pragma warning(push)
+#pragma warning(disable : 6320 6322)
+  __try {
+    ::RaiseException(0x406D1388, 0, sizeof(threadname_info) / sizeof(ULONG_PTR),
+                     reinterpret_cast<ULONG_PTR*>(&threadname_info));
+  } __except (EXCEPTION_EXECUTE_HANDLER) {  // NOLINT
+  }
+#pragma warning(pop)
+#elif defined(WEBRTC_LINUX) // || defined(WEBRTC_ANDROID)
+  prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name));  // NOLINT
+#elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
+  pthread_setname_np(name);
+#endif
+}
+
+}  // namespace rtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/platform_thread_types.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_PLATFORM_THREAD_TYPES_H_
+#define RTC_BASE_PLATFORM_THREAD_TYPES_H_
+
+// clang-format off
+// clang formating would change include order.
+#if defined(WEBRTC_WIN)
+// Include winsock2.h before including <windows.h> to maintain consistency with
+// win32.h. To include win32.h directly, it must be broken out into its own
+// build target.
+#include <winsock2.h>
+#include <windows.h>
+#elif defined(WEBRTC_FUCHSIA)
+#include <zircon/types.h>
+#include <zircon/process.h>
+#elif defined(WEBRTC_POSIX)
+#include <pthread.h>
+#include <unistd.h>
+#if defined(WEBRTC_MAC)
+#include <pthread_spis.h>
+#endif
+#endif
+// clang-format on
+
+namespace rtc {
+#if defined(WEBRTC_WIN)
+typedef DWORD PlatformThreadId;
+typedef DWORD PlatformThreadRef;
+#elif defined(WEBRTC_FUCHSIA)
+typedef zx_handle_t PlatformThreadId;
+typedef zx_handle_t PlatformThreadRef;
+#elif defined(WEBRTC_POSIX)
+typedef pid_t PlatformThreadId;
+typedef pthread_t PlatformThreadRef;
+#endif
+
+// Retrieve the ID of the current thread.
+PlatformThreadId CurrentThreadId();
+
+// Retrieves a reference to the current thread. On Windows, this is the same
+// as CurrentThreadId. On other platforms it's the pthread_t returned by
+// pthread_self().
+PlatformThreadRef CurrentThreadRef();
+
+// Compares two thread identifiers for equality.
+bool IsThreadRefEqual(const PlatformThreadRef& a, const PlatformThreadRef& b);
+
+// Sets the current thread name.
+void SetCurrentThreadName(const char* name);
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_PLATFORM_THREAD_TYPES_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/race_checker.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/race_checker.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/race_checker.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/race_checker.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "rtc_base/race_checker.h"
+
+namespace rtc {
+
+RaceChecker::RaceChecker() {}
+
+// Note that the implementation here is in itself racy, but we pretend it does
+// not matter because we want this useful in release builds without having to
+// pay the cost of using atomics. A race hitting the race checker is likely to
+// cause access_count_ to diverge from zero and therefore cause the ThreadRef
+// comparison to fail, signaling a race, although it may not be in the exact
+// spot where a race *first* appeared in the code we're trying to protect. There
+// is also a chance that an actual race is missed, however the probability of
+// that has been considered small enough to be an acceptable trade off.
+bool RaceChecker::Acquire() const {
+  const PlatformThreadRef current_thread = CurrentThreadRef();
+  // Set new accessing thread if this is a new use.
+  if (access_count_++ == 0)
+    accessing_thread_ = current_thread;
+  // If this is being used concurrently this check will fail for the second
+  // thread entering since it won't set the thread. Recursive use of checked
+  // methods are OK since the accessing thread remains the same.
+  const PlatformThreadRef accessing_thread = accessing_thread_;
+  return IsThreadRefEqual(accessing_thread, current_thread);
+}
+
+void RaceChecker::Release() const {
+  --access_count_;
+}
+
+namespace internal {
+RaceCheckerScope::RaceCheckerScope(const RaceChecker* race_checker)
+    : race_checker_(race_checker), race_check_ok_(race_checker->Acquire()) {}
+
+bool RaceCheckerScope::RaceDetected() const {
+  return !race_check_ok_;
+}
+
+RaceCheckerScope::~RaceCheckerScope() {
+  race_checker_->Release();
+}
+
+}  // namespace internal
+}  // namespace rtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/race_checker.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/race_checker.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/race_checker.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/race_checker.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,78 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_RACE_CHECKER_H_
+#define RTC_BASE_RACE_CHECKER_H_
+
+#include "rtc_base/checks.h"
+#include "rtc_base/platform_thread_types.h"
+#include "rtc_base/thread_annotations.h"
+
+namespace rtc {
+
+namespace internal {
+class RaceCheckerScope;
+}  // namespace internal
+
+// Best-effort race-checking implementation. This primitive uses no
+// synchronization at all to be as-fast-as-possible in the non-racy case.
+class RTC_LOCKABLE RaceChecker {
+ public:
+  friend class internal::RaceCheckerScope;
+  RaceChecker();
+
+ private:
+  bool Acquire() const RTC_EXCLUSIVE_LOCK_FUNCTION();
+  void Release() const RTC_UNLOCK_FUNCTION();
+
+  // Volatile to prevent code being optimized away in Acquire()/Release().
+  mutable volatile int access_count_ = 0;
+  mutable volatile PlatformThreadRef accessing_thread_;
+};
+
+namespace internal {
+class RTC_SCOPED_LOCKABLE RaceCheckerScope {
+ public:
+  explicit RaceCheckerScope(const RaceChecker* race_checker)
+      RTC_EXCLUSIVE_LOCK_FUNCTION(race_checker);
+
+  bool RaceDetected() const;
+  ~RaceCheckerScope() RTC_UNLOCK_FUNCTION();
+
+ private:
+  const RaceChecker* const race_checker_;
+  const bool race_check_ok_;
+};
+
+class RTC_SCOPED_LOCKABLE RaceCheckerScopeDoNothing {
+ public:
+  explicit RaceCheckerScopeDoNothing(const RaceChecker* race_checker)
+      RTC_EXCLUSIVE_LOCK_FUNCTION(race_checker) {}
+
+  ~RaceCheckerScopeDoNothing() RTC_UNLOCK_FUNCTION() {}
+};
+
+}  // namespace internal
+}  // namespace rtc
+
+#define RTC_CHECK_RUNS_SERIALIZED(x)               \
+  rtc::internal::RaceCheckerScope race_checker(x); \
+  RTC_CHECK(!race_checker.RaceDetected())
+
+#if RTC_DCHECK_IS_ON
+#define RTC_DCHECK_RUNS_SERIALIZED(x)              \
+  rtc::internal::RaceCheckerScope race_checker(x); \
+  RTC_DCHECK(!race_checker.RaceDetected())
+#else
+#define RTC_DCHECK_RUNS_SERIALIZED(x) \
+  rtc::internal::RaceCheckerScopeDoNothing race_checker(x)
+#endif
+
+#endif  // RTC_BASE_RACE_CHECKER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/random.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/random.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/random.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/random.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,85 @@
+/*
+ *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#include "rtc_base/random.h"
+
+#include <math.h>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_conversions.h"
+
+namespace webrtc {
+
+Random::Random(uint64_t seed) {
+  RTC_DCHECK(seed != 0x0ull);
+  state_ = seed;
+}
+
+uint32_t Random::Rand(uint32_t t) {
+  // Casting the output to 32 bits will give an almost uniform number.
+  // Pr[x=0] = (2^32-1) / (2^64-1)
+  // Pr[x=k] = 2^32 / (2^64-1) for k!=0
+  // Uniform would be Pr[x=k] = 2^32 / 2^64 for all 32-bit integers k.
+  uint32_t x = NextOutput();
+  // If x / 2^32 is uniform on [0,1), then x / 2^32 * (t+1) is uniform on
+  // the interval [0,t+1), so the integer part is uniform on [0,t].
+  uint64_t result = x * (static_cast<uint64_t>(t) + 1);
+  result >>= 32;
+  return result;
+}
+
+uint32_t Random::Rand(uint32_t low, uint32_t high) {
+  RTC_DCHECK(low <= high);
+  return Rand(high - low) + low;
+}
+
+int32_t Random::Rand(int32_t low, int32_t high) {
+  RTC_DCHECK(low <= high);
+  const int64_t low_i64{low};
+  return rtc::dchecked_cast<int32_t>(
+      Rand(rtc::dchecked_cast<uint32_t>(high - low_i64)) + low_i64);
+}
+
+template <>
+float Random::Rand<float>() {
+  double result = NextOutput() - 1;
+  result = result / 0xFFFFFFFFFFFFFFFEull;
+  return static_cast<float>(result);
+}
+
+template <>
+double Random::Rand<double>() {
+  double result = NextOutput() - 1;
+  result = result / 0xFFFFFFFFFFFFFFFEull;
+  return result;
+}
+
+template <>
+bool Random::Rand<bool>() {
+  return Rand(0, 1) == 1;
+}
+
+double Random::Gaussian(double mean, double standard_deviation) {
+  // Creating a Normal distribution variable from two independent uniform
+  // variables based on the Box-Muller transform, which is defined on the
+  // interval (0, 1]. Note that we rely on NextOutput to generate integers
+  // in the range [1, 2^64-1]. Normally this behavior is a bit frustrating,
+  // but here it is exactly what we need.
+  const double kPi = 3.14159265358979323846;
+  double u1 = static_cast<double>(NextOutput()) / 0xFFFFFFFFFFFFFFFFull;
+  double u2 = static_cast<double>(NextOutput()) / 0xFFFFFFFFFFFFFFFFull;
+  return mean + standard_deviation * sqrt(-2 * log(u1)) * cos(2 * kPi * u2);
+}
+
+double Random::Exponential(double lambda) {
+  double uniform = Rand<double>();
+  return -log(uniform) / lambda;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/random.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/random.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/random.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/random.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,96 @@
+/*
+ *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_RANDOM_H_
+#define RTC_BASE_RANDOM_H_
+
+#include <stdint.h>
+
+#include <limits>
+
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+class Random {
+ public:
+  // TODO(tommi): Change this so that the seed can be initialized internally,
+  // e.g. by offering two ways of constructing or offer a static method that
+  // returns a seed that's suitable for initialization.
+  // The problem now is that callers are calling clock_->TimeInMicroseconds()
+  // which calls TickTime::Now().Ticks(), which can return a very low value on
+  // Mac and can result in a seed of 0 after conversion to microseconds.
+  // Besides the quality of the random seed being poor, this also requires
+  // the client to take on extra dependencies to generate a seed.
+  // If we go for a static seed generator in Random, we can use something from
+  // webrtc/rtc_base and make sure that it works the same way across platforms.
+  // See also discussion here: https://codereview.webrtc.org/1623543002/
+  explicit Random(uint64_t seed);
+
+  Random() = delete;
+  Random(const Random&) = delete;
+  Random& operator=(const Random&) = delete;
+
+  // Return pseudo-random integer of the specified type.
+  // We need to limit the size to 32 bits to keep the output close to uniform.
+  template <typename T>
+  T Rand() {
+    static_assert(std::numeric_limits<T>::is_integer &&
+                      std::numeric_limits<T>::radix == 2 &&
+                      std::numeric_limits<T>::digits <= 32,
+                  "Rand is only supported for built-in integer types that are "
+                  "32 bits or smaller.");
+    return static_cast<T>(NextOutput());
+  }
+
+  // Uniformly distributed pseudo-random number in the interval [0, t].
+  uint32_t Rand(uint32_t t);
+
+  // Uniformly distributed pseudo-random number in the interval [low, high].
+  uint32_t Rand(uint32_t low, uint32_t high);
+
+  // Uniformly distributed pseudo-random number in the interval [low, high].
+  int32_t Rand(int32_t low, int32_t high);
+
+  // Normal Distribution.
+  double Gaussian(double mean, double standard_deviation);
+
+  // Exponential Distribution.
+  double Exponential(double lambda);
+
+ private:
+  // Outputs a nonzero 64-bit random number using Xorshift algorithm.
+  // https://en.wikipedia.org/wiki/Xorshift
+  uint64_t NextOutput() {
+    state_ ^= state_ >> 12;
+    state_ ^= state_ << 25;
+    state_ ^= state_ >> 27;
+    RTC_DCHECK(state_ != 0x0ULL);
+    return state_ * 2685821657736338717ull;
+  }
+
+  uint64_t state_;
+};
+
+// Return pseudo-random number in the interval [0.0, 1.0).
+template <>
+float Random::Rand<float>();
+
+// Return pseudo-random number in the interval [0.0, 1.0).
+template <>
+double Random::Rand<double>();
+
+// Return pseudo-random boolean value.
+template <>
+bool Random::Rand<bool>();
+
+}  // namespace webrtc
+
+#endif  // RTC_BASE_RANDOM_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_counted_object.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_counted_object.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_counted_object.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_counted_object.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,88 @@
+/*
+ *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#ifndef RTC_BASE_REF_COUNTED_OBJECT_H_
+#define RTC_BASE_REF_COUNTED_OBJECT_H_
+
+#include <type_traits>
+#include <utility>
+
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/ref_count.h"
+#include "rtc_base/ref_counter.h"
+
+namespace rtc {
+
+template <class T>
+class RefCountedObject : public T {
+ public:
+  RefCountedObject() {}
+
+  template <class P0>
+  explicit RefCountedObject(P0&& p0) : T(std::forward<P0>(p0)) {}
+
+  template <class P0, class P1, class... Args>
+  RefCountedObject(P0&& p0, P1&& p1, Args&&... args)
+      : T(std::forward<P0>(p0),
+          std::forward<P1>(p1),
+          std::forward<Args>(args)...) {}
+
+  virtual void AddRef() const { ref_count_.IncRef(); }
+
+  virtual RefCountReleaseStatus Release() const {
+    const auto status = ref_count_.DecRef();
+    if (status == RefCountReleaseStatus::kDroppedLastRef) {
+      delete this;
+    }
+    return status;
+  }
+
+  // Return whether the reference count is one. If the reference count is used
+  // in the conventional way, a reference count of 1 implies that the current
+  // thread owns the reference and no other thread shares it. This call
+  // performs the test for a reference count of one, and performs the memory
+  // barrier needed for the owning thread to act on the object, knowing that it
+  // has exclusive access to the object.
+  virtual bool HasOneRef() const { return ref_count_.HasOneRef(); }
+
+ protected:
+  virtual ~RefCountedObject() {}
+
+  mutable webrtc::webrtc_impl::RefCounter ref_count_{0};
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(RefCountedObject);
+};
+
+template <class T>
+class FinalRefCountedObject final : public T {
+ public:
+  using T::T;
+  // Until c++17 compilers are allowed not to inherit the default constructor,
+  // and msvc doesn't. Thus the default constructor is forwarded explicitly.
+  FinalRefCountedObject() = default;
+  FinalRefCountedObject(const FinalRefCountedObject&) = delete;
+  FinalRefCountedObject& operator=(const FinalRefCountedObject&) = delete;
+
+  void AddRef() const { ref_count_.IncRef(); }
+  void Release() const {
+    if (ref_count_.DecRef() == RefCountReleaseStatus::kDroppedLastRef) {
+      delete this;
+    }
+  }
+  bool HasOneRef() const { return ref_count_.HasOneRef(); }
+
+ private:
+  ~FinalRefCountedObject() = default;
+
+  mutable webrtc::webrtc_impl::RefCounter ref_count_{0};
+};
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_REF_COUNTED_OBJECT_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_counter.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_counter.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_counter.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_counter.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+ *  Copyright 2017 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#ifndef RTC_BASE_REF_COUNTER_H_
+#define RTC_BASE_REF_COUNTER_H_
+
+#include <atomic>
+
+#include "rtc_base/ref_count.h"
+
+namespace webrtc {
+namespace webrtc_impl {
+
+class RefCounter {
+ public:
+  explicit RefCounter(int ref_count) : ref_count_(ref_count) {}
+  RefCounter() = delete;
+
+  void IncRef() {
+    // Relaxed memory order: The current thread is allowed to act on the
+    // resource protected by the reference counter both before and after the
+    // atomic op, so this function doesn't prevent memory access reordering.
+    ref_count_.fetch_add(1, std::memory_order_relaxed);
+  }
+
+  // Returns kDroppedLastRef if this call dropped the last reference; the caller
+  // should therefore free the resource protected by the reference counter.
+  // Otherwise, returns kOtherRefsRemained (note that in case of multithreading,
+  // some other caller may have dropped the last reference by the time this call
+  // returns; all we know is that we didn't do it).
+  rtc::RefCountReleaseStatus DecRef() {
+    // Use release-acquire barrier to ensure all actions on the protected
+    // resource are finished before the resource can be freed.
+    // When ref_count_after_subtract > 0, this function require
+    // std::memory_order_release part of the barrier.
+    // When ref_count_after_subtract == 0, this function require
+    // std::memory_order_acquire part of the barrier.
+    // In addition std::memory_order_release is used for synchronization with
+    // the HasOneRef function to make sure all actions on the protected resource
+    // are finished before the resource is assumed to have exclusive access.
+    int ref_count_after_subtract =
+        ref_count_.fetch_sub(1, std::memory_order_acq_rel) - 1;
+    return ref_count_after_subtract == 0
+               ? rtc::RefCountReleaseStatus::kDroppedLastRef
+               : rtc::RefCountReleaseStatus::kOtherRefsRemained;
+  }
+
+  // Return whether the reference count is one. If the reference count is used
+  // in the conventional way, a reference count of 1 implies that the current
+  // thread owns the reference and no other thread shares it. This call performs
+  // the test for a reference count of one, and performs the memory barrier
+  // needed for the owning thread to act on the resource protected by the
+  // reference counter, knowing that it has exclusive access.
+  bool HasOneRef() const {
+    // To ensure resource protected by the reference counter has exclusive
+    // access, all changes to the resource before it was released by other
+    // threads must be visible by current thread. That is provided by release
+    // (in DecRef) and acquire (in this function) ordering.
+    return ref_count_.load(std::memory_order_acquire) == 1;
+  }
+
+ private:
+  std::atomic<int> ref_count_;
+};
+
+}  // namespace webrtc_impl
+}  // namespace webrtc
+
+#endif  // RTC_BASE_REF_COUNTER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_count.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_count.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_count.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/ref_count.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,67 @@
+/*
+ *  Copyright 2011 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#ifndef RTC_BASE_REF_COUNT_H_
+#define RTC_BASE_REF_COUNT_H_
+
+namespace rtc {
+
+// Refcounted objects should implement the following informal interface:
+//
+// void AddRef() const ;
+// RefCountReleaseStatus Release() const;
+//
+// You may access members of a reference-counted object, including the AddRef()
+// and Release() methods, only if you already own a reference to it, or if
+// you're borrowing someone else's reference. (A newly created object is a
+// special case: the reference count is zero on construction, and the code that
+// creates the object should immediately call AddRef(), bringing the reference
+// count from zero to one, e.g., by constructing an rtc::scoped_refptr).
+//
+// AddRef() creates a new reference to the object.
+//
+// Release() releases a reference to the object; the caller now has one less
+// reference than before the call. Returns kDroppedLastRef if the number of
+// references dropped to zero because of this (in which case the object destroys
+// itself). Otherwise, returns kOtherRefsRemained, to signal that at the precise
+// time the caller's reference was dropped, other references still remained (but
+// if other threads own references, this may of course have changed by the time
+// Release() returns).
+//
+// The caller of Release() must treat it in the same way as a delete operation:
+// Regardless of the return value from Release(), the caller mustn't access the
+// object. The object might still be alive, due to references held by other
+// users of the object, but the object can go away at any time, e.g., as the
+// result of another thread calling Release().
+//
+// Calling AddRef() and Release() manually is discouraged. It's recommended to
+// use rtc::scoped_refptr to manage all pointers to reference counted objects.
+// Note that rtc::scoped_refptr depends on compile-time duck-typing; formally
+// implementing the below RefCountInterface is not required.
+
+enum class RefCountReleaseStatus { kDroppedLastRef, kOtherRefsRemained };
+
+// Interfaces where refcounting is part of the public api should
+// inherit this abstract interface. The implementation of these
+// methods is usually provided by the RefCountedObject template class,
+// applied as a leaf in the inheritance tree.
+class RefCountInterface {
+ public:
+  virtual void AddRef() const = 0;
+  virtual RefCountReleaseStatus Release() const = 0;
+
+  // Non-public destructor, because Release() has exclusive responsibility for
+  // destroying the object.
+ protected:
+  virtual ~RefCountInterface() {}
+};
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_REF_COUNT_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_encode.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_encode.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_encode.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_encode.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,387 @@
+/*
+ *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "rtc_base/string_encode.h"
+
+#include <cstdio>
+
+#include "rtc_base/arraysize.h"
+#include "rtc_base/checks.h"
+
+namespace rtc {
+
+/////////////////////////////////////////////////////////////////////////////
+// String Encoding Utilities
+/////////////////////////////////////////////////////////////////////////////
+
+namespace {
+const char HEX[] = "0123456789abcdef";
+
+// Convert an unsigned value from 0 to 15 to the hex character equivalent...
+char hex_encode(unsigned char val) {
+  RTC_DCHECK_LT(val, 16);
+  return (val < 16) ? HEX[val] : '!';
+}
+
+// ...and vice-versa.
+bool hex_decode(char ch, unsigned char* val) {
+  if ((ch >= '0') && (ch <= '9')) {
+    *val = ch - '0';
+  } else if ((ch >= 'A') && (ch <= 'F')) {
+    *val = (ch - 'A') + 10;
+  } else if ((ch >= 'a') && (ch <= 'f')) {
+    *val = (ch - 'a') + 10;
+  } else {
+    return false;
+  }
+  return true;
+}
+
+size_t hex_encode_output_length(size_t srclen, char delimiter) {
+  return delimiter && srclen > 0 ? (srclen * 3 - 1) : (srclen * 2);
+}
+
+// hex_encode shows the hex representation of binary data in ascii, with
+// |delimiter| between bytes, or none if |delimiter| == 0.
+void hex_encode_with_delimiter(char* buffer,
+                               const char* csource,
+                               size_t srclen,
+                               char delimiter) {
+  RTC_DCHECK(buffer);
+
+  // Init and check bounds.
+  const unsigned char* bsource =
+      reinterpret_cast<const unsigned char*>(csource);
+  size_t srcpos = 0, bufpos = 0;
+
+  while (srcpos < srclen) {
+    unsigned char ch = bsource[srcpos++];
+    buffer[bufpos] = hex_encode((ch >> 4) & 0xF);
+    buffer[bufpos + 1] = hex_encode((ch)&0xF);
+    bufpos += 2;
+
+    // Don't write a delimiter after the last byte.
+    if (delimiter && (srcpos < srclen)) {
+      buffer[bufpos] = delimiter;
+      ++bufpos;
+    }
+  }
+}
+
+}  // namespace
+
+std::string hex_encode(const std::string& str) {
+  return hex_encode(str.c_str(), str.size());
+}
+
+std::string hex_encode(const char* source, size_t srclen) {
+  return hex_encode_with_delimiter(source, srclen, 0);
+}
+
+std::string hex_encode_with_delimiter(const char* source,
+                                      size_t srclen,
+                                      char delimiter) {
+  std::string s(hex_encode_output_length(srclen, delimiter), 0);
+  hex_encode_with_delimiter(&s[0], source, srclen, delimiter);
+  return s;
+}
+
+size_t hex_decode(char* cbuffer,
+                  size_t buflen,
+                  const char* source,
+                  size_t srclen) {
+  return hex_decode_with_delimiter(cbuffer, buflen, source, srclen, 0);
+}
+
+size_t hex_decode_with_delimiter(char* cbuffer,
+                                 size_t buflen,
+                                 const char* source,
+                                 size_t srclen,
+                                 char delimiter) {
+  RTC_DCHECK(cbuffer);  // TODO(kwiberg): estimate output size
+  if (buflen == 0)
+    return 0;
+
+  // Init and bounds check.
+  unsigned char* bbuffer = reinterpret_cast<unsigned char*>(cbuffer);
+  size_t srcpos = 0, bufpos = 0;
+  size_t needed = (delimiter) ? (srclen + 1) / 3 : srclen / 2;
+  if (buflen < needed)
+    return 0;
+
+  while (srcpos < srclen) {
+    if ((srclen - srcpos) < 2) {
+      // This means we have an odd number of bytes.
+      return 0;
+    }
+
+    unsigned char h1, h2;
+    if (!hex_decode(source[srcpos], &h1) ||
+        !hex_decode(source[srcpos + 1], &h2))
+      return 0;
+
+    bbuffer[bufpos++] = (h1 << 4) | h2;
+    srcpos += 2;
+
+    // Remove the delimiter if needed.
+    if (delimiter && (srclen - srcpos) > 1) {
+      if (source[srcpos] != delimiter)
+        return 0;
+      ++srcpos;
+    }
+  }
+
+  return bufpos;
+}
+
+size_t hex_decode(char* buffer, size_t buflen, const std::string& source) {
+  return hex_decode_with_delimiter(buffer, buflen, source, 0);
+}
+size_t hex_decode_with_delimiter(char* buffer,
+                                 size_t buflen,
+                                 const std::string& source,
+                                 char delimiter) {
+  return hex_decode_with_delimiter(buffer, buflen, source.c_str(),
+                                   source.length(), delimiter);
+}
+
+size_t tokenize(const std::string& source,
+                char delimiter,
+                std::vector<std::string>* fields) {
+  fields->clear();
+  size_t last = 0;
+  for (size_t i = 0; i < source.length(); ++i) {
+    if (source[i] == delimiter) {
+      if (i != last) {
+        fields->push_back(source.substr(last, i - last));
+      }
+      last = i + 1;
+    }
+  }
+  if (last != source.length()) {
+    fields->push_back(source.substr(last, source.length() - last));
+  }
+  return fields->size();
+}
+
+size_t tokenize_with_empty_tokens(const std::string& source,
+                                  char delimiter,
+                                  std::vector<std::string>* fields) {
+  fields->clear();
+  size_t last = 0;
+  for (size_t i = 0; i < source.length(); ++i) {
+    if (source[i] == delimiter) {
+      fields->push_back(source.substr(last, i - last));
+      last = i + 1;
+    }
+  }
+  fields->push_back(source.substr(last, source.length() - last));
+  return fields->size();
+}
+
+size_t tokenize_append(const std::string& source,
+                       char delimiter,
+                       std::vector<std::string>* fields) {
+  if (!fields)
+    return 0;
+
+  std::vector<std::string> new_fields;
+  tokenize(source, delimiter, &new_fields);
+  fields->insert(fields->end(), new_fields.begin(), new_fields.end());
+  return fields->size();
+}
+
+size_t tokenize(const std::string& source,
+                char delimiter,
+                char start_mark,
+                char end_mark,
+                std::vector<std::string>* fields) {
+  if (!fields)
+    return 0;
+  fields->clear();
+
+  std::string remain_source = source;
+  while (!remain_source.empty()) {
+    size_t start_pos = remain_source.find(start_mark);
+    if (std::string::npos == start_pos)
+      break;
+    std::string pre_mark;
+    if (start_pos > 0) {
+      pre_mark = remain_source.substr(0, start_pos - 1);
+    }
+
+    ++start_pos;
+    size_t end_pos = remain_source.find(end_mark, start_pos);
+    if (std::string::npos == end_pos)
+      break;
+
+    // We have found the matching marks. First tokenize the pre-mask. Then add
+    // the marked part as a single field. Finally, loop back for the post-mark.
+    tokenize_append(pre_mark, delimiter, fields);
+    fields->push_back(remain_source.substr(start_pos, end_pos - start_pos));
+    remain_source = remain_source.substr(end_pos + 1);
+  }
+
+  return tokenize_append(remain_source, delimiter, fields);
+}
+
+bool tokenize_first(const std::string& source,
+                    const char delimiter,
+                    std::string* token,
+                    std::string* rest) {
+  // Find the first delimiter
+  size_t left_pos = source.find(delimiter);
+  if (left_pos == std::string::npos) {
+    return false;
+  }
+
+  // Look for additional occurrances of delimiter.
+  size_t right_pos = left_pos + 1;
+  while (source[right_pos] == delimiter) {
+    right_pos++;
+  }
+
+  *token = source.substr(0, left_pos);
+  *rest = source.substr(right_pos);
+  return true;
+}
+
+std::string join(const std::vector<std::string>& source, char delimiter) {
+  if (source.size() == 0) {
+    return std::string();
+  }
+  // Find length of the string to be returned to pre-allocate memory.
+  size_t source_string_length = 0;
+  for (size_t i = 0; i < source.size(); ++i) {
+    source_string_length += source[i].length();
+  }
+
+  // Build the joined string.
+  std::string joined_string;
+  joined_string.reserve(source_string_length + source.size() - 1);
+  for (size_t i = 0; i < source.size(); ++i) {
+    if (i != 0) {
+      joined_string += delimiter;
+    }
+    joined_string += source[i];
+  }
+  return joined_string;
+}
+
+size_t split(const std::string& source,
+             char delimiter,
+             std::vector<std::string>* fields) {
+  RTC_DCHECK(fields);
+  fields->clear();
+  size_t last = 0;
+  for (size_t i = 0; i < source.length(); ++i) {
+    if (source[i] == delimiter) {
+      fields->push_back(source.substr(last, i - last));
+      last = i + 1;
+    }
+  }
+  fields->push_back(source.substr(last, source.length() - last));
+  return fields->size();
+}
+
+std::string ToString(const bool b) {
+  return b ? "true" : "false";
+}
+
+std::string ToString(const char* const s) {
+  return std::string(s);
+}
+std::string ToString(const std::string s) {
+  return s;
+}
+
+std::string ToString(const short s) {
+  char buf[32];
+  const int len = std::snprintf(&buf[0], arraysize(buf), "%hd", s);
+  RTC_DCHECK_LE(len, arraysize(buf));
+  return std::string(&buf[0], len);
+}
+std::string ToString(const unsigned short s) {
+  char buf[32];
+  const int len = std::snprintf(&buf[0], arraysize(buf), "%hu", s);
+  RTC_DCHECK_LE(len, arraysize(buf));
+  return std::string(&buf[0], len);
+}
+std::string ToString(const int s) {
+  char buf[32];
+  const int len = std::snprintf(&buf[0], arraysize(buf), "%d", s);
+  RTC_DCHECK_LE(len, arraysize(buf));
+  return std::string(&buf[0], len);
+}
+std::string ToString(const unsigned int s) {
+  char buf[32];
+  const int len = std::snprintf(&buf[0], arraysize(buf), "%u", s);
+  RTC_DCHECK_LE(len, arraysize(buf));
+  return std::string(&buf[0], len);
+}
+std::string ToString(const long int s) {
+  char buf[32];
+  const int len = std::snprintf(&buf[0], arraysize(buf), "%ld", s);
+  RTC_DCHECK_LE(len, arraysize(buf));
+  return std::string(&buf[0], len);
+}
+std::string ToString(const unsigned long int s) {
+  char buf[32];
+  const int len = std::snprintf(&buf[0], arraysize(buf), "%lu", s);
+  RTC_DCHECK_LE(len, arraysize(buf));
+  return std::string(&buf[0], len);
+}
+std::string ToString(const long long int s) {
+  char buf[32];
+  const int len = std::snprintf(&buf[0], arraysize(buf), "%lld", s);
+  RTC_DCHECK_LE(len, arraysize(buf));
+  return std::string(&buf[0], len);
+}
+std::string ToString(const unsigned long long int s) {
+  char buf[32];
+  const int len = std::snprintf(&buf[0], arraysize(buf), "%llu", s);
+  RTC_DCHECK_LE(len, arraysize(buf));
+  return std::string(&buf[0], len);
+}
+
+std::string ToString(const double d) {
+  char buf[32];
+  const int len = std::snprintf(&buf[0], arraysize(buf), "%g", d);
+  RTC_DCHECK_LE(len, arraysize(buf));
+  return std::string(&buf[0], len);
+}
+
+std::string ToString(const long double d) {
+  char buf[32];
+  const int len = std::snprintf(&buf[0], arraysize(buf), "%Lg", d);
+  RTC_DCHECK_LE(len, arraysize(buf));
+  return std::string(&buf[0], len);
+}
+
+std::string ToString(const void* const p) {
+  char buf[32];
+  const int len = std::snprintf(&buf[0], arraysize(buf), "%p", p);
+  RTC_DCHECK_LE(len, arraysize(buf));
+  return std::string(&buf[0], len);
+}
+
+bool FromString(const std::string& s, bool* b) {
+  if (s == "false") {
+    *b = false;
+    return true;
+  }
+  if (s == "true") {
+    *b = true;
+    return true;
+  }
+  return false;
+}
+
+}  // namespace rtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_encode.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_encode.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_encode.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_encode.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,154 @@
+/*
+ *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_STRING_ENCODE_H_
+#define RTC_BASE_STRING_ENCODE_H_
+
+#include <stddef.h>
+
+#include <string>
+#include <type_traits>
+#include <vector>
+
+#include "absl/types/optional.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/string_to_number.h"
+
+namespace rtc {
+
+//////////////////////////////////////////////////////////////////////
+// String Encoding Utilities
+//////////////////////////////////////////////////////////////////////
+
+std::string hex_encode(const std::string& str);
+std::string hex_encode(const char* source, size_t srclen);
+std::string hex_encode_with_delimiter(const char* source,
+                                      size_t srclen,
+                                      char delimiter);
+
+// hex_decode converts ascii hex to binary.
+size_t hex_decode(char* buffer,
+                  size_t buflen,
+                  const char* source,
+                  size_t srclen);
+
+// hex_decode, assuming that there is a delimiter between every byte
+// pair.
+// |delimiter| == 0 means no delimiter
+// If the buffer is too short or the data is invalid, we return 0.
+size_t hex_decode_with_delimiter(char* buffer,
+                                 size_t buflen,
+                                 const char* source,
+                                 size_t srclen,
+                                 char delimiter);
+
+// Helper functions for hex_decode.
+size_t hex_decode(char* buffer, size_t buflen, const std::string& source);
+size_t hex_decode_with_delimiter(char* buffer,
+                                 size_t buflen,
+                                 const std::string& source,
+                                 char delimiter);
+
+// Joins the source vector of strings into a single string, with each
+// field in source being separated by delimiter. No trailing delimiter is added.
+std::string join(const std::vector<std::string>& source, char delimiter);
+
+// Splits the source string into multiple fields separated by delimiter,
+// with duplicates of delimiter creating empty fields.
+size_t split(const std::string& source,
+             char delimiter,
+             std::vector<std::string>* fields);
+
+// Splits the source string into multiple fields separated by delimiter,
+// with duplicates of delimiter ignored.  Trailing delimiter ignored.
+size_t tokenize(const std::string& source,
+                char delimiter,
+                std::vector<std::string>* fields);
+
+// Tokenize, including the empty tokens.
+size_t tokenize_with_empty_tokens(const std::string& source,
+                                  char delimiter,
+                                  std::vector<std::string>* fields);
+
+// Tokenize and append the tokens to fields. Return the new size of fields.
+size_t tokenize_append(const std::string& source,
+                       char delimiter,
+                       std::vector<std::string>* fields);
+
+// Splits the source string into multiple fields separated by delimiter, with
+// duplicates of delimiter ignored. Trailing delimiter ignored. A substring in
+// between the start_mark and the end_mark is treated as a single field. Return
+// the size of fields. For example, if source is "filename
+// \"/Library/Application Support/media content.txt\"", delimiter is ' ', and
+// the start_mark and end_mark are '"', this method returns two fields:
+// "filename" and "/Library/Application Support/media content.txt".
+size_t tokenize(const std::string& source,
+                char delimiter,
+                char start_mark,
+                char end_mark,
+                std::vector<std::string>* fields);
+
+// Extract the first token from source as separated by delimiter, with
+// duplicates of delimiter ignored. Return false if the delimiter could not be
+// found, otherwise return true.
+bool tokenize_first(const std::string& source,
+                    const char delimiter,
+                    std::string* token,
+                    std::string* rest);
+
+// Convert arbitrary values to/from a string.
+// TODO(jonasolsson): Remove these when absl::StrCat becomes available.
+std::string ToString(bool b);
+
+std::string ToString(const char* s);
+std::string ToString(std::string t);
+
+std::string ToString(short s);
+std::string ToString(unsigned short s);
+std::string ToString(int s);
+std::string ToString(unsigned int s);
+std::string ToString(long int s);
+std::string ToString(unsigned long int s);
+std::string ToString(long long int s);
+std::string ToString(unsigned long long int s);
+
+std::string ToString(double t);
+std::string ToString(long double t);
+
+std::string ToString(const void* p);
+
+template <typename T,
+          typename std::enable_if<std::is_arithmetic<T>::value &&
+                                      !std::is_same<T, bool>::value,
+                                  int>::type = 0>
+static bool FromString(const std::string& s, T* t) {
+  RTC_DCHECK(t);
+  absl::optional<T> result = StringToNumber<T>(s);
+
+  if (result)
+    *t = *result;
+
+  return result.has_value();
+}
+
+bool FromString(const std::string& s, bool* b);
+
+template <typename T>
+static inline T FromString(const std::string& str) {
+  T val;
+  FromString(str, &val);
+  return val;
+}
+
+//////////////////////////////////////////////////////////////////////
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_STRING_ENCODE_H__
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/strings/string_builder.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/strings/string_builder.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/strings/string_builder.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/strings/string_builder.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,141 @@
+/*
+ *  Copyright 2018 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "rtc_base/strings/string_builder.h"
+
+#include <stdarg.h>
+
+#include <cstdio>
+#include <cstring>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_minmax.h"
+
+namespace rtc {
+
+SimpleStringBuilder::SimpleStringBuilder(rtc::ArrayView<char> buffer)
+    : buffer_(buffer) {
+  buffer_[0] = '\0';
+  RTC_DCHECK(IsConsistent());
+}
+
+SimpleStringBuilder& SimpleStringBuilder::operator<<(const char* str) {
+  return Append(str, strlen(str));
+}
+
+SimpleStringBuilder& SimpleStringBuilder::operator<<(char ch) {
+  return Append(&ch, 1);
+}
+
+SimpleStringBuilder& SimpleStringBuilder::operator<<(const std::string& str) {
+  return Append(str.c_str(), str.length());
+}
+
+// Numeric conversion routines.
+//
+// We use std::[v]snprintf instead of std::to_string because:
+// * std::to_string relies on the current locale for formatting purposes,
+//   and therefore concurrent calls to std::to_string from multiple threads
+//   may result in partial serialization of calls
+// * snprintf allows us to print the number directly into our buffer.
+// * avoid allocating a std::string (potential heap alloc).
+// TODO(tommi): Switch to std::to_chars in C++17.
+
+SimpleStringBuilder& SimpleStringBuilder::operator<<(int i) {
+  return AppendFormat("%d", i);
+}
+
+SimpleStringBuilder& SimpleStringBuilder::operator<<(unsigned i) {
+  return AppendFormat("%u", i);
+}
+
+SimpleStringBuilder& SimpleStringBuilder::operator<<(long i) {  // NOLINT
+  return AppendFormat("%ld", i);
+}
+
+SimpleStringBuilder& SimpleStringBuilder::operator<<(long long i) {  // NOLINT
+  return AppendFormat("%lld", i);
+}
+
+SimpleStringBuilder& SimpleStringBuilder::operator<<(
+    unsigned long i) {  // NOLINT
+  return AppendFormat("%lu", i);
+}
+
+SimpleStringBuilder& SimpleStringBuilder::operator<<(
+    unsigned long long i) {  // NOLINT
+  return AppendFormat("%llu", i);
+}
+
+SimpleStringBuilder& SimpleStringBuilder::operator<<(float f) {
+  return AppendFormat("%g", f);
+}
+
+SimpleStringBuilder& SimpleStringBuilder::operator<<(double f) {
+  return AppendFormat("%g", f);
+}
+
+SimpleStringBuilder& SimpleStringBuilder::operator<<(long double f) {
+  return AppendFormat("%Lg", f);
+}
+
+SimpleStringBuilder& SimpleStringBuilder::AppendFormat(const char* fmt, ...) {
+  va_list args;
+  va_start(args, fmt);
+  const int len =
+      std::vsnprintf(&buffer_[size_], buffer_.size() - size_, fmt, args);
+  if (len >= 0) {
+    const size_t chars_added = rtc::SafeMin(len, buffer_.size() - 1 - size_);
+    size_ += chars_added;
+    RTC_DCHECK_EQ(len, chars_added) << "Buffer size was insufficient";
+  } else {
+    // This should never happen, but we're paranoid, so re-write the
+    // terminator in case vsnprintf() overwrote it.
+    RTC_NOTREACHED();
+    buffer_[size_] = '\0';
+  }
+  va_end(args);
+  RTC_DCHECK(IsConsistent());
+  return *this;
+}
+
+SimpleStringBuilder& SimpleStringBuilder::Append(const char* str,
+                                                 size_t length) {
+  RTC_DCHECK_LT(size_ + length, buffer_.size())
+      << "Buffer size was insufficient";
+  const size_t chars_added = rtc::SafeMin(length, buffer_.size() - size_ - 1);
+  memcpy(&buffer_[size_], str, chars_added);
+  size_ += chars_added;
+  buffer_[size_] = '\0';
+  RTC_DCHECK(IsConsistent());
+  return *this;
+}
+
+StringBuilder& StringBuilder::AppendFormat(const char* fmt, ...) {
+  va_list args, copy;
+  va_start(args, fmt);
+  va_copy(copy, args);
+  const int predicted_length = std::vsnprintf(nullptr, 0, fmt, copy);
+  va_end(copy);
+
+  RTC_DCHECK_GE(predicted_length, 0);
+  if (predicted_length > 0) {
+    const size_t size = str_.size();
+    str_.resize(size + predicted_length);
+    // Pass "+ 1" to vsnprintf to include space for the '\0'.
+    const int actual_length =
+        std::vsnprintf(&str_[size], predicted_length + 1, fmt, args);
+    RTC_DCHECK_GE(actual_length, 0);
+  }
+  va_end(args);
+  return *this;
+}
+
+}  // namespace rtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/strings/string_builder.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/strings/string_builder.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/strings/string_builder.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/strings/string_builder.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,175 @@
+/*
+ *  Copyright 2018 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_STRINGS_STRING_BUILDER_H_
+#define RTC_BASE_STRINGS_STRING_BUILDER_H_
+
+#include <cstdio>
+#include <string>
+#include <utility>
+
+#include "absl/strings/string_view.h"
+#include "api/array_view.h"
+#include "rtc_base/string_encode.h"
+
+namespace rtc {
+
+// This is a minimalistic string builder class meant to cover the most cases of
+// when you might otherwise be tempted to use a stringstream (discouraged for
+// anything except logging). It uses a fixed-size buffer provided by the caller
+// and concatenates strings and numbers into it, allowing the results to be
+// read via |str()|.
+class SimpleStringBuilder {
+ public:
+  explicit SimpleStringBuilder(rtc::ArrayView<char> buffer);
+  SimpleStringBuilder(const SimpleStringBuilder&) = delete;
+  SimpleStringBuilder& operator=(const SimpleStringBuilder&) = delete;
+
+  SimpleStringBuilder& operator<<(const char* str);
+  SimpleStringBuilder& operator<<(char ch);
+  SimpleStringBuilder& operator<<(const std::string& str);
+  SimpleStringBuilder& operator<<(int i);
+  SimpleStringBuilder& operator<<(unsigned i);
+  SimpleStringBuilder& operator<<(long i);                // NOLINT
+  SimpleStringBuilder& operator<<(long long i);           // NOLINT
+  SimpleStringBuilder& operator<<(unsigned long i);       // NOLINT
+  SimpleStringBuilder& operator<<(unsigned long long i);  // NOLINT
+  SimpleStringBuilder& operator<<(float f);
+  SimpleStringBuilder& operator<<(double f);
+  SimpleStringBuilder& operator<<(long double f);
+
+  // Returns a pointer to the built string. The name |str()| is borrowed for
+  // compatibility reasons as we replace usage of stringstream throughout the
+  // code base.
+  const char* str() const { return buffer_.data(); }
+
+  // Returns the length of the string. The name |size()| is picked for STL
+  // compatibility reasons.
+  size_t size() const { return size_; }
+
+// Allows appending a printf style formatted string.
+#if defined(__GNUC__)
+  __attribute__((__format__(__printf__, 2, 3)))
+#endif
+  SimpleStringBuilder&
+  AppendFormat(const char* fmt, ...);
+
+  // An alternate way from operator<<() to append a string. This variant is
+  // slightly more efficient when the length of the string to append, is known.
+  SimpleStringBuilder& Append(const char* str, size_t length);
+
+ private:
+  bool IsConsistent() const {
+    return size_ <= buffer_.size() - 1 && buffer_[size_] == '\0';
+  }
+
+  // An always-zero-terminated fixed-size buffer that we write to. The fixed
+  // size allows the buffer to be stack allocated, which helps performance.
+  // Having a fixed size is furthermore useful to avoid unnecessary resizing
+  // while building it.
+  const rtc::ArrayView<char> buffer_;
+
+  // Represents the number of characters written to the buffer.
+  // This does not include the terminating '\0'.
+  size_t size_ = 0;
+};
+
+// A string builder that supports dynamic resizing while building a string.
+// The class is based around an instance of std::string and allows moving
+// ownership out of the class once the string has been built.
+// Note that this class uses the heap for allocations, so SimpleStringBuilder
+// might be more efficient for some use cases.
+class StringBuilder {
+ public:
+  StringBuilder() {}
+  explicit StringBuilder(absl::string_view s) : str_(s) {}
+
+  // TODO(tommi): Support construction from StringBuilder?
+  StringBuilder(const StringBuilder&) = delete;
+  StringBuilder& operator=(const StringBuilder&) = delete;
+
+  StringBuilder& operator<<(const absl::string_view str) {
+    str_.append(str.data(), str.length());
+    return *this;
+  }
+
+  StringBuilder& operator<<(char c) = delete;
+
+  StringBuilder& operator<<(int i) {
+    str_ += rtc::ToString(i);
+    return *this;
+  }
+
+  StringBuilder& operator<<(unsigned i) {
+    str_ += rtc::ToString(i);
+    return *this;
+  }
+
+  StringBuilder& operator<<(long i) {  // NOLINT
+    str_ += rtc::ToString(i);
+    return *this;
+  }
+
+  StringBuilder& operator<<(long long i) {  // NOLINT
+    str_ += rtc::ToString(i);
+    return *this;
+  }
+
+  StringBuilder& operator<<(unsigned long i) {  // NOLINT
+    str_ += rtc::ToString(i);
+    return *this;
+  }
+
+  StringBuilder& operator<<(unsigned long long i) {  // NOLINT
+    str_ += rtc::ToString(i);
+    return *this;
+  }
+
+  StringBuilder& operator<<(float f) {
+    str_ += rtc::ToString(f);
+    return *this;
+  }
+
+  StringBuilder& operator<<(double f) {
+    str_ += rtc::ToString(f);
+    return *this;
+  }
+
+  StringBuilder& operator<<(long double f) {
+    str_ += rtc::ToString(f);
+    return *this;
+  }
+
+  const std::string& str() const { return str_; }
+
+  void Clear() { str_.clear(); }
+
+  size_t size() const { return str_.size(); }
+
+  std::string Release() {
+    std::string ret = std::move(str_);
+    str_.clear();
+    return ret;
+  }
+
+  // Allows appending a printf style formatted string.
+  StringBuilder& AppendFormat(const char* fmt, ...)
+#if defined(__GNUC__)
+      __attribute__((__format__(__printf__, 2, 3)))
+#endif
+      ;
+
+ private:
+  std::string str_;
+};
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_STRINGS_STRING_BUILDER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_to_number.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_to_number.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_to_number.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_to_number.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,90 @@
+/*
+ *  Copyright 2017 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "rtc_base/string_to_number.h"
+
+#include <ctype.h>
+
+#include <cerrno>
+#include <cstdlib>
+
+#include "rtc_base/checks.h"
+
+namespace rtc {
+namespace string_to_number_internal {
+
+absl::optional<signed_type> ParseSigned(const char* str, int base) {
+  RTC_DCHECK(str);
+  if (isdigit(str[0]) || str[0] == '-') {
+    char* end = nullptr;
+    errno = 0;
+    const signed_type value = std::strtoll(str, &end, base);
+    if (end && *end == '\0' && errno == 0) {
+      return value;
+    }
+  }
+  return absl::nullopt;
+}
+
+absl::optional<unsigned_type> ParseUnsigned(const char* str, int base) {
+  RTC_DCHECK(str);
+  if (isdigit(str[0]) || str[0] == '-') {
+    // Explicitly discard negative values. std::strtoull parsing causes unsigned
+    // wraparound. We cannot just reject values that start with -, though, since
+    // -0 is perfectly fine, as is -0000000000000000000000000000000.
+    const bool is_negative = str[0] == '-';
+    char* end = nullptr;
+    errno = 0;
+    const unsigned_type value = std::strtoull(str, &end, base);
+    if (end && *end == '\0' && errno == 0 && (value == 0 || !is_negative)) {
+      return value;
+    }
+  }
+  return absl::nullopt;
+}
+
+template <typename T>
+T StrToT(const char* str, char** str_end);
+
+template <>
+inline float StrToT(const char* str, char** str_end) {
+  return std::strtof(str, str_end);
+}
+
+template <>
+inline double StrToT(const char* str, char** str_end) {
+  return std::strtod(str, str_end);
+}
+
+template <>
+inline long double StrToT(const char* str, char** str_end) {
+  return std::strtold(str, str_end);
+}
+
+template <typename T>
+absl::optional<T> ParseFloatingPoint(const char* str) {
+  RTC_DCHECK(str);
+  if (*str == '\0')
+    return absl::nullopt;
+  char* end = nullptr;
+  errno = 0;
+  const T value = StrToT<T>(str, &end);
+  if (end && *end == '\0' && errno == 0) {
+    return value;
+  }
+  return absl::nullopt;
+}
+
+template absl::optional<float> ParseFloatingPoint(const char* str);
+template absl::optional<double> ParseFloatingPoint(const char* str);
+template absl::optional<long double> ParseFloatingPoint(const char* str);
+
+}  // namespace string_to_number_internal
+}  // namespace rtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_to_number.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_to_number.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_to_number.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_to_number.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,116 @@
+/*
+ *  Copyright 2017 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_STRING_TO_NUMBER_H_
+#define RTC_BASE_STRING_TO_NUMBER_H_
+
+#include <limits>
+#include <string>
+#include <type_traits>
+
+#include "absl/types/optional.h"
+
+namespace rtc {
+
+// This file declares a family of functions to parse integers from strings.
+// The standard C library functions either fail to indicate errors (atoi, etc.)
+// or are a hassle to work with (strtol, sscanf, etc.). The standard C++ library
+// functions (std::stoi, etc.) indicate errors by throwing exceptions, which
+// are disabled in WebRTC.
+//
+// Integers are parsed using one of the following functions:
+//   absl::optional<int-type> StringToNumber(const char* str, int base = 10);
+//   absl::optional<int-type> StringToNumber(const std::string& str,
+//                                          int base = 10);
+//
+// These functions parse a value from the beginning of a string into one of the
+// fundamental integer types, or returns an empty Optional if parsing
+// failed. Values outside of the range supported by the type will be
+// rejected. The strings must begin with a digit or a minus sign. No leading
+// space nor trailing contents are allowed.
+// By setting base to 0, one of octal, decimal or hexadecimal will be
+// detected from the string's prefix (0, nothing or 0x, respectively).
+// If non-zero, base can be set to a value between 2 and 36 inclusively.
+//
+// If desired, this interface could be extended with support for floating-point
+// types.
+
+namespace string_to_number_internal {
+// These must be (unsigned) long long, to match the signature of strto(u)ll.
+using unsigned_type = unsigned long long;  // NOLINT(runtime/int)
+using signed_type = long long;             // NOLINT(runtime/int)
+
+absl::optional<signed_type> ParseSigned(const char* str, int base);
+absl::optional<unsigned_type> ParseUnsigned(const char* str, int base);
+
+template <typename T>
+absl::optional<T> ParseFloatingPoint(const char* str);
+}  // namespace string_to_number_internal
+
+template <typename T>
+typename std::enable_if<std::is_integral<T>::value && std::is_signed<T>::value,
+                        absl::optional<T>>::type
+StringToNumber(const char* str, int base = 10) {
+  using string_to_number_internal::signed_type;
+  static_assert(
+      std::numeric_limits<T>::max() <=
+              std::numeric_limits<signed_type>::max() &&
+          std::numeric_limits<T>::lowest() >=
+              std::numeric_limits<signed_type>::lowest(),
+      "StringToNumber only supports signed integers as large as long long int");
+  absl::optional<signed_type> value =
+      string_to_number_internal::ParseSigned(str, base);
+  if (value && *value >= std::numeric_limits<T>::lowest() &&
+      *value <= std::numeric_limits<T>::max()) {
+    return static_cast<T>(*value);
+  }
+  return absl::nullopt;
+}
+
+template <typename T>
+typename std::enable_if<std::is_integral<T>::value &&
+                            std::is_unsigned<T>::value,
+                        absl::optional<T>>::type
+StringToNumber(const char* str, int base = 10) {
+  using string_to_number_internal::unsigned_type;
+  static_assert(std::numeric_limits<T>::max() <=
+                    std::numeric_limits<unsigned_type>::max(),
+                "StringToNumber only supports unsigned integers as large as "
+                "unsigned long long int");
+  absl::optional<unsigned_type> value =
+      string_to_number_internal::ParseUnsigned(str, base);
+  if (value && *value <= std::numeric_limits<T>::max()) {
+    return static_cast<T>(*value);
+  }
+  return absl::nullopt;
+}
+
+template <typename T>
+typename std::enable_if<std::is_floating_point<T>::value,
+                        absl::optional<T>>::type
+StringToNumber(const char* str, int base = 10) {
+  static_assert(
+      std::numeric_limits<T>::max() <= std::numeric_limits<long double>::max(),
+      "StringToNumber only supports floating-point numbers as large "
+      "as long double");
+  return string_to_number_internal::ParseFloatingPoint<T>(str);
+}
+
+// The std::string overloads only exists if there is a matching const char*
+// version.
+template <typename T>
+auto StringToNumber(const std::string& str, int base = 10)
+    -> decltype(StringToNumber<T>(str.c_str(), base)) {
+  return StringToNumber<T>(str.c_str(), base);
+}
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_STRING_TO_NUMBER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_utils.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_utils.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_utils.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_utils.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,53 @@
+/*
+ *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "rtc_base/string_utils.h"
+
+namespace rtc {
+
+size_t strcpyn(char* buffer,
+               size_t buflen,
+               const char* source,
+               size_t srclen /* = SIZE_UNKNOWN */) {
+  if (buflen <= 0)
+    return 0;
+
+  if (srclen == SIZE_UNKNOWN) {
+    srclen = strlen(source);
+  }
+  if (srclen >= buflen) {
+    srclen = buflen - 1;
+  }
+  memcpy(buffer, source, srclen);
+  buffer[srclen] = 0;
+  return srclen;
+}
+
+static const char kWhitespace[] = " \n\r\t";
+
+std::string string_trim(const std::string& s) {
+  std::string::size_type first = s.find_first_not_of(kWhitespace);
+  std::string::size_type last = s.find_last_not_of(kWhitespace);
+
+  if (first == std::string::npos || last == std::string::npos) {
+    return std::string("");
+  }
+
+  return s.substr(first, last - first + 1);
+}
+
+std::string ToHex(const int i) {
+  char buffer[50];
+  snprintf(buffer, sizeof(buffer), "%x", i);
+
+  return std::string(buffer);
+}
+
+}  // namespace rtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_utils.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_utils.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_utils.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/string_utils.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,93 @@
+/*
+ *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_STRING_UTILS_H_
+#define RTC_BASE_STRING_UTILS_H_
+
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+#if defined(WEBRTC_WIN)
+#include <malloc.h>
+#include <wchar.h>
+#include <windows.h>
+
+#endif  // WEBRTC_WIN
+
+#if defined(WEBRTC_POSIX)
+#include <stdlib.h>
+#include <strings.h>
+#endif  // WEBRTC_POSIX
+
+#include <string>
+
+namespace rtc {
+
+const size_t SIZE_UNKNOWN = static_cast<size_t>(-1);
+
+// Safe version of strncpy that always nul-terminate.
+size_t strcpyn(char* buffer,
+               size_t buflen,
+               const char* source,
+               size_t srclen = SIZE_UNKNOWN);
+
+///////////////////////////////////////////////////////////////////////////////
+// UTF helpers (Windows only)
+///////////////////////////////////////////////////////////////////////////////
+
+#if defined(WEBRTC_WIN)
+
+inline std::wstring ToUtf16(const char* utf8, size_t len) {
+  if (len == 0)
+    return std::wstring();
+  int len16 = ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len),
+                                    nullptr, 0);
+  std::wstring ws(len16, 0);
+  ::MultiByteToWideChar(CP_UTF8, 0, utf8, static_cast<int>(len), &*ws.begin(),
+                        len16);
+  return ws;
+}
+
+inline std::wstring ToUtf16(const std::string& str) {
+  return ToUtf16(str.data(), str.length());
+}
+
+inline std::string ToUtf8(const wchar_t* wide, size_t len) {
+  if (len == 0)
+    return std::string();
+  int len8 = ::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len),
+                                   nullptr, 0, nullptr, nullptr);
+  std::string ns(len8, 0);
+  ::WideCharToMultiByte(CP_UTF8, 0, wide, static_cast<int>(len), &*ns.begin(),
+                        len8, nullptr, nullptr);
+  return ns;
+}
+
+inline std::string ToUtf8(const wchar_t* wide) {
+  return ToUtf8(wide, wcslen(wide));
+}
+
+inline std::string ToUtf8(const std::wstring& wstr) {
+  return ToUtf8(wstr.data(), wstr.length());
+}
+
+#endif  // WEBRTC_WIN
+
+// Remove leading and trailing whitespaces.
+std::string string_trim(const std::string& s);
+
+// TODO(jonasolsson): replace with absl::Hex when that becomes available.
+std::string ToHex(const int i);
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_STRING_UTILS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/swap_queue.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/swap_queue.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/swap_queue.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/swap_queue.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,249 @@
+/*
+ *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_SWAP_QUEUE_H_
+#define RTC_BASE_SWAP_QUEUE_H_
+
+#include <stddef.h>
+
+#include <atomic>
+#include <utility>
+#include <vector>
+
+#include "absl/base/attributes.h"
+#include "rtc_base/checks.h"
+
+namespace webrtc {
+
+namespace internal {
+
+// (Internal; please don't use outside this file.)
+template <typename T>
+bool NoopSwapQueueItemVerifierFunction(const T&) {
+  return true;
+}
+
+}  // namespace internal
+
+// Functor to use when supplying a verifier function for the queue.
+template <typename T,
+          bool (*QueueItemVerifierFunction)(const T&) =
+              internal::NoopSwapQueueItemVerifierFunction>
+class SwapQueueItemVerifier {
+ public:
+  bool operator()(const T& t) const { return QueueItemVerifierFunction(t); }
+};
+
+// This class is a fixed-size queue. A single producer calls Insert() to insert
+// an element of type T at the back of the queue, and a single consumer calls
+// Remove() to remove an element from the front of the queue. It's safe for the
+// producer and the consumer to access the queue concurrently, from different
+// threads.
+//
+// To avoid the construction, copying, and destruction of Ts that a naive
+// queue implementation would require, for each "full" T passed from
+// producer to consumer, SwapQueue<T> passes an "empty" T in the other
+// direction (an "empty" T is one that contains nothing of value for the
+// consumer). This bidirectional movement is implemented with swap().
+//
+// // Create queue:
+// Bottle proto(568);  // Prepare an empty Bottle. Heap allocates space for
+//                     // 568 ml.
+// SwapQueue<Bottle> q(N, proto);  // Init queue with N copies of proto.
+//                                 // Each copy allocates on the heap.
+// // Producer pseudo-code:
+// Bottle b(568); // Prepare an empty Bottle. Heap allocates space for 568 ml.
+// loop {
+//   b.Fill(amount);  // Where amount <= 568 ml.
+//   q.Insert(&b);    // Swap our full Bottle for an empty one from q.
+// }
+//
+// // Consumer pseudo-code:
+// Bottle b(568);  // Prepare an empty Bottle. Heap allocates space for 568 ml.
+// loop {
+//   q.Remove(&b); // Swap our empty Bottle for the next-in-line full Bottle.
+//   Drink(&b);
+// }
+//
+// For a well-behaved Bottle class, there are no allocations in the
+// producer, since it just fills an empty Bottle that's already large
+// enough; no deallocations in the consumer, since it returns each empty
+// Bottle to the queue after having drunk it; and no copies along the
+// way, since the queue uses swap() everywhere to move full Bottles in
+// one direction and empty ones in the other.
+template <typename T, typename QueueItemVerifier = SwapQueueItemVerifier<T>>
+class SwapQueue {
+ public:
+  // Creates a queue of size size and fills it with default constructed Ts.
+  explicit SwapQueue(size_t size) : queue_(size) {
+    RTC_DCHECK(VerifyQueueSlots());
+  }
+
+  // Same as above and accepts an item verification functor.
+  SwapQueue(size_t size, const QueueItemVerifier& queue_item_verifier)
+      : queue_item_verifier_(queue_item_verifier), queue_(size) {
+    RTC_DCHECK(VerifyQueueSlots());
+  }
+
+  // Creates a queue of size size and fills it with copies of prototype.
+  SwapQueue(size_t size, const T& prototype) : queue_(size, prototype) {
+    RTC_DCHECK(VerifyQueueSlots());
+  }
+
+  // Same as above and accepts an item verification functor.
+  SwapQueue(size_t size,
+            const T& prototype,
+            const QueueItemVerifier& queue_item_verifier)
+      : queue_item_verifier_(queue_item_verifier), queue_(size, prototype) {
+    RTC_DCHECK(VerifyQueueSlots());
+  }
+
+  // Resets the queue to have zero content while maintaining the queue size.
+  // Just like Remove(), this can only be called (safely) from the
+  // consumer.
+  void Clear() {
+    // Drop all non-empty elements by resetting num_elements_ and incrementing
+    // next_read_index_ by the previous value of num_elements_. Relaxed memory
+    // ordering is sufficient since the dropped elements are not accessed.
+    next_read_index_ += std::atomic_exchange_explicit(
+        &num_elements_, size_t{0}, std::memory_order_relaxed);
+    if (next_read_index_ >= queue_.size()) {
+      next_read_index_ -= queue_.size();
+    }
+
+    RTC_DCHECK_LT(next_read_index_, queue_.size());
+  }
+
+  // Inserts a "full" T at the back of the queue by swapping *input with an
+  // "empty" T from the queue.
+  // Returns true if the item was inserted or false if not (the queue was full).
+  // When specified, the T given in *input must pass the ItemVerifier() test.
+  // The contents of *input after the call are then also guaranteed to pass the
+  // ItemVerifier() test.
+  ABSL_MUST_USE_RESULT bool Insert(T* input) {
+    RTC_DCHECK(input);
+
+    RTC_DCHECK(queue_item_verifier_(*input));
+
+    // Load the value of num_elements_. Acquire memory ordering prevents reads
+    // and writes to queue_[next_write_index_] to be reordered to before the
+    // load. (That element might be accessed by a concurrent call to Remove()
+    // until the load finishes.)
+    if (std::atomic_load_explicit(&num_elements_, std::memory_order_acquire) ==
+        queue_.size()) {
+      return false;
+    }
+
+    using std::swap;
+    swap(*input, queue_[next_write_index_]);
+
+    // Increment the value of num_elements_ to account for the inserted element.
+    // Release memory ordering prevents the reads and writes to
+    // queue_[next_write_index_] to be reordered to after the increment. (Once
+    // the increment has finished, Remove() might start accessing that element.)
+    const size_t old_num_elements = std::atomic_fetch_add_explicit(
+        &num_elements_, size_t{1}, std::memory_order_release);
+
+    ++next_write_index_;
+    if (next_write_index_ == queue_.size()) {
+      next_write_index_ = 0;
+    }
+
+    RTC_DCHECK_LT(next_write_index_, queue_.size());
+    RTC_DCHECK_LT(old_num_elements, queue_.size());
+
+    return true;
+  }
+
+  // Removes the frontmost "full" T from the queue by swapping it with
+  // the "empty" T in *output.
+  // Returns true if an item could be removed or false if not (the queue was
+  // empty). When specified, The T given in *output must pass the ItemVerifier()
+  // test and the contents of *output after the call are then also guaranteed to
+  // pass the ItemVerifier() test.
+  ABSL_MUST_USE_RESULT bool Remove(T* output) {
+    RTC_DCHECK(output);
+
+    RTC_DCHECK(queue_item_verifier_(*output));
+
+    // Load the value of num_elements_. Acquire memory ordering prevents reads
+    // and writes to queue_[next_read_index_] to be reordered to before the
+    // load. (That element might be accessed by a concurrent call to Insert()
+    // until the load finishes.)
+    if (std::atomic_load_explicit(&num_elements_, std::memory_order_acquire) ==
+        0) {
+      return false;
+    }
+
+    using std::swap;
+    swap(*output, queue_[next_read_index_]);
+
+    // Decrement the value of num_elements_ to account for the removed element.
+    // Release memory ordering prevents the reads and writes to
+    // queue_[next_write_index_] to be reordered to after the decrement. (Once
+    // the decrement has finished, Insert() might start accessing that element.)
+    std::atomic_fetch_sub_explicit(&num_elements_, size_t{1},
+                                   std::memory_order_release);
+
+    ++next_read_index_;
+    if (next_read_index_ == queue_.size()) {
+      next_read_index_ = 0;
+    }
+
+    RTC_DCHECK_LT(next_read_index_, queue_.size());
+
+    return true;
+  }
+
+  // Returns the current number of elements in the queue. Since elements may be
+  // concurrently added to the queue, the caller must treat this as a lower
+  // bound, not an exact count.
+  // May only be called by the consumer.
+  size_t SizeAtLeast() const {
+    // Acquire memory ordering ensures that we wait for the producer to finish
+    // inserting any element in progress.
+    return std::atomic_load_explicit(&num_elements_, std::memory_order_acquire);
+  }
+
+ private:
+  // Verify that the queue slots complies with the ItemVerifier test. This
+  // function is not thread-safe and can only be used in the constructors.
+  bool VerifyQueueSlots() {
+    for (const auto& v : queue_) {
+      RTC_DCHECK(queue_item_verifier_(v));
+    }
+    return true;
+  }
+
+  // TODO(peah): Change this to use std::function() once we can use C++11 std
+  // lib.
+  QueueItemVerifier queue_item_verifier_;
+
+  // Only accessed by the single producer.
+  size_t next_write_index_ = 0;
+
+  // Only accessed by the single consumer.
+  size_t next_read_index_ = 0;
+
+  // Accessed by both the producer and the consumer and used for synchronization
+  // between them.
+  std::atomic<size_t> num_elements_{0};
+
+  // The elements of the queue are acced by both the producer and the consumer,
+  // mediated by num_elements_. queue_.size() is constant.
+  std::vector<T> queue_;
+
+  SwapQueue(const SwapQueue&) = delete;
+  SwapQueue& operator=(const SwapQueue&) = delete;
+};
+
+}  // namespace webrtc
+
+#endif  // RTC_BASE_SWAP_QUEUE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_abseil.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_abseil.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_abseil.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_abseil.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+ *  Copyright 2020 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_SYNCHRONIZATION_MUTEX_ABSEIL_H_
+#define RTC_BASE_SYNCHRONIZATION_MUTEX_ABSEIL_H_
+
+#include "absl/base/attributes.h"
+#include "absl/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
+
+namespace webrtc {
+
+class RTC_LOCKABLE MutexImpl final {
+ public:
+  MutexImpl() = default;
+  MutexImpl(const MutexImpl&) = delete;
+  MutexImpl& operator=(const MutexImpl&) = delete;
+
+  void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION() { mutex_.Lock(); }
+  ABSL_MUST_USE_RESULT bool TryLock() RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
+    return mutex_.TryLock();
+  }
+  void Unlock() RTC_UNLOCK_FUNCTION() { mutex_.Unlock(); }
+
+ private:
+  absl::Mutex mutex_;
+};
+
+}  // namespace webrtc
+
+#endif  // RTC_BASE_SYNCHRONIZATION_MUTEX_ABSEIL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_benchmark.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_benchmark.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_benchmark.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_benchmark.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,95 @@
+/*
+ *  Copyright 2020 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "benchmark/benchmark.h"
+#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/system/unused.h"
+
+namespace webrtc {
+
+class PerfTestData {
+ public:
+  PerfTestData() : cache_line_barrier_1_(), cache_line_barrier_2_() {
+    cache_line_barrier_1_[0]++;  // Avoid 'is not used'.
+    cache_line_barrier_2_[0]++;  // Avoid 'is not used'.
+  }
+
+  int AddToCounter(int add) {
+    MutexLock mu(&mu_);
+    my_counter_ += add;
+    return 0;
+  }
+
+ private:
+  uint8_t cache_line_barrier_1_[64];
+  Mutex mu_;
+  uint8_t cache_line_barrier_2_[64];
+  int64_t my_counter_ = 0;
+};
+
+void BM_LockWithMutex(benchmark::State& state) {
+  static PerfTestData test_data;
+  for (auto s : state) {
+    RTC_UNUSED(s);
+    benchmark::DoNotOptimize(test_data.AddToCounter(2));
+  }
+}
+
+BENCHMARK(BM_LockWithMutex)->Threads(1);
+BENCHMARK(BM_LockWithMutex)->Threads(2);
+BENCHMARK(BM_LockWithMutex)->Threads(4);
+BENCHMARK(BM_LockWithMutex)->ThreadPerCpu();
+
+}  // namespace webrtc
+
+/*
+
+Results:
+
+NB when reproducing: Remember to turn of power management features such as CPU
+scaling before running!
+
+pthreads (Linux):
+----------------------------------------------------------------------
+Run on (12 X 4500 MHz CPU s)
+CPU Caches:
+  L1 Data 32 KiB (x6)
+  L1 Instruction 32 KiB (x6)
+  L2 Unified 1024 KiB (x6)
+  L3 Unified 8448 KiB (x1)
+Load Average: 0.26, 0.28, 0.44
+----------------------------------------------------------------------
+Benchmark                            Time             CPU   Iterations
+----------------------------------------------------------------------
+BM_LockWithMutex/threads:1        13.4 ns         13.4 ns     52192906
+BM_LockWithMutex/threads:2        44.2 ns         88.4 ns      8189944
+BM_LockWithMutex/threads:4        52.0 ns          198 ns      3743244
+BM_LockWithMutex/threads:12       84.9 ns          944 ns       733524
+
+std::mutex performs like the pthread implementation (Linux).
+
+Abseil (Linux):
+----------------------------------------------------------------------
+Run on (12 X 4500 MHz CPU s)
+CPU Caches:
+  L1 Data 32 KiB (x6)
+  L1 Instruction 32 KiB (x6)
+  L2 Unified 1024 KiB (x6)
+  L3 Unified 8448 KiB (x1)
+Load Average: 0.27, 0.24, 0.37
+----------------------------------------------------------------------
+Benchmark                            Time             CPU   Iterations
+----------------------------------------------------------------------
+BM_LockWithMutex/threads:1        15.0 ns         15.0 ns     46550231
+BM_LockWithMutex/threads:2        91.1 ns          182 ns      4059212
+BM_LockWithMutex/threads:4        40.8 ns          131 ns      5496560
+BM_LockWithMutex/threads:12       37.0 ns          130 ns      5377668
+
+*/
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+ *  Copyright 2020 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "rtc_base/synchronization/mutex.h"
+
+#include "rtc_base/checks.h"
+#include "rtc_base/synchronization/yield.h"
+
+namespace webrtc {
+
+#if !defined(WEBRTC_ABSL_MUTEX)
+void GlobalMutex::Lock() {
+  while (mutex_locked_.exchange(1)) {
+    YieldCurrentThread();
+  }
+}
+
+void GlobalMutex::Unlock() {
+  int old = mutex_locked_.exchange(0);
+  RTC_DCHECK_EQ(old, 1) << "Unlock called without calling Lock first";
+}
+
+GlobalMutexLock::GlobalMutexLock(GlobalMutex* mutex) : mutex_(mutex) {
+  mutex_->Lock();
+}
+
+GlobalMutexLock::~GlobalMutexLock() {
+  mutex_->Unlock();
+}
+#endif  // #if !defined(WEBRTC_ABSL_MUTEX)
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_critical_section.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_critical_section.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_critical_section.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_critical_section.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+ *  Copyright 2020 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_SYNCHRONIZATION_MUTEX_CRITICAL_SECTION_H_
+#define RTC_BASE_SYNCHRONIZATION_MUTEX_CRITICAL_SECTION_H_
+
+#if defined(WEBRTC_WIN)
+// clang-format off
+// clang formating would change include order.
+
+// Include winsock2.h before including <windows.h> to maintain consistency with
+// win32.h. To include win32.h directly, it must be broken out into its own
+// build target.
+#include <winsock2.h>
+#include <windows.h>
+#include <sal.h>  // must come after windows headers.
+// clang-format on
+
+#include "absl/base/attributes.h"
+#include "rtc_base/thread_annotations.h"
+
+namespace webrtc {
+
+class RTC_LOCKABLE MutexImpl final {
+ public:
+  MutexImpl() { InitializeCriticalSection(&critical_section_); }
+  MutexImpl(const MutexImpl&) = delete;
+  MutexImpl& operator=(const MutexImpl&) = delete;
+  ~MutexImpl() { DeleteCriticalSection(&critical_section_); }
+
+  void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION() {
+    EnterCriticalSection(&critical_section_);
+  }
+  ABSL_MUST_USE_RESULT bool TryLock() RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
+    return TryEnterCriticalSection(&critical_section_) != FALSE;
+  }
+  void Unlock() RTC_UNLOCK_FUNCTION() {
+    LeaveCriticalSection(&critical_section_);
+  }
+
+ private:
+  CRITICAL_SECTION critical_section_;
+};
+
+}  // namespace webrtc
+
+#endif  // #if defined(WEBRTC_WIN)
+#endif  // RTC_BASE_SYNCHRONIZATION_MUTEX_CRITICAL_SECTION_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,113 @@
+/*
+ *  Copyright 2020 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_SYNCHRONIZATION_MUTEX_H_
+#define RTC_BASE_SYNCHRONIZATION_MUTEX_H_
+
+#include <atomic>
+
+#include "absl/base/attributes.h"
+#include "absl/base/const_init.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/thread_annotations.h"
+
+#if defined(WEBRTC_RACE_CHECK_MUTEX)
+// To use the race check mutex, define WEBRTC_RACE_CHECK_MUTEX globally. This
+// also adds a dependency to absl::Mutex from logging.cc due to concurrent
+// invocation of the static logging system.
+#include "rtc_base/synchronization/mutex_race_check.h"
+#elif defined(WEBRTC_ABSL_MUTEX)
+#include "rtc_base/synchronization/mutex_abseil.h"  // nogncheck
+#elif defined(WEBRTC_WIN)
+#include "rtc_base/synchronization/mutex_critical_section.h"
+#elif defined(WEBRTC_POSIX)
+#include "rtc_base/synchronization/mutex_pthread.h"
+#else
+#error Unsupported platform.
+#endif
+
+namespace webrtc {
+
+// The Mutex guarantees exclusive access and aims to follow Abseil semantics
+// (i.e. non-reentrant etc).
+class RTC_LOCKABLE Mutex final {
+ public:
+  Mutex() = default;
+  Mutex(const Mutex&) = delete;
+  Mutex& operator=(const Mutex&) = delete;
+
+  void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION() {
+    impl_.Lock();
+  }
+  ABSL_MUST_USE_RESULT bool TryLock() RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
+    return impl_.TryLock();
+  }
+  void Unlock() RTC_UNLOCK_FUNCTION() {
+    impl_.Unlock();
+  }
+
+ private:
+  MutexImpl impl_;
+};
+
+// MutexLock, for serializing execution through a scope.
+class RTC_SCOPED_LOCKABLE MutexLock final {
+ public:
+  MutexLock(const MutexLock&) = delete;
+  MutexLock& operator=(const MutexLock&) = delete;
+
+  explicit MutexLock(Mutex* mutex) RTC_EXCLUSIVE_LOCK_FUNCTION(mutex)
+      : mutex_(mutex) {
+    mutex->Lock();
+  }
+  ~MutexLock() RTC_UNLOCK_FUNCTION() { mutex_->Unlock(); }
+
+ private:
+  Mutex* mutex_;
+};
+
+// A mutex used to protect global variables. Do NOT use for other purposes.
+#if defined(WEBRTC_ABSL_MUTEX)
+using GlobalMutex = absl::Mutex;
+using GlobalMutexLock = absl::MutexLock;
+#else
+class RTC_LOCKABLE GlobalMutex final {
+ public:
+  GlobalMutex(const GlobalMutex&) = delete;
+  GlobalMutex& operator=(const GlobalMutex&) = delete;
+
+  constexpr explicit GlobalMutex(absl::ConstInitType /*unused*/)
+      : mutex_locked_(0) {}
+
+  void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION();
+  void Unlock() RTC_UNLOCK_FUNCTION();
+
+ private:
+  std::atomic<int> mutex_locked_;  // 0 means lock not taken, 1 means taken.
+};
+
+// GlobalMutexLock, for serializing execution through a scope.
+class RTC_SCOPED_LOCKABLE GlobalMutexLock final {
+ public:
+  GlobalMutexLock(const GlobalMutexLock&) = delete;
+  GlobalMutexLock& operator=(const GlobalMutexLock&) = delete;
+
+  explicit GlobalMutexLock(GlobalMutex* mutex)
+      RTC_EXCLUSIVE_LOCK_FUNCTION(mutex_);
+  ~GlobalMutexLock() RTC_UNLOCK_FUNCTION();
+
+ private:
+  GlobalMutex* mutex_;
+};
+#endif  // if defined(WEBRTC_ABSL_MUTEX)
+
+}  // namespace webrtc
+
+#endif  // RTC_BASE_SYNCHRONIZATION_MUTEX_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_pthread.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_pthread.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_pthread.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_pthread.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ *  Copyright 2020 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_SYNCHRONIZATION_MUTEX_PTHREAD_H_
+#define RTC_BASE_SYNCHRONIZATION_MUTEX_PTHREAD_H_
+
+#if defined(WEBRTC_POSIX)
+
+#include <pthread.h>
+#if defined(WEBRTC_MAC)
+#include <pthread_spis.h>
+#endif
+
+#include "absl/base/attributes.h"
+#include "rtc_base/thread_annotations.h"
+
+namespace webrtc {
+
+class RTC_LOCKABLE MutexImpl final {
+ public:
+  MutexImpl() {
+    pthread_mutexattr_t mutex_attribute;
+    pthread_mutexattr_init(&mutex_attribute);
+#if defined(WEBRTC_MAC)
+    pthread_mutexattr_setpolicy_np(&mutex_attribute,
+                                   _PTHREAD_MUTEX_POLICY_FIRSTFIT);
+#endif
+    pthread_mutex_init(&mutex_, &mutex_attribute);
+    pthread_mutexattr_destroy(&mutex_attribute);
+  }
+  MutexImpl(const MutexImpl&) = delete;
+  MutexImpl& operator=(const MutexImpl&) = delete;
+  ~MutexImpl() { pthread_mutex_destroy(&mutex_); }
+
+  void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION() { pthread_mutex_lock(&mutex_); }
+  ABSL_MUST_USE_RESULT bool TryLock() RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
+    return pthread_mutex_trylock(&mutex_) == 0;
+  }
+  void Unlock() RTC_UNLOCK_FUNCTION() { pthread_mutex_unlock(&mutex_); }
+
+ private:
+  pthread_mutex_t mutex_;
+};
+
+}  // namespace webrtc
+#endif  // #if defined(WEBRTC_POSIX)
+#endif  // RTC_BASE_SYNCHRONIZATION_MUTEX_PTHREAD_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_race_check.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_race_check.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_race_check.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/mutex_race_check.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,64 @@
+/*
+ *  Copyright 2020 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_SYNCHRONIZATION_MUTEX_RACE_CHECK_H_
+#define RTC_BASE_SYNCHRONIZATION_MUTEX_RACE_CHECK_H_
+
+#include <atomic>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/system/unused.h"
+#include "rtc_base/thread_annotations.h"
+
+namespace webrtc {
+
+// This implementation class is useful when a consuming project can guarantee
+// that all WebRTC invocation is happening serially. Additionally, the consuming
+// project cannot use WebRTC code that spawn threads or task queues.
+//
+// The class internally check fails on Lock() if it finds the consumer actually
+// invokes WebRTC concurrently.
+//
+// To use the race check mutex, define WEBRTC_RACE_CHECK_MUTEX globally. This
+// also adds a dependency to absl::Mutex from logging.cc because even though
+// objects are invoked serially, the logging is static and invoked concurrently
+// and hence needs protection.
+class RTC_LOCKABLE MutexImpl final {
+ public:
+  MutexImpl() = default;
+  MutexImpl(const MutexImpl&) = delete;
+  MutexImpl& operator=(const MutexImpl&) = delete;
+
+  void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION() {
+    bool was_free = free_.exchange(false, std::memory_order_acquire);
+    RTC_CHECK(was_free)
+        << "WEBRTC_RACE_CHECK_MUTEX: mutex locked concurrently.";
+  }
+  RTC_WARN_UNUSED_RESULT bool TryLock() RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true) {
+    bool was_free = free_.exchange(false, std::memory_order_acquire);
+    return was_free;
+  }
+  void Unlock() RTC_UNLOCK_FUNCTION() {
+    free_.store(true, std::memory_order_release);
+  }
+
+ private:
+  // Release-acquire ordering is used.
+  // - In the Lock methods we're guaranteeing that reads and writes happening
+  // after the (Try)Lock don't appear to have happened before the Lock (acquire
+  // ordering).
+  // - In the Unlock method we're guaranteeing that reads and writes happening
+  // before the Unlock don't appear to happen after it (release ordering).
+  std::atomic<bool> free_{true};
+};
+
+}  // namespace webrtc
+
+#endif  // RTC_BASE_SYNCHRONIZATION_MUTEX_RACE_CHECK_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/yield.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/yield.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/yield.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/yield.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+ *  Copyright 2020 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "rtc_base/synchronization/yield.h"
+
+#if defined(WEBRTC_WIN)
+#include <windows.h>
+#else
+#include <sched.h>
+#include <time.h>
+#endif
+
+namespace webrtc {
+
+void YieldCurrentThread() {
+  // TODO(bugs.webrtc.org/11634): use dedicated OS functionality instead of
+  // sleep for yielding.
+#if defined(WEBRTC_WIN)
+  ::Sleep(0);
+#elif defined(WEBRTC_MAC) && defined(RTC_USE_NATIVE_MUTEX_ON_MAC) && \
+    !RTC_USE_NATIVE_MUTEX_ON_MAC
+  sched_yield();
+#else
+  static const struct timespec ts_null = {0};
+  nanosleep(&ts_null, nullptr);
+#endif
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/yield.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/yield.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/yield.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/synchronization/yield.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,20 @@
+/*
+ *  Copyright 2020 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#ifndef RTC_BASE_SYNCHRONIZATION_YIELD_H_
+#define RTC_BASE_SYNCHRONIZATION_YIELD_H_
+
+namespace webrtc {
+
+// Request rescheduling of threads.
+void YieldCurrentThread();
+
+}  // namespace webrtc
+
+#endif  // RTC_BASE_SYNCHRONIZATION_YIELD_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/arch.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/arch.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/arch.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/arch.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// This file contains platform-specific typedefs and defines.
+// Much of it is derived from Chromium's build/build_config.h.
+
+#ifndef RTC_BASE_SYSTEM_ARCH_H_
+#define RTC_BASE_SYSTEM_ARCH_H_
+
+// Processor architecture detection.  For more info on what's defined, see:
+//   https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros
+//   https://www.agner.org/optimize/calling_conventions.pdf
+//   https://sourceforge.net/p/predef/wiki/Architectures/
+//   or with gcc, run: "echo | gcc -E -dM -"
+#if defined(_M_X64) || defined(__x86_64__)
+#define WEBRTC_ARCH_X86_FAMILY
+#define WEBRTC_ARCH_X86_64
+#define WEBRTC_ARCH_64_BITS
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#elif defined(_M_ARM64) || defined(__aarch64__)
+#define WEBRTC_ARCH_ARM_FAMILY
+#define WEBRTC_ARCH_64_BITS
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#elif defined(_M_IX86) || defined(__i386__)
+#define WEBRTC_ARCH_X86_FAMILY
+#define WEBRTC_ARCH_X86
+#define WEBRTC_ARCH_32_BITS
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#elif defined(_M_ARM) || defined(__ARMEL__)
+#define WEBRTC_ARCH_ARM_FAMILY
+#define WEBRTC_ARCH_32_BITS
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#elif defined(__MIPSEL__) || defined(__MIPSEB__)
+#define WEBRTC_ARCH_MIPS_FAMILY
+#if defined(__LP64__)
+#define WEBRTC_ARCH_64_BITS
+#else
+#define WEBRTC_ARCH_32_BITS
+#endif
+#if defined(__MIPSEL__)
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#else
+#define WEBRTC_ARCH_BIG_ENDIAN
+#endif
+#elif defined(__PPC__)
+#if defined(__PPC64__)
+#define WEBRTC_ARCH_64_BITS
+#else
+#define WEBRTC_ARCH_32_BITS
+#endif
+#if defined(__LITTLE_ENDIAN__)
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#else
+#define WEBRTC_ARCH_BIG_ENDIAN
+#endif
+#elif defined(__sparc) || defined(__sparc__)
+#if __SIZEOF_LONG__ == 8
+#define WEBRTC_ARCH_64_BITS
+#else
+#define WEBRTC_ARCH_32_BITS
+#endif
+#define WEBRTC_ARCH_BIG_ENDIAN
+#elif defined(__riscv) && __riscv_xlen == 64
+#define WEBRTC_ARCH_64_BITS
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#elif defined(__riscv) && __riscv_xlen == 32
+#define WEBRTC_ARCH_32_BITS
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#elif defined(__pnacl__)
+#define WEBRTC_ARCH_32_BITS
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#elif defined(__EMSCRIPTEN__)
+#define WEBRTC_ARCH_32_BITS
+#define WEBRTC_ARCH_LITTLE_ENDIAN
+#else
+#error Please add support for your architecture in rtc_base/system/arch.h
+#endif
+
+#if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))
+#error Define either WEBRTC_ARCH_LITTLE_ENDIAN or WEBRTC_ARCH_BIG_ENDIAN
+#endif
+
+#endif  // RTC_BASE_SYSTEM_ARCH_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/file_wrapper.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/file_wrapper.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/file_wrapper.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/file_wrapper.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,143 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "rtc_base/system/file_wrapper.h"
+#include "rtc_base/numerics/safe_conversions.h"
+
+#include <cerrno>
+
+#ifdef _WIN32
+#include <Windows.h>
+#else
+#include <string.h>
+#endif
+
+#include <utility>
+
+namespace webrtc {
+namespace {
+FILE* FileOpen(const char* file_name_utf8, bool read_only, int* error) {
+#if defined(_WIN32)
+  int len = MultiByteToWideChar(CP_UTF8, 0, file_name_utf8, -1, nullptr, 0);
+  std::wstring wstr(len, 0);
+  MultiByteToWideChar(CP_UTF8, 0, file_name_utf8, -1, &wstr[0], len);
+  FILE* file = _wfopen(wstr.c_str(), read_only ? L"rb" : L"wb");
+#else
+  FILE* file = fopen(file_name_utf8, read_only ? "rb" : "wb");
+#endif
+  if (!file && error) {
+    *error = errno;
+  }
+  return file;
+}
+
+const char* GetCstrCheckNoEmbeddedNul(const std::string& s) {
+  const char* p = s.c_str();
+  RTC_CHECK_EQ(strlen(p), s.size())
+      << "Invalid filename, containing NUL character";
+  return p;
+}
+}  // namespace
+
+// static
+FileWrapper FileWrapper::OpenReadOnly(const char* file_name_utf8) {
+  return FileWrapper(FileOpen(file_name_utf8, true, nullptr));
+}
+
+// static
+FileWrapper FileWrapper::OpenReadOnly(const std::string& file_name_utf8) {
+  return OpenReadOnly(GetCstrCheckNoEmbeddedNul(file_name_utf8));
+}
+
+// static
+FileWrapper FileWrapper::OpenWriteOnly(const char* file_name_utf8,
+                                       int* error /*=nullptr*/) {
+  return FileWrapper(FileOpen(file_name_utf8, false, error));
+}
+
+// static
+FileWrapper FileWrapper::OpenWriteOnly(const std::string& file_name_utf8,
+                                       int* error /*=nullptr*/) {
+  return OpenWriteOnly(GetCstrCheckNoEmbeddedNul(file_name_utf8), error);
+}
+
+FileWrapper::FileWrapper(FileWrapper&& other) {
+  operator=(std::move(other));
+}
+
+FileWrapper& FileWrapper::operator=(FileWrapper&& other) {
+  Close();
+  file_ = other.file_;
+  other.file_ = nullptr;
+  return *this;
+}
+
+bool FileWrapper::SeekRelative(int64_t offset) {
+  RTC_DCHECK(file_);
+  return fseek(file_, rtc::checked_cast<long>(offset), SEEK_CUR) == 0;
+}
+
+bool FileWrapper::SeekTo(int64_t position) {
+  RTC_DCHECK(file_);
+  return fseek(file_, rtc::checked_cast<long>(position), SEEK_SET) == 0;
+}
+
+long FileWrapper::FileSize() {
+  if (file_ == nullptr)
+    return -1;
+  long original_position = ftell(file_);
+  if (original_position < 0)
+    return -1;
+  int seek_error = fseek(file_, 0, SEEK_END);
+  if (seek_error)
+    return -1;
+  long file_size = ftell(file_);
+  seek_error = fseek(file_, original_position, SEEK_SET);
+  if (seek_error)
+    return -1;
+  return file_size;
+}
+
+bool FileWrapper::Flush() {
+  RTC_DCHECK(file_);
+  return fflush(file_) == 0;
+}
+
+size_t FileWrapper::Read(void* buf, size_t length) {
+  RTC_DCHECK(file_);
+  return fread(buf, 1, length, file_);
+}
+
+bool FileWrapper::ReadEof() const {
+  RTC_DCHECK(file_);
+  return feof(file_);
+}
+
+bool FileWrapper::Write(const void* buf, size_t length) {
+  RTC_DCHECK(file_);
+  return fwrite(buf, 1, length, file_) == length;
+}
+
+bool FileWrapper::Close() {
+  if (file_ == nullptr)
+    return true;
+
+  bool success = fclose(file_) == 0;
+  file_ = nullptr;
+  return success;
+}
+
+FILE* FileWrapper::Release() {
+  FILE* file = file_;
+  file_ = nullptr;
+  return file;
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/file_wrapper.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/file_wrapper.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/file_wrapper.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/file_wrapper.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,113 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_SYSTEM_FILE_WRAPPER_H_
+#define RTC_BASE_SYSTEM_FILE_WRAPPER_H_
+
+#include <stddef.h>
+#include <stdio.h>
+
+#include <string>
+
+// Implementation that can read (exclusive) or write from/to a file.
+
+namespace webrtc {
+
+// This class is a thin wrapper around FILE*. It's main features are that it
+// owns the FILE*, calling fclose on destruction, and that on windows, file
+// names passed to the open methods are always treated as utf-8, regardless of
+// system code page.
+
+// Most of the methods return only a success/fail indication. When needed, an
+// optional argument |int* error| should be added to all methods, in the same
+// way as for the OpenWriteOnly methods.
+class FileWrapper final {
+ public:
+  // Opens a file, in read or write mode. Use the is_open() method on the
+  // returned object to check if the open operation was successful. On failure,
+  // and if |error| is non-null, the system errno value is stored at |*error|.
+  // The file is closed by the destructor.
+  static FileWrapper OpenReadOnly(const char* file_name_utf8);
+  static FileWrapper OpenReadOnly(const std::string& file_name_utf8);
+  static FileWrapper OpenWriteOnly(const char* file_name_utf8,
+                                   int* error = nullptr);
+  static FileWrapper OpenWriteOnly(const std::string& file_name_utf8,
+                                   int* error = nullptr);
+
+  FileWrapper() = default;
+
+  // Takes over ownership of |file|, closing it on destruction. Calling with
+  // null |file| is allowed, and results in a FileWrapper with is_open() false.
+  explicit FileWrapper(FILE* file) : file_(file) {}
+  ~FileWrapper() { Close(); }
+
+  // Copying is not supported.
+  FileWrapper(const FileWrapper&) = delete;
+  FileWrapper& operator=(const FileWrapper&) = delete;
+
+  // Support for move semantics.
+  FileWrapper(FileWrapper&&);
+  FileWrapper& operator=(FileWrapper&&);
+
+  // Returns true if a file has been opened. If the file is not open, no methods
+  // but is_open and Close may be called.
+  bool is_open() const { return file_ != nullptr; }
+
+  // Closes the file, and implies Flush. Returns true on success, false if
+  // writing buffered data fails. On failure, the file is nevertheless closed.
+  // Calling Close on an already closed file does nothing and returns success.
+  bool Close();
+
+  // Releases and returns the wrapped file without closing it. This call passes
+  // the ownership of the file to the caller, and the wrapper is no longer
+  // responsible for closing it. Similarly the previously wrapped file is no
+  // longer available for the wrapper to use in any aspect.
+  FILE* Release();
+
+  // Write any buffered data to the underlying file. Returns true on success,
+  // false on write error. Note: Flushing when closing, is not required.
+  bool Flush();
+
+  // Seeks to the beginning of file. Returns true on success, false on failure,
+  // e.g., if the underlying file isn't seekable.
+  bool Rewind() { return SeekTo(0); }
+  // TODO(nisse): The seek functions are used only by the WavReader. If that
+  // code is demoted to test code, seek functions can be deleted from this
+  // utility.
+  // Seek relative to current file position.
+  bool SeekRelative(int64_t offset);
+  // Seek to given position.
+  bool SeekTo(int64_t position);
+
+  // Returns the file size or -1 if a size could not be determined.
+  // (A file size might not exists for non-seekable files or file-like
+  // objects, for example /dev/tty on unix.)
+  long FileSize();
+
+  // Returns number of bytes read. Short count indicates EOF or error.
+  size_t Read(void* buf, size_t length);
+
+  // If the most recent Read() returned a short count, this methods returns true
+  // if the short count was due to EOF, and false it it was due to some i/o
+  // error.
+  bool ReadEof() const;
+
+  // Returns true if all data was successfully written (or buffered), or false
+  // if there was an error. Writing buffered data can fail later, and is
+  // reported with return value from Flush or Close.
+  bool Write(const void* buf, size_t length);
+
+ private:
+  FILE* file_ = nullptr;
+};
+
+}  // namespace webrtc
+
+#endif  // RTC_BASE_SYSTEM_FILE_WRAPPER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/inline.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/inline.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/inline.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/inline.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_SYSTEM_INLINE_H_
+#define RTC_BASE_SYSTEM_INLINE_H_
+
+#if defined(_MSC_VER)
+
+#define RTC_FORCE_INLINE __forceinline
+#define RTC_NO_INLINE __declspec(noinline)
+
+#elif defined(__GNUC__)
+
+#define RTC_FORCE_INLINE __attribute__((__always_inline__))
+#define RTC_NO_INLINE __attribute__((__noinline__))
+
+#else
+
+#define RTC_FORCE_INLINE
+#define RTC_NO_INLINE
+
+#endif
+
+#endif  // RTC_BASE_SYSTEM_INLINE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/rtc_export.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/rtc_export.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/rtc_export.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system/rtc_export.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_SYSTEM_RTC_EXPORT_H_
+#define RTC_BASE_SYSTEM_RTC_EXPORT_H_
+
+// RTC_EXPORT is used to mark symbols as exported or imported when WebRTC is
+// built or used as a shared library.
+// When WebRTC is built as a static library the RTC_EXPORT macro expands to
+// nothing.
+
+#ifdef WEBRTC_ENABLE_SYMBOL_EXPORT
+
+#ifdef WEBRTC_WIN
+
+#ifdef WEBRTC_LIBRARY_IMPL
+#define RTC_EXPORT __declspec(dllexport)
+#else
+#define RTC_EXPORT __declspec(dllimport)
+#endif
+
+#else  // WEBRTC_WIN
+
+#if __has_attribute(visibility) && defined(WEBRTC_LIBRARY_IMPL)
+#define RTC_EXPORT __attribute__((visibility("default")))
+#endif
+
+#endif  // WEBRTC_WIN
+
+#endif  // WEBRTC_ENABLE_SYMBOL_EXPORT
+
+#ifndef RTC_EXPORT
+#define RTC_EXPORT
+#endif
+
+#endif  // RTC_BASE_SYSTEM_RTC_EXPORT_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system_time.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system_time.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system_time.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system_time.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,97 @@
+/*
+ *  Copyright 2021 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// If WEBRTC_EXCLUDE_SYSTEM_TIME is set, an implementation of
+// rtc::SystemTimeNanos() must be provided externally.
+#ifndef WEBRTC_EXCLUDE_SYSTEM_TIME
+
+#include <stdint.h>
+
+#include <limits>
+
+#if defined(WEBRTC_POSIX)
+#include <sys/time.h>
+#if defined(WEBRTC_MAC)
+#include <mach/mach_time.h>
+#endif
+#endif
+
+#if defined(WEBRTC_WIN)
+// clang-format off
+// clang formatting would put <windows.h> last,
+// which leads to compilation failure.
+#include <windows.h>
+#include <mmsystem.h>
+#include <sys/timeb.h>
+// clang-format on
+#endif
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_conversions.h"
+#include "rtc_base/system_time.h"
+#include "rtc_base/time_utils.h"
+
+namespace rtc {
+
+int64_t SystemTimeNanos() {
+  int64_t ticks;
+#if defined(WEBRTC_MAC)
+  static mach_timebase_info_data_t timebase;
+  if (timebase.denom == 0) {
+    // Get the timebase if this is the first time we run.
+    // Recommended by Apple's QA1398.
+    if (mach_timebase_info(&timebase) != KERN_SUCCESS) {
+      RTC_NOTREACHED();
+    }
+  }
+  // Use timebase to convert absolute time tick units into nanoseconds.
+  const auto mul = [](uint64_t a, uint32_t b) -> int64_t {
+    RTC_DCHECK_NE(b, 0);
+    RTC_DCHECK_LE(a, std::numeric_limits<int64_t>::max() / b)
+        << "The multiplication " << a << " * " << b << " overflows";
+    return rtc::dchecked_cast<int64_t>(a * b);
+  };
+  ticks = mul(mach_absolute_time(), timebase.numer) / timebase.denom;
+#elif defined(WEBRTC_POSIX)
+  struct timespec ts;
+  // TODO(deadbeef): Do we need to handle the case when CLOCK_MONOTONIC is not
+  // supported?
+  clock_gettime(CLOCK_MONOTONIC, &ts);
+  ticks = kNumNanosecsPerSec * static_cast<int64_t>(ts.tv_sec) +
+          static_cast<int64_t>(ts.tv_nsec);
+#elif defined(WINUWP)
+  ticks = WinUwpSystemTimeNanos();
+#elif defined(WEBRTC_WIN)
+  static volatile LONG last_timegettime = 0;
+  static volatile int64_t num_wrap_timegettime = 0;
+  volatile LONG* last_timegettime_ptr = &last_timegettime;
+  DWORD now = timeGetTime();
+  // Atomically update the last gotten time
+  DWORD old = InterlockedExchange(last_timegettime_ptr, now);
+  if (now < old) {
+    // If now is earlier than old, there may have been a race between threads.
+    // 0x0fffffff ~3.1 days, the code will not take that long to execute
+    // so it must have been a wrap around.
+    if (old > 0xf0000000 && now < 0x0fffffff) {
+      num_wrap_timegettime++;
+    }
+  }
+  ticks = now + (num_wrap_timegettime << 32);
+  // TODO(deadbeef): Calculate with nanosecond precision. Otherwise, we're
+  // just wasting a multiply and divide when doing Time() on Windows.
+  ticks = ticks * kNumNanosecsPerMillisec;
+#else
+#error Unsupported platform.
+#endif
+  return ticks;
+}
+
+}  // namespace rtc
+#endif  // WEBRTC_EXCLUDE_SYSTEM_TIME
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system_time.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system_time.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system_time.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/system_time.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,22 @@
+/*
+ *  Copyright 2021 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_SYSTEM_TIME_H_
+#define RTC_BASE_SYSTEM_TIME_H_
+
+namespace rtc {
+
+// Returns the actual system time, even if a clock is set for testing.
+// Useful for timeouts while using a test clock, or for logging.
+int64_t SystemTimeNanos();
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_SYSTEM_TIME_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/thread_annotations.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/thread_annotations.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/thread_annotations.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/thread_annotations.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,95 @@
+//
+// Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
+//
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file in the root of the source
+// tree. An additional intellectual property rights grant can be found
+// in the file PATENTS.  All contributing project authors may
+// be found in the AUTHORS file in the root of the source tree.
+//
+// Borrowed from
+// https://code.google.com/p/gperftools/source/browse/src/base/thread_annotations.h
+// but adapted for clang attributes instead of the gcc.
+//
+// This header file contains the macro definitions for thread safety
+// annotations that allow the developers to document the locking policies
+// of their multi-threaded code. The annotations can also help program
+// analysis tools to identify potential thread safety issues.
+
+#ifndef RTC_BASE_THREAD_ANNOTATIONS_H_
+#define RTC_BASE_THREAD_ANNOTATIONS_H_
+
+#if defined(__clang__) && (!defined(SWIG))
+#define RTC_THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x))
+#else
+#define RTC_THREAD_ANNOTATION_ATTRIBUTE__(x)  // no-op
+#endif
+
+// Document if a shared variable/field needs to be protected by a lock.
+// GUARDED_BY allows the user to specify a particular lock that should be
+// held when accessing the annotated variable.
+#define RTC_GUARDED_BY(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(guarded_by(x))
+
+// Document if the memory location pointed to by a pointer should be guarded
+// by a lock when dereferencing the pointer. Note that a pointer variable to a
+// shared memory location could itself be a shared variable. For example, if a
+// shared global pointer q, which is guarded by mu1, points to a shared memory
+// location that is guarded by mu2, q should be annotated as follows:
+//     int *q GUARDED_BY(mu1) PT_GUARDED_BY(mu2);
+#define RTC_PT_GUARDED_BY(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(pt_guarded_by(x))
+
+// Document the acquisition order between locks that can be held
+// simultaneously by a thread. For any two locks that need to be annotated
+// to establish an acquisition order, only one of them needs the annotation.
+// (i.e. You don't have to annotate both locks with both ACQUIRED_AFTER
+// and ACQUIRED_BEFORE.)
+#define RTC_ACQUIRED_AFTER(x) \
+  RTC_THREAD_ANNOTATION_ATTRIBUTE__(acquired_after(x))
+#define RTC_ACQUIRED_BEFORE(x) \
+  RTC_THREAD_ANNOTATION_ATTRIBUTE__(acquired_before(x))
+
+// The following three annotations document the lock requirements for
+// functions/methods.
+
+// Document if a function expects certain locks to be held before it is called
+#define RTC_EXCLUSIVE_LOCKS_REQUIRED(...) \
+  RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_locks_required(__VA_ARGS__))
+#define RTC_SHARED_LOCKS_REQUIRED(...) \
+  RTC_THREAD_ANNOTATION_ATTRIBUTE__(shared_locks_required(__VA_ARGS__))
+
+// Document the locks acquired in the body of the function. These locks
+// cannot be held when calling this function (as google3's Mutex locks are
+// non-reentrant).
+#define RTC_LOCKS_EXCLUDED(...) \
+  RTC_THREAD_ANNOTATION_ATTRIBUTE__(locks_excluded(__VA_ARGS__))
+
+// Document the lock the annotated function returns without acquiring it.
+#define RTC_LOCK_RETURNED(x) RTC_THREAD_ANNOTATION_ATTRIBUTE__(lock_returned(x))
+
+// Document if a class/type is a lockable type (such as the Mutex class).
+#define RTC_LOCKABLE RTC_THREAD_ANNOTATION_ATTRIBUTE__(lockable)
+
+// Document if a class is a scoped lockable type (such as the MutexLock class).
+#define RTC_SCOPED_LOCKABLE RTC_THREAD_ANNOTATION_ATTRIBUTE__(scoped_lockable)
+
+// The following annotations specify lock and unlock primitives.
+#define RTC_EXCLUSIVE_LOCK_FUNCTION(...) \
+  RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_lock_function(__VA_ARGS__))
+
+#define RTC_SHARED_LOCK_FUNCTION(...) \
+  RTC_THREAD_ANNOTATION_ATTRIBUTE__(shared_lock_function(__VA_ARGS__))
+
+#define RTC_EXCLUSIVE_TRYLOCK_FUNCTION(...) \
+  RTC_THREAD_ANNOTATION_ATTRIBUTE__(exclusive_trylock_function(__VA_ARGS__))
+
+#define RTC_SHARED_TRYLOCK_FUNCTION(...) \
+  RTC_THREAD_ANNOTATION_ATTRIBUTE__(shared_trylock_function(__VA_ARGS__))
+
+#define RTC_UNLOCK_FUNCTION(...) \
+  RTC_THREAD_ANNOTATION_ATTRIBUTE__(unlock_function(__VA_ARGS__))
+
+// An escape hatch for thread safety analysis to ignore the annotated function.
+#define RTC_NO_THREAD_SAFETY_ANALYSIS \
+  RTC_THREAD_ANNOTATION_ATTRIBUTE__(no_thread_safety_analysis)
+
+#endif  // RTC_BASE_THREAD_ANNOTATIONS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/time_utils.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/time_utils.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/time_utils.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/time_utils.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,270 @@
+/*
+ *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <stdint.h>
+
+#if defined(WEBRTC_POSIX)
+#include <sys/time.h>
+#endif
+
+#if defined(WEBRTC_WIN)
+#include <sys/timeb.h>
+#endif
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_conversions.h"
+#include "rtc_base/system_time.h"
+#include "rtc_base/time_utils.h"
+
+namespace rtc {
+
+ClockInterface* g_clock = nullptr;
+
+ClockInterface* SetClockForTesting(ClockInterface* clock) {
+  ClockInterface* prev = g_clock;
+  g_clock = clock;
+  return prev;
+}
+
+ClockInterface* GetClockForTesting() {
+  return g_clock;
+}
+
+#if defined(WINUWP)
+
+namespace {
+
+class TimeHelper final {
+ public:
+  TimeHelper(const TimeHelper&) = delete;
+
+  // Resets the clock based upon an NTP server. This routine must be called
+  // prior to the main system start-up to ensure all clocks are based upon
+  // an NTP server time if NTP synchronization is required. No critical
+  // section is used thus this method must be called prior to any clock
+  // routines being used.
+  static void SyncWithNtp(int64_t ntp_server_time_ms) {
+    auto& singleton = Singleton();
+    TIME_ZONE_INFORMATION time_zone;
+    GetTimeZoneInformation(&time_zone);
+    int64_t time_zone_bias_ns =
+        rtc::dchecked_cast<int64_t>(time_zone.Bias) * 60 * 1000 * 1000 * 1000;
+    singleton.app_start_time_ns_ =
+        (ntp_server_time_ms - kNTPTimeToUnixTimeEpochOffset) * 1000000 -
+        time_zone_bias_ns;
+    singleton.UpdateReferenceTime();
+  }
+
+  // Returns the number of nanoseconds that have passed since unix epoch.
+  static int64_t TicksNs() {
+    auto& singleton = Singleton();
+    int64_t result = 0;
+    LARGE_INTEGER qpcnt;
+    QueryPerformanceCounter(&qpcnt);
+    result = rtc::dchecked_cast<int64_t>(
+        (rtc::dchecked_cast<uint64_t>(qpcnt.QuadPart) * 100000 /
+         rtc::dchecked_cast<uint64_t>(singleton.os_ticks_per_second_)) *
+        10000);
+    result = singleton.app_start_time_ns_ + result -
+             singleton.time_since_os_start_ns_;
+    return result;
+  }
+
+ private:
+  TimeHelper() {
+    TIME_ZONE_INFORMATION time_zone;
+    GetTimeZoneInformation(&time_zone);
+    int64_t time_zone_bias_ns =
+        rtc::dchecked_cast<int64_t>(time_zone.Bias) * 60 * 1000 * 1000 * 1000;
+    FILETIME ft;
+    // This will give us system file in UTC format.
+    GetSystemTimeAsFileTime(&ft);
+    LARGE_INTEGER li;
+    li.HighPart = ft.dwHighDateTime;
+    li.LowPart = ft.dwLowDateTime;
+
+    app_start_time_ns_ = (li.QuadPart - kFileTimeToUnixTimeEpochOffset) * 100 -
+                         time_zone_bias_ns;
+
+    UpdateReferenceTime();
+  }
+
+  static TimeHelper& Singleton() {
+    static TimeHelper singleton;
+    return singleton;
+  }
+
+  void UpdateReferenceTime() {
+    LARGE_INTEGER qpfreq;
+    QueryPerformanceFrequency(&qpfreq);
+    os_ticks_per_second_ = rtc::dchecked_cast<int64_t>(qpfreq.QuadPart);
+
+    LARGE_INTEGER qpcnt;
+    QueryPerformanceCounter(&qpcnt);
+    time_since_os_start_ns_ = rtc::dchecked_cast<int64_t>(
+        (rtc::dchecked_cast<uint64_t>(qpcnt.QuadPart) * 100000 /
+         rtc::dchecked_cast<uint64_t>(os_ticks_per_second_)) *
+        10000);
+  }
+
+ private:
+  static constexpr uint64_t kFileTimeToUnixTimeEpochOffset =
+      116444736000000000ULL;
+  static constexpr uint64_t kNTPTimeToUnixTimeEpochOffset = 2208988800000L;
+
+  // The number of nanoseconds since unix system epoch
+  int64_t app_start_time_ns_;
+  // The number of nanoseconds since the OS started
+  int64_t time_since_os_start_ns_;
+  // The OS calculated ticks per second
+  int64_t os_ticks_per_second_;
+};
+
+}  // namespace
+
+void SyncWithNtp(int64_t time_from_ntp_server_ms) {
+  TimeHelper::SyncWithNtp(time_from_ntp_server_ms);
+}
+
+int64_t WinUwpSystemTimeNanos() {
+  return TimeHelper::TicksNs();
+}
+
+#endif  // defined(WINUWP)
+
+int64_t SystemTimeMillis() {
+  return static_cast<int64_t>(SystemTimeNanos() / kNumNanosecsPerMillisec);
+}
+
+int64_t TimeNanos() {
+  if (g_clock) {
+    return g_clock->TimeNanos();
+  }
+  return SystemTimeNanos();
+}
+
+uint32_t Time32() {
+  return static_cast<uint32_t>(TimeNanos() / kNumNanosecsPerMillisec);
+}
+
+int64_t TimeMillis() {
+  return TimeNanos() / kNumNanosecsPerMillisec;
+}
+
+int64_t TimeMicros() {
+  return TimeNanos() / kNumNanosecsPerMicrosec;
+}
+
+int64_t TimeAfter(int64_t elapsed) {
+  RTC_DCHECK_GE(elapsed, 0);
+  return TimeMillis() + elapsed;
+}
+
+int32_t TimeDiff32(uint32_t later, uint32_t earlier) {
+  return later - earlier;
+}
+
+int64_t TimeDiff(int64_t later, int64_t earlier) {
+  return later - earlier;
+}
+
+TimestampWrapAroundHandler::TimestampWrapAroundHandler()
+    : last_ts_(0), num_wrap_(-1) {}
+
+int64_t TimestampWrapAroundHandler::Unwrap(uint32_t ts) {
+  if (num_wrap_ == -1) {
+    last_ts_ = ts;
+    num_wrap_ = 0;
+    return ts;
+  }
+
+  if (ts < last_ts_) {
+    if (last_ts_ >= 0xf0000000 && ts < 0x0fffffff)
+      ++num_wrap_;
+  } else if ((ts - last_ts_) > 0xf0000000) {
+    // Backwards wrap. Unwrap with last wrap count and don't update last_ts_.
+    return ts + (num_wrap_ - 1) * (int64_t{1} << 32);
+  }
+
+  last_ts_ = ts;
+  return ts + (num_wrap_ << 32);
+}
+
+int64_t TmToSeconds(const tm& tm) {
+  static short int mdays[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+  static short int cumul_mdays[12] = {0,   31,  59,  90,  120, 151,
+                                      181, 212, 243, 273, 304, 334};
+  int year = tm.tm_year + 1900;
+  int month = tm.tm_mon;
+  int day = tm.tm_mday - 1;  // Make 0-based like the rest.
+  int hour = tm.tm_hour;
+  int min = tm.tm_min;
+  int sec = tm.tm_sec;
+
+  bool expiry_in_leap_year =
+      (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0));
+
+  if (year < 1970)
+    return -1;
+  if (month < 0 || month > 11)
+    return -1;
+  if (day < 0 || day >= mdays[month] + (expiry_in_leap_year && month == 2 - 1))
+    return -1;
+  if (hour < 0 || hour > 23)
+    return -1;
+  if (min < 0 || min > 59)
+    return -1;
+  if (sec < 0 || sec > 59)
+    return -1;
+
+  day += cumul_mdays[month];
+
+  // Add number of leap days between 1970 and the expiration year, inclusive.
+  day += ((year / 4 - 1970 / 4) - (year / 100 - 1970 / 100) +
+          (year / 400 - 1970 / 400));
+
+  // We will have added one day too much above if expiration is during a leap
+  // year, and expiration is in January or February.
+  if (expiry_in_leap_year && month <= 2 - 1)  // |month| is zero based.
+    day -= 1;
+
+  // Combine all variables into seconds from 1970-01-01 00:00 (except |month|
+  // which was accumulated into |day| above).
+  return (((static_cast<int64_t>(year - 1970) * 365 + day) * 24 + hour) * 60 +
+          min) *
+             60 +
+         sec;
+}
+
+int64_t TimeUTCMicros() {
+  if (g_clock) {
+    return g_clock->TimeNanos() / kNumNanosecsPerMicrosec;
+  }
+#if defined(WEBRTC_POSIX)
+  struct timeval time;
+  gettimeofday(&time, nullptr);
+  // Convert from second (1.0) and microsecond (1e-6).
+  return (static_cast<int64_t>(time.tv_sec) * rtc::kNumMicrosecsPerSec +
+          time.tv_usec);
+
+#elif defined(WEBRTC_WIN)
+  struct _timeb time;
+  _ftime(&time);
+  // Convert from second (1.0) and milliseconds (1e-3).
+  return (static_cast<int64_t>(time.time) * rtc::kNumMicrosecsPerSec +
+          static_cast<int64_t>(time.millitm) * rtc::kNumMicrosecsPerMillisec);
+#endif
+}
+
+int64_t TimeUTCMillis() {
+  return TimeUTCMicros() / kNumMicrosecsPerMillisec;
+}
+
+}  // namespace rtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/time_utils.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/time_utils.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/time_utils.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/time_utils.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,145 @@
+/*
+ *  Copyright 2005 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_TIME_UTILS_H_
+#define RTC_BASE_TIME_UTILS_H_
+
+#include <stdint.h>
+#include <time.h>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/system/rtc_export.h"
+#include "rtc_base/system_time.h"
+
+namespace rtc {
+
+static const int64_t kNumMillisecsPerSec = INT64_C(1000);
+static const int64_t kNumMicrosecsPerSec = INT64_C(1000000);
+static const int64_t kNumNanosecsPerSec = INT64_C(1000000000);
+
+static const int64_t kNumMicrosecsPerMillisec =
+    kNumMicrosecsPerSec / kNumMillisecsPerSec;
+static const int64_t kNumNanosecsPerMillisec =
+    kNumNanosecsPerSec / kNumMillisecsPerSec;
+static const int64_t kNumNanosecsPerMicrosec =
+    kNumNanosecsPerSec / kNumMicrosecsPerSec;
+
+// TODO(honghaiz): Define a type for the time value specifically.
+
+class ClockInterface {
+ public:
+  virtual ~ClockInterface() {}
+  virtual int64_t TimeNanos() const = 0;
+};
+
+// Sets the global source of time. This is useful mainly for unit tests.
+//
+// Returns the previously set ClockInterface, or nullptr if none is set.
+//
+// Does not transfer ownership of the clock. SetClockForTesting(nullptr)
+// should be called before the ClockInterface is deleted.
+//
+// This method is not thread-safe; it should only be used when no other thread
+// is running (for example, at the start/end of a unit test, or start/end of
+// main()).
+//
+// TODO(deadbeef): Instead of having functions that access this global
+// ClockInterface, we may want to pass the ClockInterface into everything
+// that uses it, eliminating the need for a global variable and this function.
+RTC_EXPORT ClockInterface* SetClockForTesting(ClockInterface* clock);
+
+// Returns previously set clock, or nullptr if no custom clock is being used.
+RTC_EXPORT ClockInterface* GetClockForTesting();
+
+#if defined(WINUWP)
+// Synchronizes the current clock based upon an NTP server's epoch in
+// milliseconds.
+void SyncWithNtp(int64_t time_from_ntp_server_ms);
+
+// Returns the current time in nanoseconds. The clock is synchonized with the
+// system wall clock time upon instatiation. It may also be synchronized using
+// the SyncWithNtp() function above. Please note that the clock will most likely
+// drift away from the system wall clock time as time goes by.
+int64_t WinUwpSystemTimeNanos();
+#endif  // defined(WINUWP)
+
+// Returns the actual system time, even if a clock is set for testing.
+// Useful for timeouts while using a test clock, or for logging.
+int64_t SystemTimeMillis();
+
+// Returns the current time in milliseconds in 32 bits.
+uint32_t Time32();
+
+// Returns the current time in milliseconds in 64 bits.
+RTC_EXPORT int64_t TimeMillis();
+// Deprecated. Do not use this in any new code.
+inline int64_t Time() {
+  return TimeMillis();
+}
+
+// Returns the current time in microseconds.
+RTC_EXPORT int64_t TimeMicros();
+
+// Returns the current time in nanoseconds.
+RTC_EXPORT int64_t TimeNanos();
+
+// Returns a future timestamp, 'elapsed' milliseconds from now.
+int64_t TimeAfter(int64_t elapsed);
+
+// Number of milliseconds that would elapse between 'earlier' and 'later'
+// timestamps.  The value is negative if 'later' occurs before 'earlier'.
+int64_t TimeDiff(int64_t later, int64_t earlier);
+int32_t TimeDiff32(uint32_t later, uint32_t earlier);
+
+// The number of milliseconds that have elapsed since 'earlier'.
+inline int64_t TimeSince(int64_t earlier) {
+  return TimeMillis() - earlier;
+}
+
+// The number of milliseconds that will elapse between now and 'later'.
+inline int64_t TimeUntil(int64_t later) {
+  return later - TimeMillis();
+}
+
+class TimestampWrapAroundHandler {
+ public:
+  TimestampWrapAroundHandler();
+
+  int64_t Unwrap(uint32_t ts);
+
+ private:
+  uint32_t last_ts_;
+  int64_t num_wrap_;
+};
+
+// Convert from tm, which is relative to 1900-01-01 00:00 to number of
+// seconds from 1970-01-01 00:00 ("epoch"). Don't return time_t since that
+// is still 32 bits on many systems.
+int64_t TmToSeconds(const tm& tm);
+
+// Return the number of microseconds since January 1, 1970, UTC.
+// Useful mainly when producing logs to be correlated with other
+// devices, and when the devices in question all have properly
+// synchronized clocks.
+//
+// Note that this function obeys the system's idea about what the time
+// is. It is not guaranteed to be monotonic; it will jump in case the
+// system time is changed, e.g., by some other process calling
+// settimeofday. Always use rtc::TimeMicros(), not this function, for
+// measuring time intervals and timeouts.
+int64_t TimeUTCMicros();
+
+// Return the number of milliseconds since January 1, 1970, UTC.
+// See above.
+int64_t TimeUTCMillis();
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_TIME_UTILS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/type_traits.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/type_traits.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/type_traits.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/type_traits.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,140 @@
+/*
+ *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef RTC_BASE_TYPE_TRAITS_H_
+#define RTC_BASE_TYPE_TRAITS_H_
+
+#include <cstddef>
+#include <type_traits>
+
+namespace rtc {
+
+// Determines if the given class has zero-argument .data() and .size() methods
+// whose return values are convertible to T* and size_t, respectively.
+template <typename DS, typename T>
+class HasDataAndSize {
+ private:
+  template <
+      typename C,
+      typename std::enable_if<
+          std::is_convertible<decltype(std::declval<C>().data()), T*>::value &&
+          std::is_convertible<decltype(std::declval<C>().size()),
+                              std::size_t>::value>::type* = nullptr>
+  static int Test(int);
+
+  template <typename>
+  static char Test(...);
+
+ public:
+  static constexpr bool value = std::is_same<decltype(Test<DS>(0)), int>::value;
+};
+
+namespace test_has_data_and_size {
+
+template <typename DR, typename SR>
+struct Test1 {
+  DR data();
+  SR size();
+};
+static_assert(HasDataAndSize<Test1<int*, int>, int>::value, "");
+static_assert(HasDataAndSize<Test1<int*, int>, const int>::value, "");
+static_assert(HasDataAndSize<Test1<const int*, int>, const int>::value, "");
+static_assert(!HasDataAndSize<Test1<const int*, int>, int>::value,
+              "implicit cast of const int* to int*");
+static_assert(!HasDataAndSize<Test1<char*, size_t>, int>::value,
+              "implicit cast of char* to int*");
+
+struct Test2 {
+  int* data;
+  size_t size;
+};
+static_assert(!HasDataAndSize<Test2, int>::value,
+              ".data and .size aren't functions");
+
+struct Test3 {
+  int* data();
+};
+static_assert(!HasDataAndSize<Test3, int>::value, ".size() is missing");
+
+class Test4 {
+  int* data();
+  size_t size();
+};
+static_assert(!HasDataAndSize<Test4, int>::value,
+              ".data() and .size() are private");
+
+}  // namespace test_has_data_and_size
+
+namespace type_traits_impl {
+
+// Determines if the given type is an enum that converts implicitly to
+// an integral type.
+template <typename T>
+struct IsIntEnum {
+ private:
+  // This overload is used if the type is an enum, and unary plus
+  // compiles and turns it into an integral type.
+  template <typename X,
+            typename std::enable_if<
+                std::is_enum<X>::value &&
+                std::is_integral<decltype(+std::declval<X>())>::value>::type* =
+                nullptr>
+  static int Test(int);
+
+  // Otherwise, this overload is used.
+  template <typename>
+  static char Test(...);
+
+ public:
+  static constexpr bool value =
+      std::is_same<decltype(Test<typename std::remove_reference<T>::type>(0)),
+                   int>::value;
+};
+
+}  // namespace type_traits_impl
+
+// Determines if the given type is integral, or an enum that
+// converts implicitly to an integral type.
+template <typename T>
+struct IsIntlike {
+ private:
+  using X = typename std::remove_reference<T>::type;
+
+ public:
+  static constexpr bool value =
+      std::is_integral<X>::value || type_traits_impl::IsIntEnum<X>::value;
+};
+
+namespace test_enum_intlike {
+
+enum E1 { e1 };
+enum { e2 };
+enum class E3 { e3 };
+struct S {};
+
+static_assert(type_traits_impl::IsIntEnum<E1>::value, "");
+static_assert(type_traits_impl::IsIntEnum<decltype(e2)>::value, "");
+static_assert(!type_traits_impl::IsIntEnum<E3>::value, "");
+static_assert(!type_traits_impl::IsIntEnum<int>::value, "");
+static_assert(!type_traits_impl::IsIntEnum<float>::value, "");
+static_assert(!type_traits_impl::IsIntEnum<S>::value, "");
+
+static_assert(IsIntlike<E1>::value, "");
+static_assert(IsIntlike<decltype(e2)>::value, "");
+static_assert(!IsIntlike<E3>::value, "");
+static_assert(IsIntlike<int>::value, "");
+static_assert(!IsIntlike<float>::value, "");
+static_assert(!IsIntlike<S>::value, "");
+
+}  // namespace test_enum_intlike
+
+}  // namespace rtc
+
+#endif  // RTC_BASE_TYPE_TRAITS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/units/unit_base.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/units/unit_base.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/units/unit_base.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/rtc_base/units/unit_base.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,306 @@
+/*
+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+#ifndef RTC_BASE_UNITS_UNIT_BASE_H_
+#define RTC_BASE_UNITS_UNIT_BASE_H_
+
+#include <stdint.h>
+
+#include <algorithm>
+#include <cmath>
+#include <limits>
+#include <type_traits>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_conversions.h"
+
+namespace webrtc {
+namespace rtc_units_impl {
+
+// UnitBase is a base class for implementing custom value types with a specific
+// unit. It provides type safety and commonly useful operations. The underlying
+// storage is always an int64_t, it's up to the unit implementation to choose
+// what scale it represents.
+//
+// It's used like:
+// class MyUnit: public UnitBase<MyUnit> {...};
+//
+// Unit_T is the subclass representing the specific unit.
+template <class Unit_T>
+class UnitBase {
+ public:
+  UnitBase() = delete;
+  static constexpr Unit_T Zero() { return Unit_T(0); }
+  static constexpr Unit_T PlusInfinity() { return Unit_T(PlusInfinityVal()); }
+  static constexpr Unit_T MinusInfinity() { return Unit_T(MinusInfinityVal()); }
+
+  constexpr bool IsZero() const { return value_ == 0; }
+  constexpr bool IsFinite() const { return !IsInfinite(); }
+  constexpr bool IsInfinite() const {
+    return value_ == PlusInfinityVal() || value_ == MinusInfinityVal();
+  }
+  constexpr bool IsPlusInfinity() const { return value_ == PlusInfinityVal(); }
+  constexpr bool IsMinusInfinity() const {
+    return value_ == MinusInfinityVal();
+  }
+
+  constexpr bool operator==(const Unit_T& other) const {
+    return value_ == other.value_;
+  }
+  constexpr bool operator!=(const Unit_T& other) const {
+    return value_ != other.value_;
+  }
+  constexpr bool operator<=(const Unit_T& other) const {
+    return value_ <= other.value_;
+  }
+  constexpr bool operator>=(const Unit_T& other) const {
+    return value_ >= other.value_;
+  }
+  constexpr bool operator>(const Unit_T& other) const {
+    return value_ > other.value_;
+  }
+  constexpr bool operator<(const Unit_T& other) const {
+    return value_ < other.value_;
+  }
+  constexpr Unit_T RoundTo(const Unit_T& resolution) const {
+    RTC_DCHECK(IsFinite());
+    RTC_DCHECK(resolution.IsFinite());
+    RTC_DCHECK_GT(resolution.value_, 0);
+    return Unit_T((value_ + resolution.value_ / 2) / resolution.value_) *
+           resolution.value_;
+  }
+  constexpr Unit_T RoundUpTo(const Unit_T& resolution) const {
+    RTC_DCHECK(IsFinite());
+    RTC_DCHECK(resolution.IsFinite());
+    RTC_DCHECK_GT(resolution.value_, 0);
+    return Unit_T((value_ + resolution.value_ - 1) / resolution.value_) *
+           resolution.value_;
+  }
+  constexpr Unit_T RoundDownTo(const Unit_T& resolution) const {
+    RTC_DCHECK(IsFinite());
+    RTC_DCHECK(resolution.IsFinite());
+    RTC_DCHECK_GT(resolution.value_, 0);
+    return Unit_T(value_ / resolution.value_) * resolution.value_;
+  }
+
+ protected:
+  template <
+      typename T,
+      typename std::enable_if<std::is_integral<T>::value>::type* = nullptr>
+  static constexpr Unit_T FromValue(T value) {
+    if (Unit_T::one_sided)
+      RTC_DCHECK_GE(value, 0);
+    RTC_DCHECK_GT(value, MinusInfinityVal());
+    RTC_DCHECK_LT(value, PlusInfinityVal());
+    return Unit_T(rtc::dchecked_cast<int64_t>(value));
+  }
+  template <typename T,
+            typename std::enable_if<std::is_floating_point<T>::value>::type* =
+                nullptr>
+  static constexpr Unit_T FromValue(T value) {
+    if (value == std::numeric_limits<T>::infinity()) {
+      return PlusInfinity();
+    } else if (value == -std::numeric_limits<T>::infinity()) {
+      return MinusInfinity();
+    } else {
+      RTC_DCHECK(!std::isnan(value));
+      return FromValue(rtc::dchecked_cast<int64_t>(value));
+    }
+  }
+
+  template <
+      typename T,
+      typename std::enable_if<std::is_integral<T>::value>::type* = nullptr>
+  static constexpr Unit_T FromFraction(int64_t denominator, T value) {
+    if (Unit_T::one_sided)
+      RTC_DCHECK_GE(value, 0);
+    RTC_DCHECK_GT(value, MinusInfinityVal() / denominator);
+    RTC_DCHECK_LT(value, PlusInfinityVal() / denominator);
+    return Unit_T(rtc::dchecked_cast<int64_t>(value * denominator));
+  }
+  template <typename T,
+            typename std::enable_if<std::is_floating_point<T>::value>::type* =
+                nullptr>
+  static constexpr Unit_T FromFraction(int64_t denominator, T value) {
+    return FromValue(value * denominator);
+  }
+
+  template <typename T = int64_t>
+  constexpr typename std::enable_if<std::is_integral<T>::value, T>::type
+  ToValue() const {
+    RTC_DCHECK(IsFinite());
+    return rtc::dchecked_cast<T>(value_);
+  }
+  template <typename T>
+  constexpr typename std::enable_if<std::is_floating_point<T>::value, T>::type
+  ToValue() const {
+    return IsPlusInfinity()
+               ? std::numeric_limits<T>::infinity()
+               : IsMinusInfinity() ? -std::numeric_limits<T>::infinity()
+                                   : value_;
+  }
+  template <typename T>
+  constexpr T ToValueOr(T fallback_value) const {
+    return IsFinite() ? value_ : fallback_value;
+  }
+
+  template <int64_t Denominator, typename T = int64_t>
+  constexpr typename std::enable_if<std::is_integral<T>::value, T>::type
+  ToFraction() const {
+    RTC_DCHECK(IsFinite());
+    if (Unit_T::one_sided) {
+      return rtc::dchecked_cast<T>(
+          DivRoundPositiveToNearest(value_, Denominator));
+    } else {
+      return rtc::dchecked_cast<T>(DivRoundToNearest(value_, Denominator));
+    }
+  }
+  template <int64_t Denominator, typename T>
+  constexpr typename std::enable_if<std::is_floating_point<T>::value, T>::type
+  ToFraction() const {
+    return ToValue<T>() * (1 / static_cast<T>(Denominator));
+  }
+
+  template <int64_t Denominator>
+  constexpr int64_t ToFractionOr(int64_t fallback_value) const {
+    return IsFinite() ? Unit_T::one_sided
+                            ? DivRoundPositiveToNearest(value_, Denominator)
+                            : DivRoundToNearest(value_, Denominator)
+                      : fallback_value;
+  }
+
+  template <int64_t Factor, typename T = int64_t>
+  constexpr typename std::enable_if<std::is_integral<T>::value, T>::type
+  ToMultiple() const {
+    RTC_DCHECK_GE(ToValue(), std::numeric_limits<T>::min() / Factor);
+    RTC_DCHECK_LE(ToValue(), std::numeric_limits<T>::max() / Factor);
+    return rtc::dchecked_cast<T>(ToValue() * Factor);
+  }
+  template <int64_t Factor, typename T>
+  constexpr typename std::enable_if<std::is_floating_point<T>::value, T>::type
+  ToMultiple() const {
+    return ToValue<T>() * Factor;
+  }
+
+  explicit constexpr UnitBase(int64_t value) : value_(value) {}
+
+ private:
+  template <class RelativeUnit_T>
+  friend class RelativeUnit;
+
+  static inline constexpr int64_t PlusInfinityVal() {
+    return std::numeric_limits<int64_t>::max();
+  }
+  static inline constexpr int64_t MinusInfinityVal() {
+    return std::numeric_limits<int64_t>::min();
+  }
+
+  constexpr Unit_T& AsSubClassRef() { return static_cast<Unit_T&>(*this); }
+  constexpr const Unit_T& AsSubClassRef() const {
+    return static_cast<const Unit_T&>(*this);
+  }
+  // Assumes that n >= 0 and d > 0.
+  static constexpr int64_t DivRoundPositiveToNearest(int64_t n, int64_t d) {
+    return (n + d / 2) / d;
+  }
+  // Assumes that d > 0.
+  static constexpr int64_t DivRoundToNearest(int64_t n, int64_t d) {
+    return (n + (n >= 0 ? d / 2 : -d / 2)) / d;
+  }
+
+  int64_t value_;
+};
+
+// Extends UnitBase to provide operations for relative units, that is, units
+// that have a meaningful relation between values such that a += b is a
+// sensible thing to do. For a,b <- same unit.
+template <class Unit_T>
+class RelativeUnit : public UnitBase<Unit_T> {
+ public:
+  constexpr Unit_T Clamped(Unit_T min_value, Unit_T max_value) const {
+    return std::max(min_value,
+                    std::min(UnitBase<Unit_T>::AsSubClassRef(), max_value));
+  }
+  constexpr void Clamp(Unit_T min_value, Unit_T max_value) {
+    *this = Clamped(min_value, max_value);
+  }
+  constexpr Unit_T operator+(const Unit_T other) const {
+    if (this->IsPlusInfinity() || other.IsPlusInfinity()) {
+      RTC_DCHECK(!this->IsMinusInfinity());
+      RTC_DCHECK(!other.IsMinusInfinity());
+      return this->PlusInfinity();
+    } else if (this->IsMinusInfinity() || other.IsMinusInfinity()) {
+      RTC_DCHECK(!this->IsPlusInfinity());
+      RTC_DCHECK(!other.IsPlusInfinity());
+      return this->MinusInfinity();
+    }
+    return UnitBase<Unit_T>::FromValue(this->ToValue() + other.ToValue());
+  }
+  constexpr Unit_T operator-(const Unit_T other) const {
+    if (this->IsPlusInfinity() || other.IsMinusInfinity()) {
+      RTC_DCHECK(!this->IsMinusInfinity());
+      RTC_DCHECK(!other.IsPlusInfinity());
+      return this->PlusInfinity();
+    } else if (this->IsMinusInfinity() || other.IsPlusInfinity()) {
+      RTC_DCHECK(!this->IsPlusInfinity());
+      RTC_DCHECK(!other.IsMinusInfinity());
+      return this->MinusInfinity();
+    }
+    return UnitBase<Unit_T>::FromValue(this->ToValue() - other.ToValue());
+  }
+  constexpr Unit_T& operator+=(const Unit_T other) {
+    *this = *this + other;
+    return this->AsSubClassRef();
+  }
+  constexpr Unit_T& operator-=(const Unit_T other) {
+    *this = *this - other;
+    return this->AsSubClassRef();
+  }
+  constexpr double operator/(const Unit_T other) const {
+    return UnitBase<Unit_T>::template ToValue<double>() /
+           other.template ToValue<double>();
+  }
+  template <typename T>
+  constexpr typename std::enable_if<std::is_arithmetic<T>::value, Unit_T>::type
+  operator/(const T& scalar) const {
+    return UnitBase<Unit_T>::FromValue(
+        std::round(UnitBase<Unit_T>::template ToValue<int64_t>() / scalar));
+  }
+  constexpr Unit_T operator*(double scalar) const {
+    return UnitBase<Unit_T>::FromValue(std::round(this->ToValue() * scalar));
+  }
+  constexpr Unit_T operator*(int64_t scalar) const {
+    return UnitBase<Unit_T>::FromValue(this->ToValue() * scalar);
+  }
+  constexpr Unit_T operator*(int32_t scalar) const {
+    return UnitBase<Unit_T>::FromValue(this->ToValue() * scalar);
+  }
+
+ protected:
+  using UnitBase<Unit_T>::UnitBase;
+};
+
+template <class Unit_T>
+inline constexpr Unit_T operator*(double scalar, RelativeUnit<Unit_T> other) {
+  return other * scalar;
+}
+template <class Unit_T>
+inline constexpr Unit_T operator*(int64_t scalar, RelativeUnit<Unit_T> other) {
+  return other * scalar;
+}
+template <class Unit_T>
+inline constexpr Unit_T operator*(int32_t scalar, RelativeUnit<Unit_T> other) {
+  return other * scalar;
+}
+
+}  // namespace rtc_units_impl
+
+}  // namespace webrtc
+
+#endif  // RTC_BASE_UNITS_UNIT_BASE_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/cpu_features_wrapper.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/cpu_features_wrapper.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/cpu_features_wrapper.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/cpu_features_wrapper.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_
+#define SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_
+
+#include <stdint.h>
+
+namespace webrtc {
+
+// List of features in x86.
+typedef enum { kSSE2, kSSE3, kAVX2 } CPUFeature;
+
+// List of features in ARM.
+enum {
+  kCPUFeatureARMv7 = (1 << 0),
+  kCPUFeatureVFPv3 = (1 << 1),
+  kCPUFeatureNEON = (1 << 2),
+  kCPUFeatureLDREXSTREX = (1 << 3)
+};
+
+// Returns true if the CPU supports the feature.
+int GetCPUInfo(CPUFeature feature);
+
+// No CPU feature is available => straight C path.
+int GetCPUInfoNoASM(CPUFeature feature);
+
+// Return the features in an ARM device.
+// It detects the features in the hardware platform, and returns supported
+// values in the above enum definition as a bitmask.
+uint64_t GetCPUFeaturesARM(void);
+
+}  // namespace webrtc
+
+#endif  // SYSTEM_WRAPPERS_INCLUDE_CPU_FEATURES_WRAPPER_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/field_trial.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/field_trial.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/field_trial.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/field_trial.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,102 @@
+//
+// Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+//
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file in the root of the source
+// tree. An additional intellectual property rights grant can be found
+// in the file PATENTS.  All contributing project authors may
+// be found in the AUTHORS file in the root of the source tree.
+//
+
+#ifndef SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_H_
+#define SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_H_
+
+#include <string>
+
+// Field trials allow webrtc clients (such as Chrome) to turn on feature code
+// in binaries out in the field and gather information with that.
+//
+// By default WebRTC provides an implementation of field trials that can be
+// found in system_wrappers/source/field_trial.cc. If clients want to provide
+// a custom version, they will have to:
+//
+// 1. Compile WebRTC defining the preprocessor macro
+//    WEBRTC_EXCLUDE_FIELD_TRIAL_DEFAULT (if GN is used this can be achieved
+//    by setting the GN arg rtc_exclude_field_trial_default to true).
+// 2. Provide an implementation of:
+//    std::string webrtc::field_trial::FindFullName(const std::string& trial).
+//
+// They are designed to wire up directly to chrome field trials and to speed up
+// developers by reducing the need to wire APIs to control whether a feature is
+// on/off. E.g. to experiment with a new method that could lead to a different
+// trade-off between CPU/bandwidth:
+//
+// 1 - Develop the feature with default behaviour off:
+//
+//   if (FieldTrial::FindFullName("WebRTCExperimentMethod2") == "Enabled")
+//     method2();
+//   else
+//     method1();
+//
+// 2 - Once the changes are rolled to chrome, the new code path can be
+//     controlled as normal chrome field trials.
+//
+// 3 - Evaluate the new feature and clean the code paths.
+//
+// Notes:
+//   - NOT every feature is a candidate to be controlled by this mechanism as
+//     it may require negotiation between involved parties (e.g. SDP).
+//
+// TODO(andresp): since chrome --force-fieldtrials does not marks the trial
+//     as active it does not get propagated to the renderer process. For now one
+//     needs to push a config with start_active:true or run a local finch
+//     server.
+//
+// TODO(andresp): find out how to get bots to run tests with trials enabled.
+
+namespace webrtc {
+namespace field_trial {
+
+// Returns the group name chosen for the named trial, or the empty string
+// if the trial does not exists.
+//
+// Note: To keep things tidy append all the trial names with WebRTC.
+std::string FindFullName(const std::string& name);
+
+// Convenience method, returns true iff FindFullName(name) return a string that
+// starts with "Enabled".
+// TODO(tommi): Make sure all implementations support this.
+inline bool IsEnabled(const char* name) {
+  return FindFullName(name).find("Enabled") == 0;
+}
+
+// Convenience method, returns true iff FindFullName(name) return a string that
+// starts with "Disabled".
+inline bool IsDisabled(const char* name) {
+  return FindFullName(name).find("Disabled") == 0;
+}
+
+// Optionally initialize field trial from a string.
+// This method can be called at most once before any other call into webrtc.
+// E.g. before the peer connection factory is constructed.
+// Note: trials_string must never be destroyed.
+void InitFieldTrialsFromString(const char* trials_string);
+
+const char* GetFieldTrialString();
+
+#ifndef WEBRTC_EXCLUDE_FIELD_TRIAL_DEFAULT
+// Validates the given field trial string.
+bool FieldTrialsStringIsValid(const char* trials_string);
+
+// Merges two field trial strings.
+//
+// If a key (trial) exists twice with conflicting values (groups), the value
+// in 'second' takes precedence.
+// Shall only be called with valid FieldTrial strings.
+std::string MergeFieldTrialsStrings(const char* first, const char* second);
+#endif  // WEBRTC_EXCLUDE_FIELD_TRIAL_DEFAULT
+
+}  // namespace field_trial
+}  // namespace webrtc
+
+#endif  // SYSTEM_WRAPPERS_INCLUDE_FIELD_TRIAL_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/metrics.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/metrics.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/metrics.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/include/metrics.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,438 @@
+//
+// Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+//
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file in the root of the source
+// tree. An additional intellectual property rights grant can be found
+// in the file PATENTS.  All contributing project authors may
+// be found in the AUTHORS file in the root of the source tree.
+//
+
+#ifndef SYSTEM_WRAPPERS_INCLUDE_METRICS_H_
+#define SYSTEM_WRAPPERS_INCLUDE_METRICS_H_
+
+#include <stddef.h>
+
+#include <map>
+#include <memory>
+#include <string>
+
+#include "rtc_base/atomic_ops.h"
+#include "rtc_base/checks.h"
+
+#if defined(RTC_DISABLE_METRICS)
+#define RTC_METRICS_ENABLED 0
+#else
+#define RTC_METRICS_ENABLED 1
+#endif
+
+namespace webrtc {
+namespace metrics_impl {
+template <typename... Ts>
+void NoOp(const Ts&...) {}
+}
+}
+
+#if RTC_METRICS_ENABLED
+#define EXPECT_METRIC_EQ(val1, val2) EXPECT_EQ(val1, val2)
+#define EXPECT_METRIC_EQ_WAIT(val1, val2, timeout) \
+  EXPECT_EQ_WAIT(val1, val2, timeout)
+#define EXPECT_METRIC_GT(val1, val2) EXPECT_GT(val1, val2)
+#define EXPECT_METRIC_LE(val1, val2) EXPECT_LE(val1, val2)
+#define EXPECT_METRIC_TRUE(conditon) EXPECT_TRUE(conditon)
+#define EXPECT_METRIC_FALSE(conditon) EXPECT_FALSE(conditon)
+#define EXPECT_METRIC_THAT(value, matcher) EXPECT_THAT(value, matcher)
+#else
+#define EXPECT_METRIC_EQ(val1, val2) webrtc::metrics_impl::NoOp(val1, val2)
+#define EXPECT_METRIC_EQ_WAIT(val1, val2, timeout) webrtc::metrics_impl::NoOp(val1, val2, timeout)
+#define EXPECT_METRIC_GT(val1, val2) webrtc::metrics_impl::NoOp(val1, val2)
+#define EXPECT_METRIC_LE(val1, val2) webrtc::metrics_impl::NoOp(val1, val2)
+#define EXPECT_METRIC_TRUE(condition) webrtc::metrics_impl::NoOp(condition || true)
+#define EXPECT_METRIC_FALSE(condition) webrtc::metrics_impl::NoOp(condition && false)
+#define EXPECT_METRIC_THAT(value, matcher) webrtc::metrics_impl::NoOp(value, testing::_)
+#endif
+
+#if RTC_METRICS_ENABLED
+// Macros for allowing WebRTC clients (e.g. Chrome) to gather and aggregate
+// statistics.
+//
+// Histogram for counters.
+// RTC_HISTOGRAM_COUNTS(name, sample, min, max, bucket_count);
+//
+// Histogram for enumerators.
+// The boundary should be above the max enumerator sample.
+// RTC_HISTOGRAM_ENUMERATION(name, sample, boundary);
+//
+//
+// The macros use the methods HistogramFactoryGetCounts,
+// HistogramFactoryGetEnumeration and HistogramAdd.
+//
+// By default WebRTC provides implementations of the aforementioned methods
+// that can be found in system_wrappers/source/metrics.cc. If clients want to
+// provide a custom version, they will have to:
+//
+// 1. Compile WebRTC defining the preprocessor macro
+//    WEBRTC_EXCLUDE_METRICS_DEFAULT (if GN is used this can be achieved
+//    by setting the GN arg rtc_exclude_metrics_default to true).
+// 2. Provide implementations of:
+//    Histogram* webrtc::metrics::HistogramFactoryGetCounts(
+//        const std::string& name, int sample, int min, int max,
+//        int bucket_count);
+//    Histogram* webrtc::metrics::HistogramFactoryGetEnumeration(
+//        const std::string& name, int sample, int boundary);
+//    void webrtc::metrics::HistogramAdd(
+//        Histogram* histogram_pointer, const std::string& name, int sample);
+//
+// Example usage:
+//
+// RTC_HISTOGRAM_COUNTS("WebRTC.Video.NacksSent", nacks_sent, 1, 100000, 100);
+//
+// enum Types {
+//   kTypeX,
+//   kTypeY,
+//   kBoundary,
+// };
+//
+// RTC_HISTOGRAM_ENUMERATION("WebRTC.Types", kTypeX, kBoundary);
+//
+// NOTE: It is recommended to do the Chromium review for modifications to
+// histograms.xml before new metrics are committed to WebRTC.
+
+// Macros for adding samples to a named histogram.
+
+// Histogram for counters (exponentially spaced buckets).
+#define RTC_HISTOGRAM_COUNTS_100(name, sample) \
+  RTC_HISTOGRAM_COUNTS(name, sample, 1, 100, 50)
+
+#define RTC_HISTOGRAM_COUNTS_200(name, sample) \
+  RTC_HISTOGRAM_COUNTS(name, sample, 1, 200, 50)
+
+#define RTC_HISTOGRAM_COUNTS_500(name, sample) \
+  RTC_HISTOGRAM_COUNTS(name, sample, 1, 500, 50)
+
+#define RTC_HISTOGRAM_COUNTS_1000(name, sample) \
+  RTC_HISTOGRAM_COUNTS(name, sample, 1, 1000, 50)
+
+#define RTC_HISTOGRAM_COUNTS_10000(name, sample) \
+  RTC_HISTOGRAM_COUNTS(name, sample, 1, 10000, 50)
+
+#define RTC_HISTOGRAM_COUNTS_100000(name, sample) \
+  RTC_HISTOGRAM_COUNTS(name, sample, 1, 100000, 50)
+
+#define RTC_HISTOGRAM_COUNTS(name, sample, min, max, bucket_count)       \
+  RTC_HISTOGRAM_COMMON_BLOCK(name, sample,                               \
+                             webrtc::metrics::HistogramFactoryGetCounts( \
+                                 name, min, max, bucket_count))
+
+#define RTC_HISTOGRAM_COUNTS_LINEAR(name, sample, min, max, bucket_count)      \
+  RTC_HISTOGRAM_COMMON_BLOCK(name, sample,                                     \
+                             webrtc::metrics::HistogramFactoryGetCountsLinear( \
+                                 name, min, max, bucket_count))
+
+// Slow metrics: pointer to metric is acquired at each call and is not cached.
+//
+#define RTC_HISTOGRAM_COUNTS_SPARSE_100(name, sample) \
+  RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, 1, 100, 50)
+
+#define RTC_HISTOGRAM_COUNTS_SPARSE_200(name, sample) \
+  RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, 1, 200, 50)
+
+#define RTC_HISTOGRAM_COUNTS_SPARSE_500(name, sample) \
+  RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, 1, 500, 50)
+
+#define RTC_HISTOGRAM_COUNTS_SPARSE_1000(name, sample) \
+  RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, 1, 1000, 50)
+
+#define RTC_HISTOGRAM_COUNTS_SPARSE_10000(name, sample) \
+  RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, 1, 10000, 50)
+
+#define RTC_HISTOGRAM_COUNTS_SPARSE_100000(name, sample) \
+  RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, 1, 100000, 50)
+
+#define RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, min, max, bucket_count)     \
+  RTC_HISTOGRAM_COMMON_BLOCK_SLOW(name, sample,                               \
+                                  webrtc::metrics::HistogramFactoryGetCounts( \
+                                      name, min, max, bucket_count))
+
+// Histogram for percentage (evenly spaced buckets).
+#define RTC_HISTOGRAM_PERCENTAGE_SPARSE(name, sample) \
+  RTC_HISTOGRAM_ENUMERATION_SPARSE(name, sample, 101)
+
+// Histogram for booleans.
+#define RTC_HISTOGRAM_BOOLEAN_SPARSE(name, sample) \
+  RTC_HISTOGRAM_ENUMERATION_SPARSE(name, sample, 2)
+
+// Histogram for enumerators (evenly spaced buckets).
+// |boundary| should be above the max enumerator sample.
+//
+// TODO(qingsi): Refactor the default implementation given by RtcHistogram,
+// which is already sparse, and remove the boundary argument from the macro.
+#define RTC_HISTOGRAM_ENUMERATION_SPARSE(name, sample, boundary) \
+  RTC_HISTOGRAM_COMMON_BLOCK_SLOW(                               \
+      name, sample,                                              \
+      webrtc::metrics::SparseHistogramFactoryGetEnumeration(name, boundary))
+
+// Histogram for percentage (evenly spaced buckets).
+#define RTC_HISTOGRAM_PERCENTAGE(name, sample) \
+  RTC_HISTOGRAM_ENUMERATION(name, sample, 101)
+
+// Histogram for booleans.
+#define RTC_HISTOGRAM_BOOLEAN(name, sample) \
+  RTC_HISTOGRAM_ENUMERATION(name, sample, 2)
+
+// Histogram for enumerators (evenly spaced buckets).
+// |boundary| should be above the max enumerator sample.
+#define RTC_HISTOGRAM_ENUMERATION(name, sample, boundary) \
+  RTC_HISTOGRAM_COMMON_BLOCK_SLOW(                        \
+      name, sample,                                       \
+      webrtc::metrics::HistogramFactoryGetEnumeration(name, boundary))
+
+// The name of the histogram should not vary.
+// TODO(asapersson): Consider changing string to const char*.
+#define RTC_HISTOGRAM_COMMON_BLOCK(constant_name, sample,                  \
+                                   factory_get_invocation)                 \
+  do {                                                                     \
+    static webrtc::metrics::Histogram* atomic_histogram_pointer = nullptr; \
+    webrtc::metrics::Histogram* histogram_pointer =                        \
+        rtc::AtomicOps::AcquireLoadPtr(&atomic_histogram_pointer);         \
+    if (!histogram_pointer) {                                              \
+      histogram_pointer = factory_get_invocation;                          \
+      webrtc::metrics::Histogram* prev_pointer =                           \
+          rtc::AtomicOps::CompareAndSwapPtr(                               \
+              &atomic_histogram_pointer,                                   \
+              static_cast<webrtc::metrics::Histogram*>(nullptr),           \
+              histogram_pointer);                                          \
+      RTC_DCHECK(prev_pointer == nullptr ||                                \
+                 prev_pointer == histogram_pointer);                       \
+    }                                                                      \
+    if (histogram_pointer) {                                               \
+      webrtc::metrics::HistogramAdd(histogram_pointer, sample);            \
+    }                                                                      \
+  } while (0)
+
+// The histogram is constructed/found for each call.
+// May be used for histograms with infrequent updates.`
+#define RTC_HISTOGRAM_COMMON_BLOCK_SLOW(name, sample, factory_get_invocation) \
+  do {                                                                        \
+    webrtc::metrics::Histogram* histogram_pointer = factory_get_invocation;   \
+    if (histogram_pointer) {                                                  \
+      webrtc::metrics::HistogramAdd(histogram_pointer, sample);               \
+    }                                                                         \
+  } while (0)
+
+// Helper macros.
+// Macros for calling a histogram with varying name (e.g. when using a metric
+// in different modes such as real-time vs screenshare). Fast, because pointer
+// is cached. |index| should be different for different names. Allowed |index|
+// values are 0, 1, and 2.
+#define RTC_HISTOGRAMS_COUNTS_100(index, name, sample) \
+  RTC_HISTOGRAMS_COMMON(index, name, sample,           \
+                        RTC_HISTOGRAM_COUNTS(name, sample, 1, 100, 50))
+
+#define RTC_HISTOGRAMS_COUNTS_200(index, name, sample) \
+  RTC_HISTOGRAMS_COMMON(index, name, sample,           \
+                        RTC_HISTOGRAM_COUNTS(name, sample, 1, 200, 50))
+
+#define RTC_HISTOGRAMS_COUNTS_500(index, name, sample) \
+  RTC_HISTOGRAMS_COMMON(index, name, sample,           \
+                        RTC_HISTOGRAM_COUNTS(name, sample, 1, 500, 50))
+
+#define RTC_HISTOGRAMS_COUNTS_1000(index, name, sample) \
+  RTC_HISTOGRAMS_COMMON(index, name, sample,            \
+                        RTC_HISTOGRAM_COUNTS(name, sample, 1, 1000, 50))
+
+#define RTC_HISTOGRAMS_COUNTS_10000(index, name, sample) \
+  RTC_HISTOGRAMS_COMMON(index, name, sample,             \
+                        RTC_HISTOGRAM_COUNTS(name, sample, 1, 10000, 50))
+
+#define RTC_HISTOGRAMS_COUNTS_100000(index, name, sample) \
+  RTC_HISTOGRAMS_COMMON(index, name, sample,              \
+                        RTC_HISTOGRAM_COUNTS(name, sample, 1, 100000, 50))
+
+#define RTC_HISTOGRAMS_ENUMERATION(index, name, sample, boundary) \
+  RTC_HISTOGRAMS_COMMON(index, name, sample,                      \
+                        RTC_HISTOGRAM_ENUMERATION(name, sample, boundary))
+
+#define RTC_HISTOGRAMS_PERCENTAGE(index, name, sample) \
+  RTC_HISTOGRAMS_COMMON(index, name, sample,           \
+                        RTC_HISTOGRAM_PERCENTAGE(name, sample))
+
+#define RTC_HISTOGRAMS_COMMON(index, name, sample, macro_invocation) \
+  do {                                                               \
+    switch (index) {                                                 \
+      case 0:                                                        \
+        macro_invocation;                                            \
+        break;                                                       \
+      case 1:                                                        \
+        macro_invocation;                                            \
+        break;                                                       \
+      case 2:                                                        \
+        macro_invocation;                                            \
+        break;                                                       \
+      default:                                                       \
+        RTC_NOTREACHED();                                            \
+    }                                                                \
+  } while (0)
+
+#else
+
+////////////////////////////////////////////////////////////////////////////////
+// This section defines no-op alternatives to the metrics macros when
+// RTC_METRICS_ENABLED is defined.
+
+#define RTC_HISTOGRAM_COUNTS_100(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_COUNTS_200(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_COUNTS_500(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_COUNTS_1000(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_COUNTS_10000(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_COUNTS_100000(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_COUNTS(name, sample, min, max, bucket_count) \
+  webrtc::metrics_impl::NoOp(name, sample, min, max, bucket_count)
+
+#define RTC_HISTOGRAM_COUNTS_LINEAR(name, sample, min, max, bucket_count) \
+  webrtc::metrics_impl::NoOp(name, sample, min, max, bucket_count)
+
+#define RTC_HISTOGRAM_COUNTS_SPARSE_100(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_COUNTS_SPARSE_200(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_COUNTS_SPARSE_500(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_COUNTS_SPARSE_1000(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_COUNTS_SPARSE_10000(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_COUNTS_SPARSE_100000(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_COUNTS_SPARSE(name, sample, min, max, bucket_count) \
+  webrtc::metrics_impl::NoOp(name, sample, min, max, bucket_count)
+
+#define RTC_HISTOGRAM_PERCENTAGE_SPARSE(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_BOOLEAN_SPARSE(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_ENUMERATION_SPARSE(name, sample, boundary) \
+  webrtc::metrics_impl::NoOp(name, sample, boundary)
+
+#define RTC_HISTOGRAM_PERCENTAGE(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_BOOLEAN(name, sample) webrtc::metrics_impl::NoOp(name, sample)
+
+#define RTC_HISTOGRAM_ENUMERATION(name, sample, boundary) \
+  webrtc::metrics_impl::NoOp(name, sample, boundary)
+
+#define RTC_HISTOGRAM_COMMON_BLOCK(constant_name, sample,  \
+                                   factory_get_invocation) \
+  webrtc::metrics_impl::NoOp(constant_name, sample, factory_get_invocation)
+
+#define RTC_HISTOGRAM_COMMON_BLOCK_SLOW(name, sample, factory_get_invocation) \
+  webrtc::metrics_impl::NoOp(name, sample, factory_get_invocation)
+
+#define RTC_HISTOGRAMS_COUNTS_100(index, name, sample) webrtc::metrics_impl::NoOp(index, name, sample)
+
+#define RTC_HISTOGRAMS_COUNTS_200(index, name, sample) webrtc::metrics_impl::NoOp(index, name, sample)
+
+#define RTC_HISTOGRAMS_COUNTS_500(index, name, sample) webrtc::metrics_impl::NoOp(index, name, sample)
+
+#define RTC_HISTOGRAMS_COUNTS_1000(index, name, sample) \
+  webrtc::metrics_impl::NoOp(index, name, sample)
+
+#define RTC_HISTOGRAMS_COUNTS_10000(index, name, sample) \
+  webrtc::metrics_impl::NoOp(index, name, sample)
+
+#define RTC_HISTOGRAMS_COUNTS_100000(index, name, sample) \
+  webrtc::metrics_impl::NoOp(index, name, sample)
+
+#define RTC_HISTOGRAMS_ENUMERATION(index, name, sample, boundary) \
+  webrtc::metrics_impl::NoOp(index, name, sample, boundary)
+
+#define RTC_HISTOGRAMS_PERCENTAGE(index, name, sample) webrtc::metrics_impl::NoOp(index, name, sample)
+
+#define RTC_HISTOGRAMS_COMMON(index, name, sample, macro_invocation) \
+  webrtc::metrics_impl::NoOp(index, name, sample, macro_invocation)
+
+#endif  // RTC_METRICS_ENABLED
+
+namespace webrtc {
+namespace metrics {
+
+// Time that should have elapsed for stats that are gathered once per call.
+enum { kMinRunTimeInSeconds = 10 };
+
+class Histogram;
+
+// Functions for getting pointer to histogram (constructs or finds the named
+// histogram).
+
+// Get histogram for counters.
+Histogram* HistogramFactoryGetCounts(const std::string& name,
+                                     int min,
+                                     int max,
+                                     int bucket_count);
+
+// Get histogram for counters with linear bucket spacing.
+Histogram* HistogramFactoryGetCountsLinear(const std::string& name,
+                                           int min,
+                                           int max,
+                                           int bucket_count);
+
+// Get histogram for enumerators.
+// |boundary| should be above the max enumerator sample.
+Histogram* HistogramFactoryGetEnumeration(const std::string& name,
+                                          int boundary);
+
+// Get sparse histogram for enumerators.
+// |boundary| should be above the max enumerator sample.
+Histogram* SparseHistogramFactoryGetEnumeration(const std::string& name,
+                                                int boundary);
+
+// Function for adding a |sample| to a histogram.
+void HistogramAdd(Histogram* histogram_pointer, int sample);
+
+struct SampleInfo {
+  SampleInfo(const std::string& name, int min, int max, size_t bucket_count);
+  ~SampleInfo();
+
+  const std::string name;
+  const int min;
+  const int max;
+  const size_t bucket_count;
+  std::map<int, int> samples;  // <value, # of events>
+};
+
+// Enables collection of samples.
+// This method should be called before any other call into webrtc.
+void Enable();
+
+// Gets histograms and clears all samples.
+void GetAndReset(
+    std::map<std::string, std::unique_ptr<SampleInfo>>* histograms);
+
+// Functions below are mainly for testing.
+
+// Clears all samples.
+void Reset();
+
+// Returns the number of times the |sample| has been added to the histogram.
+int NumEvents(const std::string& name, int sample);
+
+// Returns the total number of added samples to the histogram.
+int NumSamples(const std::string& name);
+
+// Returns the minimum sample value (or -1 if the histogram has no samples).
+int MinSample(const std::string& name);
+
+// Returns a map with keys the samples with at least one event and values the
+// number of events for that sample.
+std::map<int, int> Samples(const std::string& name);
+
+}  // namespace metrics
+}  // namespace webrtc
+
+#endif  // SYSTEM_WRAPPERS_INCLUDE_METRICS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features2.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features2.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features2.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features2.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,115 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+// Parts of this file derived from Chromium's base/cpu.cc.
+
+#include "rtc_base/system/arch.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+#include "system_wrappers/include/field_trial.h"
+
+#if defined(WEBRTC_ARCH_X86_FAMILY) && defined(_MSC_VER)
+#include <intrin.h>
+#endif
+
+namespace webrtc {
+
+// No CPU feature is available => straight C path.
+int GetCPUInfoNoASM(CPUFeature feature) {
+  (void)feature;
+  return 0;
+}
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+
+#if defined(WEBRTC_ENABLE_AVX2)
+// xgetbv returns the value of an Intel Extended Control Register (XCR).
+// Currently only XCR0 is defined by Intel so |xcr| should always be zero.
+static uint64_t xgetbv(uint32_t xcr) {
+#if defined(_MSC_VER)
+  return _xgetbv(xcr);
+#else
+  uint32_t eax, edx;
+
+  __asm__ volatile("xgetbv" : "=a"(eax), "=d"(edx) : "c"(xcr));
+  return (static_cast<uint64_t>(edx) << 32) | eax;
+#endif  // _MSC_VER
+}
+#endif  // WEBRTC_ENABLE_AVX2
+
+#ifndef _MSC_VER
+// Intrinsic for "cpuid".
+#if defined(__pic__) && defined(__i386__)
+static inline void __cpuid(int cpu_info[4], int info_type) {
+  __asm__ volatile(
+      "mov %%ebx, %%edi\n"
+      "cpuid\n"
+      "xchg %%edi, %%ebx\n"
+      : "=a"(cpu_info[0]), "=D"(cpu_info[1]), "=c"(cpu_info[2]),
+        "=d"(cpu_info[3])
+      : "a"(info_type));
+}
+#else
+static inline void __cpuid(int cpu_info[4], int info_type) {
+  __asm__ volatile("cpuid\n"
+                   : "=a"(cpu_info[0]), "=b"(cpu_info[1]), "=c"(cpu_info[2]),
+                     "=d"(cpu_info[3])
+                   : "a"(info_type), "c"(0));
+}
+#endif
+#endif  // _MSC_VER
+#endif  // WEBRTC_ARCH_X86_FAMILY
+
+#if defined(WEBRTC_ARCH_X86_FAMILY)
+// Actual feature detection for x86.
+int GetCPUInfo(CPUFeature feature) {
+  int cpu_info[4];
+  __cpuid(cpu_info, 1);
+  if (feature == kSSE2) {
+    return 0 != (cpu_info[3] & 0x04000000);
+  }
+  if (feature == kSSE3) {
+    return 0 != (cpu_info[2] & 0x00000001);
+  }
+#if defined(WEBRTC_ENABLE_AVX2)
+  if (feature == kAVX2 &&
+      !webrtc::field_trial::IsEnabled("WebRTC-Avx2SupportKillSwitch")) {
+    int cpu_info7[4];
+    __cpuid(cpu_info7, 0);
+    int num_ids = cpu_info7[0];
+    if (num_ids < 7) {
+      return 0;
+    }
+    // Interpret CPU feature information.
+    __cpuid(cpu_info7, 7);
+
+    // AVX instructions can be used when
+    //     a) AVX are supported by the CPU,
+    //     b) XSAVE is supported by the CPU,
+    //     c) XSAVE is enabled by the kernel.
+    // See http://software.intel.com/en-us/blogs/2011/04/14/is-avx-enabled
+    // AVX2 support needs (avx_support && (cpu_info7[1] & 0x00000020) != 0;).
+    return (cpu_info[2] & 0x10000000) != 0 &&
+           (cpu_info[2] & 0x04000000) != 0 /* XSAVE */ &&
+           (cpu_info[2] & 0x08000000) != 0 /* OSXSAVE */ &&
+           (xgetbv(0) & 0x00000006) == 6 /* XSAVE enabled by kernel */ &&
+           (cpu_info7[1] & 0x00000020) != 0;
+  }
+#endif  // WEBRTC_ENABLE_AVX2
+  return 0;
+}
+#else
+// Default to straight C for other platforms.
+int GetCPUInfo(CPUFeature feature) {
+  (void)feature;
+  return 0;
+}
+#endif
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features_android.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features_android.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features_android.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features_android.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,19 @@
+/*
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <cpu-features.h>
+
+namespace webrtc {
+
+uint64_t GetCPUFeaturesARM(void) {
+  return android_getCpuFeatures();
+}
+
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features_linux.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features_linux.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features_linux.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/cpu_features_linux.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,96 @@
+/*
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <features.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __GLIBC_PREREQ
+#define WEBRTC_GLIBC_PREREQ(a, b) __GLIBC_PREREQ(a, b)
+#else
+#define WEBRTC_GLIBC_PREREQ(a, b) 0
+#endif
+
+#if WEBRTC_GLIBC_PREREQ(2, 16)
+#include <sys/auxv.h>
+#else
+#include <errno.h>
+#include <fcntl.h>
+#include <link.h>
+#include <unistd.h>
+#endif
+
+#include "rtc_base/system/arch.h"
+#include "system_wrappers/include/cpu_features_wrapper.h"
+
+#if defined(WEBRTC_ARCH_ARM_FAMILY)
+#include <asm/hwcap.h>
+
+namespace webrtc {
+
+uint64_t GetCPUFeaturesARM(void) {
+  uint64_t result = 0;
+  int architecture = 0;
+  uint64_t hwcap = 0;
+  const char* platform = NULL;
+#if WEBRTC_GLIBC_PREREQ(2, 16)
+  hwcap = getauxval(AT_HWCAP);
+  platform = (const char*)getauxval(AT_PLATFORM);
+#else
+  ElfW(auxv_t) auxv;
+  int fd = open("/proc/self/auxv", O_RDONLY);
+  if (fd >= 0) {
+    while (hwcap == 0 || platform == NULL) {
+      if (read(fd, &auxv, sizeof(auxv)) < (ssize_t)sizeof(auxv)) {
+        if (errno == EINTR)
+          continue;
+        break;
+      }
+      switch (auxv.a_type) {
+        case AT_HWCAP:
+          hwcap = auxv.a_un.a_val;
+          break;
+        case AT_PLATFORM:
+          platform = (const char*)auxv.a_un.a_val;
+          break;
+      }
+    }
+    close(fd);
+  }
+#endif  // WEBRTC_GLIBC_PREREQ(2, 16)
+#if defined(__aarch64__)
+  architecture = 8;
+  if ((hwcap & HWCAP_FP) != 0)
+    result |= kCPUFeatureVFPv3;
+  if ((hwcap & HWCAP_ASIMD) != 0)
+    result |= kCPUFeatureNEON;
+#else
+  if (platform != NULL) {
+    /* expect a string in the form "v6l" or "v7l", etc.
+     */
+    if (platform[0] == 'v' && '0' <= platform[1] && platform[1] <= '9' &&
+        (platform[2] == 'l' || platform[2] == 'b')) {
+      architecture = platform[1] - '0';
+    }
+  }
+  if ((hwcap & HWCAP_VFPv3) != 0)
+    result |= kCPUFeatureVFPv3;
+  if ((hwcap & HWCAP_NEON) != 0)
+    result |= kCPUFeatureNEON;
+#endif
+  if (architecture >= 7)
+    result |= kCPUFeatureARMv7;
+  if (architecture >= 6)
+    result |= kCPUFeatureLDREXSTREX;
+  return result;
+}
+
+}  // namespace webrtc
+#endif  // WEBRTC_ARCH_ARM_FAMILY
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/field_trial.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/field_trial.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/field_trial.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/field_trial.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,155 @@
+// Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+//
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file in the root of the source
+// tree. An additional intellectual property rights grant can be found
+// in the file PATENTS.  All contributing project authors may
+// be found in the AUTHORS file in the root of the source tree.
+//
+
+#include "system_wrappers/include/field_trial.h"
+
+#include <stddef.h>
+
+#include <map>
+#include <string>
+
+#include "absl/strings/string_view.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/string_encode.h"
+
+// Simple field trial implementation, which allows client to
+// specify desired flags in InitFieldTrialsFromString.
+namespace webrtc {
+namespace field_trial {
+
+static const char* trials_init_string = NULL;
+
+#ifndef WEBRTC_EXCLUDE_FIELD_TRIAL_DEFAULT
+namespace {
+constexpr char kPersistentStringSeparator = '/';
+// Validates the given field trial string.
+//  E.g.:
+//    "WebRTC-experimentFoo/Enabled/WebRTC-experimentBar/Enabled100kbps/"
+//    Assigns the process to group "Enabled" on WebRTCExperimentFoo trial
+//    and to group "Enabled100kbps" on WebRTCExperimentBar.
+//
+//  E.g. invalid config:
+//    "WebRTC-experiment1/Enabled"  (note missing / separator at the end).
+bool FieldTrialsStringIsValidInternal(const absl::string_view trials) {
+  if (trials.empty())
+    return true;
+
+  size_t next_item = 0;
+  std::map<absl::string_view, absl::string_view> field_trials;
+  while (next_item < trials.length()) {
+    size_t name_end = trials.find(kPersistentStringSeparator, next_item);
+    if (name_end == trials.npos || next_item == name_end)
+      return false;
+    size_t group_name_end =
+        trials.find(kPersistentStringSeparator, name_end + 1);
+    if (group_name_end == trials.npos || name_end + 1 == group_name_end)
+      return false;
+    absl::string_view name = trials.substr(next_item, name_end - next_item);
+    absl::string_view group_name =
+        trials.substr(name_end + 1, group_name_end - name_end - 1);
+
+    next_item = group_name_end + 1;
+
+    // Fail if duplicate with different group name.
+    if (field_trials.find(name) != field_trials.end() &&
+        field_trials.find(name)->second != group_name) {
+      return false;
+    }
+
+    field_trials[name] = group_name;
+  }
+
+  return true;
+}
+}  // namespace
+
+bool FieldTrialsStringIsValid(const char* trials_string) {
+  return FieldTrialsStringIsValidInternal(trials_string);
+}
+
+void InsertOrReplaceFieldTrialStringsInMap(
+    std::map<std::string, std::string>* fieldtrial_map,
+    const absl::string_view trials_string) {
+  if (FieldTrialsStringIsValidInternal(trials_string)) {
+    std::vector<std::string> tokens;
+    rtc::split(std::string(trials_string), '/', &tokens);
+    // Skip last token which is empty due to trailing '/'.
+    for (size_t idx = 0; idx < tokens.size() - 1; idx += 2) {
+      (*fieldtrial_map)[tokens[idx]] = tokens[idx + 1];
+    }
+  } else {
+    RTC_DCHECK(false) << "Invalid field trials string:" << trials_string;
+  }
+}
+
+std::string MergeFieldTrialsStrings(const char* first, const char* second) {
+  std::map<std::string, std::string> fieldtrial_map;
+  InsertOrReplaceFieldTrialStringsInMap(&fieldtrial_map, first);
+  InsertOrReplaceFieldTrialStringsInMap(&fieldtrial_map, second);
+
+  // Merge into fieldtrial string.
+  std::string merged = "";
+  for (auto const& fieldtrial : fieldtrial_map) {
+    merged += fieldtrial.first + '/' + fieldtrial.second + '/';
+  }
+  return merged;
+}
+
+std::string FindFullName(const std::string& name) {
+  if (trials_init_string == NULL)
+    return std::string();
+
+  std::string trials_string(trials_init_string);
+  if (trials_string.empty())
+    return std::string();
+
+  size_t next_item = 0;
+  while (next_item < trials_string.length()) {
+    // Find next name/value pair in field trial configuration string.
+    size_t field_name_end =
+        trials_string.find(kPersistentStringSeparator, next_item);
+    if (field_name_end == trials_string.npos || field_name_end == next_item)
+      break;
+    size_t field_value_end =
+        trials_string.find(kPersistentStringSeparator, field_name_end + 1);
+    if (field_value_end == trials_string.npos ||
+        field_value_end == field_name_end + 1)
+      break;
+    std::string field_name(trials_string, next_item,
+                           field_name_end - next_item);
+    std::string field_value(trials_string, field_name_end + 1,
+                            field_value_end - field_name_end - 1);
+    next_item = field_value_end + 1;
+
+    if (name == field_name)
+      return field_value;
+  }
+  return std::string();
+}
+#endif  // WEBRTC_EXCLUDE_FIELD_TRIAL_DEFAULT
+
+// Optionally initialize field trial from a string.
+void InitFieldTrialsFromString(const char* trials_string) {
+  RTC_LOG(LS_INFO) << "Setting field trial string:" << trials_string;
+#ifndef WEBRTC_EXCLUDE_FIELD_TRIAL_DEFAULT
+  if (trials_string) {
+    RTC_DCHECK(FieldTrialsStringIsValidInternal(trials_string))
+        << "Invalid field trials string:" << trials_string;
+  };
+#endif  // WEBRTC_EXCLUDE_FIELD_TRIAL_DEFAULT
+  trials_init_string = trials_string;
+}
+
+const char* GetFieldTrialString() {
+  return trials_init_string;
+}
+
+}  // namespace field_trial
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/metrics.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/metrics.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/metrics.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/system_wrappers/source/metrics.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,328 @@
+// Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+//
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file in the root of the source
+// tree. An additional intellectual property rights grant can be found
+// in the file PATENTS.  All contributing project authors may
+// be found in the AUTHORS file in the root of the source tree.
+//
+
+#include "system_wrappers/include/metrics.h"
+
+#include <algorithm>
+
+#include "rtc_base/constructor_magic.h"
+#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
+
+// Default implementation of histogram methods for WebRTC clients that do not
+// want to provide their own implementation.
+
+namespace webrtc {
+namespace metrics {
+class Histogram;
+
+namespace {
+// Limit for the maximum number of sample values that can be stored.
+// TODO(asapersson): Consider using bucket count (and set up
+// linearly/exponentially spaced buckets) if samples are logged more frequently.
+const int kMaxSampleMapSize = 300;
+
+class RtcHistogram {
+ public:
+  RtcHistogram(const std::string& name, int min, int max, int bucket_count)
+      : min_(min), max_(max), info_(name, min, max, bucket_count) {
+    RTC_DCHECK_GT(bucket_count, 0);
+  }
+
+  void Add(int sample) {
+    sample = std::min(sample, max_);
+    sample = std::max(sample, min_ - 1);  // Underflow bucket.
+
+    MutexLock lock(&mutex_);
+    if (info_.samples.size() == kMaxSampleMapSize &&
+        info_.samples.find(sample) == info_.samples.end()) {
+      return;
+    }
+    ++info_.samples[sample];
+  }
+
+  // Returns a copy (or nullptr if there are no samples) and clears samples.
+  std::unique_ptr<SampleInfo> GetAndReset() {
+    MutexLock lock(&mutex_);
+    if (info_.samples.empty())
+      return nullptr;
+
+    SampleInfo* copy =
+        new SampleInfo(info_.name, info_.min, info_.max, info_.bucket_count);
+
+    std::swap(info_.samples, copy->samples);
+
+    return std::unique_ptr<SampleInfo>(copy);
+  }
+
+  const std::string& name() const { return info_.name; }
+
+  // Functions only for testing.
+  void Reset() {
+    MutexLock lock(&mutex_);
+    info_.samples.clear();
+  }
+
+  int NumEvents(int sample) const {
+    MutexLock lock(&mutex_);
+    const auto it = info_.samples.find(sample);
+    return (it == info_.samples.end()) ? 0 : it->second;
+  }
+
+  int NumSamples() const {
+    int num_samples = 0;
+    MutexLock lock(&mutex_);
+    for (const auto& sample : info_.samples) {
+      num_samples += sample.second;
+    }
+    return num_samples;
+  }
+
+  int MinSample() const {
+    MutexLock lock(&mutex_);
+    return (info_.samples.empty()) ? -1 : info_.samples.begin()->first;
+  }
+
+  std::map<int, int> Samples() const {
+    MutexLock lock(&mutex_);
+    return info_.samples;
+  }
+
+ private:
+  mutable Mutex mutex_;
+  const int min_;
+  const int max_;
+  SampleInfo info_ RTC_GUARDED_BY(mutex_);
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(RtcHistogram);
+};
+
+class RtcHistogramMap {
+ public:
+  RtcHistogramMap() {}
+  ~RtcHistogramMap() {}
+
+  Histogram* GetCountsHistogram(const std::string& name,
+                                int min,
+                                int max,
+                                int bucket_count) {
+    MutexLock lock(&mutex_);
+    const auto& it = map_.find(name);
+    if (it != map_.end())
+      return reinterpret_cast<Histogram*>(it->second.get());
+
+    RtcHistogram* hist = new RtcHistogram(name, min, max, bucket_count);
+    map_[name].reset(hist);
+    return reinterpret_cast<Histogram*>(hist);
+  }
+
+  Histogram* GetEnumerationHistogram(const std::string& name, int boundary) {
+    MutexLock lock(&mutex_);
+    const auto& it = map_.find(name);
+    if (it != map_.end())
+      return reinterpret_cast<Histogram*>(it->second.get());
+
+    RtcHistogram* hist = new RtcHistogram(name, 1, boundary, boundary + 1);
+    map_[name].reset(hist);
+    return reinterpret_cast<Histogram*>(hist);
+  }
+
+  void GetAndReset(
+      std::map<std::string, std::unique_ptr<SampleInfo>>* histograms) {
+    MutexLock lock(&mutex_);
+    for (const auto& kv : map_) {
+      std::unique_ptr<SampleInfo> info = kv.second->GetAndReset();
+      if (info)
+        histograms->insert(std::make_pair(kv.first, std::move(info)));
+    }
+  }
+
+  // Functions only for testing.
+  void Reset() {
+    MutexLock lock(&mutex_);
+    for (const auto& kv : map_)
+      kv.second->Reset();
+  }
+
+  int NumEvents(const std::string& name, int sample) const {
+    MutexLock lock(&mutex_);
+    const auto& it = map_.find(name);
+    return (it == map_.end()) ? 0 : it->second->NumEvents(sample);
+  }
+
+  int NumSamples(const std::string& name) const {
+    MutexLock lock(&mutex_);
+    const auto& it = map_.find(name);
+    return (it == map_.end()) ? 0 : it->second->NumSamples();
+  }
+
+  int MinSample(const std::string& name) const {
+    MutexLock lock(&mutex_);
+    const auto& it = map_.find(name);
+    return (it == map_.end()) ? -1 : it->second->MinSample();
+  }
+
+  std::map<int, int> Samples(const std::string& name) const {
+    MutexLock lock(&mutex_);
+    const auto& it = map_.find(name);
+    return (it == map_.end()) ? std::map<int, int>() : it->second->Samples();
+  }
+
+ private:
+  mutable Mutex mutex_;
+  std::map<std::string, std::unique_ptr<RtcHistogram>> map_
+      RTC_GUARDED_BY(mutex_);
+
+  RTC_DISALLOW_COPY_AND_ASSIGN(RtcHistogramMap);
+};
+
+// RtcHistogramMap is allocated upon call to Enable().
+// The histogram getter functions, which return pointer values to the histograms
+// in the map, are cached in WebRTC. Therefore, this memory is not freed by the
+// application (the memory will be reclaimed by the OS).
+static RtcHistogramMap* volatile g_rtc_histogram_map = nullptr;
+
+void CreateMap() {
+  RtcHistogramMap* map = rtc::AtomicOps::AcquireLoadPtr(&g_rtc_histogram_map);
+  if (map == nullptr) {
+    RtcHistogramMap* new_map = new RtcHistogramMap();
+    RtcHistogramMap* old_map = rtc::AtomicOps::CompareAndSwapPtr(
+        &g_rtc_histogram_map, static_cast<RtcHistogramMap*>(nullptr), new_map);
+    if (old_map != nullptr)
+      delete new_map;
+  }
+}
+
+// Set the first time we start using histograms. Used to make sure Enable() is
+// not called thereafter.
+#if RTC_DCHECK_IS_ON
+static volatile int g_rtc_histogram_called = 0;
+#endif
+
+// Gets the map (or nullptr).
+RtcHistogramMap* GetMap() {
+#if RTC_DCHECK_IS_ON
+  rtc::AtomicOps::ReleaseStore(&g_rtc_histogram_called, 1);
+#endif
+  return g_rtc_histogram_map;
+}
+}  // namespace
+
+#ifndef WEBRTC_EXCLUDE_METRICS_DEFAULT
+// Implementation of histogram methods in
+// webrtc/system_wrappers/interface/metrics.h.
+
+// Histogram with exponentially spaced buckets.
+// Creates (or finds) histogram.
+// The returned histogram pointer is cached (and used for adding samples in
+// subsequent calls).
+Histogram* HistogramFactoryGetCounts(const std::string& name,
+                                     int min,
+                                     int max,
+                                     int bucket_count) {
+  // TODO(asapersson): Alternative implementation will be needed if this
+  // histogram type should be truly exponential.
+  return HistogramFactoryGetCountsLinear(name, min, max, bucket_count);
+}
+
+// Histogram with linearly spaced buckets.
+// Creates (or finds) histogram.
+// The returned histogram pointer is cached (and used for adding samples in
+// subsequent calls).
+Histogram* HistogramFactoryGetCountsLinear(const std::string& name,
+                                           int min,
+                                           int max,
+                                           int bucket_count) {
+  RtcHistogramMap* map = GetMap();
+  if (!map)
+    return nullptr;
+
+  return map->GetCountsHistogram(name, min, max, bucket_count);
+}
+
+// Histogram with linearly spaced buckets.
+// Creates (or finds) histogram.
+// The returned histogram pointer is cached (and used for adding samples in
+// subsequent calls).
+Histogram* HistogramFactoryGetEnumeration(const std::string& name,
+                                          int boundary) {
+  RtcHistogramMap* map = GetMap();
+  if (!map)
+    return nullptr;
+
+  return map->GetEnumerationHistogram(name, boundary);
+}
+
+// Our default implementation reuses the non-sparse histogram.
+Histogram* SparseHistogramFactoryGetEnumeration(const std::string& name,
+                                                int boundary) {
+  return HistogramFactoryGetEnumeration(name, boundary);
+}
+
+// Fast path. Adds |sample| to cached |histogram_pointer|.
+void HistogramAdd(Histogram* histogram_pointer, int sample) {
+  RtcHistogram* ptr = reinterpret_cast<RtcHistogram*>(histogram_pointer);
+  ptr->Add(sample);
+}
+
+#endif  // WEBRTC_EXCLUDE_METRICS_DEFAULT
+
+SampleInfo::SampleInfo(const std::string& name,
+                       int min,
+                       int max,
+                       size_t bucket_count)
+    : name(name), min(min), max(max), bucket_count(bucket_count) {}
+
+SampleInfo::~SampleInfo() {}
+
+// Implementation of global functions in metrics.h.
+void Enable() {
+  RTC_DCHECK(g_rtc_histogram_map == nullptr);
+#if RTC_DCHECK_IS_ON
+  RTC_DCHECK_EQ(0, rtc::AtomicOps::AcquireLoad(&g_rtc_histogram_called));
+#endif
+  CreateMap();
+}
+
+void GetAndReset(
+    std::map<std::string, std::unique_ptr<SampleInfo>>* histograms) {
+  histograms->clear();
+  RtcHistogramMap* map = GetMap();
+  if (map)
+    map->GetAndReset(histograms);
+}
+
+void Reset() {
+  RtcHistogramMap* map = GetMap();
+  if (map)
+    map->Reset();
+}
+
+int NumEvents(const std::string& name, int sample) {
+  RtcHistogramMap* map = GetMap();
+  return map ? map->NumEvents(name, sample) : 0;
+}
+
+int NumSamples(const std::string& name) {
+  RtcHistogramMap* map = GetMap();
+  return map ? map->NumSamples(name) : 0;
+}
+
+int MinSample(const std::string& name) {
+  RtcHistogramMap* map = GetMap();
+  return map ? map->MinSample(name) : -1;
+}
+
+std::map<int, int> Samples(const std::string& name) {
+  RtcHistogramMap* map = GetMap();
+  return map ? map->Samples(name) : std::map<int, int>();
+}
+
+}  // namespace metrics
+}  // namespace webrtc
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/README.txt asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/README.txt
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/README.txt	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/README.txt	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,416 @@
+PFFFT: a pretty fast FFT.
+
+TL;DR
+--
+
+PFFFT does 1D Fast Fourier Transforms, of single precision real and
+complex vectors. It tries do it fast, it tries to be correct, and it
+tries to be small. Computations do take advantage of SSE1 instructions
+on x86 cpus, Altivec on powerpc cpus, and NEON on ARM cpus. The
+license is BSD-like.
+
+
+Why does it exist:
+--
+
+I was in search of a good performing FFT library , preferably very
+small and with a very liberal license.
+
+When one says "fft library", FFTW ("Fastest Fourier Transform in the
+West") is probably the first name that comes to mind -- I guess that
+99% of open-source projects that need a FFT do use FFTW, and are happy
+with it. However, it is quite a large library , which does everything
+fft related (2d transforms, 3d transforms, other transformations such
+as discrete cosine , or fast hartley). And it is licensed under the
+GNU GPL , which means that it cannot be used in non open-source
+products.
+
+An alternative to FFTW that is really small, is the venerable FFTPACK
+v4, which is available on NETLIB. A more recent version (v5) exists,
+but it is larger as it deals with multi-dimensional transforms. This
+is a library that is written in FORTRAN 77, a language that is now
+considered as a bit antiquated by many. FFTPACKv4 was written in 1985,
+by Dr Paul Swarztrauber of NCAR, more than 25 years ago ! And despite
+its age, benchmarks show it that it still a very good performing FFT
+library, see for example the 1d single precision benchmarks here:
+http://www.fftw.org/speed/opteron-2.2GHz-32bit/ . It is however not
+competitive with the fastest ones, such as FFTW, Intel MKL, AMD ACML,
+Apple vDSP. The reason for that is that those libraries do take
+advantage of the SSE SIMD instructions available on Intel CPUs,
+available since the days of the Pentium III. These instructions deal
+with small vectors of 4 floats at a time, instead of a single float
+for a traditionnal FPU, so when using these instructions one may expect
+a 4-fold performance improvement.
+
+The idea was to take this fortran fftpack v4 code, translate to C,
+modify it to deal with those SSE instructions, and check that the
+final performance is not completely ridiculous when compared to other
+SIMD FFT libraries. Translation to C was performed with f2c (
+http://www.netlib.org/f2c/ ). The resulting file was a bit edited in
+order to remove the thousands of gotos that were introduced by
+f2c. You will find the fftpack.h and fftpack.c sources in the
+repository, this a complete translation of
+http://www.netlib.org/fftpack/ , with the discrete cosine transform
+and the test program. There is no license information in the netlib
+repository, but it was confirmed to me by the fftpack v5 curators that
+the same terms do apply to fftpack v4:
+http://www.cisl.ucar.edu/css/software/fftpack5/ftpk.html . This is a
+"BSD-like" license, it is compatible with proprietary projects.
+
+Adapting fftpack to deal with the SIMD 4-element vectors instead of
+scalar single precision numbers was more complex than I originally
+thought, especially with the real transforms, and I ended up writing
+more code than I planned..
+
+
+The code:
+--
+
+Only two files, in good old C, pffft.c and pffft.h . The API is very
+very simple, just make sure that you read the comments in pffft.h.
+
+
+Comparison with other FFTs:
+--
+
+The idea was not to break speed records, but to get a decently fast
+fft that is at least 50% as fast as the fastest FFT -- especially on
+slowest computers . I'm more focused on getting the best performance
+on slow cpus (Atom, Intel Core 1, old Athlons, ARM Cortex-A9...), than
+on getting top performance on today fastest cpus.
+
+It can be used in a real-time context as the fft functions do not
+perform any memory allocation -- that is why they accept a 'work'
+array in their arguments.
+
+It is also a bit focused on performing 1D convolutions, that is why it
+provides "unordered" FFTs , and a fourier domain convolution
+operation.
+
+
+Benchmark results (cpu tested: core i7 2600, core 2 quad, core 1 duo, atom N270, cortex-A9, cortex-A15, A8X)
+--
+
+The benchmark shows the performance of various fft implementations measured in 
+MFlops, with the number of floating point operations being defined as 5Nlog2(N)
+for a length N complex fft, and 2.5*Nlog2(N) for a real fft. 
+See http://www.fftw.org/speed/method.html for an explanation of these formulas.
+
+MacOS Lion, gcc 4.2, 64-bit, fftw 3.3 on a 3.4 GHz core i7 2600
+
+Built with:
+
+ gcc-4.2 -o test_pffft -arch x86_64 -O3 -Wall -W pffft.c test_pffft.c fftpack.c -L/usr/local/lib -I/usr/local/include/ -DHAVE_VECLIB -framework veclib -DHAVE_FFTW -lfftw3f 
+
+| input len |real FFTPack|  real vDSP |  real FFTW | real PFFFT | |cplx FFTPack|  cplx vDSP |  cplx FFTW | cplx PFFFT |
+|-----------+------------+------------+------------+------------| |------------+------------+------------+------------|
+|       64  |     2816   |     8596   |     7329   |     8187   | |     2887   |    14898   |    14668   |    11108   |
+|       96  |     3298   |      n/a   |     8378   |     7727   | |     3953   |      n/a   |    15680   |    10878   |
+|      128  |     3507   |    11575   |     9266   |    10108   | |     4233   |    17598   |    16427   |    12000   |
+|      160  |     3391   |      n/a   |     9838   |    10711   | |     4220   |      n/a   |    16653   |    11187   |
+|      192  |     3919   |      n/a   |     9868   |    10956   | |     4297   |      n/a   |    15770   |    12540   |
+|      256  |     4283   |    13179   |    10694   |    13128   | |     4545   |    19550   |    16350   |    13822   |
+|      384  |     3136   |      n/a   |    10810   |    12061   | |     3600   |      n/a   |    16103   |    13240   |
+|      480  |     3477   |      n/a   |    10632   |    12074   | |     3536   |      n/a   |    11630   |    12522   |
+|      512  |     3783   |    15141   |    11267   |    13838   | |     3649   |    20002   |    16560   |    13580   |
+|      640  |     3639   |      n/a   |    11164   |    13946   | |     3695   |      n/a   |    15416   |    13890   |
+|      768  |     3800   |      n/a   |    11245   |    13495   | |     3590   |      n/a   |    15802   |    14552   |
+|      800  |     3440   |      n/a   |    10499   |    13301   | |     3659   |      n/a   |    12056   |    13268   |
+|     1024  |     3924   |    15605   |    11450   |    15339   | |     3769   |    20963   |    13941   |    15467   |
+|     2048  |     4518   |    16195   |    11551   |    15532   | |     4258   |    20413   |    13723   |    15042   |
+|     2400  |     4294   |      n/a   |    10685   |    13078   | |     4093   |      n/a   |    12777   |    13119   |
+|     4096  |     4750   |    16596   |    11672   |    15817   | |     4157   |    19662   |    14316   |    14336   |
+|     8192  |     3820   |    16227   |    11084   |    12555   | |     3691   |    18132   |    12102   |    13813   |
+|     9216  |     3864   |      n/a   |    10254   |    12870   | |     3586   |      n/a   |    12119   |    13994   |
+|    16384  |     3822   |    15123   |    10454   |    12822   | |     3613   |    16874   |    12370   |    13881   |
+|    32768  |     4175   |    14512   |    10662   |    11095   | |     3881   |    14702   |    11619   |    11524   |
+|   262144  |     3317   |    11429   |     6269   |     9517   | |     2810   |    11729   |     7757   |    10179   |
+|  1048576  |     2913   |    10551   |     4730   |     5867   | |     2661   |     7881   |     3520   |     5350   |
+|-----------+------------+------------+------------+------------| |------------+------------+------------+------------|
+
+
+Debian 6, gcc 4.4.5, 64-bit, fftw 3.3.1 on a 3.4 GHz core i7 2600
+
+Built with:
+gcc -o test_pffft -DHAVE_FFTW -msse2 -O3 -Wall -W pffft.c test_pffft.c fftpack.c -L$HOME/local/lib -I$HOME/local/include/ -lfftw3f -lm
+
+| N (input length) | real FFTPack |   real FFTW  |  real PFFFT  | | cplx FFTPack |   cplx FFTW  |  cplx PFFFT  |
+|------------------+--------------+--------------+--------------| |--------------+--------------+--------------|
+|           64     |      3840    |      7680    |      8777    | |      4389    |     20480    |     11171    |
+|           96     |      4214    |      9633    |      8429    | |      4816    |     22477    |     11238    |
+|          128     |      3584    |     10240    |     10240    | |      5120    |     23893    |     11947    |
+|          192     |      4854    |     11095    |     12945    | |      4854    |     22191    |     14121    |
+|          256     |      4096    |     11703    |     16384    | |      5120    |     23406    |     13653    |
+|          384     |      4395    |     14651    |     12558    | |      4884    |     19535    |     14651    |
+|          512     |      5760    |     13166    |     15360    | |      4608    |     23040    |     15360    |
+|          768     |      4907    |     14020    |     16357    | |      4461    |     19628    |     14020    |
+|         1024     |      5120    |     14629    |     14629    | |      5120    |     20480    |     15754    |
+|         2048     |      5632    |     14080    |     18773    | |      4693    |     12516    |     16091    |
+|         4096     |      5120    |     13653    |     17554    | |      4726    |      7680    |     14456    |
+|         8192     |      4160    |      7396    |     13312    | |      4437    |     14791    |     13312    |
+|         9216     |      4210    |      6124    |     13473    | |      4491    |      7282    |     14970    |
+|        16384     |      3976    |     11010    |     14313    | |      4210    |     11450    |     13631    |
+|        32768     |      4260    |     10224    |     10954    | |      4260    |      6816    |     11797    |
+|       262144     |      3736    |      6896    |      9961    | |      2359    |      8965    |      9437    |
+|      1048576     |      2796    |      4534    |      6453    | |      1864    |      3078    |      5592    |
+|------------------+--------------+--------------+--------------| |--------------+--------------+--------------|
+
+
+
+MacOS Snow Leopard, gcc 4.0, 32-bit, fftw 3.3 on a 1.83 GHz core 1 duo
+
+Built with:
+
+ gcc -o test_pffft -DHAVE_FFTW -DHAVE_VECLIB -O3 -Wall -W pffft.c test_pffft.c fftpack.c -L/usr/local/lib -I/usr/local/include/ -lfftw3f -framework veclib
+
+| input len |real FFTPack|  real vDSP |  real FFTW | real PFFFT | |cplx FFTPack|  cplx vDSP |  cplx FFTW | cplx PFFFT |
+|-----------+------------+------------+------------+------------| |------------+------------+------------+------------|
+|      64   |      745   |     2145   |     1706   |     2028   | |      961   |     3356   |     3313   |     2300   |
+|      96   |      877   |      n/a   |     1976   |     1978   | |     1059   |      n/a   |     3333   |     2233   |
+|     128   |      951   |     2808   |     2213   |     2279   | |     1202   |     3803   |     3739   |     2494   |
+|     192   |     1002   |      n/a   |     2456   |     2429   | |     1186   |      n/a   |     3701   |     2508   |
+|     256   |     1065   |     3205   |     2641   |     2793   | |     1302   |     4013   |     3912   |     2663   |
+|     384   |      845   |      n/a   |     2759   |     2499   | |      948   |      n/a   |     3729   |     2504   |
+|     512   |      900   |     3476   |     2956   |     2759   | |      974   |     4057   |     3954   |     2645   |
+|     768   |      910   |      n/a   |     2912   |     2737   | |      975   |      n/a   |     3837   |     2614   |
+|    1024   |      936   |     3583   |     3107   |     3009   | |     1006   |     4124   |     3821   |     2697   |
+|    2048   |     1057   |     3585   |     3091   |     2837   | |     1089   |     3889   |     3701   |     2513   |
+|    4096   |     1083   |     3524   |     3092   |     2733   | |     1039   |     3617   |     3462   |     2364   |
+|    8192   |      874   |     3252   |     2967   |     2363   | |      911   |     3106   |     2789   |     2302   |
+|    9216   |      898   |      n/a   |     2420   |     2290   | |      865   |      n/a   |     2676   |     2204   |
+|   16384   |      903   |     2892   |     2506   |     2421   | |      899   |     3026   |     2797   |     2289   |
+|   32768   |      965   |     2837   |     2550   |     2358   | |      920   |     2922   |     2763   |     2240   |
+|  262144   |      738   |     2422   |     1589   |     1708   | |      610   |     2038   |     1436   |     1091   |
+| 1048576   |      528   |     1207   |      845   |      880   | |      606   |     1020   |      669   |     1036   |
+|-----------+------------+------------+------------+------------| |------------+------------+------------+------------|
+
+
+
+Ubuntu 11.04, gcc 4.5, 32-bit, fftw 3.2 on a 2.66 core 2 quad
+
+Built with:
+gcc -o test_pffft -DHAVE_FFTW -msse -mfpmath=sse -O3 -Wall -W pffft.c test_pffft.c fftpack.c -L/usr/local/lib -I/usr/local/include/ -lfftw3f -lm
+
+| input len |real FFTPack|  real FFTW | real PFFFT | |cplx FFTPack|  cplx FFTW | cplx PFFFT |
+|-----------+------------+------------+------------| |------------+------------+------------|
+|       64  |     1920   |     3614   |     5120   | |     2194   |     7680   |     6467   |
+|       96  |     1873   |     3549   |     5187   | |     2107   |     8429   |     5863   |
+|      128  |     2240   |     3773   |     5514   | |     2560   |     7964   |     6827   |
+|      192  |     1765   |     4569   |     7767   | |     2284   |     9137   |     7061   |
+|      256  |     2048   |     5461   |     7447   | |     2731   |     9638   |     7802   |
+|      384  |     1998   |     5861   |     6762   | |     2313   |     9253   |     7644   |
+|      512  |     2095   |     6144   |     7680   | |     2194   |    10240   |     7089   |
+|      768  |     2230   |     5773   |     7549   | |     2045   |    10331   |     7010   |
+|     1024  |     2133   |     6400   |     8533   | |     2133   |    10779   |     7877   |
+|     2048  |     2011   |     7040   |     8665   | |     1942   |    10240   |     7768   |
+|     4096  |     2194   |     6827   |     8777   | |     1755   |     9452   |     6827   |
+|     8192  |     1849   |     6656   |     6656   | |     1752   |     7831   |     6827   |
+|     9216  |     1871   |     5858   |     6416   | |     1643   |     6909   |     6266   |
+|    16384  |     1883   |     6223   |     6506   | |     1664   |     7340   |     6982   |
+|    32768  |     1826   |     6390   |     6667   | |     1631   |     7481   |     6971   |
+|   262144  |     1546   |     4075   |     5977   | |     1299   |     3415   |     3551   |
+|  1048576  |     1104   |     2071   |     1730   | |     1104   |     1149   |     1834   |
+|-----------+------------+------------+------------| |------------+------------+------------|
+
+
+
+Ubuntu 11.04, gcc 4.5, 32-bit, fftw 3.3 on a 1.6 GHz Atom N270
+
+Built with:
+gcc -o test_pffft -DHAVE_FFTW -msse -mfpmath=sse -O3 -Wall -W pffft.c test_pffft.c fftpack.c -L/usr/local/lib -I/usr/local/include/ -lfftw3f -lm
+
+| N (input length) | real FFTPack |   real FFTW  |  real PFFFT  | | cplx FFTPack |   cplx FFTW  |  cplx PFFFT  |
+|------------------+--------------+--------------+--------------| |--------------+--------------+--------------|
+|           64     |       452    |      1041    |      1336    | |       549    |      2318    |      1781    |
+|           96     |       444    |      1297    |      1297    | |       503    |      2408    |      1686    |
+|          128     |       527    |      1525    |      1707    | |       543    |      2655    |      1886    |
+|          192     |       498    |      1653    |      1849    | |       539    |      2678    |      1942    |
+|          256     |       585    |      1862    |      2156    | |       594    |      2777    |      2244    |
+|          384     |       499    |      1870    |      1998    | |       511    |      2586    |      1890    |
+|          512     |       562    |      2095    |      2194    | |       542    |      2973    |      2194    |
+|          768     |       545    |      2045    |      2133    | |       545    |      2365    |      2133    |
+|         1024     |       595    |      2133    |      2438    | |       569    |      2695    |      2179    |
+|         2048     |       587    |      2125    |      2347    | |       521    |      2230    |      1707    |
+|         4096     |       495    |      1890    |      1834    | |       492    |      1876    |      1672    |
+|         8192     |       469    |      1548    |      1729    | |       438    |      1740    |      1664    |
+|         9216     |       468    |      1663    |      1663    | |       446    |      1585    |      1531    |
+|        16384     |       453    |      1608    |      1767    | |       398    |      1476    |      1664    |
+|        32768     |       456    |      1420    |      1503    | |       387    |      1388    |      1345    |
+|       262144     |       309    |       385    |       726    | |       262    |       415    |       840    |
+|      1048576     |       280    |       351    |       739    | |       261    |       313    |       797    |
+|------------------+--------------+--------------+--------------| |--------------+--------------+--------------|
+
+
+
+Windows 7, visual c++ 2010 on a 1.6 GHz Atom N270
+
+Built with:
+cl /Ox -D_USE_MATH_DEFINES /arch:SSE test_pffft.c pffft.c fftpack.c
+
+(visual c++ is definitively not very good with SSE intrinsics...)
+
+| N (input length) | real FFTPack |  real PFFFT  | | cplx FFTPack |  cplx PFFFT  |
+|------------------+--------------+--------------| |--------------+--------------|
+|           64     |       173    |      1009    | |       174    |      1159    |
+|           96     |       169    |      1029    | |       188    |      1201    |
+|          128     |       195    |      1242    | |       191    |      1275    |
+|          192     |       178    |      1312    | |       184    |      1276    |
+|          256     |       196    |      1591    | |       186    |      1281    |
+|          384     |       172    |      1409    | |       181    |      1281    |
+|          512     |       187    |      1640    | |       181    |      1313    |
+|          768     |       171    |      1614    | |       176    |      1258    |
+|         1024     |       186    |      1812    | |       178    |      1223    |
+|         2048     |       190    |      1707    | |       186    |      1099    |
+|         4096     |       182    |      1446    | |       177    |       975    |
+|         8192     |       175    |      1345    | |       169    |      1034    |
+|         9216     |       165    |      1271    | |       168    |      1023    |
+|        16384     |       166    |      1396    | |       165    |       949    |
+|        32768     |       172    |      1311    | |       161    |       881    |
+|       262144     |       136    |       632    | |       134    |       629    |
+|      1048576     |       134    |       698    | |       127    |       623    |
+|------------------+--------------+--------------| |--------------+--------------|
+
+
+
+Ubuntu 12.04, gcc-4.7.3, 32-bit, with fftw 3.3.3 (built with --enable-neon), on a 1.2GHz ARM Cortex A9 (Tegra 3)
+
+Built with:
+gcc-4.7 -O3 -DHAVE_FFTW -march=armv7-a -mtune=cortex-a9 -mfloat-abi=hard -mfpu=neon -ffast-math test_pffft.c pffft.c -o test_pffft_arm fftpack.c -lm -I/usr/local/include/ -L/usr/local/lib/ -lfftw3f
+
+| input len |real FFTPack|  real FFTW | real PFFFT | |cplx FFTPack|  cplx FFTW | cplx PFFFT |
+|-----------+------------+------------+------------| |------------+------------+------------|
+|       64  |      549   |      452   |      731   | |      512   |      602   |      640   |
+|       96  |      421   |      272   |      702   | |      496   |      571   |      602   |
+|      128  |      498   |      512   |      815   | |      597   |      618   |      652   |
+|      160  |      521   |      536   |      815   | |      586   |      669   |      625   |
+|      192  |      539   |      571   |      883   | |      485   |      597   |      626   |
+|      256  |      640   |      539   |      975   | |      569   |      611   |      671   |
+|      384  |      499   |      610   |      879   | |      499   |      602   |      637   |
+|      480  |      518   |      507   |      877   | |      496   |      661   |      616   |
+|      512  |      524   |      591   |     1002   | |      549   |      678   |      668   |
+|      640  |      542   |      612   |      955   | |      568   |      663   |      645   |
+|      768  |      557   |      613   |      981   | |      491   |      663   |      598   |
+|      800  |      514   |      353   |      882   | |      514   |      360   |      574   |
+|     1024  |      640   |      640   |     1067   | |      492   |      683   |      602   |
+|     2048  |      587   |      640   |      908   | |      486   |      640   |      552   |
+|     2400  |      479   |      368   |      777   | |      422   |      376   |      518   |
+|     4096  |      511   |      614   |      853   | |      426   |      640   |      534   |
+|     8192  |      415   |      584   |      708   | |      386   |      622   |      516   |
+|     9216  |      419   |      571   |      687   | |      364   |      586   |      506   |
+|    16384  |      426   |      577   |      716   | |      398   |      606   |      530   |
+|    32768  |      417   |      572   |      673   | |      399   |      572   |      468   |
+|   262144  |      219   |      380   |      293   | |      255   |      431   |      343   |
+|  1048576  |      202   |      274   |      237   | |      265   |      282   |      355   |
+|-----------+------------+------------+------------| |------------+------------+------------|
+
+Same platform as above, but this time pffft and fftpack are built with clang 3.2:
+
+clang -O3 -DHAVE_FFTW -march=armv7-a -mtune=cortex-a9 -mfloat-abi=hard -mfpu=neon -ffast-math test_pffft.c pffft.c -o test_pffft_arm fftpack.c -lm -I/usr/local/include/ -L/usr/local/lib/ -lfftw3f
+
+| input len |real FFTPack|  real FFTW | real PFFFT | |cplx FFTPack|  cplx FFTW | cplx PFFFT |
+|-----------+------------+------------+------------| |------------+------------+------------|
+|       64  |      427   |      452   |      853   | |      427   |      602   |     1024   |
+|       96  |      351   |      276   |      843   | |      337   |      571   |      963   |
+|      128  |      373   |      512   |      996   | |      390   |      618   |     1054   |
+|      160  |      426   |      536   |      987   | |      375   |      669   |      914   |
+|      192  |      404   |      571   |     1079   | |      388   |      588   |     1079   |
+|      256  |      465   |      539   |     1205   | |      445   |      602   |     1170   |
+|      384  |      366   |      610   |     1099   | |      343   |      594   |     1099   |
+|      480  |      356   |      507   |     1140   | |      335   |      651   |      931   |
+|      512  |      411   |      591   |     1213   | |      384   |      649   |     1124   |
+|      640  |      398   |      612   |     1193   | |      373   |      654   |      901   |
+|      768  |      409   |      613   |     1227   | |      383   |      663   |     1044   |
+|      800  |      411   |      348   |     1073   | |      353   |      358   |      809   |
+|     1024  |      427   |      640   |     1280   | |      413   |      692   |     1004   |
+|     2048  |      414   |      626   |     1126   | |      371   |      640   |      853   |
+|     2400  |      399   |      373   |      898   | |      319   |      368   |      653   |
+|     4096  |      404   |      602   |     1059   | |      357   |      633   |      778   |
+|     8192  |      332   |      584   |      792   | |      308   |      616   |      716   |
+|     9216  |      322   |      561   |      783   | |      299   |      586   |      687   |
+|    16384  |      344   |      568   |      778   | |      314   |      617   |      745   |
+|    32768  |      342   |      564   |      737   | |      314   |      552   |      629   |
+|   262144  |      201   |      383   |      313   | |      227   |      435   |      413   |
+|  1048576  |      187   |      262   |      251   | |      228   |      281   |      409   |
+|-----------+------------+------------+------------| |------------+------------+------------|
+
+So it looks like, on ARM, gcc 4.7 is the best at scalar floating point
+(the fftpack performance numbers are better with gcc), while clang is
+the best with neon intrinsics (see how pffft perf has improved with
+clang 3.2).
+
+
+NVIDIA Jetson TK1 board, gcc-4.8.2. The cpu is a 2.3GHz cortex A15 (Tegra K1).
+
+Built with:
+gcc -O3 -march=armv7-a -mtune=native -mfloat-abi=hard -mfpu=neon -ffast-math test_pffft.c pffft.c -o test_pffft_arm fftpack.c -lm
+
+| input len |real FFTPack| real PFFFT | |cplx FFTPack| cplx PFFFT |
+|-----------+------------+------------| |------------+------------|
+|       64  |     1735   |     3308   | |     1994   |     3744   |
+|       96  |     1596   |     3448   | |     1987   |     3572   |
+|      128  |     1807   |     4076   | |     2255   |     3960   |
+|      160  |     1769   |     4083   | |     2071   |     3845   |
+|      192  |     1990   |     4233   | |     2017   |     3939   |
+|      256  |     2191   |     4882   | |     2254   |     4346   |
+|      384  |     1878   |     4492   | |     2073   |     4012   |
+|      480  |     1748   |     4398   | |     1923   |     3951   |
+|      512  |     2030   |     5064   | |     2267   |     4195   |
+|      640  |     1918   |     4756   | |     2094   |     4184   |
+|      768  |     2099   |     4907   | |     2048   |     4297   |
+|      800  |     1822   |     4555   | |     1880   |     4063   |
+|     1024  |     2232   |     5355   | |     2187   |     4420   |
+|     2048  |     2176   |     4983   | |     2027   |     3602   |
+|     2400  |     1741   |     4256   | |     1710   |     3344   |
+|     4096  |     1816   |     3914   | |     1851   |     3349   |
+|     8192  |     1716   |     3481   | |     1700   |     3255   |
+|     9216  |     1735   |     3589   | |     1653   |     3094   |
+|    16384  |     1567   |     3483   | |     1637   |     3244   |
+|    32768  |     1624   |     3240   | |     1655   |     3156   |
+|   262144  |     1012   |     1898   | |      983   |     1503   |
+|  1048576  |      876   |     1154   | |      868   |     1341   |
+|-----------+------------+------------| |------------+------------|
+
+The performance on the tegra K1 is pretty impressive. I'm not
+including the FFTW numbers as they as slightly below the scalar
+fftpack numbers, so something must be wrong (however it seems to be
+correctly configured and is using neon simd instructions).
+
+When using clang 3.4 the pffft version is even a bit faster, reaching
+5.7 GFlops for real ffts of size 1024.
+
+
+iPad Air 2 with iOS9, xcode 8.0, arm64. The cpu is an Apple A8X, supposedly running at 1.5GHz.
+
+| input len |real FFTPack|  real vDSP | real PFFFT | |cplx FFTPack|  cplx vDSP | cplx PFFFT |
+|-----------+------------+------------+------------| |------------+------------+------------|
+|       64  |     2517   |     7995   |     6086   | |     2725   |    13006   |     8495   |
+|       96  |     2442   |      n/a   |     6691   | |     2256   |      n/a   |     7991   |
+|      128  |     2664   |    10186   |     7877   | |     2575   |    15115   |     9115   |
+|      160  |     2638   |      n/a   |     8283   | |     2682   |      n/a   |     8806   |
+|      192  |     2903   |      n/a   |     9083   | |     2634   |      n/a   |     8980   |
+|      256  |     3184   |    11452   |    10039   | |     3026   |    15410   |    10199   |
+|      384  |     2665   |      n/a   |    10100   | |     2275   |      n/a   |     9247   |
+|      480  |     2546   |      n/a   |     9863   | |     2341   |      n/a   |     8892   |
+|      512  |     2832   |    12197   |    10989   | |     2547   |    16768   |    10154   |
+|      640  |     2755   |      n/a   |    10461   | |     2569   |      n/a   |     9666   |
+|      768  |     2998   |      n/a   |    11355   | |     2585   |      n/a   |     9813   |
+|      800  |     2516   |      n/a   |    10332   | |     2433   |      n/a   |     9164   |
+|     1024  |     3109   |    12965   |    12114   | |     2869   |    16448   |    10519   |
+|     2048  |     3027   |    12996   |    12023   | |     2648   |    17304   |    10307   |
+|     2400  |     2515   |      n/a   |    10372   | |     2355   |      n/a   |     8443   |
+|     4096  |     3204   |    13603   |    12359   | |     2814   |    16570   |     9780   |
+|     8192  |     2759   |    13422   |    10824   | |     2153   |    15652   |     7884   |
+|     9216  |     2700   |      n/a   |     9938   | |     2241   |      n/a   |     7900   |
+|    16384  |     2280   |    13057   |     7976   | |      593   |     4272   |     2534   |
+|    32768  |      768   |     4269   |     2882   | |      606   |     4405   |     2604   |
+|   262144  |      724   |     3527   |     2630   | |      534   |     2418   |     2157   |
+|  1048576  |      674   |     1467   |     2135   | |      530   |     1621   |     2055   |
+|-----------+------------+------------+------------| |------------+------------+------------|
+
+I double-checked to make sure I did not make a mistake in the time
+measurements, as the numbers are much higher than what I initially
+expected. They are in fact higher than the number I get on the 2.8GHz
+Xeon of my 2008 mac pro.. (except for FFT lengths >= 32768 where
+having a big cache is useful). A good surprise is also that the perf
+is not too far from apple's vDSP (at least for the real FFT).
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.c asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.c
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.c	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.c	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,1881 @@
+/* Copyright (c) 2013  Julien Pommier ( pommier@modartt.com )
+
+   Based on original fortran 77 code from FFTPACKv4 from NETLIB
+   (http://www.netlib.org/fftpack), authored by Dr Paul Swarztrauber
+   of NCAR, in 1985.
+
+   As confirmed by the NCAR fftpack software curators, the following
+   FFTPACKv5 license applies to FFTPACKv4 sources. My changes are
+   released under the same terms.
+
+   FFTPACK license:
+
+   http://www.cisl.ucar.edu/css/software/fftpack5/ftpk.html
+
+   Copyright (c) 2004 the University Corporation for Atmospheric
+   Research ("UCAR"). All rights reserved. Developed by NCAR's
+   Computational and Information Systems Laboratory, UCAR,
+   www.cisl.ucar.edu.
+
+   Redistribution and use of the Software in source and binary forms,
+   with or without modification, is permitted provided that the
+   following conditions are met:
+
+   - Neither the names of NCAR's Computational and Information Systems
+   Laboratory, the University Corporation for Atmospheric Research,
+   nor the names of its sponsors or contributors may be used to
+   endorse or promote products derived from this Software without
+   specific prior written permission.  
+
+   - Redistributions of source code must retain the above copyright
+   notices, this list of conditions, and the disclaimer below.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions, and the disclaimer below in the
+   documentation and/or other materials provided with the
+   distribution.
+
+   THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT
+   HOLDERS BE LIABLE FOR ANY CLAIM, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+   SOFTWARE.
+
+
+   PFFFT : a Pretty Fast FFT.
+
+   This file is largerly based on the original FFTPACK implementation, modified in
+   order to take advantage of SIMD instructions of modern CPUs.
+*/
+
+/*
+  ChangeLog: 
+  - 2011/10/02, version 1: This is the very first release of this file.
+*/
+
+#include "pffft.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <assert.h>
+
+/* detect compiler flavour */
+#if defined(_MSC_VER)
+#  define COMPILER_MSVC
+#elif defined(__GNUC__)
+#  define COMPILER_GCC
+#endif
+
+#if defined(COMPILER_GCC)
+#  define ALWAYS_INLINE(return_type) inline return_type __attribute__ ((always_inline))
+#  define NEVER_INLINE(return_type) return_type __attribute__ ((noinline))
+#  define RESTRICT __restrict
+#  define VLA_ARRAY_ON_STACK(type__, varname__, size__) type__ varname__[size__];
+#elif defined(COMPILER_MSVC)
+#  define ALWAYS_INLINE(return_type) __forceinline return_type
+#  define NEVER_INLINE(return_type) __declspec(noinline) return_type
+#  define RESTRICT __restrict
+#  define VLA_ARRAY_ON_STACK(type__, varname__, size__) type__ *varname__ = (type__*)_alloca(size__ * sizeof(type__))
+#endif
+
+
+/* 
+   vector support macros: the rest of the code is independant of
+   SSE/Altivec/NEON -- adding support for other platforms with 4-element
+   vectors should be limited to these macros 
+*/
+
+
+// define PFFFT_SIMD_DISABLE if you want to use scalar code instead of simd code
+//#define PFFFT_SIMD_DISABLE
+
+/*
+   Altivec support macros 
+*/
+#if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
+typedef vector float v4sf;
+#  define SIMD_SZ 4
+#  define VZERO() ((vector float) vec_splat_u8(0))
+#  define VMUL(a,b) vec_madd(a,b, VZERO())
+#  define VADD(a,b) vec_add(a,b)
+#  define VMADD(a,b,c) vec_madd(a,b,c)
+#  define VSUB(a,b) vec_sub(a,b)
+inline v4sf ld_ps1(const float *p) { v4sf v=vec_lde(0,p); return vec_splat(vec_perm(v, v, vec_lvsl(0, p)), 0); }
+#  define LD_PS1(p) ld_ps1(&p)
+#  define INTERLEAVE2(in1, in2, out1, out2) { v4sf tmp__ = vec_mergeh(in1, in2); out2 = vec_mergel(in1, in2); out1 = tmp__; }
+#  define UNINTERLEAVE2(in1, in2, out1, out2) {                           \
+    vector unsigned char vperm1 =  (vector unsigned char)(0,1,2,3,8,9,10,11,16,17,18,19,24,25,26,27); \
+    vector unsigned char vperm2 =  (vector unsigned char)(4,5,6,7,12,13,14,15,20,21,22,23,28,29,30,31); \
+    v4sf tmp__ = vec_perm(in1, in2, vperm1); out2 = vec_perm(in1, in2, vperm2); out1 = tmp__; \
+  }
+#  define VTRANSPOSE4(x0,x1,x2,x3) {              \
+    v4sf y0 = vec_mergeh(x0, x2);               \
+    v4sf y1 = vec_mergel(x0, x2);               \
+    v4sf y2 = vec_mergeh(x1, x3);               \
+    v4sf y3 = vec_mergel(x1, x3);               \
+    x0 = vec_mergeh(y0, y2);                    \
+    x1 = vec_mergel(y0, y2);                    \
+    x2 = vec_mergeh(y1, y3);                    \
+    x3 = vec_mergel(y1, y3);                    \
+  }
+#  define VSWAPHL(a,b) vec_perm(a,b, (vector unsigned char)(16,17,18,19,20,21,22,23,8,9,10,11,12,13,14,15))
+#  define VALIGNED(ptr) ((((long)(ptr)) & 0xF) == 0)
+
+/*
+  SSE1 support macros
+*/
+#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(i386) || defined(_M_IX86))
+
+#include <xmmintrin.h>
+typedef __m128 v4sf;
+#  define SIMD_SZ 4 // 4 floats by simd vector -- this is pretty much hardcoded in the preprocess/finalize functions anyway so you will have to work if you want to enable AVX with its 256-bit vectors.
+#  define VZERO() _mm_setzero_ps()
+#  define VMUL(a,b) _mm_mul_ps(a,b)
+#  define VADD(a,b) _mm_add_ps(a,b)
+#  define VMADD(a,b,c) _mm_add_ps(_mm_mul_ps(a,b), c)
+#  define VSUB(a,b) _mm_sub_ps(a,b)
+#  define LD_PS1(p) _mm_set1_ps(p)
+#  define INTERLEAVE2(in1, in2, out1, out2) { v4sf tmp__ = _mm_unpacklo_ps(in1, in2); out2 = _mm_unpackhi_ps(in1, in2); out1 = tmp__; }
+#  define UNINTERLEAVE2(in1, in2, out1, out2) { v4sf tmp__ = _mm_shuffle_ps(in1, in2, _MM_SHUFFLE(2,0,2,0)); out2 = _mm_shuffle_ps(in1, in2, _MM_SHUFFLE(3,1,3,1)); out1 = tmp__; }
+#  define VTRANSPOSE4(x0,x1,x2,x3) _MM_TRANSPOSE4_PS(x0,x1,x2,x3)
+#  define VSWAPHL(a,b) _mm_shuffle_ps(b, a, _MM_SHUFFLE(3,2,1,0))
+#  define VALIGNED(ptr) ((((long)(ptr)) & 0xF) == 0)
+
+/*
+  ARM NEON support macros
+*/
+#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64))
+#  include <arm_neon.h>
+typedef float32x4_t v4sf;
+#  define SIMD_SZ 4
+#  define VZERO() vdupq_n_f32(0)
+#  define VMUL(a,b) vmulq_f32(a,b)
+#  define VADD(a,b) vaddq_f32(a,b)
+#  define VMADD(a,b,c) vmlaq_f32(c,a,b)
+#  define VSUB(a,b) vsubq_f32(a,b)
+#  define LD_PS1(p) vld1q_dup_f32(&(p))
+#  define INTERLEAVE2(in1, in2, out1, out2) { float32x4x2_t tmp__ = vzipq_f32(in1,in2); out1=tmp__.val[0]; out2=tmp__.val[1]; }
+#  define UNINTERLEAVE2(in1, in2, out1, out2) { float32x4x2_t tmp__ = vuzpq_f32(in1,in2); out1=tmp__.val[0]; out2=tmp__.val[1]; }
+#  define VTRANSPOSE4(x0,x1,x2,x3) {                                    \
+    float32x4x2_t t0_ = vzipq_f32(x0, x2);                              \
+    float32x4x2_t t1_ = vzipq_f32(x1, x3);                              \
+    float32x4x2_t u0_ = vzipq_f32(t0_.val[0], t1_.val[0]);              \
+    float32x4x2_t u1_ = vzipq_f32(t0_.val[1], t1_.val[1]);              \
+    x0 = u0_.val[0]; x1 = u0_.val[1]; x2 = u1_.val[0]; x3 = u1_.val[1]; \
+  }
+// marginally faster version
+//#  define VTRANSPOSE4(x0,x1,x2,x3) { asm("vtrn.32 %q0, %q1;\n vtrn.32 %q2,%q3\n vswp %f0,%e2\n vswp %f1,%e3" : "+w"(x0), "+w"(x1), "+w"(x2), "+w"(x3)::); }
+#  define VSWAPHL(a,b) vcombine_f32(vget_low_f32(b), vget_high_f32(a))
+#  define VALIGNED(ptr) ((((long)(ptr)) & 0x3) == 0)
+#else
+#  if !defined(PFFFT_SIMD_DISABLE)
+#    warning "building with simd disabled !\n";
+#    define PFFFT_SIMD_DISABLE // fallback to scalar code
+#  endif
+#endif
+
+// fallback mode for situations where SSE/Altivec are not available, use scalar mode instead
+#ifdef PFFFT_SIMD_DISABLE
+typedef float v4sf;
+#  define SIMD_SZ 1
+#  define VZERO() 0.f
+#  define VMUL(a,b) ((a)*(b))
+#  define VADD(a,b) ((a)+(b))
+#  define VMADD(a,b,c) ((a)*(b)+(c))
+#  define VSUB(a,b) ((a)-(b))
+#  define LD_PS1(p) (p)
+#  define VALIGNED(ptr) ((((long)(ptr)) & 0x3) == 0)
+#endif
+
+// shortcuts for complex multiplcations
+#define VCPLXMUL(ar,ai,br,bi) { v4sf tmp; tmp=VMUL(ar,bi); ar=VMUL(ar,br); ar=VSUB(ar,VMUL(ai,bi)); ai=VMUL(ai,br); ai=VADD(ai,tmp); }
+#define VCPLXMULCONJ(ar,ai,br,bi) { v4sf tmp; tmp=VMUL(ar,bi); ar=VMUL(ar,br); ar=VADD(ar,VMUL(ai,bi)); ai=VMUL(ai,br); ai=VSUB(ai,tmp); }
+#ifndef SVMUL
+// multiply a scalar with a vector
+#define SVMUL(f,v) VMUL(LD_PS1(f),v)
+#endif
+
+#if !defined(PFFFT_SIMD_DISABLE)
+typedef union v4sf_union {
+  v4sf  v;
+  float f[4];
+} v4sf_union;
+
+#include <string.h>
+
+#define assertv4(v,f0,f1,f2,f3) assert(v.f[0] == (f0) && v.f[1] == (f1) && v.f[2] == (f2) && v.f[3] == (f3))
+
+/* detect bugs with the vector support macros */
+void validate_pffft_simd() {
+  float f[16] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 };
+  v4sf_union a0, a1, a2, a3, t, u; 
+  memcpy(a0.f, f, 4*sizeof(float));
+  memcpy(a1.f, f+4, 4*sizeof(float));
+  memcpy(a2.f, f+8, 4*sizeof(float));
+  memcpy(a3.f, f+12, 4*sizeof(float));
+
+  t = a0; u = a1; t.v = VZERO();
+  printf("VZERO=[%2g %2g %2g %2g]\n", t.f[0], t.f[1], t.f[2], t.f[3]); assertv4(t, 0, 0, 0, 0);
+  t.v = VADD(a1.v, a2.v);
+  printf("VADD(4:7,8:11)=[%2g %2g %2g %2g]\n", t.f[0], t.f[1], t.f[2], t.f[3]); assertv4(t, 12, 14, 16, 18);
+  t.v = VMUL(a1.v, a2.v);
+  printf("VMUL(4:7,8:11)=[%2g %2g %2g %2g]\n", t.f[0], t.f[1], t.f[2], t.f[3]); assertv4(t, 32, 45, 60, 77);
+  t.v = VMADD(a1.v, a2.v,a0.v);
+  printf("VMADD(4:7,8:11,0:3)=[%2g %2g %2g %2g]\n", t.f[0], t.f[1], t.f[2], t.f[3]); assertv4(t, 32, 46, 62, 80);
+
+  INTERLEAVE2(a1.v,a2.v,t.v,u.v);
+  printf("INTERLEAVE2(4:7,8:11)=[%2g %2g %2g %2g] [%2g %2g %2g %2g]\n", t.f[0], t.f[1], t.f[2], t.f[3], u.f[0], u.f[1], u.f[2], u.f[3]);
+  assertv4(t, 4, 8, 5, 9); assertv4(u, 6, 10, 7, 11);
+  UNINTERLEAVE2(a1.v,a2.v,t.v,u.v);
+  printf("UNINTERLEAVE2(4:7,8:11)=[%2g %2g %2g %2g] [%2g %2g %2g %2g]\n", t.f[0], t.f[1], t.f[2], t.f[3], u.f[0], u.f[1], u.f[2], u.f[3]);
+  assertv4(t, 4, 6, 8, 10); assertv4(u, 5, 7, 9, 11);
+
+  t.v=LD_PS1(f[15]);
+  printf("LD_PS1(15)=[%2g %2g %2g %2g]\n", t.f[0], t.f[1], t.f[2], t.f[3]);
+  assertv4(t, 15, 15, 15, 15);
+  t.v = VSWAPHL(a1.v, a2.v);
+  printf("VSWAPHL(4:7,8:11)=[%2g %2g %2g %2g]\n", t.f[0], t.f[1], t.f[2], t.f[3]);
+  assertv4(t, 8, 9, 6, 7);
+  VTRANSPOSE4(a0.v, a1.v, a2.v, a3.v);
+  printf("VTRANSPOSE4(0:3,4:7,8:11,12:15)=[%2g %2g %2g %2g] [%2g %2g %2g %2g] [%2g %2g %2g %2g] [%2g %2g %2g %2g]\n", 
+         a0.f[0], a0.f[1], a0.f[2], a0.f[3], a1.f[0], a1.f[1], a1.f[2], a1.f[3], 
+         a2.f[0], a2.f[1], a2.f[2], a2.f[3], a3.f[0], a3.f[1], a3.f[2], a3.f[3]); 
+  assertv4(a0, 0, 4, 8, 12); assertv4(a1, 1, 5, 9, 13); assertv4(a2, 2, 6, 10, 14); assertv4(a3, 3, 7, 11, 15);
+}
+#endif //!PFFFT_SIMD_DISABLE
+
+/* SSE and co like 16-bytes aligned pointers */
+#define MALLOC_V4SF_ALIGNMENT 64 // with a 64-byte alignment, we are even aligned on L2 cache lines...
+void *pffft_aligned_malloc(size_t nb_bytes) {
+  void *p, *p0 = malloc(nb_bytes + MALLOC_V4SF_ALIGNMENT);
+  if (!p0) return (void *) 0;
+  p = (void *) (((size_t) p0 + MALLOC_V4SF_ALIGNMENT) & (~((size_t) (MALLOC_V4SF_ALIGNMENT-1))));
+  *((void **) p - 1) = p0;
+  return p;
+}
+
+void pffft_aligned_free(void *p) {
+  if (p) free(*((void **) p - 1));
+}
+
+int pffft_simd_size() { return SIMD_SZ; }
+
+/*
+  passf2 and passb2 has been merged here, fsign = -1 for passf2, +1 for passb2
+*/
+static NEVER_INLINE(void) passf2_ps(int ido, int l1, const v4sf *cc, v4sf *ch, const float *wa1, float fsign) {
+  int k, i;
+  int l1ido = l1*ido;
+  if (ido <= 2) {
+    for (k=0; k < l1ido; k += ido, ch += ido, cc+= 2*ido) {
+      ch[0]         = VADD(cc[0], cc[ido+0]);
+      ch[l1ido]     = VSUB(cc[0], cc[ido+0]);
+      ch[1]         = VADD(cc[1], cc[ido+1]);
+      ch[l1ido + 1] = VSUB(cc[1], cc[ido+1]);
+    }
+  } else {
+    for (k=0; k < l1ido; k += ido, ch += ido, cc += 2*ido) {
+      for (i=0; i<ido-1; i+=2) {
+        v4sf tr2 = VSUB(cc[i+0], cc[i+ido+0]);
+        v4sf ti2 = VSUB(cc[i+1], cc[i+ido+1]);
+        v4sf wr = LD_PS1(wa1[i]), wi = VMUL(LD_PS1(fsign), LD_PS1(wa1[i+1]));
+        ch[i]   = VADD(cc[i+0], cc[i+ido+0]);
+        ch[i+1] = VADD(cc[i+1], cc[i+ido+1]);
+        VCPLXMUL(tr2, ti2, wr, wi);
+        ch[i+l1ido]   = tr2;
+        ch[i+l1ido+1] = ti2;
+      }
+    }
+  }
+}
+
+/*
+  passf3 and passb3 has been merged here, fsign = -1 for passf3, +1 for passb3
+*/
+static NEVER_INLINE(void) passf3_ps(int ido, int l1, const v4sf *cc, v4sf *ch,
+                                    const float *wa1, const float *wa2, float fsign) {
+  static const float taur = -0.5f;
+  float taui = 0.866025403784439f*fsign;
+  int i, k;
+  v4sf tr2, ti2, cr2, ci2, cr3, ci3, dr2, di2, dr3, di3;
+  int l1ido = l1*ido;
+  float wr1, wi1, wr2, wi2;
+  assert(ido > 2);
+  for (k=0; k< l1ido; k += ido, cc+= 3*ido, ch +=ido) {
+    for (i=0; i<ido-1; i+=2) {
+      tr2 = VADD(cc[i+ido], cc[i+2*ido]);
+      cr2 = VADD(cc[i], SVMUL(taur,tr2));
+      ch[i]    = VADD(cc[i], tr2);
+      ti2 = VADD(cc[i+ido+1], cc[i+2*ido+1]);
+      ci2 = VADD(cc[i    +1], SVMUL(taur,ti2));
+      ch[i+1]  = VADD(cc[i+1], ti2);
+      cr3 = SVMUL(taui, VSUB(cc[i+ido], cc[i+2*ido]));
+      ci3 = SVMUL(taui, VSUB(cc[i+ido+1], cc[i+2*ido+1]));
+      dr2 = VSUB(cr2, ci3);
+      dr3 = VADD(cr2, ci3);
+      di2 = VADD(ci2, cr3);
+      di3 = VSUB(ci2, cr3);
+      wr1=wa1[i], wi1=fsign*wa1[i+1], wr2=wa2[i], wi2=fsign*wa2[i+1]; 
+      VCPLXMUL(dr2, di2, LD_PS1(wr1), LD_PS1(wi1));
+      ch[i+l1ido] = dr2; 
+      ch[i+l1ido + 1] = di2;
+      VCPLXMUL(dr3, di3, LD_PS1(wr2), LD_PS1(wi2));
+      ch[i+2*l1ido] = dr3;
+      ch[i+2*l1ido+1] = di3;
+    }
+  }
+} /* passf3 */
+
+static NEVER_INLINE(void) passf4_ps(int ido, int l1, const v4sf *cc, v4sf *ch,
+                                    const float *wa1, const float *wa2, const float *wa3, float fsign) {
+  /* isign == -1 for forward transform and +1 for backward transform */
+
+  int i, k;
+  v4sf ci2, ci3, ci4, cr2, cr3, cr4, ti1, ti2, ti3, ti4, tr1, tr2, tr3, tr4;
+  int l1ido = l1*ido;
+  if (ido == 2) {
+    for (k=0; k < l1ido; k += ido, ch += ido, cc += 4*ido) {
+      tr1 = VSUB(cc[0], cc[2*ido + 0]);
+      tr2 = VADD(cc[0], cc[2*ido + 0]);
+      ti1 = VSUB(cc[1], cc[2*ido + 1]);
+      ti2 = VADD(cc[1], cc[2*ido + 1]);
+      ti4 = VMUL(VSUB(cc[1*ido + 0], cc[3*ido + 0]), LD_PS1(fsign));
+      tr4 = VMUL(VSUB(cc[3*ido + 1], cc[1*ido + 1]), LD_PS1(fsign));
+      tr3 = VADD(cc[ido + 0], cc[3*ido + 0]);
+      ti3 = VADD(cc[ido + 1], cc[3*ido + 1]);
+
+      ch[0*l1ido + 0] = VADD(tr2, tr3);
+      ch[0*l1ido + 1] = VADD(ti2, ti3);
+      ch[1*l1ido + 0] = VADD(tr1, tr4);
+      ch[1*l1ido + 1] = VADD(ti1, ti4);
+      ch[2*l1ido + 0] = VSUB(tr2, tr3);
+      ch[2*l1ido + 1] = VSUB(ti2, ti3);        
+      ch[3*l1ido + 0] = VSUB(tr1, tr4);
+      ch[3*l1ido + 1] = VSUB(ti1, ti4);
+    }
+  } else {
+    for (k=0; k < l1ido; k += ido, ch+=ido, cc += 4*ido) {
+      for (i=0; i<ido-1; i+=2) {
+        float wr1, wi1, wr2, wi2, wr3, wi3;
+        tr1 = VSUB(cc[i + 0], cc[i + 2*ido + 0]);
+        tr2 = VADD(cc[i + 0], cc[i + 2*ido + 0]);
+        ti1 = VSUB(cc[i + 1], cc[i + 2*ido + 1]);
+        ti2 = VADD(cc[i + 1], cc[i + 2*ido + 1]);
+        tr4 = VMUL(VSUB(cc[i + 3*ido + 1], cc[i + 1*ido + 1]), LD_PS1(fsign));
+        ti4 = VMUL(VSUB(cc[i + 1*ido + 0], cc[i + 3*ido + 0]), LD_PS1(fsign));
+        tr3 = VADD(cc[i + ido + 0], cc[i + 3*ido + 0]);
+        ti3 = VADD(cc[i + ido + 1], cc[i + 3*ido + 1]);
+
+        ch[i] = VADD(tr2, tr3);
+        cr3    = VSUB(tr2, tr3);
+        ch[i + 1] = VADD(ti2, ti3);
+        ci3 = VSUB(ti2, ti3);
+
+        cr2 = VADD(tr1, tr4);
+        cr4 = VSUB(tr1, tr4);
+        ci2 = VADD(ti1, ti4);
+        ci4 = VSUB(ti1, ti4);
+        wr1=wa1[i], wi1=fsign*wa1[i+1];
+        VCPLXMUL(cr2, ci2, LD_PS1(wr1), LD_PS1(wi1));
+        wr2=wa2[i], wi2=fsign*wa2[i+1]; 
+        ch[i + l1ido] = cr2;
+        ch[i + l1ido + 1] = ci2;
+
+        VCPLXMUL(cr3, ci3, LD_PS1(wr2), LD_PS1(wi2));
+        wr3=wa3[i], wi3=fsign*wa3[i+1]; 
+        ch[i + 2*l1ido] = cr3;
+        ch[i + 2*l1ido + 1] = ci3;
+
+        VCPLXMUL(cr4, ci4, LD_PS1(wr3), LD_PS1(wi3));
+        ch[i + 3*l1ido] = cr4;
+        ch[i + 3*l1ido + 1] = ci4;
+      }
+    }
+  }
+} /* passf4 */
+
+/*
+  passf5 and passb5 has been merged here, fsign = -1 for passf5, +1 for passb5
+*/
+static NEVER_INLINE(void) passf5_ps(int ido, int l1, const v4sf *cc, v4sf *ch,
+                                    const float *wa1, const float *wa2, 
+                                    const float *wa3, const float *wa4, float fsign) {  
+  static const float tr11 = .309016994374947f;
+  const float ti11 = .951056516295154f*fsign;
+  static const float tr12 = -.809016994374947f;
+  const float ti12 = .587785252292473f*fsign;
+
+  /* Local variables */
+  int i, k;
+  v4sf ci2, ci3, ci4, ci5, di3, di4, di5, di2, cr2, cr3, cr5, cr4, ti2, ti3,
+    ti4, ti5, dr3, dr4, dr5, dr2, tr2, tr3, tr4, tr5;
+
+  float wr1, wi1, wr2, wi2, wr3, wi3, wr4, wi4;
+
+#define cc_ref(a_1,a_2) cc[(a_2-1)*ido + a_1 + 1]
+#define ch_ref(a_1,a_3) ch[(a_3-1)*l1*ido + a_1 + 1]
+
+  assert(ido > 2);
+  for (k = 0; k < l1; ++k, cc += 5*ido, ch += ido) {
+    for (i = 0; i < ido-1; i += 2) {
+      ti5 = VSUB(cc_ref(i  , 2), cc_ref(i  , 5));
+      ti2 = VADD(cc_ref(i  , 2), cc_ref(i  , 5));
+      ti4 = VSUB(cc_ref(i  , 3), cc_ref(i  , 4));
+      ti3 = VADD(cc_ref(i  , 3), cc_ref(i  , 4));
+      tr5 = VSUB(cc_ref(i-1, 2), cc_ref(i-1, 5));
+      tr2 = VADD(cc_ref(i-1, 2), cc_ref(i-1, 5));
+      tr4 = VSUB(cc_ref(i-1, 3), cc_ref(i-1, 4));
+      tr3 = VADD(cc_ref(i-1, 3), cc_ref(i-1, 4));
+      ch_ref(i-1, 1) = VADD(cc_ref(i-1, 1), VADD(tr2, tr3));
+      ch_ref(i  , 1) = VADD(cc_ref(i  , 1), VADD(ti2, ti3));
+      cr2 = VADD(cc_ref(i-1, 1), VADD(SVMUL(tr11, tr2),SVMUL(tr12, tr3)));
+      ci2 = VADD(cc_ref(i  , 1), VADD(SVMUL(tr11, ti2),SVMUL(tr12, ti3)));
+      cr3 = VADD(cc_ref(i-1, 1), VADD(SVMUL(tr12, tr2),SVMUL(tr11, tr3)));
+      ci3 = VADD(cc_ref(i  , 1), VADD(SVMUL(tr12, ti2),SVMUL(tr11, ti3)));
+      cr5 = VADD(SVMUL(ti11, tr5), SVMUL(ti12, tr4));
+      ci5 = VADD(SVMUL(ti11, ti5), SVMUL(ti12, ti4));
+      cr4 = VSUB(SVMUL(ti12, tr5), SVMUL(ti11, tr4));
+      ci4 = VSUB(SVMUL(ti12, ti5), SVMUL(ti11, ti4));
+      dr3 = VSUB(cr3, ci4);
+      dr4 = VADD(cr3, ci4);
+      di3 = VADD(ci3, cr4);
+      di4 = VSUB(ci3, cr4);
+      dr5 = VADD(cr2, ci5);
+      dr2 = VSUB(cr2, ci5);
+      di5 = VSUB(ci2, cr5);
+      di2 = VADD(ci2, cr5);
+      wr1=wa1[i], wi1=fsign*wa1[i+1], wr2=wa2[i], wi2=fsign*wa2[i+1]; 
+      wr3=wa3[i], wi3=fsign*wa3[i+1], wr4=wa4[i], wi4=fsign*wa4[i+1]; 
+      VCPLXMUL(dr2, di2, LD_PS1(wr1), LD_PS1(wi1));
+      ch_ref(i - 1, 2) = dr2;
+      ch_ref(i, 2)     = di2;
+      VCPLXMUL(dr3, di3, LD_PS1(wr2), LD_PS1(wi2));
+      ch_ref(i - 1, 3) = dr3;
+      ch_ref(i, 3)     = di3;
+      VCPLXMUL(dr4, di4, LD_PS1(wr3), LD_PS1(wi3));
+      ch_ref(i - 1, 4) = dr4;
+      ch_ref(i, 4)     = di4;
+      VCPLXMUL(dr5, di5, LD_PS1(wr4), LD_PS1(wi4));
+      ch_ref(i - 1, 5) = dr5;
+      ch_ref(i, 5)     = di5;
+    }
+  }
+#undef ch_ref
+#undef cc_ref
+}
+
+static NEVER_INLINE(void) radf2_ps(int ido, int l1, const v4sf * RESTRICT cc, v4sf * RESTRICT ch, const float *wa1) {
+  static const float minus_one = -1.f;
+  int i, k, l1ido = l1*ido;
+  for (k=0; k < l1ido; k += ido) {
+    v4sf a = cc[k], b = cc[k + l1ido];
+    ch[2*k] = VADD(a, b);
+    ch[2*(k+ido)-1] = VSUB(a, b);
+  }
+  if (ido < 2) return;
+  if (ido != 2) {
+    for (k=0; k < l1ido; k += ido) {
+      for (i=2; i<ido; i+=2) {
+        v4sf tr2 = cc[i - 1 + k + l1ido], ti2 = cc[i + k + l1ido];
+        v4sf br = cc[i - 1 + k], bi = cc[i + k];
+        VCPLXMULCONJ(tr2, ti2, LD_PS1(wa1[i - 2]), LD_PS1(wa1[i - 1])); 
+        ch[i + 2*k] = VADD(bi, ti2);
+        ch[2*(k+ido) - i] = VSUB(ti2, bi);
+        ch[i - 1 + 2*k] = VADD(br, tr2);
+        ch[2*(k+ido) - i -1] = VSUB(br, tr2);
+      }
+    }
+    if (ido % 2 == 1) return;
+  }
+  for (k=0; k < l1ido; k += ido) {
+    ch[2*k + ido] = SVMUL(minus_one, cc[ido-1 + k + l1ido]);
+    ch[2*k + ido-1] = cc[k + ido-1];
+  }
+} /* radf2 */
+
+
+static NEVER_INLINE(void) radb2_ps(int ido, int l1, const v4sf *cc, v4sf *ch, const float *wa1) {
+  static const float minus_two=-2;
+  int i, k, l1ido = l1*ido;
+  v4sf a,b,c,d, tr2, ti2;
+  for (k=0; k < l1ido; k += ido) {
+    a = cc[2*k]; b = cc[2*(k+ido) - 1];
+    ch[k] = VADD(a, b);
+    ch[k + l1ido] =VSUB(a, b);
+  }
+  if (ido < 2) return;
+  if (ido != 2) {
+    for (k = 0; k < l1ido; k += ido) {
+      for (i = 2; i < ido; i += 2) {
+        a = cc[i-1 + 2*k]; b = cc[2*(k + ido) - i - 1];
+        c = cc[i+0 + 2*k]; d = cc[2*(k + ido) - i + 0];
+        ch[i-1 + k] = VADD(a, b);
+        tr2 = VSUB(a, b);
+        ch[i+0 + k] = VSUB(c, d);
+        ti2 = VADD(c, d);
+        VCPLXMUL(tr2, ti2, LD_PS1(wa1[i - 2]), LD_PS1(wa1[i - 1]));
+        ch[i-1 + k + l1ido] = tr2;
+        ch[i+0 + k + l1ido] = ti2;
+      }
+    }
+    if (ido % 2 == 1) return;
+  }
+  for (k = 0; k < l1ido; k += ido) {
+    a = cc[2*k + ido-1]; b = cc[2*k + ido];
+    ch[k + ido-1] = VADD(a,a);
+    ch[k + ido-1 + l1ido] = SVMUL(minus_two, b);
+  }
+} /* radb2 */
+
+static void radf3_ps(int ido, int l1, const v4sf * RESTRICT cc, v4sf * RESTRICT ch,
+                     const float *wa1, const float *wa2) {
+  static const float taur = -0.5f;
+  static const float taui = 0.866025403784439f;
+  int i, k, ic;
+  v4sf ci2, di2, di3, cr2, dr2, dr3, ti2, ti3, tr2, tr3, wr1, wi1, wr2, wi2;
+  for (k=0; k<l1; k++) {
+    cr2 = VADD(cc[(k + l1)*ido], cc[(k + 2*l1)*ido]);
+    ch[3*k*ido] = VADD(cc[k*ido], cr2);
+    ch[(3*k+2)*ido] = SVMUL(taui, VSUB(cc[(k + l1*2)*ido], cc[(k + l1)*ido]));
+    ch[ido-1 + (3*k + 1)*ido] = VADD(cc[k*ido], SVMUL(taur, cr2));
+  }
+  if (ido == 1) return;
+  for (k=0; k<l1; k++) {
+    for (i=2; i<ido; i+=2) {
+      ic = ido - i;
+      wr1 = LD_PS1(wa1[i - 2]); wi1 = LD_PS1(wa1[i - 1]);
+      dr2 = cc[i - 1 + (k + l1)*ido]; di2 = cc[i + (k + l1)*ido];
+      VCPLXMULCONJ(dr2, di2, wr1, wi1);
+
+      wr2 = LD_PS1(wa2[i - 2]); wi2 = LD_PS1(wa2[i - 1]);
+      dr3 = cc[i - 1 + (k + l1*2)*ido]; di3 = cc[i + (k + l1*2)*ido];
+      VCPLXMULCONJ(dr3, di3, wr2, wi2);
+        
+      cr2 = VADD(dr2, dr3);
+      ci2 = VADD(di2, di3);
+      ch[i - 1 + 3*k*ido] = VADD(cc[i - 1 + k*ido], cr2);
+      ch[i + 3*k*ido] = VADD(cc[i + k*ido], ci2);
+      tr2 = VADD(cc[i - 1 + k*ido], SVMUL(taur, cr2));
+      ti2 = VADD(cc[i + k*ido], SVMUL(taur, ci2));
+      tr3 = SVMUL(taui, VSUB(di2, di3));
+      ti3 = SVMUL(taui, VSUB(dr3, dr2));
+      ch[i - 1 + (3*k + 2)*ido] = VADD(tr2, tr3);
+      ch[ic - 1 + (3*k + 1)*ido] = VSUB(tr2, tr3);
+      ch[i + (3*k + 2)*ido] = VADD(ti2, ti3);
+      ch[ic + (3*k + 1)*ido] = VSUB(ti3, ti2);
+    }
+  }
+} /* radf3 */
+
+
+static void radb3_ps(int ido, int l1, const v4sf *RESTRICT cc, v4sf *RESTRICT ch,
+                     const float *wa1, const float *wa2)
+{
+  static const float taur = -0.5f;
+  static const float taui = 0.866025403784439f;
+  static const float taui_2 = 0.866025403784439f*2;
+  int i, k, ic;
+  v4sf ci2, ci3, di2, di3, cr2, cr3, dr2, dr3, ti2, tr2;
+  for (k=0; k<l1; k++) {
+    tr2 = cc[ido-1 + (3*k + 1)*ido]; tr2 = VADD(tr2,tr2);
+    cr2 = VMADD(LD_PS1(taur), tr2, cc[3*k*ido]);
+    ch[k*ido] = VADD(cc[3*k*ido], tr2);
+    ci3 = SVMUL(taui_2, cc[(3*k + 2)*ido]);
+    ch[(k + l1)*ido] = VSUB(cr2, ci3);
+    ch[(k + 2*l1)*ido] = VADD(cr2, ci3);
+  }
+  if (ido == 1) return;
+  for (k=0; k<l1; k++) {
+    for (i=2; i<ido; i+=2) {
+      ic = ido - i;
+      tr2 = VADD(cc[i - 1 + (3*k + 2)*ido], cc[ic - 1 + (3*k + 1)*ido]);
+      cr2 = VMADD(LD_PS1(taur), tr2, cc[i - 1 + 3*k*ido]);
+      ch[i - 1 + k*ido] = VADD(cc[i - 1 + 3*k*ido], tr2);
+      ti2 = VSUB(cc[i + (3*k + 2)*ido], cc[ic + (3*k + 1)*ido]);
+      ci2 = VMADD(LD_PS1(taur), ti2, cc[i + 3*k*ido]);
+      ch[i + k*ido] = VADD(cc[i + 3*k*ido], ti2);
+      cr3 = SVMUL(taui, VSUB(cc[i - 1 + (3*k + 2)*ido], cc[ic - 1 + (3*k + 1)*ido]));
+      ci3 = SVMUL(taui, VADD(cc[i + (3*k + 2)*ido], cc[ic + (3*k + 1)*ido]));
+      dr2 = VSUB(cr2, ci3);
+      dr3 = VADD(cr2, ci3);
+      di2 = VADD(ci2, cr3);
+      di3 = VSUB(ci2, cr3);
+      VCPLXMUL(dr2, di2, LD_PS1(wa1[i-2]), LD_PS1(wa1[i-1]));
+      ch[i - 1 + (k + l1)*ido] = dr2;
+      ch[i + (k + l1)*ido] = di2;
+      VCPLXMUL(dr3, di3, LD_PS1(wa2[i-2]), LD_PS1(wa2[i-1]));
+      ch[i - 1 + (k + 2*l1)*ido] = dr3;
+      ch[i + (k + 2*l1)*ido] = di3;
+    }
+  }
+} /* radb3 */
+
+static NEVER_INLINE(void) radf4_ps(int ido, int l1, const v4sf *RESTRICT cc, v4sf * RESTRICT ch,
+                                   const float * RESTRICT wa1, const float * RESTRICT wa2, const float * RESTRICT wa3)
+{
+  static const float minus_hsqt2 = (float)-0.7071067811865475;
+  int i, k, l1ido = l1*ido;
+  {
+    const v4sf *RESTRICT cc_ = cc, * RESTRICT cc_end = cc + l1ido; 
+    v4sf * RESTRICT ch_ = ch;
+    while (cc < cc_end) {
+      // this loop represents between 25% and 40% of total radf4_ps cost !
+      v4sf a0 = cc[0], a1 = cc[l1ido];
+      v4sf a2 = cc[2*l1ido], a3 = cc[3*l1ido];
+      v4sf tr1 = VADD(a1, a3);
+      v4sf tr2 = VADD(a0, a2);
+      ch[2*ido-1] = VSUB(a0, a2);
+      ch[2*ido  ] = VSUB(a3, a1);
+      ch[0      ] = VADD(tr1, tr2);
+      ch[4*ido-1] = VSUB(tr2, tr1);
+      cc += ido; ch += 4*ido;
+    }
+    cc = cc_; ch = ch_;
+  }
+  if (ido < 2) return;
+  if (ido != 2) {
+    for (k = 0; k < l1ido; k += ido) {
+      const v4sf * RESTRICT pc = (v4sf*)(cc + 1 + k);
+      for (i=2; i<ido; i += 2, pc += 2) {
+        int ic = ido - i;
+        v4sf wr, wi, cr2, ci2, cr3, ci3, cr4, ci4;
+        v4sf tr1, ti1, tr2, ti2, tr3, ti3, tr4, ti4;
+
+        cr2 = pc[1*l1ido+0];
+        ci2 = pc[1*l1ido+1];
+        wr=LD_PS1(wa1[i - 2]);
+        wi=LD_PS1(wa1[i - 1]);
+        VCPLXMULCONJ(cr2,ci2,wr,wi);
+
+        cr3 = pc[2*l1ido+0];
+        ci3 = pc[2*l1ido+1];
+        wr = LD_PS1(wa2[i-2]); 
+        wi = LD_PS1(wa2[i-1]);
+        VCPLXMULCONJ(cr3, ci3, wr, wi);
+
+        cr4 = pc[3*l1ido];
+        ci4 = pc[3*l1ido+1];
+        wr = LD_PS1(wa3[i-2]); 
+        wi = LD_PS1(wa3[i-1]);
+        VCPLXMULCONJ(cr4, ci4, wr, wi);
+
+        /* at this point, on SSE, five of "cr2 cr3 cr4 ci2 ci3 ci4" should be loaded in registers */
+
+        tr1 = VADD(cr2,cr4);
+        tr4 = VSUB(cr4,cr2); 
+        tr2 = VADD(pc[0],cr3);
+        tr3 = VSUB(pc[0],cr3);
+        ch[i - 1 + 4*k] = VADD(tr1,tr2);
+        ch[ic - 1 + 4*k + 3*ido] = VSUB(tr2,tr1); // at this point tr1 and tr2 can be disposed
+        ti1 = VADD(ci2,ci4);
+        ti4 = VSUB(ci2,ci4);
+        ch[i - 1 + 4*k + 2*ido] = VADD(ti4,tr3);
+        ch[ic - 1 + 4*k + 1*ido] = VSUB(tr3,ti4); // dispose tr3, ti4
+        ti2 = VADD(pc[1],ci3);
+        ti3 = VSUB(pc[1],ci3);
+        ch[i + 4*k] = VADD(ti1, ti2);
+        ch[ic + 4*k + 3*ido] = VSUB(ti1, ti2);
+        ch[i + 4*k + 2*ido] = VADD(tr4, ti3);
+        ch[ic + 4*k + 1*ido] = VSUB(tr4, ti3);
+      }
+    }
+    if (ido % 2 == 1) return;
+  }
+  for (k=0; k<l1ido; k += ido) {
+    v4sf a = cc[ido-1 + k + l1ido], b = cc[ido-1 + k + 3*l1ido];
+    v4sf c = cc[ido-1 + k], d = cc[ido-1 + k + 2*l1ido];
+    v4sf ti1 = SVMUL(minus_hsqt2, VADD(a, b));
+    v4sf tr1 = SVMUL(minus_hsqt2, VSUB(b, a));
+    ch[ido-1 + 4*k] = VADD(tr1, c);
+    ch[ido-1 + 4*k + 2*ido] = VSUB(c, tr1);
+    ch[4*k + 1*ido] = VSUB(ti1, d); 
+    ch[4*k + 3*ido] = VADD(ti1, d); 
+  }
+} /* radf4 */
+
+
+static NEVER_INLINE(void) radb4_ps(int ido, int l1, const v4sf * RESTRICT cc, v4sf * RESTRICT ch,
+                                   const float * RESTRICT wa1, const float * RESTRICT wa2, const float *RESTRICT wa3)
+{
+  static const float minus_sqrt2 = (float)-1.414213562373095;
+  static const float two = 2.f;
+  int i, k, l1ido = l1*ido;
+  v4sf ci2, ci3, ci4, cr2, cr3, cr4, ti1, ti2, ti3, ti4, tr1, tr2, tr3, tr4;
+  {
+    const v4sf *RESTRICT cc_ = cc, * RESTRICT ch_end = ch + l1ido; 
+    v4sf *ch_ = ch;
+    while (ch < ch_end) {
+      v4sf a = cc[0], b = cc[4*ido-1];
+      v4sf c = cc[2*ido], d = cc[2*ido-1];
+      tr3 = SVMUL(two,d);
+      tr2 = VADD(a,b);
+      tr1 = VSUB(a,b);
+      tr4 = SVMUL(two,c);
+      ch[0*l1ido] = VADD(tr2, tr3);
+      ch[2*l1ido] = VSUB(tr2, tr3);
+      ch[1*l1ido] = VSUB(tr1, tr4);
+      ch[3*l1ido] = VADD(tr1, tr4);
+      
+      cc += 4*ido; ch += ido;
+    }
+    cc = cc_; ch = ch_;
+  }
+  if (ido < 2) return;
+  if (ido != 2) {
+    for (k = 0; k < l1ido; k += ido) {
+      const v4sf * RESTRICT pc = (v4sf*)(cc - 1 + 4*k);
+      v4sf * RESTRICT ph = (v4sf*)(ch + k + 1);
+      for (i = 2; i < ido; i += 2) {
+
+        tr1 = VSUB(pc[i], pc[4*ido - i]);
+        tr2 = VADD(pc[i], pc[4*ido - i]);
+        ti4 = VSUB(pc[2*ido + i], pc[2*ido - i]);
+        tr3 = VADD(pc[2*ido + i], pc[2*ido - i]);
+        ph[0] = VADD(tr2, tr3);
+        cr3 = VSUB(tr2, tr3);
+
+        ti3 = VSUB(pc[2*ido + i + 1], pc[2*ido - i + 1]);
+        tr4 = VADD(pc[2*ido + i + 1], pc[2*ido - i + 1]);
+        cr2 = VSUB(tr1, tr4);
+        cr4 = VADD(tr1, tr4);
+
+        ti1 = VADD(pc[i + 1], pc[4*ido - i + 1]);
+        ti2 = VSUB(pc[i + 1], pc[4*ido - i + 1]);
+
+        ph[1] = VADD(ti2, ti3); ph += l1ido;
+        ci3 = VSUB(ti2, ti3);
+        ci2 = VADD(ti1, ti4);
+        ci4 = VSUB(ti1, ti4);
+        VCPLXMUL(cr2, ci2, LD_PS1(wa1[i-2]), LD_PS1(wa1[i-1]));
+        ph[0] = cr2;
+        ph[1] = ci2; ph += l1ido;
+        VCPLXMUL(cr3, ci3, LD_PS1(wa2[i-2]), LD_PS1(wa2[i-1]));
+        ph[0] = cr3;
+        ph[1] = ci3; ph += l1ido;
+        VCPLXMUL(cr4, ci4, LD_PS1(wa3[i-2]), LD_PS1(wa3[i-1]));
+        ph[0] = cr4;
+        ph[1] = ci4; ph = ph - 3*l1ido + 2;
+      }
+    }
+    if (ido % 2 == 1) return;
+  }
+  for (k=0; k < l1ido; k+=ido) {
+    int i0 = 4*k + ido;
+    v4sf c = cc[i0-1], d = cc[i0 + 2*ido-1];
+    v4sf a = cc[i0+0], b = cc[i0 + 2*ido+0];
+    tr1 = VSUB(c,d);
+    tr2 = VADD(c,d);
+    ti1 = VADD(b,a);
+    ti2 = VSUB(b,a);
+    ch[ido-1 + k + 0*l1ido] = VADD(tr2,tr2);
+    ch[ido-1 + k + 1*l1ido] = SVMUL(minus_sqrt2, VSUB(ti1, tr1));
+    ch[ido-1 + k + 2*l1ido] = VADD(ti2, ti2);
+    ch[ido-1 + k + 3*l1ido] = SVMUL(minus_sqrt2, VADD(ti1, tr1));
+  }
+} /* radb4 */
+
+static void radf5_ps(int ido, int l1, const v4sf * RESTRICT cc, v4sf * RESTRICT ch, 
+                     const float *wa1, const float *wa2, const float *wa3, const float *wa4)
+{
+  static const float tr11 = .309016994374947f;
+  static const float ti11 = .951056516295154f;
+  static const float tr12 = -.809016994374947f;
+  static const float ti12 = .587785252292473f;
+
+  /* System generated locals */
+  int cc_offset, ch_offset;
+
+  /* Local variables */
+  int i, k, ic;
+  v4sf ci2, di2, ci4, ci5, di3, di4, di5, ci3, cr2, cr3, dr2, dr3, dr4, dr5,
+    cr5, cr4, ti2, ti3, ti5, ti4, tr2, tr3, tr4, tr5;
+  int idp2;
+
+
+#define cc_ref(a_1,a_2,a_3) cc[((a_3)*l1 + (a_2))*ido + a_1]
+#define ch_ref(a_1,a_2,a_3) ch[((a_3)*5 + (a_2))*ido + a_1]
+
+  /* Parameter adjustments */
+  ch_offset = 1 + ido * 6;
+  ch -= ch_offset;
+  cc_offset = 1 + ido * (1 + l1);
+  cc -= cc_offset;
+
+  /* Function Body */
+  for (k = 1; k <= l1; ++k) {
+    cr2 = VADD(cc_ref(1, k, 5), cc_ref(1, k, 2));
+    ci5 = VSUB(cc_ref(1, k, 5), cc_ref(1, k, 2));
+    cr3 = VADD(cc_ref(1, k, 4), cc_ref(1, k, 3));
+    ci4 = VSUB(cc_ref(1, k, 4), cc_ref(1, k, 3));
+    ch_ref(1, 1, k) = VADD(cc_ref(1, k, 1), VADD(cr2, cr3));
+    ch_ref(ido, 2, k) = VADD(cc_ref(1, k, 1), VADD(SVMUL(tr11, cr2), SVMUL(tr12, cr3)));
+    ch_ref(1, 3, k) = VADD(SVMUL(ti11, ci5), SVMUL(ti12, ci4));
+    ch_ref(ido, 4, k) = VADD(cc_ref(1, k, 1), VADD(SVMUL(tr12, cr2), SVMUL(tr11, cr3)));
+    ch_ref(1, 5, k) = VSUB(SVMUL(ti12, ci5), SVMUL(ti11, ci4));
+    //printf("pffft: radf5, k=%d ch_ref=%f, ci4=%f\n", k, ch_ref(1, 5, k), ci4);
+  }
+  if (ido == 1) {
+    return;
+  }
+  idp2 = ido + 2;
+  for (k = 1; k <= l1; ++k) {
+    for (i = 3; i <= ido; i += 2) {
+      ic = idp2 - i;
+      dr2 = LD_PS1(wa1[i-3]); di2 = LD_PS1(wa1[i-2]);
+      dr3 = LD_PS1(wa2[i-3]); di3 = LD_PS1(wa2[i-2]);
+      dr4 = LD_PS1(wa3[i-3]); di4 = LD_PS1(wa3[i-2]);
+      dr5 = LD_PS1(wa4[i-3]); di5 = LD_PS1(wa4[i-2]);
+      VCPLXMULCONJ(dr2, di2, cc_ref(i-1, k, 2), cc_ref(i, k, 2));
+      VCPLXMULCONJ(dr3, di3, cc_ref(i-1, k, 3), cc_ref(i, k, 3));
+      VCPLXMULCONJ(dr4, di4, cc_ref(i-1, k, 4), cc_ref(i, k, 4));
+      VCPLXMULCONJ(dr5, di5, cc_ref(i-1, k, 5), cc_ref(i, k, 5));
+      cr2 = VADD(dr2, dr5);
+      ci5 = VSUB(dr5, dr2);
+      cr5 = VSUB(di2, di5);
+      ci2 = VADD(di2, di5);
+      cr3 = VADD(dr3, dr4);
+      ci4 = VSUB(dr4, dr3);
+      cr4 = VSUB(di3, di4);
+      ci3 = VADD(di3, di4);
+      ch_ref(i - 1, 1, k) = VADD(cc_ref(i - 1, k, 1), VADD(cr2, cr3));
+      ch_ref(i, 1, k) = VSUB(cc_ref(i, k, 1), VADD(ci2, ci3));//
+      tr2 = VADD(cc_ref(i - 1, k, 1), VADD(SVMUL(tr11, cr2), SVMUL(tr12, cr3)));
+      ti2 = VSUB(cc_ref(i, k, 1), VADD(SVMUL(tr11, ci2), SVMUL(tr12, ci3)));//
+      tr3 = VADD(cc_ref(i - 1, k, 1), VADD(SVMUL(tr12, cr2), SVMUL(tr11, cr3)));
+      ti3 = VSUB(cc_ref(i, k, 1), VADD(SVMUL(tr12, ci2), SVMUL(tr11, ci3)));//
+      tr5 = VADD(SVMUL(ti11, cr5), SVMUL(ti12, cr4));
+      ti5 = VADD(SVMUL(ti11, ci5), SVMUL(ti12, ci4));
+      tr4 = VSUB(SVMUL(ti12, cr5), SVMUL(ti11, cr4));
+      ti4 = VSUB(SVMUL(ti12, ci5), SVMUL(ti11, ci4));
+      ch_ref(i - 1, 3, k) = VSUB(tr2, tr5);
+      ch_ref(ic - 1, 2, k) = VADD(tr2, tr5);
+      ch_ref(i, 3, k) = VADD(ti2, ti5);
+      ch_ref(ic, 2, k) = VSUB(ti5, ti2);
+      ch_ref(i - 1, 5, k) = VSUB(tr3, tr4);
+      ch_ref(ic - 1, 4, k) = VADD(tr3, tr4);
+      ch_ref(i, 5, k) = VADD(ti3, ti4);
+      ch_ref(ic, 4, k) = VSUB(ti4, ti3);
+    }
+  }
+#undef cc_ref
+#undef ch_ref
+} /* radf5 */
+
+static void radb5_ps(int ido, int l1, const v4sf *RESTRICT cc, v4sf *RESTRICT ch, 
+                  const float *wa1, const float *wa2, const float *wa3, const float *wa4)
+{
+  static const float tr11 = .309016994374947f;
+  static const float ti11 = .951056516295154f;
+  static const float tr12 = -.809016994374947f;
+  static const float ti12 = .587785252292473f;
+
+  int cc_offset, ch_offset;
+
+  /* Local variables */
+  int i, k, ic;
+  v4sf ci2, ci3, ci4, ci5, di3, di4, di5, di2, cr2, cr3, cr5, cr4, ti2, ti3,
+    ti4, ti5, dr3, dr4, dr5, dr2, tr2, tr3, tr4, tr5;
+  int idp2;
+
+#define cc_ref(a_1,a_2,a_3) cc[((a_3)*5 + (a_2))*ido + a_1]
+#define ch_ref(a_1,a_2,a_3) ch[((a_3)*l1 + (a_2))*ido + a_1]
+
+  /* Parameter adjustments */
+  ch_offset = 1 + ido * (1 + l1);
+  ch -= ch_offset;
+  cc_offset = 1 + ido * 6;
+  cc -= cc_offset;
+
+  /* Function Body */
+  for (k = 1; k <= l1; ++k) {
+    ti5 = VADD(cc_ref(1, 3, k), cc_ref(1, 3, k));
+    ti4 = VADD(cc_ref(1, 5, k), cc_ref(1, 5, k));
+    tr2 = VADD(cc_ref(ido, 2, k), cc_ref(ido, 2, k));
+    tr3 = VADD(cc_ref(ido, 4, k), cc_ref(ido, 4, k));
+    ch_ref(1, k, 1) = VADD(cc_ref(1, 1, k), VADD(tr2, tr3));
+    cr2 = VADD(cc_ref(1, 1, k), VADD(SVMUL(tr11, tr2), SVMUL(tr12, tr3)));
+    cr3 = VADD(cc_ref(1, 1, k), VADD(SVMUL(tr12, tr2), SVMUL(tr11, tr3)));
+    ci5 = VADD(SVMUL(ti11, ti5), SVMUL(ti12, ti4));
+    ci4 = VSUB(SVMUL(ti12, ti5), SVMUL(ti11, ti4));
+    ch_ref(1, k, 2) = VSUB(cr2, ci5);
+    ch_ref(1, k, 3) = VSUB(cr3, ci4);
+    ch_ref(1, k, 4) = VADD(cr3, ci4);
+    ch_ref(1, k, 5) = VADD(cr2, ci5);
+  }
+  if (ido == 1) {
+    return;
+  }
+  idp2 = ido + 2;
+  for (k = 1; k <= l1; ++k) {
+    for (i = 3; i <= ido; i += 2) {
+      ic = idp2 - i;
+      ti5 = VADD(cc_ref(i  , 3, k), cc_ref(ic  , 2, k));
+      ti2 = VSUB(cc_ref(i  , 3, k), cc_ref(ic  , 2, k));
+      ti4 = VADD(cc_ref(i  , 5, k), cc_ref(ic  , 4, k));
+      ti3 = VSUB(cc_ref(i  , 5, k), cc_ref(ic  , 4, k));
+      tr5 = VSUB(cc_ref(i-1, 3, k), cc_ref(ic-1, 2, k));
+      tr2 = VADD(cc_ref(i-1, 3, k), cc_ref(ic-1, 2, k));
+      tr4 = VSUB(cc_ref(i-1, 5, k), cc_ref(ic-1, 4, k));
+      tr3 = VADD(cc_ref(i-1, 5, k), cc_ref(ic-1, 4, k));
+      ch_ref(i - 1, k, 1) = VADD(cc_ref(i-1, 1, k), VADD(tr2, tr3));
+      ch_ref(i, k, 1) = VADD(cc_ref(i, 1, k), VADD(ti2, ti3));
+      cr2 = VADD(cc_ref(i-1, 1, k), VADD(SVMUL(tr11, tr2), SVMUL(tr12, tr3)));
+      ci2 = VADD(cc_ref(i  , 1, k), VADD(SVMUL(tr11, ti2), SVMUL(tr12, ti3)));
+      cr3 = VADD(cc_ref(i-1, 1, k), VADD(SVMUL(tr12, tr2), SVMUL(tr11, tr3)));
+      ci3 = VADD(cc_ref(i  , 1, k), VADD(SVMUL(tr12, ti2), SVMUL(tr11, ti3)));
+      cr5 = VADD(SVMUL(ti11, tr5), SVMUL(ti12, tr4));
+      ci5 = VADD(SVMUL(ti11, ti5), SVMUL(ti12, ti4));
+      cr4 = VSUB(SVMUL(ti12, tr5), SVMUL(ti11, tr4));
+      ci4 = VSUB(SVMUL(ti12, ti5), SVMUL(ti11, ti4));
+      dr3 = VSUB(cr3, ci4);
+      dr4 = VADD(cr3, ci4);
+      di3 = VADD(ci3, cr4);
+      di4 = VSUB(ci3, cr4);
+      dr5 = VADD(cr2, ci5);
+      dr2 = VSUB(cr2, ci5);
+      di5 = VSUB(ci2, cr5);
+      di2 = VADD(ci2, cr5);
+      VCPLXMUL(dr2, di2, LD_PS1(wa1[i-3]), LD_PS1(wa1[i-2]));
+      VCPLXMUL(dr3, di3, LD_PS1(wa2[i-3]), LD_PS1(wa2[i-2]));
+      VCPLXMUL(dr4, di4, LD_PS1(wa3[i-3]), LD_PS1(wa3[i-2]));
+      VCPLXMUL(dr5, di5, LD_PS1(wa4[i-3]), LD_PS1(wa4[i-2]));
+
+      ch_ref(i-1, k, 2) = dr2; ch_ref(i, k, 2) = di2;
+      ch_ref(i-1, k, 3) = dr3; ch_ref(i, k, 3) = di3;
+      ch_ref(i-1, k, 4) = dr4; ch_ref(i, k, 4) = di4;
+      ch_ref(i-1, k, 5) = dr5; ch_ref(i, k, 5) = di5;
+    }
+  }
+#undef cc_ref
+#undef ch_ref
+} /* radb5 */
+
+static NEVER_INLINE(v4sf *) rfftf1_ps(int n, const v4sf *input_readonly, v4sf *work1, v4sf *work2, 
+                                      const float *wa, const int *ifac) {  
+  v4sf *in  = (v4sf*)input_readonly;
+  v4sf *out = (in == work2 ? work1 : work2);
+  int nf = ifac[1], k1;
+  int l2 = n;
+  int iw = n-1;
+  assert(in != out && work1 != work2);
+  for (k1 = 1; k1 <= nf; ++k1) {
+    int kh = nf - k1;
+    int ip = ifac[kh + 2];
+    int l1 = l2 / ip;
+    int ido = n / l2;
+    iw -= (ip - 1)*ido;
+    switch (ip) {
+      case 5: {
+        int ix2 = iw + ido;
+        int ix3 = ix2 + ido;
+        int ix4 = ix3 + ido;
+        radf5_ps(ido, l1, in, out, &wa[iw], &wa[ix2], &wa[ix3], &wa[ix4]);
+      } break;
+      case 4: {
+        int ix2 = iw + ido;
+        int ix3 = ix2 + ido;
+        radf4_ps(ido, l1, in, out, &wa[iw], &wa[ix2], &wa[ix3]);
+      } break;
+      case 3: {
+        int ix2 = iw + ido;
+        radf3_ps(ido, l1, in, out, &wa[iw], &wa[ix2]);
+      } break;
+      case 2:
+        radf2_ps(ido, l1, in, out, &wa[iw]);
+        break;
+      default:
+        assert(0);
+        break;
+    }
+    l2 = l1;
+    if (out == work2) {
+      out = work1; in = work2;
+    } else {
+      out = work2; in = work1;
+    }
+  }
+  return in; /* this is in fact the output .. */
+} /* rfftf1 */
+
+static NEVER_INLINE(v4sf *) rfftb1_ps(int n, const v4sf *input_readonly, v4sf *work1, v4sf *work2, 
+                                      const float *wa, const int *ifac) {  
+  v4sf *in  = (v4sf*)input_readonly;
+  v4sf *out = (in == work2 ? work1 : work2);
+  int nf = ifac[1], k1;
+  int l1 = 1;
+  int iw = 0;
+  assert(in != out);
+  for (k1=1; k1<=nf; k1++) {
+    int ip = ifac[k1 + 1];
+    int l2 = ip*l1;
+    int ido = n / l2;
+    switch (ip) {
+      case 5: {
+        int ix2 = iw + ido;
+        int ix3 = ix2 + ido;
+        int ix4 = ix3 + ido;
+        radb5_ps(ido, l1, in, out, &wa[iw], &wa[ix2], &wa[ix3], &wa[ix4]);
+      } break;
+      case 4: {
+        int ix2 = iw + ido;
+        int ix3 = ix2 + ido;
+        radb4_ps(ido, l1, in, out, &wa[iw], &wa[ix2], &wa[ix3]);
+      } break;
+      case 3: {
+        int ix2 = iw + ido;
+        radb3_ps(ido, l1, in, out, &wa[iw], &wa[ix2]);
+      } break;
+      case 2:
+        radb2_ps(ido, l1, in, out, &wa[iw]);
+        break;
+      default:
+        assert(0);
+        break;
+    }
+    l1 = l2;
+    iw += (ip - 1)*ido;
+
+    if (out == work2) {
+      out = work1; in = work2;
+    } else {
+      out = work2; in = work1;
+    }
+  }
+  return in; /* this is in fact the output .. */
+}
+
+static int decompose(int n, int *ifac, const int *ntryh) {
+  int nl = n, nf = 0, i, j = 0;
+  for (j=0; ntryh[j]; ++j) {
+    int ntry = ntryh[j];
+    while (nl != 1) {
+      int nq = nl / ntry;
+      int nr = nl - ntry * nq;
+      if (nr == 0) {
+        ifac[2+nf++] = ntry;
+        nl = nq;
+        if (ntry == 2 && nf != 1) {
+          for (i = 2; i <= nf; ++i) {
+            int ib = nf - i + 2;
+            ifac[ib + 1] = ifac[ib];
+          }
+          ifac[2] = 2;
+        }
+      } else break;
+    }
+  }
+  ifac[0] = n;
+  ifac[1] = nf;  
+  return nf;
+}
+
+
+
+static void rffti1_ps(int n, float *wa, int *ifac)
+{
+  static const int ntryh[] = { 4,2,3,5,0 };
+  int k1, j, ii;
+
+  int nf = decompose(n,ifac,ntryh);
+  float argh = (2*M_PI) / n;
+  int is = 0;
+  int nfm1 = nf - 1;
+  int l1 = 1;
+  for (k1 = 1; k1 <= nfm1; k1++) {
+    int ip = ifac[k1 + 1];
+    int ld = 0;
+    int l2 = l1*ip;
+    int ido = n / l2;
+    int ipm = ip - 1;
+    for (j = 1; j <= ipm; ++j) {
+      float argld;
+      int i = is, fi=0;
+      ld += l1;
+      argld = ld*argh;
+      for (ii = 3; ii <= ido; ii += 2) {
+        i += 2;
+        fi += 1;
+        wa[i - 2] = cos(fi*argld);
+        wa[i - 1] = sin(fi*argld);
+      }
+      is += ido;
+    }
+    l1 = l2;
+  }
+} /* rffti1 */
+
+void cffti1_ps(int n, float *wa, int *ifac)
+{
+  static const int ntryh[] = { 5,3,4,2,0 };
+  int k1, j, ii;
+
+  int nf = decompose(n,ifac,ntryh);
+  float argh = (2*M_PI)/(float)n;
+  int i = 1;
+  int l1 = 1;
+  for (k1=1; k1<=nf; k1++) {
+    int ip = ifac[k1+1];
+    int ld = 0;
+    int l2 = l1*ip;
+    int ido = n / l2;
+    int idot = ido + ido + 2;
+    int ipm = ip - 1;
+    for (j=1; j<=ipm; j++) {
+      float argld;
+      int i1 = i, fi = 0;
+      wa[i-1] = 1;
+      wa[i] = 0;
+      ld += l1;
+      argld = ld*argh;
+      for (ii = 4; ii <= idot; ii += 2) {
+        i += 2;
+        fi += 1;
+        wa[i-1] = cos(fi*argld);
+        wa[i] = sin(fi*argld);
+      }
+      if (ip > 5) {
+        wa[i1-1] = wa[i-1];
+        wa[i1] = wa[i];
+      }
+    }
+    l1 = l2;
+  }
+} /* cffti1 */
+
+
+v4sf *cfftf1_ps(int n, const v4sf *input_readonly, v4sf *work1, v4sf *work2, const float *wa, const int *ifac, int isign) {
+  v4sf *in  = (v4sf*)input_readonly;
+  v4sf *out = (in == work2 ? work1 : work2); 
+  int nf = ifac[1], k1;
+  int l1 = 1;
+  int iw = 0;
+  assert(in != out && work1 != work2);
+  for (k1=2; k1<=nf+1; k1++) {
+    int ip = ifac[k1];
+    int l2 = ip*l1;
+    int ido = n / l2;
+    int idot = ido + ido;
+    switch (ip) {
+      case 5: {
+        int ix2 = iw + idot;
+        int ix3 = ix2 + idot;
+        int ix4 = ix3 + idot;
+        passf5_ps(idot, l1, in, out, &wa[iw], &wa[ix2], &wa[ix3], &wa[ix4], isign);
+      } break;
+      case 4: {
+        int ix2 = iw + idot;
+        int ix3 = ix2 + idot;
+        passf4_ps(idot, l1, in, out, &wa[iw], &wa[ix2], &wa[ix3], isign);
+      } break;
+      case 2: {
+        passf2_ps(idot, l1, in, out, &wa[iw], isign);
+      } break;
+      case 3: {
+        int ix2 = iw + idot;
+        passf3_ps(idot, l1, in, out, &wa[iw], &wa[ix2], isign);
+      } break;
+      default:
+        assert(0);
+    }
+    l1 = l2;
+    iw += (ip - 1)*idot;
+    if (out == work2) {
+      out = work1; in = work2;
+    } else {
+      out = work2; in = work1;
+    }
+  }
+
+  return in; /* this is in fact the output .. */
+}
+
+
+struct PFFFT_Setup {
+  int     N;
+  int     Ncvec; // nb of complex simd vectors (N/4 if PFFFT_COMPLEX, N/8 if PFFFT_REAL)
+  int ifac[15];
+  pffft_transform_t transform;
+  v4sf *data; // allocated room for twiddle coefs
+  float *e;    // points into 'data' , N/4*3 elements
+  float *twiddle; // points into 'data', N/4 elements
+};
+
+PFFFT_Setup *pffft_new_setup(int N, pffft_transform_t transform) {
+  PFFFT_Setup *s = (PFFFT_Setup*)malloc(sizeof(PFFFT_Setup));
+  int k, m;
+  /* unfortunately, the fft size must be a multiple of 16 for complex FFTs 
+     and 32 for real FFTs -- a lot of stuff would need to be rewritten to
+     handle other cases (or maybe just switch to a scalar fft, I don't know..) */
+  if (transform == PFFFT_REAL) { assert((N%(2*SIMD_SZ*SIMD_SZ))==0 && N>0); }
+  if (transform == PFFFT_COMPLEX) { assert((N%(SIMD_SZ*SIMD_SZ))==0 && N>0); }
+  //assert((N % 32) == 0);
+  s->N = N;
+  s->transform = transform;  
+  /* nb of complex simd vectors */
+  s->Ncvec = (transform == PFFFT_REAL ? N/2 : N)/SIMD_SZ;
+  s->data = (v4sf*)pffft_aligned_malloc(2*s->Ncvec * sizeof(v4sf));
+  s->e = (float*)s->data;
+  s->twiddle = (float*)(s->data + (2*s->Ncvec*(SIMD_SZ-1))/SIMD_SZ);  
+
+  if (transform == PFFFT_REAL) {
+    for (k=0; k < s->Ncvec; ++k) {
+      int i = k/SIMD_SZ;
+      int j = k%SIMD_SZ;
+      for (m=0; m < SIMD_SZ-1; ++m) {
+        float A = -2*M_PI*(m+1)*k / N;
+        s->e[(2*(i*3 + m) + 0) * SIMD_SZ + j] = cos(A);
+        s->e[(2*(i*3 + m) + 1) * SIMD_SZ + j] = sin(A);
+      }
+    }
+    rffti1_ps(N/SIMD_SZ, s->twiddle, s->ifac);
+  } else {
+    for (k=0; k < s->Ncvec; ++k) {
+      int i = k/SIMD_SZ;
+      int j = k%SIMD_SZ;
+      for (m=0; m < SIMD_SZ-1; ++m) {
+        float A = -2*M_PI*(m+1)*k / N;
+        s->e[(2*(i*3 + m) + 0)*SIMD_SZ + j] = cos(A);
+        s->e[(2*(i*3 + m) + 1)*SIMD_SZ + j] = sin(A);
+      }
+    }
+    cffti1_ps(N/SIMD_SZ, s->twiddle, s->ifac);
+  }
+
+  /* check that N is decomposable with allowed prime factors */
+  for (k=0, m=1; k < s->ifac[1]; ++k) { m *= s->ifac[2+k]; }
+  if (m != N/SIMD_SZ) {
+    pffft_destroy_setup(s); s = 0;
+  }
+
+  return s;
+}
+
+
+void pffft_destroy_setup(PFFFT_Setup *s) {
+  pffft_aligned_free(s->data);
+  free(s);
+}
+
+#if !defined(PFFFT_SIMD_DISABLE)
+
+/* [0 0 1 2 3 4 5 6 7 8] -> [0 8 7 6 5 4 3 2 1] */
+static void reversed_copy(int N, const v4sf *in, int in_stride, v4sf *out) {
+  v4sf g0, g1;
+  int k;
+  INTERLEAVE2(in[0], in[1], g0, g1); in += in_stride;
+  
+  *--out = VSWAPHL(g0, g1); // [g0l, g0h], [g1l g1h] -> [g1l, g0h]
+  for (k=1; k < N; ++k) {
+    v4sf h0, h1;
+    INTERLEAVE2(in[0], in[1], h0, h1); in += in_stride;
+    *--out = VSWAPHL(g1, h0);
+    *--out = VSWAPHL(h0, h1);
+    g1 = h1;
+  }
+  *--out = VSWAPHL(g1, g0);
+}
+
+static void unreversed_copy(int N, const v4sf *in, v4sf *out, int out_stride) {
+  v4sf g0, g1, h0, h1;
+  int k;
+  g0 = g1 = in[0]; ++in;
+  for (k=1; k < N; ++k) {
+    h0 = *in++; h1 = *in++;
+    g1 = VSWAPHL(g1, h0);
+    h0 = VSWAPHL(h0, h1);
+    UNINTERLEAVE2(h0, g1, out[0], out[1]); out += out_stride;
+    g1 = h1;
+  }
+  h0 = *in++; h1 = g0;
+  g1 = VSWAPHL(g1, h0);
+  h0 = VSWAPHL(h0, h1);
+  UNINTERLEAVE2(h0, g1, out[0], out[1]);
+}
+
+void pffft_zreorder(PFFFT_Setup *setup, const float *in, float *out, pffft_direction_t direction) {
+  int k, N = setup->N, Ncvec = setup->Ncvec;
+  const v4sf *vin = (const v4sf*)in;
+  v4sf *vout = (v4sf*)out;
+  assert(in != out);
+  if (setup->transform == PFFFT_REAL) {
+    int k, dk = N/32;
+    if (direction == PFFFT_FORWARD) {
+      for (k=0; k < dk; ++k) {
+        INTERLEAVE2(vin[k*8 + 0], vin[k*8 + 1], vout[2*(0*dk + k) + 0], vout[2*(0*dk + k) + 1]);
+        INTERLEAVE2(vin[k*8 + 4], vin[k*8 + 5], vout[2*(2*dk + k) + 0], vout[2*(2*dk + k) + 1]);
+      }
+      reversed_copy(dk, vin+2, 8, (v4sf*)(out + N/2));
+      reversed_copy(dk, vin+6, 8, (v4sf*)(out + N));
+    } else {
+      for (k=0; k < dk; ++k) {
+        UNINTERLEAVE2(vin[2*(0*dk + k) + 0], vin[2*(0*dk + k) + 1], vout[k*8 + 0], vout[k*8 + 1]);
+        UNINTERLEAVE2(vin[2*(2*dk + k) + 0], vin[2*(2*dk + k) + 1], vout[k*8 + 4], vout[k*8 + 5]);
+      }
+      unreversed_copy(dk, (v4sf*)(in + N/4), (v4sf*)(out + N - 6*SIMD_SZ), -8);
+      unreversed_copy(dk, (v4sf*)(in + 3*N/4), (v4sf*)(out + N - 2*SIMD_SZ), -8);
+    }
+  } else {
+    if (direction == PFFFT_FORWARD) {
+      for (k=0; k < Ncvec; ++k) { 
+        int kk = (k/4) + (k%4)*(Ncvec/4);
+        INTERLEAVE2(vin[k*2], vin[k*2+1], vout[kk*2], vout[kk*2+1]);
+      }
+    } else {
+      for (k=0; k < Ncvec; ++k) { 
+        int kk = (k/4) + (k%4)*(Ncvec/4);
+        UNINTERLEAVE2(vin[kk*2], vin[kk*2+1], vout[k*2], vout[k*2+1]);
+      }
+    }
+  }
+}
+
+void pffft_cplx_finalize(int Ncvec, const v4sf *in, v4sf *out, const v4sf *e) {
+  int k, dk = Ncvec/SIMD_SZ; // number of 4x4 matrix blocks
+  v4sf r0, i0, r1, i1, r2, i2, r3, i3;
+  v4sf sr0, dr0, sr1, dr1, si0, di0, si1, di1;
+  assert(in != out);
+  for (k=0; k < dk; ++k) {    
+    r0 = in[8*k+0]; i0 = in[8*k+1];
+    r1 = in[8*k+2]; i1 = in[8*k+3];
+    r2 = in[8*k+4]; i2 = in[8*k+5];
+    r3 = in[8*k+6]; i3 = in[8*k+7];
+    VTRANSPOSE4(r0,r1,r2,r3);
+    VTRANSPOSE4(i0,i1,i2,i3);
+    VCPLXMUL(r1,i1,e[k*6+0],e[k*6+1]);
+    VCPLXMUL(r2,i2,e[k*6+2],e[k*6+3]);
+    VCPLXMUL(r3,i3,e[k*6+4],e[k*6+5]);
+
+    sr0 = VADD(r0,r2); dr0 = VSUB(r0, r2);
+    sr1 = VADD(r1,r3); dr1 = VSUB(r1, r3);
+    si0 = VADD(i0,i2); di0 = VSUB(i0, i2);
+    si1 = VADD(i1,i3); di1 = VSUB(i1, i3);
+
+    /*
+      transformation for each column is:
+      
+      [1   1   1   1   0   0   0   0]   [r0]
+      [1   0  -1   0   0  -1   0   1]   [r1]
+      [1  -1   1  -1   0   0   0   0]   [r2]
+      [1   0  -1   0   0   1   0  -1]   [r3]
+      [0   0   0   0   1   1   1   1] * [i0]
+      [0   1   0  -1   1   0  -1   0]   [i1]
+      [0   0   0   0   1  -1   1  -1]   [i2]
+      [0  -1   0   1   1   0  -1   0]   [i3]    
+    */
+    
+    r0 = VADD(sr0, sr1); i0 = VADD(si0, si1);
+    r1 = VADD(dr0, di1); i1 = VSUB(di0, dr1);
+    r2 = VSUB(sr0, sr1); i2 = VSUB(si0, si1);
+    r3 = VSUB(dr0, di1); i3 = VADD(di0, dr1);
+  
+    *out++ = r0; *out++ = i0; *out++ = r1; *out++ = i1;
+    *out++ = r2; *out++ = i2; *out++ = r3; *out++ = i3;
+  }
+}
+
+void pffft_cplx_preprocess(int Ncvec, const v4sf *in, v4sf *out, const v4sf *e) {
+  int k, dk = Ncvec/SIMD_SZ; // number of 4x4 matrix blocks
+  v4sf r0, i0, r1, i1, r2, i2, r3, i3;
+  v4sf sr0, dr0, sr1, dr1, si0, di0, si1, di1;
+  assert(in != out);
+  for (k=0; k < dk; ++k) {    
+    r0 = in[8*k+0]; i0 = in[8*k+1];
+    r1 = in[8*k+2]; i1 = in[8*k+3];
+    r2 = in[8*k+4]; i2 = in[8*k+5];
+    r3 = in[8*k+6]; i3 = in[8*k+7];
+
+    sr0 = VADD(r0,r2); dr0 = VSUB(r0, r2);
+    sr1 = VADD(r1,r3); dr1 = VSUB(r1, r3);
+    si0 = VADD(i0,i2); di0 = VSUB(i0, i2);
+    si1 = VADD(i1,i3); di1 = VSUB(i1, i3);
+
+    r0 = VADD(sr0, sr1); i0 = VADD(si0, si1);
+    r1 = VSUB(dr0, di1); i1 = VADD(di0, dr1);
+    r2 = VSUB(sr0, sr1); i2 = VSUB(si0, si1);
+    r3 = VADD(dr0, di1); i3 = VSUB(di0, dr1);
+
+    VCPLXMULCONJ(r1,i1,e[k*6+0],e[k*6+1]);
+    VCPLXMULCONJ(r2,i2,e[k*6+2],e[k*6+3]);
+    VCPLXMULCONJ(r3,i3,e[k*6+4],e[k*6+5]);
+
+    VTRANSPOSE4(r0,r1,r2,r3);
+    VTRANSPOSE4(i0,i1,i2,i3);
+
+    *out++ = r0; *out++ = i0; *out++ = r1; *out++ = i1;
+    *out++ = r2; *out++ = i2; *out++ = r3; *out++ = i3;
+  }
+}
+
+
+static ALWAYS_INLINE(void) pffft_real_finalize_4x4(const v4sf *in0, const v4sf *in1, const v4sf *in,
+                            const v4sf *e, v4sf *out) {
+  v4sf r0, i0, r1, i1, r2, i2, r3, i3;
+  v4sf sr0, dr0, sr1, dr1, si0, di0, si1, di1;
+  r0 = *in0; i0 = *in1;
+  r1 = *in++; i1 = *in++; r2 = *in++; i2 = *in++; r3 = *in++; i3 = *in++;
+  VTRANSPOSE4(r0,r1,r2,r3);
+  VTRANSPOSE4(i0,i1,i2,i3);
+ 
+  /*
+    transformation for each column is:
+
+    [1   1   1   1   0   0   0   0]   [r0]
+    [1   0  -1   0   0  -1   0   1]   [r1]
+    [1   0  -1   0   0   1   0  -1]   [r2]
+    [1  -1   1  -1   0   0   0   0]   [r3]
+    [0   0   0   0   1   1   1   1] * [i0]
+    [0  -1   0   1  -1   0   1   0]   [i1]
+    [0  -1   0   1   1   0  -1   0]   [i2]
+    [0   0   0   0  -1   1  -1   1]   [i3]    
+  */
+  
+  //cerr << "matrix initial, before e , REAL:\n 1: " << r0 << "\n 1: " << r1 << "\n 1: " << r2 << "\n 1: " << r3 << "\n";
+  //cerr << "matrix initial, before e, IMAG :\n 1: " << i0 << "\n 1: " << i1 << "\n 1: " << i2 << "\n 1: " << i3 << "\n";
+
+  VCPLXMUL(r1,i1,e[0],e[1]);
+  VCPLXMUL(r2,i2,e[2],e[3]);
+  VCPLXMUL(r3,i3,e[4],e[5]);
+
+  //cerr << "matrix initial, real part:\n 1: " << r0 << "\n 1: " << r1 << "\n 1: " << r2 << "\n 1: " << r3 << "\n";
+  //cerr << "matrix initial, imag part:\n 1: " << i0 << "\n 1: " << i1 << "\n 1: " << i2 << "\n 1: " << i3 << "\n";
+
+  sr0 = VADD(r0,r2); dr0 = VSUB(r0,r2); 
+  sr1 = VADD(r1,r3); dr1 = VSUB(r3,r1);
+  si0 = VADD(i0,i2); di0 = VSUB(i0,i2); 
+  si1 = VADD(i1,i3); di1 = VSUB(i3,i1);
+
+  r0 = VADD(sr0, sr1);
+  r3 = VSUB(sr0, sr1);
+  i0 = VADD(si0, si1);
+  i3 = VSUB(si1, si0);
+  r1 = VADD(dr0, di1);
+  r2 = VSUB(dr0, di1);
+  i1 = VSUB(dr1, di0);
+  i2 = VADD(dr1, di0);
+
+  *out++ = r0;
+  *out++ = i0;
+  *out++ = r1;
+  *out++ = i1;
+  *out++ = r2;
+  *out++ = i2;
+  *out++ = r3;
+  *out++ = i3;
+
+}
+
+static NEVER_INLINE(void) pffft_real_finalize(int Ncvec, const v4sf *in, v4sf *out, const v4sf *e) {
+  int k, dk = Ncvec/SIMD_SZ; // number of 4x4 matrix blocks
+  /* fftpack order is f0r f1r f1i f2r f2i ... f(n-1)r f(n-1)i f(n)r */
+
+  v4sf_union cr, ci, *uout = (v4sf_union*)out;
+  v4sf save = in[7], zero=VZERO();
+  float xr0, xi0, xr1, xi1, xr2, xi2, xr3, xi3;
+  static const float s = M_SQRT2/2;
+
+  cr.v = in[0]; ci.v = in[Ncvec*2-1];
+  assert(in != out);
+  pffft_real_finalize_4x4(&zero, &zero, in+1, e, out);
+
+  /*
+    [cr0 cr1 cr2 cr3 ci0 ci1 ci2 ci3]
+
+    [Xr(1)]  ] [1   1   1   1   0   0   0   0]
+    [Xr(N/4) ] [0   0   0   0   1   s   0  -s]
+    [Xr(N/2) ] [1   0  -1   0   0   0   0   0]
+    [Xr(3N/4)] [0   0   0   0   1  -s   0   s]
+    [Xi(1)   ] [1  -1   1  -1   0   0   0   0]
+    [Xi(N/4) ] [0   0   0   0   0  -s  -1  -s]
+    [Xi(N/2) ] [0  -1   0   1   0   0   0   0]
+    [Xi(3N/4)] [0   0   0   0   0  -s   1  -s]
+  */
+
+  xr0=(cr.f[0]+cr.f[2]) + (cr.f[1]+cr.f[3]); uout[0].f[0] = xr0;
+  xi0=(cr.f[0]+cr.f[2]) - (cr.f[1]+cr.f[3]); uout[1].f[0] = xi0;
+  xr2=(cr.f[0]-cr.f[2]);                     uout[4].f[0] = xr2;
+  xi2=(cr.f[3]-cr.f[1]);                     uout[5].f[0] = xi2;
+  xr1= ci.f[0] + s*(ci.f[1]-ci.f[3]);        uout[2].f[0] = xr1;
+  xi1=-ci.f[2] - s*(ci.f[1]+ci.f[3]);        uout[3].f[0] = xi1;
+  xr3= ci.f[0] - s*(ci.f[1]-ci.f[3]);        uout[6].f[0] = xr3;
+  xi3= ci.f[2] - s*(ci.f[1]+ci.f[3]);        uout[7].f[0] = xi3; 
+
+  for (k=1; k < dk; ++k) {
+    v4sf save_next = in[8*k+7];
+    pffft_real_finalize_4x4(&save, &in[8*k+0], in + 8*k+1,
+                           e + k*6, out + k*8);
+    save = save_next;
+  }
+
+}
+
+static ALWAYS_INLINE(void) pffft_real_preprocess_4x4(const v4sf *in, 
+                                             const v4sf *e, v4sf *out, int first) {
+  v4sf r0=in[0], i0=in[1], r1=in[2], i1=in[3], r2=in[4], i2=in[5], r3=in[6], i3=in[7];
+  /*
+    transformation for each column is:
+
+    [1   1   1   1   0   0   0   0]   [r0]
+    [1   0   0  -1   0  -1  -1   0]   [r1]
+    [1  -1  -1   1   0   0   0   0]   [r2]
+    [1   0   0  -1   0   1   1   0]   [r3]
+    [0   0   0   0   1  -1   1  -1] * [i0]
+    [0  -1   1   0   1   0   0   1]   [i1]
+    [0   0   0   0   1   1  -1  -1]   [i2]
+    [0   1  -1   0   1   0   0   1]   [i3]    
+  */
+
+  v4sf sr0 = VADD(r0,r3), dr0 = VSUB(r0,r3); 
+  v4sf sr1 = VADD(r1,r2), dr1 = VSUB(r1,r2);
+  v4sf si0 = VADD(i0,i3), di0 = VSUB(i0,i3); 
+  v4sf si1 = VADD(i1,i2), di1 = VSUB(i1,i2);
+
+  r0 = VADD(sr0, sr1);
+  r2 = VSUB(sr0, sr1);
+  r1 = VSUB(dr0, si1);
+  r3 = VADD(dr0, si1);
+  i0 = VSUB(di0, di1);
+  i2 = VADD(di0, di1);
+  i1 = VSUB(si0, dr1);
+  i3 = VADD(si0, dr1);
+
+  VCPLXMULCONJ(r1,i1,e[0],e[1]);
+  VCPLXMULCONJ(r2,i2,e[2],e[3]);
+  VCPLXMULCONJ(r3,i3,e[4],e[5]);
+
+  VTRANSPOSE4(r0,r1,r2,r3);
+  VTRANSPOSE4(i0,i1,i2,i3);
+
+  if (!first) {
+    *out++ = r0;
+    *out++ = i0;
+  }
+  *out++ = r1;
+  *out++ = i1;
+  *out++ = r2;
+  *out++ = i2;
+  *out++ = r3;
+  *out++ = i3;
+}
+
+static NEVER_INLINE(void) pffft_real_preprocess(int Ncvec, const v4sf *in, v4sf *out, const v4sf *e) {
+  int k, dk = Ncvec/SIMD_SZ; // number of 4x4 matrix blocks
+  /* fftpack order is f0r f1r f1i f2r f2i ... f(n-1)r f(n-1)i f(n)r */
+
+  v4sf_union Xr, Xi, *uout = (v4sf_union*)out;
+  float cr0, ci0, cr1, ci1, cr2, ci2, cr3, ci3;
+  static const float s = M_SQRT2;
+  assert(in != out);
+  for (k=0; k < 4; ++k) {
+    Xr.f[k] = ((float*)in)[8*k];
+    Xi.f[k] = ((float*)in)[8*k+4];
+  }
+
+  pffft_real_preprocess_4x4(in, e, out+1, 1); // will write only 6 values
+
+  /*
+    [Xr0 Xr1 Xr2 Xr3 Xi0 Xi1 Xi2 Xi3]
+
+    [cr0] [1   0   2   0   1   0   0   0]
+    [cr1] [1   0   0   0  -1   0  -2   0]
+    [cr2] [1   0  -2   0   1   0   0   0]
+    [cr3] [1   0   0   0  -1   0   2   0]
+    [ci0] [0   2   0   2   0   0   0   0]
+    [ci1] [0   s   0  -s   0  -s   0  -s]
+    [ci2] [0   0   0   0   0  -2   0   2]
+    [ci3] [0  -s   0   s   0  -s   0  -s]
+  */
+  for (k=1; k < dk; ++k) {    
+    pffft_real_preprocess_4x4(in+8*k, e + k*6, out-1+k*8, 0);
+  }
+
+  cr0=(Xr.f[0]+Xi.f[0]) + 2*Xr.f[2]; uout[0].f[0] = cr0;
+  cr1=(Xr.f[0]-Xi.f[0]) - 2*Xi.f[2]; uout[0].f[1] = cr1;
+  cr2=(Xr.f[0]+Xi.f[0]) - 2*Xr.f[2]; uout[0].f[2] = cr2;
+  cr3=(Xr.f[0]-Xi.f[0]) + 2*Xi.f[2]; uout[0].f[3] = cr3;
+  ci0= 2*(Xr.f[1]+Xr.f[3]);                       uout[2*Ncvec-1].f[0] = ci0;
+  ci1= s*(Xr.f[1]-Xr.f[3]) - s*(Xi.f[1]+Xi.f[3]); uout[2*Ncvec-1].f[1] = ci1;
+  ci2= 2*(Xi.f[3]-Xi.f[1]);                       uout[2*Ncvec-1].f[2] = ci2;
+  ci3=-s*(Xr.f[1]-Xr.f[3]) - s*(Xi.f[1]+Xi.f[3]); uout[2*Ncvec-1].f[3] = ci3;
+}
+
+
+void pffft_transform_internal(PFFFT_Setup *setup, const float *finput, float *foutput, v4sf *scratch,
+                             pffft_direction_t direction, int ordered) {
+  int k, Ncvec   = setup->Ncvec;
+  int nf_odd = (setup->ifac[1] & 1);
+
+  // temporary buffer is allocated on the stack if the scratch pointer is NULL
+  int stack_allocate = (scratch == 0 ? Ncvec*2 : 1);
+  VLA_ARRAY_ON_STACK(v4sf, scratch_on_stack, stack_allocate);
+
+  const v4sf *vinput = (const v4sf*)finput;
+  v4sf *voutput      = (v4sf*)foutput;
+  v4sf *buff[2]      = { voutput, scratch ? scratch : scratch_on_stack };
+  int ib = (nf_odd ^ ordered ? 1 : 0);
+
+  assert(VALIGNED(finput) && VALIGNED(foutput));
+
+  //assert(finput != foutput);
+  if (direction == PFFFT_FORWARD) {
+    ib = !ib;
+    if (setup->transform == PFFFT_REAL) { 
+      ib = (rfftf1_ps(Ncvec*2, vinput, buff[ib], buff[!ib],
+                      setup->twiddle, &setup->ifac[0]) == buff[0] ? 0 : 1);      
+      pffft_real_finalize(Ncvec, buff[ib], buff[!ib], (v4sf*)setup->e);
+    } else {
+      v4sf *tmp = buff[ib];
+      for (k=0; k < Ncvec; ++k) {
+        UNINTERLEAVE2(vinput[k*2], vinput[k*2+1], tmp[k*2], tmp[k*2+1]);
+      }
+      ib = (cfftf1_ps(Ncvec, buff[ib], buff[!ib], buff[ib], 
+                      setup->twiddle, &setup->ifac[0], -1) == buff[0] ? 0 : 1);
+      pffft_cplx_finalize(Ncvec, buff[ib], buff[!ib], (v4sf*)setup->e);
+    }
+    if (ordered) {
+      pffft_zreorder(setup, (float*)buff[!ib], (float*)buff[ib], PFFFT_FORWARD);       
+    } else ib = !ib;
+  } else {
+    if (vinput == buff[ib]) { 
+      ib = !ib; // may happen when finput == foutput
+    }
+    if (ordered) {
+      pffft_zreorder(setup, (float*)vinput, (float*)buff[ib], PFFFT_BACKWARD); 
+      vinput = buff[ib]; ib = !ib;
+    }
+    if (setup->transform == PFFFT_REAL) {
+      pffft_real_preprocess(Ncvec, vinput, buff[ib], (v4sf*)setup->e);
+      ib = (rfftb1_ps(Ncvec*2, buff[ib], buff[0], buff[1], 
+                      setup->twiddle, &setup->ifac[0]) == buff[0] ? 0 : 1);
+    } else {
+      pffft_cplx_preprocess(Ncvec, vinput, buff[ib], (v4sf*)setup->e);
+      ib = (cfftf1_ps(Ncvec, buff[ib], buff[0], buff[1], 
+                      setup->twiddle, &setup->ifac[0], +1) == buff[0] ? 0 : 1);
+      for (k=0; k < Ncvec; ++k) {
+        INTERLEAVE2(buff[ib][k*2], buff[ib][k*2+1], buff[ib][k*2], buff[ib][k*2+1]);
+      }
+    }
+  }
+  
+  if (buff[ib] != voutput) {
+    /* extra copy required -- this situation should only happen when finput == foutput */
+    assert(finput==foutput);
+    for (k=0; k < Ncvec; ++k) {
+      v4sf a = buff[ib][2*k], b = buff[ib][2*k+1];
+      voutput[2*k] = a; voutput[2*k+1] = b;
+    }
+    ib = !ib;
+  }
+  assert(buff[ib] == voutput);
+}
+
+void pffft_zconvolve_accumulate(PFFFT_Setup *s, const float *a, const float *b, float *ab, float scaling) {
+  int Ncvec = s->Ncvec;
+  const v4sf * RESTRICT va = (const v4sf*)a;
+  const v4sf * RESTRICT vb = (const v4sf*)b;
+  v4sf * RESTRICT vab = (v4sf*)ab;
+
+#ifdef __arm__
+  __builtin_prefetch(va);
+  __builtin_prefetch(vb);
+  __builtin_prefetch(vab);
+  __builtin_prefetch(va+2);
+  __builtin_prefetch(vb+2);
+  __builtin_prefetch(vab+2);
+  __builtin_prefetch(va+4);
+  __builtin_prefetch(vb+4);
+  __builtin_prefetch(vab+4);
+  __builtin_prefetch(va+6);
+  __builtin_prefetch(vb+6);
+  __builtin_prefetch(vab+6);
+# ifndef __clang__
+#   define ZCONVOLVE_USING_INLINE_NEON_ASM
+# endif
+#endif
+
+  float ar, ai, br, bi, abr, abi;
+#ifndef ZCONVOLVE_USING_INLINE_ASM
+  v4sf vscal = LD_PS1(scaling);
+  int i;
+#endif
+
+  assert(VALIGNED(a) && VALIGNED(b) && VALIGNED(ab));
+  ar = ((v4sf_union*)va)[0].f[0];
+  ai = ((v4sf_union*)va)[1].f[0];
+  br = ((v4sf_union*)vb)[0].f[0];
+  bi = ((v4sf_union*)vb)[1].f[0];
+  abr = ((v4sf_union*)vab)[0].f[0];
+  abi = ((v4sf_union*)vab)[1].f[0];
+ 
+#ifdef ZCONVOLVE_USING_INLINE_ASM // inline asm version, unfortunately miscompiled by clang 3.2, at least on ubuntu.. so this will be restricted to gcc
+  const float *a_ = a, *b_ = b; float *ab_ = ab;
+  int N = Ncvec;
+  asm volatile("mov         r8, %2                  \n"
+               "vdup.f32    q15, %4                 \n"
+               "1:                                  \n"
+               "pld         [%0,#64]                \n"
+               "pld         [%1,#64]                \n"
+               "pld         [%2,#64]                \n"
+               "pld         [%0,#96]                \n"
+               "pld         [%1,#96]                \n"
+               "pld         [%2,#96]                \n"
+               "vld1.f32    {q0,q1},   [%0,:128]!         \n"
+               "vld1.f32    {q4,q5},   [%1,:128]!         \n"
+               "vld1.f32    {q2,q3},   [%0,:128]!         \n"
+               "vld1.f32    {q6,q7},   [%1,:128]!         \n"
+               "vld1.f32    {q8,q9},   [r8,:128]!          \n"
+               
+               "vmul.f32    q10, q0, q4             \n"
+               "vmul.f32    q11, q0, q5             \n"
+               "vmul.f32    q12, q2, q6             \n" 
+               "vmul.f32    q13, q2, q7             \n"                 
+               "vmls.f32    q10, q1, q5             \n"
+               "vmla.f32    q11, q1, q4             \n"
+               "vld1.f32    {q0,q1}, [r8,:128]!     \n"
+               "vmls.f32    q12, q3, q7             \n"
+               "vmla.f32    q13, q3, q6             \n"
+               "vmla.f32    q8, q10, q15            \n"
+               "vmla.f32    q9, q11, q15            \n"
+               "vmla.f32    q0, q12, q15            \n"
+               "vmla.f32    q1, q13, q15            \n"
+               "vst1.f32    {q8,q9},[%2,:128]!    \n"
+               "vst1.f32    {q0,q1},[%2,:128]!    \n"
+               "subs        %3, #2                  \n"
+               "bne         1b                      \n"
+               : "+r"(a_), "+r"(b_), "+r"(ab_), "+r"(N) : "r"(scaling) : "r8", "q0","q1","q2","q3","q4","q5","q6","q7","q8","q9", "q10","q11","q12","q13","q15","memory");
+#else // default routine, works fine for non-arm cpus with current compilers
+  for (i=0; i < Ncvec; i += 2) {
+    v4sf ar, ai, br, bi;
+    ar = va[2*i+0]; ai = va[2*i+1];
+    br = vb[2*i+0]; bi = vb[2*i+1];
+    VCPLXMUL(ar, ai, br, bi);
+    vab[2*i+0] = VMADD(ar, vscal, vab[2*i+0]);
+    vab[2*i+1] = VMADD(ai, vscal, vab[2*i+1]);
+    ar = va[2*i+2]; ai = va[2*i+3];
+    br = vb[2*i+2]; bi = vb[2*i+3];
+    VCPLXMUL(ar, ai, br, bi);
+    vab[2*i+2] = VMADD(ar, vscal, vab[2*i+2]);
+    vab[2*i+3] = VMADD(ai, vscal, vab[2*i+3]);
+  }
+#endif
+  if (s->transform == PFFFT_REAL) {
+    ((v4sf_union*)vab)[0].f[0] = abr + ar*br*scaling;
+    ((v4sf_union*)vab)[1].f[0] = abi + ai*bi*scaling;
+  }
+}
+
+
+#else // defined(PFFFT_SIMD_DISABLE)
+
+// standard routine using scalar floats, without SIMD stuff.
+
+#define pffft_zreorder_nosimd pffft_zreorder
+void pffft_zreorder_nosimd(PFFFT_Setup *setup, const float *in, float *out, pffft_direction_t direction) {
+  int k, N = setup->N;
+  if (setup->transform == PFFFT_COMPLEX) {
+    for (k=0; k < 2*N; ++k) out[k] = in[k];
+    return;
+  }
+  else if (direction == PFFFT_FORWARD) {
+    float x_N = in[N-1];
+    for (k=N-1; k > 1; --k) out[k] = in[k-1]; 
+    out[0] = in[0];
+    out[1] = x_N;
+  } else {
+    float x_N = in[1];
+    for (k=1; k < N-1; ++k) out[k] = in[k+1]; 
+    out[0] = in[0];
+    out[N-1] = x_N;
+  }
+}
+
+#define pffft_transform_internal_nosimd pffft_transform_internal
+void pffft_transform_internal_nosimd(PFFFT_Setup *setup, const float *input, float *output, float *scratch,
+                                    pffft_direction_t direction, int ordered) {
+  int Ncvec   = setup->Ncvec;
+  int nf_odd = (setup->ifac[1] & 1);
+
+  // temporary buffer is allocated on the stack if the scratch pointer is NULL
+  int stack_allocate = (scratch == 0 ? Ncvec*2 : 1);
+  VLA_ARRAY_ON_STACK(v4sf, scratch_on_stack, stack_allocate);
+  float *buff[2];
+  int ib;
+  if (scratch == 0) scratch = scratch_on_stack;
+  buff[0] = output; buff[1] = scratch;
+
+  if (setup->transform == PFFFT_COMPLEX) ordered = 0; // it is always ordered.
+  ib = (nf_odd ^ ordered ? 1 : 0);
+
+  if (direction == PFFFT_FORWARD) {
+    if (setup->transform == PFFFT_REAL) { 
+      ib = (rfftf1_ps(Ncvec*2, input, buff[ib], buff[!ib],
+                      setup->twiddle, &setup->ifac[0]) == buff[0] ? 0 : 1);      
+    } else {
+      ib = (cfftf1_ps(Ncvec, input, buff[ib], buff[!ib], 
+                      setup->twiddle, &setup->ifac[0], -1) == buff[0] ? 0 : 1);
+    }
+    if (ordered) {
+      pffft_zreorder(setup, buff[ib], buff[!ib], PFFFT_FORWARD); ib = !ib;
+    }
+  } else {    
+    if (input == buff[ib]) { 
+      ib = !ib; // may happen when finput == foutput
+    }
+    if (ordered) {
+      pffft_zreorder(setup, input, buff[!ib], PFFFT_BACKWARD); 
+      input = buff[!ib];
+    }
+    if (setup->transform == PFFFT_REAL) {
+      ib = (rfftb1_ps(Ncvec*2, input, buff[ib], buff[!ib], 
+                      setup->twiddle, &setup->ifac[0]) == buff[0] ? 0 : 1);
+    } else {
+      ib = (cfftf1_ps(Ncvec, input, buff[ib], buff[!ib], 
+                      setup->twiddle, &setup->ifac[0], +1) == buff[0] ? 0 : 1);
+    }
+  }
+  if (buff[ib] != output) {
+    int k;
+    // extra copy required -- this situation should happens only when finput == foutput
+    assert(input==output);
+    for (k=0; k < Ncvec; ++k) {
+      float a = buff[ib][2*k], b = buff[ib][2*k+1];
+      output[2*k] = a; output[2*k+1] = b;
+    }
+    ib = !ib;
+  }
+  assert(buff[ib] == output);
+}
+
+#define pffft_zconvolve_accumulate_nosimd pffft_zconvolve_accumulate
+void pffft_zconvolve_accumulate_nosimd(PFFFT_Setup *s, const float *a, const float *b,
+                                       float *ab, float scaling) {
+  int i, Ncvec = s->Ncvec;
+
+  if (s->transform == PFFFT_REAL) {
+    // take care of the fftpack ordering
+    ab[0] += a[0]*b[0]*scaling;
+    ab[2*Ncvec-1] += a[2*Ncvec-1]*b[2*Ncvec-1]*scaling;
+    ++ab; ++a; ++b; --Ncvec;
+  }
+  for (i=0; i < Ncvec; ++i) {
+    float ar, ai, br, bi;
+    ar = a[2*i+0]; ai = a[2*i+1];
+    br = b[2*i+0]; bi = b[2*i+1];
+    VCPLXMUL(ar, ai, br, bi);
+    ab[2*i+0] += ar*scaling;
+    ab[2*i+1] += ai*scaling;
+  }
+}
+
+#endif // defined(PFFFT_SIMD_DISABLE)
+
+void pffft_transform(PFFFT_Setup *setup, const float *input, float *output, float *work, pffft_direction_t direction) {
+  pffft_transform_internal(setup, input, output, (v4sf*)work, direction, 0);
+}
+
+void pffft_transform_ordered(PFFFT_Setup *setup, const float *input, float *output, float *work, pffft_direction_t direction) {
+  pffft_transform_internal(setup, input, output, (v4sf*)work, direction, 1);
+}
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/pffft/src/pffft.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,177 @@
+/* Copyright (c) 2013  Julien Pommier ( pommier@modartt.com ) 
+
+   Based on original fortran 77 code from FFTPACKv4 from NETLIB,
+   authored by Dr Paul Swarztrauber of NCAR, in 1985.
+
+   As confirmed by the NCAR fftpack software curators, the following
+   FFTPACKv5 license applies to FFTPACKv4 sources. My changes are
+   released under the same terms.
+
+   FFTPACK license:
+
+   http://www.cisl.ucar.edu/css/software/fftpack5/ftpk.html
+
+   Copyright (c) 2004 the University Corporation for Atmospheric
+   Research ("UCAR"). All rights reserved. Developed by NCAR's
+   Computational and Information Systems Laboratory, UCAR,
+   www.cisl.ucar.edu.
+
+   Redistribution and use of the Software in source and binary forms,
+   with or without modification, is permitted provided that the
+   following conditions are met:
+
+   - Neither the names of NCAR's Computational and Information Systems
+   Laboratory, the University Corporation for Atmospheric Research,
+   nor the names of its sponsors or contributors may be used to
+   endorse or promote products derived from this Software without
+   specific prior written permission.  
+
+   - Redistributions of source code must retain the above copyright
+   notices, this list of conditions, and the disclaimer below.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions, and the disclaimer below in the
+   documentation and/or other materials provided with the
+   distribution.
+
+   THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT
+   HOLDERS BE LIABLE FOR ANY CLAIM, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+   SOFTWARE.
+*/
+   
+/*
+   PFFFT : a Pretty Fast FFT.
+
+   This is basically an adaptation of the single precision fftpack
+   (v4) as found on netlib taking advantage of SIMD instruction found
+   on cpus such as intel x86 (SSE1), powerpc (Altivec), and arm (NEON).
+   
+   For architectures where no SIMD instruction is available, the code
+   falls back to a scalar version.  
+
+   Restrictions: 
+
+   - 1D transforms only, with 32-bit single precision.
+
+   - supports only transforms for inputs of length N of the form
+   N=(2^a)*(3^b)*(5^c), a >= 5, b >=0, c >= 0 (32, 48, 64, 96, 128,
+   144, 160, etc are all acceptable lengths). Performance is best for
+   128<=N<=8192.
+
+   - all (float*) pointers in the functions below are expected to
+   have an "simd-compatible" alignment, that is 16 bytes on x86 and
+   powerpc CPUs.
+  
+   You can allocate such buffers with the functions
+   pffft_aligned_malloc / pffft_aligned_free (or with stuff like
+   posix_memalign..)
+
+*/
+
+#ifndef PFFFT_H
+#define PFFFT_H
+
+#include <stddef.h> // for size_t
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+  /* opaque struct holding internal stuff (precomputed twiddle factors)
+     this struct can be shared by many threads as it contains only
+     read-only data.  
+  */
+  typedef struct PFFFT_Setup PFFFT_Setup;
+
+  /* direction of the transform */
+  typedef enum { PFFFT_FORWARD, PFFFT_BACKWARD } pffft_direction_t;
+  
+  /* type of transform */
+  typedef enum { PFFFT_REAL, PFFFT_COMPLEX } pffft_transform_t;
+
+  /*
+    prepare for performing transforms of size N -- the returned
+    PFFFT_Setup structure is read-only so it can safely be shared by
+    multiple concurrent threads. 
+  */
+  PFFFT_Setup *pffft_new_setup(int N, pffft_transform_t transform);
+  void pffft_destroy_setup(PFFFT_Setup *);
+  /* 
+     Perform a Fourier transform , The z-domain data is stored in the
+     most efficient order for transforming it back, or using it for
+     convolution. If you need to have its content sorted in the
+     "usual" way, that is as an array of interleaved complex numbers,
+     either use pffft_transform_ordered , or call pffft_zreorder after
+     the forward fft, and before the backward fft.
+
+     Transforms are not scaled: PFFFT_BACKWARD(PFFFT_FORWARD(x)) = N*x.
+     Typically you will want to scale the backward transform by 1/N.
+     
+     The 'work' pointer should point to an area of N (2*N for complex
+     fft) floats, properly aligned. If 'work' is NULL, then stack will
+     be used instead (this is probably the best strategy for small
+     FFTs, say for N < 16384).
+
+     input and output may alias.
+  */
+  void pffft_transform(PFFFT_Setup *setup, const float *input, float *output, float *work, pffft_direction_t direction);
+
+  /* 
+     Similar to pffft_transform, but makes sure that the output is
+     ordered as expected (interleaved complex numbers).  This is
+     similar to calling pffft_transform and then pffft_zreorder.
+     
+     input and output may alias.
+  */
+  void pffft_transform_ordered(PFFFT_Setup *setup, const float *input, float *output, float *work, pffft_direction_t direction);
+
+  /* 
+     call pffft_zreorder(.., PFFFT_FORWARD) after pffft_transform(...,
+     PFFFT_FORWARD) if you want to have the frequency components in
+     the correct "canonical" order, as interleaved complex numbers.
+     
+     (for real transforms, both 0-frequency and half frequency
+     components, which are real, are assembled in the first entry as
+     F(0)+i*F(n/2+1). Note that the original fftpack did place
+     F(n/2+1) at the end of the arrays).
+     
+     input and output should not alias.
+  */
+  void pffft_zreorder(PFFFT_Setup *setup, const float *input, float *output, pffft_direction_t direction);
+
+  /* 
+     Perform a multiplication of the frequency components of dft_a and
+     dft_b and accumulate them into dft_ab. The arrays should have
+     been obtained with pffft_transform(.., PFFFT_FORWARD) and should
+     *not* have been reordered with pffft_zreorder (otherwise just
+     perform the operation yourself as the dft coefs are stored as
+     interleaved complex numbers).
+     
+     the operation performed is: dft_ab += (dft_a * fdt_b)*scaling
+     
+     The dft_a, dft_b and dft_ab pointers may alias.
+  */
+  void pffft_zconvolve_accumulate(PFFFT_Setup *setup, const float *dft_a, const float *dft_b, float *dft_ab, float scaling);
+
+  /*
+    the float buffers must have the correct alignment (16-byte boundary
+    on intel and powerpc). This function may be used to obtain such
+    correctly aligned buffers.  
+  */
+  void *pffft_aligned_malloc(size_t nb_bytes);
+  void pffft_aligned_free(void *);
+
+  /* return 4 or 1 wether support SSE/Altivec instructions was enable when building pffft.c */
+  int pffft_simd_size();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // PFFFT_H
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/COPYING asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/COPYING
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/COPYING	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/COPYING	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,26 @@
+Copyright (c) 2017, Mozilla
+Copyright (c) 2007-2017, Jean-Marc Valin
+Copyright (c) 2005-2017, Xiph.Org Foundation
+Copyright (c) 2003-2004, Mark Borgerding
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+- Neither the name of the Xiph.Org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/OWNERS asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/OWNERS
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/OWNERS	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/OWNERS	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,3 @@
+alessiob@chromium.org
+aleloi@chromium.org
+
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/README.chromium asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/README.chromium
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/README.chromium	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/README.chromium	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,27 @@
+Name: Recurrent neural network for audio noise reduction
+Short Name: rnnoise
+URL: https://github.com/xiph/rnnoise
+Version: 91ef401
+Date: Oct 10, 2017
+Revision:
+License: BSD 3-Clause
+License File: COPYING
+Security Critical: no
+License Android Compatible:
+Description:
+RNNoise is a noise suppression library based on a recurrent neural network.
+The library is used for speech processing in WebRTC.
+Local Modifications:
+* Only retaining COPYING and from src/ the following files:
+ - kiss_fft.c, kiss_fft.h
+ - rnn.c
+ - rnn_data.c
+ - tansig_table.h
+* KissFFT: non-floating point parts removed, code clean, from C to C++,
+  class wrapper added
+* BUILD targets and KissFFT unit tests added
+* rnn_vad_weights.h: output layer sizes + weights scaling factor
+* removing unwanted extern from constants in rnn_vad_weights.h and using
+  constants to declare array sizes
+* Add braces around arrays in unit test.
+* KissFFT removed
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_activations.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_activations.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_activations.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_activations.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,90 @@
+/* Copyright (c) 2008-2011 Octasic Inc.
+                 2012-2017 Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef THIRD_PARTY_RNNOISE_SRC_RNN_ACTIVATIONS_H_
+#define THIRD_PARTY_RNNOISE_SRC_RNN_ACTIVATIONS_H_
+#include <cmath>
+namespace rnnoise {
+inline float TansigApproximated(float x) {
+  static constexpr float kTansigTable[201] = {
+      0.000000f, 0.039979f, 0.079830f, 0.119427f, 0.158649f, 0.197375f,
+      0.235496f, 0.272905f, 0.309507f, 0.345214f, 0.379949f, 0.413644f,
+      0.446244f, 0.477700f, 0.507977f, 0.537050f, 0.564900f, 0.591519f,
+      0.616909f, 0.641077f, 0.664037f, 0.685809f, 0.706419f, 0.725897f,
+      0.744277f, 0.761594f, 0.777888f, 0.793199f, 0.807569f, 0.821040f,
+      0.833655f, 0.845456f, 0.856485f, 0.866784f, 0.876393f, 0.885352f,
+      0.893698f, 0.901468f, 0.908698f, 0.915420f, 0.921669f, 0.927473f,
+      0.932862f, 0.937863f, 0.942503f, 0.946806f, 0.950795f, 0.954492f,
+      0.957917f, 0.961090f, 0.964028f, 0.966747f, 0.969265f, 0.971594f,
+      0.973749f, 0.975743f, 0.977587f, 0.979293f, 0.980869f, 0.982327f,
+      0.983675f, 0.984921f, 0.986072f, 0.987136f, 0.988119f, 0.989027f,
+      0.989867f, 0.990642f, 0.991359f, 0.992020f, 0.992631f, 0.993196f,
+      0.993718f, 0.994199f, 0.994644f, 0.995055f, 0.995434f, 0.995784f,
+      0.996108f, 0.996407f, 0.996682f, 0.996937f, 0.997172f, 0.997389f,
+      0.997590f, 0.997775f, 0.997946f, 0.998104f, 0.998249f, 0.998384f,
+      0.998508f, 0.998623f, 0.998728f, 0.998826f, 0.998916f, 0.999000f,
+      0.999076f, 0.999147f, 0.999213f, 0.999273f, 0.999329f, 0.999381f,
+      0.999428f, 0.999472f, 0.999513f, 0.999550f, 0.999585f, 0.999617f,
+      0.999646f, 0.999673f, 0.999699f, 0.999722f, 0.999743f, 0.999763f,
+      0.999781f, 0.999798f, 0.999813f, 0.999828f, 0.999841f, 0.999853f,
+      0.999865f, 0.999875f, 0.999885f, 0.999893f, 0.999902f, 0.999909f,
+      0.999916f, 0.999923f, 0.999929f, 0.999934f, 0.999939f, 0.999944f,
+      0.999948f, 0.999952f, 0.999956f, 0.999959f, 0.999962f, 0.999965f,
+      0.999968f, 0.999970f, 0.999973f, 0.999975f, 0.999977f, 0.999978f,
+      0.999980f, 0.999982f, 0.999983f, 0.999984f, 0.999986f, 0.999987f,
+      0.999988f, 0.999989f, 0.999990f, 0.999990f, 0.999991f, 0.999992f,
+      0.999992f, 0.999993f, 0.999994f, 0.999994f, 0.999994f, 0.999995f,
+      0.999995f, 0.999996f, 0.999996f, 0.999996f, 0.999997f, 0.999997f,
+      0.999997f, 0.999997f, 0.999997f, 0.999998f, 0.999998f, 0.999998f,
+      0.999998f, 0.999998f, 0.999998f, 0.999999f, 0.999999f, 0.999999f,
+      0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
+      0.999999f, 0.999999f, 0.999999f, 0.999999f, 1.000000f, 1.000000f,
+      1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
+      1.000000f, 1.000000f, 1.000000f,
+  };
+  // Tests are reversed to catch NaNs.
+  if (!(x < 8.f))
+    return 1.f;
+  if (!(x > -8.f))
+    return -1.f;
+  float sign = 1.f;
+  if (x < 0.f) {
+    x = -x;
+    sign = -1.f;
+  }
+  // Look-up.
+  int i = static_cast<int>(std::floor(0.5f + 25 * x));
+  float y = kTansigTable[i];
+  // Map i back to x's scale (undo 25 factor).
+  x -= 0.04f * i;
+  y = y + x * (1.f - y * y) * (1.f - y * x);
+  return sign * y;
+}
+inline float SigmoidApproximated(const float x) {
+  return 0.5f + 0.5f * TansigApproximated(0.5f * x);
+}
+inline float RectifiedLinearUnit(const float x) {
+  return x < 0.f ? 0.f : x;
+}
+}  // namespace rnnoise
+#endif  // THIRD_PARTY_RNNOISE_SRC_RNN_ACTIVATIONS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_vad_weights.cc asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_vad_weights.cc
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_vad_weights.cc	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_vad_weights.cc	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,392 @@
+#include "third_party/rnnoise/src/rnn_vad_weights.h"
+namespace rnnoise {
+const int8_t kInputDenseWeights[kInputLayerWeights] = {
+    -10,  0,    -3,   1,    -8,   -6,   3,    -13,  1,    0,    -3,   -7,
+    -5,   -3,   6,    -1,   -6,   0,    -6,   -4,   -1,   -2,   1,    1,
+    -7,   2,    21,   10,   -5,   -20,  24,   23,   37,   8,    -2,   33,
+    -6,   22,   13,   -2,   50,   8,    13,   1,    -15,  30,   -10,  30,
+    0,    3,    5,    27,   1,    4,    -3,   41,   56,   35,   -2,   49,
+    -13,  11,   13,   -2,   -47,  5,    -16,  -60,  -15,  77,   -17,  26,
+    -3,   14,   -21,  19,   -5,   -19,  -13,  0,    10,   14,   9,    31,
+    -13,  -41,  -10,  4,    22,   18,   -48,  -6,   -10,  62,   -3,   -18,
+    -14,  12,   26,   -28,  3,    14,   25,   -13,  -19,  6,    5,    36,
+    -3,   -65,  -12,  0,    31,   -7,   -9,   101,  -4,   26,   16,   17,
+    -12,  -12,  14,   -36,  -3,   5,    -15,  21,   2,    30,   -3,   38,
+    -4,   1,    -6,   7,    -7,   14,   38,   -22,  -30,  -3,   -7,   3,
+    -39,  -70,  -126, 25,   34,   94,   -67,  -22,  -33,  83,   -47,  -118,
+    4,    70,   33,   25,   62,   -128, -76,  -118, -113, 49,   -12,  -100,
+    -18,  -114, -33,  43,   32,   61,   40,   -9,   -106, 2,    36,   -100,
+    -40,  -5,   20,   -75,  61,   -51,  -9,   126,  -27,  -52,  5,    -24,
+    -21,  -126, -114, -12,  15,   106,  -2,   73,   -125, 50,   13,   -120,
+    35,   35,   4,    -61,  29,   -124, 6,    -53,  -69,  -125, 64,   -89,
+    36,   -107, -103, -7,   27,   121,  69,   77,   -35,  35,   95,   -125,
+    -49,  97,   -45,  -43,  -23,  23,   -28,  -65,  -118, 2,    8,    -126,
+    27,   -97,  92,   5,    55,   82,   17,   -57,  -115, 37,   8,    -106,
+    -46,  41,   -2,   21,   -44,  8,    -73,  -58,  -39,  34,   89,   -95,
+    95,   -117, 120,  -58,  31,   123,  1,    -32,  -109, -110, 60,   -120,
+    -43,  -74,  5,    91,   26,   21,   114,  82,   -83,  -126, 123,  22,
+    -16,  -67,  25,   -83,  46,   48,   -34,  -121, -124, -63,  -35,  -9,
+    31,   82,   123,  6,    -3,   117,  93,   -2,   -13,  -36,  124,  -112,
+    -6,   -102, -5,   -33,  -15,  44,   -69,  -127, -23,  -40,  -34,  -85,
+    68,   83,   -1,   40,   8,    84,   118,  -58,  -55,  -102, 123,  -55,
+    -14,  -123, 44,   -63,  -14,  21,   35,   16,   24,   -126, -13,  -114,
+    35,   20,   -36,  61,   -9,   97,   34,   19,   -32,  -109, 76,   -104,
+    99,   -119, 45,   -125, -51,  -28,  -8,   -69,  -8,   125,  -45,  -93,
+    113,  103,  -41,  -82,  52,   7,    126,  0,    -40,  104,  55,   -58,
+    17,   -124, -93,  -58,  8,    -45,  1,    56,   -123, 108,  -47,  -23,
+    115,  127,  17,   -68,  -13,  116,  -82,  -44,  45,   67,   -120, -101,
+    -15,  -125, 120,  -113, 17,   -48,  -73,  126,  -64,  -86,  -118, -19,
+    112,  -1,   -66,  -27,  -62,  121,  -86,  -58,  50,   89,   -38,  -75,
+    95,   -111, 12,   -113, 2,    -68,  2,    -94,  -121, 91,   -5,   0,
+    79,   43,   -7,   -18,  79,   35,   -38,  47,   1,    -45,  83,   -50,
+    102,  32,   55,   -96,  15,   -122, -69,  45,   -27,  91,   -62,  -30,
+    46,   -95,  22,   -72,  -97,  -1,   14,   -122, 28,   127,  61,   -126,
+    121,  9,    68,   -120, 49,   -60,  90,   3,    43,   68,   54,   34,
+    -10,  28,   21,   -24,  -54,  22,   -113, -12,  82,   -2,   -17,  -9,
+    127,  8,    116,  -92,  0,    -70,  -33,  123,  66,   116,  -74,  -4,
+    74,   -72,  -22,  -47,  1,    -83,  -60,  -124, 1,    122,  -57,  -43,
+    49,   40,   -126, -128, -8,   -29,  28,   -24,  -123, -121, -70,  -93,
+    -37,  -126, 11,   -125, -37,  11,   -31,  -51,  -124, 116,  -128, 8,
+    -25,  109,  75,   -12,  7,    8,    10,   117,  124,  -128, -128, 29,
+    -26,  101,  21,   -128, 87,   8,    -39,  23,   -128, 127,  -127, 74,
+    -55,  74,   112,  127,  4,    55,   44,   -92,  123,  34,   -93,  47,
+    -21,  -92,  17,   49,   -121, 92,   7,    -126, -125, 124,  -74,  3,
+    -59,  18,   -91,  3,    -9,   9,    56,   116,  7,    -29,  33,   87,
+    -21,  -128, -13,  57,   74,   9,    -29,  -61,  -97,  -21,  -95,  -12,
+    -114, 16,   82,   125,  -7,   10,   -24,  9,    77,   -128, -102, -25,
+    3,    -126, 10,   13,   -18,  51,   26,   127,  -79,  35,   51,   12,
+    -50,  -24,  1,    -7,   22,   81,   65,   120,  -30,  -38,  85,   122,
+    -4,   -106, -11,  27,   53,   41,   8,    -104, -66,  -38,  -124, 10,
+    12,   76,   117,  -109, 9,    11,   2,    -18,  3,    113,  -16,  -79,
+    -39,  -123, -20,  -128, 2,    13,   -33,  -58,  10,   84,   -104, 13,
+    64,   109,  1,    54,   -12,  28,   24,   63,   -126, 118,  -82,  46,
+    -12,  -15,  14,   -43,  60,   22,   -32,  -19,  -46,  91,   -107, 24,
+    -94,  26,   -47,  125,  6,    58,   -15,  -75,  -26,  -38,  -35,  103,
+    -16,  -17,  -13,  63,   -2,   45,   -45,  -73,  -23,  70,   -87,  51,
+    -17,  53,   76,   14,   -18,  -31,  -14,  103,  8,    21,   -28,  -33,
+    -20,  -47,  6,    39,   40,   -30,  7,    -76,  55,   31,   -20,  -21,
+    -59,  1,    25,   -11,  17,   5,    -13,  -39,  0,    -76,  50,   -33,
+    -29,  -50,  -16,  -11,  -12,  -1,   -46,  40,   -10,  65,   -19,  21,
+    -41,  -32,  -83,  -19,  -4,   49,   -60,  118,  -24,  -46,  9,    102,
+    -20,  8,    -19,  25,   31,   -3,   -37,  0,    25,   7,    29,   2,
+    -39,  127,  -64,  -20,  64,   115,  -30,  36,   100,  35,   122,  127,
+    127,  -127, 127,  -127, 19,   127,  -89,  -79,  -32,  39,   -127, 125,
+    -80,  126,  -127, 26,   8,    98,   -8,   -57,  -90,  -50,  126,  61,
+    127,  -126, 40,   -106, -68,  104,  -125, -119, 11,   10,   -127, 66,
+    -56,  -12,  -126, -104, 27,   75,   38,   -124, -126, -125, 84,   -123,
+    -45,  -114, -128, 127,  103,  -101, -124, 127,  -11,  -23,  -123, 92,
+    -123, 24,   126,  41,   -2,   -39,  -27,  -94,  40,   -112, -48,  127,
+    58,   14,   38,   -75,  -64,  73,   117,  100,  -119, -11,  6,    32,
+    -126, -14,  35,   121,  -10,  54,   -60,  89,   -3,   69,   -25,  -20,
+    43,   -86,  -34,  24,   27,   7,    -81,  -99,  -23,  -16,  -26,  13,
+    35,   -97,  80,   -29,  -13,  -121, -12,  -65,  -94,  70,   -89,  -126,
+    -95,  88,   33,   96,   29,   -90,  69,   114,  -78,  65,   90,   -47,
+    -47,  89,   1,    -12,  3,    8,    30,   5,    2,    -30,  -1,   6,
+    -7,   10,   -4,   46,   -27,  -40,  22,   -6,   -17,  45,   24,   -9,
+    23,   -14,  -63,  -26,  -12,  -57,  27,   25,   55,   -76,  -47,  21,
+    34,   33,   26,   17,   14,   6,    9,    26,   25,   -25,  -25,  -18};
+const int8_t kInputDenseBias[kInputLayerOutputSize] = {
+    38,  -6,  127,  127, 127,  -43, -127, 78,  127, 5,   127, 123,
+    127, 127, -128, -76, -126, 28,  127,  125, -30, 127, -89, -20};
+const int8_t kHiddenGruWeights[kHiddenLayerWeights] = {
+    -124, 23,   -123, -33,  -95,  -4,   8,    -84,  4,    101,  -119, 116,
+    -4,   123,  103,  -51,  29,   -124, -114, -49,  31,   9,    75,   -128,
+    0,    -49,  37,   -50,  46,   -21,  -63,  -104, 54,   82,   33,   21,
+    70,   127,  -9,   -79,  -39,  -23,  -127, 107,  122,  -96,  -46,  -18,
+    -39,  13,   -28,  -48,  14,   56,   -52,  49,   -1,   -121, 25,   -18,
+    -36,  -52,  -57,  -30,  54,   -124, -26,  -47,  10,   39,   12,   2,
+    9,    -127, -128, 102,  21,   11,   -64,  -71,  89,   -113, -111, 54,
+    31,   94,   121,  -40,  30,   40,   -109, 73,   -9,   108,  -92,  2,
+    -127, 116,  127,  127,  -122, 95,   127,  -37,  -127, 28,   89,   10,
+    24,   -104, -62,  -67,  -14,  38,   14,   -71,  22,   -41,  20,   -50,
+    39,   63,   86,   127,  -18,  79,   4,    -51,  2,    33,   117,  -113,
+    -78,  56,   -91,  37,   34,   -45,  -44,  -22,  21,   -16,  56,   30,
+    -84,  -79,  38,   -74,  127,  9,    -25,  2,    82,   61,   25,   -26,
+    26,   11,   117,  -65,  12,   -58,  42,   -62,  -93,  11,   11,   124,
+    -123, 80,   -125, 11,   -90,  42,   94,   4,    -109, -1,   85,   -52,
+    45,   -26,  -27,  77,   -5,   30,   90,   0,    95,   -7,   53,   29,
+    -82,  22,   -9,   74,   2,    -12,  -73,  114,  97,   -64,  122,  -77,
+    43,   91,   86,   126,  106,  72,   90,   -43,  46,   96,   -51,  21,
+    22,   68,   22,   41,   79,   75,   -46,  -105, 23,   -116, 127,  -123,
+    102,  57,   85,   10,   -29,  34,   125,  126,  124,  81,   -15,  54,
+    96,   -128, 39,   -124, 103,  74,   126,  127,  -50,  -71,  -122, -64,
+    93,   -75,  71,   105,  122,  123,  126,  122,  -127, 33,   -63,  -74,
+    124,  -71,  33,   41,   -56,  19,   6,    65,   41,   90,   -116, -3,
+    -46,  75,   -13,  98,   -74,  -42,  74,   -95,  -96,  81,   24,   32,
+    -19,  -123, 74,   55,   109,  115,  0,    32,   33,   12,   -20,  9,
+    127,  127,  -61,  79,   -48,  -54,  -49,  101,  -9,   27,   -106, 74,
+    119,  77,   87,   -126, -24,  127,  124,  31,   34,   127,  40,   3,
+    -90,  127,  23,   57,   -53,  127,  -69,  -88,  -33,  127,  19,   -46,
+    -9,   -125, 13,   -126, -113, 127,  -41,  46,   106,  -62,  3,    -10,
+    111,  49,   -34,  -24,  -20,  -112, 11,   101,  -50,  -34,  50,   65,
+    -64,  -106, 70,   -48,  60,   9,    -122, -45,  15,   -112, -26,  -4,
+    1,    39,   23,   58,   -45,  -80,  127,  82,   58,   30,   -94,  -119,
+    51,   -89,  95,   -107, 30,   127,  125,  58,   -52,  -42,  -38,  -20,
+    -122, 115,  39,   -26,  5,    73,   13,   -39,  43,   -23,  -20,  -125,
+    23,   35,   53,   -61,  -66,  72,   -20,  33,   8,    35,   4,    7,
+    18,   19,   16,   -45,  -50,  -71,  31,   -29,  -41,  -27,  10,   14,
+    27,   9,    -23,  98,   6,    -94,  92,   127,  -114, 59,   -26,  -100,
+    -62,  -127, -17,  -85,  -60,  126,  -42,  -6,   33,   -120, -26,  -126,
+    -127, -35,  -114, -31,  25,   -126, -100, -126, -64,  -46,  -31,  30,
+    25,   -74,  -111, -97,  -81,  -104, -114, -19,  -9,   -116, -69,  22,
+    30,   59,   8,    -51,  16,   -97,  18,   -4,   -89,  80,   -50,  3,
+    36,   -67,  56,   69,   -26,  107,  -10,  58,   -28,  -4,   -57,  -72,
+    -111, 0,    -75,  -119, 14,   -75,  -49,  -66,  -49,  8,    -121, 22,
+    -54,  121,  30,   54,   -26,  -126, -123, 56,   5,    48,   21,   -127,
+    -11,  23,   25,   -82,  6,    -25,  119,  78,   4,    -104, 27,   61,
+    -48,  37,   -13,  -52,  50,   -50,  44,   -1,   -22,  -43,  -59,  -78,
+    -67,  -32,  -26,  9,    -3,   40,   16,   19,   3,    -9,   20,   -6,
+    -37,  28,   39,   17,   -19,  -10,  1,    6,    -59,  74,   47,   3,
+    -119, 0,    -128, -107, -25,  -22,  -69,  -23,  -111, -42,  -93,  -120,
+    90,   -85,  -54,  -118, 76,   -79,  124,  101,  -77,  -75,  -17,  -71,
+    -114, 68,   55,   79,   -1,   -123, -20,  127,  -65,  -123, -128, -87,
+    123,  9,    -115, -14,  7,    -4,   127,  -79,  -115, 125,  -28,  89,
+    -83,  49,   89,   119,  -69,  -5,   12,   -49,  60,   57,   -24,  -99,
+    -110, 76,   -83,  125,  73,   81,   11,   8,    -45,  1,    83,   13,
+    -70,  -2,   97,   112,  -97,  53,   -9,   -94,  124,  44,   -49,  -24,
+    52,   76,   -110, -70,  -114, -12,  72,   -4,   -114, 43,   -43,  81,
+    102,  -84,  -27,  62,   -40,  52,   58,   124,  -35,  -51,  -123, -43,
+    56,   -75,  -34,  -35,  -106, 93,   -43,  14,   -16,  46,   62,   -97,
+    21,   30,   -53,  21,   -11,  -33,  -20,  -95,  4,    -126, 12,   45,
+    20,   108,  85,   11,   20,   -40,  99,   4,    -25,  -18,  -23,  -12,
+    -126, -55,  -20,  -44,  -51,  91,   -127, 127,  -44,  7,    127,  78,
+    38,   125,  -6,   -94,  -103, 73,   126,  -126, 18,   59,   -46,  106,
+    76,   116,  -31,  75,   -4,   92,   102,  32,   -31,  73,   42,   -21,
+    -28,  57,   127,  -8,   -107, 115,  124,  -94,  -4,   -128, 29,   -57,
+    70,   -82,  50,   -13,  -44,  38,   67,   -93,  6,    -39,  -46,  56,
+    68,   27,   61,   26,   18,   -72,  127,  22,   18,   -31,  127,  61,
+    -65,  -38,  1,    -67,  -1,   8,    -73,  46,   -116, -94,  58,   -49,
+    71,   -40,  -63,  -82,  -20,  -60,  93,   76,   69,   -106, 34,   -31,
+    4,    -25,  107,  -18,  45,   4,    -61,  126,  54,   -126, -125, 41,
+    19,   44,   32,   -98,  125,  -24,  125,  -96,  -125, 15,   87,   -4,
+    -90,  18,   -40,  28,   -69,  67,   22,   41,   39,   7,    -48,  -44,
+    12,   69,   -13,  2,    44,   -38,  111,  -7,   -126, -22,  -9,   74,
+    -128, -36,  -7,   -123, -15,  -79,  -91,  -37,  -127, -122, 104,  30,
+    7,    98,   -37,  111,  -116, -47,  127,  -45,  118,  -111, -123, -120,
+    -77,  -64,  -125, 124,  77,   111,  77,   18,   -113, 117,  -9,   67,
+    -77,  126,  49,   -20,  -124, 39,   41,   -124, -34,  114,  -87,  -126,
+    98,   -20,  59,   -17,  -24,  125,  107,  54,   35,   33,   -44,  12,
+    -29,  125,  -71,  -28,  -63,  -114, 28,   -17,  121,  -36,  127,  89,
+    -122, -49,  -18,  -48,  17,   24,   19,   -64,  -128, 13,   86,   45,
+    13,   -49,  55,   84,   48,   80,   -39,  99,   -127, 70,   -33,  30,
+    50,   126,  -65,  -117, -13,  -20,  -24,  127,  115,  -72,  -104, 63,
+    126,  -42,  57,   17,   46,   21,   119,  110,  -100, -60,  -112, 62,
+    -33,  28,   26,   -22,  -60,  -33,  -54,  78,   25,   32,   -114, 86,
+    44,   26,   43,   76,   121,  19,   97,   -2,   -3,   -73,  -68,  6,
+    -116, 6,    -43,  -97,  46,   -128, -120, -31,  -119, -29,  16,   16,
+    -126, -128, -126, -46,  -9,   -3,   92,   -31,  -76,  -126, -3,   -107,
+    -12,  -23,  -69,  5,    51,   27,   -42,  23,   -70,  -128, -29,  22,
+    29,   -126, -55,  50,   -71,  -3,   127,  44,   -27,  -70,  -63,  -66,
+    -70,  104,  86,   115,  29,   -92,  41,   -90,  44,   -11,  -28,  20,
+    -11,  -63,  -16,  43,   31,   17,   -73,  -31,  -1,   -17,  -11,  -39,
+    56,   18,   124,  72,   -14,  28,   69,   -121, -125, 34,   127,  63,
+    86,   -80,  -126, -125, -124, -47,  124,  77,   124,  -19,  23,   -7,
+    -50,  96,   -128, -93,  102,  -53,  -36,  -87,  119,  -125, 92,   -126,
+    118,  102,  72,   -2,   125,  10,   97,   124,  -125, 125,  71,   -20,
+    -47,  -116, -121, -4,   -9,   -32,  79,   -124, -36,  33,   -128, -74,
+    125,  23,   127,  -29,  -115, -32,  124,  -89,  32,   -107, 43,   -17,
+    24,   24,   18,   29,   -13,  -15,  -36,  62,   -91,  4,    -41,  95,
+    28,   -23,  6,    46,   84,   66,   77,   68,   -70,  -1,   -23,  -6,
+    65,   70,   -21,  9,    77,   -12,  2,    -118, 4,    9,    -108, 84,
+    52,   2,    52,   13,   -10,  58,   -110, 18,   66,   -95,  -23,  70,
+    31,   -3,   56,   56,   -3,   -7,   1,    -27,  -48,  -61,  41,   -4,
+    10,   -62,  32,   -7,   -24,  9,    -48,  -60,  -4,   79,   -20,  -38,
+    -76,  68,   -49,  -97,  0,    -15,  5,    -100, -49,  -95,  -99,  -115,
+    -9,   -40,  10,   104,  13,   56,   127,  -27,  -109, -94,  -118, -102,
+    -44,  -85,  52,   127,  -4,   14,   62,   121,  -122, -26,  -79,  -42,
+    -34,  1,    25,   -38,  -79,  -58,  -31,  -31,  -90,  -30,  -123, 32,
+    -56,  125,  66,   124,  -1,   3,    91,   -103, -7,   23,   78,   -18,
+    9,    69,   -69,  76,   -38,  -33,  -2,   -98,  18,   106,  84,   55,
+    87,   -47,  35,   -124, 64,   41,   -14,  46,   25,   -2,   120,  -21,
+    82,   19,   -79,  -37,  -3,   -8,   -16,  21,   19,   -5,   -28,  -112,
+    39,   -6,   -30,  53,   -69,  53,   46,   127,  123,  78,   20,   28,
+    -7,   73,   72,   17,   -40,  41,   111,  57,   32,   -95,  29,   28,
+    -39,  -65,  54,   -20,  -63,  29,   -67,  3,    44,   -57,  -47,  11,
+    61,   -22,  -44,  61,   48,   -100, 20,   125,  96,   -24,  -16,  3,
+    -69,  -126, 74,   -125, 9,    45,   -67,  -123, -59,  -72,  118,  69,
+    45,   50,   -57,  67,   13,   -66,  -106, 47,   62,   22,   -1,   -22,
+    -25,  -40,  -125, 3,    125,  32,   102,  -56,  -25,  -75,  -30,  122,
+    60,   -13,  36,   -73,  7,    -84,  124,  40,   -118, 17,   -87,  -118,
+    -8,   3,    -27,  111,  -40,  40,   -51,  127,  125,  -45,  -30,  -54,
+    46,   80,   -1,   -30,  101,  -17,  18,   26,   54,   7,    -12,  1,
+    -127, 123,  -122, -27,  -75,  64,   10,   25,   -15,  -44,  127,  -127,
+    5,    -84,  -81,  -7,   19,   -26,  126,  15,   116,  -126, 14,   -76,
+    44,   62,   -110, -124, 125,  -29,  -87,  -3,   -69,  82,   90,   57,
+    -123, 123,  100,  -19,  -51,  -32,  69,   37,   -57,  -128, -124, -72,
+    -13,  51,   -7,   -45,  -73,  5,    99,   -26,  -117, -96,  -109, 4,
+    -31,  -12,  0,    31,   -42,  -27,  12,   -81,  118,  39,   83,   14,
+    41,   -126, 107,  -82,  94,   -116, -122, -47,  -109, -84,  -128, -35,
+    -56,  66,   8,    -65,  19,   42,   -46,  -72,  -109, 41,   43,   -127,
+    -113, 58,   127,  42,   -75,  -1,   65,   117,  -55,  -113, -123, 124,
+    43,   -96,  -115, -19,  68,   15,   94,   3,    75,   0,    34,   9,
+    42,   110,  -48,  92,   -76,  99,   -17,  27,   32,   13,   125,  50,
+    -17,  56,   4,    53,   34,   -8,   99,   80,   -126, -21,  -65,  -11,
+    -46,  44,   -81,  -3,   -121, 123,  66,   -81,  -84,  119,  127,  84,
+    105,  45,   -66,  -42,  -23,  32,   -25,  12,   111,  127,  88,   125,
+    30,   24,   -127, -9,   -54,  127,  -116, -119, 88,   70,   94,   -120,
+    35,   -93,  15,   22,   -21,  25,   -110, -123, -45,  8,    -109, 125,
+    -122, -86,  -126, 8,    -14,  -120, -45,  -45,  69,   -125, -122, 6,
+    81,   86,   125,  95,   54,   77,   54,   -123, 126,  -85,  -117, 56,
+    11,   0,    -61,  -91,  -12,  -2,   -113, -3,   -15,  -122, -63,  -91,
+    10,   84,   -111, 125,  93,   21,   62,   -78,  -116, 13,   -57,  28,
+    -124, 126,  110,  12,   15,   95,   15,   -19,  -125, -97,  52,   -7,
+    101,  9,    20,   -125, -26,  -56,  72,   77,   12,   -126, 22,   -29,
+    47,   62,   95,   112,  69,   32,   97,   -83,  -8,   -5,   67,   -63,
+    -123, 79,   59,   0,    -6,   -17,  4,    -111, -52,  27,   65,   0};
+const int8_t kHiddenGruRecurrentWeights[kHiddenLayerWeights] = {
+    65,   83,   35,   56,   24,   -34,  -28,  -2,   125,  19,   42,   -9,
+    124,  -53,  24,   -87,  11,   35,   -81,  -35,  -125, -31,  123,  -21,
+    33,   -91,  113,  -93,  45,   -6,   53,   38,   -92,  8,    -27,  87,
+    4,    43,   43,   10,   -128, -128, -46,  127,  -38,  -45,  25,   -87,
+    19,   5,    52,   -96,  -23,  -29,  121,  -126, -24,  -20,  -2,   69,
+    -50,  6,    71,   -81,  -125, 90,   -94,  1,    -38,  36,   89,   17,
+    -60,  71,   -48,  18,   -15,  44,   -18,  59,   11,   114,  -51,  32,
+    110,  1,    4,    109,  -24,  127,  27,   60,   88,   24,   45,   -59,
+    75,   -36,  8,    57,   -32,  -25,  13,   126,  -89,  -61,  -76,  127,
+    18,   -62,  -68,  23,   -113, 5,    126,  43,   -88,  26,   -78,  18,
+    75,   21,   9,    -74,  20,   41,   126,  -118, -15,  9,    116,  126,
+    -127, 34,   -6,   126,  -128, -53,  -54,  -55,  -121, 70,   127,  -12,
+    -68,  82,   -25,  104,  -126, 126,  -21,  -26,  124,  -75,  -127, -120,
+    13,   61,   -64,  -108, -63,  -65,  -44,  -35,  -61,  -39,  109,  -74,
+    113,  -3,   108,  -30,  125,  120,  39,   125,  -128, -95,  -99,  111,
+    9,    25,   114,  -75,  -92,  -54,  -12,  -32,  -38,  10,   31,   10,
+    63,   51,   40,   -99,  74,   4,    50,   -128, -36,  -35,  -11,  -28,
+    -126, -7,   66,   -58,  -126, -22,  -83,  -61,  -127, 49,   126,  -8,
+    7,    62,   36,   -11,  -32,  -44,  63,   116,  41,   65,   -127, 126,
+    63,   -30,  -96,  74,   -92,  127,  38,   -18,  -128, 68,   -5,   101,
+    -4,   85,   58,   79,   0,    -58,  8,    119,  -70,  -1,   -79,  -68,
+    114,  -28,  -90,  -6,   -112, 2,    127,  -8,   10,   55,   -59,  -126,
+    127,  125,  80,   72,   35,   -54,  95,   -124, -124, 79,   23,   -46,
+    -61,  -127, -100, 99,   -77,  8,    -87,  5,    -2,   49,   85,   7,
+    -71,  82,   53,   -41,  22,   -22,  -93,  -103, 6,    52,   -56,  14,
+    -8,   -111, 85,   16,   54,   32,   -118, -24,  61,   -53,  96,   -70,
+    -5,   -17,  -67,  -84,  -7,   -82,  -107, -96,  21,   -83,  -58,  50,
+    12,   -126, -1,   -28,  34,   -126, 115,  17,   91,   1,    -127, 72,
+    11,   126,  -81,  6,    96,   -8,   77,   15,   -6,   63,   -27,  20,
+    -123, -109, 85,   -79,  -17,  126,  -92,  2,    -61,  20,   14,   17,
+    121,  123,  30,   57,   120,  127,  57,   42,   117,  98,   67,   39,
+    -20,  -70,  100,  7,    125,  122,  40,   16,   -79,  125,  83,   41,
+    -106, -57,  24,   55,   27,   -66,  -111, -44,  -7,   -43,  -66,  121,
+    42,   -128, -45,  35,   15,   -127, 34,   -35,  -34,  -40,  -18,  -6,
+    63,   111,  31,   116,  127,  19,   24,   -71,  -39,  34,   11,   19,
+    -40,  27,   12,   106,  -10,  56,   -82,  -106, -2,   -50,  -52,  114,
+    -126, -34,  -43,  -68,  10,   76,   57,   -118, -128, 37,   -104, 76,
+    125,  3,    -76,  127,  -29,  84,   -94,  -15,  55,   125,  79,   127,
+    -57,  -125, 104,  -68,  126,  126,  -77,  51,   45,   33,   -109, 115,
+    -11,  1,    95,   -121, -5,   -9,   -126, -114, 39,   68,   -126, -107,
+    -51,  -42,  24,   -8,   51,   -27,  -43,  66,   -45,  62,   -98,  -109,
+    69,   67,   0,    -125, -128, 49,   31,   126,  -122, 2,    -55,  -67,
+    -126, -70,  -128, -125, -77,  25,   16,   -8,   -102, 11,   -75,  82,
+    38,   -5,   5,    19,   34,   47,   -127, -93,  21,   24,   -97,  -18,
+    31,   39,   34,   -20,  22,   123,  7,    -77,  -81,  -46,  -9,   1,
+    23,   39,   -127, -43,  -8,   -50,  10,   -21,  59,   -9,   -4,   -13,
+    -27,  44,   127,  52,   -47,  70,   -43,  52,   101,  -49,  27,   45,
+    49,   33,   -125, 55,   114,  20,   -1,   76,   -24,  -96,  105,  24,
+    126,  75,   -21,  -105, 13,   -42,  40,   126,  -30,  -39,  -95,  125,
+    -63,  11,   6,    125,  125,  -14,  5,    42,   -61,  -4,   49,   88,
+    6,    -107, -28,  19,   -29,  47,   126,  6,    -46,  -89,  -18,  91,
+    -20,  -6,   118,  -21,  -22,  39,   115,  11,   -42,  54,   73,   -55,
+    -77,  62,   -27,  -59,  -99,  -12,  -127, -40,  56,   -3,   -124, -91,
+    71,   -111, 6,    -19,  82,   -24,  -35,  102,  -42,  7,    -126, -126,
+    -125, 18,   98,   -52,  127,  105,  -52,  40,   -83,  126,  -122, 109,
+    5,    127,  48,   6,    5,    -125, 100,  -16,  29,   85,   -89,  8,
+    4,    41,   62,   -127, 62,   122,  85,   122,  -107, 8,    -125, 93,
+    -127, 127,  102,  19,   19,   -66,  41,   -42,  114,  127,  -48,  -117,
+    -29,  -6,   -73,  -102, -3,   -19,  0,    88,   42,   87,   -117, -20,
+    2,    122,  28,   63,   71,   66,   120,  93,   124,  -43,  49,   103,
+    31,   90,   -91,  -22,  -126, 26,   -24,  -21,  51,   -126, 87,   -103,
+    -69,  -10,  -66,  -23,  20,   97,   36,   25,   -127, 30,   -20,  -63,
+    30,   51,   -116, 23,   40,   -39,  36,   -83,  -77,  -25,  -50,  110,
+    14,   13,   -109, 125,  -65,  -55,  -87,  124,  -126, -32,  -72,  -108,
+    127,  127,  -125, -124, 61,   121,  102,  -128, -127, 16,   100,  127,
+    -124, -68,  72,   -93,  -128, 43,   -93,  -19,  -125, -97,  -113, -33,
+    83,   127,  -44,  127,  -75,  127,  16,   44,   50,   -122, 23,   118,
+    46,   19,   26,   -128, 10,   4,    99,   -14,  -82,  -13,  30,   125,
+    57,   65,   60,   -71,  35,   98,   28,   7,    1,    43,   89,   70,
+    75,   121,  -59,  82,   -126, -53,  -16,  -116, -65,  52,   -52,  0,
+    80,   35,   45,   -61,  46,   8,    107,  27,   -26,  -118, 90,   57,
+    -10,  7,    -15,  0,    -39,  -4,   12,   29,   -1,   116,  84,   79,
+    119,  125,  -59,  28,   -6,   -25,  -43,  2,    90,   79,   67,   103,
+    -82,  2,    -6,   125,  19,   73,   0,    -105, 112,  -17,  104,  107,
+    124,  106,  19,   56,   -44,  55,   -112, 6,    -39,  -83,  126,  -93,
+    -98,  57,   -120, -23,  -38,  2,    -31,  -48,  106,  127,  127,  69,
+    16,   110,  71,   104,  62,   -12,  -22,  42,   -37,  -94,  34,   -1,
+    -32,  -12,  -124, -47,  -13,  60,   -75,  -66,  58,   -127, -2,   64,
+    76,   -106, 73,   -49,  -31,  127,  126,  31,   16,   127,  -110, 107,
+    -16,  -53,  20,   69,   -14,  -125, 59,   -44,  15,   120,  125,  125,
+    43,   6,    19,   -58,  127,  127,  43,   16,   82,   97,   -127, 127,
+    -93,  -41,  88,   0,    77,   -15,  116,  16,   -124, -31,  -3,   95,
+    -40,  -126, -54,  -126, -83,  -8,   -59,  6,    67,   -29,  4,    124,
+    -10,  112,  -28,  -8,   85,   -21,  45,   84,   6,    -8,   11,   72,
+    32,   84,   -62,  77,   2,    -36,  75,   31,   -50,  116,  126,  119,
+    -88,  -55,  -14,  -37,  126,  40,   -108, -6,   -6,   57,   64,   -28,
+    -76,  30,   -117, -93,  31,   -92,  -44,  -64,  94,   58,   65,   114,
+    41,   47,   71,   42,   -26,  99,   -126, 57,   -5,   74,   -19,  -113,
+    -1,   67,   -21,  126,  1,    -3,   33,   60,   -82,  37,   -48,  89,
+    114,  -38,  127,  -114, 35,   58,   -5,   21,   -46,  121,  -123, -43,
+    127,  115,  123,  122,  -101, 126,  127,  81,   52,   89,   -127, 102,
+    42,   117,  -9,   -2,   125,  127,  110,  96,   120,  66,   70,   124,
+    55,   84,   -38,  -58,  119,  -127, -16,  -79,  123,  18,   -127, -50,
+    -38,  120,  -85,  1,    7,    -56,  108,  -77,  -2,   21,   37,   1,
+    13,   -105, -69,  28,   -87,  33,   -104, -51,  126,  41,   3,    -121,
+    28,   71,   58,   86,   -8,   127,  94,   -55,  125,  40,   -19,  127,
+    -33,  -87,  -23,  7,    -111, -68,  9,    84,   -119, 55,   -82,  78,
+    -37,  -20,  -9,   -23,  53,   -13,  15,   -46,  116,  126,  -127, 56,
+    -126, 125,  -7,   -1,   45,   26,   125,  121,  29,   47,   -86,  30,
+    10,   76,   -125, -7,   23,   92,   -12,  -39,  -18,  92,   -97,  -8,
+    -85,  -41,  49,   -50,  123,  -37,  -126, -30,  14,   79,   -49,  -65,
+    9,    -36,  -38,  -96,  85,   -24,  -13,  37,   -25,  -5,   -64,  -127,
+    55,   -60,  -18,  -61,  -63,  127,  56,   67,   15,   124,  72,   120,
+    127,  40,   -10,  114,  24,   -23,  46,   78,   -53,  125,  86,   124,
+    86,   0,    38,   93,   21,   127,  123,  75,   -72,  13,   48,   33,
+    83,   -51,  15,   -32,  -49,  -33,  120,  64,   7,    9,    65,   60,
+    21,   -21,  -61,  -53,  -113, 84,   -97,  101,  37,   -114, -27,  41,
+    73,   126,  -10,  59,   61,   -15,  70,   -13,  82,   -4,   69,   56,
+    94,   -91,  -50,  92,   -74,  -48,  53,   -7,   -107, 127,  28,   30,
+    -26,  -21,  -61,  77,   82,   64,   -91,  -125, 122,  -104, 127,  123,
+    122,  123,  76,   -126, 127,  -6,   -80,  7,    40,   -66,  -65,  54,
+    -2,   23,   96,   -64,  74,   2,    -53,  -12,  -123, 39,   60,   -20,
+    16,   -17,  -97,  23,   -4,   -53,  -122, 32,   -16,  -54,  -95,  43,
+    71,   -1,   -67,  -33,  41,   18,   72,   28,   -83,  31,   -100, -91,
+    -27,  10,   -128, -106, 2,    76,   -13,  42,   34,   112,  -19,  44,
+    40,   -9,   -11,  65,   92,   -43,  -125, 2,    47,   -32,  25,   122,
+    -29,  12,   101,  -8,   -126, -23,  43,   7,    125,  -20,  -124, 82,
+    -2,   13,   -73,  -106, 115,  31,   116,  -23,  -44,  -71,  84,   3,
+    47,   91,   127,  127,  -15,  95,   7,    93,   5,    113,  -50,  54,
+    11,   13,   -127, 17,   72,   43,   -23,  5,    -70,  20,   15,   -27,
+    99,   69,   -109, -122, -94,  16,   127,  0,    116,  104,  45,   108,
+    -34,  87,   72,   -14,  118,  46,   42,   109,  -26,  95,   93,   127,
+    60,   127,  -93,  -54,  -122, 34,   -105, 56,   55,   103,  125,  -71,
+    -50,  95,   -72,  127,  107,  21,   73,   126,  61,   127,  127,  24,
+    -62,  90,   73,   90,   -46,  -78,  -124, 72,   123,  -42,  50,   -107,
+    17,   -32,  -62,  -89,  124,  1,    80,   -2,   117,  119,  -65,  -127,
+    -95,  -121, -52,  103,  66,   75,   -3,   -62,  -127, 127,  -74,  124,
+    79,   49,   40,   105,  -67,  -71,  -70,  43,   127,  119,  -4,   66,
+    43,   23,   91,   -126, 15,   63,   -119, 112,  103,  15,   -99,  31,
+    -127, 69,   116,  -46,  -67,  2,    -126, -29,  30,   30,   -69,  -98,
+    -47,  -87,  -70,  -127, 23,   -73,  30,   -7,   94,   -52,  -65,  98,
+    -45,  97,   53,   23,   -9,   -22,  -52,  -47,  6,    -1,   -85,  -15,
+    -61,  -14,  68,   110,  -10,  -121, -25,  -35,  -15,  -94,  -123, 27,
+    75,   48,   -66,  -56,  -44,  93,   109,  67,   -36,  24,   70,   -126,
+    8,    -127, 126,  52,   11,   -32,  120,  -13,  -26,  -28,  -125, 127,
+    106,  -50,  124,  36,   -126, -12,  0,    -23,  76,   -71,  -126, -12,
+    -17,  -82,  12,   124,  57,   33,   4,    77,   -46,  71,   -34,  72,
+    125,  -128, 124,  -24,  -128, 75,   -120, 69,   -45,  55,   33,   127,
+    -33,  4,    -105, -41,  -59,  -91,  123,  44,   -127, 127,  -67,  52,
+    25,   -125, -65,  100,  -25,  123,  6,    11,   -123, -92,  -33,  126,
+    -17,  -4,   29,   33,   127,  96,   3,    87,   -48,  -18,  -70,  123,
+    58,   -127, -3,   -52,  -1,   -36,  -41,  127,  51,   -52,  -27,  46,
+    -83,  57,   9,    126,  127,  94,   79,   -37,  -127, -40,  67,   52,
+    82,   -66,  122,  -13,  -73,  127,  -8,   -80,  46,   -48,  4,    -54};
+const int8_t kHiddenGruBias[kHiddenLayerBiases] = {
+    124, 125, -57, -126, 53,  123, 127,  -75, 68,  102, -2, 116,
+    124, 127, 124, 125,  126, 123, -16,  48,  125, 126, 78, 85,
+    11,  126, -30, -30,  -64, -3,  -105, -29, -17, 69,  63, 2,
+    -32, -10, -62, 113,  -52, 112, -109, 112, 7,   -40, 73, 53,
+    62,  6,   -2,  0,    0,   100, -16,  26,  -24, 56,  26, -10,
+    -33, 41,  70,  109,  -29, 127, 34,   -66, 49,  53,  27, 62};
+const int8_t kOutputDenseWeights[kOutputLayerWeights] = {
+    127,  127,  127, 127,  127,  20,  127,  -126, -126, -54, 14,  125,
+    -126, -126, 127, -125, -126, 127, -127, -127, -57,  -30, 127, 80};
+const int8_t kOutputDenseBias[kOutputLayerOutputSize] = {-50};
+}  // namespace rnnoise
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_vad_weights.h asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_vad_weights.h
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_vad_weights.h	1970-01-01 00:00:00.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/third_party/webrtc_aec3/src/third_party/rnnoise/src/rnn_vad_weights.h	2022-02-24 07:54:38.000000000 +0000
@@ -0,0 +1,29 @@
+#ifndef THIRD_PARTY_RNNOISE_SRC_RNN_VAD_WEIGHTS_H_
+#define THIRD_PARTY_RNNOISE_SRC_RNN_VAD_WEIGHTS_H_
+#include <cstdint>
+#include <cstring>
+namespace rnnoise {
+// Weights scaling factor.
+const float kWeightsScale = 1.f / 256.f;
+// Input layer (dense).
+const size_t kInputLayerInputSize = 42;
+const size_t kInputLayerOutputSize = 24;
+const size_t kInputLayerWeights = kInputLayerInputSize * kInputLayerOutputSize;
+extern const int8_t kInputDenseWeights[kInputLayerWeights];
+extern const int8_t kInputDenseBias[kInputLayerOutputSize];
+// Hidden layer (GRU).
+const size_t kHiddenLayerOutputSize = 24;
+const size_t kHiddenLayerWeights =
+    3 * kInputLayerOutputSize * kHiddenLayerOutputSize;
+const size_t kHiddenLayerBiases = 3 * kHiddenLayerOutputSize;
+extern const int8_t kHiddenGruWeights[kHiddenLayerWeights];
+extern const int8_t kHiddenGruRecurrentWeights[kHiddenLayerWeights];
+extern const int8_t kHiddenGruBias[kHiddenLayerBiases];
+// Output layer (dense).
+const size_t kOutputLayerOutputSize = 1;
+const size_t kOutputLayerWeights =
+    kHiddenLayerOutputSize * kOutputLayerOutputSize;
+extern const int8_t kOutputDenseWeights[kOutputLayerWeights];
+extern const int8_t kOutputDenseBias[kOutputLayerOutputSize];
+}  // namespace rnnoise
+#endif  // THIRD_PARTY_RNNOISE_SRC_RNN_VAD_WEIGHTS_H_
diff -Nru asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/version.mak asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/version.mak
--- asterisk-18.11.2~dfsg+~cs6.10.40431413/Xpjproject/version.mak	2020-02-14 09:48:27.000000000 +0000
+++ asterisk-18.12.0~dfsg+~cs6.12.40431413/Xpjproject/version.mak	2022-02-24 07:54:38.000000000 +0000
@@ -1,6 +1,6 @@
 # Don't change the "export PJ_VERSION_xxx" style, they are parsed by setup.py
 export PJ_VERSION_MAJOR  := 2
-export PJ_VERSION_MINOR  := 10
+export PJ_VERSION_MINOR  := 12
 export PJ_VERSION_REV    :=
 export PJ_VERSION_SUFFIX :=